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 6441 by michael, Thu Aug 27 17:04:15 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	<	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 */
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.");
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
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	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178		}
179
180		if (IsConfExemptResv(conf))
181		{
182	<	SetExemptResv(source_p);
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183		sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184		}
185
186		/* If this user is exempt from user limits set it "F lined" */
187		if (IsConfExemptLimits(conf))
188		{
189	<	SetExemptLimits(source_p);
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190		sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191		}
192
193		if (IsConfCanFlood(conf))
194		{
195	<	SetCanFlood(source_p);
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196		sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197		"protection, aren't you fearsome.");
198		}
#	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",
235	>	if (IsCapable(server, CAPAB_SVS))
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	>	listener_get_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);
362	–	show_isupport(source_p);
363	–
364	–	if (source_p->id[0])
365	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
287
288	+	isupport_show(source_p);
289		show_lusers(source_p);
290		motd_signon(source_p);
291		}
#	Line 378 | Line 300 | static int
300		check_xline(struct Client *source_p)
301		{
302		struct MaskItem *conf = NULL;
303	<	const char *reason = NULL;
303	>
304	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
305	>	return 0;
306
307		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
308		{
309		++conf->count;
386	–
387	–	if (conf->reason)
388	–	reason = conf->reason;
389	–	else
390	–	reason = CONF_NOREASON;
391	–
310		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
311		"X-line Rejecting [%s] [%s], user %s [%s]",
312	<	source_p->info, reason,
312	>	source_p->info, conf->reason,
313		get_client_name(source_p, HIDE_IP),
314		source_p->sockhost);
315
#	Line 416 | Line 334 | register_local_user(struct Client *sourc
334
335		assert(source_p == source_p->from);
336		assert(MyConnect(source_p));
337	<	assert(!source_p->localClient->registration);
338	<
421	<	ClearCap(source_p, CAP_TS6);
337	>	assert(IsUnknown(source_p));
338	>	assert(!source_p->connection->registration);
339
340	<	if (ConfigFileEntry.ping_cookie)
340	>	if (ConfigGeneral.ping_cookie)
341		{
342	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
342	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
343		{
344		do
345	<	source_p->localClient->random_ping = genrand_int32();
346	<	while (!source_p->localClient->random_ping);
345	>	source_p->connection->random_ping = genrand_int32();
346	>	while (!source_p->connection->random_ping);
347
348	<	sendto_one(source_p, "PING :%u",
349	<	source_p->localClient->random_ping);
433	<	SetPingSent(source_p);
348	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
349	>	AddFlag(source_p, FLAGS_PINGSENT);
350		return;
351		}
352
353	<	if (!HasPingCookie(source_p))
353	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
354		return;
355		}
356
357	<	source_p->localClient->last_privmsg = CurrentTime;
357	>	source_p->connection->last_privmsg = CurrentTime;
358		/* Straight up the maximum rate of flooding... */
359	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
359	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
360
361		if (!check_client(source_p))
362		return;
#	Line 449 | Line 365 | register_local_user(struct Client *sourc
365		{
366		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
367		"character in your hostname");
368	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
368	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
369		}
370
371	<	conf = source_p->localClient->confs.head->data;
371	>	conf = source_p->connection->confs.head->data;
372
373	<	if (!IsGotId(source_p))
373	>	if (!HasFlag(source_p, FLAGS_GOTID))
374		{
375		char username[USERLEN + 1] = "";
461	–	const char *p = username;
376		unsigned int i = 0;
377
378		if (IsNeedIdentd(conf))
#	Line 475 | Line 389 | register_local_user(struct Client *sourc
389		if (!IsNoTilde(conf))
390		source_p->username[i++] = '~';
391
392	<	for (; *p && i < USERLEN; ++p)
393	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
392	>	for (const char *p = username; *p && i < USERLEN; ++p)
393	>	source_p->username[i++] = *p;
394
395		source_p->username[i] = '\0';
396		}
#	Line 485 | Line 398 | register_local_user(struct Client *sourc
398		/* Password check */
399		if (!EmptyString(conf->passwd))
400		{
401	<	if (!match_conf_password(source_p->localClient->passwd, conf))
401	>	if (!match_conf_password(source_p->connection->password, conf))
402		{
403		++ServerStats.is_ref;
404
#	Line 496 | Line 409 | register_local_user(struct Client *sourc
409		}
410
411		/*
412	<	* Don't free source_p->localClient->passwd here - it can be required
413	<	* by masked /stats I if there are auth{} blocks with need_password = no;
412	>	* Don't free source_p->connection->password here - it can be required
413	>	* by masked /stats I if there are auth {} blocks with need_password = no;
414		* --adx
415		*/
416
#	Line 517 | Line 430 | register_local_user(struct Client *sourc
430		* probably be just a percentage of the MAXCLIENTS...
431		*   -Taner
432		*/
433	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
434	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
433	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
434	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
435		{
436		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
437		"Too many clients, rejecting %s[%s].",
#	Line 553 | Line 466 | register_local_user(struct Client *sourc
466		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
467		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
468		source_p->name, source_p->username, source_p->host,
469	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
470	<	"255.255.255.255" : source_p->sockhost,
558	<	get_client_class(&source_p->localClient->confs),
469	>	source_p->sockhost,
470	>	get_client_class(&source_p->connection->confs),
471		source_p->info, source_p->id);
472
473	<	if (ConfigFileEntry.invisible_on_connect)
473	>	if (ConfigGeneral.invisible_on_connect)
474		{
475		AddUMode(source_p, UMODE_INVISIBLE);
476		++Count.invisi;
#	Line 569 | Line 481 | register_local_user(struct Client *sourc
481		Count.max_loc = Count.local;
482
483		if (!(Count.max_loc % 10))
484	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
485	<	"New Max Local Clients: %d",
484	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
485	>	"New maximum local client connections: %u",
486		Count.max_loc);
487		}
488
#	Line 581 | Line 493 | register_local_user(struct Client *sourc
493		assert(source_p->servptr == &me);
494		SetClient(source_p);
495		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
496	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
497
498		assert(dlinkFind(&unknown_list, source_p));
499
500	<	dlink_move_node(&source_p->localClient->lclient_node,
500	>	dlink_move_node(&source_p->connection->lclient_node,
501		&unknown_list, &local_client_list);
502
503		user_welcome(source_p);
504	<	add_user_host(source_p->username, source_p->host, 0);
505	<	SetUserHost(source_p);
504	>	userhost_add(source_p->username, source_p->host, 0);
505	>	AddFlag(source_p, FLAGS_USERHOST);
506
507		introduce_client(source_p);
508		}
#	Line 605 | Line 518 | register_local_user(struct Client *sourc
518		*                is introduced by a server.
519		*/
520		void
521	<	register_remote_user(struct Client *source_p, const char *username,
609	<	const char *host, const char *server)
521	>	register_remote_user(struct Client *source_p)
522		{
523	<	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	<	}
523	>	const struct Client *target_p = NULL;
524
525		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
526		{
#	Line 648 | Line 530 | register_remote_user(struct Client *sour
530		source_p->host, source_p->servptr->name,
531		target_p->name, target_p->from->name);
532		sendto_one(source_p->from,
533	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
533	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
534		me.id, source_p->id, me.name, source_p->servptr->name,
535		target_p->from->name);
536
537		AddFlag(source_p, FLAGS_KILLED);
538	<	exit_client(source_p, "USER server wrong direction");
538	>	exit_client(source_p, "UID server wrong direction");
539		return;
540		}
541
#	Line 669 | Line 551 | register_remote_user(struct Client *sour
551
552		SetClient(source_p);
553		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
554	<	add_user_host(source_p->username, source_p->host, 1);
555	<	SetUserHost(source_p);
554	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
555	>	userhost_add(source_p->username, source_p->host, 1);
556	>	AddFlag(source_p, FLAGS_USERHOST);
557
558		if (HasFlag(source_p->servptr, FLAGS_EOB))
559		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
560	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
560	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
561		source_p->servptr->name,
562		source_p->name, source_p->username, source_p->host,
563	<	source_p->info, source_p->id);
563	>	source_p->sockhost, source_p->info, source_p->id);
564
565		introduce_client(source_p);
566		}
#	Line 742 | Line 625 | valid_username(const char *username, con
625		{
626		while (*++p)
627		{
628	<	if (*p == '.' && ConfigFileEntry.dots_in_ident)
628	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
629		{
630	<	if (++dots > ConfigFileEntry.dots_in_ident)
630	>	if (++dots > ConfigGeneral.dots_in_ident)
631		return 0;
632		if (!IsUserChar(*(p + 1)))
633		return 0;
#	Line 775 | Line 658 | valid_nickname(const char *nickname, con
658		{
659		const char *p = nickname;
660
661	<	assert(nickname && *nickname);
661	>	assert(p);
662
663		/*
664		* Nicks can't start with a digit or - or be 0 length.
665		*/
666	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
666	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
667		return 0;
668
669		for (; *p; ++p)
#	Line 797 | Line 680 | valid_nickname(const char *nickname, con
680		* inputs       - client_p
681		*              - source_p
682		*              - int old
800	–	*              - sendmask mask of modes to send
683		*              - suplied umode_buf
684		* output       - NONE
685		*/
686		void
687		send_umode(struct Client *client_p, struct Client *source_p,
688	<	unsigned int old, unsigned int sendmask, char *umode_buf)
688	>	unsigned int old, char *umode_buf)
689		{
690		char *m = umode_buf;
691		int what = 0;
#	Line 812 | Line 694 | send_umode(struct Client *client_p, stru
694		* Build a string in umode_buf to represent the change in the user's
695		* mode between the new (source_p->umodes) and 'old'.
696		*/
697	<	for (unsigned int i = 0; i < 128; ++i)
697	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
698		{
699	<	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))
699	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
700		{
701		if (what == MODE_DEL)
702	<	*m++ = (char)i;
702	>	*m++ = tab->c;
703		else
704		{
705		what = MODE_DEL;
706		*m++ = '-';
707	<	*m++ = (char)i;
707	>	*m++ = tab->c;
708		}
709		}
710	<	else if (!(flag & old) && HasUMode(source_p, flag))
710	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
711		{
712		if (what == MODE_ADD)
713	<	*m++ = (char)i;
713	>	*m++ = tab->c;
714		else
715		{
716		what = MODE_ADD;
717		*m++ = '+';
718	<	*m++ = (char)i;
718	>	*m++ = tab->c;
719		}
720		}
721		}
#	Line 850 | Line 724 | send_umode(struct Client *client_p, stru
724
725		if (*umode_buf && client_p)
726		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
727	<	source_p->name, source_p->username,
728	<	source_p->host, source_p->name, umode_buf);
727	>	client_p->name, client_p->username,
728	>	client_p->host, client_p->name, umode_buf);
729		}
730
731		/* send_umode_out()
#	Line 861 | Line 735 | send_umode(struct Client *client_p, stru
735		* side effects - Only send ubuf out to servers that know about this client
736		*/
737		void
738	<	send_umode_out(struct Client *client_p, struct Client *source_p,
865	<	unsigned int old)
738	>	send_umode_out(struct Client *source_p, unsigned int old)
739		{
740		char buf[IRCD_BUFSIZE] = "";
741
742	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
742	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
743
744		if (buf[0])
745	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
745	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
746		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);
747		}
748
749		void
750		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
751		{
752	<	dlink_node *ptr = NULL;
752	>	dlink_node *node = NULL;
753
754		if (!strcmp(target_p->host, hostname))
755		return;
#	Line 888 | Line 758 | user_set_hostmask(struct Client *target_
758		{
759		case MODE_ADD:
760		AddUMode(target_p, UMODE_HIDDENHOST);
891	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
761		break;
762		case MODE_DEL:
763		DelUMode(target_p, UMODE_HIDDENHOST);
895	–
896	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
897	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
764		break;
765		default: return;
766		}
767
768	<	if (ConfigFileEntry.cycle_on_host_change)
768	>	if (ConfigGeneral.cycle_on_host_change)
769		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
770		target_p->name, target_p->username, target_p->host);
771
772	<	if (IsUserHostIp(target_p))
773	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
772	>	if (HasFlag(target_p, FLAGS_USERHOST))
773	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
774
775		strlcpy(target_p->host, hostname, sizeof(target_p->host));
776
777	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
778	<	SetUserHost(target_p);
777	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
778	>	AddFlag(target_p, FLAGS_USERHOST);
779
780		if (MyClient(target_p))
781		{
782	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
782	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
783		clear_ban_cache_client(target_p);
784		}
785
786	<	if (!ConfigFileEntry.cycle_on_host_change)
786	>	if (!ConfigGeneral.cycle_on_host_change)
787		return;
788
789	<	DLINK_FOREACH(ptr, target_p->channel.head)
789	>	DLINK_FOREACH(node, target_p->channel.head)
790		{
791		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
792		char *p = modebuf;
793		int len = 0;
794	<	const struct Membership *ms = ptr->data;
794	>	const struct Membership *member = node->data;
795
796	<	if (has_member_flags(ms, CHFL_CHANOP))
796	>	if (has_member_flags(member, CHFL_CHANOP))
797		{
798		*p++ = 'o';
799		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
800		}
801
802	<	if (has_member_flags(ms, CHFL_HALFOP))
802	>	if (has_member_flags(member, CHFL_HALFOP))
803		{
804		*p++ = 'h';
805		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
806		}
807
808	<	if (has_member_flags(ms, CHFL_VOICE))
808	>	if (has_member_flags(member, CHFL_VOICE))
809		{
810		*p++ = 'v';
811		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 947 | Line 813 | user_set_hostmask(struct Client *target_
813
814		*p = '\0';
815
816	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
817	<	target_p->name, target_p->username, target_p->host,
818	<	ms->chptr->chname);
816	>
817	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
818	>	target_p->name, target_p->username,
819	>	target_p->host, member->chptr->name,
820	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
821	>	target_p->info);
822	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
823	>	target_p->name, target_p->username,
824	>	target_p->host, member->chptr->name);
825	>
826		if (nickbuf[0])
827	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
828	<	target_p->servptr->name, ms->chptr->chname,
827	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
828	>	target_p->servptr->name, member->chptr->name,
829		modebuf, nickbuf);
830
831		}
#	Line 969 | Line 842 | user_set_hostmask(struct Client *target_
842		* \param source_p Pointer to given client to oper
843		*/
844		void
845	<	oper_up(struct Client *source_p)
845	>	user_oper_up(struct Client *source_p)
846		{
847		const unsigned int old = source_p->umodes;
848	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
976	<
977	<	assert(source_p->localClient->confs.head);
848	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
849
850		++Count.oper;
851		SetOper(source_p);
852
853		if (conf->modes)
854		AddUMode(source_p, conf->modes);
855	<	else if (ConfigFileEntry.oper_umodes)
856	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
855	>	else if (ConfigGeneral.oper_umodes)
856	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
857
858		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
859		++Count.invisi;
#	Line 997 | Line 868 | oper_up(struct Client *source_p)
868		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
869		AddUMode(source_p, UMODE_ADMIN);
870
871	<	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? */
871	>	if (!EmptyString(conf->whois))
872		{
873	<	if (new_uid[i] == 'Z')
874	<	new_uid[i] = '0';
875	<	else if (new_uid[i] == '9')
876	<	{
1061	<	new_uid[i] = 'A';
1062	<	add_one_to_uid(i - 1);
1063	<	}
1064	<	else
1065	<	++new_uid[i];
873	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
874	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
875	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
876	>	RPL_WHOISOPERATOR, conf->whois);
877		}
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	–	}
878
879	<	/*
880	<	* init_isupport()
881	<	*
882	<	* input        - NONE
883	<	* output       - NONE
884	<	* 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	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1107	<	add_isupport("STATUSMSG", "@%+", -1);
1108	<	add_isupport("EXCEPTS", "e", -1);
1109	<	add_isupport("INVEX", "I", -1);
1110	<	}
1111	<
1112	<	/*
1113	<	* add_isupport()
1114	<	*
1115	<	* input        - name of supported function
1116	<	*              - options if any
1117	<	*              - number if any
1118	<	* output       - NONE
1119	<	* side effects - Each supported item must call this when activated
1120	<	*/
1121	<	void
1122	<	add_isupport(const char *name, const char *options, int n)
1123	<	{
1124	<	dlink_node *ptr;
1125	<	struct Isupport *support = NULL;
1126	<
1127	<	DLINK_FOREACH(ptr, support_list.head)
1128	<	{
1129	<	support = ptr->data;
1130	<	if (irccmp(support->name, name) == 0)
1131	<	{
1132	<	MyFree(support->name);
1133	<	MyFree(support->options);
1134	<	break;
1135	<	}
1136	<	}
1137	<
1138	<	if (ptr == NULL)
1139	<	{
1140	<	support = MyCalloc(sizeof(*support));
1141	<	dlinkAddTail(support, &support->node, &support_list);
1142	<	}
1143	<
1144	<	support->name = xstrdup(name);
1145	<	if (options)
1146	<	support->options = xstrdup(options);
1147	<	support->number = n;
1148	<
1149	<	rebuild_isupport_message_line();
1150	<	}
1151	<
1152	<	/*
1153	<	* delete_isupport()
1154	<	*
1155	<	* input        - name of supported function
1156	<	* output       - NONE
1157	<	* side effects - Each supported item must call this when deactivated
1158	<	*/
1159	<	void
1160	<	delete_isupport(const char *name)
1161	<	{
1162	<	dlink_node *ptr;
1163	<	struct Isupport *support;
1164	<
1165	<	DLINK_FOREACH(ptr, support_list.head)
1166	<	{
1167	<	support = ptr->data;
1168	<	if (irccmp(support->name, name) == 0)
1169	<	{
1170	<	dlinkDelete(ptr, &support_list);
1171	<	MyFree(support->name);
1172	<	MyFree(support->options);
1173	<	MyFree(support);
1174	<	break;
1175	<	}
1176	<	}
1177	<
1178	<	rebuild_isupport_message_line();
1179	<	}
1180	<
1181	<	/*
1182	<	* rebuild_isupport_message_line
1183	<	*
1184	<	* input        - NONE
1185	<	* output       - NONE
1186	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1187	<	*/
1188	<	void
1189	<	rebuild_isupport_message_line(void)
1190	<	{
1191	<	char isupportbuffer[IRCD_BUFSIZE];
1192	<	char *p = isupportbuffer;
1193	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1194	<	int n = 0;
1195	<	int tokens = 0;
1196	<	size_t len = 0;
1197	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1198	<
1199	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1200	<	{
1201	<	dlinkDelete(ptr, &support_list_lines);
1202	<	MyFree(ptr->data);
1203	<	free_dlink_node(ptr);
1204	<	}
1205	<
1206	<	DLINK_FOREACH(ptr, support_list.head)
1207	<	{
1208	<	struct Isupport *support = ptr->data;
1209	<
1210	<	p += (n = sprintf(p, "%s", support->name));
1211	<	len += n;
1212	<
1213	<	if (support->options)
1214	<	{
1215	<	p += (n = sprintf(p, "=%s", support->options));
1216	<	len += n;
1217	<	}
1218	<
1219	<	if (support->number > 0)
1220	<	{
1221	<	p += (n = sprintf(p, "=%d", support->number));
1222	<	len += n;
1223	<	}
1224	<
1225	<	*p++ = ' ';
1226	<	len++;
1227	<	*p = '\0';
1228	<
1229	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1230	<	{ /* arbritrary for now */
1231	<	if (*--p == ' ')
1232	<	*p = '\0';
1233	<
1234	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1235	<	p = isupportbuffer;
1236	<	len = 0;
1237	<	n = tokens = 0;
1238	<	}
1239	<	}
1240	<
1241	<	if (len)
1242	<	{
1243	<	if (*--p == ' ')
1244	<	*p = '\0';
1245	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1246	<	}
879	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%s is now an operator",
880	>	get_oper_name(source_p));
881	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
882	>	me.id, get_oper_name(source_p));
883	>	send_umode_out(source_p, old);
884	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
885		}

Diff Legend

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