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 891 by michael, Thu Nov 1 13:44:50 2007 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3135 by michael, Mon Mar 10 21:11:25 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"
36		#include "ircd.h"
39	–	#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"
46	–	#include "s_stats.h"
43		#include "send.h"
44		#include "supported.h"
49	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47	+	#include "rng_mt.h"
48		#include "userhost.h"
53	–	#include "hook.h"
49		#include "s_misc.h"
50	<	#include "msg.h"
56	<	#include "pcre.h"
50	>	#include "parse.h"
51		#include "watch.h"
52
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;
64	–
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 95 | Line 83 | unsigned int user_modes[256] =
83		0,                  /* @ */
84		0,                  /* A */
85		0,                  /* B */
86	<	UMODE_CCONN_FULL,   /* C */
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),
230	<	from, to, Count.total, Count.max_tot,
231	<	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	<	if (Count.local > MaxClientCount)
243	<	MaxClientCount = Count.local;
199	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
200
201	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
202	<	MaxConnectionCount = Count.local + Count.myserver;
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.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	<	dlink_node *ptr = NULL;
290	<	dlink_node *m = NULL;
253	>	const char *id = NULL;
254	>	const struct MaskItem *conf = NULL;
255
256		assert(source_p != NULL);
257	+	assert(source_p == source_p->from);
258		assert(MyConnect(source_p));
294	–	assert(source_p->username != username);
259		assert(!source_p->localClient->registration);
260
261	<	ClearCap(client_p, CAP_TS6);
261	>	ClearCap(source_p, CAP_TS6);
262
263		if (ConfigFileEntry.ping_cookie)
264		{
265	<	if (!IsPingSent(source_p) &&
302	<	source_p->localClient->random_ping == 0)
265	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
266		{
267	<	source_p->localClient->random_ping = (unsigned long)rand();
268	<	sendto_one(source_p, "PING :%lu",
267	>	do
268	>	source_p->localClient->random_ping = genrand_int32();
269	>	while (!source_p->localClient->random_ping);
270	>
271	>	sendto_one(source_p, "PING :%u",
272		source_p->localClient->random_ping);
273		SetPingSent(source_p);
274		return;
#	Line 312 | Line 278 | register_local_user(struct Client *clien
278		return;
279		}
280
281	<	source_p->localClient->last = CurrentTime;
281	>	source_p->localClient->last_privmsg = CurrentTime;
282		/* Straight up the maximum rate of flooding... */
283		source_p->localClient->allow_read = MAX_FLOOD_BURST;
284
285	<	if (!execute_callback(client_check_cb, source_p, username))
285	>	if (!check_client(source_p))
286		return;
287
288	<	if (valid_hostname(source_p->host) == 0)
288	>	if (!valid_hostname(source_p->host))
289		{
290	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
291	<	"character in your hostname", me.name, source_p->name);
290	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
291	>	"character in your hostname");
292		strlcpy(source_p->host, source_p->sockhost,
293		sizeof(source_p->host));
294		}
295
296	<	ptr   = source_p->localClient->confs.head;
331	<	aconf = map_to_conf(ptr->data);
296	>	conf = source_p->localClient->confs.head->data;
297
298		if (!IsGotId(source_p))
299		{
300	<	const char *p = NULL;
300	>	char username[USERLEN + 1];
301	>	const char *p = username;
302		unsigned int i = 0;
303
304	<	if (IsNeedIdentd(aconf))
304	>	if (IsNeedIdentd(conf))
305		{
306	<	ServerStats->is_ref++;
307	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
308	<	"identd to use this server", me.name, source_p->name);
306	>	++ServerStats.is_ref;
307	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
308	>	"identd to use this server");
309		exit_client(source_p, &me, "Install identd");
310		return;
311		}
312
313	<	p = username;
313	>	strlcpy(username, source_p->username, sizeof(username));
314
315	<	if (!IsNoTilde(aconf))
315	>	if (!IsNoTilde(conf))
316		source_p->username[i++] = '~';
317
318	<	while (*p && i < USERLEN)
353	<	{
318	>	for (; *p && i < USERLEN; ++p)
319		if (*p != '[')
320		source_p->username[i++] = *p;
356	–	p++;
357	–	}
321
322		source_p->username[i] = '\0';
323		}
324
325		/* password check */
326	<	if (!EmptyString(aconf->passwd))
326	>	if (!EmptyString(conf->passwd))
327		{
328		const char *pass = source_p->localClient->passwd;
329
330	<	if (!match_conf_password(pass, aconf))
330	>	if (!match_conf_password(pass, conf))
331		{
332	<	ServerStats->is_ref++;
333	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
334	<	me.name, source_p->name);
332	>	++ServerStats.is_ref;
333	>
334	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
335		exit_client(source_p, &me, "Bad Password");
336		return;
337		}
#	Line 380 | Line 343 | register_local_user(struct Client *clien
343		*/
344
345		/* report if user has &^>= etc. and set flags as needed in source_p */
346	<	report_and_set_user_flags(source_p, aconf);
346	>	report_and_set_user_flags(source_p, conf);
347	>
348	>	if (IsDead(source_p))
349	>	return;
350
351		/* Limit clients -
352		* We want to be able to have servers and F-line clients
#	Line 393 | Line 359 | register_local_user(struct Client *clien
359		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
360		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
361		{
362	<	sendto_realops_flags(UMODE_FULL, L_ALL,
362	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
363		"Too many clients, rejecting %s[%s].",
364	<	nick, source_p->host);
365	<	ServerStats->is_ref++;
364	>	source_p->name, source_p->host);
365	>	++ServerStats.is_ref;
366		exit_client(source_p, &me, "Sorry, server is full - try later");
367		return;
368		}
369
370		/* valid user name check */
371	<	if (valid_username(source_p->username) == 0)
371	>	if (!valid_username(source_p->username, 1))
372		{
373		char tmpstr2[IRCD_BUFSIZE];
374
375	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
376	<	nick, source_p->username, source_p->host);
377	<	ServerStats->is_ref++;
378	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
375	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
376	>	"Invalid username: %s (%s@%s)",
377	>	source_p->name, source_p->username, source_p->host);
378	>	++ServerStats.is_ref;
379	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
380	>	source_p->username);
381		exit_client(source_p, &me, tmpstr2);
382		return;
383		}
384
417	–	assert(source_p == client_p);
418	–
385		if (check_xline(source_p))
386		return;
387
388	<	if (IsDead(client_p))
389	<	return;
424	<
425	<	if (me.id[0])
426	<	{
427	<	const char *id = execute_callback(uid_get_cb, source_p);
388	>	while (hash_find_id((id = uid_get())) != NULL)
389	>	;
390
391	<	while (hash_find_id(id) != NULL)
392	<	id = uid_get(NULL);
391	>	strlcpy(source_p->id, id, sizeof(source_p->id));
392	>	hash_add_id(source_p);
393
394	<	strlcpy(source_p->id, id, sizeof(source_p->id));
395	<	hash_add_id(source_p);
396	<	}
435	<
436	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
437	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
438	<	nick, source_p->username, source_p->host,
394	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
395	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
396	>	source_p->name, source_p->username, source_p->host,
397		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
398		"255.255.255.255" : source_p->sockhost,
399	<	get_client_class(source_p),
400	<	source_p->info);
443	<
444	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
445	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
446	<	nick, source_p->username, source_p->host,
447	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
448	<	"255.255.255.255" : source_p->sockhost,
449	<	get_client_class(source_p),
450	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
451	<	"<hidden>" : source_p->client_host,
452	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
453	<	"<hidden>" : source_p->client_server,
454	<	source_p->info);
455	<
456	<
457	<	/* If they have died in send_* don't do anything. */
458	<	if (IsDead(source_p))
459	<	return;
399	>	get_client_class(&source_p->localClient->confs),
400	>	source_p->info, source_p->id);
401
402		if (ConfigFileEntry.invisible_on_connect)
403		{
404	<	source_p->umodes |= UMODE_INVISIBLE;
405	<	Count.invisi++;
404	>	AddUMode(source_p, UMODE_INVISIBLE);
405	>	++Count.invisi;
406		}
407
408	<	if ((++Count.local) > Count.max_loc)
408	>	if (++Count.local > Count.max_loc)
409		{
410		Count.max_loc = Count.local;
411
412		if (!(Count.max_loc % 10))
413	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
413	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
414	>	"New Max Local Clients: %d",
415		Count.max_loc);
416		}
417
476	–	SetClient(source_p);
477	–
478	–	source_p->servptr = &me;
479	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
480	–
418		/* Increment our total user count here */
419		if (++Count.total > Count.max_tot)
420		Count.max_tot = Count.total;
421	<	Count.totalrestartcount++;
421	>	++Count.totalrestartcount;
422	>
423	>	assert(source_p->servptr == &me);
424	>	SetClient(source_p);
425	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
426
427		source_p->localClient->allow_read = MAX_FLOOD_BURST;
428
429	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
430	<	{
431	<	free_dlink_node(m);
432	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
492	<	}
493	<	else assert(0);
429	>	assert(dlinkFind(&unknown_list, source_p));
430	>
431	>	dlink_move_node(&source_p->localClient->lclient_node,
432	>	&unknown_list, &local_client_list);
433
434		user_welcome(source_p);
435		add_user_host(source_p->username, source_p->host, 0);
436		SetUserHost(source_p);
437
438	<	introduce_client(client_p, source_p);
438	>	introduce_client(source_p);
439		}
440
441		/* register_remote_user()
442		*
443	<	* inputs       - client_p directly connected client
505	<	*              - source_p remote or directly connected client
443	>	* inputs       - source_p remote or directly connected client
444		*              - username to register as
445		*              - host name to register as
446		*              - server name
509	–	*              - realname (gecos)
447		* output       - NONE
448		* side effects - This function is called when a remote client
449		*                is introduced by a server.
450		*/
451		void
452	<	register_remote_user(struct Client *client_p, struct Client *source_p,
453	<	const char *username, const char *host, const char *server,
517	<	const char *realname)
452	>	register_remote_user(struct Client *source_p, const char *username,
453	>	const char *host, const char *server)
454		{
455		struct Client *target_p = NULL;
456
457		assert(source_p != NULL);
458		assert(source_p->username != username);
459
460	<	strlcpy(source_p->host, host, sizeof(source_p->host));
525	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
460	>	strlcpy(source_p->host, host, sizeof(source_p->host));
461		strlcpy(source_p->username, username, sizeof(source_p->username));
462
463		/*
464		* coming from another server, take the servers word for it
465		*/
466	<	source_p->servptr = find_server(server);
466	>	source_p->servptr = hash_find_server(server);
467
468	<	/* Super GhostDetect:
468	>	/*
469	>	* Super GhostDetect:
470		* If we can't find the server the user is supposed to be on,
471		* then simply blow the user away.        -Taner
472		*/
473		if (source_p->servptr == NULL)
474		{
475	<	sendto_realops_flags(UMODE_ALL, L_ALL,
475	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
476		"No server %s for user %s[%s@%s] from %s",
477		server, source_p->name, source_p->username,
478		source_p->host, source_p->from->name);
479	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
479	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
480
481	<	SetKilled(source_p);
481	>	AddFlag(source_p, FLAGS_KILLED);
482		exit_client(source_p, &me, "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,
493	>	kill_client(source_p->from, 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);
496	>	AddFlag(source_p, FLAGS_KILLED);
497		exit_client(source_p, &me, "USER server wrong direction");
498		return;
499		}
500
501	+	/*
502	+	* If the nick has been introduced by a services server,
503	+	* make it a service as well.
504	+	*/
505	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
506	+	AddFlag(source_p, FLAGS_SERVICE);
507	+
508		/* Increment our total user count here */
509		if (++Count.total > Count.max_tot)
510		Count.max_tot = Count.total;
#	Line 571 | Line 514 | register_remote_user(struct Client *clie
514		add_user_host(source_p->username, source_p->host, 1);
515		SetUserHost(source_p);
516
517	<	introduce_client(client_p, source_p);
517	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
518	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
519	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
520	>	source_p->servptr->name,
521	>	source_p->name, source_p->username, source_p->host,
522	>	source_p->info, source_p->id);
523	>
524	>	introduce_client(source_p);
525		}
526
527		/* introduce_client()
528		*
529	<	* inputs       - client_p
580	<	*              - source_p
529	>	* inputs       - source_p
530		* output       - NONE
531		* side effects - This common function introduces a client to the rest
532		*                of the net, either from a local client connect or
533		*                from a remote connect.
534		*/
535		static void
536	<	introduce_client(struct Client *client_p, struct Client *source_p)
536	>	introduce_client(struct Client *source_p)
537		{
538		dlink_node *server_node = NULL;
539	<	static char ubuf[12];
539	>	char ubuf[IRCD_BUFSIZE];
540
541		if (MyClient(source_p))
542		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 596 | Line 545 | introduce_client(struct Client *client_p
545
546		watch_check_hash(source_p, RPL_LOGON);
547
548	<	if (*ubuf == '\0')
548	>	if (ubuf[0] == '\0')
549		{
550		ubuf[0] = '+';
551		ubuf[1] = '\0';
#	Line 606 | Line 555 | introduce_client(struct Client *client_p
555		{
556		struct Client *server = server_node->data;
557
558	<	if (server == client_p)
558	>	if (server == source_p->from)
559		continue;
560
561	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
562	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
561	>	if (IsCapable(server, CAP_SVS))
562	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
563		source_p->servptr->id,
564		source_p->name, source_p->hopcount+1,
565		(unsigned long)source_p->tsinfo,
566		ubuf, source_p->username, source_p->host,
567		(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	<	"0" : source_p->sockhost, source_p->id, source_p->info);
568	>	"0" : source_p->sockhost, source_p->id,
569	>	source_p->svid,
570	>	source_p->info);
571		else
572	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
572	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	>	source_p->servptr->id,
574		source_p->name, source_p->hopcount+1,
575		(unsigned long)source_p->tsinfo,
576		ubuf, source_p->username, source_p->host,
577	<	source_p->servptr->name, source_p->info);
577	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	>	"0" : source_p->sockhost, source_p->id, source_p->info);
579	>
580	>	if (!EmptyString(source_p->certfp))
581	>	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582		}
583		}
584
#	Line 642 | Line 598 | valid_hostname(const char *hostname)
598
599		assert(p != NULL);
600
601	<	if ('.' == *p || ':' == *p)
601	>	if (EmptyString(p) || *p == '.' || *p == ':')
602		return 0;
603
604	<	while (*p)
649	<	{
604	>	for (; *p; ++p)
605		if (!IsHostChar(*p))
606		return 0;
652	–	p++;
653	–	}
607
608	<	return 1;
608	>	return p - hostname <= HOSTLEN;
609		}
610
611		/* valid_username()
#	Line 667 | Line 620 | valid_hostname(const char *hostname)
620		* style of username
621		*/
622		int
623	<	valid_username(const char *username)
623	>	valid_username(const char *username, const int local)
624		{
625		int dots      = 0;
626		const char *p = username;
627
628		assert(p != NULL);
629
630	<	if ('~' == *p)
630	>	if (*p == '~')
631		++p;
632
633	<	/* reject usernames that don't start with an alphanum
633	>	/*
634	>	* Reject usernames that don't start with an alphanum
635		* i.e. reject jokers who have '-@somehost' or '.@somehost'
636		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
637		*/
638		if (!IsAlNum(*p))
639		return 0;
640
641	<	while (*++p)
641	>	if (local)
642		{
643	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
643	>	while (*++p)
644		{
645	<	dots++;
646	<
647	<	if (dots > ConfigFileEntry.dots_in_ident)
648	<	return 0;
649	<	if (!IsUserChar(p[1]))
645	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
646	>	{
647	>	if (++dots > ConfigFileEntry.dots_in_ident)
648	>	return 0;
649	>	if (!IsUserChar(*(p + 1)))
650	>	return 0;
651	>	}
652	>	else if (!IsUserChar(*p))
653		return 0;
654		}
698	–	else if (!IsUserChar(*p))
699	–	return 0;
655		}
656	+	else
657	+	{
658	+	while (*++p)
659	+	if (!IsUserChar(*p))
660	+	return 0;
661	+	}
662	+
663	+	return  p - username <= USERLEN;;
664	+	}
665	+
666	+	/* clean_nick_name()
667	+	*
668	+	* input        - nickname
669	+	*              - whether it's a local nick (1) or remote (0)
670	+	* output       - none
671	+	* side effects - walks through the nickname, returning 0 if erroneous
672	+	*/
673	+	int
674	+	valid_nickname(const char *nickname, const int local)
675	+	{
676	+	const char *p = nickname;
677	+	assert(nickname && *nickname);
678	+
679	+	/* nicks can't start with a digit or - or be 0 length */
680	+	/* This closer duplicates behaviour of hybrid-6 */
681	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
682	+	return 0;
683	+
684	+	for (; *p; ++p)
685	+	if (!IsNickChar(*p))
686	+	return 0;
687
688	<	return 1;
688	>	return p - nickname <= NICKLEN;
689		}
690
691		/* report_and_set_user_flags()
692		*
693		* inputs       - pointer to source_p
694	<	*              - pointer to aconf for this user
694	>	*              - pointer to conf for this user
695		* output       - NONE
696		* side effects - Report to user any special flags
697		*                they are getting, and set them.
698		*/
699		static void
700	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
700	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
701		{
702		/* If this user is being spoofed, tell them so */
703	<	if (IsConfDoSpoofIp(aconf))
704	<	{
719	<	sendto_one(source_p,
720	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
721	<	me.name, source_p->name);
722	<	}
703	>	if (IsConfDoSpoofIp(conf))
704	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705
706		/* If this user is in the exception class, Set it "E lined" */
707	<	if (IsConfExemptKline(aconf))
707	>	if (IsConfExemptKline(conf))
708		{
709		SetExemptKline(source_p);
710	<	sendto_one(source_p,
729	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
730	<	me.name, source_p->name);
710	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711		}
712
713	<	/* The else here is to make sure that G line exempt users
713	>	/*
714	>	* The else here is to make sure that G line exempt users
715		* do not get noticed twice.
716		*/
717	<	else if (IsConfExemptGline(aconf))
717	>	else if (IsConfExemptGline(conf))
718		{
719		SetExemptGline(source_p);
720	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
740	<	me.name, source_p->name);
720	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721		}
722
723	<	if (IsConfExemptResv(aconf))
723	>	if (IsConfExemptResv(conf))
724		{
725		SetExemptResv(source_p);
726	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
747	<	me.name, source_p->name);
726	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727		}
728
729		/* If this user is exempt from user limits set it "F lined" */
730	<	if (IsConfExemptLimits(aconf))
730	>	if (IsConfExemptLimits(conf))
731		{
732		SetExemptLimits(source_p);
733	<	sendto_one(source_p,
755	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
756	<	me.name,source_p->name);
757	<	}
758	<
759	<	/* If this user is exempt from idle time outs */
760	<	if (IsConfIdlelined(aconf))
761	<	{
762	<	SetIdlelined(source_p);
763	<	sendto_one(source_p,
764	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
765	<	me.name, source_p->name);
733	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734		}
735
736	<	if (IsConfCanFlood(aconf))
736	>	if (IsConfCanFlood(conf))
737		{
738		SetCanFlood(source_p);
739	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
740	<	"protection, aren't you fearsome.",
773	<	me.name, source_p->name);
774	<	}
775	<	}
776	<
777	<	/* do_local_user()
778	<	*
779	<	* inputs       -
780	<	* output       - NONE
781	<	* side effects -
782	<	*/
783	<	void
784	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
785	<	const char *username, const char *host, const char *server,
786	<	const char *realname)
787	<	{
788	<	assert(source_p != NULL);
789	<	assert(source_p->username != username);
790	<
791	<	if (source_p == NULL)
792	<	return;
793	<
794	<	if (!IsUnknown(source_p))
795	<	{
796	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
797	<	me.name, nick);
798	<	return;
799	<	}
800	<
801	<	source_p->localClient->registration &= ~REG_NEED_USER;
802	<
803	<	/*
804	<	* don't take the clients word for it, ever
805	<	*/
806	<	source_p->servptr = &me;
807	<
808	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
809	<
810	<	/* stash for later */
811	<	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
812	<	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
813	<
814	<	if (!IsGotId(source_p))
815	<	{
816	<	/* save the username in the client
817	<	* If you move this you'll break ping cookies..you've been warned
818	<	*/
819	<	strlcpy(source_p->username, username, sizeof(source_p->username));
739	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	>	"protection, aren't you fearsome.");
741		}
821	–
822	–	if (!source_p->localClient->registration)
823	–	/* NICK already received, now I have USER... */
824	–	register_local_user(client_p, source_p, source_p->name, username);
825	–	}
826	–
827	–	/* change_simple_umode()
828	–	*
829	–	* this callback can be hooked to allow special handling of
830	–	* certain usermodes
831	–	*/
832	–	static void *
833	–	change_simple_umode(va_list args)
834	–	{
835	–	struct Client *client_p;
836	–	struct Client *source_p;
837	–	int what;
838	–	unsigned int flag;
839	–
840	–	client_p = va_arg(args, struct Client *);
841	–	source_p = va_arg(args, struct Client *);
842	–	what = va_arg(args, int);
843	–	flag = va_arg(args, unsigned int);
844	–
845	–	if (what == MODE_ADD)
846	–	source_p->umodes |= flag;
847	–	else
848	–	source_p->umodes &= ~flag;
849	–
850	–	return NULL;
742		}
743
744		/* set_user_mode()
#	Line 859 | Line 750 | change_simple_umode(va_list args)
750		*/
751		void
752		set_user_mode(struct Client *client_p, struct Client *source_p,
753	<	int parc, char *parv[])
753	>	const int parc, char *parv[])
754		{
755		unsigned int flag, setflags;
756		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 871 | Line 762 | set_user_mode(struct Client *client_p, s
762		if ((target_p = find_person(client_p, parv[1])) == NULL)
763		{
764		if (MyConnect(source_p))
765	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
875	<	me.name, source_p->name, parv[1]);
765	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
766		return;
767		}
768
769	<	if (IsServer(source_p))
769	>	if (source_p != target_p)
770		{
771	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
882	<	parv[1], source_p->name);
883	<	return;
884	<	}
885	<
886	<	if (source_p != target_p || target_p->from != source_p->from)
887	<	{
888	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
889	<	me.name, source_p->name);
771	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
772		return;
773		}
774
#	Line 895 | Line 777 | set_user_mode(struct Client *client_p, s
777		m = buf;
778		*m++ = '+';
779
780	<	for (i = 0; i < 128; i++)
781	<	if (source_p->umodes & user_modes[i])
780	>	for (i = 0; i < 128; ++i)
781	>	if (HasUMode(source_p, user_modes[i]))
782		*m++ = (char)i;
783		*m = '\0';
784
785	<	sendto_one(source_p, form_str(RPL_UMODEIS),
904	<	me.name, source_p->name, buf);
785	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
786		return;
787		}
788
908	–	execute_callback(entering_umode_cb, client_p, source_p);
909	–
789		/* find flags already set for user */
790		setflags = source_p->umodes;
791
792		/* parse mode change string(s) */
793	<	for (p = &parv[2]; p && *p; p++)
793	>	for (p = &parv[2]; p && *p; ++p)
794		{
795	<	for (m = *p; *m; m++)
795	>	for (m = *p; *m; ++m)
796		{
797		switch (*m)
798		{
#	Line 926 | Line 805 | set_user_mode(struct Client *client_p, s
805		case 'o':
806		if (what == MODE_ADD)
807		{
808	<	if (IsServer(client_p) && !IsOper(source_p))
808	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
809		{
810		++Count.oper;
811		SetOper(source_p);
#	Line 934 | Line 813 | set_user_mode(struct Client *client_p, s
813		}
814		else
815		{
816	<	/* Only decrement the oper counts if an oper to begin with
938	<	* found by Pat Szuta, Perly , perly@xnet.com
939	<	*/
940	<	if (!IsOper(source_p))
816	>	if (!HasUMode(source_p, UMODE_OPER))
817		break;
818
819		ClearOper(source_p);
944	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
820		Count.oper--;
821
822		if (MyConnect(source_p))
823		{
824	<	dlink_node *dm;
824	>	dlink_node *dm = NULL;
825
826	<	detach_conf(source_p, OPER_TYPE);
827	<	ClearOperFlags(source_p);
826	>	detach_conf(source_p, CONF_OPER);
827	>	ClrOFlag(source_p);
828	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
829
830		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
831		free_dlink_node(dm);
#	Line 958 | Line 834 | set_user_mode(struct Client *client_p, s
834
835		break;
836
837	<	/* we may not get these,
838	<	* but they shouldnt be in default
839	<	*/
840	<	case ' ' :
965	<	case '\n':
966	<	case '\r':
967	<	case '\t':
837	>	case 'S':  /* Only servers may set +S in a burst */
838	>	case 'W':  /* Only servers may set +W in a burst */
839	>	case 'r':  /* Only services may set +r */
840	>	case 'x':  /* Only services may set +x */
841		break;
842
843		default:
844		if ((flag = user_modes[(unsigned char)*m]))
845		{
846	<	if (MyConnect(source_p) && !IsOper(source_p) &&
846	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
847		(ConfigFileEntry.oper_only_umodes & flag))
975	–	{
848		badflag = 1;
977	–	}
849		else
850	<	execute_callback(umode_cb, client_p, source_p, what, flag);
851	<	}
852	<	else
853	<	{
854	<	if (MyConnect(source_p))
855	<	badflag = 1;
850	>	{
851	>	if (what == MODE_ADD)
852	>	AddUMode(source_p, flag);
853	>	else
854	>	DelUMode(source_p, flag);
855	>	}
856		}
857	+	else if (MyConnect(source_p))
858	+	badflag = 1;
859
860		break;
861		}
#	Line 990 | Line 863 | set_user_mode(struct Client *client_p, s
863		}
864
865		if (badflag)
866	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
994	<	me.name, source_p->name);
995	<
996	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
997	<	{
998	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
999	<	me.name, source_p->name);
1000	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1001	<	}
866	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
867
868	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
869	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
868	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
869	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
870		{
871	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
872	<	me.name, source_p->name);
1008	<	source_p->umodes &= ~UMODE_ADMIN;
871	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
872	>	DelUMode(source_p, UMODE_ADMIN);
873		}
874
875	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
875	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
876		++Count.invisi;
877	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
877	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
878		--Count.invisi;
879
880		/*
#	Line 1035 | Line 899 | void
899		send_umode(struct Client *client_p, struct Client *source_p,
900		unsigned int old, unsigned int sendmask, char *umode_buf)
901		{
902	+	char *m = umode_buf;
903		int what = 0;
904		unsigned int i;
905		unsigned int flag;
1041	–	char *m = umode_buf;
906
907		/*
908		* build a string in umode_buf to represent the change in the user's
909		* mode between the new (source_p->umodes) and 'old'.
910		*/
911	<	for (i = 0; i < 128; i++)
911	>	for (i = 0; i < 128; ++i)
912		{
913		flag = user_modes[i];
914		if (!flag)
#	Line 1053 | Line 917 | send_umode(struct Client *client_p, stru
917		if (MyClient(source_p) && !(flag & sendmask))
918		continue;
919
920	<	if ((flag & old) && !(source_p->umodes & flag))
920	>	if ((flag & old) && !HasUMode(source_p, flag))
921		{
922		if (what == MODE_DEL)
923		*m++ = (char)i;
#	Line 1064 | Line 928 | send_umode(struct Client *client_p, stru
928		*m++ = (char)i;
929		}
930		}
931	<	else if (!(flag & old) && (source_p->umodes & flag))
931	>	else if (!(flag & old) && HasUMode(source_p, flag))
932		{
933		if (what == MODE_ADD)
934		*m++ = (char)i;
#	Line 1098 | Line 962 | send_umode_out(struct Client *client_p,
962		char buf[IRCD_BUFSIZE] = { '\0' };
963		dlink_node *ptr = NULL;
964
965	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1102	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
965	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
966
967		if (buf[0])
968		{
#	Line 1118 | Line 981 | send_umode_out(struct Client *client_p,
981		send_umode(client_p, source_p, old, 0xffffffff, buf);
982		}
983
984	+	void
985	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
986	+	{
987	+	dlink_node *ptr = NULL;
988	+
989	+	if (!strcmp(target_p->host, hostname))
990	+	return;
991	+
992	+	switch (what)
993	+	{
994	+	case MODE_ADD:
995	+	AddUMode(target_p, UMODE_HIDDENHOST);
996	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
997	+	break;
998	+	case MODE_DEL:
999	+	DelUMode(target_p, UMODE_HIDDENHOST);
1000	+
1001	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1002	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1003	+	break;
1004	+	default: return;
1005	+	}
1006	+
1007	+	if (ConfigFileEntry.cycle_on_host_change)
1008	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1009	+	target_p->name, target_p->username, target_p->host);
1010	+
1011	+	if (IsUserHostIp(target_p))
1012	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1013	+
1014	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1015	+
1016	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1017	+	SetUserHost(target_p);
1018	+
1019	+	if (MyClient(target_p))
1020	+	{
1021	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1022	+	clear_ban_cache_client(target_p);
1023	+	}
1024	+
1025	+	if (!ConfigFileEntry.cycle_on_host_change)
1026	+	return;
1027	+
1028	+	DLINK_FOREACH(ptr, target_p->channel.head)
1029	+	{
1030	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1031	+	char *p = modebuf;
1032	+	int len = 0;
1033	+	const struct Membership *ms = ptr->data;
1034	+
1035	+	if (has_member_flags(ms, CHFL_CHANOP))
1036	+	{
1037	+	*p++ = 'o';
1038	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1039	+	}
1040	+
1041	+	if (has_member_flags(ms, CHFL_HALFOP))
1042	+	{
1043	+	*p++ = 'h';
1044	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1045	+	}
1046	+
1047	+	if (has_member_flags(ms, CHFL_VOICE))
1048	+	{
1049	+	*p++ = 'v';
1050	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1051	+	}
1052	+
1053	+	*p = '\0';
1054	+
1055	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1056	+	target_p->name, target_p->username, target_p->host,
1057	+	ms->chptr->chname);
1058	+	if (nickbuf[0])
1059	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1060	+	target_p->servptr->name, ms->chptr->chname,
1061	+	modebuf, nickbuf);
1062	+
1063	+	}
1064	+
1065	+	if (target_p->away[0])
1066	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1067	+	":%s!%s@%s AWAY :%s",
1068	+	target_p->name, target_p->username,
1069	+	target_p->host, target_p->away);
1070	+	}
1071	+
1072		/* user_welcome()
1073		*
1074		* inputs       - client pointer to client to welcome
#	Line 1134 | Line 1085 | user_welcome(struct Client *source_p)
1085		#endif
1086
1087		#ifdef HAVE_LIBCRYPTO
1088	<	if (source_p->localClient->fd.ssl != NULL)
1089	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1090	<	me.name, source_p->name,
1091	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1088	>	if (HasFlag(source_p, FLAGS_SSL))
1089	>	{
1090	>	AddUMode(source_p, UMODE_SSL);
1091	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1092	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	>	}
1094		#endif
1095
1096	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1097	<	ServerInfo.network_name, source_p->name);
1098	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1099	<	get_listener_name(source_p->localClient->listener), ircd_version);
1100	<	sendto_one(source_p, form_str(RPL_CREATED),
1101	<	me.name, source_p->name, built_date);
1149	<	sendto_one(source_p, form_str(RPL_MYINFO),
1150	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1096	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1097	>	source_p->name);
1098	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1099	>	get_listener_name(source_p->localClient->listener), ircd_version);
1100	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1101	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1102		show_isupport(source_p);
1103
1104		if (source_p->id[0] != '\0')
1105	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1155	<	source_p->name, source_p->id);
1105	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1106
1107		show_lusers(source_p);
1108	<
1159	<	if (ConfigFileEntry.short_motd)
1160	<	{
1161	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1162	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1163	<	sendto_one(source_p,
1164	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1165	<	"read it", source_p->name);
1166	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1167	<	me.name, source_p->name, me.name);
1168	<	sendto_one(source_p, form_str(RPL_MOTD),
1169	<	me.name, source_p->name,
1170	<	"*** This is the short motd ***");
1171	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1172	<	me.name, source_p->name);
1173	<	}
1174	<	else
1175	<	send_message_file(source_p, &ConfigFileEntry.motd);
1108	>	motd_signon(source_p);
1109		}
1110
1111		/* check_xline()
#	Line 1184 | Line 1117 | user_welcome(struct Client *source_p)
1117		static int
1118		check_xline(struct Client *source_p)
1119		{
1120	<	struct ConfItem *conf = NULL;
1120	>	struct MaskItem *conf = NULL;
1121		const char *reason = NULL;
1122
1123	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1191	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1123	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1124		{
1125	<	struct MatchItem *reg = map_to_conf(conf);
1194	<
1195	<	++reg->count;
1125	>	++conf->count;
1126
1127	<	if (reg->reason != NULL)
1128	<	reason = reg->reason;
1127	>	if (conf->reason != NULL)
1128	>	reason = conf->reason;
1129		else
1130		reason = "No Reason";
1131
1132	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1132	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1133		"X-line Rejecting [%s] [%s], user %s [%s]",
1134		source_p->info, reason,
1135		get_client_name(source_p, HIDE_IP),
1136		source_p->sockhost);
1137
1138	<	ServerStats->is_ref++;
1139	<	if (REJECT_HOLD_TIME > 0)
1210	<	{
1211	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1212	<	me.name, source_p->name);
1213	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1214	<	SetCaptured(source_p);
1215	<	}
1216	<	else
1217	<	exit_client(source_p, &me, "Bad user info");
1138	>	++ServerStats.is_ref;
1139	>	exit_client(source_p, &me, "Bad user info");
1140		return 1;
1141		}
1142
#	Line 1225 | Line 1147 | check_xline(struct Client *source_p)
1147		*
1148		* inputs       - pointer to given client to oper
1149		* output       - NONE
1150	<	* side effects - Blindly opers up given source_p, using aconf info
1150	>	* side effects - Blindly opers up given source_p, using conf info
1151		*                all checks on passwords have already been done.
1152	<	*                This could also be used by rsa oper routines.
1152	>	*                This could also be used by rsa oper routines.
1153		*/
1154		void
1155		oper_up(struct Client *source_p)
1156		{
1157	<	unsigned int old = source_p->umodes;
1158	<	const char *operprivs = "";
1237	<	const struct AccessItem *oconf = NULL;
1157	>	const unsigned int old = source_p->umodes;
1158	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1159
1160		assert(source_p->localClient->confs.head);
1240	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1161
1162		++Count.oper;
1163		SetOper(source_p);
1164
1165	<	if (oconf->modes)
1166	<	source_p->umodes |= oconf->modes;
1165	>	if (conf->modes)
1166	>	AddUMode(source_p, conf->modes);
1167		else if (ConfigFileEntry.oper_umodes)
1168	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1249	<	else
1250	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1251	<	UMODE_WALLOP|UMODE_LOCOPS);
1168	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1169
1170	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1170	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1171		++Count.invisi;
1172	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1172	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1173		--Count.invisi;
1174
1175		assert(dlinkFind(&oper_list, source_p) == NULL);
1176		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1177
1178	<	operprivs = oper_privs_as_string(oconf->port);
1178	>	AddOFlag(source_p, conf->port);
1179
1180	<	SetOFlag(source_p, oconf->port);
1180	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1181	>	AddUMode(source_p, UMODE_ADMIN);
1182
1183	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1184	<	source_p->umodes |= UMODE_ADMIN;
1267	<	if (!IsOperN(source_p))
1268	<	source_p->umodes &= ~UMODE_NCHANGE;
1269	<
1270	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1271	<	source_p->name, source_p->username, source_p->host);
1183	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1184	>	get_oper_name(source_p));
1185		send_umode_out(source_p, source_p, old);
1186	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1274	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1275	<	me.name, source_p->name, operprivs);
1276	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1186	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1187		}
1188
1189		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1281 | Line 1191 | static char new_uid[TOTALSIDUID + 1];
1191		int
1192		valid_sid(const char *sid)
1193		{
1284	–
1194		if (strlen(sid) == IRC_MAXSID)
1195		if (IsDigit(*sid))
1196		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1292 | Line 1201 | valid_sid(const char *sid)
1201
1202		/*
1203		* init_uid()
1204	<	*
1204	>	*
1205		* inputs       - NONE
1206		* output       - NONE
1207		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1302 | Line 1211 | valid_sid(const char *sid)
1211		void
1212		init_uid(void)
1213		{
1214	<	int i;
1214	>	unsigned int i;
1215
1216		memset(new_uid, 0, sizeof(new_uid));
1217
1218	<	if (ServerInfo.sid != NULL)
1310	<	{
1218	>	if (!EmptyString(ServerInfo.sid))
1219		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1312	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1313	–
1314	–	hash_add_id(&me);
1315	–	}
1220
1221	<	for (i = 0; i < IRC_MAXSID; i++)
1222	<	if (new_uid[i] == '\0')
1221	>	for (i = 0; i < IRC_MAXSID; ++i)
1222	>	if (new_uid[i] == '\0')
1223		new_uid[i] = 'A';
1224
1225		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1322	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1323	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1324	–	* -Dianora
1325	–	*/
1226		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1327	–
1328	–	entering_umode_cb = register_callback("entering_umode", NULL);
1329	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1330	–	uid_get_cb = register_callback("uid_get", uid_get);
1227		}
1228
1229		/*
#	Line 1370 | Line 1266 | add_one_to_uid(int i)
1266		* output       - new UID is returned to caller
1267		* side effects - new_uid is incremented by one.
1268		*/
1269	<	static void *
1270	<	uid_get(va_list args)
1269	>	static const char *
1270	>	uid_get(void)
1271		{
1272		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1273		return new_uid;
#	Line 1387 | Line 1283 | uid_get(va_list args)
1283		void
1284		init_isupport(void)
1285		{
1390	–	isupportFile = init_MessageLine();
1391	–
1286		add_isupport("CALLERID", NULL, -1);
1287		add_isupport("CASEMAPPING", CASEMAP, -1);
1288		add_isupport("DEAF", "D", -1);
1289		add_isupport("KICKLEN", NULL, KICKLEN);
1290		add_isupport("MODES", NULL, MAXMODEPARAMS);
1397	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1291		#ifdef HALFOPS
1292		add_isupport("PREFIX", "(ohv)@%+", -1);
1293		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1402 | Line 1295 | init_isupport(void)
1295		add_isupport("PREFIX", "(ov)@+", -1);
1296		add_isupport("STATUSMSG", "@+", -1);
1297		#endif
1298	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1298	>	add_isupport("EXCEPTS", "e", -1);
1299	>	add_isupport("INVEX", "I", -1);
1300		}
1301
1302		/*
#	Line 1437 | Line 1331 | add_isupport(const char *name, const cha
1331		dlinkAddTail(support, &support->node, &support_list);
1332		}
1333
1334	<	DupString(support->name, name);
1334	>	support->name = xstrdup(name);
1335		if (options != NULL)
1336	<	DupString(support->options, options);
1336	>	support->options = xstrdup(options);
1337		support->number = n;
1338
1339		rebuild_isupport_message_line();
#	Line 1486 | Line 1380 | rebuild_isupport_message_line(void)
1380		{
1381		char isupportbuffer[IRCD_BUFSIZE];
1382		char *p = isupportbuffer;
1383	<	dlink_node *ptr = NULL;
1383	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1384		int n = 0;
1385		int tokens = 0;
1386		size_t len = 0;
1387	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1387	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1388
1389	<	destroy_MessageLine(isupportFile);
1389	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1390	>	{
1391	>	dlinkDelete(ptr, &support_list_lines);
1392	>	MyFree(ptr->data);
1393	>	free_dlink_node(ptr);
1394	>	}
1395
1396		DLINK_FOREACH(ptr, support_list.head)
1397		{
1398		struct Isupport *support = ptr->data;
1399
1400	<	p += (n = ircsprintf(p, "%s", support->name));
1400	>	p += (n = sprintf(p, "%s", support->name));
1401		len += n;
1402
1403		if (support->options != NULL)
1404		{
1405	<	p += (n = ircsprintf(p, "=%s", support->options));
1405	>	p += (n = sprintf(p, "=%s", support->options));
1406		len += n;
1407		}
1408
1409		if (support->number > 0)
1410		{
1411	<	p += (n = ircsprintf(p, "=%d", support->number));
1411	>	p += (n = sprintf(p, "=%d", support->number));
1412		len += n;
1413		}
1414
#	Line 1522 | Line 1421 | rebuild_isupport_message_line(void)
1421		if (*--p == ' ')
1422		*p = '\0';
1423
1424	<	addto_MessageLine(isupportFile, isupportbuffer);
1424	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1425		p = isupportbuffer;
1426		len = 0;
1427		n = tokens = 0;
#	Line 1533 | Line 1432 | rebuild_isupport_message_line(void)
1432		{
1433		if (*--p == ' ')
1434		*p = '\0';
1435	<	addto_MessageLine(isupportFile, isupportbuffer);
1435	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1436		}
1437		}

Diff Legend

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