[GNUnet-SVN] r19766 - gnunet/src/vpn

[gnunet]

Author: grothoff
Date: 2012-02-12 20:15:23 +0100 (Sun, 12 Feb 2012)
New Revision: 19766

Modified:
   gnunet/src/vpn/test_gnunet_vpn.c
Log:
-fix testcase

Modified: gnunet/src/vpn/test_gnunet_vpn.c
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.c    2012-02-12 19:03:39 UTC (rev 19765)
+++ gnunet/src/vpn/test_gnunet_vpn.c    2012-02-12 19:15:23 UTC (rev 19766)
@@ -392,6 +392,8 @@
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct in_addr v4;
+  struct in_addr v6;
+  void *addr;
   enum MHD_FLAG flags;
 
   vpn = GNUNET_VPN_connect (cfg);
@@ -406,11 +408,24 @@
                          MHD_OPTION_END);
   GNUNET_assert (NULL != mhd);
   mhd_main ();
-  GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v4));
+  addr = NULL;
+  switch (dest_af)
+  {
+  case AF_INET:
+    GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v4));
+    addr = &v4;
+    break;
+  case AF_INET6:
+    GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v6));
+    addr = &v6;
+    break;
+  default:
+    GNUNET_assert (0);
+  }
   rr = GNUNET_VPN_redirect_to_ip (vpn,
                                  src_af,
                                  dest_af,
-                                 &v4,
+                                 addr,
                                  GNUNET_YES,
                                  GNUNET_TIME_UNIT_FOREVER_ABS,
                                  &allocation_cb, NULL);