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 6156 by michael, Thu Jun 18 09:19:25 2015 UTC vs.
Revision 7630 by michael, Tue Jun 28 16:46:50 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2016 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 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"
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41	+	#include "conf_gecos.h"
42		#include "log.h"
43		#include "server.h"
44		#include "send.h"
#	Line 47 | Line 49
49		#include "misc.h"
50		#include "parse.h"
51		#include "watch.h"
52	+	#include "isupport.h"
53	+	#include "tls.h"
54
55		static char umode_buffer[IRCD_BUFSIZE];
52	–	static const char *uid_get(void);
53	–
54	–	/* Used for building up the isupport string,
55	–	* used with init_isupport, add_isupport, delete_isupport
56	–	*/
57	–	struct Isupport
58	–	{
59	–	dlink_node node;
60	–	char *name;
61	–	char *options;
62	–	int number;
63	–	};
64	–
65	–	static dlink_list support_list;
66	–	static dlink_list support_list_lines;
56
57		const struct user_modes *umode_map[256];
58		const struct user_modes  umode_tab[] =
#	Line 100 | Line 89 | const struct user_modes  umode_tab[] =
89		};
90
91		void
92	<	user_usermodes_init(void)
92	>	user_modes_init(void)
93		{
94		char *umode_buffer_ptr = umode_buffer;
95
#	Line 120 | Line 109 | user_usermodes_init(void)
109		* side effects - display to client user counts etc.
110		*/
111		void
112	<	show_lusers(struct Client *source_p)
112	>	show_lusers(struct Client *client_p)
113		{
114	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
115	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
115	>	sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
116		Count.invisi, dlink_list_length(&global_server_list));
117		else
118	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
118	>	sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
119		Count.invisi, 1);
120
121		if (Count.oper)
122	<	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
122	>	sendto_one_numeric(client_p, &me, RPL_LUSEROP, Count.oper);
123
124		if (dlink_list_length(&unknown_list))
125	<	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
125	>	sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126
127		if (dlink_list_length(&channel_list))
128	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
128	>	sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
129
130	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
130	>	if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
131		{
132	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
133	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
132	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, Count.local, Count.myserver);
133	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
134		}
135		else
136		{
137	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
138	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
137	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, Count.total, 0);
138	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
139		}
140
141	<	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
141	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
142
143	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
144	<	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
143	>	if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
144	>	sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con,
145		Count.max_loc_cli, Count.totalrestartcount);
146
147		if (Count.local > Count.max_loc_cli)
#	Line 162 | Line 151 | show_lusers(struct Client *source_p)
151		Count.max_loc_con = Count.local + Count.myserver;
152		}
153
165	–	/* show_isupport()
166	–	*
167	–	* inputs       - pointer to client
168	–	* output       - NONE
169	–	* side effects - display to client what we support (for them)
170	–	*/
171	–	void
172	–	show_isupport(struct Client *source_p)
173	–	{
174	–	const dlink_node *node = NULL;
175	–
176	–	DLINK_FOREACH(node, support_list_lines.head)
177	–	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178	–	}
179	–
180	–
154		/* report_and_set_user_flags()
155		*
156	<	* inputs       - pointer to source_p
156	>	* inputs       - pointer to client_p
157		*              - pointer to conf for this user
158		* output       - NONE
159		* side effects - Report to user any special flags
160		*                they are getting, and set them.
161		*/
162		static void
163	<	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
163	>	report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
164		{
165		/* If this user is being spoofed, tell them so */
166		if (IsConfDoSpoofIp(conf))
167	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
167	>	sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
168
169		/* If this user is in the exception class, set it "E lined" */
170		if (IsConfExemptKline(conf))
171		{
172	<	SetExemptKline(source_p);
173	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172	>	AddFlag(client_p, FLAGS_EXEMPTKLINE);
173	>	sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
174		}
175
176		if (IsConfExemptXline(conf))
177		{
178	<	SetExemptXline(source_p);
179	<	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178	>	AddFlag(client_p, FLAGS_EXEMPTXLINE);
179	>	sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
180		}
181
182		if (IsConfExemptResv(conf))
183		{
184	<	SetExemptResv(source_p);
185	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	>	AddFlag(client_p, FLAGS_EXEMPTRESV);
185	>	sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
186		}
187
188		/* If this user is exempt from user limits set it "F lined" */
189		if (IsConfExemptLimits(conf))
190		{
191	<	SetExemptLimits(source_p);
192	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	>	AddFlag(client_p, FLAGS_NOLIMIT);
192	>	sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
193		}
194
195		if (IsConfCanFlood(conf))
196		{
197	<	SetCanFlood(source_p);
198	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
226	<	"protection, aren't you fearsome.");
197	>	AddFlag(client_p, FLAGS_CANFLOOD);
198	>	sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
199		}
200		}
201
202		/* introduce_client()
203		*
204	<	* inputs       - source_p
204	>	* inputs       - client_p
205		* output       - NONE
206		* side effects - This common function introduces a client to the rest
207		*                of the net, either from a local client connect or
208		*                from a remote connect.
209		*/
210		static void
211	<	introduce_client(struct Client *source_p)
211	>	introduce_client(struct Client *client_p)
212		{
213		dlink_node *node = NULL;
214		char ubuf[IRCD_BUFSIZE] = "";
215
216	<	if (MyClient(source_p))
217	<	send_umode(source_p, source_p, 0, ubuf);
246	<	else
247	<	send_umode(NULL, source_p, 0, ubuf);
248	<
249	<	watch_check_hash(source_p, RPL_LOGON);
216	>	send_umode(client_p, MyConnect(client_p), 0, ubuf);
217	>	watch_check_hash(client_p, RPL_LOGON);
218
219		if (ubuf[0] == '\0')
220		{
#	Line 256 | Line 224 | introduce_client(struct Client *source_p
224
225		DLINK_FOREACH(node, local_server_list.head)
226		{
227	<	struct Client *server = node->data;
227	>	struct Client *server_p = node->data;
228
229	<	if (server == source_p->from)
229	>	if (server_p == client_p->from)
230		continue;
231
232	<	if (IsCapable(server, CAP_SVS))
233	<	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
234	<	source_p->servptr->id,
235	<	source_p->name, source_p->hopcount+1,
236	<	(unsigned long)source_p->tsinfo,
237	<	ubuf, source_p->username, source_p->host,
238	<	source_p->sockhost, source_p->id,
239	<	source_p->account,
272	<	source_p->info);
273	<	else
274	<	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
275	<	source_p->servptr->id,
276	<	source_p->name, source_p->hopcount+1,
277	<	(unsigned long)source_p->tsinfo,
278	<	ubuf, source_p->username, source_p->host,
279	<	source_p->sockhost, source_p->id, source_p->info);
232	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
233	>	client_p->servptr->id,
234	>	client_p->name, client_p->hopcount+1,
235	>	client_p->tsinfo,
236	>	ubuf, client_p->username, client_p->host,
237	>	client_p->sockhost, client_p->id,
238	>	client_p->account,
239	>	client_p->info);
240
241	<	if (!EmptyString(source_p->certfp))
242	<	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
241	>	if (!EmptyString(client_p->certfp))
242	>	sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
243		}
244		}
245
#	Line 290 | Line 250 | introduce_client(struct Client *source_p
250		* side effects -
251		*/
252		static void
253	<	user_welcome(struct Client *source_p)
253	>	user_welcome(struct Client *client_p)
254		{
295	–	#if defined(__TIME__) && defined(__DATE__)
255		static const char built_date[] = __DATE__ " at " __TIME__;
297	–	#else
298	–	static const char built_date[] = "unknown";
299	–	#endif
300	–
301	–	#ifdef HAVE_LIBCRYPTO
302	–	if (HasFlag(source_p, FLAGS_SSL))
303	–	{
304	–	AddUMode(source_p, UMODE_SSL);
305	–	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
306	–	ssl_get_cipher(source_p->connection->fd.ssl));
307	–	}
308	–	#endif
309	–
310	–	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
311	–	source_p->name);
312	–	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
313	–	get_listener_name(source_p->connection->listener), ircd_version);
314	–	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
315	–	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
316	–	show_isupport(source_p);
317	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
256
257	<	show_lusers(source_p);
258	<	motd_signon(source_p);
257	>	if (HasFlag(client_p, FLAGS_SSL))
258	>	{
259	>	AddUMode(client_p, UMODE_SSL);
260	>	sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
261	>	tls_get_cipher(&client_p->connection->fd.ssl));
262	>	}
263	>
264	>	sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
265	>	client_p->name);
266	>	sendto_one_numeric(client_p, &me, RPL_YOURHOST,
267	>	listener_get_name(client_p->connection->listener), ircd_version);
268	>	sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
269	>	sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
270	>
271	>	isupport_show(client_p);
272	>	show_lusers(client_p);
273	>	motd_signon(client_p);
274		}
275
276		/* check_xline()
#	Line 327 | Line 280 | user_welcome(struct Client *source_p)
280		* side effects -
281		*/
282		static int
283	<	check_xline(struct Client *source_p)
283	>	check_xline(struct Client *client_p)
284		{
285	<	struct MaskItem *conf = NULL;
285	>	const struct GecosItem *gecos = NULL;
286
287	<	if (IsExemptXline(source_p))
287	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
288		return 0;
289
290	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
290	>	if ((gecos = gecos_find(client_p->info, match)))
291		{
339	–	++conf->count;
292		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
293		"X-line Rejecting [%s] [%s], user %s [%s]",
294	<	source_p->info, conf->reason,
295	<	get_client_name(source_p, HIDE_IP),
296	<	source_p->sockhost);
294	>	client_p->info, gecos->reason,
295	>	get_client_name(client_p, HIDE_IP),
296	>	client_p->sockhost);
297
298		++ServerStats.is_ref;
299	<	exit_client(source_p, "Bad user info");
299	>	exit_client(client_p, "Bad user info");
300		return 1;
301		}
302
#	Line 354 | Line 306 | check_xline(struct Client *source_p)
306		/*! \brief This function is called when both NICK and USER messages
307		*      have been accepted for the client, in whatever order. Only
308		*      after this, is the UID message propagated.
309	<	* \param source_p Pointer to given client to introduce
309	>	* \param client_p Pointer to given client to introduce
310		*/
311		void
312	<	register_local_user(struct Client *source_p)
312	>	register_local_user(struct Client *client_p)
313		{
362	–	const char *id = NULL;
314		const struct MaskItem *conf = NULL;
315
316	<	assert(source_p == source_p->from);
317	<	assert(MyConnect(source_p));
318	<	assert(IsUnknown(source_p));
319	<	assert(!source_p->connection->registration);
316	>	assert(client_p == client_p->from);
317	>	assert(MyConnect(client_p));
318	>	assert(IsUnknown(client_p));
319	>	assert(!client_p->connection->registration);
320
321		if (ConfigGeneral.ping_cookie)
322		{
323	<	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
323	>	if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping)
324		{
325		do
326	<	source_p->connection->random_ping = genrand_int32();
327	<	while (!source_p->connection->random_ping);
326	>	client_p->connection->random_ping = genrand_int32();
327	>	while (!client_p->connection->random_ping);
328
329	<	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
330	<	SetPingSent(source_p);
329	>	sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
330	>	AddFlag(client_p, FLAGS_PINGSENT);
331		return;
332		}
333
334	<	if (!HasPingCookie(source_p))
334	>	if (!HasFlag(client_p, FLAGS_PING_COOKIE))
335		return;
336		}
337
338	<	source_p->connection->last_privmsg = CurrentTime;
338	>	client_p->connection->last_privmsg = CurrentTime;
339		/* Straight up the maximum rate of flooding... */
340	<	source_p->connection->allow_read = MAX_FLOOD_BURST;
340	>	client_p->connection->allow_read = MAX_FLOOD_BURST;
341
342	<	if (!check_client(source_p))
342	>	if (!check_client(client_p))
343		return;
344
345	<	if (!valid_hostname(source_p->host))
345	>	if (!valid_hostname(client_p->host))
346		{
347	<	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
347	>	sendto_one_notice(client_p, &me, ":*** Notice -- You have an illegal "
348		"character in your hostname");
349	<	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
349	>	strlcpy(client_p->host, client_p->sockhost, sizeof(client_p->host));
350		}
351
352	<	conf = source_p->connection->confs.head->data;
352	>	conf = client_p->connection->confs.head->data;
353
354	<	if (!IsGotId(source_p))
354	>	if (!HasFlag(client_p, FLAGS_GOTID))
355		{
356		char username[USERLEN + 1] = "";
406	–	const char *p = username;
357		unsigned int i = 0;
358
359		if (IsNeedIdentd(conf))
360		{
361		++ServerStats.is_ref;
362	<	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
362	>	sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
363		"identd to use this server");
364	<	exit_client(source_p, "Install identd");
364	>	exit_client(client_p, "Install identd");
365		return;
366		}
367
368	<	strlcpy(username, source_p->username, sizeof(username));
368	>	strlcpy(username, client_p->username, sizeof(username));
369
370		if (!IsNoTilde(conf))
371	<	source_p->username[i++] = '~';
371	>	client_p->username[i++] = '~';
372
373	<	for (; *p && i < USERLEN; ++p)
374	<	source_p->username[i++] = *p;
373	>	for (const char *p = username; *p && i < USERLEN; ++p)
374	>	client_p->username[i++] = *p;
375
376	<	source_p->username[i] = '\0';
376	>	client_p->username[i] = '\0';
377		}
378
379		/* Password check */
380		if (!EmptyString(conf->passwd))
381		{
382	<	if (!match_conf_password(source_p->connection->password, conf))
382	>	if (!match_conf_password(client_p->connection->password, conf))
383		{
384		++ServerStats.is_ref;
385
386	<	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
387	<	exit_client(source_p, "Bad Password");
386	>	sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
387	>	exit_client(client_p, "Bad Password");
388		return;
389		}
390		}
391
392		/*
393	<	* Don't free source_p->connection->password here - it can be required
393	>	* Don't free client_p->connection->password here - it can be required
394		* by masked /stats I if there are auth {} blocks with need_password = no;
395		* --adx
396		*/
397
398		/*
399	<	* Report if user has &^>= etc. and set flags as needed in source_p
399	>	* Report if user has &^>= etc. and set flags as needed in client_p
400		*/
401	<	report_and_set_user_flags(source_p, conf);
401	>	report_and_set_user_flags(client_p, conf);
402
403	<	if (IsDead(source_p))
403	>	if (IsDead(client_p))
404		return;
405
406		/*
#	Line 462 | Line 412 | register_local_user(struct Client *sourc
412		*   -Taner
413		*/
414		if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
415	<	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
415	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
416		{
417		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
418		"Too many clients, rejecting %s[%s].",
419	<	source_p->name, source_p->host);
419	>	client_p->name, client_p->host);
420		++ServerStats.is_ref;
421	<	exit_client(source_p, "Sorry, server is full - try later");
421	>	exit_client(client_p, "Sorry, server is full - try later");
422		return;
423		}
424
425	<	if (!valid_username(source_p->username, 1))
425	>	if (!valid_username(client_p->username, 1))
426		{
427		char buf[IRCD_BUFSIZE] = "";
428
429		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
430		"Invalid username: %s (%s@%s)",
431	<	source_p->name, source_p->username, source_p->host);
431	>	client_p->name, client_p->username, client_p->host);
432		++ServerStats.is_ref;
433	<	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
434	<	exit_client(source_p, buf);
433	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
434	>	exit_client(client_p, buf);
435		return;
436		}
437
438	<	if (check_xline(source_p))
438	>	if (check_xline(client_p))
439		return;
440
441	+	const char *id;
442		while (hash_find_id((id = uid_get())))
443		;
444
445	<	strlcpy(source_p->id, id, sizeof(source_p->id));
446	<	hash_add_id(source_p);
445	>	strlcpy(client_p->id, id, sizeof(client_p->id));
446	>	hash_add_id(client_p);
447
448		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
449		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
450	<	source_p->name, source_p->username, source_p->host,
451	<	source_p->sockhost,
452	<	get_client_class(&source_p->connection->confs),
453	<	source_p->info, source_p->id);
450	>	client_p->name, client_p->username, client_p->host,
451	>	client_p->sockhost,
452	>	get_client_class(&client_p->connection->confs),
453	>	client_p->info, client_p->id);
454
455		if (ConfigGeneral.invisible_on_connect)
456		{
457	<	AddUMode(source_p, UMODE_INVISIBLE);
457	>	AddUMode(client_p, UMODE_INVISIBLE);
458		++Count.invisi;
459		}
460
#	Line 512 | Line 463 | register_local_user(struct Client *sourc
463		Count.max_loc = Count.local;
464
465		if (!(Count.max_loc % 10))
466	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
466	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
467		"New maximum local client connections: %u",
468		Count.max_loc);
469		}
#	Line 521 | Line 472 | register_local_user(struct Client *sourc
472		Count.max_tot = Count.total;
473		++Count.totalrestartcount;
474
475	<	assert(source_p->servptr == &me);
476	<	SetClient(source_p);
477	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
478	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
475	>	assert(client_p->servptr == &me);
476	>	SetClient(client_p);
477	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
478	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
479
480	<	assert(dlinkFind(&unknown_list, source_p));
480	>	assert(dlinkFind(&unknown_list, client_p));
481
482	<	dlink_move_node(&source_p->connection->lclient_node,
482	>	dlink_move_node(&client_p->connection->lclient_node,
483		&unknown_list, &local_client_list);
484
485	<	user_welcome(source_p);
486	<	add_user_host(source_p->username, source_p->host, 0);
487	<	SetUserHost(source_p);
485	>	user_welcome(client_p);
486	>	userhost_add(client_p->sockhost, 0);
487	>	AddFlag(client_p, FLAGS_USERHOST);
488
489	<	introduce_client(source_p);
489	>	introduce_client(client_p);
490		}
491
492		/* register_remote_user()
493		*
494	<	* inputs       - source_p remote or directly connected client
494	>	* inputs       - client_p remote or directly connected client
495		*              - username to register as
496		*              - host name to register as
497		*              - server name
#	Line 549 | Line 500 | register_local_user(struct Client *sourc
500		*                is introduced by a server.
501		*/
502		void
503	<	register_remote_user(struct Client *source_p)
503	>	register_remote_user(struct Client *client_p)
504		{
505	<	const struct Client *target_p = NULL;
555	<
556	<	if ((target_p = source_p->servptr) && target_p->from != source_p->from)
557	<	{
558	<	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
559	<	"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
560	<	source_p->from->name, source_p->name, source_p->username,
561	<	source_p->host, source_p->servptr->name,
562	<	target_p->name, target_p->from->name);
563	<	sendto_one(source_p->from,
564	<	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
565	<	me.id, source_p->id, me.name, source_p->servptr->name,
566	<	target_p->from->name);
567	<
568	<	AddFlag(source_p, FLAGS_KILLED);
569	<	exit_client(source_p, "UID server wrong direction");
570	<	return;
571	<	}
505	>	assert(client_p->servptr->from == client_p->from);
506
507		/*
508		* If the nick has been introduced by a services server,
509		* make it a service as well.
510		*/
511	<	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
512	<	AddFlag(source_p, FLAGS_SERVICE);
511	>	if (HasFlag(client_p->servptr, FLAGS_SERVICE))
512	>	AddFlag(client_p, FLAGS_SERVICE);
513
514		if (++Count.total > Count.max_tot)
515		Count.max_tot = Count.total;
516
517	<	SetClient(source_p);
518	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
519	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
520	<	add_user_host(source_p->username, source_p->host, 1);
521	<	SetUserHost(source_p);
517	>	SetClient(client_p);
518	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
519	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
520	>	userhost_add(client_p->sockhost, 1);
521	>	AddFlag(client_p, FLAGS_USERHOST);
522
523	<	if (HasFlag(source_p->servptr, FLAGS_EOB))
523	>	if (HasFlag(client_p->servptr, FLAGS_EOB))
524		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
525		"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
526	<	source_p->servptr->name,
527	<	source_p->name, source_p->username, source_p->host,
528	<	source_p->sockhost, source_p->info, source_p->id);
526	>	client_p->servptr->name,
527	>	client_p->name, client_p->username, client_p->host,
528	>	client_p->sockhost, client_p->info, client_p->id);
529
530	<	introduce_client(source_p);
530	>	introduce_client(client_p);
531		}
532
533		/* valid_hostname()
#	Line 636 | Line 570 | valid_hostname(const char *hostname)
570		int
571		valid_username(const char *username, const int local)
572		{
639	–	unsigned int dots = 0;
573		const char *p = username;
574
575		assert(p);
#	Line 654 | Line 587 | valid_username(const char *username, con
587
588		if (local)
589		{
590	+	unsigned int dots = 0;
591	+
592		while (*++p)
593		{
594		if (*p == '.' && ConfigGeneral.dots_in_ident)
#	Line 704 | Line 639 | valid_nickname(const char *nickname, con
639		return p - nickname <= NICKLEN;
640		}
641
642	<	/* send_umode()
643	<	* send the MODE string for user (user) to connection client_p
644	<	* -avalon
645	<	*
646	<	* inputs       - client_p
712	<	*              - source_p
713	<	*              - int old
714	<	*              - sendmask mask of modes to send
715	<	*              - suplied umode_buf
716	<	* output       - NONE
642	>	/*! \brief Builds a mode change string to buffer pointed by \a buf
643	>	* \param client_p  Pointer to client
644	>	* \param send      Whether to send a MODE message to client_p
645	>	* \param old       Old user mode to compare against when building new mode buffer
646	>	* \param buf       Pointer to buffer to build string in
647		*/
648		void
649	<	send_umode(struct Client *client_p, struct Client *source_p,
650	<	unsigned int old, char *umode_buf)
649	>	send_umode(struct Client *client_p, unsigned int send,
650	>	unsigned int old, char *buf)
651		{
652	<	char *m = umode_buf;
652	>	char *m = buf;
653		int what = 0;
654
655		/*
656		* Build a string in umode_buf to represent the change in the user's
657	<	* mode between the new (source_p->umodes) and 'old'.
657	>	* mode between the new (client_p->umodes) and 'old'.
658		*/
659		for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
660		{
661	<	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
661	>	if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
662		{
663		if (what == MODE_DEL)
664		*m++ = tab->c;
#	Line 739 | Line 669 | send_umode(struct Client *client_p, stru
669		*m++ = tab->c;
670		}
671		}
672	<	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
672	>	else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
673		{
674		if (what == MODE_ADD)
675		*m++ = tab->c;
#	Line 754 | Line 684 | send_umode(struct Client *client_p, stru
684
685		*m = '\0';
686
687	<	if (*umode_buf && client_p)
687	>	if (send && *buf)
688		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
689		client_p->name, client_p->username,
690	<	client_p->host, client_p->name, umode_buf);
690	>	client_p->host, client_p->name, buf);
691		}
692
693		/* send_umode_out()
#	Line 767 | Line 697 | send_umode(struct Client *client_p, stru
697		* side effects - Only send ubuf out to servers that know about this client
698		*/
699		void
700	<	send_umode_out(struct Client *source_p, unsigned int old)
700	>	send_umode_out(struct Client *client_p, unsigned int old)
701		{
702		char buf[IRCD_BUFSIZE] = "";
703
704	<	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
704	>	send_umode(client_p, MyConnect(client_p), old, buf);
705
706		if (buf[0])
707	<	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
708	<	source_p->id, source_p->id, buf);
707	>	sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
708	>	client_p->id, client_p->id, buf);
709		}
710
711		void
712	<	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
712	>	user_set_hostmask(struct Client *client_p, const char *hostname, const int what)
713		{
714		dlink_node *node = NULL;
715
716	<	if (!strcmp(target_p->host, hostname))
716	>	if (!strcmp(client_p->host, hostname))
717		return;
718
719		switch (what)
720		{
721		case MODE_ADD:
722	<	AddUMode(target_p, UMODE_HIDDENHOST);
722	>	AddUMode(client_p, UMODE_HIDDENHOST);
723		break;
724		case MODE_DEL:
725	<	DelUMode(target_p, UMODE_HIDDENHOST);
725	>	DelUMode(client_p, UMODE_HIDDENHOST);
726		break;
727		default: return;
728		}
729
730		if (ConfigGeneral.cycle_on_host_change)
731	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
732	<	target_p->name, target_p->username, target_p->host);
803	<
804	<	if (IsUserHostIp(target_p))
805	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
731	>	sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
732	>	client_p->name, client_p->username, client_p->host);
733
734	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
734	>	sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
735	>	client_p->name, client_p->username,
736	>	client_p->host, client_p->username, hostname);
737
738	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
810	<	SetUserHost(target_p);
738	>	strlcpy(client_p->host, hostname, sizeof(client_p->host));
739
740	<	if (MyClient(target_p))
740	>	if (MyConnect(client_p))
741		{
742	<	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
743	<	clear_ban_cache_client(target_p);
742	>	sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
743	>	clear_ban_cache_client(client_p);
744		}
745
746		if (!ConfigGeneral.cycle_on_host_change)
747		return;
748
749	<	DLINK_FOREACH(node, target_p->channel.head)
749	>	DLINK_FOREACH(node, client_p->channel.head)
750		{
751	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
751	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
752	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
753		char *p = modebuf;
754		int len = 0;
755		const struct Membership *member = node->data;
#	Line 828 | Line 757 | user_set_hostmask(struct Client *target_
757		if (has_member_flags(member, CHFL_CHANOP))
758		{
759		*p++ = 'o';
760	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
760	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
761		}
762
763		if (has_member_flags(member, CHFL_HALFOP))
764		{
765		*p++ = 'h';
766	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
766	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
767		}
768
769		if (has_member_flags(member, CHFL_VOICE))
770		{
771		*p++ = 'v';
772	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
772	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
773		}
774
775		*p = '\0';
776
777	<
778	<	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
779	<	target_p->name, target_p->username,
780	<	target_p->host, member->chptr->name,
781	<	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
782	<	target_p->info);
783	<	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
855	<	target_p->name, target_p->username,
856	<	target_p->host, member->chptr->name);
777	>	sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
778	>	client_p->name, client_p->username,
779	>	client_p->host, member->chptr->name,
780	>	client_p->account, client_p->info);
781	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
782	>	client_p->name, client_p->username,
783	>	client_p->host, member->chptr->name);
784
785		if (nickbuf[0])
786	<	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
787	<	target_p->servptr->name, member->chptr->name,
788	<	modebuf, nickbuf);
862	<
786	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
787	>	client_p->servptr->name, member->chptr->name,
788	>	modebuf, nickbuf);
789		}
790
791	<	if (target_p->away[0])
792	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
791	>	if (client_p->away[0])
792	>	sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
793		":%s!%s@%s AWAY :%s",
794	<	target_p->name, target_p->username,
795	<	target_p->host, target_p->away);
870	<	}
871	<
872	<	/*! \brief Blindly opers up given source_p, using conf info.
873	<	*         All checks on passwords have already been done.
874	<	* \param source_p Pointer to given client to oper
875	<	*/
876	<	void
877	<	oper_up(struct Client *source_p)
878	<	{
879	<	const unsigned int old = source_p->umodes;
880	<	const struct MaskItem *const conf = source_p->connection->confs.head->data;
881	<
882	<	assert(source_p->connection->confs.head);
883	<
884	<	++Count.oper;
885	<	SetOper(source_p);
886	<
887	<	if (conf->modes)
888	<	AddUMode(source_p, conf->modes);
889	<	else if (ConfigGeneral.oper_umodes)
890	<	AddUMode(source_p, ConfigGeneral.oper_umodes);
891	<
892	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
893	<	++Count.invisi;
894	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
895	<	--Count.invisi;
896	<
897	<	assert(dlinkFind(&oper_list, source_p) == NULL);
898	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
899	<
900	<	AddOFlag(source_p, conf->port);
901	<
902	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
903	<	AddUMode(source_p, UMODE_ADMIN);
904	<
905	<	if (!EmptyString(conf->whois))
906	<	{
907	<	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
908	<	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
909	<	me.id, source_p->id, (unsigned long)source_p->tsinfo,
910	<	RPL_WHOISOPERATOR, conf->whois);
911	<	}
912	<
913	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
914	<	get_oper_name(source_p));
915	<	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
916	<	me.id, get_oper_name(source_p));
917	<	send_umode_out(source_p, old);
918	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
919	<	}
920	<
921	<	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
922	<
923	<	int
924	<	valid_sid(const char *sid)
925	<	{
926	<	if (strlen(sid) == IRC_MAXSID)
927	<	if (IsDigit(*sid))
928	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
929	<	return 1;
930	<
931	<	return 0;
932	<	}
933	<
934	<	/*
935	<	* init_uid()
936	<	*
937	<	* inputs       - NONE
938	<	* output       - NONE
939	<	* side effects - new_uid is filled in with server id portion (sid)
940	<	*                (first 3 bytes). Rest is filled in with '9'.
941	<	*
942	<	*/
943	<	void
944	<	init_uid(void)
945	<	{
946	<	snprintf(new_uid, sizeof(new_uid), "%s999999", me.id);
947	<	}
948	<
949	<	/*
950	<	* add_one_to_uid
951	<	*
952	<	* inputs       - index number into new_uid
953	<	* output       - NONE
954	<	* side effects - new_uid is incremented by one
955	<	*                note this is a recursive function
956	<	*/
957	<	static void
958	<	add_one_to_uid(unsigned int i)
959	<	{
960	<	if (i < IRC_MAXSID)
961	<	return;
962	<
963	<	if (new_uid[i] == 'Z')
964	<	new_uid[i] = '0';
965	<	else if (new_uid[i] == '9')
966	<	{
967	<	new_uid[i] = 'A';
968	<	add_one_to_uid(i - 1);
969	<	}
970	<	else
971	<	++new_uid[i];
972	<	}
973	<
974	<	/*
975	<	* uid_get
976	<	*
977	<	* inputs       - struct Client *
978	<	* output       - new UID is returned to caller
979	<	* side effects - new_uid is incremented by one.
980	<	*/
981	<	static const char *
982	<	uid_get(void)
983	<	{
984	<	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
985	<	return new_uid;
986	<	}
987	<
988	<	/*
989	<	* init_isupport()
990	<	*
991	<	* input        - NONE
992	<	* output       - NONE
993	<	* side effects - Must be called before isupport is enabled
994	<	*/
995	<	void
996	<	init_isupport(void)
997	<	{
998	<	add_isupport("CALLERID", NULL, -1);
999	<	add_isupport("CASEMAPPING", "rfc1459", -1);
1000	<	add_isupport("DEAF", "D", -1);
1001	<	add_isupport("KICKLEN", NULL, KICKLEN);
1002	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1003	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1004	<	add_isupport("STATUSMSG", "@%+", -1);
1005	<	add_isupport("EXCEPTS", NULL, -1);
1006	<	add_isupport("INVEX", NULL, -1);
1007	<	}
1008	<
1009	<	/*
1010	<	* add_isupport()
1011	<	*
1012	<	* input        - name of supported function
1013	<	*              - options if any
1014	<	*              - number if any
1015	<	* output       - NONE
1016	<	* side effects - Each supported item must call this when activated
1017	<	*/
1018	<	void
1019	<	add_isupport(const char *name, const char *options, int n)
1020	<	{
1021	<	dlink_node *node = NULL;
1022	<	struct Isupport *support = NULL;
1023	<
1024	<	DLINK_FOREACH(node, support_list.head)
1025	<	{
1026	<	support = node->data;
1027	<	if (irccmp(support->name, name) == 0)
1028	<	{
1029	<	MyFree(support->name);
1030	<	MyFree(support->options);
1031	<	break;
1032	<	}
1033	<	}
1034	<
1035	<	if (node == NULL)
1036	<	{
1037	<	support = MyCalloc(sizeof(*support));
1038	<	dlinkAddTail(support, &support->node, &support_list);
1039	<	}
1040	<
1041	<	support->name = xstrdup(name);
1042	<	if (options)
1043	<	support->options = xstrdup(options);
1044	<	support->number = n;
1045	<
1046	<	rebuild_isupport_message_line();
1047	<	}
1048	<
1049	<	/*
1050	<	* delete_isupport()
1051	<	*
1052	<	* input        - name of supported function
1053	<	* output       - NONE
1054	<	* side effects - Each supported item must call this when deactivated
1055	<	*/
1056	<	void
1057	<	delete_isupport(const char *name)
1058	<	{
1059	<	dlink_node *node = NULL;
1060	<
1061	<	DLINK_FOREACH(node, support_list.head)
1062	<	{
1063	<	struct Isupport *support = node->data;
1064	<
1065	<	if (irccmp(support->name, name) == 0)
1066	<	{
1067	<	dlinkDelete(node, &support_list);
1068	<	MyFree(support->name);
1069	<	MyFree(support->options);
1070	<	MyFree(support);
1071	<	break;
1072	<	}
1073	<	}
1074	<
1075	<	rebuild_isupport_message_line();
1076	<	}
1077	<
1078	<	/*
1079	<	* rebuild_isupport_message_line
1080	<	*
1081	<	* input        - NONE
1082	<	* output       - NONE
1083	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1084	<	*/
1085	<	void
1086	<	rebuild_isupport_message_line(void)
1087	<	{
1088	<	char isupportbuffer[IRCD_BUFSIZE];
1089	<	char *p = isupportbuffer;
1090	<	dlink_node *node = NULL, *node_next = NULL;
1091	<	int n = 0;
1092	<	int tokens = 0;
1093	<	size_t len = 0;
1094	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1095	<
1096	<	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1097	<	{
1098	<	dlinkDelete(node, &support_list_lines);
1099	<	MyFree(node->data);
1100	<	free_dlink_node(node);
1101	<	}
1102	<
1103	<	DLINK_FOREACH(node, support_list.head)
1104	<	{
1105	<	struct Isupport *support = node->data;
1106	<
1107	<	p += (n = sprintf(p, "%s", support->name));
1108	<	len += n;
1109	<
1110	<	if (support->options)
1111	<	{
1112	<	p += (n = sprintf(p, "=%s", support->options));
1113	<	len += n;
1114	<	}
1115	<
1116	<	if (support->number > 0)
1117	<	{
1118	<	p += (n = sprintf(p, "=%d", support->number));
1119	<	len += n;
1120	<	}
1121	<
1122	<	*p++ = ' ';
1123	<	len++;
1124	<	*p = '\0';
1125	<
1126	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1127	<	{ /* arbritrary for now */
1128	<	if (*--p == ' ')
1129	<	*p = '\0';
1130	<
1131	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1132	<	p = isupportbuffer;
1133	<	len = 0;
1134	<	n = tokens = 0;
1135	<	}
1136	<	}
1137	<
1138	<	if (len)
1139	<	{
1140	<	if (*--p == ' ')
1141	<	*p = '\0';
1142	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1143	<	}
794	>	client_p->name, client_p->username,
795	>	client_p->host, client_p->away);
796		}

Diff Legend

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