-/*
+/*
* Charybdis: an advanced ircd
* ip_cloaking.c: provide user hostname cloaking
*
#include "s_serv.h"
#include "numeric.h"
+static const char ip_cloaking_desc[] = "IP cloaking module that uses user mode +h";
+
static int
_modinit(void)
{
{ NULL, NULL }
};
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
- ip_cloaking_hfnlist, "$Revision: 3526 $");
+DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
+ ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
static void
-distribute_hostchange(struct Client *client)
+distribute_hostchange(struct Client *client_p, char *newhost)
{
- if (irccmp(client->host, client->orighost))
- sendto_one_numeric(client, RPL_HOSTHIDDEN, "%s :is now your hidden host",
- client->host);
+ if (newhost != client_p->orighost)
+ sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
+ newhost);
else
- sendto_one_numeric(client, RPL_HOSTHIDDEN, "%s :hostname reset",
- client->host);
+ sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :hostname reset",
+ newhost);
sendto_server(NULL, NULL,
CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s",
- use_id(&me), use_id(client), client->host);
+ use_id(&me), use_id(client_p), newhost);
sendto_server(NULL, NULL,
CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
- use_id(&me), use_id(client), client->host);
- if (irccmp(client->host, client->orighost))
- SetDynSpoof(client);
+ use_id(&me), use_id(client_p), newhost);
+
+ change_nick_user_host(client_p, client_p->name, client_p->username, newhost, 0, "Changing host");
+
+ if (newhost != client_p->orighost)
+ SetDynSpoof(client_p);
else
- ClearDynSpoof(client);
+ ClearDynSpoof(client_p);
}
static void
{
ipv6 = 1;
- /* Damn you IPv6...
+ /* Damn you IPv6...
* We count the number of colons so we can calculate how much
* of the host to cloak. This is because some hostmasks may not
* have as many octets as we'd like.
else if (!strchr(outbuf, '.'))
return;
- for (tptr = outbuf; *tptr != '\0'; tptr++)
+ for (tptr = outbuf; *tptr != '\0'; tptr++)
{
if (*tptr == ':' || *tptr == '.')
{
rb_strlcpy(outbuf, inbuf, HOSTLEN + 1);
- /* pass 1: scramble first section of hostname using base26
+ /* pass 1: scramble first section of hostname using base26
* alphabet toasted against the FNV hash of the string.
*
* numbers are not changed at this time, only letters.
if (*tptr == '.')
break;
- if (isdigit(*tptr) || *tptr == '-')
+ if (isdigit((unsigned char)*tptr) || *tptr == '-')
continue;
*tptr = b26_alphabet[(*tptr + accum) % 26];
/* pass 2: scramble each number in the address */
for (tptr = outbuf; *tptr != '\0'; tptr++)
{
- if (isdigit(*tptr))
+ if (isdigit((unsigned char)*tptr))
*tptr = '0' + (*tptr + accum) % 10;
accum = (accum << 1) | (accum >> 31);
- }
+ }
}
static void
}
if (strcmp(source_p->host, source_p->localClient->mangledhost))
{
- rb_strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN + 1);
- distribute_hostchange(source_p);
+ distribute_hostchange(source_p, source_p->localClient->mangledhost);
}
else /* not really nice, but we need to send this numeric here */
sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
if (source_p->localClient->mangledhost != NULL &&
!strcmp(source_p->host, source_p->localClient->mangledhost))
{
- rb_strlcpy(source_p->host, source_p->orighost, HOSTLEN + 1);
- distribute_hostchange(source_p);
+ distribute_hostchange(source_p, source_p->orighost);
}
}
}