ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/user.c

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3313 by michael, Tue Apr 15 12:32:01 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5563 by michael, Sat Feb 14 20:07:46 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
30	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
#	Line 39 | Line 38
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
#	Line 67 | Line 65 | struct Isupport
65		static dlink_list support_list;
66		static dlink_list support_list_lines;
67
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	const unsigned int user_modes[256] =
68	>	const struct user_modes *umode_map[256];
69	>	const struct user_modes  umode_tab[] =
70		{
71	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	0,                  /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	UMODE_FARCONNECT,   /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	UMODE_HIDDEN,       /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
88	<	0,                  /* M */
89	<	0,                  /* N */
90	<	0,                  /* O */
91	<	0,                  /* P */
92	<	0,                  /* Q */
93	<	UMODE_REGONLY,      /* R */
94	<	UMODE_SSL,          /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	UMODE_WEBIRC,       /* W */
99	<	0,                  /* X */
102	<	0,                  /* Y */
103	<	0,                  /* Z 0x5A */
104	<	0, 0, 0, 0, 0,      /* 0x5F   */
105	<	0,                  /* 0x60   */
106	<	UMODE_ADMIN,        /* a */
107	<	UMODE_BOTS,         /* b */
108	<	UMODE_CCONN,        /* c */
109	<	UMODE_DEBUG,        /* d */
110	<	UMODE_EXTERNAL,     /* e */
111	<	UMODE_FULL,         /* f */
112	<	UMODE_CALLERID,     /* g */
113	<	0,                  /* h */
114	<	UMODE_INVISIBLE,    /* i */
115	<	UMODE_REJ,          /* j */
116	<	UMODE_SKILL,        /* k */
117	<	UMODE_LOCOPS,       /* l */
118	<	0,                  /* m */
119	<	UMODE_NCHANGE,      /* n */
120	<	UMODE_OPER,         /* o */
121	<	0,                  /* p */
122	<	0,                  /* q */
123	<	UMODE_REGISTERED,   /* r */
124	<	UMODE_SERVNOTICE,   /* s */
125	<	0,                  /* t */
126	<	UMODE_UNAUTH,       /* u */
127	<	0,                  /* v */
128	<	UMODE_WALLOP,       /* w */
129	<	UMODE_HIDDENHOST,   /* x */
130	<	UMODE_SPY,          /* y */
131	<	UMODE_OPERWALL,     /* z      0x7A */
132	<	0,0,0,0,0,          /* 0x7B - 0x7F */
133	<
134	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
135	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
136	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
137	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
138	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
139	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
140	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
141	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71	>	{ 'D', UMODE_DEAF         },
72	>	{ 'F', UMODE_FARCONNECT   },
73	>	{ 'G', UMODE_SOFTCALLERID },
74	>	{ 'H', UMODE_HIDDEN       },
75	>	{ 'R', UMODE_REGONLY      },
76	>	{ 'S', UMODE_SSL          },
77	>	{ 'W', UMODE_WEBIRC       },
78	>	{ 'a', UMODE_ADMIN        },
79	>	{ 'b', UMODE_BOTS         },
80	>	{ 'c', UMODE_CCONN        },
81	>	{ 'd', UMODE_DEBUG        },
82	>	{ 'e', UMODE_EXTERNAL     },
83	>	{ 'f', UMODE_FULL         },
84	>	{ 'g', UMODE_CALLERID     },
85	>	{ 'i', UMODE_INVISIBLE    },
86	>	{ 'j', UMODE_REJ          },
87	>	{ 'k', UMODE_SKILL        },
88	>	{ 'l', UMODE_LOCOPS       },
89	>	{ 'n', UMODE_NCHANGE      },
90	>	{ 'o', UMODE_OPER         },
91	>	{ 'p', UMODE_HIDECHANS    },
92	>	{ 'q', UMODE_HIDEIDLE     },
93	>	{ 'r', UMODE_REGISTERED   },
94	>	{ 's', UMODE_SERVNOTICE   },
95	>	{ 'u', UMODE_UNAUTH       },
96	>	{ 'w', UMODE_WALLOP       },
97	>	{ 'x', UMODE_HIDDENHOST   },
98	>	{ 'y', UMODE_SPY          },
99	>	{ '\0', 0 }
100		};
101
102		void
103	<	assemble_umode_buffer(void)
103	>	user_usermodes_init(void)
104		{
147	–	unsigned int idx = 0;
105		char *umode_buffer_ptr = umode_buffer;
106
107	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108	<	if (user_modes[idx])
109	<	*umode_buffer_ptr++ = idx;
107	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108	>	{
109	>	umode_map[tab->c] = tab;
110	>	*umode_buffer_ptr++ = tab->c;
111	>	}
112
113		*umode_buffer_ptr = '\0';
114		}
#	Line 164 | Line 123 | void
123		show_lusers(struct Client *source_p)
124		{
125		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
127	<	Count.invisi, dlink_list_length(&global_serv_list));
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
127	>	Count.invisi, dlink_list_length(&global_server_list));
128		else
129	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
130	<	(Count.total-Count.invisi), Count.invisi, 1);
129	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
130	>	Count.invisi, 1);
131
132	<	if (Count.oper > 0)
132	>	if (Count.oper)
133		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
134
135	<	if (dlink_list_length(&unknown_list) > 0)
135	>	if (dlink_list_length(&unknown_list))
136		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
137
138	<	if (dlink_list_length(&global_channel_list) > 0)
139	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
138	>	if (dlink_list_length(&channel_list))
139	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
140
141		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142		{
#	Line 212 | Line 171 | show_lusers(struct Client *source_p)
171		void
172		show_isupport(struct Client *source_p)
173		{
174	<	const dlink_node *ptr = NULL;
174	>	const dlink_node *node = NULL;
175
176	<	DLINK_FOREACH(ptr, support_list_lines.head)
177	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
176	>	DLINK_FOREACH(node, support_list_lines.head)
177	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178		}
179
180
#	Line 234 | Line 193 | report_and_set_user_flags(struct Client
193		if (IsConfDoSpoofIp(conf))
194		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
195
196	<	/* If this user is in the exception class, Set it "E lined" */
196	>	/* If this user is in the exception class, set it "E lined" */
197		if (IsConfExemptKline(conf))
198		{
199		SetExemptKline(source_p);
#	Line 283 | Line 242 | report_and_set_user_flags(struct Client
242		static void
243		introduce_client(struct Client *source_p)
244		{
245	<	dlink_node *ptr = NULL;
245	>	dlink_node *node = NULL;
246		char ubuf[IRCD_BUFSIZE] = "";
247
248		if (MyClient(source_p))
249	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
249	>	send_umode(source_p, source_p, 0, ubuf);
250		else
251	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
251	>	send_umode(NULL, source_p, 0, ubuf);
252
253		watch_check_hash(source_p, RPL_LOGON);
254
#	Line 299 | Line 258 | introduce_client(struct Client *source_p
258		ubuf[1] = '\0';
259		}
260
261	<	DLINK_FOREACH(ptr, serv_list.head)
261	>	DLINK_FOREACH(node, local_server_list.head)
262		{
263	<	struct Client *server = ptr->data;
263	>	struct Client *server = node->data;
264
265		if (server == source_p->from)
266		continue;
#	Line 312 | Line 271 | introduce_client(struct Client *source_p
271		source_p->name, source_p->hopcount+1,
272		(unsigned long)source_p->tsinfo,
273		ubuf, source_p->username, source_p->host,
274	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
275	<	"0" : source_p->sockhost, source_p->id,
317	<	source_p->svid,
274	>	source_p->sockhost, source_p->id,
275	>	source_p->account,
276		source_p->info);
277		else
278		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
#	Line 322 | Line 280 | introduce_client(struct Client *source_p
280		source_p->name, source_p->hopcount+1,
281		(unsigned long)source_p->tsinfo,
282		ubuf, source_p->username, source_p->host,
283	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
326	<	"0" : source_p->sockhost, source_p->id, source_p->info);
283	>	source_p->sockhost, source_p->id, source_p->info);
284
285		if (!EmptyString(source_p->certfp))
286		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 350 | Line 307 | user_welcome(struct Client *source_p)
307		{
308		AddUMode(source_p, UMODE_SSL);
309		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
310	<	ssl_get_cipher(source_p->localClient->fd.ssl));
310	>	ssl_get_cipher(source_p->connection->fd.ssl));
311		}
312		#endif
313
314	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
314	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
315		source_p->name);
316		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
317	<	get_listener_name(source_p->localClient->listener), ircd_version);
317	>	get_listener_name(source_p->connection->listener), ircd_version);
318		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
319		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
320		show_isupport(source_p);
321	<
365	<	if (source_p->id[0])
366	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
321	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
322
323		show_lusers(source_p);
324		motd_signon(source_p);
#	Line 379 | Line 334 | static int
334		check_xline(struct Client *source_p)
335		{
336		struct MaskItem *conf = NULL;
382	–	const char *reason = NULL;
337
338		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339		{
340		++conf->count;
387	–
388	–	if (conf->reason)
389	–	reason = conf->reason;
390	–	else
391	–	reason = CONF_NOREASON;
392	–
341		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
342		"X-line Rejecting [%s] [%s], user %s [%s]",
343	<	source_p->info, reason,
343	>	source_p->info, conf->reason,
344		get_client_name(source_p, HIDE_IP),
345		source_p->sockhost);
346
#	Line 404 | Line 352 | check_xline(struct Client *source_p)
352		return 0;
353		}
354
355	<	/*
356	<	** register_local_user
357	<	**      This function is called when both NICK and USER messages
358	<	**      have been accepted for the client, in whatever order. Only
359	<	**      after this, is the USER message propagated.
412	<	**
413	<	**      NICK's must be propagated at once when received, although
414	<	**      it would be better to delay them too until full info is
415	<	**      available. Doing it is not so simple though, would have
416	<	**      to implement the following:
417	<	**
418	<	**      (actually it has been implemented already for a while) -orabidoo
419	<	**
420	<	**      1) user telnets in and gives only "NICK foobar" and waits
421	<	**      2) another user far away logs in normally with the nick
422	<	**         "foobar" (quite legal, as this server didn't propagate
423	<	**         it).
424	<	**      3) now this server gets nick "foobar" from outside, but
425	<	**         has alread the same defined locally. Current server
426	<	**         would just issue "KILL foobar" to clean out dups. But,
427	<	**         this is not fair. It should actually request another
428	<	**         nick from local user or kill him/her...
429	<	*/
355	>	/*! \brief This function is called when both NICK and USER messages
356	>	*      have been accepted for the client, in whatever order. Only
357	>	*      after this, is the UID message propagated.
358	>	* \param source_p Pointer to given client to introduce
359	>	*/
360		void
361		register_local_user(struct Client *source_p)
362		{
#	Line 435 | Line 365 | register_local_user(struct Client *sourc
365
366		assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	<	assert(!source_p->localClient->registration);
439	<
440	<	ClearCap(source_p, CAP_TS6);
368	>	assert(!source_p->connection->registration);
369
370	<	if (ConfigFileEntry.ping_cookie)
370	>	if (ConfigGeneral.ping_cookie)
371		{
372	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
372	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
373		{
374		do
375	<	source_p->localClient->random_ping = genrand_int32();
376	<	while (!source_p->localClient->random_ping);
375	>	source_p->connection->random_ping = genrand_int32();
376	>	while (!source_p->connection->random_ping);
377
378	<	sendto_one(source_p, "PING :%u",
451	<	source_p->localClient->random_ping);
378	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
379		SetPingSent(source_p);
380		return;
381		}
#	Line 457 | Line 384 | register_local_user(struct Client *sourc
384		return;
385		}
386
387	<	source_p->localClient->last_privmsg = CurrentTime;
387	>	source_p->connection->last_privmsg = CurrentTime;
388		/* Straight up the maximum rate of flooding... */
389	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
389	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
390
391		if (!check_client(source_p))
392		return;
#	Line 468 | Line 395 | register_local_user(struct Client *sourc
395		{
396		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
397		"character in your hostname");
398	<	strlcpy(source_p->host, source_p->sockhost,
472	<	sizeof(source_p->host));
398	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
399		}
400
401	<	conf = source_p->localClient->confs.head->data;
401	>	conf = source_p->connection->confs.head->data;
402
403		if (!IsGotId(source_p))
404		{
#	Line 495 | Line 421 | register_local_user(struct Client *sourc
421		source_p->username[i++] = '~';
422
423		for (; *p && i < USERLEN; ++p)
424	<	if (*p != '[')
499	<	source_p->username[i++] = *p;
424	>	source_p->username[i++] = *p;
425
426		source_p->username[i] = '\0';
427		}
428
429	<	/* password check */
429	>	/* Password check */
430		if (!EmptyString(conf->passwd))
431		{
432	<	const char *pass = source_p->localClient->passwd;
508	<
509	<	if (!match_conf_password(pass, conf))
432	>	if (!match_conf_password(source_p->connection->password, conf))
433		{
434		++ServerStats.is_ref;
435
#	Line 516 | Line 439 | register_local_user(struct Client *sourc
439		}
440		}
441
442	<	/* don't free source_p->localClient->passwd here - it can be required
443	<	* by masked /stats I if there are auth{} blocks with need_password = no;
442	>	/*
443	>	* Don't free source_p->connection->password here - it can be required
444	>	* by masked /stats I if there are auth {} blocks with need_password = no;
445		* --adx
446		*/
447
448	<	/* report if user has &^>= etc. and set flags as needed in source_p */
448	>	/*
449	>	* Report if user has &^>= etc. and set flags as needed in source_p
450	>	*/
451		report_and_set_user_flags(source_p, conf);
452
453		if (IsDead(source_p))
454		return;
455
456	<	/* Limit clients -
456	>	/*
457	>	* Limit clients -
458		* We want to be able to have servers and F-line clients
459		* connect, so save room for "buffer" connections.
460		* Smaller servers may want to decrease this, and it should
461		* probably be just a percentage of the MAXCLIENTS...
462		*   -Taner
463		*/
464	<	/* Except "F:" clients */
465	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
539	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
464	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
465	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
466		{
467		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
468		"Too many clients, rejecting %s[%s].",
#	Line 546 | Line 472 | register_local_user(struct Client *sourc
472		return;
473		}
474
549	–	/* valid user name check */
475		if (!valid_username(source_p->username, 1))
476		{
477	<	char tmpstr2[IRCD_BUFSIZE] = "";
477	>	char buf[IRCD_BUFSIZE] = "";
478
479		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
480		"Invalid username: %s (%s@%s)",
481		source_p->name, source_p->username, source_p->host);
482		++ServerStats.is_ref;
483	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
484	<	source_p->username);
560	<	exit_client(source_p, tmpstr2);
483	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
484	>	exit_client(source_p, buf);
485		return;
486		}
487
#	Line 573 | Line 497 | register_local_user(struct Client *sourc
497		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
498		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
499		source_p->name, source_p->username, source_p->host,
500	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
501	<	"255.255.255.255" : source_p->sockhost,
578	<	get_client_class(&source_p->localClient->confs),
500	>	source_p->sockhost,
501	>	get_client_class(&source_p->connection->confs),
502		source_p->info, source_p->id);
503
504	<	if (ConfigFileEntry.invisible_on_connect)
504	>	if (ConfigGeneral.invisible_on_connect)
505		{
506		AddUMode(source_p, UMODE_INVISIBLE);
507		++Count.invisi;
#	Line 590 | Line 513 | register_local_user(struct Client *sourc
513
514		if (!(Count.max_loc % 10))
515		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516	<	"New Max Local Clients: %d",
516	>	"New maximum local client connections: %u",
517		Count.max_loc);
518		}
519
597	–	/* Increment our total user count here */
520		if (++Count.total > Count.max_tot)
521		Count.max_tot = Count.total;
522		++Count.totalrestartcount;
#	Line 602 | Line 524 | register_local_user(struct Client *sourc
524		assert(source_p->servptr == &me);
525		SetClient(source_p);
526		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
527	<
606	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
527	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
528
529		assert(dlinkFind(&unknown_list, source_p));
530
531	<	dlink_move_node(&source_p->localClient->lclient_node,
531	>	dlink_move_node(&source_p->connection->lclient_node,
532		&unknown_list, &local_client_list);
533
534		user_welcome(source_p);
#	Line 628 | Line 549 | register_local_user(struct Client *sourc
549		*                is introduced by a server.
550		*/
551		void
552	<	register_remote_user(struct Client *source_p, const char *username,
632	<	const char *host, const char *server)
552	>	register_remote_user(struct Client *source_p)
553		{
554	<	struct Client *target_p = NULL;
635	<
636	<	assert(source_p->username != username);
637	<
638	<	strlcpy(source_p->host, host, sizeof(source_p->host));
639	<	strlcpy(source_p->username, username, sizeof(source_p->username));
640	<
641	<	/*
642	<	* coming from another server, take the servers word for it
643	<	*/
644	<	source_p->servptr = hash_find_server(server);
645	<
646	<	/*
647	<	* Super GhostDetect:
648	<	* If we can't find the server the user is supposed to be on,
649	<	* then simply blow the user away.        -Taner
650	<	*/
651	<	if (source_p->servptr == NULL)
652	<	{
653	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
654	<	"No server %s for user %s[%s@%s] from %s",
655	<	server, source_p->name, source_p->username,
656	<	source_p->host, source_p->from->name);
657	<	sendto_one(source_p->from,
658	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
659	<	me.id, source_p->id, me.name, server);
660	<
661	<	AddFlag(source_p, FLAGS_KILLED);
662	<	exit_client(source_p, "Ghosted Client");
663	<	return;
664	<	}
554	>	const struct Client *target_p = NULL;
555
556		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
557		{
#	Line 671 | Line 561 | register_remote_user(struct Client *sour
561		source_p->host, source_p->servptr->name,
562		target_p->name, target_p->from->name);
563		sendto_one(source_p->from,
564	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
564	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
565		me.id, source_p->id, me.name, source_p->servptr->name,
566		target_p->from->name);
567
568		AddFlag(source_p, FLAGS_KILLED);
569	<	exit_client(source_p, "USER server wrong direction");
569	>	exit_client(source_p, "UID server wrong direction");
570		return;
571		}
572
#	Line 687 | Line 577 | register_remote_user(struct Client *sour
577		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
578		AddFlag(source_p, FLAGS_SERVICE);
579
690	–	/* Increment our total user count here */
580		if (++Count.total > Count.max_tot)
581		Count.max_tot = Count.total;
582
583		SetClient(source_p);
584		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
585	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
586		add_user_host(source_p->username, source_p->host, 1);
587		SetUserHost(source_p);
588
589		if (HasFlag(source_p->servptr, FLAGS_EOB))
590	<	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
591	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
592	<	source_p->servptr->name,
593	<	source_p->name, source_p->username, source_p->host,
594	<	source_p->info, source_p->id);
590	>	{
591	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
592	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
593	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
594	>	source_p->servptr->name,
595	>	source_p->name, source_p->username, source_p->host,
596	>	source_p->sockhost, source_p->info, source_p->id);
597	>	else
598	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
599	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
600	>	source_p->servptr->name,
601	>	source_p->name, source_p->username, source_p->host,
602	>	source_p->info, source_p->id);
603	>	}
604
605		introduce_client(source_p);
606		}
#	Line 746 | Line 645 | valid_hostname(const char *hostname)
645		int
646		valid_username(const char *username, const int local)
647		{
648	<	int dots      = 0;
648	>	unsigned int dots = 0;
649		const char *p = username;
650
651		assert(p);
#	Line 766 | Line 665 | valid_username(const char *username, con
665		{
666		while (*++p)
667		{
668	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
668	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
669		{
670	<	if (++dots > ConfigFileEntry.dots_in_ident)
670	>	if (++dots > ConfigGeneral.dots_in_ident)
671		return 0;
672		if (!IsUserChar(*(p + 1)))
673		return 0;
#	Line 784 | Line 683 | valid_username(const char *username, con
683		return 0;
684		}
685
686	<	return  p - username <= USERLEN;;
686	>	return p - username <= USERLEN;
687		}
688
689		/* clean_nick_name()
#	Line 798 | Line 697 | int
697		valid_nickname(const char *nickname, const int local)
698		{
699		const char *p = nickname;
801	–	assert(nickname && *nickname);
700
701		assert(p);
702
703	<	/* nicks can't start with a digit or - or be 0 length */
704	<	/* This closer duplicates behaviour of hybrid-6 */
705	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
703	>	/*
704	>	* Nicks can't start with a digit or - or be 0 length.
705	>	*/
706	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
707		return 0;
708
709		for (; *p; ++p)
#	Line 827 | Line 726 | valid_nickname(const char *nickname, con
726		*/
727		void
728		send_umode(struct Client *client_p, struct Client *source_p,
729	<	unsigned int old, unsigned int sendmask, char *umode_buf)
729	>	unsigned int old, char *umode_buf)
730		{
731		char *m = umode_buf;
732		int what = 0;
834	–	unsigned int i;
835	–	unsigned int flag;
733
734		/*
735	<	* build a string in umode_buf to represent the change in the user's
735	>	* Build a string in umode_buf to represent the change in the user's
736		* mode between the new (source_p->umodes) and 'old'.
737		*/
738	<	for (i = 0; i < 128; ++i)
738	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
739		{
740	<	flag = user_modes[i];
844	<	if (!flag)
845	<	continue;
846	<
847	<	if (MyClient(source_p) && !(flag & sendmask))
848	<	continue;
849	<
850	<	if ((flag & old) && !HasUMode(source_p, flag))
740	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
741		{
742		if (what == MODE_DEL)
743	<	*m++ = (char)i;
743	>	*m++ = tab->c;
744		else
745		{
746		what = MODE_DEL;
747		*m++ = '-';
748	<	*m++ = (char)i;
748	>	*m++ = tab->c;
749		}
750		}
751	<	else if (!(flag & old) && HasUMode(source_p, flag))
751	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
752		{
753		if (what == MODE_ADD)
754	<	*m++ = (char)i;
754	>	*m++ = tab->c;
755		else
756		{
757		what = MODE_ADD;
758		*m++ = '+';
759	<	*m++ = (char)i;
759	>	*m++ = tab->c;
760		}
761		}
762		}
#	Line 875 | Line 765 | send_umode(struct Client *client_p, stru
765
766		if (*umode_buf && client_p)
767		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
768	<	source_p->name, source_p->username,
769	<	source_p->host, source_p->name, umode_buf);
768	>	client_p->name, client_p->username,
769	>	client_p->host, client_p->name, umode_buf);
770		}
771
772		/* send_umode_out()
#	Line 886 | Line 776 | send_umode(struct Client *client_p, stru
776		* side effects - Only send ubuf out to servers that know about this client
777		*/
778		void
779	<	send_umode_out(struct Client *client_p, struct Client *source_p,
890	<	unsigned int old)
779	>	send_umode_out(struct Client *source_p, unsigned int old)
780		{
781		char buf[IRCD_BUFSIZE] = "";
782
783	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
783	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
784
785		if (buf[0])
786	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
786	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
787		source_p->id, source_p->id, buf);
899	–
900	–	if (client_p && MyClient(client_p))
901	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
788		}
789
790		void
791		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
792		{
793	<	dlink_node *ptr = NULL;
793	>	dlink_node *node = NULL;
794
795		if (!strcmp(target_p->host, hostname))
796		return;
#	Line 913 | Line 799 | user_set_hostmask(struct Client *target_
799		{
800		case MODE_ADD:
801		AddUMode(target_p, UMODE_HIDDENHOST);
916	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
802		break;
803		case MODE_DEL:
804		DelUMode(target_p, UMODE_HIDDENHOST);
920	–
921	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
922	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
805		break;
806		default: return;
807		}
808
809	<	if (ConfigFileEntry.cycle_on_host_change)
809	>	if (ConfigGeneral.cycle_on_host_change)
810		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
811		target_p->name, target_p->username, target_p->host);
812
#	Line 938 | Line 820 | user_set_hostmask(struct Client *target_
820
821		if (MyClient(target_p))
822		{
823	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
823	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
824		clear_ban_cache_client(target_p);
825		}
826
827	<	if (!ConfigFileEntry.cycle_on_host_change)
827	>	if (!ConfigGeneral.cycle_on_host_change)
828		return;
829
830	<	DLINK_FOREACH(ptr, target_p->channel.head)
830	>	DLINK_FOREACH(node, target_p->channel.head)
831		{
832		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
833		char *p = modebuf;
834		int len = 0;
835	<	const struct Membership *ms = ptr->data;
835	>	const struct Membership *member = node->data;
836
837	<	if (has_member_flags(ms, CHFL_CHANOP))
837	>	if (has_member_flags(member, CHFL_CHANOP))
838		{
839		*p++ = 'o';
840		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
841		}
842
843	<	if (has_member_flags(ms, CHFL_HALFOP))
843	>	if (has_member_flags(member, CHFL_HALFOP))
844		{
845		*p++ = 'h';
846		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
847		}
848
849	<	if (has_member_flags(ms, CHFL_VOICE))
849	>	if (has_member_flags(member, CHFL_VOICE))
850		{
851		*p++ = 'v';
852		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 972 | Line 854 | user_set_hostmask(struct Client *target_
854
855		*p = '\0';
856
857	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
858	<	target_p->name, target_p->username, target_p->host,
859	<	ms->chptr->chname);
857	>
858	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
859	>	target_p->name, target_p->username,
860	>	target_p->host, member->chptr->name,
861	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
862	>	target_p->info);
863	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
864	>	target_p->name, target_p->username,
865	>	target_p->host, member->chptr->name);
866	>
867		if (nickbuf[0])
868	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
869	<	target_p->servptr->name, ms->chptr->chname,
868	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
869	>	target_p->servptr->name, member->chptr->name,
870		modebuf, nickbuf);
871
872		}
#	Line 989 | Line 878 | user_set_hostmask(struct Client *target_
878		target_p->host, target_p->away);
879		}
880
881	<	/* oper_up()
882	<	*
883	<	* inputs       - pointer to given client to oper
995	<	* output       - NONE
996	<	* side effects - Blindly opers up given source_p, using conf info
997	<	*                all checks on passwords have already been done.
998	<	*                This could also be used by rsa oper routines.
881	>	/*! \brief Blindly opers up given source_p, using conf info.
882	>	*         All checks on passwords have already been done.
883	>	* \param source_p Pointer to given client to oper
884		*/
885		void
886		oper_up(struct Client *source_p)
887		{
888		const unsigned int old = source_p->umodes;
889	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
889	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
890
891	<	assert(source_p->localClient->confs.head);
891	>	assert(source_p->connection->confs.head);
892
893		++Count.oper;
894		SetOper(source_p);
895
896		if (conf->modes)
897		AddUMode(source_p, conf->modes);
898	<	else if (ConfigFileEntry.oper_umodes)
899	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
898	>	else if (ConfigGeneral.oper_umodes)
899	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
900
901		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
902		++Count.invisi;
#	Line 1026 | Line 911 | oper_up(struct Client *source_p)
911		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
912		AddUMode(source_p, UMODE_ADMIN);
913
914	+	if (!EmptyString(conf->whois))
915	+	{
916	+	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
917	+	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
918	+	me.id, source_p->id, (unsigned long)source_p->tsinfo,
919	+	RPL_WHOISOPERATOR, conf->whois);
920	+	}
921	+
922		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
923		get_oper_name(source_p));
924	<	send_umode_out(source_p, source_p, old);
924	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
925	>	me.id, get_oper_name(source_p));
926	>	send_umode_out(source_p, old);
927		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
928		}
929
930	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
930	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
931
932		int
933		valid_sid(const char *sid)
#	Line 1059 | Line 954 | init_uid(void)
954		{
955		memset(new_uid, 0, sizeof(new_uid));
956
957	<	if (!EmptyString(ServerInfo.sid))
958	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
957	>	if (!EmptyString(ConfigServerInfo.sid))
958	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
959
960		for (unsigned int i = 0; i < IRC_MAXSID; ++i)
961		if (new_uid[i] == '\0')
#	Line 1079 | Line 974 | init_uid(void)
974		*                note this is a recursive function
975		*/
976		static void
977	<	add_one_to_uid(int i)
977	>	add_one_to_uid(unsigned int i)
978		{
979	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
979	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
980		{
981		if (new_uid[i] == 'Z')
982		new_uid[i] = '0';
983		else if (new_uid[i] == '9')
984		{
985		new_uid[i] = 'A';
986	<	add_one_to_uid(i-1);
986	>	add_one_to_uid(i - 1);
987		}
988		else
989		++new_uid[i];
#	Line 1113 | Line 1008 | add_one_to_uid(int i)
1008		static const char *
1009		uid_get(void)
1010		{
1011	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1011	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1012		return new_uid;
1013		}
1014
#	Line 1128 | Line 1023 | void
1023		init_isupport(void)
1024		{
1025		add_isupport("CALLERID", NULL, -1);
1026	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1026	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1027		add_isupport("DEAF", "D", -1);
1028		add_isupport("KICKLEN", NULL, KICKLEN);
1029		add_isupport("MODES", NULL, MAXMODEPARAMS);
1135	–	#ifdef HALFOPS
1030		add_isupport("PREFIX", "(ohv)@%+", -1);
1031		add_isupport("STATUSMSG", "@%+", -1);
1032	<	#else
1033	<	add_isupport("PREFIX", "(ov)@+", -1);
1140	<	add_isupport("STATUSMSG", "@+", -1);
1141	<	#endif
1142	<	add_isupport("EXCEPTS", "e", -1);
1143	<	add_isupport("INVEX", "I", -1);
1032	>	add_isupport("EXCEPTS", NULL, -1);
1033	>	add_isupport("INVEX", NULL, -1);
1034		}
1035
1036		/*
#	Line 1155 | Line 1045 | init_isupport(void)
1045		void
1046		add_isupport(const char *name, const char *options, int n)
1047		{
1048	<	dlink_node *ptr;
1049	<	struct Isupport *support;
1048	>	dlink_node *node = NULL;
1049	>	struct Isupport *support = NULL;
1050
1051	<	DLINK_FOREACH(ptr, support_list.head)
1051	>	DLINK_FOREACH(node, support_list.head)
1052		{
1053	<	support = ptr->data;
1053	>	support = node->data;
1054		if (irccmp(support->name, name) == 0)
1055		{
1056		MyFree(support->name);
#	Line 1169 | Line 1059 | add_isupport(const char *name, const cha
1059		}
1060		}
1061
1062	<	if (ptr == NULL)
1062	>	if (node == NULL)
1063		{
1064	<	support = MyMalloc(sizeof(*support));
1064	>	support = MyCalloc(sizeof(*support));
1065		dlinkAddTail(support, &support->node, &support_list);
1066		}
1067
1068		support->name = xstrdup(name);
1069	<	if (options != NULL)
1069	>	if (options)
1070		support->options = xstrdup(options);
1071		support->number = n;
1072
#	Line 1193 | Line 1083 | add_isupport(const char *name, const cha
1083		void
1084		delete_isupport(const char *name)
1085		{
1086	<	dlink_node *ptr;
1197	<	struct Isupport *support;
1086	>	dlink_node *node = NULL;
1087
1088	<	DLINK_FOREACH(ptr, support_list.head)
1088	>	DLINK_FOREACH(node, support_list.head)
1089		{
1090	<	support = ptr->data;
1090	>	struct Isupport *support = node->data;
1091	>
1092		if (irccmp(support->name, name) == 0)
1093		{
1094	<	dlinkDelete(ptr, &support_list);
1094	>	dlinkDelete(node, &support_list);
1095		MyFree(support->name);
1096		MyFree(support->options);
1097		MyFree(support);
#	Line 1224 | Line 1114 | rebuild_isupport_message_line(void)
1114		{
1115		char isupportbuffer[IRCD_BUFSIZE];
1116		char *p = isupportbuffer;
1117	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1117	>	dlink_node *node = NULL, *node_next = NULL;
1118		int n = 0;
1119		int tokens = 0;
1120		size_t len = 0;
1121		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1122
1123	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1123	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1124		{
1125	<	dlinkDelete(ptr, &support_list_lines);
1126	<	MyFree(ptr->data);
1127	<	free_dlink_node(ptr);
1125	>	dlinkDelete(node, &support_list_lines);
1126	>	MyFree(node->data);
1127	>	free_dlink_node(node);
1128		}
1129
1130	<	DLINK_FOREACH(ptr, support_list.head)
1130	>	DLINK_FOREACH(node, support_list.head)
1131		{
1132	<	struct Isupport *support = ptr->data;
1132	>	struct Isupport *support = node->data;
1133
1134		p += (n = sprintf(p, "%s", support->name));
1135		len += n;
1136
1137	<	if (support->options != NULL)
1137	>	if (support->options)
1138		{
1139		p += (n = sprintf(p, "=%s", support->options));
1140		len += n;
#	Line 1272 | Line 1162 | rebuild_isupport_message_line(void)
1162		}
1163		}
1164
1165	<	if (len != 0)
1165	>	if (len)
1166		{
1167		if (*--p == ' ')
1168		*p = '\0';

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)