GitHub-Mirror/NeoStats-NeoIRCd
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bunch of fixes with hiddenhosts and CLIENT/NICK Messages

Browse source
This commit is contained in:
fishwaldo 2002-09-24 11:50:16 +00:00
parent 26f843e7b4
commit 87a0864b91
6 changed files with 253 additions and 257 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -4,6 +4,10 @@ Symbols are:
(F) - Fish (fish@dynam.ac)
(S) - Shmad (shmad@#neostats.net)
(HP) - Hybrid Team Patches to Hybrid Source
* NeoIRCd Version 0.9.4 - 24th Sept, 2002 - Fish
(F) - Changed HiddenHost System to Use Ultimates version instead...
(F) - Changed NICK and Client Messages to include vhost, so we dont have to burst SETHOST
(F) - Don't burst SETHOST when we remove -x
* NeoIRCd Version 0.9.3 - 19th Sept, 2002 - Fish
(HP) - Merged in Hybrid rc4 Patches (including Rc3 and Rc3 fixes)

71
modules/core/m_nick.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_nick.c,v 1.11 2002/09/20 09:10:39 fishwaldo Exp $
* $Id: m_nick.c,v 1.12 2002/09/24 11:50:16 fishwaldo Exp $
*/
#include "stdinc.h"
@ -97,7 +97,7 @@ _moddeinit(void)
mod_del_cmd(&client_msgtab);
}
const char *_version = "$Revision: 1.11 $";
const char *_version = "$Revision: 1.12 $";
#endif
/*
@ -311,9 +311,10 @@ mr_nick(struct Client *client_p, struct Client *source_p,
* parv[4] = umode
* parv[5] = username
* parv[6] = hostname
* parv[7] = server
* parv[8] = svsid
* parv[9] = ircname
* parv[7] = vhost
* parv[8] = server
* parv[9] = svsid
* parv[10] = ircname
*/
static void
ms_nick(struct Client *client_p, struct Client *source_p,
@ -330,8 +331,8 @@ ms_nick(struct Client *client_p, struct Client *source_p,
return;
}
/* parc == 3 on nickchange, parc == 10 on new nick */
if((IsClient(source_p) && (parc != 3)) || (IsServer(source_p) && (parc != 10)))
/* parc == 3 on nickchange, parc == 11 on new nick */
if((IsClient(source_p) && (parc != 3)) || (IsServer(source_p) && (parc != 11)))
{
char tbuf[BUFSIZE] = { 0 };
int j;
@ -355,21 +356,21 @@ ms_nick(struct Client *client_p, struct Client *source_p,
/* fix the length of the nick */
strlcpy(nick, parv[1], NICKLEN);
if(check_clean_nick(client_p, source_p, nick, parv[1], parv[7]))
if(check_clean_nick(client_p, source_p, nick, parv[1], parv[8]))
return;
if (parc == 10)
if (parc == 11)
{
if (check_clean_user(client_p, nick, parv[5], parv[7]) ||
check_clean_host(client_p, nick, parv[6], parv[7]))
if (check_clean_user(client_p, nick, parv[5], parv[8]) ||
check_clean_host(client_p, nick, parv[6], parv[8]))
return;
/* check the length of the clients gecos */
if(strlen(parv[9]) > REALLEN)
if(strlen(parv[10]) > REALLEN)
{
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ALL, "Long realname from server %s for %s",
parv[7], parv[1]);
parv[9][REALLEN] = '\0';
parv[8], parv[1]);
parv[10][REALLEN] = '\0';
}
if (IsServer(source_p))
@ -428,8 +429,8 @@ ms_client(struct Client *client_p, struct Client *source_p,
char *id;
char *name;
id = parv[8];
name = parv[9];
id = parv[9];
name = parv[10];
/* XXX can this happen ? */
if (BadPtr(parv[1]))
@ -439,9 +440,9 @@ ms_client(struct Client *client_p, struct Client *source_p,
strlcpy(nick, parv[1], NICKLEN);
/* check the nicknames, usernames and hostnames are ok */
if(check_clean_nick(client_p, source_p, nick, parv[1], parv[7]) ||
check_clean_user(client_p, nick, parv[5], parv[7]) ||
check_clean_host(client_p, nick, parv[6], parv[7]))
if(check_clean_nick(client_p, source_p, nick, parv[1], parv[8]) ||
check_clean_user(client_p, nick, parv[5], parv[8]) ||
check_clean_host(client_p, nick, parv[6], parv[8]))
return;
/* check length of clients gecos */
@ -727,6 +728,13 @@ nick_from_server(struct Client *client_p, struct Client *source_p, int parc,
if(!(source_p->umodes & FLAGS_OPER) && (flag & FLAGS_OPER))
Count.oper++;
if(!(source_p->umodes & FLAGS_HIDDEN) && (flag & FLAGS_HIDDEN)) {
if (parv[7][0] != '*')
strncpy(source_p->vhost, parv[7], HOSTLEN +1);
else
make_virthost(source_p->host, source_p->vhost, 1);
}
/* we only allow Ulined Servers to set +s */
if ((flag & FLAGS_SERVICES) && (!IsUlined(find_server(parv[7])))) {
sendto_one(source_p, ":%s NOTICE %s :*** Only Ulined Services can set +S", me.name, source_p->name);
@ -740,7 +748,7 @@ nick_from_server(struct Client *client_p, struct Client *source_p, int parc,
}
return do_remote_user(nick, client_p, source_p, parv[5], parv[6],
parv[7], parv[9], NULL, atol(parv[8]));
parv[8], parv[10], NULL, atol(parv[9]));
}
}
else if(source_p->name[0])
@ -788,8 +796,8 @@ client_from_server(struct Client *client_p, struct Client *source_p, int parc,
int flag;
char *m;
id = parv[8];
name = parv[10];
id = parv[9];
name = parv[11];
source_p = make_client(client_p);
add_client_to_list(source_p);
@ -816,6 +824,21 @@ client_from_server(struct Client *client_p, struct Client *source_p, int parc,
if(flag & FLAGS_OPER)
Count.oper++;
if(!(source_p->umodes & FLAGS_HIDDEN) && (flag & FLAGS_HIDDEN)) {
if (parv[7][0] != '*')
strncpy(source_p->vhost, parv[7], HOSTLEN +1);
else
make_virthost(source_p->host, source_p->vhost, 1);
}
/* we only allow Ulined Servers to set +s */
if ((flag & FLAGS_SERVICES) && (!IsUlined(find_server(parv[7])))) {
sendto_one(source_p, ":%s NOTICE %s :*** Only Ulined Services can set +S", me.name, source_p->name);
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ALL, "Warning, Non-Ulined Server %s tried to set %s as +S", source_p->from->name, source_p->name);
/* we don't allow them to get +S, so do a continue */
continue;
}
source_p->umodes |= flag & SEND_UMODES;
m++;
@ -901,9 +924,9 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
target_p->flags |= FLAGS_KILLED;
(void)exit_client(client_p, target_p, &me, "Nick collision");
if(parc == 9)
if(parc == 10)
nick_from_server(client_p,source_p,parc,parv,newts,nick);
else if(parc == 10)
else if(parc == 11)
client_from_server(client_p,source_p,parc,parv,newts,nick);
return 0;

6
src/client.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: client.c,v 1.9 2002/09/19 05:41:11 fishwaldo Exp $
* $Id: client.c,v 1.10 2002/09/24 11:50:16 fishwaldo Exp $
*/
#include "stdinc.h"
#include "config.h"
@ -1154,10 +1154,10 @@ void dead_link(struct Client *client_p)
if (!IsPerson(client_p) && !IsUnknown(client_p) && !IsClosing(client_p))
{
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ADMIN,
sendto_realops_flags(FLAGS_ALL, L_ADMIN,
"Closing link to %s: %s",
get_client_name(client_p, HIDE_IP), notice);
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_OPER,
sendto_realops_flags(FLAGS_ALL, L_OPER,
"Closing link to %s: %s",
get_client_name(client_p, MASK_IP), notice);
}

379
src/cloak.c
View file

@ -19,27 +19,24 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: cloak.c,v 1.2 2002/09/13 06:56:45 fishwaldo Exp $
* $Id: cloak.c,v 1.3 2002/09/24 11:50:16 fishwaldo Exp $
*/
/*
**
** Originally rewritten from AustNet's VirtualWorld Code.
** Virtual World written by Roger 'RogerY' Yerramsetti <rogery@austnet.org>
**
** Rewritten using the crc32 implementation by //ylo based on the original
** implementation by Gary S. Brown
**
** hiddenhost implementation based on the code from UnrealIRCd by
** RaYmAn, NiQuiL, narf, Griever (great thinking) eternal, bball, JK.@ roxnet.org
**
** Additional ideas and code by ShadowMaster, [-Th3Dud3-] (RageIRCd) and Solaris @ Demonkarma.net
**
*/
/************************************************************************
* Unreal Internet Relay Chat Daemon, src/cloak.c
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 1, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "stdinc.h"
@ -57,28 +54,20 @@
#include "s_conf.h"
#include "memory.h"
#undef KEY
#undef KEY2
#undef KEY3
/* Hidden host code below */
/* this is temp */
#define CLOAK_KEY1 2312321
#define CLOAK_KEY2 2313122
#define CLOAK_KEY3 5343123
#define hidden_host "neo"
#define KEY 94214
#define KEY2 83645
#define KEY3 29734
#define KEY CLOAK_KEY1
#define KEY2 CLOAK_KEY2
#define KEY3 CLOAK_KEY3
int str2arr (char **, char *, char *);
#define POW_8 256L
#define POW_16 65536L
#define POW_32 4294967296L
unsigned long crc32 (const unsigned char *s, unsigned int len);
/* The implementation here was originally done by Gary S. Brown. I have
borrowed the tables directly, and made some minor changes to the
crc32-function (including changing the interface). //ylo */
/* The implementation here was originally done by Gary S. Brown. I have
borrowed the tables directly, and made some minor changes to the
crc32-function (including changing the interface). //ylo */
/* ============================================================= */
/* COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or */
@ -121,196 +110,172 @@
/* -------------------------------------------------------------------- */
static unsigned long crc32_tab[] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
0x2d02ef8dL
};
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
0x2d02ef8dL
};
/* Return a 32-bit CRC of the contents of the buffer. */
unsigned long crc32(const unsigned char *s, unsigned int len)
unsigned long
crc32 (const unsigned char *s, unsigned int len)
{
unsigned int i;
unsigned long crc32val;
crc32val = 0;
for (i = 0; i < len; i ++)
for (i = 0; i < len; i++)
{
crc32val =
crc32_tab[(crc32val ^ s[i]) & 0xff] ^
(crc32val >> 8);
crc32val = crc32_tab[(crc32val ^ s[i]) & 0xff] ^ (crc32val >> 8);
}
return crc32val;
}
char *hidehost(char *host)
{
static char cloaked[512];
static char h1[512];
static char h2[4][4];
static char h3[300];
unsigned long l[8];
int i;
char *p;
/* Find out what kind of host we're dealing with here */
/* IPv6 ? */
if (strchr(host, ':'))
{
/* Do IPv6 cloaking here */
/* FIXME: what the hell to do with :FFFF:192.168.1.5?
*/
/*
* a:b:c:d:e:f:g:h
*
* crc(a.b.c.d)
* crc(a.b.c.d.e.f.g)
* crc(a.b.c.d.e.f.g.h)
*/
sscanf(host, "%lx:%lx:%lx:%lx:%lx:%lx:%lx:%lx",
&l[0], &l[1], &l[2], &l[3],
&l[4], &l[5], &l[6], &l[7]);
ircsprintf(h3, "%lx:%lx:%lx:%lx",
l[0], l[1], l[2], l[3]);
l[0] = crc32(h3, strlen(h3));
ircsprintf(h3, "%lx:%lx:%lx:%lx:%lx:%lx:%lx",
l[0], l[1], l[2], l[3],
l[4], l[5], l[6]);
l[1] = crc32(h3, strlen(h3));
l[2] = crc32(host, strlen(host));
for (i = 0; i <= 2; i++)
{
l[i] = ((l[i] + KEY2) ^ KEY) + KEY3;
l[i] <<= 2; l[i] >>= 2;
}
ircsprintf(cloaked, "%lx:%lx:%lx:IP",
l[2], l[1], l[0]);
return cloaked;
}
/* Is this a IPv4 IP? */
for (p = host; *p; p++)
{
if (!isdigit(*p) && !(*p == '.'))
{
break;
}
}
if (!(*p))
{
/* Do IPv4 cloaking here */
strcpy(h1, host);
i = 0;
for (i = 0, p = strtok(h1, "."); p && (i <= 3); p = strtok(NULL, "."), i++)
{
strncpy(h2[i], p, 4);
}
ircsprintf(h3, "%s.%s", h2[0], h2[1]);
l[0] = ((crc32(h3, strlen(h3)) + KEY) ^ KEY2) + KEY3;
ircsprintf(h3, "%s.%s.%s", h2[0], h2[1], h2[2]);
l[1] = ((KEY2 ^ crc32(h3, strlen(h3))) + KEY3) ^ KEY;
l[4] = crc32(host, strlen(host));
l[2] = ((l[4] + KEY3) ^ KEY) + KEY2;
l[2] <<= 2; l[2] >>= 2;
l[0] <<= 1; l[0] >>= 1;
ircsprintf(cloaked, "%lX.%lX.%lX.IP", l[2], l[1], l[0]);
return cloaked;
}
else
{
/* Normal host cloaking here
*
* Find first .<alpha>
*/
for (p = host; *p; p++)
{
if (*p == '.')
{
if (isalpha(*(p + 1)))
break;
}
}
l[0] = ((crc32(host, strlen(host)) ^ KEY2) + KEY) ^ KEY3;
l[0] <<= 2;
l[0] >>= 2;
p++;
if (*p)
sprintf(cloaked, "%s-%lX.%s", hidden_host,
l[0], p);
else
sprintf(cloaked, "%s-%lX", hidden_host, l[0]);
return cloaked;
}
/* Couldn't cloak, -WTF? */
return NULL;
int
str2arr (char **pparv, char *string, char *delim)
{
char *tok;
int pparc = 0;
tok = (char *) strtok (string, delim);
while (tok != NULL)
{
pparv[pparc++] = tok;
tok = (char *) strtok (NULL, delim);
}
return pparc;
}
/* Regular user host */
/* mode = 0, just use strncpyzt, 1 = Realloc new and return new pointer */
char *make_virthost(char *curr, char *new, int mode)
char
*make_virthost (char *curr, char *host, int mode)
{
char *mask;
char *x;
if (curr == NULL)
return (char *)NULL;
static char mask[HOSTLEN +1];
char *parv[HOSTLEN + 1], *parv2[HOSTLEN + 1], s[HOSTLEN + 1], s2[HOSTLEN + 2];
int parc = 0, parc2 = 0, len = 0;
unsigned long hash[8];
mask = hidehost(curr);
if (mode == 0)
/* Paranoia. curr & host are pointers */
strncpy (s, curr, HOSTLEN);
strncpy (s2, host, HOSTLEN);
parc = str2arr (parv, s, ".");
parc2 = str2arr (parv2, s2, ".");
/* crc32 and hashing using our 3 keys */
hash[0] = ((crc32 (parv[3], strlen (parv[3])) + KEY2) ^ KEY) ^ KEY3;
hash[1] = ((crc32 (parv[2], strlen (parv[2])) + KEY2) ^ KEY) ^ KEY3;
/* Why make life easy on crackers? Bitshifting */
hash[0] <<= 2;
hash[0] >>= 2;
hash[1] <<= 2;
hash[1] >>= 2;
/* Check if host could be IPv4 */
if (parc == 4)
{
len = strlen (parv[3]);
/* Check if its an IPv4 for sure */
if (strchr ("0123456789", parv[3][len - 1]))
{
strncpy(new, mask, HOSTLEN); /* */
return NULL;
hash[2] = ((crc32 (parv[1], strlen (parv[1])) + KEY2) ^ KEY) ^ KEY3;
hash[3] = ((crc32 (parv[0], strlen (parv[0])) + KEY2) ^ KEY) ^ KEY3;
hash[2] <<= 2;
hash[2] >>= 2;
hash[3] <<= 2;
hash[3] >>= 2;
ircsprintf (mask, "%lX.%lX.%lX.%lXX",
hash[0], hash[1], hash[2], hash[3]);
}
if (new)
MyFree(new);
DupString(x,mask);
return x;
else
{
ircsprintf (mask, "%lX.%lX.%s.%s.%s",
hash[0], hash[1], parv[parc - 3], parv[parc - 2],
parv[parc - 1]);
}
}
else
{
if (parc >= 4) /* There are isp's like *.isp.co.uk etc out there */
{
ircsprintf (mask, "%lX.%lX.%s.%s.%s",
hash[0], hash[1], parv[parc - 3], parv[parc - 2],
parv[parc - 1]);
}
else
{
ircsprintf (mask, "%lX.%lX.%s.%s",
hash[0], hash[1], parv[parc - 2], parv[parc - 1]);
}
}
if (mode == 0)
{
strncpy(host, mask, HOSTLEN); /* */
}
return host;
}

17
src/s_serv.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: s_serv.c,v 1.12 2002/09/23 03:14:21 fishwaldo Exp $
* $Id: s_serv.c,v 1.13 2002/09/24 11:50:16 fishwaldo Exp $
*/
#include "stdinc.h"
@ -154,7 +154,7 @@ void slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
assert(len < 256);
data[len-1] = '\0';
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ALL, "SlinkError for %s: %s",
sendto_realops_flags(FLAGS_ALL, L_ALL, "SlinkError for %s: %s",
server_p->name, data);
exit_client(server_p, server_p, &me, "servlink error -- terminating link");
}
@ -828,23 +828,24 @@ void sendnick_TS(struct Client *client_p, struct Client *target_p)
}
if (HasID(target_p) && IsCapable(client_p, CAP_UID))
sendto_one(client_p, "CLIENT %s %d %lu %s %s %s %s %s %lu :%s",
sendto_one(client_p, "CLIENT %s %d %lu %s %s %s %s %s %s %lu :%s",
target_p->name,
target_p->hopcount + 1,
(unsigned long) target_p->tsinfo,
ubuf,
target_p->username, target_p->host,
IsHidden(target_p) ? target_p->vhost : "*",
target_p->user->server, target_p->user->id, target_p->svsid, target_p->info);
else
sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s %lu :%s",
target_p->name,
target_p->hopcount + 1,
(unsigned long) target_p->tsinfo,
ubuf,
target_p->username, target_p->host,
IsHidden(target_p) ? target_p->vhost : "*",
target_p->user->server, target_p->svsid, target_p->info);
if (IsHidden(target_p)) sendto_one(client_p, ":%s SETHOST %s :%s", me.name, target_p->name, target_p->vhost);
}
@ -952,7 +953,7 @@ int server_estab(struct Client *client_p)
CONF_SERVER)))
{
/* This shouldn't happen, better tell the ops... -A1kmm */
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ALL, "Warning: Lost connect{} block "
sendto_realops_flags(FLAGS_ALL, L_ALL, "Warning: Lost connect{} block "
"for server %s(this shouldn't happen)!", host);
return exit_client(client_p, client_p, client_p, "Lost connect{} block!");
}
@ -1023,11 +1024,11 @@ int server_estab(struct Client *client_p)
{
if (fork_server(client_p) < 0 )
{
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_ADMIN,
sendto_realops_flags(FLAGS_ALL, L_ADMIN,
"Warning: fork failed for server %s -- check servlink_path (%s)",
get_client_name(client_p, HIDE_IP),
ConfigFileEntry.servlink_path);
sendto_realops_flags(FLAGS_ALL|FLAGS_REMOTE, L_OPER, "Warning: fork failed for server "
sendto_realops_flags(FLAGS_ALL, L_OPER, "Warning: fork failed for server "
"%s -- check servlink_path (%s)",
get_client_name(client_p, MASK_IP),
ConfigFileEntry.servlink_path);

33
src/s_user.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: s_user.c,v 1.18 2002/09/23 10:47:30 fishwaldo Exp $
* $Id: s_user.c,v 1.19 2002/09/24 11:50:16 fishwaldo Exp $
*/
#include "stdinc.h"
@ -503,7 +503,6 @@ register_local_user(struct Client *client_p, struct Client *source_p,
}
user_welcome(source_p);
introduce_client(client_p, source_p, user, nick);
if (IsHidden(source_p)) sendto_server(NULL, source_p, NULL, 0, 0, LL_ICLIENT, ":%s SETHOST %s :%s", me.name, source_p->name, source_p->vhost);
return (0);
}
@ -642,23 +641,25 @@ introduce_client(struct Client *client_p, struct Client *source_p,
{
if (IsCapable(uplink, CAP_UID) && HasID(source_p))
{
sendto_one(uplink, "CLIENT %s %d %lu %s %s %s %s %s %lu :%s",
sendto_one(uplink, "CLIENT %s %d %lu %s %s %s %s %s %s %lu :%s",
nick,
source_p->hopcount+1,
(unsigned long) source_p->tsinfo,
ubuf,
source_p->username, source_p->host, user->server,
user->id, source_p->svsid, source_p->info);
source_p->username, source_p->host,
IsHidden(source_p) ? source_p->vhost : "*",
user->server, user->id, source_p->svsid, source_p->info);
}
else
{
sendto_one(uplink, "NICK %s %d %lu %s %s %s %s %lu :%s",
sendto_one(uplink, "NICK %s %d %lu %s %s %s %s %s %lu :%s",
nick,
source_p->hopcount+1,
(unsigned long) source_p->tsinfo,
ubuf,
source_p->username, source_p->host, user->server,
source_p->svsid, source_p->info);
source_p->username, source_p->host,
IsHidden(source_p) ? source_p->vhost : "*",
user->server, source_p->svsid, source_p->info);
}
}
else
@ -671,21 +672,23 @@ introduce_client(struct Client *client_p, struct Client *source_p,
continue;
if (IsCapable(server, CAP_UID) && HasID(source_p))
sendto_one(server, "CLIENT %s %d %lu %s %s %s %s %s %lu :%s",
sendto_one(server, "CLIENT %s %d %lu %s %s %s %s %s %s %lu :%s",
nick,
source_p->hopcount+1,
(unsigned long) source_p->tsinfo,
ubuf,
source_p->username, source_p->host, user->server,
user->id, source_p->svsid, source_p->info);
source_p->username, source_p->host,
IsHidden(source_p) ? source_p->vhost : "*",
user->server, user->id, source_p->svsid, source_p->info);
else
sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
sendto_one(server, "NICK %s %d %lu %s %s %s %s %s %lu :%s",
nick,
source_p->hopcount+1,
(unsigned long) source_p->tsinfo,
ubuf,
source_p->username, source_p->host, user->server,
source_p->svsid, source_p->info);
source_p->username, source_p->host,
IsHidden(source_p) ? source_p->vhost : "*",
user->server, source_p->svsid, source_p->info);
}
}
@ -1046,6 +1049,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, char *parv
break;
}
make_virthost(target_p->host, target_p->vhost, 0);
sendto_server(NULL, target_p, NULL, NOCAPS, NOCAPS, LL_ICLIENT, ":%s SETHOST %s :%s", me.name, target_p->name, target_p->vhost);
} else {
ClearHidden(target_p);
if (!MyClient(target_p)) {
@ -1053,7 +1057,6 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, char *parv
}
strncpy(target_p->vhost, target_p->host, HOSTLEN);
}
sendto_server(NULL, target_p, NULL, NOCAPS, NOCAPS, LL_ICLIENT, ":%s SETHOST %s :%s", me.name, target_p->name, target_p->vhost);
break;
/* we may not get these,