Merge pull request #302 from edk0/sasl-usercloak

[solanum.git] / extensions / extb_hostmask.c

diff --git a/extensions/extb_hostmask.c b/extensions/extb_hostmask.c
index f376ffc68dac68884450750911740414bdf25fee..c4776e55523927d2130eac04dc554515d94e8c85 100644 (file)
--- a/extensions/extb_hostmask.c
+++ b/extensions/extb_hostmask.c
@@ -7,13 +7,14 @@
 #include "modules.h"
 #include "client.h"
 #include "ircd.h"
-#include "ipv4_from_ipv6.h"
+
+static const char extb_desc[] = "Hostmask ($m) extban type";
 
 static int _modinit(void);
 static void _moddeinit(void);
 static int eb_hostmask(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_hostmask, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_hostmask, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, extb_desc);
 
 static int
 _modinit(void)
@@ -31,10 +32,10 @@ _moddeinit(void)
 static int
 eb_hostmask(const char *banstr, struct Client *client_p, struct Channel *chptr, long mode_type)
 {
-       char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
-       char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char src_althost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char src_ip4host[NICKLEN + USERLEN + HOSTLEN + 6];
+       char src_host[NAMELEN + USERLEN + HOSTLEN + 6];
+       char src_iphost[NAMELEN + USERLEN + HOSTLEN + 6];
+       char src_althost[NAMELEN + USERLEN + HOSTLEN + 6];
+       char src_ip4host[NAMELEN + USERLEN + HOSTLEN + 6];
        struct sockaddr_in ip4;
        char *s = src_host, *s2 = src_iphost, *s3 = NULL, *s4 = NULL;
 
@@ -52,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 (client_p->localClient->ip.ss_family == 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);
@@ -62,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;
 }