[GNUnet-SVN] r25548 - gnunet/src/exit

[gnunet]

Author: bartpolot
Date: 2012-12-19 14:26:59 +0100 (Wed, 19 Dec 2012)
New Revision: 25548

Modified:
   gnunet/src/exit/gnunet-daemon-exit.c
Log:
- use prefix

Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c        2012-12-19 13:02:42 UTC (rev 
25547)
+++ gnunet/src/exit/gnunet-daemon-exit.c        2012-12-19 13:26:59 UTC (rev 
25548)
@@ -3015,6 +3015,7 @@
   char *ipv4mask;
   char *binary;
   char *regex;
+  char *prefixed_regex;
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
   if (GNUNET_YES !=
@@ -3209,19 +3210,37 @@
   if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) )
   {
     if (GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_string (cfg, "exit", 
"EXIT_RANGE_IPV4_REGEX", &regex))
+       GNUNET_CONFIGURATION_get_value_string (cfg,
+                                               "exit",
+                                               "EXIT_RANGE_IPV4_REGEX",
+                                               &regex))
       regex = GNUNET_strdup ("(0|1)*");
-    GNUNET_MESH_announce_regex (mesh_handle, regex, REGEX_MAX_PATH_LEN_IPV4);
+    (void) GNUNET_asprintf (&prefixed_regex, "%s%s%s",
+                            GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
+                            "4", regex);
+    GNUNET_MESH_announce_regex (mesh_handle,
+                                prefixed_regex,
+                                REGEX_MAX_PATH_LEN_IPV4);
     GNUNET_free (regex);
+    GNUNET_free (prefixed_regex);
   }
 
   if (GNUNET_YES == ipv6_enabled && GNUNET_YES == ipv6_exit)
   {
     if (GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_string (cfg, "exit", 
"EXIT_RANGE_IPV6_REGEX", &regex))
+       GNUNET_CONFIGURATION_get_value_string (cfg,
+                                               "exit",
+                                               "EXIT_RANGE_IPV6_REGEX",
+                                               &regex))
       regex = GNUNET_strdup ("(0|1)*");
-    GNUNET_MESH_announce_regex (mesh_handle, regex, REGEX_MAX_PATH_LEN_IPV6);
+    (void) GNUNET_asprintf (&prefixed_regex, "%s%s%s",
+                            GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
+                            "6", regex);
+    GNUNET_MESH_announce_regex (mesh_handle,
+                                prefixed_regex,
+                                REGEX_MAX_PATH_LEN_IPV6);
     GNUNET_free (regex);
+    GNUNET_free (prefixed_regex);
   }
 
   helper_handle = GNUNET_HELPER_start (GNUNET_NO,