-/* $Id: ip_cloaking.c 3526 2007-07-06 07:56:14Z nenolod $ */
#include "stdinc.h"
#include "modules.h"
#include "s_serv.h"
#include "numeric.h"
-/* if you're modifying this module, you'll probably to change this */
+static const char ip_cloaking_desc[] = "The old IP cloaking mechanism version 3.0";
+
+/* if you're modifying this module, you'll probably want to change this */
#define KEY 0x13748cfa
static int
{ 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_p, char *newhost)
{
if (newhost != client_p->orighost)
sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
- client_p->host);
+ newhost);
else
sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :hostname reset",
- client_p->host);
+ newhost);
sendto_server(NULL, NULL,
CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s",
- use_id(&me), use_id(client_p), client_p->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_p), client_p->host);
+ use_id(&me), use_id(client_p), newhost);
change_nick_user_host(client_p, client_p->name, client_p->username, newhost, 0, "Changing host");
{
char *tptr;
unsigned int accum = get_string_weighted_entropy(inbuf);
- char buf[HOSTLEN];
+ char buf[HOSTLEN + 1] = { 0 };
int ipv6 = 0;
strncpy(buf, inbuf, HOSTLEN);
if(ipv6)
{
- rb_snprintf(outbuf, HOSTLEN, "%s:%x", buf, accum);
+ snprintf(outbuf, HOSTLEN, "%.60s:%x", buf, accum);
}
else
{
- rb_snprintf(outbuf, HOSTLEN, "%s.%x", buf, accum);
+ snprintf(outbuf, HOSTLEN, "%.60s.%x", buf, accum);
}
}
strncpy(outbuf, inbuf, HOSTLEN);
- /* pass 1: scramble first section of hostname using base26
+ /* pass 1: scramble first section of hostname using base26
* alphabet toasted against the weighted entropy 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 = 48 + ((*tptr * accum) % 10);
}
- }
+ }
}
static void
source_p->umodes &= ~user_modes['h'];
return;
}
- source_p->localClient->mangledhost = rb_malloc(HOSTLEN);
+ source_p->localClient->mangledhost = rb_malloc(HOSTLEN + 1);
if (!irccmp(source_p->orighost, source_p->sockhost))
do_host_cloak_ip(source_p->orighost, source_p->localClient->mangledhost);
else