remove RB_IPV6

[solanum.git] / extensions / extb_hostmask.c

diff --git a/extensions/extb_hostmask.c b/extensions/extb_hostmask.c
index 9bffe26b821500902b74ba45a15820344b144534..15182981446e437d4c750ad10bfae268c378db7c 100644 (file)
--- a/extensions/extb_hostmask.c
+++ b/extensions/extb_hostmask.c
@@ -7,7 +7,6 @@
 #include "modules.h"
 #include "client.h"
 #include "ircd.h"
-#include "ipv4_from_ipv6.h"
 
 static const char extb_desc[] = "Hostmask ($m) extban type";
 
@@ -54,9 +53,8 @@ eb_hostmask(const char *banstr, struct Client *client_p, struct Channel *chptr,
                s3 = src_althost;
        }
 
-#ifdef RB_IPV6
        /* handle Teredo if necessary */
-       if (GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET6 && ipv4_from_ipv6((const struct sockaddr_in6 *) &client_p->localClient->ip, &ip4))
+       if (GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET6 && rb_ipv4_from_ipv6((const struct sockaddr_in6 *) &client_p->localClient->ip, &ip4))
        {
                sprintf(src_ip4host, "%s!%s@", client_p->name, client_p->username);
                s4 = src_ip4host + strlen(src_ip4host);
@@ -64,7 +62,6 @@ eb_hostmask(const char *banstr, struct Client *client_p, struct Channel *chptr,
                                s4, src_ip4host + sizeof src_ip4host - s4);
                s4 = src_ip4host;
        }
-#endif
 
        return match(banstr, s) || match(banstr, s2) || (s3 != NULL && match(banstr, s3)) || (s4 != NULL && match(banstr, s4)) ? EXTBAN_MATCH : EXTBAN_NOMATCH;
 }