cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4 from Joah/master 

[Fixed] Merge ip_cloaking* Fixes from charybdis
This commit is contained in:
Jeff Horelick 2012-10-12 09:29:51 -07:00
parent 465f81c3fc abd9b88621
commit f6dbc81c8f
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/ip_cloaking.c
View File

@ -1,3 +1,9 @@
/*
* Charybdis: an advanced ircd
* ip_cloaking.c: provide user hostname cloaking
*
* Written originally by nenolod, altered to use FNV by Elizabeth in 2008
*/
#include "stdinc.h" #include "stdinc.h"
#include "modules.h" #include "modules.h"
@ -11,9 +17,6 @@
#include "s_serv.h" #include "s_serv.h"
#include "numeric.h" #include "numeric.h"
/* if you're modifying this module, you'll probably to change this */
#define KEY 0x13748cfa
static int static int
_modinit(void) _modinit(void)
{ {
@ -44,25 +47,28 @@ DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
ip_cloaking_hfnlist, "$Revision: 3526 $"); ip_cloaking_hfnlist, "$Revision: 3526 $");
static void static void
distribute_hostchange(struct Client *client) distribute_hostchange(struct Client *client_p, char *newhost)
{ {
if (irccmp(client->host, client->orighost)) if (newhost != client_p->orighost)
sendto_one_numeric(client, RPL_HOSTHIDDEN, "%s :is now your hidden host", sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
client->host); newhost);
else else
sendto_one_numeric(client, RPL_HOSTHIDDEN, "%s :hostname reset", sendto_one_numeric(client_p, RPL_HOSTHIDDEN, "%s :hostname reset",
client->host); newhost);
sendto_server(NULL, NULL, sendto_server(NULL, NULL,
CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s", 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, sendto_server(NULL, NULL,
CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s", CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
use_id(&me), use_id(client), client->host); use_id(&me), use_id(client_p), newhost);
if (irccmp(client->host, client->orighost))
SetDynSpoof(client); 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 else
ClearDynSpoof(client); ClearDynSpoof(client_p);
} }
static void static void
@ -176,8 +182,7 @@ check_umode_change(void *vdata)
} }
if (strcmp(source_p->host, source_p->localClient->mangledhost)) if (strcmp(source_p->host, source_p->localClient->mangledhost))
{ {
rb_strlcpy(source_p->host, source_p->localClient->mangledhost, HOSTLEN + 1); distribute_hostchange(source_p, source_p->localClient->mangledhost);
distribute_hostchange(source_p);
} }
else /* not really nice, but we need to send this numeric here */ 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", sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host",
@ -188,8 +193,7 @@ check_umode_change(void *vdata)
if (source_p->localClient->mangledhost != NULL && if (source_p->localClient->mangledhost != NULL &&
!strcmp(source_p->host, source_p->localClient->mangledhost)) !strcmp(source_p->host, source_p->localClient->mangledhost))
{ {
rb_strlcpy(source_p->host, source_p->orighost, HOSTLEN + 1); distribute_hostchange(source_p, source_p->orighost);
distribute_hostchange(source_p);
} }
} }
} }
@ -218,3 +222,4 @@ check_new_user(void *vdata)
SetDynSpoof(source_p); SetDynSpoof(source_p);
} }
} }