diff options
| author | Bart Polot <bart@net.in.tum.de> | 2012-12-19 13:26:59 +0000 |
|---|---|---|
| committer | Bart Polot <bart@net.in.tum.de> | 2012-12-19 13:26:59 +0000 |
| commit | 60c8164095399a95bc63493ccad6ff3630ee130c (patch) | |
| tree | c71a42d817f13928433e32e01184a6de04158840 | |
| parent | ccc37ce1438490a519e33d97829277ba16221425 (diff) | |
- use prefix
| -rw-r--r-- | src/exit/gnunet-daemon-exit.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index aab25072ab..5f60ea4cd1 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c @@ -3015,6 +3015,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, 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 @@ run (void *cls, char *const *args GNUNET_UNUSED, if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) ) { if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, "exit", "EXIT_RANGE_IPV4_REGEX", ®ex)) + GNUNET_CONFIGURATION_get_value_string (cfg, + "exit", + "EXIT_RANGE_IPV4_REGEX", + ®ex)) 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", ®ex)) + GNUNET_CONFIGURATION_get_value_string (cfg, + "exit", + "EXIT_RANGE_IPV6_REGEX", + ®ex)) 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, |