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

Diff Legend

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