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/user.c (file contents):
Revision 3896 by michael, Fri Jun 6 19:08:47 2014 UTC vs.
Revision 5558 by michael, Fri Feb 13 20:45:49 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
#	Line 40 | Line 40
40		#include "log.h"
41		#include "server.h"
42		#include "send.h"
43	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
#	Line 66 | 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 */
101	<	0,                  /* Y */
102	<	0,                  /* Z 0x5A */
103	<	0, 0, 0, 0, 0,      /* 0x5F   */
104	<	0,                  /* 0x60   */
105	<	UMODE_ADMIN,        /* a */
106	<	UMODE_BOTS,         /* b */
107	<	UMODE_CCONN,        /* c */
108	<	UMODE_DEBUG,        /* d */
109	<	UMODE_EXTERNAL,     /* e */
110	<	UMODE_FULL,         /* f */
111	<	UMODE_CALLERID,     /* g */
112	<	0,                  /* h */
113	<	UMODE_INVISIBLE,    /* i */
114	<	UMODE_REJ,          /* j */
115	<	UMODE_SKILL,        /* k */
116	<	UMODE_LOCOPS,       /* l */
117	<	0,                  /* m */
118	<	UMODE_NCHANGE,      /* n */
119	<	UMODE_OPER,         /* o */
120	<	UMODE_HIDECHANS,    /* p */
121	<	UMODE_HIDEIDLE,     /* q */
122	<	UMODE_REGISTERED,   /* r */
123	<	UMODE_SERVNOTICE,   /* s */
124	<	0,                  /* t */
125	<	UMODE_UNAUTH,       /* u */
126	<	0,                  /* v */
127	<	UMODE_WALLOP,       /* w */
128	<	UMODE_HIDDENHOST,   /* x */
129	<	UMODE_SPY,          /* y */
130	<	0,                  /* z      0x7A */
131	<	0,0,0,0,0,          /* 0x7B - 0x7F */
132	<
133	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
134	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
135	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
136	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
137	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
138	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
139	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
140	<	/* 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		{
146	–	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 163 | 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)
133		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 175 | Line 135 | show_lusers(struct Client *source_p)
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))
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 211 | 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 233 | 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 282 | 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 298 | 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 311 | 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,
316	<	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 321 | 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)) ?
325	<	"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 349 | 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	<
364	<	if (source_p->id[0])
365	<	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 378 | Line 334 | static int
334		check_xline(struct Client *source_p)
335		{
336		struct MaskItem *conf = NULL;
381	–	const char *reason = NULL;
337
338		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339		{
340		++conf->count;
386	–
387	–	if (conf->reason)
388	–	reason = conf->reason;
389	–	else
390	–	reason = CONF_NOREASON;
391	–
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 416 | 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);
368	>	assert(!source_p->connection->registration);
369
370		ClearCap(source_p, CAP_TS6);
371
372	<	if (ConfigFileEntry.ping_cookie)
372	>	if (ConfigGeneral.ping_cookie)
373		{
374	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
374	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
375		{
376		do
377	<	source_p->localClient->random_ping = genrand_int32();
378	<	while (!source_p->localClient->random_ping);
377	>	source_p->connection->random_ping = genrand_int32();
378	>	while (!source_p->connection->random_ping);
379
380	<	sendto_one(source_p, "PING :%u",
432	<	source_p->localClient->random_ping);
380	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
381		SetPingSent(source_p);
382		return;
383		}
#	Line 438 | Line 386 | register_local_user(struct Client *sourc
386		return;
387		}
388
389	<	source_p->localClient->last_privmsg = CurrentTime;
389	>	source_p->connection->last_privmsg = CurrentTime;
390		/* Straight up the maximum rate of flooding... */
391	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
391	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
392
393		if (!check_client(source_p))
394		return;
#	Line 449 | Line 397 | register_local_user(struct Client *sourc
397		{
398		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
399		"character in your hostname");
400	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
400	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
401		}
402
403	<	conf = source_p->localClient->confs.head->data;
403	>	conf = source_p->connection->confs.head->data;
404
405		if (!IsGotId(source_p))
406		{
#	Line 476 | Line 423 | register_local_user(struct Client *sourc
423		source_p->username[i++] = '~';
424
425		for (; *p && i < USERLEN; ++p)
426	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
426	>	source_p->username[i++] = *p;
427
428		source_p->username[i] = '\0';
429		}
#	Line 485 | Line 431 | register_local_user(struct Client *sourc
431		/* Password check */
432		if (!EmptyString(conf->passwd))
433		{
434	<	if (!match_conf_password(source_p->localClient->passwd, conf))
434	>	if (!match_conf_password(source_p->connection->password, conf))
435		{
436		++ServerStats.is_ref;
437
#	Line 496 | Line 442 | register_local_user(struct Client *sourc
442		}
443
444		/*
445	<	* Don't free source_p->localClient->passwd here - it can be required
446	<	* by masked /stats I if there are auth{} blocks with need_password = no;
445	>	* Don't free source_p->connection->password here - it can be required
446	>	* by masked /stats I if there are auth {} blocks with need_password = no;
447		* --adx
448		*/
449
#	Line 517 | Line 463 | register_local_user(struct Client *sourc
463		* probably be just a percentage of the MAXCLIENTS...
464		*   -Taner
465		*/
466	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
467	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
466	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
467	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
468		{
469		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
470		"Too many clients, rejecting %s[%s].",
#	Line 553 | Line 499 | register_local_user(struct Client *sourc
499		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
500		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
501		source_p->name, source_p->username, source_p->host,
502	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
503	<	"255.255.255.255" : source_p->sockhost,
558	<	get_client_class(&source_p->localClient->confs),
502	>	source_p->sockhost,
503	>	get_client_class(&source_p->connection->confs),
504		source_p->info, source_p->id);
505
506	<	if (ConfigFileEntry.invisible_on_connect)
506	>	if (ConfigGeneral.invisible_on_connect)
507		{
508		AddUMode(source_p, UMODE_INVISIBLE);
509		++Count.invisi;
#	Line 570 | Line 515 | register_local_user(struct Client *sourc
515
516		if (!(Count.max_loc % 10))
517		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
518	<	"New Max Local Clients: %d",
518	>	"New maximum local client connections: %u",
519		Count.max_loc);
520		}
521
#	Line 581 | Line 526 | register_local_user(struct Client *sourc
526		assert(source_p->servptr == &me);
527		SetClient(source_p);
528		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
529	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
530
531		assert(dlinkFind(&unknown_list, source_p));
532
533	<	dlink_move_node(&source_p->localClient->lclient_node,
533	>	dlink_move_node(&source_p->connection->lclient_node,
534		&unknown_list, &local_client_list);
535
536		user_welcome(source_p);
#	Line 605 | Line 551 | register_local_user(struct Client *sourc
551		*                is introduced by a server.
552		*/
553		void
554	<	register_remote_user(struct Client *source_p, const char *username,
609	<	const char *host, const char *server)
554	>	register_remote_user(struct Client *source_p)
555		{
556	<	struct Client *target_p = NULL;
612	<
613	<	assert(source_p->username != username);
614	<
615	<	strlcpy(source_p->host, host, sizeof(source_p->host));
616	<	strlcpy(source_p->username, username, sizeof(source_p->username));
617	<
618	<	/*
619	<	* Coming from another server, take the servers word for it
620	<	*/
621	<	source_p->servptr = hash_find_server(server);
622	<
623	<	/*
624	<	* Super GhostDetect:
625	<	* If we can't find the server the user is supposed to be on,
626	<	* then simply blow the user away.        -Taner
627	<	*/
628	<	if (source_p->servptr == NULL)
629	<	{
630	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
631	<	"No server %s for user %s[%s@%s] from %s",
632	<	server, source_p->name, source_p->username,
633	<	source_p->host, source_p->from->name);
634	<	sendto_one(source_p->from,
635	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636	<	me.id, source_p->id, me.name, server);
637	<
638	<	AddFlag(source_p, FLAGS_KILLED);
639	<	exit_client(source_p, "Ghosted Client");
640	<	return;
641	<	}
556	>	const struct Client *target_p = NULL;
557
558		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
559		{
#	Line 648 | Line 563 | register_remote_user(struct Client *sour
563		source_p->host, source_p->servptr->name,
564		target_p->name, target_p->from->name);
565		sendto_one(source_p->from,
566	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
566	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
567		me.id, source_p->id, me.name, source_p->servptr->name,
568		target_p->from->name);
569
570		AddFlag(source_p, FLAGS_KILLED);
571	<	exit_client(source_p, "USER server wrong direction");
571	>	exit_client(source_p, "UID server wrong direction");
572		return;
573		}
574
#	Line 669 | Line 584 | register_remote_user(struct Client *sour
584
585		SetClient(source_p);
586		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
587	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
588		add_user_host(source_p->username, source_p->host, 1);
589		SetUserHost(source_p);
590
591		if (HasFlag(source_p->servptr, FLAGS_EOB))
592	<	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
593	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
594	<	source_p->servptr->name,
595	<	source_p->name, source_p->username, source_p->host,
596	<	source_p->info, source_p->id);
592	>	{
593	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
594	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
595	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
596	>	source_p->servptr->name,
597	>	source_p->name, source_p->username, source_p->host,
598	>	source_p->sockhost, source_p->info, source_p->id);
599	>	else
600	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
601	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
602	>	source_p->servptr->name,
603	>	source_p->name, source_p->username, source_p->host,
604	>	source_p->info, source_p->id);
605	>	}
606
607		introduce_client(source_p);
608		}
#	Line 742 | Line 667 | valid_username(const char *username, con
667		{
668		while (*++p)
669		{
670	<	if (*p == '.' && ConfigFileEntry.dots_in_ident)
670	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
671		{
672	<	if (++dots > ConfigFileEntry.dots_in_ident)
672	>	if (++dots > ConfigGeneral.dots_in_ident)
673		return 0;
674		if (!IsUserChar(*(p + 1)))
675		return 0;
#	Line 775 | Line 700 | valid_nickname(const char *nickname, con
700		{
701		const char *p = nickname;
702
703	<	assert(nickname && *nickname);
703	>	assert(p);
704
705		/*
706		* Nicks can't start with a digit or - or be 0 length.
707		*/
708	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
708	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
709		return 0;
710
711		for (; *p; ++p)
#	Line 803 | Line 728 | valid_nickname(const char *nickname, con
728		*/
729		void
730		send_umode(struct Client *client_p, struct Client *source_p,
731	<	unsigned int old, unsigned int sendmask, char *umode_buf)
731	>	unsigned int old, char *umode_buf)
732		{
733		char *m = umode_buf;
734		int what = 0;
#	Line 812 | Line 737 | send_umode(struct Client *client_p, stru
737		* Build a string in umode_buf to represent the change in the user's
738		* mode between the new (source_p->umodes) and 'old'.
739		*/
740	<	for (unsigned int i = 0; i < 128; ++i)
740	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
741		{
742	<	unsigned int flag = user_modes[i];
818	<
819	<	if (!flag)
820	<	continue;
821	<
822	<	if (MyClient(source_p) && !(flag & sendmask))
823	<	continue;
824	<
825	<	if ((flag & old) && !HasUMode(source_p, flag))
742	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
743		{
744		if (what == MODE_DEL)
745	<	*m++ = (char)i;
745	>	*m++ = tab->c;
746		else
747		{
748		what = MODE_DEL;
749		*m++ = '-';
750	<	*m++ = (char)i;
750	>	*m++ = tab->c;
751		}
752		}
753	<	else if (!(flag & old) && HasUMode(source_p, flag))
753	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
754		{
755		if (what == MODE_ADD)
756	<	*m++ = (char)i;
756	>	*m++ = tab->c;
757		else
758		{
759		what = MODE_ADD;
760		*m++ = '+';
761	<	*m++ = (char)i;
761	>	*m++ = tab->c;
762		}
763		}
764		}
#	Line 850 | Line 767 | send_umode(struct Client *client_p, stru
767
768		if (*umode_buf && client_p)
769		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
770	<	source_p->name, source_p->username,
771	<	source_p->host, source_p->name, umode_buf);
770	>	client_p->name, client_p->username,
771	>	client_p->host, client_p->name, umode_buf);
772		}
773
774		/* send_umode_out()
#	Line 861 | Line 778 | send_umode(struct Client *client_p, stru
778		* side effects - Only send ubuf out to servers that know about this client
779		*/
780		void
781	<	send_umode_out(struct Client *client_p, struct Client *source_p,
865	<	unsigned int old)
781	>	send_umode_out(struct Client *source_p, unsigned int old)
782		{
783		char buf[IRCD_BUFSIZE] = "";
784
785	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
785	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
786
787		if (buf[0])
788	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
788	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
789		source_p->id, source_p->id, buf);
874	–
875	–	if (client_p && MyClient(client_p))
876	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
790		}
791
792		void
793		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
794		{
795	<	dlink_node *ptr = NULL;
795	>	dlink_node *node = NULL;
796
797		if (!strcmp(target_p->host, hostname))
798		return;
#	Line 888 | Line 801 | user_set_hostmask(struct Client *target_
801		{
802		case MODE_ADD:
803		AddUMode(target_p, UMODE_HIDDENHOST);
891	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
804		break;
805		case MODE_DEL:
806		DelUMode(target_p, UMODE_HIDDENHOST);
895	–
896	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
897	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
807		break;
808		default: return;
809		}
810
811	<	if (ConfigFileEntry.cycle_on_host_change)
811	>	if (ConfigGeneral.cycle_on_host_change)
812		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
813		target_p->name, target_p->username, target_p->host);
814
#	Line 913 | Line 822 | user_set_hostmask(struct Client *target_
822
823		if (MyClient(target_p))
824		{
825	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
825	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
826		clear_ban_cache_client(target_p);
827		}
828
829	<	if (!ConfigFileEntry.cycle_on_host_change)
829	>	if (!ConfigGeneral.cycle_on_host_change)
830		return;
831
832	<	DLINK_FOREACH(ptr, target_p->channel.head)
832	>	DLINK_FOREACH(node, target_p->channel.head)
833		{
834		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
835		char *p = modebuf;
836		int len = 0;
837	<	const struct Membership *ms = ptr->data;
837	>	const struct Membership *member = node->data;
838
839	<	if (has_member_flags(ms, CHFL_CHANOP))
839	>	if (has_member_flags(member, CHFL_CHANOP))
840		{
841		*p++ = 'o';
842		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
843		}
844
845	<	if (has_member_flags(ms, CHFL_HALFOP))
845	>	if (has_member_flags(member, CHFL_HALFOP))
846		{
847		*p++ = 'h';
848		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
849		}
850
851	<	if (has_member_flags(ms, CHFL_VOICE))
851	>	if (has_member_flags(member, CHFL_VOICE))
852		{
853		*p++ = 'v';
854		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 947 | Line 856 | user_set_hostmask(struct Client *target_
856
857		*p = '\0';
858
859	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
860	<	target_p->name, target_p->username, target_p->host,
861	<	ms->chptr->chname);
859	>
860	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
861	>	target_p->name, target_p->username,
862	>	target_p->host, member->chptr->name,
863	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
864	>	target_p->info);
865	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
866	>	target_p->name, target_p->username,
867	>	target_p->host, member->chptr->name);
868	>
869		if (nickbuf[0])
870	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
871	<	target_p->servptr->name, ms->chptr->chname,
870	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
871	>	target_p->servptr->name, member->chptr->name,
872		modebuf, nickbuf);
873
874		}
#	Line 972 | Line 888 | void
888		oper_up(struct Client *source_p)
889		{
890		const unsigned int old = source_p->umodes;
891	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
891	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
892
893	<	assert(source_p->localClient->confs.head);
893	>	assert(source_p->connection->confs.head);
894
895		++Count.oper;
896		SetOper(source_p);
897
898		if (conf->modes)
899		AddUMode(source_p, conf->modes);
900	<	else if (ConfigFileEntry.oper_umodes)
901	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
900	>	else if (ConfigGeneral.oper_umodes)
901	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
902
903		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
904		++Count.invisi;
#	Line 997 | Line 913 | oper_up(struct Client *source_p)
913		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
914		AddUMode(source_p, UMODE_ADMIN);
915
916	+	if (!EmptyString(conf->whois))
917	+	{
918	+	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
919	+	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
920	+	me.id, source_p->id, (unsigned long)source_p->tsinfo,
921	+	RPL_WHOISOPERATOR, conf->whois);
922	+	}
923	+
924		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
925		get_oper_name(source_p));
926	<	send_umode_out(source_p, source_p, old);
926	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
927	>	me.id, get_oper_name(source_p));
928	>	send_umode_out(source_p, old);
929		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
930		}
931
#	Line 1030 | Line 956 | init_uid(void)
956		{
957		memset(new_uid, 0, sizeof(new_uid));
958
959	<	if (!EmptyString(ServerInfo.sid))
960	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
959	>	if (!EmptyString(ConfigServerInfo.sid))
960	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
961
962		for (unsigned int i = 0; i < IRC_MAXSID; ++i)
963		if (new_uid[i] == '\0')
#	Line 1099 | Line 1025 | void
1025		init_isupport(void)
1026		{
1027		add_isupport("CALLERID", NULL, -1);
1028	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1028	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1029		add_isupport("DEAF", "D", -1);
1030		add_isupport("KICKLEN", NULL, KICKLEN);
1031		add_isupport("MODES", NULL, MAXMODEPARAMS);
1032		add_isupport("PREFIX", "(ohv)@%+", -1);
1033		add_isupport("STATUSMSG", "@%+", -1);
1034	<	add_isupport("EXCEPTS", "e", -1);
1035	<	add_isupport("INVEX", "I", -1);
1034	>	add_isupport("EXCEPTS", NULL, -1);
1035	>	add_isupport("INVEX", NULL, -1);
1036		}
1037
1038		/*
#	Line 1121 | Line 1047 | init_isupport(void)
1047		void
1048		add_isupport(const char *name, const char *options, int n)
1049		{
1050	<	dlink_node *ptr;
1050	>	dlink_node *node = NULL;
1051		struct Isupport *support = NULL;
1052
1053	<	DLINK_FOREACH(ptr, support_list.head)
1053	>	DLINK_FOREACH(node, support_list.head)
1054		{
1055	<	support = ptr->data;
1055	>	support = node->data;
1056		if (irccmp(support->name, name) == 0)
1057		{
1058		MyFree(support->name);
#	Line 1135 | Line 1061 | add_isupport(const char *name, const cha
1061		}
1062		}
1063
1064	<	if (ptr == NULL)
1064	>	if (node == NULL)
1065		{
1066		support = MyCalloc(sizeof(*support));
1067		dlinkAddTail(support, &support->node, &support_list);
#	Line 1159 | Line 1085 | add_isupport(const char *name, const cha
1085		void
1086		delete_isupport(const char *name)
1087		{
1088	<	dlink_node *ptr;
1163	<	struct Isupport *support;
1088	>	dlink_node *node = NULL;
1089
1090	<	DLINK_FOREACH(ptr, support_list.head)
1090	>	DLINK_FOREACH(node, support_list.head)
1091		{
1092	<	support = ptr->data;
1092	>	struct Isupport *support = node->data;
1093	>
1094		if (irccmp(support->name, name) == 0)
1095		{
1096	<	dlinkDelete(ptr, &support_list);
1096	>	dlinkDelete(node, &support_list);
1097		MyFree(support->name);
1098		MyFree(support->options);
1099		MyFree(support);
#	Line 1190 | Line 1116 | rebuild_isupport_message_line(void)
1116		{
1117		char isupportbuffer[IRCD_BUFSIZE];
1118		char *p = isupportbuffer;
1119	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1119	>	dlink_node *node = NULL, *node_next = NULL;
1120		int n = 0;
1121		int tokens = 0;
1122		size_t len = 0;
1123		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1124
1125	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1125	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1126		{
1127	<	dlinkDelete(ptr, &support_list_lines);
1128	<	MyFree(ptr->data);
1129	<	free_dlink_node(ptr);
1127	>	dlinkDelete(node, &support_list_lines);
1128	>	MyFree(node->data);
1129	>	free_dlink_node(node);
1130		}
1131
1132	<	DLINK_FOREACH(ptr, support_list.head)
1132	>	DLINK_FOREACH(node, support_list.head)
1133		{
1134	<	struct Isupport *support = ptr->data;
1134	>	struct Isupport *support = node->data;
1135
1136		p += (n = sprintf(p, "%s", support->name));
1137		len += n;

Diff Legend

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