ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2159 by michael, Sun Jun 2 18:22:01 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4972 by michael, Mon Dec 1 16:28:11 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 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 16 | 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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
45	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
51	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
56	–
57	–	static void user_welcome(struct Client *);
58	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59	–	static int check_xline(struct Client *);
60	–	static void introduce_client(struct Client *);
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	<
67	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 85 | Line 75 | const unsigned int user_modes[256] =
75		0,                  /* @ */
76		0,                  /* A */
77		0,                  /* B */
78	<	UMODE_CCONN_FULL,   /* C */
78	>	0,                  /* C */
79		UMODE_DEAF,         /* D */
80		0,                  /* E */
81		UMODE_FARCONNECT,   /* F */
#	Line 101 | Line 91 | const unsigned int user_modes[256] =
91		0,                  /* P */
92		0,                  /* Q */
93		UMODE_REGONLY,      /* R */
94	<	0,                  /* S */
94	>	UMODE_SSL,          /* S */
95		0,                  /* T */
96		0,                  /* U */
97		0,                  /* V */
98	<	0,                  /* W */
98	>	UMODE_WEBIRC,       /* W */
99		0,                  /* X */
100		0,                  /* Y */
101		0,                  /* Z 0x5A */
102	<	0, 0, 0, 0, 0,      /* 0x5F   */
102	>	0, 0, 0, 0, 0,      /* 0x5F   */
103		0,                  /* 0x60   */
104		UMODE_ADMIN,        /* a */
105		UMODE_BOTS,         /* b */
#	Line 126 | Line 116 | const unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121		UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
#	Line 136 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
127		UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 169 | Line 159 | assemble_umode_buffer(void)
159		* side effects - display to client user counts etc.
160		*/
161		void
162	<	show_lusers(struct Client *source_p)
162	>	show_lusers(struct Client *source_p)
163		{
174	–	const char *from, *to;
175	–
176	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
177	–	{
178	–	from = me.id;
179	–	to = source_p->id;
180	–	}
181	–	else
182	–	{
183	–	from = me.name;
184	–	to = source_p->name;
185	–	}
186	–
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
166	<	from, to, (Count.total-Count.invisi),
190	<	Count.invisi, dlink_list_length(&global_serv_list));
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
169	<	(Count.total-Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171	<	if (Count.oper > 0)
172	<	sendto_one(source_p, form_str(RPL_LUSEROP),
173	<	from, to, Count.oper);
174	<
175	<	if (dlink_list_length(&unknown_list) > 0)
176	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
177	<	from, to, dlink_list_length(&unknown_list));
178	<
203	<	if (dlink_list_length(&global_channel_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
171	>	if (Count.oper)
172	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173	>
174	>	if (dlink_list_length(&unknown_list))
175	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176	>
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
182	<	sendto_one(source_p, form_str(RPL_LUSERME),
183	<	from, to, Count.local, Count.myserver);
211	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
182	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
183	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
184		}
185		else
186		{
187	<	sendto_one(source_p, form_str(RPL_LUSERME),
188	<	from, to, Count.total, 0);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot);
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
188	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
189		}
190
191	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot);
191	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192
193		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
194	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
195	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
194	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
195	>	Count.max_loc_cli, Count.totalrestartcount);
196
197		if (Count.local > Count.max_loc_cli)
198		Count.max_loc_cli = Count.local;
199
200		if ((Count.local + Count.myserver) > Count.max_loc_con)
201	<	Count.max_loc_con = Count.local + Count.myserver;
201	>	Count.max_loc_con = Count.local + Count.myserver;
202		}
203
204		/* show_isupport()
#	Line 240 | Line 208 | show_lusers(struct Client *source_p)
208		* side effects - display to client what we support (for them)
209		*/
210		void
211	<	show_isupport(struct Client *source_p)
211	>	show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	<	source_p->name, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
219	>
220	>	/* report_and_set_user_flags()
221	>	*
222	>	* inputs       - pointer to source_p
223	>	*              - pointer to conf for this user
224	>	* output       - NONE
225	>	* side effects - Report to user any special flags
226	>	*                they are getting, and set them.
227	>	*/
228	>	static void
229	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
230	>	{
231	>	/* If this user is being spoofed, tell them so */
232	>	if (IsConfDoSpoofIp(conf))
233	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234	>
235	>	/* If this user is in the exception class, set it "E lined" */
236	>	if (IsConfExemptKline(conf))
237	>	{
238	>	SetExemptKline(source_p);
239	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
240	>	}
241	>
242	>	/*
243	>	* The else here is to make sure that G line exempt users
244	>	* do not get noticed twice.
245	>	*/
246	>	else if (IsConfExemptGline(conf))
247	>	{
248	>	SetExemptGline(source_p);
249	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
250	>	}
251	>
252	>	if (IsConfExemptResv(conf))
253	>	{
254	>	SetExemptResv(source_p);
255	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
256	>	}
257	>
258	>	/* If this user is exempt from user limits set it "F lined" */
259	>	if (IsConfExemptLimits(conf))
260	>	{
261	>	SetExemptLimits(source_p);
262	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
263	>	}
264	>
265	>	if (IsConfCanFlood(conf))
266	>	{
267	>	SetCanFlood(source_p);
268	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	>	"protection, aren't you fearsome.");
270	>	}
271	>	}
272	>
273	>	/* introduce_client()
274	>	*
275	>	* inputs       - source_p
276	>	* output       - NONE
277	>	* side effects - This common function introduces a client to the rest
278	>	*                of the net, either from a local client connect or
279	>	*                from a remote connect.
280	>	*/
281	>	static void
282	>	introduce_client(struct Client *source_p)
283	>	{
284	>	dlink_node *node = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(node, local_server_list.head)
301	>	{
302	>	struct Client *server = node->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315	>	source_p->info);
316	>	else
317	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
318	>	source_p->servptr->id,
319	>	source_p->name, source_p->hopcount+1,
320	>	(unsigned long)source_p->tsinfo,
321	>	ubuf, source_p->username, source_p->host,
322	>	source_p->sockhost, source_p->id, source_p->info);
323	>
324	>	if (!EmptyString(source_p->certfp))
325	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
326	>	}
327	>	}
328	>
329	>	/* user_welcome()
330	>	*
331	>	* inputs       - client pointer to client to welcome
332	>	* output       - NONE
333	>	* side effects -
334	>	*/
335	>	static void
336	>	user_welcome(struct Client *source_p)
337	>	{
338	>	#if defined(__TIME__) && defined(__DATE__)
339	>	static const char built_date[] = __DATE__ " at " __TIME__;
340	>	#else
341	>	static const char built_date[] = "unknown";
342	>	#endif
343	>
344	>	#ifdef HAVE_LIBCRYPTO
345	>	if (HasFlag(source_p, FLAGS_SSL))
346	>	{
347	>	AddUMode(source_p, UMODE_SSL);
348	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
349	>	ssl_get_cipher(source_p->connection->fd.ssl));
350	>	}
351	>	#endif
352	>
353	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
354	>	source_p->name);
355	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
356	>	get_listener_name(source_p->connection->listener), ircd_version);
357	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
358	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
359	>	show_isupport(source_p);
360	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
361	>
362	>	show_lusers(source_p);
363	>	motd_signon(source_p);
364	>	}
365	>
366	>	/* check_xline()
367	>	*
368	>	* inputs       - pointer to client to test
369	>	* outupt       - 1 if exiting 0 if ok
370	>	* side effects -
371	>	*/
372	>	static int
373	>	check_xline(struct Client *source_p)
374	>	{
375	>	struct MaskItem *conf = NULL;
376	>
377	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378	>	{
379	>	++conf->count;
380	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381	>	"X-line Rejecting [%s] [%s], user %s [%s]",
382	>	source_p->info, conf->reason,
383	>	get_client_name(source_p, HIDE_IP),
384	>	source_p->sockhost);
385	>
386	>	++ServerStats.is_ref;
387	>	exit_client(source_p, "Bad user info");
388	>	return 1;
389	>	}
390	>
391	>	return 0;
392	>	}
393	>
394	>	/*! \brief This function is called when both NICK and USER messages
395	>	*      have been accepted for the client, in whatever order. Only
396	>	*      after this, is the UID message propagated.
397	>	* \param source_p Pointer to given client to introduce
398	>	*/
399		void
400		register_local_user(struct Client *source_p)
401		{
402		const char *id = NULL;
403		const struct MaskItem *conf = NULL;
404
281	–	assert(source_p != NULL);
405		assert(source_p == source_p->from);
406		assert(MyConnect(source_p));
407	<	assert(!source_p->localClient->registration);
407	>	assert(!source_p->connection->registration);
408
409		ClearCap(source_p, CAP_TS6);
410
411	<	if (ConfigFileEntry.ping_cookie)
411	>	if (ConfigGeneral.ping_cookie)
412		{
413	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
413	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
414		{
415		do
416	<	source_p->localClient->random_ping = genrand_int32();
417	<	while (!source_p->localClient->random_ping);
416	>	source_p->connection->random_ping = genrand_int32();
417	>	while (!source_p->connection->random_ping);
418
419	<	sendto_one(source_p, "PING :%u",
297	<	source_p->localClient->random_ping);
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 303 | Line 425 | register_local_user(struct Client *sourc
425		return;
426		}
427
428	<	source_p->localClient->last_privmsg = CurrentTime;
428	>	source_p->connection->last_privmsg = CurrentTime;
429		/* Straight up the maximum rate of flooding... */
430	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
430	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
431
432		if (!check_client(source_p))
433		return;
434
435	<	if (valid_hostname(source_p->host) == 0)
435	>	if (!valid_hostname(source_p->host))
436		{
437	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
438	<	"character in your hostname", me.name, source_p->name);
439	<	strlcpy(source_p->host, source_p->sockhost,
318	<	sizeof(source_p->host));
437	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438	>	"character in your hostname");
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442	<	conf = source_p->localClient->confs.head->data;
442	>	conf = source_p->connection->confs.head->data;
443
444		if (!IsGotId(source_p))
445		{
446	<	char username[USERLEN + 1];
446	>	char username[USERLEN + 1] = "";
447		const char *p = username;
448		unsigned int i = 0;
449
450		if (IsNeedIdentd(conf))
451		{
452		++ServerStats.is_ref;
453	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
454	<	"identd to use this server", me.name, source_p->name);
455	<	exit_client(source_p, &me, "Install identd");
453	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
454	>	"identd to use this server");
455	>	exit_client(source_p, "Install identd");
456		return;
457		}
458
#	Line 341 | Line 462 | register_local_user(struct Client *sourc
462		source_p->username[i++] = '~';
463
464		for (; *p && i < USERLEN; ++p)
465	<	if (*p != '[')
345	<	source_p->username[i++] = *p;
465	>	source_p->username[i++] = *p;
466
467		source_p->username[i] = '\0';
468		}
469
470	<	/* password check */
470	>	/* Password check */
471		if (!EmptyString(conf->passwd))
472		{
473	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
473	>	if (!match_conf_password(source_p->connection->password, conf))
474		{
475		++ServerStats.is_ref;
476	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
477	<	me.name, source_p->name);
478	<	exit_client(source_p, &me, "Bad Password");
476	>
477	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
478	>	exit_client(source_p, "Bad Password");
479		return;
480		}
481		}
482
483	<	/* don't free source_p->localClient->passwd here - it can be required
484	<	* by masked /stats I if there are auth{} blocks with need_password = no;
483	>	/*
484	>	* Don't free source_p->connection->password here - it can be required
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
489	<	/* report if user has &^>= etc. and set flags as needed in source_p */
489	>	/*
490	>	* Report if user has &^>= etc. and set flags as needed in source_p
491	>	*/
492		report_and_set_user_flags(source_p, conf);
493
494		if (IsDead(source_p))
495		return;
496
497	<	/* Limit clients -
497	>	/*
498	>	* Limit clients -
499		* We want to be able to have servers and F-line clients
500		* connect, so save room for "buffer" connections.
501		* Smaller servers may want to decrease this, and it should
502		* probably be just a percentage of the MAXCLIENTS...
503		*   -Taner
504		*/
505	<	/* Except "F:" clients */
506	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
505	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
506	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
507		{
508		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
509		"Too many clients, rejecting %s[%s].",
510		source_p->name, source_p->host);
511		++ServerStats.is_ref;
512	<	exit_client(source_p, &me, "Sorry, server is full - try later");
512	>	exit_client(source_p, "Sorry, server is full - try later");
513		return;
514		}
515
516	<	/* valid user name check */
396	<	if (valid_username(source_p->username, 1) == 0)
516	>	if (!valid_username(source_p->username, 1))
517		{
518	<	char tmpstr2[IRCD_BUFSIZE];
518	>	char buf[IRCD_BUFSIZE] = "";
519
520		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
521		"Invalid username: %s (%s@%s)",
522		source_p->name, source_p->username, source_p->host);
523		++ServerStats.is_ref;
524	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
525	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
524	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
525	>	exit_client(source_p, buf);
526		return;
527		}
528
529		if (check_xline(source_p))
530		return;
531
532	<	while (hash_find_id((id = uid_get())) != NULL)
532	>	while (hash_find_id((id = uid_get())))
533		;
534
535		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 419 | Line 538 | register_local_user(struct Client *sourc
538		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540		source_p->name, source_p->username, source_p->host,
541	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
542	<	"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(&source_p->localClient->confs),
541	>	source_p->sockhost,
542	>	get_client_class(&source_p->connection->confs),
543		source_p->info, source_p->id);
544
545	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	<	source_p->name, source_p->username, source_p->host,
430	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(&source_p->localClient->confs),
433	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	<	"<hidden>" : source_p->localClient->client_host,
435	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	<	"<hidden>" : source_p->localClient->client_server,
437	<	source_p->info);
438	<
439	<
440	<	if (ConfigFileEntry.invisible_on_connect)
545	>	if (ConfigGeneral.invisible_on_connect)
546		{
547		AddUMode(source_p, UMODE_INVISIBLE);
548		++Count.invisi;
549		}
550
551	<	if ((++Count.local) > Count.max_loc)
551	>	if (++Count.local > Count.max_loc)
552		{
553		Count.max_loc = Count.local;
554
555		if (!(Count.max_loc % 10))
556		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
557	<	"New Max Local Clients: %d",
557	>	"New maximum local client connections: %u",
558		Count.max_loc);
559		}
560
456	–	/* Increment our total user count here */
561		if (++Count.total > Count.max_tot)
562		Count.max_tot = Count.total;
563		++Count.totalrestartcount;
#	Line 461 | Line 565 | register_local_user(struct Client *sourc
565		assert(source_p->servptr == &me);
566		SetClient(source_p);
567		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
568	<
465	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
568	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
569
570		assert(dlinkFind(&unknown_list, source_p));
571
572	<	dlink_move_node(&source_p->localClient->lclient_node,
572	>	dlink_move_node(&source_p->connection->lclient_node,
573		&unknown_list, &local_client_list);
574
575		user_welcome(source_p);
#	Line 482 | Line 585 | register_local_user(struct Client *sourc
585		*              - username to register as
586		*              - host name to register as
587		*              - server name
485	–	*              - realname (gecos)
588		* output       - NONE
589		* side effects - This function is called when a remote client
590		*                is introduced by a server.
591		*/
592		void
593	<	register_remote_user(struct Client *source_p,
492	<	const char *username, const char *host, const char *server,
493	<	const char *realname)
593	>	register_remote_user(struct Client *source_p)
594		{
595	<	struct Client *target_p = NULL;
496	<
497	<	assert(source_p != NULL);
498	<	assert(source_p->username != username);
499	<
500	<	strlcpy(source_p->host, host, sizeof(source_p->host));
501	<	strlcpy(source_p->username, username, sizeof(source_p->username));
502	<
503	<	/*
504	<	* coming from another server, take the servers word for it
505	<	*/
506	<	source_p->servptr = hash_find_server(server);
507	<
508	<	/*
509	<	* Super GhostDetect:
510	<	* If we can't find the server the user is supposed to be on,
511	<	* then simply blow the user away.        -Taner
512	<	*/
513	<	if (source_p->servptr == NULL)
514	<	{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516	<	"No server %s for user %s[%s@%s] from %s",
517	<	server, source_p->name, source_p->username,
518	<	source_p->host, source_p->from->name);
519	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520	<
521	<	AddFlag(source_p, FLAGS_KILLED);
522	<	exit_client(source_p, &me, "Ghosted Client");
523	<	return;
524	<	}
595	>	const struct Client *target_p = NULL;
596
597		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
598		{
#	Line 530 | Line 601 | register_remote_user(struct Client *sour
601		source_p->from->name, source_p->name, source_p->username,
602		source_p->host, source_p->servptr->name,
603		target_p->name, target_p->from->name);
604	<	kill_client(source_p->from, source_p,
605	<	"%s (NICK from wrong direction (%s != %s))",
606	<	me.name, source_p->servptr->name, target_p->from->name);
604	>	sendto_one(source_p->from,
605	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
606	>	me.id, source_p->id, me.name, source_p->servptr->name,
607	>	target_p->from->name);
608	>
609		AddFlag(source_p, FLAGS_KILLED);
610	<	exit_client(source_p, &me, "USER server wrong direction");
610	>	exit_client(source_p, "UID server wrong direction");
611		return;
612		}
613
#	Line 545 | Line 618 | register_remote_user(struct Client *sour
618		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
619		AddFlag(source_p, FLAGS_SERVICE);
620
548	–	/* Increment our total user count here */
621		if (++Count.total > Count.max_tot)
622		Count.max_tot = Count.total;
623
624		SetClient(source_p);
625		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
626	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
627		add_user_host(source_p->username, source_p->host, 1);
628		SetUserHost(source_p);
629
#	Line 564 | Line 637 | register_remote_user(struct Client *sour
637		introduce_client(source_p);
638		}
639
567	–	/* introduce_client()
568	–	*
569	–	* inputs       - source_p
570	–	* output       - NONE
571	–	* side effects - This common function introduces a client to the rest
572	–	*                of the net, either from a local client connect or
573	–	*                from a remote connect.
574	–	*/
575	–	static void
576	–	introduce_client(struct Client *source_p)
577	–	{
578	–	dlink_node *server_node = NULL;
579	–	static char ubuf[12];
580	–
581	–	if (MyClient(source_p))
582	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
583	–	else
584	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
585	–
586	–	watch_check_hash(source_p, RPL_LOGON);
587	–
588	–	if (*ubuf == '\0')
589	–	{
590	–	ubuf[0] = '+';
591	–	ubuf[1] = '\0';
592	–	}
593	–
594	–	DLINK_FOREACH(server_node, serv_list.head)
595	–	{
596	–	struct Client *server = server_node->data;
597	–
598	–	if (server == source_p->from)
599	–	continue;
600	–
601	–	if (IsCapable(server, CAP_SVS))
602	–	{
603	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
604	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
605	–	source_p->servptr->id,
606	–	source_p->name, source_p->hopcount+1,
607	–	(unsigned long)source_p->tsinfo,
608	–	ubuf, source_p->username, source_p->host,
609	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
610	–	"0" : source_p->sockhost, source_p->id,
611	–	source_p->svid,
612	–	source_p->info);
613	–	else
614	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
615	–	source_p->name, source_p->hopcount+1,
616	–	(unsigned long)source_p->tsinfo,
617	–	ubuf, source_p->username, source_p->host,
618	–	source_p->servptr->name, source_p->svid,
619	–	source_p->info);
620	–
621	–	}
622	–	else
623	–	{
624	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
625	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
626	–	source_p->servptr->id,
627	–	source_p->name, source_p->hopcount+1,
628	–	(unsigned long)source_p->tsinfo,
629	–	ubuf, source_p->username, source_p->host,
630	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
631	–	"0" : source_p->sockhost, source_p->id, source_p->info);
632	–	else
633	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
634	–	source_p->name, source_p->hopcount+1,
635	–	(unsigned long)source_p->tsinfo,
636	–	ubuf, source_p->username, source_p->host,
637	–	source_p->servptr->name, source_p->info);
638	–	}
639	–	}
640	–	}
641	–
640		/* valid_hostname()
641		*
642		* Inputs       - pointer to hostname
#	Line 653 | Line 651 | valid_hostname(const char *hostname)
651		{
652		const char *p = hostname;
653
654	<	assert(p != NULL);
654	>	assert(p);
655
656	<	if (*p == '.' || *p == ':')
656	>	if (EmptyString(p) || *p == '.' || *p == ':')
657		return 0;
658
659		for (; *p; ++p)
#	Line 679 | Line 677 | valid_hostname(const char *hostname)
677		int
678		valid_username(const char *username, const int local)
679		{
680	<	int dots      = 0;
680	>	unsigned int dots = 0;
681		const char *p = username;
682
683	<	assert(p != NULL);
683	>	assert(p);
684
685		if (*p == '~')
686		++p;
#	Line 699 | Line 697 | valid_username(const char *username, con
697		{
698		while (*++p)
699		{
700	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
701		{
702	<	if (++dots > ConfigFileEntry.dots_in_ident)
702	>	if (++dots > ConfigGeneral.dots_in_ident)
703		return 0;
704		if (!IsUserChar(*(p + 1)))
705		return 0;
#	Line 717 | Line 715 | valid_username(const char *username, con
715		return 0;
716		}
717
718	<	return  p - username <= USERLEN;;
718	>	return p - username <= USERLEN;
719		}
720
721		/* clean_nick_name()
#	Line 731 | Line 729 | int
729		valid_nickname(const char *nickname, const int local)
730		{
731		const char *p = nickname;
732	+
733		assert(nickname && *nickname);
734
735	<	/* nicks can't start with a digit or - or be 0 length */
736	<	/* This closer duplicates behaviour of hybrid-6 */
737	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
735	>	/*
736	>	* Nicks can't start with a digit or - or be 0 length.
737	>	*/
738	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
739		return 0;
740
741		for (; *p; ++p)
#	Line 745 | Line 745 | valid_nickname(const char *nickname, con
745		return p - nickname <= NICKLEN;
746		}
747
748	–	/* report_and_set_user_flags()
749	–	*
750	–	* inputs       - pointer to source_p
751	–	*              - pointer to conf for this user
752	–	* output       - NONE
753	–	* side effects - Report to user any special flags
754	–	*                they are getting, and set them.
755	–	*/
756	–	static void
757	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
758	–	{
759	–	/* If this user is being spoofed, tell them so */
760	–	if (IsConfDoSpoofIp(conf))
761	–	sendto_one(source_p,
762	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
763	–	me.name, source_p->name);
764	–
765	–	/* If this user is in the exception class, Set it "E lined" */
766	–	if (IsConfExemptKline(conf))
767	–	{
768	–	SetExemptKline(source_p);
769	–	sendto_one(source_p,
770	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
771	–	me.name, source_p->name);
772	–	}
773	–
774	–	/* The else here is to make sure that G line exempt users
775	–	* do not get noticed twice.
776	–	*/
777	–	else if (IsConfExemptGline(conf))
778	–	{
779	–	SetExemptGline(source_p);
780	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
781	–	me.name, source_p->name);
782	–	}
783	–
784	–	if (IsConfExemptResv(conf))
785	–	{
786	–	SetExemptResv(source_p);
787	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
788	–	me.name, source_p->name);
789	–	}
790	–
791	–	/* If this user is exempt from user limits set it "F lined" */
792	–	if (IsConfExemptLimits(conf))
793	–	{
794	–	SetExemptLimits(source_p);
795	–	sendto_one(source_p,
796	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
797	–	me.name,source_p->name);
798	–	}
799	–
800	–	if (IsConfCanFlood(conf))
801	–	{
802	–	SetCanFlood(source_p);
803	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
804	–	"protection, aren't you fearsome.",
805	–	me.name, source_p->name);
806	–	}
807	–	}
808	–
809	–	/* set_user_mode()
810	–	*
811	–	* added 15/10/91 By Darren Reed.
812	–	* parv[0] - sender
813	–	* parv[1] - username to change mode for
814	–	* parv[2] - modes to change
815	–	*/
816	–	void
817	–	set_user_mode(struct Client *client_p, struct Client *source_p,
818	–	const int parc, char *parv[])
819	–	{
820	–	unsigned int flag, setflags;
821	–	char **p, *m, buf[IRCD_BUFSIZE];
822	–	struct Client *target_p;
823	–	int what = MODE_ADD, badflag = 0, i;
824	–
825	–	assert(!(parc < 2));
826	–
827	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
828	–	{
829	–	if (MyConnect(source_p))
830	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
831	–	me.name, source_p->name, parv[1]);
832	–	return;
833	–	}
834	–
835	–	if (source_p != target_p)
836	–	{
837	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
838	–	me.name, source_p->name);
839	–	return;
840	–	}
841	–
842	–	if (parc < 3)
843	–	{
844	–	m = buf;
845	–	*m++ = '+';
846	–
847	–	for (i = 0; i < 128; i++)
848	–	if (HasUMode(source_p, user_modes[i]))
849	–	*m++ = (char)i;
850	–	*m = '\0';
851	–
852	–	sendto_one(source_p, form_str(RPL_UMODEIS),
853	–	me.name, source_p->name, buf);
854	–	return;
855	–	}
856	–
857	–	/* find flags already set for user */
858	–	setflags = source_p->umodes;
859	–
860	–	/* parse mode change string(s) */
861	–	for (p = &parv[2]; p && *p; p++)
862	–	{
863	–	for (m = *p; *m; m++)
864	–	{
865	–	switch (*m)
866	–	{
867	–	case '+':
868	–	what = MODE_ADD;
869	–	break;
870	–	case '-':
871	–	what = MODE_DEL;
872	–	break;
873	–	case 'o':
874	–	if (what == MODE_ADD)
875	–	{
876	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
877	–	{
878	–	++Count.oper;
879	–	SetOper(source_p);
880	–	}
881	–	}
882	–	else
883	–	{
884	–	/* Only decrement the oper counts if an oper to begin with
885	–	* found by Pat Szuta, Perly , perly@xnet.com
886	–	*/
887	–	if (!HasUMode(source_p, UMODE_OPER))
888	–	break;
889	–
890	–	ClearOper(source_p);
891	–	Count.oper--;
892	–
893	–	if (MyConnect(source_p))
894	–	{
895	–	dlink_node *dm;
896	–
897	–	detach_conf(source_p, CONF_OPER);
898	–	ClrOFlag(source_p);
899	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
900	–
901	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
902	–	free_dlink_node(dm);
903	–	}
904	–	}
905	–
906	–	break;
907	–
908	–	case 'r':  /* Only services may set +r */
909	–	case 'x':  /* Only services may set +x */
910	–	break;
911	–
912	–	default:
913	–	if ((flag = user_modes[(unsigned char)*m]))
914	–	{
915	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
916	–	(ConfigFileEntry.oper_only_umodes & flag))
917	–	badflag = 1;
918	–	else
919	–	{
920	–	if (what == MODE_ADD)
921	–	AddUMode(source_p, flag);
922	–	else
923	–	DelUMode(source_p, flag);
924	–	}
925	–	}
926	–	else
927	–	{
928	–	if (MyConnect(source_p))
929	–	badflag = 1;
930	–	}
931	–
932	–	break;
933	–	}
934	–	}
935	–	}
936	–
937	–	if (badflag)
938	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
939	–	me.name, source_p->name);
940	–
941	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
942	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
943	–	{
944	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
945	–	me.name, source_p->name);
946	–	DelUMode(source_p, UMODE_ADMIN);
947	–	}
948	–
949	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
950	–	++Count.invisi;
951	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
952	–	--Count.invisi;
953	–
954	–	/*
955	–	* compare new flags with old flags and send string which
956	–	* will cause servers to update correctly.
957	–	*/
958	–	send_umode_out(client_p, source_p, setflags);
959	–	}
960	–
748		/* send_umode()
749		* send the MODE string for user (user) to connection client_p
750		* -avalon
#	Line 971 | Line 758 | set_user_mode(struct Client *client_p, s
758		*/
759		void
760		send_umode(struct Client *client_p, struct Client *source_p,
761	<	unsigned int old, unsigned int sendmask, char *umode_buf)
761	>	unsigned int old, char *umode_buf)
762		{
763		char *m = umode_buf;
764		int what = 0;
978	–	unsigned int i;
979	–	unsigned int flag;
765
766		/*
767	<	* build a string in umode_buf to represent the change in the user's
767	>	* Build a string in umode_buf to represent the change in the user's
768		* mode between the new (source_p->umodes) and 'old'.
769		*/
770	<	for (i = 0; i < 128; i++)
770	>	for (unsigned int i = 0; i < 128; ++i)
771		{
772	<	flag = user_modes[i];
988	<	if (!flag)
989	<	continue;
772	>	unsigned int flag = user_modes[i];
773
774	<	if (MyClient(source_p) && !(flag & sendmask))
774	>	if (!flag)
775		continue;
776
777		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1019 | Line 802 | send_umode(struct Client *client_p, stru
802
803		if (*umode_buf && client_p)
804		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
805	<	source_p->name, source_p->username,
806	<	source_p->host, source_p->name, umode_buf);
805	>	client_p->name, client_p->username,
806	>	client_p->host, client_p->name, umode_buf);
807		}
808
809		/* send_umode_out()
#	Line 1030 | Line 813 | send_umode(struct Client *client_p, stru
813		* side effects - Only send ubuf out to servers that know about this client
814		*/
815		void
816	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1034	<	unsigned int old)
816	>	send_umode_out(struct Client *source_p, unsigned int old)
817		{
818	<	char buf[IRCD_BUFSIZE] = { '\0' };
1037	<	dlink_node *ptr = NULL;
818	>	char buf[IRCD_BUFSIZE] = "";
819
820	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
820	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
821
822		if (buf[0])
823	<	{
824	<	DLINK_FOREACH(ptr, serv_list.head)
1044	<	{
1045	<	struct Client *target_p = ptr->data;
1046	<
1047	<	if ((target_p != client_p) && (target_p != source_p))
1048	<	sendto_one(target_p, ":%s MODE %s :%s",
1049	<	ID_or_name(source_p, target_p),
1050	<	ID_or_name(source_p, target_p), buf);
1051	<	}
1052	<	}
1053	<
1054	<	if (client_p && MyClient(client_p))
1055	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
823	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
824	>	source_p->id, source_p->id, buf);
825		}
826
827		void
828		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
829		{
830	<	dlink_node *ptr = NULL;
830	>	dlink_node *node = NULL;
831
832		if (!strcmp(target_p->host, hostname))
833		return;
#	Line 1067 | Line 836 | user_set_hostmask(struct Client *target_
836		{
837		case MODE_ADD:
838		AddUMode(target_p, UMODE_HIDDENHOST);
1070	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
839		break;
840		case MODE_DEL:
841		DelUMode(target_p, UMODE_HIDDENHOST);
1074	–
1075	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1076	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
842		break;
843		default: return;
844		}
845
846	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
847	<	target_p->name, target_p->username, target_p->host);
846	>	if (ConfigGeneral.cycle_on_host_change)
847	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
848	>	target_p->name, target_p->username, target_p->host);
849
850		if (IsUserHostIp(target_p))
851		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
#	Line 1091 | Line 857 | user_set_hostmask(struct Client *target_
857
858		if (MyClient(target_p))
859		{
860	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1095	<	target_p->name, target_p->host);
860	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
861		clear_ban_cache_client(target_p);
862		}
863
864	<	DLINK_FOREACH(ptr, target_p->channel.head)
864	>	if (!ConfigGeneral.cycle_on_host_change)
865	>	return;
866	>
867	>	DLINK_FOREACH(node, target_p->channel.head)
868		{
869	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
869	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
870		char *p = modebuf;
871		int len = 0;
872	<	const struct Membership *ms = ptr->data;
872	>	const struct Membership *member = node->data;
873
874	<	if (has_member_flags(ms, CHFL_CHANOP)) {
874	>	if (has_member_flags(member, CHFL_CHANOP))
875	>	{
876		*p++ = 'o';
877		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
878		}
879
880	<	if (has_member_flags(ms, CHFL_HALFOP)) {
880	>	if (has_member_flags(member, CHFL_HALFOP))
881	>	{
882		*p++ = 'h';
883		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
884		}
885
886	<	if (has_member_flags(ms, CHFL_VOICE)) {
886	>	if (has_member_flags(member, CHFL_VOICE))
887	>	{
888		*p++ = 'v';
889		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
890		}
891
892		*p = '\0';
893
894	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
895	<	target_p->name, target_p->username, target_p->host,
896	<	ms->chptr->chname);
894	>
895	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
896	>	target_p->name, target_p->username,
897	>	target_p->host, member->chptr->name,
898	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
899	>	target_p->info);
900	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
901	>	target_p->name, target_p->username,
902	>	target_p->host, member->chptr->name);
903	>
904		if (nickbuf[0])
905	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
906	<	target_p->servptr->name, ms->chptr->chname,
905	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
906	>	target_p->servptr->name, member->chptr->name,
907		modebuf, nickbuf);
908
909		}
#	Line 1137 | Line 915 | user_set_hostmask(struct Client *target_
915		target_p->host, target_p->away);
916		}
917
918	<	/* user_welcome()
919	<	*
920	<	* inputs       - client pointer to client to welcome
1143	<	* output       - NONE
1144	<	* side effects -
1145	<	*/
1146	<	static void
1147	<	user_welcome(struct Client *source_p)
1148	<	{
1149	<	#if defined(__TIME__) && defined(__DATE__)
1150	<	static const char built_date[] = __DATE__ " at " __TIME__;
1151	<	#else
1152	<	static const char built_date[] = "unknown";
1153	<	#endif
1154	<
1155	<	#ifdef HAVE_LIBCRYPTO
1156	<	if (source_p->localClient->fd.ssl != NULL)
1157	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1158	<	me.name, source_p->name,
1159	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1160	<	#endif
1161	<
1162	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1163	<	ServerInfo.network_name, source_p->name);
1164	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1165	<	get_listener_name(source_p->localClient->listener), ircd_version);
1166	<	sendto_one(source_p, form_str(RPL_CREATED),
1167	<	me.name, source_p->name, built_date);
1168	<	sendto_one(source_p, form_str(RPL_MYINFO),
1169	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1170	<	show_isupport(source_p);
1171	<
1172	<	if (source_p->id[0] != '\0')
1173	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1174	<	source_p->name, source_p->id);
1175	<
1176	<	show_lusers(source_p);
1177	<	motd_signon(source_p);
1178	<	}
1179	<
1180	<	/* check_xline()
1181	<	*
1182	<	* inputs       - pointer to client to test
1183	<	* outupt       - 1 if exiting 0 if ok
1184	<	* side effects -
1185	<	*/
1186	<	static int
1187	<	check_xline(struct Client *source_p)
1188	<	{
1189	<	struct MaskItem *conf = NULL;
1190	<	const char *reason = NULL;
1191	<
1192	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1193	<	{
1194	<	++conf->count;
1195	<
1196	<	if (conf->reason != NULL)
1197	<	reason = conf->reason;
1198	<	else
1199	<	reason = "No Reason";
1200	<
1201	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1202	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1203	<	source_p->info, reason,
1204	<	get_client_name(source_p, HIDE_IP),
1205	<	source_p->sockhost);
1206	<
1207	<	++ServerStats.is_ref;
1208	<	exit_client(source_p, &me, "Bad user info");
1209	<	return 1;
1210	<	}
1211	<
1212	<	return 0;
1213	<	}
1214	<
1215	<	/* oper_up()
1216	<	*
1217	<	* inputs       - pointer to given client to oper
1218	<	* output       - NONE
1219	<	* side effects - Blindly opers up given source_p, using conf info
1220	<	*                all checks on passwords have already been done.
1221	<	*                This could also be used by rsa oper routines.
918	>	/*! \brief Blindly opers up given source_p, using conf info.
919	>	*         All checks on passwords have already been done.
920	>	* \param source_p Pointer to given client to oper
921		*/
922		void
923		oper_up(struct Client *source_p)
924		{
925		const unsigned int old = source_p->umodes;
926	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
926	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
927
928	<	assert(source_p->localClient->confs.head);
928	>	assert(source_p->connection->confs.head);
929
930		++Count.oper;
931		SetOper(source_p);
932
933		if (conf->modes)
934		AddUMode(source_p, conf->modes);
935	<	else if (ConfigFileEntry.oper_umodes)
936	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
935	>	else if (ConfigGeneral.oper_umodes)
936	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
937
938		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
939		++Count.invisi;
#	Line 1251 | Line 950 | oper_up(struct Client *source_p)
950
951		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
952		get_oper_name(source_p));
953	<	send_umode_out(source_p, source_p, old);
954	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
953	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
954	>	me.id, get_oper_name(source_p));
955	>	send_umode_out(source_p, old);
956	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
957		}
958
959	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
959	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
960
961		int
962		valid_sid(const char *sid)
#	Line 1270 | Line 971 | valid_sid(const char *sid)
971
972		/*
973		* init_uid()
974	<	*
974	>	*
975		* inputs       - NONE
976		* output       - NONE
977		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1280 | Line 981 | valid_sid(const char *sid)
981		void
982		init_uid(void)
983		{
1283	–	unsigned int i;
1284	–
984		memset(new_uid, 0, sizeof(new_uid));
985
986	<	if (!EmptyString(ServerInfo.sid))
987	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
986	>	if (!EmptyString(ConfigServerInfo.sid))
987	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
988
989	<	for (i = 0; i < IRC_MAXSID; ++i)
990	<	if (new_uid[i] == '\0')
989	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
990	>	if (new_uid[i] == '\0')
991		new_uid[i] = 'A';
992
993		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1295	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1296	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1297	–	* -Dianora
1298	–	*/
994		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
995		}
996
#	Line 1308 | Line 1003 | init_uid(void)
1003		*                note this is a recursive function
1004		*/
1005		static void
1006	<	add_one_to_uid(int i)
1006	>	add_one_to_uid(unsigned int i)
1007		{
1008	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1008	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1009		{
1010		if (new_uid[i] == 'Z')
1011		new_uid[i] = '0';
1012		else if (new_uid[i] == '9')
1013		{
1014		new_uid[i] = 'A';
1015	<	add_one_to_uid(i-1);
1015	>	add_one_to_uid(i - 1);
1016		}
1017		else
1018		++new_uid[i];
#	Line 1342 | Line 1037 | add_one_to_uid(int i)
1037		static const char *
1038		uid_get(void)
1039		{
1040	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1040	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1041		return new_uid;
1042		}
1043
#	Line 1357 | Line 1052 | void
1052		init_isupport(void)
1053		{
1054		add_isupport("CALLERID", NULL, -1);
1055	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1055	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1056		add_isupport("DEAF", "D", -1);
1057		add_isupport("KICKLEN", NULL, KICKLEN);
1058		add_isupport("MODES", NULL, MAXMODEPARAMS);
1364	–	#ifdef HALFOPS
1059		add_isupport("PREFIX", "(ohv)@%+", -1);
1060		add_isupport("STATUSMSG", "@%+", -1);
1061	<	#else
1062	<	add_isupport("PREFIX", "(ov)@+", -1);
1369	<	add_isupport("STATUSMSG", "@+", -1);
1370	<	#endif
1061	>	add_isupport("EXCEPTS", NULL, -1);
1062	>	add_isupport("INVEX", NULL, -1);
1063		}
1064
1065		/*
#	Line 1382 | Line 1074 | init_isupport(void)
1074		void
1075		add_isupport(const char *name, const char *options, int n)
1076		{
1077	<	dlink_node *ptr;
1078	<	struct Isupport *support;
1077	>	dlink_node *node = NULL;
1078	>	struct Isupport *support = NULL;
1079
1080	<	DLINK_FOREACH(ptr, support_list.head)
1080	>	DLINK_FOREACH(node, support_list.head)
1081		{
1082	<	support = ptr->data;
1082	>	support = node->data;
1083		if (irccmp(support->name, name) == 0)
1084		{
1085		MyFree(support->name);
#	Line 1396 | Line 1088 | add_isupport(const char *name, const cha
1088		}
1089		}
1090
1091	<	if (ptr == NULL)
1091	>	if (node == NULL)
1092		{
1093	<	support = MyMalloc(sizeof(*support));
1093	>	support = MyCalloc(sizeof(*support));
1094		dlinkAddTail(support, &support->node, &support_list);
1095		}
1096
1097		support->name = xstrdup(name);
1098	<	if (options != NULL)
1098	>	if (options)
1099		support->options = xstrdup(options);
1100		support->number = n;
1101
#	Line 1420 | Line 1112 | add_isupport(const char *name, const cha
1112		void
1113		delete_isupport(const char *name)
1114		{
1115	<	dlink_node *ptr;
1424	<	struct Isupport *support;
1115	>	dlink_node *node = NULL;
1116
1117	<	DLINK_FOREACH(ptr, support_list.head)
1117	>	DLINK_FOREACH(node, support_list.head)
1118		{
1119	<	support = ptr->data;
1119	>	struct Isupport *support = node->data;
1120	>
1121		if (irccmp(support->name, name) == 0)
1122		{
1123	<	dlinkDelete(ptr, &support_list);
1123	>	dlinkDelete(node, &support_list);
1124		MyFree(support->name);
1125		MyFree(support->options);
1126		MyFree(support);
#	Line 1451 | Line 1143 | rebuild_isupport_message_line(void)
1143		{
1144		char isupportbuffer[IRCD_BUFSIZE];
1145		char *p = isupportbuffer;
1146	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1146	>	dlink_node *node = NULL, *node_next = NULL;
1147		int n = 0;
1148		int tokens = 0;
1149		size_t len = 0;
1150	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1150	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1151
1152	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1152	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1153		{
1154	<	dlinkDelete(ptr, &support_list_lines);
1155	<	MyFree(ptr->data);
1156	<	free_dlink_node(ptr);
1154	>	dlinkDelete(node, &support_list_lines);
1155	>	MyFree(node->data);
1156	>	free_dlink_node(node);
1157		}
1158
1159	<	DLINK_FOREACH(ptr, support_list.head)
1159	>	DLINK_FOREACH(node, support_list.head)
1160		{
1161	<	struct Isupport *support = ptr->data;
1161	>	struct Isupport *support = node->data;
1162
1163		p += (n = sprintf(p, "%s", support->name));
1164		len += n;
1165
1166	<	if (support->options != NULL)
1166	>	if (support->options)
1167		{
1168		p += (n = sprintf(p, "=%s", support->options));
1169		len += n;
#	Line 1499 | Line 1191 | rebuild_isupport_message_line(void)
1191		}
1192		}
1193
1194	<	if (len != 0)
1194	>	if (len)
1195		{
1196		if (*--p == ' ')
1197		*p = '\0';

Diff Legend

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