@@ -721,8 +721,8 @@ void delete_route_connected_v6_net(struct tuntap * tt,

  * is still point to point and no layer 2 resolution is done...

  */

-const char *

-create_arbitrary_remote( struct tuntap *tt, struct gc_arena * gc )

+in_addr_t

+create_arbitrary_remote( struct tuntap *tt )

 {

   in_addr_t remote;

@@ -730,7 +730,7 @@ create_arbitrary_remote( struct tuntap *tt, struct gc_arena * gc )

   if ( remote == tt->local ) remote ++;

-  return print_in_addr_t (remote, 0, gc);

+  return remote;

 }

 #endif

@@ -1230,6 +1230,8 @@ do_ifconfig (struct tuntap *tt,

 #elif defined(TARGET_FREEBSD)||defined(TARGET_DRAGONFLY)

+      in_addr_t remote_end;		/* for "virtual" subnet topology */

+

       /* example: ifconfig tun2 10.2.0.2 10.2.0.1 mtu 1450 netmask 255.255.255.255 up */

       if (tun)

 	argv_printf (&argv,

@@ -1242,12 +1244,13 @@ do_ifconfig (struct tuntap *tt,

 			  );

       else if ( tt->topology == TOP_SUBNET )

 	{

+	    remote_end = create_arbitrary_remote( tt );

 	    argv_printf (&argv,

 			  "%s %s %s %s mtu %d netmask %s up",

 			  IFCONFIG_PATH,

 			  actual,

 			  ifconfig_local,

-			  create_arbitrary_remote( tt, &gc ),

+			  print_in_addr_t (remote_end, 0, &gc),

 			  tun_mtu,

 			  ifconfig_remote_netmask

 			  );

@@ -1274,7 +1277,7 @@ do_ifconfig (struct tuntap *tt,

           r.flags = RT_DEFINED;

           r.network = tt->local & tt->remote_netmask;

           r.netmask = tt->remote_netmask;

-          r.gateway = tt->local;

+          r.gateway = remote_end;

           add_route (&r, tt, 0, NULL, es);

         }