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 3655 by michael, Wed May 28 20:51:21 2014 UTC vs.
Revision 6192 by michael, Wed Jun 24 18:00:07 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		*/
#	Line 31 | Line 31
31		#include "channel_mode.h"
32		#include "client.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 40 | Line 41
41		#include "log.h"
42		#include "server.h"
43		#include "send.h"
43	–	#include "supported.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
#	Line 48 | Line 48
48		#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
53	–	static const char *uid_get(void);
54
55	<	/* Used for building up the isupport string,
56	<	* used with init_isupport, add_isupport, delete_isupport
57	<	*/
58	<	struct Isupport
59	<	{
60	<	dlink_node node;
61	<	char *name;
62	<	char *options;
63	<	int number;
64	<	};
65	<
66	<	static dlink_list support_list;
67	<	static dlink_list support_list_lines;
68	<
69	<	/* memory is cheap. map 0-255 to equivalent mode */
70	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	0,                  /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	UMODE_SSL,          /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	UMODE_WEBIRC,       /* W */
86	<	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	<	UMODE_OPERWALL,     /* 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 */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
146	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 163 | Line 110 | void
110		show_lusers(struct Client *source_p)
111		{
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
114	<	Count.invisi, dlink_list_length(&global_serv_list));
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117	<	(Count.total - Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119		if (Count.oper)
120		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 175 | Line 122 | show_lusers(struct Client *source_p)
122		if (dlink_list_length(&unknown_list))
123		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124
125	<	if (dlink_list_length(&global_channel_list))
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127
128		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
#	Line 202 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
205	–	/* show_isupport()
206	–	*
207	–	* inputs       - pointer to client
208	–	* output       - NONE
209	–	* side effects - display to client what we support (for them)
210	–	*/
211	–	void
212	–	show_isupport(struct Client *source_p)
213	–	{
214	–	const dlink_node *ptr = NULL;
215	–
216	–	DLINK_FOREACH(ptr, support_list_lines.head)
217	–	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218	–	}
219	–
220	–
152		/* report_and_set_user_flags()
153		*
154		* inputs       - pointer to source_p
#	Line 233 | Line 164 | report_and_set_user_flags(struct Client
164		if (IsConfDoSpoofIp(conf))
165		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
166
167	<	/* If this user is in the exception class, Set it "E lined" */
167	>	/* If this user is in the exception class, set it "E lined" */
168		if (IsConfExemptKline(conf))
169		{
170		SetExemptKline(source_p);
171	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172		}
173
174	<	/*
244	<	* The else here is to make sure that G line exempt users
245	<	* do not get noticed twice.
246	<	*/
247	<	else if (IsConfExemptGline(conf))
174	>	if (IsConfExemptXline(conf))
175		{
176	<	SetExemptGline(source_p);
177	<	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
176	>	SetExemptXline(source_p);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178		}
179
180		if (IsConfExemptResv(conf))
#	Line 282 | Line 209 | report_and_set_user_flags(struct Client
209		static void
210		introduce_client(struct Client *source_p)
211		{
212	<	dlink_node *ptr = NULL;
212	>	dlink_node *node = NULL;
213		char ubuf[IRCD_BUFSIZE] = "";
214
215		if (MyClient(source_p))
216	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
216	>	send_umode(source_p, source_p, 0, ubuf);
217		else
218	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
218	>	send_umode(NULL, source_p, 0, ubuf);
219
220		watch_check_hash(source_p, RPL_LOGON);
221
#	Line 298 | Line 225 | introduce_client(struct Client *source_p
225		ubuf[1] = '\0';
226		}
227
228	<	DLINK_FOREACH(ptr, serv_list.head)
228	>	DLINK_FOREACH(node, local_server_list.head)
229		{
230	<	struct Client *server = ptr->data;
230	>	struct Client *server = node->data;
231
232		if (server == source_p->from)
233		continue;
234
235		if (IsCapable(server, CAP_SVS))
236	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237		source_p->servptr->id,
238		source_p->name, source_p->hopcount+1,
239		(unsigned long)source_p->tsinfo,
240		ubuf, source_p->username, source_p->host,
241	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
242	<	"0" : source_p->sockhost, source_p->id,
316	<	source_p->svid,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243		source_p->info);
244		else
245	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246		source_p->servptr->id,
247		source_p->name, source_p->hopcount+1,
248		(unsigned long)source_p->tsinfo,
249		ubuf, source_p->username, source_p->host,
250	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
325	<	"0" : source_p->sockhost, source_p->id, source_p->info);
250	>	source_p->sockhost, source_p->id, source_p->info);
251
252		if (!EmptyString(source_p->certfp))
253		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 349 | Line 274 | user_welcome(struct Client *source_p)
274		{
275		AddUMode(source_p, UMODE_SSL);
276		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
277	<	ssl_get_cipher(source_p->localClient->fd.ssl));
277	>	ssl_get_cipher(source_p->connection->fd.ssl));
278		}
279		#endif
280
281	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
281	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
282		source_p->name);
283		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
284	<	get_listener_name(source_p->localClient->listener), ircd_version);
284	>	get_listener_name(source_p->connection->listener), ircd_version);
285		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
286		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
287	<	show_isupport(source_p);
288	<
364	<	if (source_p->id[0])
365	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
287	>	isupport_show(source_p);
288	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
289
290		show_lusers(source_p);
291		motd_signon(source_p);
#	Line 378 | Line 301 | static int
301		check_xline(struct Client *source_p)
302		{
303		struct MaskItem *conf = NULL;
304	<	const char *reason = NULL;
304	>
305	>	if (IsExemptXline(source_p))
306	>	return 0;
307
308		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
309		{
310		++conf->count;
386	–
387	–	if (conf->reason)
388	–	reason = conf->reason;
389	–	else
390	–	reason = CONF_NOREASON;
391	–
311		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
312		"X-line Rejecting [%s] [%s], user %s [%s]",
313	<	source_p->info, reason,
313	>	source_p->info, conf->reason,
314		get_client_name(source_p, HIDE_IP),
315		source_p->sockhost);
316
#	Line 416 | Line 335 | register_local_user(struct Client *sourc
335
336		assert(source_p == source_p->from);
337		assert(MyConnect(source_p));
338	<	assert(!source_p->localClient->registration);
339	<
421	<	ClearCap(source_p, CAP_TS6);
338	>	assert(IsUnknown(source_p));
339	>	assert(!source_p->connection->registration);
340
341	<	if (ConfigFileEntry.ping_cookie)
341	>	if (ConfigGeneral.ping_cookie)
342		{
343	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
343	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
344		{
345		do
346	<	source_p->localClient->random_ping = genrand_int32();
347	<	while (!source_p->localClient->random_ping);
346	>	source_p->connection->random_ping = genrand_int32();
347	>	while (!source_p->connection->random_ping);
348
349	<	sendto_one(source_p, "PING :%u",
432	<	source_p->localClient->random_ping);
349	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
350		SetPingSent(source_p);
351		return;
352		}
#	Line 438 | Line 355 | register_local_user(struct Client *sourc
355		return;
356		}
357
358	<	source_p->localClient->last_privmsg = CurrentTime;
358	>	source_p->connection->last_privmsg = CurrentTime;
359		/* Straight up the maximum rate of flooding... */
360	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
360	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
361
362		if (!check_client(source_p))
363		return;
#	Line 449 | Line 366 | register_local_user(struct Client *sourc
366		{
367		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
368		"character in your hostname");
369	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
369	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
370		}
371
372	<	conf = source_p->localClient->confs.head->data;
372	>	conf = source_p->connection->confs.head->data;
373
374		if (!IsGotId(source_p))
375		{
#	Line 476 | Line 392 | register_local_user(struct Client *sourc
392		source_p->username[i++] = '~';
393
394		for (; *p && i < USERLEN; ++p)
395	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
395	>	source_p->username[i++] = *p;
396
397		source_p->username[i] = '\0';
398		}
#	Line 485 | Line 400 | register_local_user(struct Client *sourc
400		/* Password check */
401		if (!EmptyString(conf->passwd))
402		{
403	<	if (!match_conf_password(source_p->localClient->passwd, conf))
403	>	if (!match_conf_password(source_p->connection->password, conf))
404		{
405		++ServerStats.is_ref;
406
#	Line 496 | Line 411 | register_local_user(struct Client *sourc
411		}
412
413		/*
414	<	* Don't free source_p->localClient->passwd here - it can be required
415	<	* by masked /stats I if there are auth{} blocks with need_password = no;
414	>	* Don't free source_p->connection->password here - it can be required
415	>	* by masked /stats I if there are auth {} blocks with need_password = no;
416		* --adx
417		*/
418
#	Line 517 | Line 432 | register_local_user(struct Client *sourc
432		* probably be just a percentage of the MAXCLIENTS...
433		*   -Taner
434		*/
435	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
436	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
435	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
436	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
437		{
438		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
439		"Too many clients, rejecting %s[%s].",
#	Line 553 | Line 468 | register_local_user(struct Client *sourc
468		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
469		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
470		source_p->name, source_p->username, source_p->host,
471	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
472	<	"255.255.255.255" : source_p->sockhost,
558	<	get_client_class(&source_p->localClient->confs),
471	>	source_p->sockhost,
472	>	get_client_class(&source_p->connection->confs),
473		source_p->info, source_p->id);
474
475	<	if (ConfigFileEntry.invisible_on_connect)
475	>	if (ConfigGeneral.invisible_on_connect)
476		{
477		AddUMode(source_p, UMODE_INVISIBLE);
478		++Count.invisi;
#	Line 570 | Line 484 | register_local_user(struct Client *sourc
484
485		if (!(Count.max_loc % 10))
486		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
487	<	"New Max Local Clients: %d",
487	>	"New maximum local client connections: %u",
488		Count.max_loc);
489		}
490
#	Line 581 | Line 495 | register_local_user(struct Client *sourc
495		assert(source_p->servptr == &me);
496		SetClient(source_p);
497		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
498	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
499
500		assert(dlinkFind(&unknown_list, source_p));
501
502	<	dlink_move_node(&source_p->localClient->lclient_node,
502	>	dlink_move_node(&source_p->connection->lclient_node,
503		&unknown_list, &local_client_list);
504
505		user_welcome(source_p);
#	Line 605 | Line 520 | register_local_user(struct Client *sourc
520		*                is introduced by a server.
521		*/
522		void
523	<	register_remote_user(struct Client *source_p, const char *username,
609	<	const char *host, const char *server)
523	>	register_remote_user(struct Client *source_p)
524		{
525	<	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	<	}
525	>	const struct Client *target_p = NULL;
526
527		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
528		{
#	Line 648 | Line 532 | register_remote_user(struct Client *sour
532		source_p->host, source_p->servptr->name,
533		target_p->name, target_p->from->name);
534		sendto_one(source_p->from,
535	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
535	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
536		me.id, source_p->id, me.name, source_p->servptr->name,
537		target_p->from->name);
538
539		AddFlag(source_p, FLAGS_KILLED);
540	<	exit_client(source_p, "USER server wrong direction");
540	>	exit_client(source_p, "UID server wrong direction");
541		return;
542		}
543
#	Line 669 | Line 553 | register_remote_user(struct Client *sour
553
554		SetClient(source_p);
555		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
556	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
557		add_user_host(source_p->username, source_p->host, 1);
558		SetUserHost(source_p);
559
560		if (HasFlag(source_p->servptr, FLAGS_EOB))
561		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
562	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
562	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
563		source_p->servptr->name,
564		source_p->name, source_p->username, source_p->host,
565	<	source_p->info, source_p->id);
565	>	source_p->sockhost, source_p->info, source_p->id);
566
567		introduce_client(source_p);
568		}
#	Line 722 | Line 607 | valid_hostname(const char *hostname)
607		int
608		valid_username(const char *username, const int local)
609		{
610	<	int dots      = 0;
610	>	unsigned int dots = 0;
611		const char *p = username;
612
613		assert(p);
#	Line 742 | Line 627 | valid_username(const char *username, con
627		{
628		while (*++p)
629		{
630	<	if (*p == '.' && ConfigFileEntry.dots_in_ident)
630	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
631		{
632	<	if (++dots > ConfigFileEntry.dots_in_ident)
632	>	if (++dots > ConfigGeneral.dots_in_ident)
633		return 0;
634		if (!IsUserChar(*(p + 1)))
635		return 0;
#	Line 760 | Line 645 | valid_username(const char *username, con
645		return 0;
646		}
647
648	<	return p - username <= USERLEN;;
648	>	return p - username <= USERLEN;
649		}
650
651		/* clean_nick_name()
#	Line 775 | Line 660 | valid_nickname(const char *nickname, con
660		{
661		const char *p = nickname;
662
663	<	assert(nickname && *nickname);
663	>	assert(p);
664
665		/*
666		* Nicks can't start with a digit or - or be 0 length.
667		*/
668	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
668	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
669		return 0;
670
671		for (; *p; ++p)
#	Line 803 | Line 688 | valid_nickname(const char *nickname, con
688		*/
689		void
690		send_umode(struct Client *client_p, struct Client *source_p,
691	<	unsigned int old, unsigned int sendmask, char *umode_buf)
691	>	unsigned int old, char *umode_buf)
692		{
693		char *m = umode_buf;
694		int what = 0;
#	Line 812 | Line 697 | send_umode(struct Client *client_p, stru
697		* Build a string in umode_buf to represent the change in the user's
698		* mode between the new (source_p->umodes) and 'old'.
699		*/
700	<	for (unsigned int i = 0; i < 128; ++i)
700	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
701		{
702	<	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))
702	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
703		{
704		if (what == MODE_DEL)
705	<	*m++ = (char)i;
705	>	*m++ = tab->c;
706		else
707		{
708		what = MODE_DEL;
709		*m++ = '-';
710	<	*m++ = (char)i;
710	>	*m++ = tab->c;
711		}
712		}
713	<	else if (!(flag & old) && HasUMode(source_p, flag))
713	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
714		{
715		if (what == MODE_ADD)
716	<	*m++ = (char)i;
716	>	*m++ = tab->c;
717		else
718		{
719		what = MODE_ADD;
720		*m++ = '+';
721	<	*m++ = (char)i;
721	>	*m++ = tab->c;
722		}
723		}
724		}
#	Line 850 | Line 727 | send_umode(struct Client *client_p, stru
727
728		if (*umode_buf && client_p)
729		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
730	<	source_p->name, source_p->username,
731	<	source_p->host, source_p->name, umode_buf);
730	>	client_p->name, client_p->username,
731	>	client_p->host, client_p->name, umode_buf);
732		}
733
734		/* send_umode_out()
#	Line 861 | Line 738 | send_umode(struct Client *client_p, stru
738		* side effects - Only send ubuf out to servers that know about this client
739		*/
740		void
741	<	send_umode_out(struct Client *client_p, struct Client *source_p,
865	<	unsigned int old)
741	>	send_umode_out(struct Client *source_p, unsigned int old)
742		{
743		char buf[IRCD_BUFSIZE] = "";
744
745	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
745	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
746
747		if (buf[0])
748	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
748	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
749		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);
750		}
751
752		void
753		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
754		{
755	<	dlink_node *ptr = NULL;
755	>	dlink_node *node = NULL;
756
757		if (!strcmp(target_p->host, hostname))
758		return;
#	Line 888 | Line 761 | user_set_hostmask(struct Client *target_
761		{
762		case MODE_ADD:
763		AddUMode(target_p, UMODE_HIDDENHOST);
891	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
764		break;
765		case MODE_DEL:
766		DelUMode(target_p, UMODE_HIDDENHOST);
895	–
896	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
897	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
767		break;
768		default: return;
769		}
770
771	<	if (ConfigFileEntry.cycle_on_host_change)
771	>	if (ConfigGeneral.cycle_on_host_change)
772		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
773		target_p->name, target_p->username, target_p->host);
774
#	Line 913 | Line 782 | user_set_hostmask(struct Client *target_
782
783		if (MyClient(target_p))
784		{
785	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
785	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
786		clear_ban_cache_client(target_p);
787		}
788
789	<	if (!ConfigFileEntry.cycle_on_host_change)
789	>	if (!ConfigGeneral.cycle_on_host_change)
790		return;
791
792	<	DLINK_FOREACH(ptr, target_p->channel.head)
792	>	DLINK_FOREACH(node, target_p->channel.head)
793		{
794		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
795		char *p = modebuf;
796		int len = 0;
797	<	const struct Membership *ms = ptr->data;
797	>	const struct Membership *member = node->data;
798
799	<	if (has_member_flags(ms, CHFL_CHANOP))
799	>	if (has_member_flags(member, CHFL_CHANOP))
800		{
801		*p++ = 'o';
802		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
803		}
804
805	<	if (has_member_flags(ms, CHFL_HALFOP))
805	>	if (has_member_flags(member, CHFL_HALFOP))
806		{
807		*p++ = 'h';
808		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
809		}
810
811	<	if (has_member_flags(ms, CHFL_VOICE))
811	>	if (has_member_flags(member, CHFL_VOICE))
812		{
813		*p++ = 'v';
814		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 947 | Line 816 | user_set_hostmask(struct Client *target_
816
817		*p = '\0';
818
819	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
820	<	target_p->name, target_p->username, target_p->host,
821	<	ms->chptr->chname);
819	>
820	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
821	>	target_p->name, target_p->username,
822	>	target_p->host, member->chptr->name,
823	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
824	>	target_p->info);
825	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
826	>	target_p->name, target_p->username,
827	>	target_p->host, member->chptr->name);
828	>
829		if (nickbuf[0])
830	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
831	<	target_p->servptr->name, ms->chptr->chname,
830	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
831	>	target_p->servptr->name, member->chptr->name,
832		modebuf, nickbuf);
833
834		}
#	Line 969 | Line 845 | user_set_hostmask(struct Client *target_
845		* \param source_p Pointer to given client to oper
846		*/
847		void
848	<	oper_up(struct Client *source_p)
848	>	user_oper_up(struct Client *source_p)
849		{
850		const unsigned int old = source_p->umodes;
851	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
851	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
852
853	<	assert(source_p->localClient->confs.head);
853	>	assert(source_p->connection->confs.head);
854
855		++Count.oper;
856		SetOper(source_p);
857
858		if (conf->modes)
859		AddUMode(source_p, conf->modes);
860	<	else if (ConfigFileEntry.oper_umodes)
861	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
860	>	else if (ConfigGeneral.oper_umodes)
861	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
862
863		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
864		++Count.invisi;
#	Line 997 | Line 873 | oper_up(struct Client *source_p)
873		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
874		AddUMode(source_p, UMODE_ADMIN);
875
876	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1001	<	get_oper_name(source_p));
1002	<	send_umode_out(source_p, source_p, old);
1003	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1004	<	}
1005	<
1006	<	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1007	<
1008	<	int
1009	<	valid_sid(const char *sid)
1010	<	{
1011	<	if (strlen(sid) == IRC_MAXSID)
1012	<	if (IsDigit(*sid))
1013	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1014	<	return 1;
1015	<
1016	<	return 0;
1017	<	}
1018	<
1019	<	/*
1020	<	* init_uid()
1021	<	*
1022	<	* inputs       - NONE
1023	<	* output       - NONE
1024	<	* side effects - new_uid is filled in with server id portion (sid)
1025	<	*                (first 3 bytes) or defaulted to 'A'.
1026	<	*                Rest is filled in with 'A'
1027	<	*/
1028	<	void
1029	<	init_uid(void)
1030	<	{
1031	<	memset(new_uid, 0, sizeof(new_uid));
1032	<
1033	<	if (!EmptyString(ServerInfo.sid))
1034	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1035	<
1036	<	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1037	<	if (new_uid[i] == '\0')
1038	<	new_uid[i] = 'A';
1039	<
1040	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1041	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1042	<	}
1043	<
1044	<	/*
1045	<	* add_one_to_uid
1046	<	*
1047	<	* inputs       - index number into new_uid
1048	<	* output       - NONE
1049	<	* side effects - new_uid is incremented by one
1050	<	*                note this is a recursive function
1051	<	*/
1052	<	static void
1053	<	add_one_to_uid(unsigned int i)
1054	<	{
1055	<	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1056	<	{
1057	<	if (new_uid[i] == 'Z')
1058	<	new_uid[i] = '0';
1059	<	else if (new_uid[i] == '9')
1060	<	{
1061	<	new_uid[i] = 'A';
1062	<	add_one_to_uid(i - 1);
1063	<	}
1064	<	else
1065	<	++new_uid[i];
1066	<	}
1067	<	else
1068	<	{
1069	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1070	<	if (new_uid[i] == 'Z')
1071	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1072	<	else
1073	<	++new_uid[i];
1074	<	}
1075	<	}
1076	<
1077	<	/*
1078	<	* uid_get
1079	<	*
1080	<	* inputs       - struct Client *
1081	<	* output       - new UID is returned to caller
1082	<	* side effects - new_uid is incremented by one.
1083	<	*/
1084	<	static const char *
1085	<	uid_get(void)
1086	<	{
1087	<	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1088	<	return new_uid;
1089	<	}
1090	<
1091	<	/*
1092	<	* init_isupport()
1093	<	*
1094	<	* input        - NONE
1095	<	* output       - NONE
1096	<	* side effects - Must be called before isupport is enabled
1097	<	*/
1098	<	void
1099	<	init_isupport(void)
1100	<	{
1101	<	add_isupport("CALLERID", NULL, -1);
1102	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1103	<	add_isupport("DEAF", "D", -1);
1104	<	add_isupport("KICKLEN", NULL, KICKLEN);
1105	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1106	<	#ifdef HALFOPS
1107	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1108	<	add_isupport("STATUSMSG", "@%+", -1);
1109	<	#else
1110	<	add_isupport("PREFIX", "(ov)@+", -1);
1111	<	add_isupport("STATUSMSG", "@+", -1);
1112	<	#endif
1113	<	add_isupport("EXCEPTS", "e", -1);
1114	<	add_isupport("INVEX", "I", -1);
1115	<	}
1116	<
1117	<	/*
1118	<	* add_isupport()
1119	<	*
1120	<	* input        - name of supported function
1121	<	*              - options if any
1122	<	*              - number if any
1123	<	* output       - NONE
1124	<	* side effects - Each supported item must call this when activated
1125	<	*/
1126	<	void
1127	<	add_isupport(const char *name, const char *options, int n)
1128	<	{
1129	<	dlink_node *ptr;
1130	<	struct Isupport *support;
1131	<
1132	<	DLINK_FOREACH(ptr, support_list.head)
876	>	if (!EmptyString(conf->whois))
877		{
878	<	support = ptr->data;
879	<	if (irccmp(support->name, name) == 0)
880	<	{
881	<	MyFree(support->name);
1138	<	MyFree(support->options);
1139	<	break;
1140	<	}
878	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
879	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
880	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
881	>	RPL_WHOISOPERATOR, conf->whois);
882		}
883
884	<	if (ptr == NULL)
885	<	{
886	<	support = MyCalloc(sizeof(*support));
887	<	dlinkAddTail(support, &support->node, &support_list);
888	<	}
889	<
1149	<	support->name = xstrdup(name);
1150	<	if (options)
1151	<	support->options = xstrdup(options);
1152	<	support->number = n;
1153	<
1154	<	rebuild_isupport_message_line();
1155	<	}
1156	<
1157	<	/*
1158	<	* delete_isupport()
1159	<	*
1160	<	* input        - name of supported function
1161	<	* output       - NONE
1162	<	* side effects - Each supported item must call this when deactivated
1163	<	*/
1164	<	void
1165	<	delete_isupport(const char *name)
1166	<	{
1167	<	dlink_node *ptr;
1168	<	struct Isupport *support;
1169	<
1170	<	DLINK_FOREACH(ptr, support_list.head)
1171	<	{
1172	<	support = ptr->data;
1173	<	if (irccmp(support->name, name) == 0)
1174	<	{
1175	<	dlinkDelete(ptr, &support_list);
1176	<	MyFree(support->name);
1177	<	MyFree(support->options);
1178	<	MyFree(support);
1179	<	break;
1180	<	}
1181	<	}
1182	<
1183	<	rebuild_isupport_message_line();
1184	<	}
1185	<
1186	<	/*
1187	<	* rebuild_isupport_message_line
1188	<	*
1189	<	* input        - NONE
1190	<	* output       - NONE
1191	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1192	<	*/
1193	<	void
1194	<	rebuild_isupport_message_line(void)
1195	<	{
1196	<	char isupportbuffer[IRCD_BUFSIZE];
1197	<	char *p = isupportbuffer;
1198	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1199	<	int n = 0;
1200	<	int tokens = 0;
1201	<	size_t len = 0;
1202	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1203	<
1204	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1205	<	{
1206	<	dlinkDelete(ptr, &support_list_lines);
1207	<	MyFree(ptr->data);
1208	<	free_dlink_node(ptr);
1209	<	}
1210	<
1211	<	DLINK_FOREACH(ptr, support_list.head)
1212	<	{
1213	<	struct Isupport *support = ptr->data;
1214	<
1215	<	p += (n = sprintf(p, "%s", support->name));
1216	<	len += n;
1217	<
1218	<	if (support->options)
1219	<	{
1220	<	p += (n = sprintf(p, "=%s", support->options));
1221	<	len += n;
1222	<	}
1223	<
1224	<	if (support->number > 0)
1225	<	{
1226	<	p += (n = sprintf(p, "=%d", support->number));
1227	<	len += n;
1228	<	}
1229	<
1230	<	*p++ = ' ';
1231	<	len++;
1232	<	*p = '\0';
1233	<
1234	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1235	<	{ /* arbritrary for now */
1236	<	if (*--p == ' ')
1237	<	*p = '\0';
1238	<
1239	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1240	<	p = isupportbuffer;
1241	<	len = 0;
1242	<	n = tokens = 0;
1243	<	}
1244	<	}
1245	<
1246	<	if (len)
1247	<	{
1248	<	if (*--p == ' ')
1249	<	*p = '\0';
1250	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1251	<	}
884	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
885	>	get_oper_name(source_p));
886	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
887	>	me.id, get_oper_name(source_p));
888	>	send_umode_out(source_p, old);
889	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
890		}

Diff Legend

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