ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_user.c (file contents), Revision 1125 by michael, Sun Feb 20 13:44:39 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3316 by michael, Tue Apr 15 14:09:39 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"
#	Line 29 | Line 31
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
34		#include "hash.h"
35		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42		#include "s_serv.h"
43		#include "send.h"
44		#include "supported.h"
47	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47		#include "rng_mt.h"
48		#include "userhost.h"
52	–	#include "hook.h"
49		#include "s_misc.h"
50	<	#include "msg.h"
50	>	#include "parse.h"
51		#include "watch.h"
52
57	–	unsigned int MaxClientCount     = 1;
58	–	unsigned int MaxConnectionCount = 1;
59	–	struct Callback *entering_umode_cb = NULL;
60	–	struct Callback *umode_cb = NULL;
61	–
53		static char umode_buffer[IRCD_BUFSIZE];
63	–
64	–	static void user_welcome(struct Client *);
65	–	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
66	–	static int check_xline(struct Client *);
67	–	static void introduce_client(struct Client *);
54		static const char *uid_get(void);
55
56		/* Used for building up the isupport string,
57		* used with init_isupport, add_isupport, delete_isupport
58		*/
59	<
74	<	struct Isupport
59	>	struct Isupport
60		{
61		dlink_node node;
62		char *name;
#	Line 79 | Line 64 | struct Isupport
64		int number;
65		};
66
67	<	static dlink_list support_list = { NULL, NULL, 0 };
68	<	MessageFile *isupportFile;
67	>	static dlink_list support_list;
68	>	static dlink_list support_list_lines;
69
70		/* memory is cheap. map 0-255 to equivalent mode */
71	<	unsigned int user_modes[256] =
71	>	const unsigned int user_modes[256] =
72		{
73		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
74		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 92 | Line 77 | unsigned int user_modes[256] =
77		0,                  /* @ */
78		0,                  /* A */
79		0,                  /* B */
80	<	UMODE_CCONN_FULL,   /* C */
80	>	0,                  /* C */
81		UMODE_DEAF,         /* D */
82		0,                  /* E */
83	<	0,                  /* F */
83	>	UMODE_FARCONNECT,   /* F */
84		UMODE_SOFTCALLERID, /* G */
85	<	0,                  /* H */
85	>	UMODE_HIDDEN,       /* H */
86		0,                  /* I */
87		0,                  /* J */
88		0,                  /* K */
#	Line 107 | Line 92 | unsigned int user_modes[256] =
92		0,                  /* O */
93		0,                  /* P */
94		0,                  /* Q */
95	<	0,                  /* R */
96	<	0,                  /* S */
95	>	UMODE_REGONLY,      /* R */
96	>	UMODE_SSL,          /* S */
97		0,                  /* T */
98		0,                  /* U */
99		0,                  /* V */
100	<	0,                  /* W */
100	>	UMODE_WEBIRC,       /* W */
101		0,                  /* X */
102		0,                  /* Y */
103		0,                  /* Z 0x5A */
104	<	0, 0, 0, 0, 0,      /* 0x5F   */
104	>	0, 0, 0, 0, 0,      /* 0x5F   */
105		0,                  /* 0x60   */
106		UMODE_ADMIN,        /* a */
107		UMODE_BOTS,         /* b */
108		UMODE_CCONN,        /* c */
109		UMODE_DEBUG,        /* d */
110	<	0,                  /* e */
110	>	UMODE_EXTERNAL,     /* e */
111		UMODE_FULL,         /* f */
112		UMODE_CALLERID,     /* g */
113		0,                  /* h */
114		UMODE_INVISIBLE,    /* i */
115	<	0,                  /* j */
115	>	UMODE_REJ,          /* j */
116		UMODE_SKILL,        /* k */
117		UMODE_LOCOPS,       /* l */
118		0,                  /* m */
#	Line 135 | Line 120 | unsigned int user_modes[256] =
120		UMODE_OPER,         /* o */
121		0,                  /* p */
122		0,                  /* q */
123	<	UMODE_REJ,          /* r */
123	>	UMODE_REGISTERED,   /* r */
124		UMODE_SERVNOTICE,   /* s */
125		0,                  /* t */
126		UMODE_UNAUTH,       /* u */
127		0,                  /* v */
128		UMODE_WALLOP,       /* w */
129	<	UMODE_EXTERNAL,     /* x */
129	>	UMODE_HIDDENHOST,   /* x */
130		UMODE_SPY,          /* y */
131		UMODE_OPERWALL,     /* z      0x7A */
132		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 176 | Line 161 | assemble_umode_buffer(void)
161		* side effects - display to client user counts etc.
162		*/
163		void
164	<	show_lusers(struct Client *source_p)
164	>	show_lusers(struct Client *source_p)
165		{
166	<	const char *from, *to;
167	<
168	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
184	<	{
185	<	from = me.id;
186	<	to = source_p->id;
187	<	}
188	<	else
189	<	{
190	<	from = me.name;
191	<	to = source_p->name;
192	<	}
193	<
194	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
195	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
196	<	from, to, (Count.total-Count.invisi),
197	<	Count.invisi, dlink_list_length(&global_serv_list));
166	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
167	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
168	>	Count.invisi, dlink_list_length(&global_serv_list));
169		else
170	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
171	<	(Count.total-Count.invisi), Count.invisi, 1);
170	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
171	>	(Count.total-Count.invisi), Count.invisi, 1);
172
173		if (Count.oper > 0)
174	<	sendto_one(source_p, form_str(RPL_LUSEROP),
204	<	from, to, Count.oper);
174	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
175
176		if (dlink_list_length(&unknown_list) > 0)
177	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
208	<	from, to, dlink_list_length(&unknown_list));
177	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
178
179		if (dlink_list_length(&global_channel_list) > 0)
180	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
212	<	from, to, dlink_list_length(&global_channel_list));
180	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
181
182	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
182	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
183		{
184	<	sendto_one(source_p, form_str(RPL_LUSERME),
185	<	from, to, Count.local, Count.myserver);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.local, Count.max_loc,
220	<	Count.local, Count.max_loc);
184	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
185	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
186		}
187		else
188		{
189	<	sendto_one(source_p, form_str(RPL_LUSERME),
190	<	from, to, Count.total, 0);
191	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
192	<	from, to, Count.total, Count.max_tot,
193	<	Count.total, Count.max_tot);
229	<	}
230	<
231	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
232	<	from, to, Count.total, Count.max_tot,
233	<	Count.total, Count.max_tot);
234	<
235	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
236	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
237	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
189	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
190	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
191	>	}
192	>
193	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
194
195	<	if (Count.local > MaxClientCount)
196	<	MaxClientCount = Count.local;
195	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
196	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
197	>	Count.max_loc_cli, Count.totalrestartcount);
198
199	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
200	<	MaxConnectionCount = Count.local + Count.myserver;
199	>	if (Count.local > Count.max_loc_cli)
200	>	Count.max_loc_cli = Count.local;
201	>
202	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
203	>	Count.max_loc_con = Count.local + Count.myserver;
204		}
205
206		/* show_isupport()
#	Line 250 | Line 210 | show_lusers(struct Client *source_p)
210		* side effects - display to client what we support (for them)
211		*/
212		void
213	<	show_isupport(struct Client *source_p)
213	>	show_isupport(struct Client *source_p)
214	>	{
215	>	const dlink_node *ptr = NULL;
216	>
217	>	DLINK_FOREACH(ptr, support_list_lines.head)
218	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
219	>	}
220	>
221	>
222	>	/* report_and_set_user_flags()
223	>	*
224	>	* inputs       - pointer to source_p
225	>	*              - pointer to conf for this user
226	>	* output       - NONE
227	>	* side effects - Report to user any special flags
228	>	*                they are getting, and set them.
229	>	*/
230	>	static void
231	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
232	>	{
233	>	/* If this user is being spoofed, tell them so */
234	>	if (IsConfDoSpoofIp(conf))
235	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
236	>
237	>	/* If this user is in the exception class, Set it "E lined" */
238	>	if (IsConfExemptKline(conf))
239	>	{
240	>	SetExemptKline(source_p);
241	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
242	>	}
243	>
244	>	/*
245	>	* The else here is to make sure that G line exempt users
246	>	* do not get noticed twice.
247	>	*/
248	>	else if (IsConfExemptGline(conf))
249	>	{
250	>	SetExemptGline(source_p);
251	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
252	>	}
253	>
254	>	if (IsConfExemptResv(conf))
255	>	{
256	>	SetExemptResv(source_p);
257	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
258	>	}
259	>
260	>	/* If this user is exempt from user limits set it "F lined" */
261	>	if (IsConfExemptLimits(conf))
262	>	{
263	>	SetExemptLimits(source_p);
264	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
265	>	}
266	>
267	>	if (IsConfCanFlood(conf))
268	>	{
269	>	SetCanFlood(source_p);
270	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
271	>	"protection, aren't you fearsome.");
272	>	}
273	>	}
274	>
275	>	/* introduce_client()
276	>	*
277	>	* inputs       - source_p
278	>	* output       - NONE
279	>	* side effects - This common function introduces a client to the rest
280	>	*                of the net, either from a local client connect or
281	>	*                from a remote connect.
282	>	*/
283	>	static void
284	>	introduce_client(struct Client *source_p)
285	>	{
286	>	dlink_node *ptr = NULL;
287	>	char ubuf[IRCD_BUFSIZE] = "";
288	>
289	>	if (MyClient(source_p))
290	>	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
291	>	else
292	>	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
293	>
294	>	watch_check_hash(source_p, RPL_LOGON);
295	>
296	>	if (ubuf[0] == '\0')
297	>	{
298	>	ubuf[0] = '+';
299	>	ubuf[1] = '\0';
300	>	}
301	>
302	>	DLINK_FOREACH(ptr, serv_list.head)
303	>	{
304	>	struct Client *server = ptr->data;
305	>
306	>	if (server == source_p->from)
307	>	continue;
308	>
309	>	if (IsCapable(server, CAP_SVS))
310	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
311	>	source_p->servptr->id,
312	>	source_p->name, source_p->hopcount+1,
313	>	(unsigned long)source_p->tsinfo,
314	>	ubuf, source_p->username, source_p->host,
315	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
316	>	"0" : source_p->sockhost, source_p->id,
317	>	source_p->svid,
318	>	source_p->info);
319	>	else
320	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
321	>	source_p->servptr->id,
322	>	source_p->name, source_p->hopcount+1,
323	>	(unsigned long)source_p->tsinfo,
324	>	ubuf, source_p->username, source_p->host,
325	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
326	>	"0" : source_p->sockhost, source_p->id, source_p->info);
327	>
328	>	if (!EmptyString(source_p->certfp))
329	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
330	>	}
331	>	}
332	>
333	>	/* user_welcome()
334	>	*
335	>	* inputs       - client pointer to client to welcome
336	>	* output       - NONE
337	>	* side effects -
338	>	*/
339	>	static void
340	>	user_welcome(struct Client *source_p)
341		{
342	<	send_message_file(source_p, isupportFile);
342	>	#if defined(__TIME__) && defined(__DATE__)
343	>	static const char built_date[] = __DATE__ " at " __TIME__;
344	>	#else
345	>	static const char built_date[] = "unknown";
346	>	#endif
347	>
348	>	#ifdef HAVE_LIBCRYPTO
349	>	if (HasFlag(source_p, FLAGS_SSL))
350	>	{
351	>	AddUMode(source_p, UMODE_SSL);
352	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
353	>	ssl_get_cipher(source_p->localClient->fd.ssl));
354	>	}
355	>	#endif
356	>
357	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
358	>	source_p->name);
359	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
360	>	get_listener_name(source_p->localClient->listener), ircd_version);
361	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
362	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
363	>	show_isupport(source_p);
364	>
365	>	if (source_p->id[0])
366	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
367	>
368	>	show_lusers(source_p);
369	>	motd_signon(source_p);
370	>	}
371	>
372	>	/* check_xline()
373	>	*
374	>	* inputs       - pointer to client to test
375	>	* outupt       - 1 if exiting 0 if ok
376	>	* side effects -
377	>	*/
378	>	static int
379	>	check_xline(struct Client *source_p)
380	>	{
381	>	struct MaskItem *conf = NULL;
382	>	const char *reason = NULL;
383	>
384	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
385	>	{
386	>	++conf->count;
387	>
388	>	if (conf->reason)
389	>	reason = conf->reason;
390	>	else
391	>	reason = CONF_NOREASON;
392	>
393	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
394	>	"X-line Rejecting [%s] [%s], user %s [%s]",
395	>	source_p->info, reason,
396	>	get_client_name(source_p, HIDE_IP),
397	>	source_p->sockhost);
398	>
399	>	++ServerStats.is_ref;
400	>	exit_client(source_p, "Bad user info");
401	>	return 1;
402	>	}
403	>
404	>	return 0;
405		}
406
407		/*
408	<	** register_local_user
409	<	**      This function is called when both NICK and USER messages
410	<	**      have been accepted for the client, in whatever order. Only
411	<	**      after this, is the USER message propagated.
412	<	**
413	<	**      NICK's must be propagated at once when received, although
414	<	**      it would be better to delay them too until full info is
415	<	**      available. Doing it is not so simple though, would have
416	<	**      to implement the following:
417	<	**
418	<	**      (actually it has been implemented already for a while) -orabidoo
419	<	**
420	<	**      1) user telnets in and gives only "NICK foobar" and waits
421	<	**      2) another user far away logs in normally with the nick
422	<	**         "foobar" (quite legal, as this server didn't propagate
274	<	**         it).
275	<	**      3) now this server gets nick "foobar" from outside, but
276	<	**         has alread the same defined locally. Current server
277	<	**         would just issue "KILL foobar" to clean out dups. But,
278	<	**         this is not fair. It should actually request another
279	<	**         nick from local user or kill him/her...
280	<	*/
408	>	* register_local_user
409	>	*      This function is called when both NICK and USER messages
410	>	*      have been accepted for the client, in whatever order. Only
411	>	*      after this, is the UID message propagated.
412	>	*
413	>	*      1) user telnets in and gives only "NICK foobar" and waits
414	>	*      2) another user far away logs in normally with the nick
415	>	*         "foobar" (quite legal, as this server didn't propagate
416	>	*         it).
417	>	*      3) now this server gets nick "foobar" from outside, but
418	>	*         has alread the same defined locally. Current server
419	>	*         would just issue "KILL foobar" to clean out dups. But,
420	>	*         this is not fair. It should actually request another
421	>	*         nick from local user or kill him/her...
422	>	*/
423		void
424		register_local_user(struct Client *source_p)
425		{
426		const char *id = NULL;
427	<	const struct AccessItem *aconf = NULL;
286	<	dlink_node *ptr = NULL;
287	<	dlink_node *m = NULL;
427	>	const struct MaskItem *conf = NULL;
428
289	–	assert(source_p != NULL);
429		assert(source_p == source_p->from);
430		assert(MyConnect(source_p));
431		assert(!source_p->localClient->registration);
#	Line 295 | Line 434 | register_local_user(struct Client *sourc
434
435		if (ConfigFileEntry.ping_cookie)
436		{
437	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
437	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
438		{
439		do
440		source_p->localClient->random_ping = genrand_int32();
#	Line 311 | Line 450 | register_local_user(struct Client *sourc
450		return;
451		}
452
453	<	source_p->localClient->last = CurrentTime;
453	>	source_p->localClient->last_privmsg = CurrentTime;
454		/* Straight up the maximum rate of flooding... */
455		source_p->localClient->allow_read = MAX_FLOOD_BURST;
456
457	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
457	>	if (!check_client(source_p))
458		return;
459
460	<	if (valid_hostname(source_p->host) == 0)
460	>	if (!valid_hostname(source_p->host))
461		{
462	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
463	<	"character in your hostname", me.name, source_p->name);
462	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
463	>	"character in your hostname");
464		strlcpy(source_p->host, source_p->sockhost,
465		sizeof(source_p->host));
466		}
467
468	<	ptr   = source_p->localClient->confs.head;
330	<	aconf = map_to_conf(ptr->data);
468	>	conf = source_p->localClient->confs.head->data;
469
470		if (!IsGotId(source_p))
471		{
472	<	char username[USERLEN + 1];
472	>	char username[USERLEN + 1] = "";
473		const char *p = username;
474		unsigned int i = 0;
475
476	<	if (IsNeedIdentd(aconf))
476	>	if (IsNeedIdentd(conf))
477		{
478		++ServerStats.is_ref;
479	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
480	<	"identd to use this server", me.name, source_p->name);
481	<	exit_client(source_p, &me, "Install identd");
479	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
480	>	"identd to use this server");
481	>	exit_client(source_p, "Install identd");
482		return;
483		}
484
485		strlcpy(username, source_p->username, sizeof(username));
486
487	<	if (!IsNoTilde(aconf))
487	>	if (!IsNoTilde(conf))
488		source_p->username[i++] = '~';
489
490		for (; *p && i < USERLEN; ++p)
#	Line 357 | Line 495 | register_local_user(struct Client *sourc
495		}
496
497		/* password check */
498	<	if (!EmptyString(aconf->passwd))
498	>	if (!EmptyString(conf->passwd))
499		{
500		const char *pass = source_p->localClient->passwd;
501
502	<	if (!match_conf_password(pass, aconf))
502	>	if (!match_conf_password(pass, conf))
503		{
504		++ServerStats.is_ref;
505	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
506	<	me.name, source_p->name);
507	<	exit_client(source_p, &me, "Bad Password");
505	>
506	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
507	>	exit_client(source_p, "Bad Password");
508		return;
509		}
510		}
#	Line 377 | Line 515 | register_local_user(struct Client *sourc
515		*/
516
517		/* report if user has &^>= etc. and set flags as needed in source_p */
518	<	report_and_set_user_flags(source_p, aconf);
518	>	report_and_set_user_flags(source_p, conf);
519
520		if (IsDead(source_p))
521		return;
#	Line 393 | Line 531 | register_local_user(struct Client *sourc
531		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
532		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
533		{
534	<	sendto_realops_flags(UMODE_FULL, L_ALL,
534	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
535		"Too many clients, rejecting %s[%s].",
536		source_p->name, source_p->host);
537		++ServerStats.is_ref;
538	<	exit_client(source_p, &me, "Sorry, server is full - try later");
538	>	exit_client(source_p, "Sorry, server is full - try later");
539		return;
540		}
541
542		/* valid user name check */
543	<	if (valid_username(source_p->username) == 0)
543	>	if (!valid_username(source_p->username, 1))
544		{
545	<	char tmpstr2[IRCD_BUFSIZE];
545	>	char tmpstr2[IRCD_BUFSIZE] = "";
546
547	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
547	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
548	>	"Invalid username: %s (%s@%s)",
549		source_p->name, source_p->username, source_p->host);
550		++ServerStats.is_ref;
551		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
552		source_p->username);
553	<	exit_client(source_p, &me, tmpstr2);
553	>	exit_client(source_p, tmpstr2);
554		return;
555		}
556
557		if (check_xline(source_p))
558		return;
559
560	<	while (hash_find_id((id = uid_get())) != NULL)
560	>	while (hash_find_id((id = uid_get())))
561		;
562
563		strlcpy(source_p->id, id, sizeof(source_p->id));
564		hash_add_id(source_p);
565
566	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
567	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
429	<	source_p->name, source_p->username, source_p->host,
430	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(source_p),
433	<	source_p->info);
434	<
435	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
436	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
566	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
567	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
568		source_p->name, source_p->username, source_p->host,
569		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
570		"255.255.255.255" : source_p->sockhost,
571	<	get_client_class(source_p),
572	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	<	"<hidden>" : source_p->localClient->client_host,
443	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
444	<	"<hidden>" : source_p->localClient->client_server,
445	<	source_p->info);
446	<
571	>	get_client_class(&source_p->localClient->confs),
572	>	source_p->info, source_p->id);
573
574		if (ConfigFileEntry.invisible_on_connect)
575		{
576	<	source_p->umodes |= UMODE_INVISIBLE;
576	>	AddUMode(source_p, UMODE_INVISIBLE);
577		++Count.invisi;
578		}
579
580	<	if ((++Count.local) > Count.max_loc)
580	>	if (++Count.local > Count.max_loc)
581		{
582		Count.max_loc = Count.local;
583
584		if (!(Count.max_loc % 10))
585	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
585	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
586	>	"New Max Local Clients: %d",
587		Count.max_loc);
588		}
589
#	Line 473 | Line 600 | register_local_user(struct Client *sourc
600
601		assert(dlinkFind(&unknown_list, source_p));
602
603	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
604	<	{
478	<	free_dlink_node(m);
479	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
480	<	}
603	>	dlink_move_node(&source_p->localClient->lclient_node,
604	>	&unknown_list, &local_client_list);
605
606		user_welcome(source_p);
607		add_user_host(source_p->username, source_p->host, 0);
#	Line 492 | Line 616 | register_local_user(struct Client *sourc
616		*              - username to register as
617		*              - host name to register as
618		*              - server name
495	–	*              - realname (gecos)
619		* output       - NONE
620		* side effects - This function is called when a remote client
621		*                is introduced by a server.
622		*/
623		void
624	<	register_remote_user(struct Client *source_p,
625	<	const char *username, const char *host, const char *server,
503	<	const char *realname)
624	>	register_remote_user(struct Client *source_p, const char *username,
625	>	const char *host, const char *server)
626		{
627		struct Client *target_p = NULL;
628
507	–	assert(source_p != NULL);
629		assert(source_p->username != username);
630
631	<	strlcpy(source_p->host, host, sizeof(source_p->host));
631	>	strlcpy(source_p->host, host, sizeof(source_p->host));
632		strlcpy(source_p->username, username, sizeof(source_p->username));
633
634		/*
635		* coming from another server, take the servers word for it
636		*/
637	<	source_p->servptr = find_server(server);
637	>	source_p->servptr = hash_find_server(server);
638
639	<	/* Super GhostDetect:
639	>	/*
640	>	* Super GhostDetect:
641		* If we can't find the server the user is supposed to be on,
642		* then simply blow the user away.        -Taner
643		*/
644		if (source_p->servptr == NULL)
645		{
646	<	sendto_realops_flags(UMODE_ALL, L_ALL,
646	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
647		"No server %s for user %s[%s@%s] from %s",
648		server, source_p->name, source_p->username,
649		source_p->host, source_p->from->name);
650	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
650	>	sendto_one(source_p->from,
651	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
652	>	me.id, source_p->id, me.name, server);
653
654	<	SetKilled(source_p);
655	<	exit_client(source_p, &me, "Ghosted Client");
654	>	AddFlag(source_p, FLAGS_KILLED);
655	>	exit_client(source_p, "Ghosted Client");
656		return;
657		}
658
659		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
660		{
661	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
661	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
662		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
663		source_p->from->name, source_p->name, source_p->username,
664		source_p->host, source_p->servptr->name,
665		target_p->name, target_p->from->name);
666	<	kill_client(source_p->from, source_p,
667	<	"%s (NICK from wrong direction (%s != %s))",
668	<	me.name, source_p->servptr->name, target_p->from->name);
669	<	SetKilled(source_p);
670	<	exit_client(source_p, &me, "USER server wrong direction");
666	>	sendto_one(source_p->from,
667	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
668	>	me.id, source_p->id, me.name, source_p->servptr->name,
669	>	target_p->from->name);
670	>
671	>	AddFlag(source_p, FLAGS_KILLED);
672	>	exit_client(source_p, "USER server wrong direction");
673		return;
674		}
675
676	+	/*
677	+	* If the nick has been introduced by a services server,
678	+	* make it a service as well.
679	+	*/
680	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
681	+	AddFlag(source_p, FLAGS_SERVICE);
682	+
683		/* Increment our total user count here */
684		if (++Count.total > Count.max_tot)
685		Count.max_tot = Count.total;
#	Line 556 | Line 689 | register_remote_user(struct Client *sour
689		add_user_host(source_p->username, source_p->host, 1);
690		SetUserHost(source_p);
691
692	<	introduce_client(source_p);
693	<	}
694	<
695	<	/* introduce_client()
696	<	*
697	<	* inputs       - source_p
565	<	* output       - NONE
566	<	* side effects - This common function introduces a client to the rest
567	<	*                of the net, either from a local client connect or
568	<	*                from a remote connect.
569	<	*/
570	<	static void
571	<	introduce_client(struct Client *source_p)
572	<	{
573	<	dlink_node *server_node = NULL;
574	<	static char ubuf[12];
692	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
693	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
694	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
695	>	source_p->servptr->name,
696	>	source_p->name, source_p->username, source_p->host,
697	>	source_p->info, source_p->id);
698
699	<	if (MyClient(source_p))
577	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
578	<	else
579	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
580	<
581	<	watch_check_hash(source_p, RPL_LOGON);
582	<
583	<	if (*ubuf == '\0')
584	<	{
585	<	ubuf[0] = '+';
586	<	ubuf[1] = '\0';
587	<	}
588	<
589	<	DLINK_FOREACH(server_node, serv_list.head)
590	<	{
591	<	struct Client *server = server_node->data;
592	<
593	<	if (server == source_p->from)
594	<	continue;
595	<
596	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
597	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
598	<	source_p->servptr->id,
599	<	source_p->name, source_p->hopcount+1,
600	<	(unsigned long)source_p->tsinfo,
601	<	ubuf, source_p->username, source_p->host,
602	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
603	<	"0" : source_p->sockhost, source_p->id, source_p->info);
604	<	else
605	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
606	<	source_p->name, source_p->hopcount+1,
607	<	(unsigned long)source_p->tsinfo,
608	<	ubuf, source_p->username, source_p->host,
609	<	source_p->servptr->name, source_p->info);
610	<	}
699	>	introduce_client(source_p);
700		}
701
702		/* valid_hostname()
#	Line 624 | Line 713 | valid_hostname(const char *hostname)
713		{
714		const char *p = hostname;
715
716	<	assert(p != NULL);
716	>	assert(p);
717
718	<	if (*p == '.' || *p == ':')
718	>	if (EmptyString(p) || *p == '.' || *p == ':')
719		return 0;
720
721		for (; *p; ++p)
722		if (!IsHostChar(*p))
723		return 0;
724
725	<	return 1;
725	>	return p - hostname <= HOSTLEN;
726		}
727
728		/* valid_username()
#	Line 648 | Line 737 | valid_hostname(const char *hostname)
737		* style of username
738		*/
739		int
740	<	valid_username(const char *username)
740	>	valid_username(const char *username, const int local)
741		{
742		int dots      = 0;
743		const char *p = username;
744
745	<	assert(p != NULL);
745	>	assert(p);
746
747		if (*p == '~')
748		++p;
749
750	<	/* reject usernames that don't start with an alphanum
750	>	/*
751	>	* Reject usernames that don't start with an alphanum
752		* i.e. reject jokers who have '-@somehost' or '.@somehost'
753		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
754		*/
755		if (!IsAlNum(*p))
756		return 0;
757
758	<	while (*++p)
758	>	if (local)
759		{
760	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
760	>	while (*++p)
761		{
762	<	if (++dots > ConfigFileEntry.dots_in_ident)
763	<	return 0;
764	<	if (!IsUserChar(*(p + 1)))
762	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
763	>	{
764	>	if (++dots > ConfigFileEntry.dots_in_ident)
765	>	return 0;
766	>	if (!IsUserChar(*(p + 1)))
767	>	return 0;
768	>	}
769	>	else if (!IsUserChar(*p))
770		return 0;
771		}
677	–	else if (!IsUserChar(*p))
678	–	return 0;
679	–	}
680	–
681	–	return 1;
682	–	}
683	–
684	–	/* report_and_set_user_flags()
685	–	*
686	–	* inputs       - pointer to source_p
687	–	*              - pointer to aconf for this user
688	–	* output       - NONE
689	–	* side effects - Report to user any special flags
690	–	*                they are getting, and set them.
691	–	*/
692	–	static void
693	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
694	–	{
695	–	/* If this user is being spoofed, tell them so */
696	–	if (IsConfDoSpoofIp(aconf))
697	–	{
698	–	sendto_one(source_p,
699	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
700	–	me.name, source_p->name);
701	–	}
702	–
703	–	/* If this user is in the exception class, Set it "E lined" */
704	–	if (IsConfExemptKline(aconf))
705	–	{
706	–	SetExemptKline(source_p);
707	–	sendto_one(source_p,
708	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
709	–	me.name, source_p->name);
710	–	}
711	–
712	–	/* The else here is to make sure that G line exempt users
713	–	* do not get noticed twice.
714	–	*/
715	–	else if (IsConfExemptGline(aconf))
716	–	{
717	–	SetExemptGline(source_p);
718	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
719	–	me.name, source_p->name);
720	–	}
721	–
722	–	if (IsConfExemptResv(aconf))
723	–	{
724	–	SetExemptResv(source_p);
725	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
726	–	me.name, source_p->name);
772		}
773	<
729	<	/* If this user is exempt from user limits set it "F lined" */
730	<	if (IsConfExemptLimits(aconf))
731	<	{
732	<	SetExemptLimits(source_p);
733	<	sendto_one(source_p,
734	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
735	<	me.name,source_p->name);
736	<	}
737	<
738	<	/* If this user is exempt from idle time outs */
739	<	if (IsConfIdlelined(aconf))
773	>	else
774		{
775	<	SetIdlelined(source_p);
776	<	sendto_one(source_p,
777	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
744	<	me.name, source_p->name);
775	>	while (*++p)
776	>	if (!IsUserChar(*p))
777	>	return 0;
778		}
779
780	<	if (IsConfCanFlood(aconf))
748	<	{
749	<	SetCanFlood(source_p);
750	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
751	<	"protection, aren't you fearsome.",
752	<	me.name, source_p->name);
753	<	}
780	>	return  p - username <= USERLEN;;
781		}
782
783	<	/* change_simple_umode()
783	>	/* clean_nick_name()
784		*
785	<	* this callback can be hooked to allow special handling of
786	<	* certain usermodes
785	>	* input        - nickname
786	>	*              - whether it's a local nick (1) or remote (0)
787	>	* output       - none
788	>	* side effects - walks through the nickname, returning 0 if erroneous
789		*/
790	<	static void *
791	<	change_simple_umode(va_list args)
763	<	{
764	<	struct Client *client_p;
765	<	struct Client *source_p;
766	<	int what;
767	<	unsigned int flag;
768	<
769	<	client_p = va_arg(args, struct Client *);
770	<	source_p = va_arg(args, struct Client *);
771	<	what = va_arg(args, int);
772	<	flag = va_arg(args, unsigned int);
773	<
774	<	if (what == MODE_ADD)
775	<	source_p->umodes |= flag;
776	<	else
777	<	source_p->umodes &= ~flag;
778	<
779	<	return NULL;
780	<	}
781	<
782	<	/* set_user_mode()
783	<	*
784	<	* added 15/10/91 By Darren Reed.
785	<	* parv[0] - sender
786	<	* parv[1] - username to change mode for
787	<	* parv[2] - modes to change
788	<	*/
789	<	void
790	<	set_user_mode(struct Client *client_p, struct Client *source_p,
791	<	int parc, char *parv[])
790	>	int
791	>	valid_nickname(const char *nickname, const int local)
792		{
793	<	unsigned int flag, setflags;
794	<	char **p, *m, buf[IRCD_BUFSIZE];
795	<	struct Client *target_p;
796	<	int what = MODE_ADD, badflag = 0, i;
797	<
798	<	assert(!(parc < 2));
799	<
800	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
801	<	{
802	<	if (MyConnect(source_p))
803	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
804	<	me.name, source_p->name, parv[1]);
805	<	return;
806	<	}
807	<
808	<	if (IsServer(source_p))
809	<	{
810	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
811	<	parv[1], source_p->name);
812	<	return;
813	<	}
814	<
815	<	if (source_p != target_p)
816	<	{
817	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
818	<	me.name, source_p->name);
819	<	return;
820	<	}
821	<
822	<	if (parc < 3)
823	<	{
824	<	m = buf;
825	<	*m++ = '+';
826	<
827	<	for (i = 0; i < 128; i++)
828	<	if (source_p->umodes & user_modes[i])
829	<	*m++ = (char)i;
830	<	*m = '\0';
831	<
832	<	sendto_one(source_p, form_str(RPL_UMODEIS),
833	<	me.name, source_p->name, buf);
834	<	return;
835	<	}
793	>	const char *p = nickname;
794	>	assert(nickname && *nickname);
795
796	<	execute_callback(entering_umode_cb, client_p, source_p);
796	>	assert(p);
797
798	<	/* find flags already set for user */
799	<	setflags = source_p->umodes;
800	<
801	<	/* parse mode change string(s) */
843	<	for (p = &parv[2]; p && *p; p++)
844	<	{
845	<	for (m = *p; *m; m++)
846	<	{
847	<	switch (*m)
848	<	{
849	<	case '+':
850	<	what = MODE_ADD;
851	<	break;
852	<	case '-':
853	<	what = MODE_DEL;
854	<	break;
855	<	case 'o':
856	<	if (what == MODE_ADD)
857	<	{
858	<	if (IsServer(client_p) && !IsOper(source_p))
859	<	{
860	<	++Count.oper;
861	<	SetOper(source_p);
862	<	}
863	<	}
864	<	else
865	<	{
866	<	/* Only decrement the oper counts if an oper to begin with
867	<	* found by Pat Szuta, Perly , perly@xnet.com
868	<	*/
869	<	if (!IsOper(source_p))
870	<	break;
871	<
872	<	ClearOper(source_p);
873	<	Count.oper--;
874	<
875	<	if (MyConnect(source_p))
876	<	{
877	<	dlink_node *dm;
878	<
879	<	detach_conf(source_p, OPER_TYPE);
880	<	ClearOperFlags(source_p);
881	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
882	<
883	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
884	<	free_dlink_node(dm);
885	<	}
886	<	}
887	<
888	<	break;
889	<
890	<	/* we may not get these,
891	<	* but they shouldnt be in default
892	<	*/
893	<	case ' ' :
894	<	case '\n':
895	<	case '\r':
896	<	case '\t':
897	<	break;
898	<
899	<	default:
900	<	if ((flag = user_modes[(unsigned char)*m]))
901	<	{
902	<	if (MyConnect(source_p) && !IsOper(source_p) &&
903	<	(ConfigFileEntry.oper_only_umodes & flag))
904	<	{
905	<	badflag = 1;
906	<	}
907	<	else
908	<	execute_callback(umode_cb, client_p, source_p, what, flag);
909	<	}
910	<	else
911	<	{
912	<	if (MyConnect(source_p))
913	<	badflag = 1;
914	<	}
915	<
916	<	break;
917	<	}
918	<	}
919	<	}
920	<
921	<	if (badflag)
922	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
923	<	me.name, source_p->name);
924	<
925	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
926	<	{
927	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
928	<	me.name, source_p->name);
929	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
930	<	}
931	<
932	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
933	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
934	<	{
935	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
936	<	me.name, source_p->name);
937	<	source_p->umodes &= ~UMODE_ADMIN;
938	<	}
798	>	/* nicks can't start with a digit or - or be 0 length */
799	>	/* This closer duplicates behaviour of hybrid-6 */
800	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
801	>	return 0;
802
803	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
804	<	++Count.invisi;
805	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
943	<	--Count.invisi;
803	>	for (; *p; ++p)
804	>	if (!IsNickChar(*p))
805	>	return 0;
806
807	<	/*
946	<	* compare new flags with old flags and send string which
947	<	* will cause servers to update correctly.
948	<	*/
949	<	send_umode_out(client_p, source_p, setflags);
807	>	return p - nickname <= NICKLEN;
808		}
809
810		/* send_umode()
#	Line 973 | Line 831 | send_umode(struct Client *client_p, stru
831		* build a string in umode_buf to represent the change in the user's
832		* mode between the new (source_p->umodes) and 'old'.
833		*/
834	<	for (i = 0; i < 128; i++)
834	>	for (i = 0; i < 128; ++i)
835		{
836		flag = user_modes[i];
837		if (!flag)
#	Line 982 | Line 840 | send_umode(struct Client *client_p, stru
840		if (MyClient(source_p) && !(flag & sendmask))
841		continue;
842
843	<	if ((flag & old) && !(source_p->umodes & flag))
843	>	if ((flag & old) && !HasUMode(source_p, flag))
844		{
845		if (what == MODE_DEL)
846		*m++ = (char)i;
#	Line 993 | Line 851 | send_umode(struct Client *client_p, stru
851		*m++ = (char)i;
852		}
853		}
854	<	else if (!(flag & old) && (source_p->umodes & flag))
854	>	else if (!(flag & old) && HasUMode(source_p, flag))
855		{
856		if (what == MODE_ADD)
857		*m++ = (char)i;
#	Line 1024 | Line 882 | void
882		send_umode_out(struct Client *client_p, struct Client *source_p,
883		unsigned int old)
884		{
885	<	char buf[IRCD_BUFSIZE] = { '\0' };
1028	<	dlink_node *ptr = NULL;
885	>	char buf[IRCD_BUFSIZE] = "";
886
887	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1031	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
887	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
888
889		if (buf[0])
890	<	{
891	<	DLINK_FOREACH(ptr, serv_list.head)
1036	<	{
1037	<	struct Client *target_p = ptr->data;
1038	<
1039	<	if ((target_p != client_p) && (target_p != source_p))
1040	<	sendto_one(target_p, ":%s MODE %s :%s",
1041	<	ID_or_name(source_p, target_p),
1042	<	ID_or_name(source_p, target_p), buf);
1043	<	}
1044	<	}
890	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
891	>	source_p->id, source_p->id, buf);
892
893		if (client_p && MyClient(client_p))
894		send_umode(client_p, source_p, old, 0xffffffff, buf);
895		}
896
897	<	/* user_welcome()
898	<	*
1052	<	* inputs       - client pointer to client to welcome
1053	<	* output       - NONE
1054	<	* side effects -
1055	<	*/
1056	<	static void
1057	<	user_welcome(struct Client *source_p)
897	>	void
898	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
899		{
900	<	#if defined(__TIME__) && defined(__DATE__)
1060	<	static const char built_date[] = __DATE__ " at " __TIME__;
1061	<	#else
1062	<	static const char built_date[] = "unknown";
1063	<	#endif
900	>	dlink_node *ptr = NULL;
901
902	<	#ifdef HAVE_LIBCRYPTO
903	<	if (source_p->localClient->fd.ssl != NULL)
1067	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1068	<	me.name, source_p->name,
1069	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1070	<	#endif
902	>	if (!strcmp(target_p->host, hostname))
903	>	return;
904
905	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
906	<	ServerInfo.network_name, source_p->name);
907	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
908	<	get_listener_name(source_p->localClient->listener), ircd_version);
909	<	sendto_one(source_p, form_str(RPL_CREATED),
910	<	me.name, source_p->name, built_date);
911	<	sendto_one(source_p, form_str(RPL_MYINFO),
912	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1080	<	show_isupport(source_p);
905	>	switch (what)
906	>	{
907	>	case MODE_ADD:
908	>	AddUMode(target_p, UMODE_HIDDENHOST);
909	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
910	>	break;
911	>	case MODE_DEL:
912	>	DelUMode(target_p, UMODE_HIDDENHOST);
913
914	<	if (source_p->id[0] != '\0')
915	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
916	<	source_p->name, source_p->id);
914	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
915	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
916	>	break;
917	>	default: return;
918	>	}
919
920	<	show_lusers(source_p);
920	>	if (ConfigFileEntry.cycle_on_host_change)
921	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
922	>	target_p->name, target_p->username, target_p->host);
923	>
924	>	if (IsUserHostIp(target_p))
925	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
926	>
927	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
928	>
929	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
930	>	SetUserHost(target_p);
931
932	<	if (ConfigFileEntry.short_motd)
932	>	if (MyClient(target_p))
933		{
934	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
935	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1092	<	sendto_one(source_p,
1093	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1094	<	"read it", me.name, source_p->name);
1095	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1096	<	me.name, source_p->name, me.name);
1097	<	sendto_one(source_p, form_str(RPL_MOTD),
1098	<	me.name, source_p->name,
1099	<	"*** This is the short motd ***");
1100	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1101	<	me.name, source_p->name);
934	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
935	>	clear_ban_cache_client(target_p);
936		}
1103	–	else
1104	–	send_message_file(source_p, &ConfigFileEntry.motd);
1105	–	}
937
938	<	/* check_xline()
939	<	*
1109	<	* inputs       - pointer to client to test
1110	<	* outupt       - 1 if exiting 0 if ok
1111	<	* side effects -
1112	<	*/
1113	<	static int
1114	<	check_xline(struct Client *source_p)
1115	<	{
1116	<	struct ConfItem *conf = NULL;
1117	<	const char *reason = NULL;
938	>	if (!ConfigFileEntry.cycle_on_host_change)
939	>	return;
940
941	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1120	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
941	>	DLINK_FOREACH(ptr, target_p->channel.head)
942		{
943	<	struct MatchItem *reg = map_to_conf(conf);
943	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
944	>	char *p = modebuf;
945	>	int len = 0;
946	>	const struct Membership *ms = ptr->data;
947
948	<	++reg->count;
949	<
950	<	if (reg->reason != NULL)
951	<	reason = reg->reason;
952	<	else
1129	<	reason = "No Reason";
948	>	if (has_member_flags(ms, CHFL_CHANOP))
949	>	{
950	>	*p++ = 'o';
951	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
952	>	}
953
954	<	sendto_realops_flags(UMODE_REJ, L_ALL,
955	<	"X-line Rejecting [%s] [%s], user %s [%s]",
956	<	source_p->info, reason,
957	<	get_client_name(source_p, HIDE_IP),
958	<	source_p->sockhost);
954	>	if (has_member_flags(ms, CHFL_HALFOP))
955	>	{
956	>	*p++ = 'h';
957	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
958	>	}
959
960	<	++ServerStats.is_ref;
1138	<	if (REJECT_HOLD_TIME > 0)
960	>	if (has_member_flags(ms, CHFL_VOICE))
961		{
962	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
963	<	me.name, source_p->name);
1142	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1143	<	SetCaptured(source_p);
962	>	*p++ = 'v';
963	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
964		}
965	<	else
966	<	exit_client(source_p, &me, "Bad user info");
967	<	return 1;
965	>
966	>	*p = '\0';
967	>
968	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
969	>	target_p->name, target_p->username, target_p->host,
970	>	ms->chptr->chname);
971	>	if (nickbuf[0])
972	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
973	>	target_p->servptr->name, ms->chptr->chname,
974	>	modebuf, nickbuf);
975	>
976		}
977
978	<	return 0;
978	>	if (target_p->away[0])
979	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
980	>	":%s!%s@%s AWAY :%s",
981	>	target_p->name, target_p->username,
982	>	target_p->host, target_p->away);
983		}
984
985		/* oper_up()
986		*
987		* inputs       - pointer to given client to oper
988		* output       - NONE
989	<	* side effects - Blindly opers up given source_p, using aconf info
989	>	* side effects - Blindly opers up given source_p, using conf info
990		*                all checks on passwords have already been done.
991	<	*                This could also be used by rsa oper routines.
991	>	*                This could also be used by rsa oper routines.
992		*/
993		void
994		oper_up(struct Client *source_p)
995		{
996	<	unsigned int old = source_p->umodes;
997	<	const char *operprivs = "";
1166	<	const struct AccessItem *oconf = NULL;
996	>	const unsigned int old = source_p->umodes;
997	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
998
999		assert(source_p->localClient->confs.head);
1169	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1000
1001		++Count.oper;
1002		SetOper(source_p);
1003
1004	<	if (oconf->modes)
1005	<	source_p->umodes |= oconf->modes;
1004	>	if (conf->modes)
1005	>	AddUMode(source_p, conf->modes);
1006		else if (ConfigFileEntry.oper_umodes)
1007	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1178	<	else
1179	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1180	<	UMODE_WALLOP|UMODE_LOCOPS);
1007	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1008
1009	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1009	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1010		++Count.invisi;
1011	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1011	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1012		--Count.invisi;
1013
1014		assert(dlinkFind(&oper_list, source_p) == NULL);
1015		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1016
1017	<	operprivs = oper_privs_as_string(oconf->port);
1191	<
1192	<	SetOFlag(source_p, oconf->port);
1017	>	AddOFlag(source_p, conf->port);
1018
1019	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1020	<	source_p->umodes |= UMODE_ADMIN;
1196	<	if (!IsOperN(source_p))
1197	<	source_p->umodes &= ~UMODE_NCHANGE;
1019	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1020	>	AddUMode(source_p, UMODE_ADMIN);
1021
1022	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1023	<	source_p->name, source_p->username, source_p->host);
1022	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1023	>	get_oper_name(source_p));
1024		send_umode_out(source_p, source_p, old);
1025	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1203	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1204	<	me.name, source_p->name, operprivs);
1205	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1025	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1026		}
1027
1028		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1220 | Line 1040 | valid_sid(const char *sid)
1040
1041		/*
1042		* init_uid()
1043	<	*
1043	>	*
1044		* inputs       - NONE
1045		* output       - NONE
1046		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1230 | Line 1050 | valid_sid(const char *sid)
1050		void
1051		init_uid(void)
1052		{
1233	–	int i;
1234	–
1053		memset(new_uid, 0, sizeof(new_uid));
1054
1055		if (!EmptyString(ServerInfo.sid))
1056		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1057
1058	<	for (i = 0; i < IRC_MAXSID; ++i)
1059	<	if (new_uid[i] == '\0')
1058	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1059	>	if (new_uid[i] == '\0')
1060		new_uid[i] = 'A';
1061
1062		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1246	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1247	–	* -Dianora
1248	–	*/
1063		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1250	–
1251	–	entering_umode_cb = register_callback("entering_umode", NULL);
1252	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1064		}
1065
1066		/*
#	Line 1309 | Line 1120 | uid_get(void)
1120		void
1121		init_isupport(void)
1122		{
1312	–	isupportFile = init_MessageLine();
1313	–
1123		add_isupport("CALLERID", NULL, -1);
1124		add_isupport("CASEMAPPING", CASEMAP, -1);
1125		add_isupport("DEAF", "D", -1);
1126		add_isupport("KICKLEN", NULL, KICKLEN);
1127		add_isupport("MODES", NULL, MAXMODEPARAMS);
1319	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1128		#ifdef HALFOPS
1129		add_isupport("PREFIX", "(ohv)@%+", -1);
1130		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1324 | Line 1132 | init_isupport(void)
1132		add_isupport("PREFIX", "(ov)@+", -1);
1133		add_isupport("STATUSMSG", "@+", -1);
1134		#endif
1135	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1135	>	add_isupport("EXCEPTS", "e", -1);
1136	>	add_isupport("INVEX", "I", -1);
1137		}
1138
1139		/*
#	Line 1359 | Line 1168 | add_isupport(const char *name, const cha
1168		dlinkAddTail(support, &support->node, &support_list);
1169		}
1170
1171	<	DupString(support->name, name);
1171	>	support->name = xstrdup(name);
1172		if (options != NULL)
1173	<	DupString(support->options, options);
1173	>	support->options = xstrdup(options);
1174		support->number = n;
1175
1176		rebuild_isupport_message_line();
#	Line 1408 | Line 1217 | rebuild_isupport_message_line(void)
1217		{
1218		char isupportbuffer[IRCD_BUFSIZE];
1219		char *p = isupportbuffer;
1220	<	dlink_node *ptr = NULL;
1220	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1221		int n = 0;
1222		int tokens = 0;
1223		size_t len = 0;
1224	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1224	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1225
1226	<	destroy_MessageLine(isupportFile);
1226	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1227	>	{
1228	>	dlinkDelete(ptr, &support_list_lines);
1229	>	MyFree(ptr->data);
1230	>	free_dlink_node(ptr);
1231	>	}
1232
1233		DLINK_FOREACH(ptr, support_list.head)
1234		{
1235		struct Isupport *support = ptr->data;
1236
1237	<	p += (n = ircsprintf(p, "%s", support->name));
1237	>	p += (n = sprintf(p, "%s", support->name));
1238		len += n;
1239
1240		if (support->options != NULL)
1241		{
1242	<	p += (n = ircsprintf(p, "=%s", support->options));
1242	>	p += (n = sprintf(p, "=%s", support->options));
1243		len += n;
1244		}
1245
1246		if (support->number > 0)
1247		{
1248	<	p += (n = ircsprintf(p, "=%d", support->number));
1248	>	p += (n = sprintf(p, "=%d", support->number));
1249		len += n;
1250		}
1251
#	Line 1444 | Line 1258 | rebuild_isupport_message_line(void)
1258		if (*--p == ' ')
1259		*p = '\0';
1260
1261	<	addto_MessageLine(isupportFile, isupportbuffer);
1261	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1262		p = isupportbuffer;
1263		len = 0;
1264		n = tokens = 0;
#	Line 1455 | Line 1269 | rebuild_isupport_message_line(void)
1269		{
1270		if (*--p == ' ')
1271		*p = '\0';
1272	<	addto_MessageLine(isupportFile, isupportbuffer);
1272	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1273		}
1274		}

Diff Legend

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