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 2125 by michael, Sun May 26 18:41:13 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4785 by michael, Sat Oct 25 16:13:48 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
55	–
51		static char umode_buffer[IRCD_BUFSIZE];
57	–
58	–	static void user_welcome(struct Client *);
59	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60	–	static int check_xline(struct Client *);
61	–	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	<
68	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 73 | Line 62 | struct Isupport
62		int number;
63		};
64
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
65	>	static dlink_list support_list;
66	>	static dlink_list support_list_lines;
67
68		/* memory is cheap. map 0-255 to equivalent mode */
69		const unsigned int user_modes[256] =
#	Line 86 | 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 102 | 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 127 | 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 */
124		UMODE_UNAUTH,       /* u */
125		0,                  /* v */
126		UMODE_WALLOP,       /* w */
127	<	0,                  /* x */
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 170 | 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		{
175	–	const char *from, *to;
176	–
177	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
178	–	{
179	–	from = me.id;
180	–	to = source_p->id;
181	–	}
182	–	else
183	–	{
184	–	from = me.name;
185	–	to = source_p->name;
186	–	}
187	–
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),
191	<	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	<
204	<	if (dlink_list_length(&global_channel_list) > 0)
205	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
206	<	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);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	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);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	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),
224	<	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 241 | 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	<	send_message_file(source_p, isupportFile);
213	>	const dlink_node *ptr = NULL;
214	>
215	>	DLINK_FOREACH(ptr, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->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 *ptr = 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(ptr, local_server_list.head)
301	>	{
302	>	struct Client *server = ptr->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	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	>	"0" : source_p->sockhost, source_p->id,
315	>	source_p->svid,
316	>	source_p->info);
317	>	else
318	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
319	>	source_p->servptr->id,
320	>	source_p->name, source_p->hopcount+1,
321	>	(unsigned long)source_p->tsinfo,
322	>	ubuf, source_p->username, source_p->host,
323	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	>	"0" : source_p->sockhost, source_p->id, source_p->info);
325	>
326	>	if (!EmptyString(source_p->certfp))
327	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
328	>	}
329	>	}
330	>
331	>	/* user_welcome()
332	>	*
333	>	* inputs       - client pointer to client to welcome
334	>	* output       - NONE
335	>	* side effects -
336	>	*/
337	>	static void
338	>	user_welcome(struct Client *source_p)
339	>	{
340	>	#if defined(__TIME__) && defined(__DATE__)
341	>	static const char built_date[] = __DATE__ " at " __TIME__;
342	>	#else
343	>	static const char built_date[] = "unknown";
344	>	#endif
345	>
346	>	#ifdef HAVE_LIBCRYPTO
347	>	if (HasFlag(source_p, FLAGS_SSL))
348	>	{
349	>	AddUMode(source_p, UMODE_SSL);
350	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351	>	ssl_get_cipher(source_p->connection->fd.ssl));
352	>	}
353	>	#endif
354	>
355	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
356	>	source_p->name);
357	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358	>	get_listener_name(source_p->connection->listener), ircd_version);
359	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
360	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361	>	show_isupport(source_p);
362	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
363	>
364	>	show_lusers(source_p);
365	>	motd_signon(source_p);
366	>	}
367	>
368	>	/* check_xline()
369	>	*
370	>	* inputs       - pointer to client to test
371	>	* outupt       - 1 if exiting 0 if ok
372	>	* side effects -
373	>	*/
374	>	static int
375	>	check_xline(struct Client *source_p)
376	>	{
377	>	struct MaskItem *conf = NULL;
378	>	const char *reason = NULL;
379	>
380	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
381	>	{
382	>	++conf->count;
383	>
384	>	if (conf->reason)
385	>	reason = conf->reason;
386	>	else
387	>	reason = CONF_NOREASON;
388	>
389	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
390	>	"X-line Rejecting [%s] [%s], user %s [%s]",
391	>	source_p->info, reason,
392	>	get_client_name(source_p, HIDE_IP),
393	>	source_p->sockhost);
394	>
395	>	++ServerStats.is_ref;
396	>	exit_client(source_p, "Bad user info");
397	>	return 1;
398	>	}
399	>
400	>	return 0;
401	>	}
402	>
403	>	/*! \brief This function is called when both NICK and USER messages
404	>	*      have been accepted for the client, in whatever order. Only
405	>	*      after this, is the UID message propagated.
406	>	* \param source_p Pointer to given client to introduce
407	>	*/
408		void
409		register_local_user(struct Client *source_p)
410		{
411		const char *id = NULL;
412		const struct MaskItem *conf = NULL;
413
278	–	assert(source_p != NULL);
414		assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416	<	assert(!source_p->localClient->registration);
416	>	assert(!source_p->connection->registration);
417
418		ClearCap(source_p, CAP_TS6);
419
420	<	if (ConfigFileEntry.ping_cookie)
420	>	if (ConfigGeneral.ping_cookie)
421		{
422	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
422	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
423		{
424		do
425	<	source_p->localClient->random_ping = genrand_int32();
426	<	while (!source_p->localClient->random_ping);
425	>	source_p->connection->random_ping = genrand_int32();
426	>	while (!source_p->connection->random_ping);
427
428	<	sendto_one(source_p, "PING :%u",
294	<	source_p->localClient->random_ping);
428	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
429		SetPingSent(source_p);
430		return;
431		}
#	Line 300 | Line 434 | register_local_user(struct Client *sourc
434		return;
435		}
436
437	<	source_p->localClient->last_privmsg = CurrentTime;
437	>	source_p->connection->last_privmsg = CurrentTime;
438		/* Straight up the maximum rate of flooding... */
439	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
439	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
440
441		if (!check_client(source_p))
442		return;
443
444	<	if (valid_hostname(source_p->host) == 0)
444	>	if (!valid_hostname(source_p->host))
445		{
446	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
447	<	"character in your hostname", me.name, source_p->name);
448	<	strlcpy(source_p->host, source_p->sockhost,
315	<	sizeof(source_p->host));
446	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
447	>	"character in your hostname");
448	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
449		}
450
451	<	conf = source_p->localClient->confs.head->data;
451	>	conf = source_p->connection->confs.head->data;
452
453		if (!IsGotId(source_p))
454		{
455	<	char username[USERLEN + 1];
455	>	char username[USERLEN + 1] = "";
456		const char *p = username;
457		unsigned int i = 0;
458
459		if (IsNeedIdentd(conf))
460		{
461		++ServerStats.is_ref;
462	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
463	<	"identd to use this server", me.name, source_p->name);
464	<	exit_client(source_p, &me, "Install identd");
462	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
463	>	"identd to use this server");
464	>	exit_client(source_p, "Install identd");
465		return;
466		}
467
#	Line 338 | Line 471 | register_local_user(struct Client *sourc
471		source_p->username[i++] = '~';
472
473		for (; *p && i < USERLEN; ++p)
474	<	if (*p != '[')
342	<	source_p->username[i++] = *p;
474	>	source_p->username[i++] = *p;
475
476		source_p->username[i] = '\0';
477		}
478
479	<	/* password check */
479	>	/* Password check */
480		if (!EmptyString(conf->passwd))
481		{
482	<	const char *pass = source_p->localClient->passwd;
351	<
352	<	if (!match_conf_password(pass, conf))
482	>	if (!match_conf_password(source_p->connection->password, conf))
483		{
484		++ServerStats.is_ref;
485	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
486	<	me.name, source_p->name);
487	<	exit_client(source_p, &me, "Bad Password");
485	>
486	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
487	>	exit_client(source_p, "Bad Password");
488		return;
489		}
490		}
491
492	<	/* don't free source_p->localClient->passwd here - it can be required
493	<	* by masked /stats I if there are auth{} blocks with need_password = no;
492	>	/*
493	>	* Don't free source_p->connection->password here - it can be required
494	>	* by masked /stats I if there are auth {} blocks with need_password = no;
495		* --adx
496		*/
497
498	<	/* report if user has &^>= etc. and set flags as needed in source_p */
498	>	/*
499	>	* Report if user has &^>= etc. and set flags as needed in source_p
500	>	*/
501		report_and_set_user_flags(source_p, conf);
502
503		if (IsDead(source_p))
504		return;
505
506	<	/* Limit clients -
506	>	/*
507	>	* Limit clients -
508		* We want to be able to have servers and F-line clients
509		* connect, so save room for "buffer" connections.
510		* Smaller servers may want to decrease this, and it should
511		* probably be just a percentage of the MAXCLIENTS...
512		*   -Taner
513		*/
514	<	/* Except "F:" clients */
515	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
382	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
514	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
515	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
516		{
517		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
518		"Too many clients, rejecting %s[%s].",
519		source_p->name, source_p->host);
520		++ServerStats.is_ref;
521	<	exit_client(source_p, &me, "Sorry, server is full - try later");
521	>	exit_client(source_p, "Sorry, server is full - try later");
522		return;
523		}
524
525	<	/* valid user name check */
393	<	if (valid_username(source_p->username, 1) == 0)
525	>	if (!valid_username(source_p->username, 1))
526		{
527	<	char tmpstr2[IRCD_BUFSIZE];
527	>	char buf[IRCD_BUFSIZE] = "";
528
529		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
530		"Invalid username: %s (%s@%s)",
531		source_p->name, source_p->username, source_p->host);
532		++ServerStats.is_ref;
533	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
534	<	source_p->username);
403	<	exit_client(source_p, &me, tmpstr2);
533	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
534	>	exit_client(source_p, buf);
535		return;
536		}
537
538		if (check_xline(source_p))
539		return;
540
541	<	while (hash_find_id((id = uid_get())) != NULL)
541	>	while (hash_find_id((id = uid_get())))
542		;
543
544		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 416 | Line 547 | register_local_user(struct Client *sourc
547		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
548		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
549		source_p->name, source_p->username, source_p->host,
550	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
550	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
551		"255.255.255.255" : source_p->sockhost,
552	<	get_client_class(&source_p->localClient->confs),
552	>	get_client_class(&source_p->connection->confs),
553		source_p->info, source_p->id);
554
555	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	<	source_p->name, source_p->username, source_p->host,
427	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	<	"255.255.255.255" : source_p->sockhost,
429	<	get_client_class(&source_p->localClient->confs),
430	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"<hidden>" : source_p->localClient->client_host,
432	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	<	"<hidden>" : source_p->localClient->client_server,
434	<	source_p->info);
435	<
436	<
437	<	if (ConfigFileEntry.invisible_on_connect)
555	>	if (ConfigGeneral.invisible_on_connect)
556		{
557		AddUMode(source_p, UMODE_INVISIBLE);
558		++Count.invisi;
559		}
560
561	<	if ((++Count.local) > Count.max_loc)
561	>	if (++Count.local > Count.max_loc)
562		{
563		Count.max_loc = Count.local;
564
565		if (!(Count.max_loc % 10))
566		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
567	<	"New Max Local Clients: %d",
567	>	"New maximum local client connections: %u",
568		Count.max_loc);
569		}
570
453	–	/* Increment our total user count here */
571		if (++Count.total > Count.max_tot)
572		Count.max_tot = Count.total;
573		++Count.totalrestartcount;
#	Line 458 | Line 575 | register_local_user(struct Client *sourc
575		assert(source_p->servptr == &me);
576		SetClient(source_p);
577		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
578	<
462	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
578	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
579
580		assert(dlinkFind(&unknown_list, source_p));
581
582	<	dlink_move_node(&source_p->localClient->lclient_node,
582	>	dlink_move_node(&source_p->connection->lclient_node,
583		&unknown_list, &local_client_list);
584
585		user_welcome(source_p);
#	Line 479 | Line 595 | register_local_user(struct Client *sourc
595		*              - username to register as
596		*              - host name to register as
597		*              - server name
482	–	*              - realname (gecos)
598		* output       - NONE
599		* side effects - This function is called when a remote client
600		*                is introduced by a server.
601		*/
602		void
603	<	register_remote_user(struct Client *source_p,
489	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
603	>	register_remote_user(struct Client *source_p)
604		{
605	<	struct Client *target_p = NULL;
493	<
494	<	assert(source_p != NULL);
495	<	assert(source_p->username != username);
496	<
497	<	strlcpy(source_p->host, host, sizeof(source_p->host));
498	<	strlcpy(source_p->username, username, sizeof(source_p->username));
499	<
500	<	/*
501	<	* coming from another server, take the servers word for it
502	<	*/
503	<	source_p->servptr = hash_find_server(server);
504	<
505	<	/*
506	<	* Super GhostDetect:
507	<	* If we can't find the server the user is supposed to be on,
508	<	* then simply blow the user away.        -Taner
509	<	*/
510	<	if (source_p->servptr == NULL)
511	<	{
512	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
513	<	"No server %s for user %s[%s@%s] from %s",
514	<	server, source_p->name, source_p->username,
515	<	source_p->host, source_p->from->name);
516	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
517	<
518	<	AddFlag(source_p, FLAGS_KILLED);
519	<	exit_client(source_p, &me, "Ghosted Client");
520	<	return;
521	<	}
605	>	const struct Client *target_p = NULL;
606
607		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
608		{
#	Line 527 | Line 611 | register_remote_user(struct Client *sour
611		source_p->from->name, source_p->name, source_p->username,
612		source_p->host, source_p->servptr->name,
613		target_p->name, target_p->from->name);
614	<	kill_client(source_p->from, source_p,
615	<	"%s (NICK from wrong direction (%s != %s))",
616	<	me.name, source_p->servptr->name, target_p->from->name);
614	>	sendto_one(source_p->from,
615	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
616	>	me.id, source_p->id, me.name, source_p->servptr->name,
617	>	target_p->from->name);
618	>
619		AddFlag(source_p, FLAGS_KILLED);
620	<	exit_client(source_p, &me, "USER server wrong direction");
620	>	exit_client(source_p, "USER server wrong direction");
621		return;
622		}
623
#	Line 542 | Line 628 | register_remote_user(struct Client *sour
628		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
629		AddFlag(source_p, FLAGS_SERVICE);
630
545	–	/* Increment our total user count here */
631		if (++Count.total > Count.max_tot)
632		Count.max_tot = Count.total;
633
634		SetClient(source_p);
635		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
636	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
637		add_user_host(source_p->username, source_p->host, 1);
638		SetUserHost(source_p);
639
#	Line 561 | Line 647 | register_remote_user(struct Client *sour
647		introduce_client(source_p);
648		}
649
564	–	/* introduce_client()
565	–	*
566	–	* inputs       - source_p
567	–	* output       - NONE
568	–	* side effects - This common function introduces a client to the rest
569	–	*                of the net, either from a local client connect or
570	–	*                from a remote connect.
571	–	*/
572	–	static void
573	–	introduce_client(struct Client *source_p)
574	–	{
575	–	dlink_node *server_node = NULL;
576	–	static char ubuf[12];
577	–
578	–	if (MyClient(source_p))
579	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
580	–	else
581	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
582	–
583	–	watch_check_hash(source_p, RPL_LOGON);
584	–
585	–	if (*ubuf == '\0')
586	–	{
587	–	ubuf[0] = '+';
588	–	ubuf[1] = '\0';
589	–	}
590	–
591	–	DLINK_FOREACH(server_node, serv_list.head)
592	–	{
593	–	struct Client *server = server_node->data;
594	–
595	–	if (server == source_p->from)
596	–	continue;
597	–
598	–	if (IsCapable(server, CAP_SVS))
599	–	{
600	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
601	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
602	–	source_p->servptr->id,
603	–	source_p->name, source_p->hopcount+1,
604	–	(unsigned long)source_p->tsinfo,
605	–	ubuf, source_p->username, source_p->host,
606	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
607	–	"0" : source_p->sockhost, source_p->id,
608	–	source_p->svid,
609	–	source_p->info);
610	–	else
611	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
612	–	source_p->name, source_p->hopcount+1,
613	–	(unsigned long)source_p->tsinfo,
614	–	ubuf, source_p->username, source_p->host,
615	–	source_p->servptr->name, source_p->svid,
616	–	source_p->info);
617	–
618	–	}
619	–	else
620	–	{
621	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
622	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
623	–	source_p->servptr->id,
624	–	source_p->name, source_p->hopcount+1,
625	–	(unsigned long)source_p->tsinfo,
626	–	ubuf, source_p->username, source_p->host,
627	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
628	–	"0" : source_p->sockhost, source_p->id, source_p->info);
629	–	else
630	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
631	–	source_p->name, source_p->hopcount+1,
632	–	(unsigned long)source_p->tsinfo,
633	–	ubuf, source_p->username, source_p->host,
634	–	source_p->servptr->name, source_p->info);
635	–	}
636	–	}
637	–	}
638	–
650		/* valid_hostname()
651		*
652		* Inputs       - pointer to hostname
#	Line 650 | Line 661 | valid_hostname(const char *hostname)
661		{
662		const char *p = hostname;
663
664	<	assert(p != NULL);
664	>	assert(p);
665
666	<	if (*p == '.' || *p == ':')
666	>	if (EmptyString(p) || *p == '.' || *p == ':')
667		return 0;
668
669		for (; *p; ++p)
#	Line 676 | Line 687 | valid_hostname(const char *hostname)
687		int
688		valid_username(const char *username, const int local)
689		{
690	<	int dots      = 0;
690	>	unsigned int dots = 0;
691		const char *p = username;
692
693	<	assert(p != NULL);
693	>	assert(p);
694
695		if (*p == '~')
696		++p;
#	Line 696 | Line 707 | valid_username(const char *username, con
707		{
708		while (*++p)
709		{
710	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
710	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
711		{
712	<	if (++dots > ConfigFileEntry.dots_in_ident)
712	>	if (++dots > ConfigGeneral.dots_in_ident)
713		return 0;
714		if (!IsUserChar(*(p + 1)))
715		return 0;
#	Line 714 | Line 725 | valid_username(const char *username, con
725		return 0;
726		}
727
728	<	return  p - username <= USERLEN;;
728	>	return p - username <= USERLEN;
729		}
730
731		/* clean_nick_name()
#	Line 728 | Line 739 | int
739		valid_nickname(const char *nickname, const int local)
740		{
741		const char *p = nickname;
742	+
743		assert(nickname && *nickname);
744
745	<	/* nicks can't start with a digit or - or be 0 length */
746	<	/* This closer duplicates behaviour of hybrid-6 */
747	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
745	>	/*
746	>	* Nicks can't start with a digit or - or be 0 length.
747	>	*/
748	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
749		return 0;
750
751		for (; *p; ++p)
#	Line 742 | Line 755 | valid_nickname(const char *nickname, con
755		return p - nickname <= NICKLEN;
756		}
757
745	–	/* report_and_set_user_flags()
746	–	*
747	–	* inputs       - pointer to source_p
748	–	*              - pointer to conf for this user
749	–	* output       - NONE
750	–	* side effects - Report to user any special flags
751	–	*                they are getting, and set them.
752	–	*/
753	–	static void
754	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
755	–	{
756	–	/* If this user is being spoofed, tell them so */
757	–	if (IsConfDoSpoofIp(conf))
758	–	{
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/* If this user is in the exception class, Set it "E lined" */
765	–	if (IsConfExemptKline(conf))
766	–	{
767	–	SetExemptKline(source_p);
768	–	sendto_one(source_p,
769	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
770	–	me.name, source_p->name);
771	–	}
772	–
773	–	/* The else here is to make sure that G line exempt users
774	–	* do not get noticed twice.
775	–	*/
776	–	else if (IsConfExemptGline(conf))
777	–	{
778	–	SetExemptGline(source_p);
779	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
780	–	me.name, source_p->name);
781	–	}
782	–
783	–	if (IsConfExemptResv(conf))
784	–	{
785	–	SetExemptResv(source_p);
786	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
787	–	me.name, source_p->name);
788	–	}
789	–
790	–	/* If this user is exempt from user limits set it "F lined" */
791	–	if (IsConfExemptLimits(conf))
792	–	{
793	–	SetExemptLimits(source_p);
794	–	sendto_one(source_p,
795	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
796	–	me.name,source_p->name);
797	–	}
798	–
799	–	if (IsConfCanFlood(conf))
800	–	{
801	–	SetCanFlood(source_p);
802	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
803	–	"protection, aren't you fearsome.",
804	–	me.name, source_p->name);
805	–	}
806	–	}
807	–
808	–	/* set_user_mode()
809	–	*
810	–	* added 15/10/91 By Darren Reed.
811	–	* parv[0] - sender
812	–	* parv[1] - username to change mode for
813	–	* parv[2] - modes to change
814	–	*/
815	–	void
816	–	set_user_mode(struct Client *client_p, struct Client *source_p,
817	–	const int parc, char *parv[])
818	–	{
819	–	unsigned int flag, setflags;
820	–	char **p, *m, buf[IRCD_BUFSIZE];
821	–	struct Client *target_p;
822	–	int what = MODE_ADD, badflag = 0, i;
823	–
824	–	assert(!(parc < 2));
825	–
826	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
827	–	{
828	–	if (MyConnect(source_p))
829	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
830	–	me.name, source_p->name, parv[1]);
831	–	return;
832	–	}
833	–
834	–	if (source_p != target_p)
835	–	{
836	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
837	–	me.name, source_p->name);
838	–	return;
839	–	}
840	–
841	–	if (parc < 3)
842	–	{
843	–	m = buf;
844	–	*m++ = '+';
845	–
846	–	for (i = 0; i < 128; i++)
847	–	if (HasUMode(source_p, user_modes[i]))
848	–	*m++ = (char)i;
849	–	*m = '\0';
850	–
851	–	sendto_one(source_p, form_str(RPL_UMODEIS),
852	–	me.name, source_p->name, buf);
853	–	return;
854	–	}
855	–
856	–	/* find flags already set for user */
857	–	setflags = source_p->umodes;
858	–
859	–	/* parse mode change string(s) */
860	–	for (p = &parv[2]; p && *p; p++)
861	–	{
862	–	for (m = *p; *m; m++)
863	–	{
864	–	switch (*m)
865	–	{
866	–	case '+':
867	–	what = MODE_ADD;
868	–	break;
869	–	case '-':
870	–	what = MODE_DEL;
871	–	break;
872	–	case 'o':
873	–	if (what == MODE_ADD)
874	–	{
875	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
876	–	{
877	–	++Count.oper;
878	–	SetOper(source_p);
879	–	}
880	–	}
881	–	else
882	–	{
883	–	/* Only decrement the oper counts if an oper to begin with
884	–	* found by Pat Szuta, Perly , perly@xnet.com
885	–	*/
886	–	if (!HasUMode(source_p, UMODE_OPER))
887	–	break;
888	–
889	–	ClearOper(source_p);
890	–	Count.oper--;
891	–
892	–	if (MyConnect(source_p))
893	–	{
894	–	dlink_node *dm;
895	–
896	–	detach_conf(source_p, CONF_OPER);
897	–	ClrOFlag(source_p);
898	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
899	–
900	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
901	–	free_dlink_node(dm);
902	–	}
903	–	}
904	–
905	–	break;
906	–
907	–	case 'r':  /* Only services may set +r */
908	–	break;
909	–
910	–	default:
911	–	if ((flag = user_modes[(unsigned char)*m]))
912	–	{
913	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
914	–	(ConfigFileEntry.oper_only_umodes & flag))
915	–	badflag = 1;
916	–	else
917	–	{
918	–	if (what == MODE_ADD)
919	–	AddUMode(source_p, flag);
920	–	else
921	–	DelUMode(source_p, flag);
922	–	}
923	–	}
924	–	else
925	–	{
926	–	if (MyConnect(source_p))
927	–	badflag = 1;
928	–	}
929	–
930	–	break;
931	–	}
932	–	}
933	–	}
934	–
935	–	if (badflag)
936	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
937	–	me.name, source_p->name);
938	–
939	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
940	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
941	–	{
942	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
943	–	me.name, source_p->name);
944	–	DelUMode(source_p, UMODE_ADMIN);
945	–	}
946	–
947	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
948	–	++Count.invisi;
949	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
950	–	--Count.invisi;
951	–
952	–	/*
953	–	* compare new flags with old flags and send string which
954	–	* will cause servers to update correctly.
955	–	*/
956	–	send_umode_out(client_p, source_p, setflags);
957	–	}
958	–
758		/* send_umode()
759		* send the MODE string for user (user) to connection client_p
760		* -avalon
#	Line 969 | Line 768 | set_user_mode(struct Client *client_p, s
768		*/
769		void
770		send_umode(struct Client *client_p, struct Client *source_p,
771	<	unsigned int old, unsigned int sendmask, char *umode_buf)
771	>	unsigned int old, char *umode_buf)
772		{
773		char *m = umode_buf;
774		int what = 0;
976	–	unsigned int i;
977	–	unsigned int flag;
775
776		/*
777	<	* build a string in umode_buf to represent the change in the user's
777	>	* Build a string in umode_buf to represent the change in the user's
778		* mode between the new (source_p->umodes) and 'old'.
779		*/
780	<	for (i = 0; i < 128; i++)
780	>	for (unsigned int i = 0; i < 128; ++i)
781		{
782	<	flag = user_modes[i];
986	<	if (!flag)
987	<	continue;
782	>	unsigned int flag = user_modes[i];
783
784	<	if (MyClient(source_p) && !(flag & sendmask))
784	>	if (!flag)
785		continue;
786
787		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1017 | Line 812 | send_umode(struct Client *client_p, stru
812
813		if (*umode_buf && client_p)
814		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
815	<	source_p->name, source_p->username,
816	<	source_p->host, source_p->name, umode_buf);
815	>	client_p->name, client_p->username,
816	>	client_p->host, client_p->name, umode_buf);
817		}
818
819		/* send_umode_out()
#	Line 1028 | Line 823 | send_umode(struct Client *client_p, stru
823		* side effects - Only send ubuf out to servers that know about this client
824		*/
825		void
826	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1032	<	unsigned int old)
826	>	send_umode_out(struct Client *source_p, unsigned int old)
827		{
828	<	char buf[IRCD_BUFSIZE] = { '\0' };
1035	<	dlink_node *ptr = NULL;
828	>	char buf[IRCD_BUFSIZE] = "";
829
830	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
830	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
831
832		if (buf[0])
833	<	{
834	<	DLINK_FOREACH(ptr, serv_list.head)
1042	<	{
1043	<	struct Client *target_p = ptr->data;
1044	<
1045	<	if ((target_p != client_p) && (target_p != source_p))
1046	<	sendto_one(target_p, ":%s MODE %s :%s",
1047	<	ID_or_name(source_p, target_p),
1048	<	ID_or_name(source_p, target_p), buf);
1049	<	}
1050	<	}
1051	<
1052	<	if (client_p && MyClient(client_p))
1053	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
833	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
834	>	source_p->id, source_p->id, buf);
835		}
836
837		void
838	<	user_set_hostmask(struct Client *target_p, const char *hostname)
838	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
839		{
840	<	if (!valid_hostname(hostname))
840	>	dlink_node *ptr = NULL;
841	>
842	>	if (!strcmp(target_p->host, hostname))
843		return;
844
845	+	switch (what)
846	+	{
847	+	case MODE_ADD:
848	+	AddUMode(target_p, UMODE_HIDDENHOST);
849	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
850	+	break;
851	+	case MODE_DEL:
852	+	DelUMode(target_p, UMODE_HIDDENHOST);
853	+
854	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
855	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
856	+	break;
857	+	default: return;
858	+	}
859	+
860	+	if (ConfigGeneral.cycle_on_host_change)
861	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
862	+	target_p->name, target_p->username, target_p->host);
863	+
864		if (IsUserHostIp(target_p))
865		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
866
867		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1066	–	SetIPSpoof(target_p);
868
869		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
870		SetUserHost(target_p);
871
872		if (MyClient(target_p))
873	+	{
874	+	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
875		clear_ban_cache_client(target_p);
876	<	}
1074	<
1075	<	/* user_welcome()
1076	<	*
1077	<	* inputs       - client pointer to client to welcome
1078	<	* output       - NONE
1079	<	* side effects -
1080	<	*/
1081	<	static void
1082	<	user_welcome(struct Client *source_p)
1083	<	{
1084	<	#if defined(__TIME__) && defined(__DATE__)
1085	<	static const char built_date[] = __DATE__ " at " __TIME__;
1086	<	#else
1087	<	static const char built_date[] = "unknown";
1088	<	#endif
1089	<
1090	<	#ifdef HAVE_LIBCRYPTO
1091	<	if (source_p->localClient->fd.ssl != NULL)
1092	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1093	<	me.name, source_p->name,
1094	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1095	<	#endif
1096	<
1097	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1098	<	ServerInfo.network_name, source_p->name);
1099	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1100	<	get_listener_name(source_p->localClient->listener), ircd_version);
1101	<	sendto_one(source_p, form_str(RPL_CREATED),
1102	<	me.name, source_p->name, built_date);
1103	<	sendto_one(source_p, form_str(RPL_MYINFO),
1104	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1105	<	show_isupport(source_p);
1106	<
1107	<	if (source_p->id[0] != '\0')
1108	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1109	<	source_p->name, source_p->id);
876	>	}
877
878	<	show_lusers(source_p);
878	>	if (!ConfigGeneral.cycle_on_host_change)
879	>	return;
880
881	<	if (ConfigFileEntry.short_motd)
881	>	DLINK_FOREACH(ptr, target_p->channel.head)
882		{
883	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
884	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
885	<	sendto_one(source_p,
886	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1119	<	"read it", me.name, source_p->name);
1120	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1121	<	me.name, source_p->name, me.name);
1122	<	sendto_one(source_p, form_str(RPL_MOTD),
1123	<	me.name, source_p->name,
1124	<	"*** This is the short motd ***");
1125	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1126	<	me.name, source_p->name);
1127	<	}
1128	<	else
1129	<	send_message_file(source_p, &ConfigFileEntry.motd);
1130	<	}
883	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
884	>	char *p = modebuf;
885	>	int len = 0;
886	>	const struct Membership *ms = ptr->data;
887
888	<	/* check_xline()
889	<	*
890	<	* inputs       - pointer to client to test
891	<	* outupt       - 1 if exiting 0 if ok
892	<	* side effects -
1137	<	*/
1138	<	static int
1139	<	check_xline(struct Client *source_p)
1140	<	{
1141	<	struct MaskItem *conf = NULL;
1142	<	const char *reason = NULL;
888	>	if (has_member_flags(ms, CHFL_CHANOP))
889	>	{
890	>	*p++ = 'o';
891	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
892	>	}
893
894	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
895	<	{
896	<	++conf->count;
894	>	if (has_member_flags(ms, CHFL_HALFOP))
895	>	{
896	>	*p++ = 'h';
897	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
898	>	}
899
900	<	if (conf->reason != NULL)
901	<	reason = conf->reason;
902	<	else
903	<	reason = "No Reason";
900	>	if (has_member_flags(ms, CHFL_VOICE))
901	>	{
902	>	*p++ = 'v';
903	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
904	>	}
905
906	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1154	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1155	<	source_p->info, reason,
1156	<	get_client_name(source_p, HIDE_IP),
1157	<	source_p->sockhost);
906	>	*p = '\0';
907
908	<	++ServerStats.is_ref;
909	<	exit_client(source_p, &me, "Bad user info");
910	<	return 1;
911	<	}
908	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
909	>	target_p->name, target_p->username, target_p->host,
910	>	ms->chptr->name);
911	>	if (nickbuf[0])
912	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
913	>	target_p->servptr->name, ms->chptr->name,
914	>	modebuf, nickbuf);
915
916	<	return 0;
1165	<	}
916	>	}
917
918	<	/* oper_up()
919	<	*
920	<	* inputs       - pointer to given client to oper
921	<	* output       - NONE
922	<	* side effects - Blindly opers up given source_p, using conf info
923	<	*                all checks on passwords have already been done.
924	<	*                This could also be used by rsa oper routines.
918	>	if (target_p->away[0])
919	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
920	>	":%s!%s@%s AWAY :%s",
921	>	target_p->name, target_p->username,
922	>	target_p->host, target_p->away);
923	>	}
924	>
925	>	/*! \brief Blindly opers up given source_p, using conf info.
926	>	*         All checks on passwords have already been done.
927	>	* \param source_p Pointer to given client to oper
928		*/
929		void
930		oper_up(struct Client *source_p)
931		{
932		const unsigned int old = source_p->umodes;
933	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
933	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
934
935	<	assert(source_p->localClient->confs.head);
935	>	assert(source_p->connection->confs.head);
936
937		++Count.oper;
938		SetOper(source_p);
939
940		if (conf->modes)
941		AddUMode(source_p, conf->modes);
942	<	else if (ConfigFileEntry.oper_umodes)
943	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
942	>	else if (ConfigGeneral.oper_umodes)
943	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
944
945		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946		++Count.invisi;
#	Line 1203 | Line 957 | oper_up(struct Client *source_p)
957
958		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
959		get_oper_name(source_p));
960	<	send_umode_out(source_p, source_p, old);
961	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
960	>	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
961	>	me.id, get_oper_name(source_p));
962	>	send_umode_out(source_p, old);
963	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
964		}
965
966	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
966	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
967
968		int
969		valid_sid(const char *sid)
#	Line 1222 | Line 978 | valid_sid(const char *sid)
978
979		/*
980		* init_uid()
981	<	*
981	>	*
982		* inputs       - NONE
983		* output       - NONE
984		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1232 | Line 988 | valid_sid(const char *sid)
988		void
989		init_uid(void)
990		{
1235	–	unsigned int i;
1236	–
991		memset(new_uid, 0, sizeof(new_uid));
992
993	<	if (!EmptyString(ServerInfo.sid))
994	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
993	>	if (!EmptyString(ConfigServerInfo.sid))
994	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
995
996	<	for (i = 0; i < IRC_MAXSID; ++i)
997	<	if (new_uid[i] == '\0')
996	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
997	>	if (new_uid[i] == '\0')
998		new_uid[i] = 'A';
999
1000		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1247	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1248	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1249	–	* -Dianora
1250	–	*/
1001		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1002		}
1003
#	Line 1260 | Line 1010 | init_uid(void)
1010		*                note this is a recursive function
1011		*/
1012		static void
1013	<	add_one_to_uid(int i)
1013	>	add_one_to_uid(unsigned int i)
1014		{
1015	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1015	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1016		{
1017		if (new_uid[i] == 'Z')
1018		new_uid[i] = '0';
1019		else if (new_uid[i] == '9')
1020		{
1021		new_uid[i] = 'A';
1022	<	add_one_to_uid(i-1);
1022	>	add_one_to_uid(i - 1);
1023		}
1024		else
1025		++new_uid[i];
#	Line 1294 | Line 1044 | add_one_to_uid(int i)
1044		static const char *
1045		uid_get(void)
1046		{
1047	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1047	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1048		return new_uid;
1049		}
1050
#	Line 1308 | Line 1058 | uid_get(void)
1058		void
1059		init_isupport(void)
1060		{
1311	–	isupportFile = init_MessageLine();
1312	–
1061		add_isupport("CALLERID", NULL, -1);
1062	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1062	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1063		add_isupport("DEAF", "D", -1);
1064		add_isupport("KICKLEN", NULL, KICKLEN);
1065		add_isupport("MODES", NULL, MAXMODEPARAMS);
1318	–	#ifdef HALFOPS
1066		add_isupport("PREFIX", "(ohv)@%+", -1);
1067		add_isupport("STATUSMSG", "@%+", -1);
1068	<	#else
1069	<	add_isupport("PREFIX", "(ov)@+", -1);
1323	<	add_isupport("STATUSMSG", "@+", -1);
1324	<	#endif
1068	>	add_isupport("EXCEPTS", "e", -1);
1069	>	add_isupport("INVEX", "I", -1);
1070		}
1071
1072		/*
#	Line 1337 | Line 1082 | void
1082		add_isupport(const char *name, const char *options, int n)
1083		{
1084		dlink_node *ptr;
1085	<	struct Isupport *support;
1085	>	struct Isupport *support = NULL;
1086
1087		DLINK_FOREACH(ptr, support_list.head)
1088		{
#	Line 1352 | Line 1097 | add_isupport(const char *name, const cha
1097
1098		if (ptr == NULL)
1099		{
1100	<	support = MyMalloc(sizeof(*support));
1100	>	support = MyCalloc(sizeof(*support));
1101		dlinkAddTail(support, &support->node, &support_list);
1102		}
1103
1104		support->name = xstrdup(name);
1105	<	if (options != NULL)
1105	>	if (options)
1106		support->options = xstrdup(options);
1107		support->number = n;
1108
#	Line 1405 | Line 1150 | rebuild_isupport_message_line(void)
1150		{
1151		char isupportbuffer[IRCD_BUFSIZE];
1152		char *p = isupportbuffer;
1153	<	dlink_node *ptr = NULL;
1153	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1154		int n = 0;
1155		int tokens = 0;
1156		size_t len = 0;
1157	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1157	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1158
1159	<	destroy_MessageLine(isupportFile);
1159	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1160	>	{
1161	>	dlinkDelete(ptr, &support_list_lines);
1162	>	MyFree(ptr->data);
1163	>	free_dlink_node(ptr);
1164	>	}
1165
1166		DLINK_FOREACH(ptr, support_list.head)
1167		{
#	Line 1420 | Line 1170 | rebuild_isupport_message_line(void)
1170		p += (n = sprintf(p, "%s", support->name));
1171		len += n;
1172
1173	<	if (support->options != NULL)
1173	>	if (support->options)
1174		{
1175		p += (n = sprintf(p, "=%s", support->options));
1176		len += n;
#	Line 1441 | Line 1191 | rebuild_isupport_message_line(void)
1191		if (*--p == ' ')
1192		*p = '\0';
1193
1194	<	addto_MessageLine(isupportFile, isupportbuffer);
1194	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1195		p = isupportbuffer;
1196		len = 0;
1197		n = tokens = 0;
1198		}
1199		}
1200
1201	<	if (len != 0)
1201	>	if (len)
1202		{
1203		if (*--p == ' ')
1204		*p = '\0';
1205	<	addto_MessageLine(isupportFile, isupportbuffer);
1205	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1206		}
1207		}

Diff Legend

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