4 files changed, 14 insertions, 14 deletions

diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 90487265b..1b0bb716d 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -47,13 +47,13 @@
 
 
 /**
- * Maximum regex string length for use with GNUNET_TUN_ipv4toregex
+ * Maximum regex string length for use with GNUNET_TUN_ipv4toregexsearch
  */
 #define GNUNET_TUN_IPV4_REGEXLEN 32 + 6
 
 
 /**
- * Maximum regex string length for use with GNUNET_TUN_ipv6toregex
+ * Maximum regex string length for use with GNUNET_TUN_ipv6toregexsearch
  */
 #define GNUNET_TUN_IPV6_REGEXLEN 128 + 6
 
@@ -438,7 +438,7 @@ GNUNET_TUN_calculate_icmp_checksum (struct GNUNET_TUN_IcmpHeader *icmp,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv4toregex (const struct in_addr *ip, const char *netmask,
+GNUNET_TUN_ipv4toregexsearch (const struct in_addr *ip, const char *netmask,
                         char *rxstr);
 
 
@@ -451,7 +451,7 @@ GNUNET_TUN_ipv4toregex (const struct in_addr *ip, const char *netmask,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv6toregex (const struct in6_addr *ipv6,
+GNUNET_TUN_ipv6toregexsearch (const struct in6_addr *ipv6,
                         unsigned int prefixlen, char *rxstr);
 
 
@@ -459,7 +459,7 @@ GNUNET_TUN_ipv6toregex (const struct in6_addr *ipv6,
  * Convert an exit policy to a regular expression.  The exit policy
  * specifies a set of subnets this peer is willing to serve as an
  * exit for; the resulting regular expression will match the
- * IPv6 address strings as returned by 'GNUNET_TUN_ipv6toregex'.
+ * IPv6 address strings as returned by 'GNUNET_TUN_ipv6toregexsearch'.
  *
  * @param policy exit policy specification
  * @return regular expression, NULL on error
@@ -472,7 +472,7 @@ GNUNET_TUN_ipv6policy2regex (const char *policy);
  * Convert an exit policy to a regular expression.  The exit policy
  * specifies a set of subnets this peer is willing to serve as an
  * exit for; the resulting regular expression will match the
- * IPv4 address strings as returned by 'GNUNET_TUN_ipv4toregex'.
+ * IPv4 address strings as returned by 'GNUNET_TUN_ipv4toregexsearch'.
  *
  * @param policy exit policy specification
  * @return regular expression, NULL on error
diff --git a/src/tun/regex.c b/src/tun/regex.c
index 0d259a8d5..5b844c5bc 100644
--- a/src/tun/regex.c
+++ b/src/tun/regex.c
@@ -107,7 +107,7 @@ ipv4netmasktoprefixlen (const char *netmask)
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv4toregex (const struct in_addr *ip, const char *netmask,
+GNUNET_TUN_ipv4toregexsearch (const struct in_addr *ip, const char *netmask,
                         char *rxstr)
 {
   unsigned int pfxlen;
@@ -129,7 +129,7 @@ GNUNET_TUN_ipv4toregex (const struct in_addr *ip, const char *netmask,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv6toregex (const struct in6_addr *ipv6, unsigned int prefixlen,
+GNUNET_TUN_ipv6toregexsearch (const struct in6_addr *ipv6, unsigned int prefixlen,
                         char *rxstr)
 {
   iptobinstr (AF_INET6, ipv6, rxstr);
@@ -143,7 +143,7 @@ GNUNET_TUN_ipv6toregex (const struct in6_addr *ipv6, unsigned int prefixlen,
  * Convert an exit policy to a regular expression.  The exit policy
  * specifies a set of subnets this peer is willing to serve as an
  * exit for; the resulting regular expression will match the
- * IPv4 address strings as returned by 'GNUNET_TUN_ipv4toregex'.
+ * IPv4 address strings as returned by 'GNUNET_TUN_ipv4toregexsearch'.
  *
  * @param policy exit policy specification
  * @return regular expression, NULL on error
@@ -159,7 +159,7 @@ GNUNET_TUN_ipv4policy2regex (const char *policy)
  * Convert an exit policy to a regular expression.  The exit policy
  * specifies a set of subnets this peer is willing to serve as an
  * exit for; the resulting regular expression will match the
- * IPv4 address strings as returned by 'GNUNET_TUN_ipv4toregex'.
+ * IPv4 address strings as returned by 'GNUNET_TUN_ipv4toregexsearch'.
  *
  * @param policy exit policy specification
  * @return regular expression, NULL on error
diff --git a/src/tun/test_regex.c b/src/tun/test_regex.c
index 8af1abd02..a0c3e99fd 100644
--- a/src/tun/test_regex.c
+++ b/src/tun/test_regex.c
@@ -39,7 +39,7 @@ test_iptoregex (const char *ipv4, const char *netmask, const char *expectedv4,
   char rxv6[GNUNET_TUN_IPV6_REGEXLEN];
 
   GNUNET_assert (1 == inet_pton (AF_INET, ipv4, &a));
-  GNUNET_TUN_ipv4toregex (&a, netmask, rxv4);
+  GNUNET_TUN_ipv4toregexsearch (&a, netmask, rxv4);
 
 
   if (0 != strcmp (rxv4, expectedv4))
@@ -50,7 +50,7 @@ test_iptoregex (const char *ipv4, const char *netmask, const char *expectedv4,
   }
 
   GNUNET_assert (1 == inet_pton (AF_INET6, ipv6, &b));
-  GNUNET_TUN_ipv6toregex (&b, prefixlen, rxv6);
+  GNUNET_TUN_ipv6toregexsearch (&b, prefixlen, rxv6);
 
   if (0 != strcmp (rxv6, expectedv6))
   {
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 5230dc631..b4a4bbff5 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -855,7 +855,7 @@ create_tunnel_to_destination (struct DestinationEntry *de,
     {
       char address[GNUNET_TUN_IPV4_REGEXLEN];
 
-      GNUNET_TUN_ipv4toregex (&de->details.exit_destination.ip.v4,
+      GNUNET_TUN_ipv4toregexsearch (&de->details.exit_destination.ip.v4,
                    "255.255.255.255", address);
       GNUNET_asprintf (&policy, "%s%s%s",
                        GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
@@ -867,7 +867,7 @@ create_tunnel_to_destination (struct DestinationEntry *de,
     {
       char address[GNUNET_TUN_IPV6_REGEXLEN];
       
-      GNUNET_TUN_ipv6toregex (&de->details.exit_destination.ip.v6,
+      GNUNET_TUN_ipv6toregexsearch (&de->details.exit_destination.ip.v6,
                    128, address);
       GNUNET_asprintf (&policy, "%s%s%s",
                        GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,