ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4439 by michael, Sat Aug 9 18:36:19 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
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 "sprintf_irc.h"
36	–	#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"
45	–	#include "supported.h"
46	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
52	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
56	–
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
51		static char umode_buffer[IRCD_BUFSIZE];
61	–
62	–	static void user_welcome(struct Client *);
63	–	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
64	–	static int check_xline(struct Client *);
65	–	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	<
72	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 77 | 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	<	unsigned int user_modes[256] =
69	>	const unsigned int user_modes[256] =
70		{
71		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 90 | Line 75 | 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	<	0,                  /* F */
81	>	UMODE_FARCONNECT,   /* F */
82		UMODE_SOFTCALLERID, /* G */
83		UMODE_HIDDEN,       /* H */
84		0,                  /* I */
#	Line 106 | Line 91 | 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 */
106		UMODE_CCONN,        /* c */
107		UMODE_DEBUG,        /* d */
108	<	0,                  /* e */
108	>	UMODE_EXTERNAL,     /* e */
109		UMODE_FULL,         /* f */
110		UMODE_CALLERID,     /* g */
111		0,                  /* h */
#	Line 131 | Line 116 | 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	<	UMODE_EXTERNAL,     /* 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 174 | 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		{
179	–	const char *from, *to;
180	–
181	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
182	–	{
183	–	from = me.id;
184	–	to = source_p->id;
185	–	}
186	–	else
187	–	{
188	–	from = me.name;
189	–	to = source_p->name;
190	–	}
191	–
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),
195	<	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,
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170	>
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 (Count.oper > 0)
178	<	sendto_one(source_p, form_str(RPL_LUSEROP),
202	<	from, to, Count.oper);
203	<
204	<	if (dlink_list_length(&unknown_list) > 0)
205	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
206	<	from, to, dlink_list_length(&unknown_list));
207	<
208	<	if (dlink_list_length(&global_channel_list) > 0)
209	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
210	<	from, to, dlink_list_length(&global_channel_list));
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);
216	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
217	<	from, to, Count.local, Count.max_loc,
218	<	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);
224	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
225	<	from, to, Count.total, Count.max_tot,
226	<	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),
230	<	from, to, Count.total, Count.max_tot,
231	<	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 248 | 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->localClient->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->localClient->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 AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
412	>	const struct MaskItem *conf = NULL;
413
286	–	assert(source_p != NULL);
414		assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416		assert(!source_p->localClient->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->localClient->random_ping)
423		{
424		do
425		source_p->localClient->random_ping = genrand_int32();
#	Line 312 | Line 439 | register_local_user(struct Client *sourc
439		/* Straight up the maximum rate of flooding... */
440		source_p->localClient->allow_read = MAX_FLOOD_BURST;
441
442	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
442	>	if (!check_client(source_p))
443		return;
444
445	<	if (valid_hostname(source_p->host) == 0)
445	>	if (!valid_hostname(source_p->host))
446		{
447	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
448	<	"character in your hostname", me.name, source_p->name);
447	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
448	>	"character in your hostname");
449		strlcpy(source_p->host, source_p->sockhost,
450		sizeof(source_p->host));
451		}
452
453	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
453	>	conf = source_p->localClient->confs.head->data;
454
455		if (!IsGotId(source_p))
456		{
457	<	char username[USERLEN + 1];
457	>	char username[USERLEN + 1] = "";
458		const char *p = username;
459		unsigned int i = 0;
460
461	<	if (IsNeedIdentd(aconf))
461	>	if (IsNeedIdentd(conf))
462		{
463		++ServerStats.is_ref;
464	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
465	<	"identd to use this server", me.name, source_p->name);
466	<	exit_client(source_p, &me, "Install identd");
464	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
465	>	"identd to use this server");
466	>	exit_client(source_p, "Install identd");
467		return;
468		}
469
470		strlcpy(username, source_p->username, sizeof(username));
471
472	<	if (!IsNoTilde(aconf))
472	>	if (!IsNoTilde(conf))
473		source_p->username[i++] = '~';
474
475		for (; *p && i < USERLEN; ++p)
476	<	if (*p != '[')
351	<	source_p->username[i++] = *p;
476	>	source_p->username[i++] = *p;
477
478		source_p->username[i] = '\0';
479		}
480
481	<	/* password check */
482	<	if (!EmptyString(aconf->passwd))
481	>	/* Password check */
482	>	if (!EmptyString(conf->passwd))
483		{
484	<	const char *pass = source_p->localClient->passwd;
360	<
361	<	if (!match_conf_password(pass, aconf))
484	>	if (!match_conf_password(source_p->localClient->password, conf))
485		{
486		++ServerStats.is_ref;
487	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
488	<	me.name, source_p->name);
489	<	exit_client(source_p, &me, "Bad Password");
487	>
488	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
489	>	exit_client(source_p, "Bad Password");
490		return;
491		}
492		}
493
494	<	/* don't free source_p->localClient->passwd here - it can be required
494	>	/*
495	>	* Don't free source_p->localClient->password here - it can be required
496		* by masked /stats I if there are auth{} blocks with need_password = no;
497		* --adx
498		*/
499
500	<	/* report if user has &^>= etc. and set flags as needed in source_p */
501	<	report_and_set_user_flags(source_p, aconf);
500	>	/*
501	>	* Report if user has &^>= etc. and set flags as needed in source_p
502	>	*/
503	>	report_and_set_user_flags(source_p, conf);
504
505		if (IsDead(source_p))
506		return;
507
508	<	/* Limit clients -
508	>	/*
509	>	* Limit clients -
510		* We want to be able to have servers and F-line clients
511		* connect, so save room for "buffer" connections.
512		* Smaller servers may want to decrease this, and it should
513		* probably be just a percentage of the MAXCLIENTS...
514		*   -Taner
515		*/
516	<	/* Except "F:" clients */
517	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
391	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
516	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
517	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
518		{
519	<	sendto_realops_flags(UMODE_FULL, L_ALL,
519	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
520		"Too many clients, rejecting %s[%s].",
521		source_p->name, source_p->host);
522		++ServerStats.is_ref;
523	<	exit_client(source_p, &me, "Sorry, server is full - try later");
523	>	exit_client(source_p, "Sorry, server is full - try later");
524		return;
525		}
526
527	<	/* valid user name check */
402	<	if (valid_username(source_p->username) == 0)
527	>	if (!valid_username(source_p->username, 1))
528		{
529	<	char tmpstr2[IRCD_BUFSIZE];
529	>	char buf[IRCD_BUFSIZE] = "";
530
531	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
531	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
532	>	"Invalid username: %s (%s@%s)",
533		source_p->name, source_p->username, source_p->host);
534		++ServerStats.is_ref;
535	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
536	<	source_p->username);
411	<	exit_client(source_p, &me, tmpstr2);
535	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
536	>	exit_client(source_p, buf);
537		return;
538		}
539
540		if (check_xline(source_p))
541		return;
542
543	<	while (hash_find_id((id = uid_get())) != NULL)
543	>	while (hash_find_id((id = uid_get())))
544		;
545
546		strlcpy(source_p->id, id, sizeof(source_p->id));
547		hash_add_id(source_p);
548
549	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
549	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
550		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
551		source_p->name, source_p->username, source_p->host,
552	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
552	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553		"255.255.255.255" : source_p->sockhost,
554	<	get_client_class(source_p),
554	>	get_client_class(&source_p->localClient->confs),
555		source_p->info, source_p->id);
556
557	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
433	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
434	<	source_p->name, source_p->username, source_p->host,
435	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	<	"255.255.255.255" : source_p->sockhost,
437	<	get_client_class(source_p),
438	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	<	"<hidden>" : source_p->localClient->client_host,
440	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
441	<	"<hidden>" : source_p->localClient->client_server,
442	<	source_p->info);
443	<
444	<
445	<	if (ConfigFileEntry.invisible_on_connect)
557	>	if (ConfigGeneral.invisible_on_connect)
558		{
559		AddUMode(source_p, UMODE_INVISIBLE);
560		++Count.invisi;
561		}
562
563	<	if ((++Count.local) > Count.max_loc)
563	>	if (++Count.local > Count.max_loc)
564		{
565		Count.max_loc = Count.local;
566
567		if (!(Count.max_loc % 10))
568	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
568	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
569	>	"New Max Local Clients: %d",
570		Count.max_loc);
571		}
572
460	–	/* Increment our total user count here */
573		if (++Count.total > Count.max_tot)
574		Count.max_tot = Count.total;
575		++Count.totalrestartcount;
#	Line 465 | Line 577 | register_local_user(struct Client *sourc
577		assert(source_p->servptr == &me);
578		SetClient(source_p);
579		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
580	<
469	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
580	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
581
582		assert(dlinkFind(&unknown_list, source_p));
583
#	Line 486 | Line 597 | register_local_user(struct Client *sourc
597		*              - username to register as
598		*              - host name to register as
599		*              - server name
489	–	*              - realname (gecos)
600		* output       - NONE
601		* side effects - This function is called when a remote client
602		*                is introduced by a server.
603		*/
604		void
605	<	register_remote_user(struct Client *source_p,
496	<	const char *username, const char *host, const char *server,
497	<	const char *realname)
605	>	register_remote_user(struct Client *source_p)
606		{
607	<	struct Client *target_p = NULL;
500	<
501	<	assert(source_p != NULL);
502	<	assert(source_p->username != username);
503	<
504	<	strlcpy(source_p->host, host, sizeof(source_p->host));
505	<	strlcpy(source_p->username, username, sizeof(source_p->username));
506	<
507	<	/*
508	<	* coming from another server, take the servers word for it
509	<	*/
510	<	source_p->servptr = hash_find_server(server);
511	<
512	<	/* Super GhostDetect:
513	<	* If we can't find the server the user is supposed to be on,
514	<	* then simply blow the user away.        -Taner
515	<	*/
516	<	if (source_p->servptr == NULL)
517	<	{
518	<	sendto_realops_flags(UMODE_ALL, L_ALL,
519	<	"No server %s for user %s[%s@%s] from %s",
520	<	server, source_p->name, source_p->username,
521	<	source_p->host, source_p->from->name);
522	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
523	<
524	<	AddFlag(source_p, FLAGS_KILLED);
525	<	exit_client(source_p, &me, "Ghosted Client");
526	<	return;
527	<	}
607	>	const struct Client *target_p = NULL;
608
609		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
610		{
611	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
611	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
612		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
613		source_p->from->name, source_p->name, source_p->username,
614		source_p->host, source_p->servptr->name,
615		target_p->name, target_p->from->name);
616	<	kill_client(source_p->from, source_p,
617	<	"%s (NICK from wrong direction (%s != %s))",
618	<	me.name, source_p->servptr->name, target_p->from->name);
616	>	sendto_one(source_p->from,
617	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
618	>	me.id, source_p->id, me.name, source_p->servptr->name,
619	>	target_p->from->name);
620	>
621		AddFlag(source_p, FLAGS_KILLED);
622	<	exit_client(source_p, &me, "USER server wrong direction");
622	>	exit_client(source_p, "USER server wrong direction");
623		return;
624		}
625
#	Line 548 | Line 630 | register_remote_user(struct Client *sour
630		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
631		AddFlag(source_p, FLAGS_SERVICE);
632
551	–	/* Increment our total user count here */
633		if (++Count.total > Count.max_tot)
634		Count.max_tot = Count.total;
635
636		SetClient(source_p);
637		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
638	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
639		add_user_host(source_p->username, source_p->host, 1);
640		SetUserHost(source_p);
641
642	<	introduce_client(source_p);
643	<	}
644	<
645	<	/* introduce_client()
646	<	*
647	<	* inputs       - source_p
566	<	* output       - NONE
567	<	* side effects - This common function introduces a client to the rest
568	<	*                of the net, either from a local client connect or
569	<	*                from a remote connect.
570	<	*/
571	<	static void
572	<	introduce_client(struct Client *source_p)
573	<	{
574	<	dlink_node *server_node = NULL;
575	<	static char ubuf[12];
576	<
577	<	if (MyClient(source_p))
578	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
579	<	else
580	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
581	<
582	<	watch_check_hash(source_p, RPL_LOGON);
583	<
584	<	if (*ubuf == '\0')
585	<	{
586	<	ubuf[0] = '+';
587	<	ubuf[1] = '\0';
588	<	}
589	<
590	<	DLINK_FOREACH(server_node, serv_list.head)
591	<	{
592	<	struct Client *server = server_node->data;
593	<
594	<	if (server == source_p->from)
595	<	continue;
596	<
597	<	if (IsCapable(server, CAP_SVS))
598	<	{
599	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
601	<	source_p->servptr->id,
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
605	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
606	<	"0" : source_p->sockhost, source_p->id,
607	<	(unsigned long)source_p->servicestamp,
608	<	source_p->info);
609	<	else
610	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
611	<	source_p->name, source_p->hopcount+1,
612	<	(unsigned long)source_p->tsinfo,
613	<	ubuf, source_p->username, source_p->host,
614	<	source_p->servptr->name, (unsigned long)source_p->servicestamp,
615	<	source_p->info);
642	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
643	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
644	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
645	>	source_p->servptr->name,
646	>	source_p->name, source_p->username, source_p->host,
647	>	source_p->info, source_p->id);
648
649	<	}
618	<	else
619	<	{
620	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
621	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
622	<	source_p->servptr->id,
623	<	source_p->name, source_p->hopcount+1,
624	<	(unsigned long)source_p->tsinfo,
625	<	ubuf, source_p->username, source_p->host,
626	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
627	<	"0" : source_p->sockhost, source_p->id, source_p->info);
628	<	else
629	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	<	source_p->name, source_p->hopcount+1,
631	<	(unsigned long)source_p->tsinfo,
632	<	ubuf, source_p->username, source_p->host,
633	<	source_p->servptr->name, source_p->info);
634	<	}
635	<	}
649	>	introduce_client(source_p);
650		}
651
652		/* valid_hostname()
#	Line 649 | Line 663 | valid_hostname(const char *hostname)
663		{
664		const char *p = hostname;
665
666	<	assert(p != NULL);
666	>	assert(p);
667
668	<	if (*p == '.' || *p == ':')
668	>	if (EmptyString(p) || *p == '.' || *p == ':')
669		return 0;
670
671		for (; *p; ++p)
672		if (!IsHostChar(*p))
673		return 0;
674
675	<	return 1;
675	>	return p - hostname <= HOSTLEN;
676		}
677
678		/* valid_username()
#	Line 673 | Line 687 | valid_hostname(const char *hostname)
687		* style of username
688		*/
689		int
690	<	valid_username(const char *username)
690	>	valid_username(const char *username, const int local)
691		{
692	<	int dots      = 0;
692	>	unsigned int dots = 0;
693		const char *p = username;
694
695	<	assert(p != NULL);
695	>	assert(p);
696
697		if (*p == '~')
698		++p;
699
700	<	/* reject usernames that don't start with an alphanum
700	>	/*
701	>	* Reject usernames that don't start with an alphanum
702		* i.e. reject jokers who have '-@somehost' or '.@somehost'
703		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
704		*/
705		if (!IsAlNum(*p))
706		return 0;
707
708	<	while (*++p)
708	>	if (local)
709		{
710	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
710	>	while (*++p)
711		{
712	<	if (++dots > ConfigFileEntry.dots_in_ident)
713	<	return 0;
714	<	if (!IsUserChar(*(p + 1)))
712	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
713	>	{
714	>	if (++dots > ConfigGeneral.dots_in_ident)
715	>	return 0;
716	>	if (!IsUserChar(*(p + 1)))
717	>	return 0;
718	>	}
719	>	else if (!IsUserChar(*p))
720		return 0;
721		}
722	<	else if (!IsUserChar(*p))
723	<	return 0;
722	>	}
723	>	else
724	>	{
725	>	while (*++p)
726	>	if (!IsUserChar(*p))
727	>	return 0;
728		}
729
730	<	return 1;
730	>	return p - username <= USERLEN;
731		}
732
733		/* clean_nick_name()
#	Line 717 | Line 741 | int
741		valid_nickname(const char *nickname, const int local)
742		{
743		const char *p = nickname;
744	+
745		assert(nickname && *nickname);
746
747	<	/* nicks can't start with a digit or - or be 0 length */
748	<	/* This closer duplicates behaviour of hybrid-6 */
747	>	/*
748	>	* Nicks can't start with a digit or - or be 0 length.
749	>	*/
750		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
751		return 0;
752
#	Line 728 | Line 754 | valid_nickname(const char *nickname, con
754		if (!IsNickChar(*p))
755		return 0;
756
757	<	return p - nickname <= (NICKLEN - 1);
732	<	}
733	<
734	<	/* report_and_set_user_flags()
735	<	*
736	<	* inputs       - pointer to source_p
737	<	*              - pointer to aconf for this user
738	<	* output       - NONE
739	<	* side effects - Report to user any special flags
740	<	*                they are getting, and set them.
741	<	*/
742	<	static void
743	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
744	<	{
745	<	/* If this user is being spoofed, tell them so */
746	<	if (IsConfDoSpoofIp(aconf))
747	<	{
748	<	sendto_one(source_p,
749	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
750	<	me.name, source_p->name);
751	<	}
752	<
753	<	/* If this user is in the exception class, Set it "E lined" */
754	<	if (IsConfExemptKline(aconf))
755	<	{
756	<	SetExemptKline(source_p);
757	<	sendto_one(source_p,
758	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
759	<	me.name, source_p->name);
760	<	}
761	<
762	<	/* The else here is to make sure that G line exempt users
763	<	* do not get noticed twice.
764	<	*/
765	<	else if (IsConfExemptGline(aconf))
766	<	{
767	<	SetExemptGline(source_p);
768	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769	<	me.name, source_p->name);
770	<	}
771	<
772	<	if (IsConfExemptResv(aconf))
773	<	{
774	<	SetExemptResv(source_p);
775	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
776	<	me.name, source_p->name);
777	<	}
778	<
779	<	/* If this user is exempt from user limits set it "F lined" */
780	<	if (IsConfExemptLimits(aconf))
781	<	{
782	<	SetExemptLimits(source_p);
783	<	sendto_one(source_p,
784	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
785	<	me.name,source_p->name);
786	<	}
787	<
788	<	if (IsConfCanFlood(aconf))
789	<	{
790	<	SetCanFlood(source_p);
791	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
792	<	"protection, aren't you fearsome.",
793	<	me.name, source_p->name);
794	<	}
795	<	}
796	<
797	<	/* change_simple_umode()
798	<	*
799	<	* this callback can be hooked to allow special handling of
800	<	* certain usermodes
801	<	*/
802	<	static void *
803	<	change_simple_umode(va_list args)
804	<	{
805	<	struct Client *client_p;
806	<	struct Client *source_p;
807	<	int what;
808	<	unsigned int flag;
809	<
810	<	client_p = va_arg(args, struct Client *);
811	<	source_p = va_arg(args, struct Client *);
812	<	what = va_arg(args, int);
813	<	flag = va_arg(args, unsigned int);
814	<
815	<	if (what == MODE_ADD)
816	<	AddUMode(source_p, flag);
817	<	else
818	<	DelUMode(source_p, flag);
819	<
820	<	return NULL;
821	<	}
822	<
823	<	/* set_user_mode()
824	<	*
825	<	* added 15/10/91 By Darren Reed.
826	<	* parv[0] - sender
827	<	* parv[1] - username to change mode for
828	<	* parv[2] - modes to change
829	<	*/
830	<	void
831	<	set_user_mode(struct Client *client_p, struct Client *source_p,
832	<	int parc, char *parv[])
833	<	{
834	<	unsigned int flag, setflags;
835	<	char **p, *m, buf[IRCD_BUFSIZE];
836	<	struct Client *target_p;
837	<	int what = MODE_ADD, badflag = 0, i;
838	<
839	<	assert(!(parc < 2));
840	<
841	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
842	<	{
843	<	if (MyConnect(source_p))
844	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
845	<	me.name, source_p->name, parv[1]);
846	<	return;
847	<	}
848	<
849	<	if (IsServer(source_p))
850	<	{
851	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
852	<	parv[1], source_p->name);
853	<	return;
854	<	}
855	<
856	<	if (source_p != target_p)
857	<	{
858	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
859	<	me.name, source_p->name);
860	<	return;
861	<	}
862	<
863	<	if (parc < 3)
864	<	{
865	<	m = buf;
866	<	*m++ = '+';
867	<
868	<	for (i = 0; i < 128; i++)
869	<	if (HasUMode(source_p, user_modes[i]))
870	<	*m++ = (char)i;
871	<	*m = '\0';
872	<
873	<	sendto_one(source_p, form_str(RPL_UMODEIS),
874	<	me.name, source_p->name, buf);
875	<	return;
876	<	}
877	<
878	<	execute_callback(entering_umode_cb, client_p, source_p);
879	<
880	<	/* find flags already set for user */
881	<	setflags = source_p->umodes;
882	<
883	<	/* parse mode change string(s) */
884	<	for (p = &parv[2]; p && *p; p++)
885	<	{
886	<	for (m = *p; *m; m++)
887	<	{
888	<	switch (*m)
889	<	{
890	<	case '+':
891	<	what = MODE_ADD;
892	<	break;
893	<	case '-':
894	<	what = MODE_DEL;
895	<	break;
896	<	case 'o':
897	<	if (what == MODE_ADD)
898	<	{
899	<	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
900	<	{
901	<	++Count.oper;
902	<	SetOper(source_p);
903	<	}
904	<	}
905	<	else
906	<	{
907	<	/* Only decrement the oper counts if an oper to begin with
908	<	* found by Pat Szuta, Perly , perly@xnet.com
909	<	*/
910	<	if (!HasUMode(source_p, UMODE_OPER))
911	<	break;
912	<
913	<	ClearOper(source_p);
914	<	Count.oper--;
915	<
916	<	if (MyConnect(source_p))
917	<	{
918	<	dlink_node *dm;
919	<
920	<	detach_conf(source_p, OPER_TYPE);
921	<	ClrOFlag(source_p);
922	<	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
923	<
924	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
925	<	free_dlink_node(dm);
926	<	}
927	<	}
928	<
929	<	break;
930	<
931	<	/* we may not get these,
932	<	* but they shouldnt be in default
933	<	*/
934	<	case 'r':
935	<	case ' ' :
936	<	case '\n':
937	<	case '\r':
938	<	case '\t':
939	<	break;
940	<
941	<	default:
942	<	if ((flag = user_modes[(unsigned char)*m]))
943	<	{
944	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
945	<	(ConfigFileEntry.oper_only_umodes & flag))
946	<	{
947	<	badflag = 1;
948	<	}
949	<	else
950	<	execute_callback(umode_cb, client_p, source_p, what, flag);
951	<	}
952	<	else
953	<	{
954	<	if (MyConnect(source_p))
955	<	badflag = 1;
956	<	}
957	<
958	<	break;
959	<	}
960	<	}
961	<	}
962	<
963	<	if (badflag)
964	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
965	<	me.name, source_p->name);
966	<
967	<	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
968	<	{
969	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
970	<	me.name, source_p->name);
971	<	DelUMode(source_p, UMODE_NCHANGE);
972	<	}
973	<
974	<	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
975	<	!HasOFlag(source_p, OPER_FLAG_ADMIN))
976	<	{
977	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
978	<	me.name, source_p->name);
979	<	DelUMode(source_p, UMODE_ADMIN);
980	<	}
981	<
982	<	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
983	<	++Count.invisi;
984	<	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
985	<	--Count.invisi;
986	<
987	<	/*
988	<	* compare new flags with old flags and send string which
989	<	* will cause servers to update correctly.
990	<	*/
991	<	send_umode_out(client_p, source_p, setflags);
757	>	return p - nickname <= NICKLEN;
758		}
759
760		/* send_umode()
#	Line 1004 | Line 770 | set_user_mode(struct Client *client_p, s
770		*/
771		void
772		send_umode(struct Client *client_p, struct Client *source_p,
773	<	unsigned int old, unsigned int sendmask, char *umode_buf)
773	>	unsigned int old, char *umode_buf)
774		{
775		char *m = umode_buf;
776		int what = 0;
1011	–	unsigned int i;
1012	–	unsigned int flag;
777
778		/*
779	<	* build a string in umode_buf to represent the change in the user's
779	>	* Build a string in umode_buf to represent the change in the user's
780		* mode between the new (source_p->umodes) and 'old'.
781		*/
782	<	for (i = 0; i < 128; i++)
782	>	for (unsigned int i = 0; i < 128; ++i)
783		{
784	<	flag = user_modes[i];
1021	<	if (!flag)
1022	<	continue;
784	>	unsigned int flag = user_modes[i];
785
786	<	if (MyClient(source_p) && !(flag & sendmask))
786	>	if (!flag)
787		continue;
788
789		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1066 | Line 828 | void
828		send_umode_out(struct Client *client_p, struct Client *source_p,
829		unsigned int old)
830		{
831	<	char buf[IRCD_BUFSIZE] = { '\0' };
1070	<	dlink_node *ptr = NULL;
831	>	char buf[IRCD_BUFSIZE] = "";
832
833	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
833	>	send_umode(NULL, source_p, old, buf);
834
835		if (buf[0])
836	<	{
837	<	DLINK_FOREACH(ptr, serv_list.head)
1077	<	{
1078	<	struct Client *target_p = ptr->data;
1079	<
1080	<	if ((target_p != client_p) && (target_p != source_p))
1081	<	sendto_one(target_p, ":%s MODE %s :%s",
1082	<	ID_or_name(source_p, target_p),
1083	<	ID_or_name(source_p, target_p), buf);
1084	<	}
1085	<	}
836	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
837	>	source_p->id, source_p->id, buf);
838
839		if (client_p && MyClient(client_p))
840	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
840	>	send_umode(client_p, source_p, old, buf);
841		}
842
843	<	/* user_welcome()
844	<	*
1093	<	* inputs       - client pointer to client to welcome
1094	<	* output       - NONE
1095	<	* side effects -
1096	<	*/
1097	<	static void
1098	<	user_welcome(struct Client *source_p)
843	>	void
844	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
845		{
846	<	#if defined(__TIME__) && defined(__DATE__)
1101	<	static const char built_date[] = __DATE__ " at " __TIME__;
1102	<	#else
1103	<	static const char built_date[] = "unknown";
1104	<	#endif
846	>	dlink_node *ptr = NULL;
847
848	<	#ifdef HAVE_LIBCRYPTO
849	<	if (source_p->localClient->fd.ssl != NULL)
1108	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1109	<	me.name, source_p->name,
1110	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1111	<	#endif
848	>	if (!strcmp(target_p->host, hostname))
849	>	return;
850
851	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
852	<	ServerInfo.network_name, source_p->name);
853	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
854	<	get_listener_name(source_p->localClient->listener), ircd_version);
855	<	sendto_one(source_p, form_str(RPL_CREATED),
856	<	me.name, source_p->name, built_date);
857	<	sendto_one(source_p, form_str(RPL_MYINFO),
858	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
859	<	show_isupport(source_p);
851	>	switch (what)
852	>	{
853	>	case MODE_ADD:
854	>	AddUMode(target_p, UMODE_HIDDENHOST);
855	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
856	>	break;
857	>	case MODE_DEL:
858	>	DelUMode(target_p, UMODE_HIDDENHOST);
859	>
860	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
861	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
862	>	break;
863	>	default: return;
864	>	}
865
866	<	if (source_p->id[0] != '\0')
867	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
868	<	source_p->name, source_p->id);
866	>	if (ConfigGeneral.cycle_on_host_change)
867	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
868	>	target_p->name, target_p->username, target_p->host);
869
870	<	show_lusers(source_p);
870	>	if (IsUserHostIp(target_p))
871	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
872
873	<	if (ConfigFileEntry.short_motd)
873	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
874	>
875	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
876	>	SetUserHost(target_p);
877	>
878	>	if (MyClient(target_p))
879		{
880	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
881	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1133	<	sendto_one(source_p,
1134	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1135	<	"read it", me.name, source_p->name);
1136	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1137	<	me.name, source_p->name, me.name);
1138	<	sendto_one(source_p, form_str(RPL_MOTD),
1139	<	me.name, source_p->name,
1140	<	"*** This is the short motd ***");
1141	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1142	<	me.name, source_p->name);
880	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
881	>	clear_ban_cache_client(target_p);
882		}
1144	–	else
1145	–	send_message_file(source_p, &ConfigFileEntry.motd);
1146	–	}
883
884	<	/* check_xline()
885	<	*
1150	<	* inputs       - pointer to client to test
1151	<	* outupt       - 1 if exiting 0 if ok
1152	<	* side effects -
1153	<	*/
1154	<	static int
1155	<	check_xline(struct Client *source_p)
1156	<	{
1157	<	struct ConfItem *conf = NULL;
1158	<	const char *reason = NULL;
884	>	if (!ConfigGeneral.cycle_on_host_change)
885	>	return;
886
887	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1161	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
887	>	DLINK_FOREACH(ptr, target_p->channel.head)
888		{
889	<	struct MatchItem *reg = map_to_conf(conf);
890	<
891	<	++reg->count;
889	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
890	>	char *p = modebuf;
891	>	int len = 0;
892	>	const struct Membership *ms = ptr->data;
893
894	<	if (reg->reason != NULL)
895	<	reason = reg->reason;
896	<	else
897	<	reason = "No Reason";
894	>	if (has_member_flags(ms, CHFL_CHANOP))
895	>	{
896	>	*p++ = 'o';
897	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
898	>	}
899
900	<	sendto_realops_flags(UMODE_REJ, L_ALL,
901	<	"X-line Rejecting [%s] [%s], user %s [%s]",
902	<	source_p->info, reason,
903	<	get_client_name(source_p, HIDE_IP),
904	<	source_p->sockhost);
900	>	if (has_member_flags(ms, CHFL_HALFOP))
901	>	{
902	>	*p++ = 'h';
903	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
904	>	}
905
906	<	++ServerStats.is_ref;
1179	<	if (REJECT_HOLD_TIME > 0)
906	>	if (has_member_flags(ms, CHFL_VOICE))
907		{
908	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
909	<	me.name, source_p->name);
1183	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1184	<	SetCaptured(source_p);
908	>	*p++ = 'v';
909	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
910		}
1186	–	else
1187	–	exit_client(source_p, &me, "Bad user info");
1188	–	return 1;
1189	–	}
911
912	<	return 0;
1192	<	}
912	>	*p = '\0';
913
914	<	/* oper_up()
915	<	*
916	<	* inputs       - pointer to given client to oper
917	<	* output       - NONE
918	<	* side effects - Blindly opers up given source_p, using aconf info
919	<	*                all checks on passwords have already been done.
920	<	*                This could also be used by rsa oper routines.
914	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
915	>	target_p->name, target_p->username, target_p->host,
916	>	ms->chptr->chname);
917	>	if (nickbuf[0])
918	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
919	>	target_p->servptr->name, ms->chptr->chname,
920	>	modebuf, nickbuf);
921	>
922	>	}
923	>
924	>	if (target_p->away[0])
925	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
926	>	":%s!%s@%s AWAY :%s",
927	>	target_p->name, target_p->username,
928	>	target_p->host, target_p->away);
929	>	}
930	>
931	>	/*! \brief Blindly opers up given source_p, using conf info.
932	>	*         All checks on passwords have already been done.
933	>	* \param source_p Pointer to given client to oper
934		*/
935		void
936		oper_up(struct Client *source_p)
937		{
938	<	unsigned int old = source_p->umodes;
939	<	const char *operprivs = "";
1207	<	const struct AccessItem *oconf = NULL;
938	>	const unsigned int old = source_p->umodes;
939	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
940
941		assert(source_p->localClient->confs.head);
1210	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
942
943		++Count.oper;
944		SetOper(source_p);
945
946	<	if (oconf->modes)
947	<	AddUMode(source_p, oconf->modes);
948	<	else if (ConfigFileEntry.oper_umodes)
949	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
946	>	if (conf->modes)
947	>	AddUMode(source_p, conf->modes);
948	>	else if (ConfigGeneral.oper_umodes)
949	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
950
951		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
952		++Count.invisi;
#	Line 1225 | Line 956 | oper_up(struct Client *source_p)
956		assert(dlinkFind(&oper_list, source_p) == NULL);
957		dlinkAdd(source_p, make_dlink_node(), &oper_list);
958
959	<	operprivs = oper_privs_as_string(oconf->port);
1229	<
1230	<	AddOFlag(source_p, oconf->port);
959	>	AddOFlag(source_p, conf->port);
960
961		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
962		AddUMode(source_p, UMODE_ADMIN);
1234	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1235	–	DelUMode(source_p, UMODE_NCHANGE);
963
964	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
965	<	source_p->name, source_p->username, source_p->host);
964	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
965	>	get_oper_name(source_p));
966		send_umode_out(source_p, source_p, old);
967	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1241	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1242	<	me.name, source_p->name, operprivs);
1243	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
967	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
968		}
969
970	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
970	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
971
972		int
973		valid_sid(const char *sid)
#	Line 1258 | Line 982 | valid_sid(const char *sid)
982
983		/*
984		* init_uid()
985	<	*
985	>	*
986		* inputs       - NONE
987		* output       - NONE
988		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1268 | Line 992 | valid_sid(const char *sid)
992		void
993		init_uid(void)
994		{
1271	–	int i;
1272	–
995		memset(new_uid, 0, sizeof(new_uid));
996
997	<	if (!EmptyString(ServerInfo.sid))
998	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
997	>	if (!EmptyString(ConfigServerInfo.sid))
998	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
999
1000	<	for (i = 0; i < IRC_MAXSID; ++i)
1001	<	if (new_uid[i] == '\0')
1000	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1001	>	if (new_uid[i] == '\0')
1002		new_uid[i] = 'A';
1003
1004		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1283	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1284	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1285	–	* -Dianora
1286	–	*/
1005		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1288	–
1289	–	entering_umode_cb = register_callback("entering_umode", NULL);
1290	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1006		}
1007
1008		/*
#	Line 1299 | Line 1014 | init_uid(void)
1014		*                note this is a recursive function
1015		*/
1016		static void
1017	<	add_one_to_uid(int i)
1017	>	add_one_to_uid(unsigned int i)
1018		{
1019	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1019	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1020		{
1021		if (new_uid[i] == 'Z')
1022		new_uid[i] = '0';
1023		else if (new_uid[i] == '9')
1024		{
1025		new_uid[i] = 'A';
1026	<	add_one_to_uid(i-1);
1026	>	add_one_to_uid(i - 1);
1027		}
1028		else
1029		++new_uid[i];
#	Line 1333 | Line 1048 | add_one_to_uid(int i)
1048		static const char *
1049		uid_get(void)
1050		{
1051	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1051	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1052		return new_uid;
1053		}
1054
#	Line 1347 | Line 1062 | uid_get(void)
1062		void
1063		init_isupport(void)
1064		{
1350	–	isupportFile = init_MessageLine();
1351	–
1065		add_isupport("CALLERID", NULL, -1);
1066	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1066	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1067		add_isupport("DEAF", "D", -1);
1068		add_isupport("KICKLEN", NULL, KICKLEN);
1069		add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1358	–	#ifdef HALFOPS
1070		add_isupport("PREFIX", "(ohv)@%+", -1);
1071		add_isupport("STATUSMSG", "@%+", -1);
1072	<	#else
1073	<	add_isupport("PREFIX", "(ov)@+", -1);
1363	<	add_isupport("STATUSMSG", "@+", -1);
1364	<	#endif
1365	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1072	>	add_isupport("EXCEPTS", "e", -1);
1073	>	add_isupport("INVEX", "I", -1);
1074		}
1075
1076		/*
#	Line 1378 | Line 1086 | void
1086		add_isupport(const char *name, const char *options, int n)
1087		{
1088		dlink_node *ptr;
1089	<	struct Isupport *support;
1089	>	struct Isupport *support = NULL;
1090
1091		DLINK_FOREACH(ptr, support_list.head)
1092		{
#	Line 1393 | Line 1101 | add_isupport(const char *name, const cha
1101
1102		if (ptr == NULL)
1103		{
1104	<	support = MyMalloc(sizeof(*support));
1104	>	support = MyCalloc(sizeof(*support));
1105		dlinkAddTail(support, &support->node, &support_list);
1106		}
1107
1108	<	DupString(support->name, name);
1109	<	if (options != NULL)
1110	<	DupString(support->options, options);
1108	>	support->name = xstrdup(name);
1109	>	if (options)
1110	>	support->options = xstrdup(options);
1111		support->number = n;
1112
1113		rebuild_isupport_message_line();
#	Line 1446 | Line 1154 | rebuild_isupport_message_line(void)
1154		{
1155		char isupportbuffer[IRCD_BUFSIZE];
1156		char *p = isupportbuffer;
1157	<	dlink_node *ptr = NULL;
1157	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1158		int n = 0;
1159		int tokens = 0;
1160		size_t len = 0;
1161	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1161	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1162
1163	<	destroy_MessageLine(isupportFile);
1163	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1164	>	{
1165	>	dlinkDelete(ptr, &support_list_lines);
1166	>	MyFree(ptr->data);
1167	>	free_dlink_node(ptr);
1168	>	}
1169
1170		DLINK_FOREACH(ptr, support_list.head)
1171		{
1172		struct Isupport *support = ptr->data;
1173
1174	<	p += (n = ircsprintf(p, "%s", support->name));
1174	>	p += (n = sprintf(p, "%s", support->name));
1175		len += n;
1176
1177	<	if (support->options != NULL)
1177	>	if (support->options)
1178		{
1179	<	p += (n = ircsprintf(p, "=%s", support->options));
1179	>	p += (n = sprintf(p, "=%s", support->options));
1180		len += n;
1181		}
1182
1183		if (support->number > 0)
1184		{
1185	<	p += (n = ircsprintf(p, "=%d", support->number));
1185	>	p += (n = sprintf(p, "=%d", support->number));
1186		len += n;
1187		}
1188
#	Line 1482 | Line 1195 | rebuild_isupport_message_line(void)
1195		if (*--p == ' ')
1196		*p = '\0';
1197
1198	<	addto_MessageLine(isupportFile, isupportbuffer);
1198	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1199		p = isupportbuffer;
1200		len = 0;
1201		n = tokens = 0;
1202		}
1203		}
1204
1205	<	if (len != 0)
1205	>	if (len)
1206		{
1207		if (*--p == ' ')
1208		*p = '\0';
1209	<	addto_MessageLine(isupportFile, isupportbuffer);
1209	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1210		}
1211		}

Diff Legend

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