ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 627 by michael, Fri May 26 11:33:57 2006 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3235 by michael, Sat Mar 29 19:34:16 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 "tools.h"
28	>	#include "list.h"
29		#include "s_user.h"
30		#include "s_misc.h"
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"
38	–	#include "irc_getnameinfo.h"
36		#include "ircd.h"
40	–	#include "list.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"
47	–	#include "s_stats.h"
43		#include "send.h"
44		#include "supported.h"
50	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47	+	#include "rng_mt.h"
48		#include "userhost.h"
54	–	#include "hook.h"
49		#include "s_misc.h"
50	<	#include "msg.h"
51	<	#include "pcre.h"
58	<
59	<	int MaxClientCount     = 1;
60	<	int MaxConnectionCount = 1;
61	<	struct Callback *entering_umode_cb = NULL;
62	<	struct Callback *umode_cb = NULL;
63	<	struct Callback *uid_get_cb = NULL;
50	>	#include "parse.h"
51	>	#include "watch.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
54
55		static void user_welcome(struct Client *);
56	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
56	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
57		static int check_xline(struct Client *);
58	<	static void introduce_client(struct Client *, struct Client *);
59	<	static void *uid_get(va_list);
58	>	static void introduce_client(struct Client *);
59	>	static const char *uid_get(void);
60
61		/* Used for building up the isupport string,
62		* used with init_isupport, add_isupport, delete_isupport
63		*/
64
65	<	struct Isupport
65	>	struct Isupport
66		{
67		dlink_node node;
68		char *name;
#	Line 82 | Line 70 | struct Isupport
70		int number;
71		};
72
73	<	static dlink_list support_list = { NULL, NULL, 0 };
74	<	MessageFile *isupportFile;
73	>	static dlink_list support_list;
74	>	static dlink_list support_list_lines;
75
76		/* memory is cheap. map 0-255 to equivalent mode */
77	<	unsigned int user_modes[256] =
77	>	const unsigned int user_modes[256] =
78		{
79		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
80		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 98 | Line 86 | unsigned int user_modes[256] =
86		0,                  /* C */
87		UMODE_DEAF,         /* D */
88		0,                  /* E */
89	<	0,                  /* F */
89	>	UMODE_FARCONNECT,   /* F */
90		UMODE_SOFTCALLERID, /* G */
91	<	0,                  /* H */
91	>	UMODE_HIDDEN,       /* H */
92		0,                  /* I */
93		0,                  /* J */
94		0,                  /* K */
#	Line 110 | Line 98 | unsigned int user_modes[256] =
98		0,                  /* O */
99		0,                  /* P */
100		0,                  /* Q */
101	<	0,                  /* R */
102	<	0,                  /* S */
101	>	UMODE_REGONLY,      /* R */
102	>	UMODE_SSL,          /* S */
103		0,                  /* T */
104		0,                  /* U */
105		0,                  /* V */
106	<	0,                  /* W */
106	>	UMODE_WEBIRC,       /* W */
107		0,                  /* X */
108		0,                  /* Y */
109		0,                  /* Z 0x5A */
110	<	0, 0, 0, 0, 0,      /* 0x5F   */
110	>	0, 0, 0, 0, 0,      /* 0x5F   */
111		0,                  /* 0x60   */
112		UMODE_ADMIN,        /* a */
113		UMODE_BOTS,         /* b */
114		UMODE_CCONN,        /* c */
115		UMODE_DEBUG,        /* d */
116	<	0,                  /* e */
116	>	UMODE_EXTERNAL,     /* e */
117		UMODE_FULL,         /* f */
118		UMODE_CALLERID,     /* g */
119		0,                  /* h */
120		UMODE_INVISIBLE,    /* i */
121	<	0,                  /* j */
121	>	UMODE_REJ,          /* j */
122		UMODE_SKILL,        /* k */
123		UMODE_LOCOPS,       /* l */
124		0,                  /* m */
#	Line 138 | Line 126 | unsigned int user_modes[256] =
126		UMODE_OPER,         /* o */
127		0,                  /* p */
128		0,                  /* q */
129	<	UMODE_REJ,          /* r */
129	>	UMODE_REGISTERED,   /* r */
130		UMODE_SERVNOTICE,   /* s */
131		0,                  /* t */
132		UMODE_UNAUTH,       /* u */
133		0,                  /* v */
134		UMODE_WALLOP,       /* w */
135	<	UMODE_EXTERNAL,     /* x */
135	>	UMODE_HIDDENHOST,   /* x */
136		UMODE_SPY,          /* y */
137		UMODE_OPERWALL,     /* z      0x7A */
138		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 165 | Line 153 | assemble_umode_buffer(void)
153		unsigned int idx = 0;
154		char *umode_buffer_ptr = umode_buffer;
155
156	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
156	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
157		if (user_modes[idx])
158		*umode_buffer_ptr++ = idx;
159
#	Line 179 | Line 167 | assemble_umode_buffer(void)
167		* side effects - display to client user counts etc.
168		*/
169		void
170	<	show_lusers(struct Client *source_p)
170	>	show_lusers(struct Client *source_p)
171		{
172	<	const char *from, *to;
173	<
174	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
187	<	{
188	<	from = me.id;
189	<	to = source_p->id;
190	<	}
172	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
173	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
174	>	Count.invisi, dlink_list_length(&global_serv_list));
175		else
176	<	{
177	<	from = me.name;
194	<	to = source_p->name;
195	<	}
196	<
197	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
198	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
199	<	from, to, (Count.total-Count.invisi),
200	<	Count.invisi, dlink_list_length(&global_serv_list));
201	<	else
202	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
203	<	(Count.total-Count.invisi), Count.invisi, 1);
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
177	>	(Count.total-Count.invisi), Count.invisi, 1);
178
179		if (Count.oper > 0)
180	<	sendto_one(source_p, form_str(RPL_LUSEROP),
207	<	from, to, Count.oper);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
181
182		if (dlink_list_length(&unknown_list) > 0)
183	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
211	<	from, to, dlink_list_length(&unknown_list));
183	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
184
185		if (dlink_list_length(&global_channel_list) > 0)
186	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
215	<	from, to, dlink_list_length(&global_channel_list));
186	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
187
188	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
188	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
189		{
190	<	sendto_one(source_p, form_str(RPL_LUSERME),
191	<	from, to, Count.local, Count.myserver);
221	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
222	<	from, to, Count.local, Count.max_loc,
223	<	Count.local, Count.max_loc);
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
191	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
192		}
193		else
194		{
195	<	sendto_one(source_p, form_str(RPL_LUSERME),
196	<	from, to, Count.total, 0);
197	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
198	<	from, to, Count.total, Count.max_tot,
199	<	Count.total, Count.max_tot);
232	<	}
233	<
234	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
235	<	from, to, Count.total, Count.max_tot,
236	<	Count.total, Count.max_tot);
237	<
238	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
239	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
240	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
195	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
196	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
197	>	}
198	>
199	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
200
201	<	if (Count.local > MaxClientCount)
202	<	MaxClientCount = Count.local;
201	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
202	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
203	>	Count.max_loc_cli, Count.totalrestartcount);
204
205	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
206	<	MaxConnectionCount = Count.local + Count.myserver;
205	>	if (Count.local > Count.max_loc_cli)
206	>	Count.max_loc_cli = Count.local;
207	>
208	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
209	>	Count.max_loc_con = Count.local + Count.myserver;
210		}
211
212		/* show_isupport()
#	Line 253 | Line 216 | show_lusers(struct Client *source_p)
216		* side effects - display to client what we support (for them)
217		*/
218		void
219	<	show_isupport(struct Client *source_p)
219	>	show_isupport(struct Client *source_p)
220		{
221	<	send_message_file(source_p, isupportFile);
221	>	const dlink_node *ptr = NULL;
222	>
223	>	DLINK_FOREACH(ptr, support_list_lines.head)
224	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
225		}
226
227		/*
#	Line 282 | Line 248 | show_isupport(struct Client *source_p)
248		**         nick from local user or kill him/her...
249		*/
250		void
251	<	register_local_user(struct Client *client_p, struct Client *source_p,
286	<	const char *nick, const char *username)
251	>	register_local_user(struct Client *source_p)
252		{
253	<	const struct AccessItem *aconf = NULL;
254	<	char ipaddr[HOSTIPLEN];
290	<	dlink_node *ptr = NULL;
291	<	dlink_node *m = NULL;
253	>	const char *id = NULL;
254	>	const struct MaskItem *conf = NULL;
255
256	<	assert(source_p != NULL);
256	>	assert(source_p == source_p->from);
257		assert(MyConnect(source_p));
295	–	assert(source_p->username != username);
258		assert(!source_p->localClient->registration);
259
260	<	ClearCap(client_p, CAP_TS6);
260	>	ClearCap(source_p, CAP_TS6);
261
262		if (ConfigFileEntry.ping_cookie)
263		{
264	<	if (!IsPingSent(source_p) &&
303	<	source_p->localClient->random_ping == 0)
264	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
265		{
266	<	source_p->localClient->random_ping = (unsigned long)rand();
267	<	sendto_one(source_p, "PING :%lu",
266	>	do
267	>	source_p->localClient->random_ping = genrand_int32();
268	>	while (!source_p->localClient->random_ping);
269	>
270	>	sendto_one(source_p, "PING :%u",
271		source_p->localClient->random_ping);
272		SetPingSent(source_p);
273		return;
#	Line 313 | Line 277 | register_local_user(struct Client *clien
277		return;
278		}
279
280	<	source_p->localClient->last = CurrentTime;
280	>	source_p->localClient->last_privmsg = CurrentTime;
281		/* Straight up the maximum rate of flooding... */
282		source_p->localClient->allow_read = MAX_FLOOD_BURST;
283
284	<	if (!execute_callback(client_check_cb, source_p, username))
284	>	if (!check_client(source_p))
285		return;
286
287	<	if (valid_hostname(source_p->host) == 0)
287	>	if (!valid_hostname(source_p->host))
288		{
289	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
290	<	"character in your hostname", me.name, source_p->name);
289	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
290	>	"character in your hostname");
291		strlcpy(source_p->host, source_p->sockhost,
292		sizeof(source_p->host));
293		}
294
295	<	ptr   = source_p->localClient->confs.head;
332	<	aconf = map_to_conf(ptr->data);
295	>	conf = source_p->localClient->confs.head->data;
296
297		if (!IsGotId(source_p))
298		{
299	<	const char *p = NULL;
299	>	char username[USERLEN + 1] = "";
300	>	const char *p = username;
301		unsigned int i = 0;
302
303	<	if (IsNeedIdentd(aconf))
303	>	if (IsNeedIdentd(conf))
304		{
305	<	ServerStats->is_ref++;
306	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
307	<	"identd to use this server", me.name, source_p->name);
308	<	exit_client(source_p, &me, "Install identd");
305	>	++ServerStats.is_ref;
306	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
307	>	"identd to use this server");
308	>	exit_client(source_p, "Install identd");
309		return;
310		}
311
312	<	p = username;
312	>	strlcpy(username, source_p->username, sizeof(username));
313
314	<	if (!IsNoTilde(aconf))
314	>	if (!IsNoTilde(conf))
315		source_p->username[i++] = '~';
316
317	<	while (*p && i < USERLEN)
354	<	{
317	>	for (; *p && i < USERLEN; ++p)
318		if (*p != '[')
319		source_p->username[i++] = *p;
357	–	p++;
358	–	}
320
321		source_p->username[i] = '\0';
322		}
323
324		/* password check */
325	<	if (!EmptyString(aconf->passwd))
325	>	if (!EmptyString(conf->passwd))
326		{
327		const char *pass = source_p->localClient->passwd;
328
329	<	if (!match_conf_password(pass, aconf))
329	>	if (!match_conf_password(pass, conf))
330		{
331	<	ServerStats->is_ref++;
332	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
333	<	me.name, source_p->name);
334	<	exit_client(source_p, &me, "Bad Password");
331	>	++ServerStats.is_ref;
332	>
333	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
334	>	exit_client(source_p, "Bad Password");
335		return;
336		}
337		}
#	Line 381 | Line 342 | register_local_user(struct Client *clien
342		*/
343
344		/* report if user has &^>= etc. and set flags as needed in source_p */
345	<	report_and_set_user_flags(source_p, aconf);
345	>	report_and_set_user_flags(source_p, conf);
346	>
347	>	if (IsDead(source_p))
348	>	return;
349
350		/* Limit clients -
351		* We want to be able to have servers and F-line clients
#	Line 394 | Line 358 | register_local_user(struct Client *clien
358		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
359		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
360		{
361	<	sendto_realops_flags(UMODE_FULL, L_ALL,
361	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
362		"Too many clients, rejecting %s[%s].",
363	<	nick, source_p->host);
364	<	ServerStats->is_ref++;
365	<	exit_client(source_p, &me, "Sorry, server is full - try later");
363	>	source_p->name, source_p->host);
364	>	++ServerStats.is_ref;
365	>	exit_client(source_p, "Sorry, server is full - try later");
366		return;
367		}
368
369		/* valid user name check */
370	<	if (valid_username(source_p->username) == 0)
370	>	if (!valid_username(source_p->username, 1))
371		{
372	<	char tmpstr2[IRCD_BUFSIZE];
372	>	char tmpstr2[IRCD_BUFSIZE] = "";
373
374	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
375	<	nick, source_p->username, source_p->host);
376	<	ServerStats->is_ref++;
377	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
378	<	exit_client(source_p, &me, tmpstr2);
374	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
375	>	"Invalid username: %s (%s@%s)",
376	>	source_p->name, source_p->username, source_p->host);
377	>	++ServerStats.is_ref;
378	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
379	>	source_p->username);
380	>	exit_client(source_p, tmpstr2);
381		return;
382		}
383
418	–	assert(source_p == client_p);
419	–
384		if (check_xline(source_p))
385		return;
386
387	<	if (IsDead(client_p))
388	<	return;
425	<
426	<	if (me.id[0])
427	<	{
428	<	const char *id = execute_callback(uid_get_cb, source_p);
429	<
430	<	while (hash_find_id(id) != NULL)
431	<	id = uid_get(NULL);
432	<
433	<	strlcpy(source_p->id, id, sizeof(source_p->id));
434	<	hash_add_id(source_p);
435	<	}
387	>	while (hash_find_id((id = uid_get())))
388	>	;
389
390	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
391	<	source_p->localClient->ip.ss_len, ipaddr,
439	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
390	>	strlcpy(source_p->id, id, sizeof(source_p->id));
391	>	hash_add_id(source_p);
392
393	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
394	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
395	<	nick, source_p->username, source_p->host,
393	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
394	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
395	>	source_p->name, source_p->username, source_p->host,
396		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
397	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
398	<	source_p->info);
399	<
448	<	/* If they have died in send_* don't do anything. */
449	<	if (IsDead(source_p))
450	<	return;
397	>	"255.255.255.255" : source_p->sockhost,
398	>	get_client_class(&source_p->localClient->confs),
399	>	source_p->info, source_p->id);
400
401		if (ConfigFileEntry.invisible_on_connect)
402		{
403	<	source_p->umodes |= UMODE_INVISIBLE;
404	<	Count.invisi++;
403	>	AddUMode(source_p, UMODE_INVISIBLE);
404	>	++Count.invisi;
405		}
406
407	<	if ((++Count.local) > Count.max_loc)
407	>	if (++Count.local > Count.max_loc)
408		{
409		Count.max_loc = Count.local;
410
411		if (!(Count.max_loc % 10))
412	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
412	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
413	>	"New Max Local Clients: %d",
414		Count.max_loc);
415		}
416
467	–	SetClient(source_p);
468	–
469	–	source_p->servptr = &me;
470	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
471	–
417		/* Increment our total user count here */
418		if (++Count.total > Count.max_tot)
419		Count.max_tot = Count.total;
420	<	Count.totalrestartcount++;
420	>	++Count.totalrestartcount;
421	>
422	>	assert(source_p->servptr == &me);
423	>	SetClient(source_p);
424	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
425
426		source_p->localClient->allow_read = MAX_FLOOD_BURST;
427
428	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
429	<	{
430	<	free_dlink_node(m);
431	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
483	<	}
484	<	else assert(0);
428	>	assert(dlinkFind(&unknown_list, source_p));
429	>
430	>	dlink_move_node(&source_p->localClient->lclient_node,
431	>	&unknown_list, &local_client_list);
432
433		user_welcome(source_p);
434		add_user_host(source_p->username, source_p->host, 0);
435		SetUserHost(source_p);
436
437	<	introduce_client(client_p, source_p);
437	>	introduce_client(source_p);
438		}
439
440		/* register_remote_user()
441		*
442	<	* inputs       - client_p directly connected client
496	<	*              - source_p remote or directly connected client
442	>	* inputs       - source_p remote or directly connected client
443		*              - username to register as
444		*              - host name to register as
445		*              - server name
500	–	*              - realname (gecos)
446		* output       - NONE
447		* side effects - This function is called when a remote client
448		*                is introduced by a server.
449		*/
450		void
451	<	register_remote_user(struct Client *client_p, struct Client *source_p,
452	<	const char *username, const char *host, const char *server,
508	<	const char *realname)
451	>	register_remote_user(struct Client *source_p, const char *username,
452	>	const char *host, const char *server)
453		{
454		struct Client *target_p = NULL;
455
512	–	assert(source_p != NULL);
456		assert(source_p->username != username);
457
458	<	strlcpy(source_p->host, host, sizeof(source_p->host));
516	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
458	>	strlcpy(source_p->host, host, sizeof(source_p->host));
459		strlcpy(source_p->username, username, sizeof(source_p->username));
460
461		/*
462		* coming from another server, take the servers word for it
463		*/
464	<	source_p->servptr = find_server(server);
464	>	source_p->servptr = hash_find_server(server);
465
466	<	/* Super GhostDetect:
466	>	/*
467	>	* Super GhostDetect:
468		* If we can't find the server the user is supposed to be on,
469		* then simply blow the user away.        -Taner
470		*/
471		if (source_p->servptr == NULL)
472		{
473	<	sendto_realops_flags(UMODE_ALL, L_ALL,
473	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
474		"No server %s for user %s[%s@%s] from %s",
475		server, source_p->name, source_p->username,
476		source_p->host, source_p->from->name);
477	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
477	>	sendto_one(source_p->from,
478	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
479	>	me.id, source_p->id, me.name, server);
480
481	<	SetKilled(source_p);
482	<	exit_client(source_p, &me, "Ghosted Client");
481	>	AddFlag(source_p, FLAGS_KILLED);
482	>	exit_client(source_p, "Ghosted Client");
483		return;
484		}
485
486		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
487		{
488	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
488	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
489		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
490	<	client_p->name, source_p->name, source_p->username,
490	>	source_p->from->name, source_p->name, source_p->username,
491		source_p->host, source_p->servptr->name,
492		target_p->name, target_p->from->name);
493	<	kill_client(client_p, source_p,
494	<	"%s (NICK from wrong direction (%s != %s))",
495	<	me.name, source_p->servptr->name, target_p->from->name);
496	<	SetKilled(source_p);
497	<	exit_client(source_p, &me, "USER server wrong direction");
493	>	sendto_one(source_p->from,
494	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
495	>	me.id, source_p->id, me.name, source_p->servptr->name,
496	>	target_p->from->name);
497	>
498	>	AddFlag(source_p, FLAGS_KILLED);
499	>	exit_client(source_p, "USER server wrong direction");
500		return;
501		}
502
503	+	/*
504	+	* If the nick has been introduced by a services server,
505	+	* make it a service as well.
506	+	*/
507	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
508	+	AddFlag(source_p, FLAGS_SERVICE);
509	+
510		/* Increment our total user count here */
511		if (++Count.total > Count.max_tot)
512		Count.max_tot = Count.total;
513
560	–	++source_p->from->serv->dep_users;
561	–
514		SetClient(source_p);
515	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
515	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
516		add_user_host(source_p->username, source_p->host, 1);
517		SetUserHost(source_p);
518
519	<	introduce_client(client_p, source_p);
519	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
520	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
521	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
522	>	source_p->servptr->name,
523	>	source_p->name, source_p->username, source_p->host,
524	>	source_p->info, source_p->id);
525	>
526	>	introduce_client(source_p);
527		}
528
529		/* introduce_client()
530		*
531	<	* inputs       - client_p
573	<	*              - source_p
531	>	* inputs       - source_p
532		* output       - NONE
533		* side effects - This common function introduces a client to the rest
534		*                of the net, either from a local client connect or
535		*                from a remote connect.
536		*/
537		static void
538	<	introduce_client(struct Client *client_p, struct Client *source_p)
538	>	introduce_client(struct Client *source_p)
539		{
540	<	dlink_node *server_node = NULL;
541	<	static char ubuf[12];
540	>	dlink_node *ptr = NULL;
541	>	char ubuf[IRCD_BUFSIZE] = "";
542
543		if (MyClient(source_p))
544		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
545		else
546		send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
547
548	<	if (*ubuf == '\0')
548	>	watch_check_hash(source_p, RPL_LOGON);
549	>
550	>	if (ubuf[0] == '\0')
551		{
552		ubuf[0] = '+';
553		ubuf[1] = '\0';
554		}
555
556	<	/* arghhh one could try not introducing new nicks to ll leafs
597	<	* but then you have to introduce them "on the fly" in SJOIN
598	<	* not fun.
599	<	* Its not going to cost much more bandwidth to simply let new
600	<	* nicks just ride on through.
601	<	*/
602	<
603	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
604	<	* you _need_ to if you aren't going to burst everyone initially.
605	<	*
606	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
607	<	* in that case just send it to the uplink.
608	<	* -davidt
609	<	* rewritten to cope with SIDs .. eww eww eww --is
610	<	*/
611	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
612	<	client_p != uplink)
556	>	DLINK_FOREACH(ptr, serv_list.head)
557		{
558	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
559	<	{
560	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
558	>	struct Client *server = ptr->data;
559	>
560	>	if (server == source_p->from)
561	>	continue;
562	>
563	>	if (IsCapable(server, CAP_SVS))
564	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565		source_p->servptr->id,
566		source_p->name, source_p->hopcount+1,
567		(unsigned long)source_p->tsinfo,
568		ubuf, source_p->username, source_p->host,
569		(MyClient(source_p) && IsIPSpoof(source_p)) ?
570	<	"0" : source_p->sockhost, source_p->id, source_p->info);
571	<	}
570	>	"0" : source_p->sockhost, source_p->id,
571	>	source_p->svid,
572	>	source_p->info);
573		else
574	<	{
575	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
574	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
575	>	source_p->servptr->id,
576		source_p->name, source_p->hopcount+1,
577		(unsigned long)source_p->tsinfo,
578		ubuf, source_p->username, source_p->host,
579	<	source_p->servptr->name, source_p->info);
580	<	}
632	<	}
633	<	else
634	<	{
635	<	DLINK_FOREACH(server_node, serv_list.head)
636	<	{
637	<	struct Client *server = server_node->data;
638	<
639	<	if (IsCapable(server, CAP_LL) || server == client_p)
640	<	continue;
579	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
580	>	"0" : source_p->sockhost, source_p->id, source_p->info);
581
582	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
583	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
644	<	source_p->servptr->id,
645	<	source_p->name, source_p->hopcount+1,
646	<	(unsigned long)source_p->tsinfo,
647	<	ubuf, source_p->username, source_p->host,
648	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
649	<	"0" : source_p->sockhost, source_p->id, source_p->info);
650	<	else
651	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
652	<	source_p->name, source_p->hopcount+1,
653	<	(unsigned long)source_p->tsinfo,
654	<	ubuf, source_p->username, source_p->host,
655	<	source_p->servptr->name, source_p->info);
656	<	}
582	>	if (!EmptyString(source_p->certfp))
583	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
584		}
585		}
586
#	Line 671 | Line 598 | valid_hostname(const char *hostname)
598		{
599		const char *p = hostname;
600
601	<	assert(p != NULL);
601	>	assert(p);
602
603	<	if ('.' == *p || ':' == *p)
603	>	if (EmptyString(p) || *p == '.' || *p == ':')
604		return 0;
605
606	<	while (*p)
680	<	{
606	>	for (; *p; ++p)
607		if (!IsHostChar(*p))
608		return 0;
683	–	p++;
684	–	}
609
610	<	return 1;
610	>	return p - hostname <= HOSTLEN;
611		}
612
613		/* valid_username()
#	Line 698 | Line 622 | valid_hostname(const char *hostname)
622		* style of username
623		*/
624		int
625	<	valid_username(const char *username)
625	>	valid_username(const char *username, const int local)
626		{
627		int dots      = 0;
628		const char *p = username;
629
630	<	assert(p != NULL);
630	>	assert(p);
631
632	<	if ('~' == *p)
632	>	if (*p == '~')
633		++p;
634
635	<	/* reject usernames that don't start with an alphanum
635	>	/*
636	>	* Reject usernames that don't start with an alphanum
637		* i.e. reject jokers who have '-@somehost' or '.@somehost'
638		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
639		*/
640		if (!IsAlNum(*p))
641		return 0;
642
643	<	while (*++p)
643	>	if (local)
644		{
645	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
645	>	while (*++p)
646		{
647	<	dots++;
648	<
649	<	if (dots > ConfigFileEntry.dots_in_ident)
650	<	return 0;
651	<	if (!IsUserChar(p[1]))
647	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
648	>	{
649	>	if (++dots > ConfigFileEntry.dots_in_ident)
650	>	return 0;
651	>	if (!IsUserChar(*(p + 1)))
652	>	return 0;
653	>	}
654	>	else if (!IsUserChar(*p))
655		return 0;
656		}
729	–	else if (!IsUserChar(*p))
730	–	return 0;
657		}
658	+	else
659	+	{
660	+	while (*++p)
661	+	if (!IsUserChar(*p))
662	+	return 0;
663	+	}
664	+
665	+	return  p - username <= USERLEN;;
666	+	}
667	+
668	+	/* clean_nick_name()
669	+	*
670	+	* input        - nickname
671	+	*              - whether it's a local nick (1) or remote (0)
672	+	* output       - none
673	+	* side effects - walks through the nickname, returning 0 if erroneous
674	+	*/
675	+	int
676	+	valid_nickname(const char *nickname, const int local)
677	+	{
678	+	const char *p = nickname;
679	+	assert(nickname && *nickname);
680	+
681	+	assert(p);
682	+
683	+	/* nicks can't start with a digit or - or be 0 length */
684	+	/* This closer duplicates behaviour of hybrid-6 */
685	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
686	+	return 0;
687
688	<	return 1;
688	>	for (; *p; ++p)
689	>	if (!IsNickChar(*p))
690	>	return 0;
691	>
692	>	return p - nickname <= NICKLEN;
693		}
694
695		/* report_and_set_user_flags()
696		*
697		* inputs       - pointer to source_p
698	<	*              - pointer to aconf for this user
698	>	*              - pointer to conf for this user
699		* output       - NONE
700		* side effects - Report to user any special flags
701		*                they are getting, and set them.
702		*/
703		static void
704	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
704	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
705		{
706		/* If this user is being spoofed, tell them so */
707	<	if (IsConfDoSpoofIp(aconf))
708	<	{
750	<	sendto_one(source_p,
751	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	<	me.name, source_p->name);
753	<	}
707	>	if (IsConfDoSpoofIp(conf))
708	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
709
710		/* If this user is in the exception class, Set it "E lined" */
711	<	if (IsConfExemptKline(aconf))
711	>	if (IsConfExemptKline(conf))
712		{
713		SetExemptKline(source_p);
714	<	sendto_one(source_p,
760	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
761	<	me.name, source_p->name);
714	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
715		}
716
717	<	/* The else here is to make sure that G line exempt users
717	>	/*
718	>	* The else here is to make sure that G line exempt users
719		* do not get noticed twice.
720		*/
721	<	else if (IsConfExemptGline(aconf))
721	>	else if (IsConfExemptGline(conf))
722		{
723		SetExemptGline(source_p);
724	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
771	<	me.name, source_p->name);
724	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
725		}
726
727	<	if (IsConfExemptResv(aconf))
727	>	if (IsConfExemptResv(conf))
728		{
729		SetExemptResv(source_p);
730	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
778	<	me.name, source_p->name);
730	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
731		}
732
733		/* If this user is exempt from user limits set it "F lined" */
734	<	if (IsConfExemptLimits(aconf))
734	>	if (IsConfExemptLimits(conf))
735		{
736		SetExemptLimits(source_p);
737	<	sendto_one(source_p,
786	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
787	<	me.name,source_p->name);
737	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
738		}
739
740	<	/* If this user is exempt from idle time outs */
791	<	if (IsConfIdlelined(aconf))
792	<	{
793	<	SetIdlelined(source_p);
794	<	sendto_one(source_p,
795	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
796	<	me.name, source_p->name);
797	<	}
798	<
799	<	if (IsConfCanFlood(aconf))
740	>	if (IsConfCanFlood(conf))
741		{
742		SetCanFlood(source_p);
743	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
744	<	"protection, aren't you fearsome.",
804	<	me.name, source_p->name);
743	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
744	>	"protection, aren't you fearsome.");
745		}
746		}
747
808	–	/* do_local_user()
809	–	*
810	–	* inputs       -
811	–	* output       - NONE
812	–	* side effects -
813	–	*/
814	–	void
815	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
816	–	const char *username, const char *host, const char *server,
817	–	const char *realname)
818	–	{
819	–	assert(source_p != NULL);
820	–	assert(source_p->username != username);
821	–
822	–	if (source_p == NULL)
823	–	return;
824	–
825	–	if (!IsUnknown(source_p))
826	–	{
827	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
828	–	me.name, nick);
829	–	return;
830	–	}
831	–
832	–	source_p->localClient->registration &= ~REG_NEED_USER;
833	–
834	–	/*
835	–	* don't take the clients word for it, ever
836	–	*/
837	–	source_p->servptr = &me;
838	–
839	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
840	–
841	–	if (!IsGotId(source_p))
842	–	{
843	–	/* save the username in the client
844	–	* If you move this you'll break ping cookies..you've been warned
845	–	*/
846	–	strlcpy(source_p->username, username, sizeof(source_p->username));
847	–	}
848	–
849	–	if (!source_p->localClient->registration)
850	–	/* NICK already received, now I have USER... */
851	–	register_local_user(client_p, source_p, source_p->name, username);
852	–	}
853	–
854	–	/* change_simple_umode()
855	–	*
856	–	* this callback can be hooked to allow special handling of
857	–	* certain usermodes
858	–	*/
859	–	static void *
860	–	change_simple_umode(va_list args)
861	–	{
862	–	struct Client *client_p;
863	–	struct Client *source_p;
864	–	int what;
865	–	unsigned int flag;
866	–
867	–	client_p = va_arg(args, struct Client *);
868	–	source_p = va_arg(args, struct Client *);
869	–	what = va_arg(args, int);
870	–	flag = va_arg(args, unsigned int);
871	–
872	–	if (what == MODE_ADD)
873	–	source_p->umodes |= flag;
874	–	else
875	–	source_p->umodes &= ~flag;
876	–
877	–	return NULL;
878	–	}
879	–
748		/* set_user_mode()
749		*
750		* added 15/10/91 By Darren Reed.
751	<	* parv[0] - sender
751	>	* parv[0] - command
752		* parv[1] - username to change mode for
753		* parv[2] - modes to change
754		*/
755		void
756	<	set_user_mode(struct Client *client_p, struct Client *source_p,
889	<	int parc, char *parv[])
756	>	set_user_mode(struct Client *source_p, const int parc, char *parv[])
757		{
758		unsigned int flag, setflags;
759	<	char **p, *m, buf[IRCD_BUFSIZE];
759	>	char **p, *m, buf[IRCD_BUFSIZE] = "";
760		struct Client *target_p;
761		int what = MODE_ADD, badflag = 0, i;
762
763		assert(!(parc < 2));
764
765	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
765	>	if ((target_p = find_person(source_p, parv[1])) == NULL)
766		{
767		if (MyConnect(source_p))
768	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
902	<	me.name, source_p->name, parv[1]);
768	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
769		return;
770		}
771
772	<	if (IsServer(source_p))
772	>	if (source_p != target_p)
773		{
774	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
909	<	parv[1], source_p->name);
910	<	return;
911	<	}
912	<
913	<	if (source_p != target_p || target_p->from != source_p->from)
914	<	{
915	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
916	<	me.name, source_p->name);
774	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
775		return;
776		}
777
#	Line 922 | Line 780 | set_user_mode(struct Client *client_p, s
780		m = buf;
781		*m++ = '+';
782
783	<	for (i = 0; i < 128; i++)
784	<	if (source_p->umodes & user_modes[i])
783	>	for (i = 0; i < 128; ++i)
784	>	if (HasUMode(source_p, user_modes[i]))
785		*m++ = (char)i;
786		*m = '\0';
787
788	<	sendto_one(source_p, form_str(RPL_UMODEIS),
931	<	me.name, source_p->name, buf);
788	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
789		return;
790		}
791
935	–	execute_callback(entering_umode_cb, client_p, source_p);
936	–
792		/* find flags already set for user */
793		setflags = source_p->umodes;
794
795		/* parse mode change string(s) */
796	<	for (p = &parv[2]; p && *p; p++)
796	>	for (p = &parv[2]; p && *p; ++p)
797		{
798	<	for (m = *p; *m; m++)
798	>	for (m = *p; *m; ++m)
799		{
800		switch (*m)
801		{
#	Line 953 | Line 808 | set_user_mode(struct Client *client_p, s
808		case 'o':
809		if (what == MODE_ADD)
810		{
811	<	if (IsServer(client_p) && !IsOper(source_p))
811	>	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
812		{
813		++Count.oper;
814		SetOper(source_p);
#	Line 961 | Line 816 | set_user_mode(struct Client *client_p, s
816		}
817		else
818		{
819	<	/* Only decrement the oper counts if an oper to begin with
965	<	* found by Pat Szuta, Perly , perly@xnet.com
966	<	*/
967	<	if (!IsOper(source_p))
819	>	if (!HasUMode(source_p, UMODE_OPER))
820		break;
821
822		ClearOper(source_p);
971	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
823		Count.oper--;
824
825		if (MyConnect(source_p))
826		{
827	<	dlink_node *dm;
827	>	dlink_node *ptr = NULL;
828
829	<	detach_conf(source_p, OPER_TYPE);
830	<	ClearOperFlags(source_p);
829	>	detach_conf(source_p, CONF_OPER);
830	>	ClrOFlag(source_p);
831	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
832
833	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
834	<	free_dlink_node(dm);
833	>	if ((ptr = dlinkFindDelete(&oper_list, source_p)))
834	>	free_dlink_node(ptr);
835		}
836		}
837
838		break;
839
840	<	/* we may not get these,
841	<	* but they shouldnt be in default
842	<	*/
843	<	case ' ' :
992	<	case '\n':
993	<	case '\r':
994	<	case '\t':
840	>	case 'S':  /* Only servers may set +S in a burst */
841	>	case 'W':  /* Only servers may set +W in a burst */
842	>	case 'r':  /* Only services may set +r */
843	>	case 'x':  /* Only services may set +x */
844		break;
845
846		default:
847		if ((flag = user_modes[(unsigned char)*m]))
848		{
849	<	if (MyConnect(source_p) && !IsOper(source_p) &&
849	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
850		(ConfigFileEntry.oper_only_umodes & flag))
1002	–	{
851		badflag = 1;
1004	–	}
852		else
853	<	execute_callback(umode_cb, client_p, source_p, what, flag);
854	<	}
855	<	else
856	<	{
857	<	if (MyConnect(source_p))
858	<	badflag = 1;
853	>	{
854	>	if (what == MODE_ADD)
855	>	AddUMode(source_p, flag);
856	>	else
857	>	DelUMode(source_p, flag);
858	>	}
859		}
860	+	else if (MyConnect(source_p))
861	+	badflag = 1;
862
863		break;
864		}
#	Line 1017 | Line 866 | set_user_mode(struct Client *client_p, s
866		}
867
868		if (badflag)
869	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1021	<	me.name, source_p->name);
1022	<
1023	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1024	<	{
1025	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1026	<	me.name, source_p->name);
1027	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1028	<	}
869	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
870
871	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
872	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
871	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
872	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
873		{
874	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
875	<	me.name, source_p->name);
1035	<	source_p->umodes &= ~UMODE_ADMIN;
874	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
875	>	DelUMode(source_p, UMODE_ADMIN);
876		}
877
878	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
878	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
879		++Count.invisi;
880	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
880	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
881		--Count.invisi;
882
883		/*
884		* compare new flags with old flags and send string which
885		* will cause servers to update correctly.
886		*/
887	<	send_umode_out(client_p, source_p, setflags);
887	>	send_umode_out(source_p, source_p, setflags);
888		}
889
890		/* send_umode()
891		* send the MODE string for user (user) to connection client_p
892		* -avalon
893	+	*
894	+	* inputs       - client_p
895	+	*              - source_p
896	+	*              - int old
897	+	*              - sendmask mask of modes to send
898	+	*              - suplied umode_buf
899	+	* output       - NONE
900		*/
901		void
902		send_umode(struct Client *client_p, struct Client *source_p,
903		unsigned int old, unsigned int sendmask, char *umode_buf)
904		{
905	+	char *m = umode_buf;
906		int what = 0;
907		unsigned int i;
908		unsigned int flag;
1061	–	char *m = umode_buf;
909
910		/*
911		* build a string in umode_buf to represent the change in the user's
912		* mode between the new (source_p->umodes) and 'old'.
913		*/
914	<	for (i = 0; i < 128; i++)
914	>	for (i = 0; i < 128; ++i)
915		{
916		flag = user_modes[i];
917		if (!flag)
#	Line 1073 | Line 920 | send_umode(struct Client *client_p, stru
920		if (MyClient(source_p) && !(flag & sendmask))
921		continue;
922
923	<	if ((flag & old) && !(source_p->umodes & flag))
923	>	if ((flag & old) && !HasUMode(source_p, flag))
924		{
925		if (what == MODE_DEL)
926		*m++ = (char)i;
#	Line 1084 | Line 931 | send_umode(struct Client *client_p, stru
931		*m++ = (char)i;
932		}
933		}
934	<	else if (!(flag & old) && (source_p->umodes & flag))
934	>	else if (!(flag & old) && HasUMode(source_p, flag))
935		{
936		if (what == MODE_ADD)
937		*m++ = (char)i;
#	Line 1115 | Line 962 | void
962		send_umode_out(struct Client *client_p, struct Client *source_p,
963		unsigned int old)
964		{
965	<	char buf[IRCD_BUFSIZE] = { '\0' };
965	>	char buf[IRCD_BUFSIZE] = "";
966		dlink_node *ptr = NULL;
967
968	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1122	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
968	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
969
970		if (buf[0])
971	+	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
972	+	source_p->id, source_p->id, buf);
973	+
974	+	if (client_p && MyClient(client_p))
975	+	send_umode(client_p, source_p, old, 0xffffffff, buf);
976	+	}
977	+
978	+	void
979	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
980	+	{
981	+	dlink_node *ptr = NULL;
982	+
983	+	if (!strcmp(target_p->host, hostname))
984	+	return;
985	+
986	+	switch (what)
987		{
988	<	DLINK_FOREACH(ptr, serv_list.head)
988	>	case MODE_ADD:
989	>	AddUMode(target_p, UMODE_HIDDENHOST);
990	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
991	>	break;
992	>	case MODE_DEL:
993	>	DelUMode(target_p, UMODE_HIDDENHOST);
994	>
995	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
996	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
997	>	break;
998	>	default: return;
999	>	}
1000	>
1001	>	if (ConfigFileEntry.cycle_on_host_change)
1002	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1003	>	target_p->name, target_p->username, target_p->host);
1004	>
1005	>	if (IsUserHostIp(target_p))
1006	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1007	>
1008	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1009	>
1010	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1011	>	SetUserHost(target_p);
1012	>
1013	>	if (MyClient(target_p))
1014	>	{
1015	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1016	>	clear_ban_cache_client(target_p);
1017	>	}
1018	>
1019	>	if (!ConfigFileEntry.cycle_on_host_change)
1020	>	return;
1021	>
1022	>	DLINK_FOREACH(ptr, target_p->channel.head)
1023	>	{
1024	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
1025	>	char *p = modebuf;
1026	>	int len = 0;
1027	>	const struct Membership *ms = ptr->data;
1028	>
1029	>	if (has_member_flags(ms, CHFL_CHANOP))
1030		{
1031	<	struct Client *target_p = ptr->data;
1031	>	*p++ = 'o';
1032	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1033	>	}
1034
1035	<	if ((target_p != client_p) && (target_p != source_p))
1036	<	{
1037	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1038	<	(target_p->localClient->serverMask &
1134	<	source_p->lazyLinkClientExists))
1135	<	sendto_one(target_p, ":%s MODE %s :%s",
1136	<	ID_or_name(source_p, target_p),
1137	<	ID_or_name(source_p, target_p), buf);
1138	<	}
1035	>	if (has_member_flags(ms, CHFL_HALFOP))
1036	>	{
1037	>	*p++ = 'h';
1038	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1039		}
1040	+
1041	+	if (has_member_flags(ms, CHFL_VOICE))
1042	+	{
1043	+	*p++ = 'v';
1044	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1045	+	}
1046	+
1047	+	*p = '\0';
1048	+
1049	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1050	+	target_p->name, target_p->username, target_p->host,
1051	+	ms->chptr->chname);
1052	+	if (nickbuf[0])
1053	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1054	+	target_p->servptr->name, ms->chptr->chname,
1055	+	modebuf, nickbuf);
1056	+
1057		}
1058
1059	<	if (client_p && MyClient(client_p))
1060	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
1059	>	if (target_p->away[0])
1060	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1061	>	":%s!%s@%s AWAY :%s",
1062	>	target_p->name, target_p->username,
1063	>	target_p->host, target_p->away);
1064		}
1065
1066		/* user_welcome()
#	Line 1159 | Line 1079 | user_welcome(struct Client *source_p)
1079		#endif
1080
1081		#ifdef HAVE_LIBCRYPTO
1082	<	if (source_p->localClient->fd.ssl != NULL)
1083	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1084	<	me.name, source_p->name,
1085	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1082	>	if (HasFlag(source_p, FLAGS_SSL))
1083	>	{
1084	>	AddUMode(source_p, UMODE_SSL);
1085	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1086	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1087	>	}
1088		#endif
1089
1090	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1091	<	ServerInfo.network_name, source_p->name);
1092	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1093	<	get_listener_name(source_p->localClient->listener), ircd_version);
1094	<	sendto_one(source_p, form_str(RPL_CREATED),
1095	<	me.name, source_p->name, built_date);
1174	<	sendto_one(source_p, form_str(RPL_MYINFO),
1175	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1090	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1091	>	source_p->name);
1092	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1093	>	get_listener_name(source_p->localClient->listener), ircd_version);
1094	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1095	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1096		show_isupport(source_p);
1097
1098	<	if (source_p->id[0] != '\0')
1099	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1180	<	source_p->name, source_p->id);
1098	>	if (source_p->id[0])
1099	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1100
1101		show_lusers(source_p);
1102	<
1184	<	if (ConfigFileEntry.short_motd)
1185	<	{
1186	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1187	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1188	<	sendto_one(source_p,
1189	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1190	<	"read it", source_p->name);
1191	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1192	<	me.name, source_p->name, me.name);
1193	<	sendto_one(source_p, form_str(RPL_MOTD),
1194	<	me.name, source_p->name,
1195	<	"*** This is the short motd ***");
1196	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1197	<	me.name, source_p->name);
1198	<	}
1199	<	else
1200	<	send_message_file(source_p, &ConfigFileEntry.motd);
1102	>	motd_signon(source_p);
1103		}
1104
1105		/* check_xline()
#	Line 1209 | Line 1111 | user_welcome(struct Client *source_p)
1111		static int
1112		check_xline(struct Client *source_p)
1113		{
1114	<	struct ConfItem *conf = NULL;
1114	>	struct MaskItem *conf = NULL;
1115		const char *reason = NULL;
1116
1117	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1216	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1117	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1118		{
1119	<	struct MatchItem *reg = map_to_conf(conf);
1119	>	++conf->count;
1120
1121	<	++reg->count;
1122	<
1222	<	if (reg->reason != NULL)
1223	<	reason = reg->reason;
1121	>	if (conf->reason)
1122	>	reason = conf->reason;
1123		else
1124	<	reason = "No Reason";
1124	>	reason = CONF_NOREASON;
1125
1126	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1126	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1127		"X-line Rejecting [%s] [%s], user %s [%s]",
1128		source_p->info, reason,
1129		get_client_name(source_p, HIDE_IP),
1130		source_p->sockhost);
1131
1132	<	ServerStats->is_ref++;
1133	<	if (REJECT_HOLD_TIME > 0)
1235	<	{
1236	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1237	<	me.name, source_p->name);
1238	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1239	<	SetCaptured(source_p);
1240	<	}
1241	<	else
1242	<	exit_client(source_p, &me, "Bad user info");
1132	>	++ServerStats.is_ref;
1133	>	exit_client(source_p, "Bad user info");
1134		return 1;
1135		}
1136
#	Line 1250 | Line 1141 | check_xline(struct Client *source_p)
1141		*
1142		* inputs       - pointer to given client to oper
1143		* output       - NONE
1144	<	* side effects - Blindly opers up given source_p, using aconf info
1144	>	* side effects - Blindly opers up given source_p, using conf info
1145		*                all checks on passwords have already been done.
1146	<	*                This could also be used by rsa oper routines.
1146	>	*                This could also be used by rsa oper routines.
1147		*/
1148		void
1149		oper_up(struct Client *source_p)
1150		{
1151	<	unsigned int old = source_p->umodes;
1152	<	const char *operprivs = "";
1262	<	const struct AccessItem *oconf = NULL;
1151	>	const unsigned int old = source_p->umodes;
1152	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1153
1154		assert(source_p->localClient->confs.head);
1265	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1155
1156		++Count.oper;
1157		SetOper(source_p);
1158
1159	<	if (oconf->modes)
1160	<	source_p->umodes |= oconf->modes;
1159	>	if (conf->modes)
1160	>	AddUMode(source_p, conf->modes);
1161		else if (ConfigFileEntry.oper_umodes)
1162	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1163	<	else
1164	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1165	<	UMODE_WALLOP|UMODE_LOCOPS);
1162	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1163	>
1164	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1165	>	++Count.invisi;
1166	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1167	>	--Count.invisi;
1168
1169		assert(dlinkFind(&oper_list, source_p) == NULL);
1170		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1171
1172	<	operprivs = oper_privs_as_string(oconf->port);
1282	<
1283	<	SetOFlag(source_p, oconf->port);
1172	>	AddOFlag(source_p, conf->port);
1173
1174	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1175	<	source_p->umodes |= UMODE_ADMIN;
1287	<	if (!IsOperN(source_p))
1288	<	source_p->umodes &= ~UMODE_NCHANGE;
1174	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1175	>	AddUMode(source_p, UMODE_ADMIN);
1176
1177	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1178	<	source_p->name, source_p->username, source_p->host);
1177	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1178	>	get_oper_name(source_p));
1179		send_umode_out(source_p, source_p, old);
1180	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1294	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1295	<	me.name, source_p->name, operprivs);
1296	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1180	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1181		}
1182
1183		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1301 | Line 1185 | static char new_uid[TOTALSIDUID + 1];
1185		int
1186		valid_sid(const char *sid)
1187		{
1304	–
1188		if (strlen(sid) == IRC_MAXSID)
1189		if (IsDigit(*sid))
1190		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1312 | Line 1195 | valid_sid(const char *sid)
1195
1196		/*
1197		* init_uid()
1198	<	*
1198	>	*
1199		* inputs       - NONE
1200		* output       - NONE
1201		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1322 | Line 1205 | valid_sid(const char *sid)
1205		void
1206		init_uid(void)
1207		{
1325	–	int i;
1326	–
1208		memset(new_uid, 0, sizeof(new_uid));
1209
1210	<	if (ServerInfo.sid != NULL)
1330	<	{
1210	>	if (!EmptyString(ServerInfo.sid))
1211		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1332	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1333	–
1334	–	hash_add_id(&me);
1335	–	}
1212
1213	<	for (i = 0; i < IRC_MAXSID; i++)
1214	<	if (new_uid[i] == '\0')
1213	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1214	>	if (new_uid[i] == '\0')
1215		new_uid[i] = 'A';
1216
1217		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1342	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1343	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1344	–	* -Dianora
1345	–	*/
1218		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1347	–
1348	–	entering_umode_cb = register_callback("entering_umode", NULL);
1349	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1350	–	uid_get_cb = register_callback("uid_get", uid_get);
1219		}
1220
1221		/*
#	Line 1390 | Line 1258 | add_one_to_uid(int i)
1258		* output       - new UID is returned to caller
1259		* side effects - new_uid is incremented by one.
1260		*/
1261	<	static void *
1262	<	uid_get(va_list args)
1261	>	static const char *
1262	>	uid_get(void)
1263		{
1264		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1265		return new_uid;
#	Line 1407 | Line 1275 | uid_get(va_list args)
1275		void
1276		init_isupport(void)
1277		{
1410	–	isupportFile = init_MessageLine();
1411	–
1278		add_isupport("CALLERID", NULL, -1);
1279		add_isupport("CASEMAPPING", CASEMAP, -1);
1280	+	add_isupport("DEAF", "D", -1);
1281		add_isupport("KICKLEN", NULL, KICKLEN);
1282		add_isupport("MODES", NULL, MAXMODEPARAMS);
1416	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1283		#ifdef HALFOPS
1284		add_isupport("PREFIX", "(ohv)@%+", -1);
1285		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1421 | Line 1287 | init_isupport(void)
1287		add_isupport("PREFIX", "(ov)@+", -1);
1288		add_isupport("STATUSMSG", "@+", -1);
1289		#endif
1290	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1290	>	add_isupport("EXCEPTS", "e", -1);
1291	>	add_isupport("INVEX", "I", -1);
1292		}
1293
1294		/*
#	Line 1456 | Line 1323 | add_isupport(const char *name, const cha
1323		dlinkAddTail(support, &support->node, &support_list);
1324		}
1325
1326	<	DupString(support->name, name);
1326	>	support->name = xstrdup(name);
1327		if (options != NULL)
1328	<	DupString(support->options, options);
1328	>	support->options = xstrdup(options);
1329		support->number = n;
1330
1331		rebuild_isupport_message_line();
#	Line 1505 | Line 1372 | rebuild_isupport_message_line(void)
1372		{
1373		char isupportbuffer[IRCD_BUFSIZE];
1374		char *p = isupportbuffer;
1375	<	dlink_node *ptr = NULL;
1375	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1376		int n = 0;
1377		int tokens = 0;
1378		size_t len = 0;
1379	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1379	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1380
1381	<	destroy_MessageLine(isupportFile);
1381	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1382	>	{
1383	>	dlinkDelete(ptr, &support_list_lines);
1384	>	MyFree(ptr->data);
1385	>	free_dlink_node(ptr);
1386	>	}
1387
1388		DLINK_FOREACH(ptr, support_list.head)
1389		{
1390		struct Isupport *support = ptr->data;
1391
1392	<	p += (n = ircsprintf(p, "%s", support->name));
1392	>	p += (n = sprintf(p, "%s", support->name));
1393		len += n;
1394
1395		if (support->options != NULL)
1396		{
1397	<	p += (n = ircsprintf(p, "=%s", support->options));
1397	>	p += (n = sprintf(p, "=%s", support->options));
1398		len += n;
1399		}
1400
1401		if (support->number > 0)
1402		{
1403	<	p += (n = ircsprintf(p, "=%d", support->number));
1403	>	p += (n = sprintf(p, "=%d", support->number));
1404		len += n;
1405		}
1406
#	Line 1541 | Line 1413 | rebuild_isupport_message_line(void)
1413		if (*--p == ' ')
1414		*p = '\0';
1415
1416	<	addto_MessageLine(isupportFile, isupportbuffer);
1416	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1417		p = isupportbuffer;
1418		len = 0;
1419		n = tokens = 0;
#	Line 1552 | Line 1424 | rebuild_isupport_message_line(void)
1424		{
1425		if (*--p == ' ')
1426		*p = '\0';
1427	<	addto_MessageLine(isupportFile, isupportbuffer);
1427	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1428		}
1429		}

Diff Legend

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