[GNUnet-SVN] r35810 - gnunet/src/pt

[gnunet]

Author: grothoff
Date: 2015-05-26 10:55:43 +0200 (Tue, 26 May 2015)
New Revision: 35810

Modified:
   gnunet/src/pt/test_gns_vpn.c
Log:
-initialize GNS DNS interception in testcase, so that curl will actually get 
GNS resolution

Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c        2015-05-26 08:54:22 UTC (rev 35809)
+++ gnunet/src/pt/test_gns_vpn.c        2015-05-26 08:55:43 UTC (rev 35810)
@@ -536,9 +536,6 @@
              name);
     return;
   }
-  /* FIXME: we somehow need to get this zone-key into
-     the 'DNS_ROOT' option of the 'gns' service.  This
-     is currently why the test fails... */
   zone_key = GNUNET_IDENTITY_ego_get_private_key (ego);
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
   peername = GNUNET_strdup (GNUNET_i2s_full (&id));
@@ -603,6 +600,14 @@
     "-c", config,
     NULL
   };
+  char *const identity3_args[] =
+  {
+    "gnunet-identity",
+    "-e", "master-zone",
+    "-s", "gns-intercept",
+    "-c", config,
+    NULL
+  };
   GNUNET_TESTING_peer_get_identity (peer, &id);
   GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                 &do_shutdown,
@@ -631,6 +636,15 @@
     GNUNET_free (config);
     return;
   }
+  if (0 != fork_and_exec (bin_identity, identity3_args))
+  {
+    fprintf (stderr,
+             "Failed to run `gnunet-identity -e. Skipping test.\n");
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_free (bin_identity);
+    GNUNET_free (config);
+    return;
+  }
   GNUNET_free (bin_identity);
   GNUNET_free (config);