ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2289 by michael, Wed Jun 19 10:32:20 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 3896 by michael, Fri Jun 6 19:08:47 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
43		#include "supported.h"
45	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
51	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51
52		static char umode_buffer[IRCD_BUFSIZE];
56	–
57	–	static void user_welcome(struct Client *);
58	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59	–	static int check_xline(struct Client *);
60	–	static void introduce_client(struct Client *);
53		static const char *uid_get(void);
54
55		/* Used for building up the isupport string,
56		* used with init_isupport, add_isupport, delete_isupport
57		*/
58	<
67	<	struct Isupport
58	>	struct Isupport
59		{
60		dlink_node node;
61		char *name;
#	Line 105 | Line 96 | const unsigned int user_modes[256] =
96		0,                  /* T */
97		0,                  /* U */
98		0,                  /* V */
99	<	0,                  /* W */
99	>	UMODE_WEBIRC,       /* W */
100		0,                  /* X */
101		0,                  /* Y */
102		0,                  /* Z 0x5A */
103	<	0, 0, 0, 0, 0,      /* 0x5F   */
103	>	0, 0, 0, 0, 0,      /* 0x5F   */
104		0,                  /* 0x60   */
105		UMODE_ADMIN,        /* a */
106		UMODE_BOTS,         /* b */
#	Line 126 | Line 117 | const unsigned int user_modes[256] =
117		0,                  /* m */
118		UMODE_NCHANGE,      /* n */
119		UMODE_OPER,         /* o */
120	<	0,                  /* p */
121	<	0,                  /* q */
120	>	UMODE_HIDECHANS,    /* p */
121	>	UMODE_HIDEIDLE,     /* q */
122		UMODE_REGISTERED,   /* r */
123		UMODE_SERVNOTICE,   /* s */
124		0,                  /* t */
#	Line 136 | Line 127 | const unsigned int user_modes[256] =
127		UMODE_WALLOP,       /* w */
128		UMODE_HIDDENHOST,   /* x */
129		UMODE_SPY,          /* y */
130	<	UMODE_OPERWALL,     /* z      0x7A */
130	>	0,                  /* z      0x7A */
131		0,0,0,0,0,          /* 0x7B - 0x7F */
132
133		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 169 | Line 160 | assemble_umode_buffer(void)
160		* side effects - display to client user counts etc.
161		*/
162		void
163	<	show_lusers(struct Client *source_p)
163	>	show_lusers(struct Client *source_p)
164		{
174	–	const char *from, *to;
175	–
176	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
177	–	{
178	–	from = me.id;
179	–	to = source_p->id;
180	–	}
181	–	else
182	–	{
183	–	from = me.name;
184	–	to = source_p->name;
185	–	}
186	–
165		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
166	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
167	<	from, to, (Count.total-Count.invisi),
190	<	Count.invisi, dlink_list_length(&global_serv_list));
166	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
167	>	Count.invisi, dlink_list_length(&global_serv_list));
168		else
169	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
170	<	(Count.total-Count.invisi), Count.invisi, 1);
169	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
170	>	(Count.total - Count.invisi), Count.invisi, 1);
171
172	<	if (Count.oper > 0)
173	<	sendto_one(source_p, form_str(RPL_LUSEROP),
174	<	from, to, Count.oper);
175	<
176	<	if (dlink_list_length(&unknown_list) > 0)
177	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
178	<	from, to, dlink_list_length(&unknown_list));
179	<
203	<	if (dlink_list_length(&global_channel_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
172	>	if (Count.oper)
173	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
174	>
175	>	if (dlink_list_length(&unknown_list))
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
177	>
178	>	if (dlink_list_length(&global_channel_list))
179	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
180
181		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
182		{
183	<	sendto_one(source_p, form_str(RPL_LUSERME),
184	<	from, to, Count.local, Count.myserver);
211	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
183	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
184	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
185		}
186		else
187		{
188	<	sendto_one(source_p, form_str(RPL_LUSERME),
189	<	from, to, Count.total, 0);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot);
188	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
189	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
190		}
191
192	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot);
192	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
193
194		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
195	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
196	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
195	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
196	>	Count.max_loc_cli, Count.totalrestartcount);
197
198		if (Count.local > Count.max_loc_cli)
199		Count.max_loc_cli = Count.local;
200
201		if ((Count.local + Count.myserver) > Count.max_loc_con)
202	<	Count.max_loc_con = Count.local + Count.myserver;
202	>	Count.max_loc_con = Count.local + Count.myserver;
203		}
204
205		/* show_isupport()
#	Line 240 | Line 209 | show_lusers(struct Client *source_p)
209		* side effects - display to client what we support (for them)
210		*/
211		void
212	<	show_isupport(struct Client *source_p)
212	>	show_isupport(struct Client *source_p)
213		{
214		const dlink_node *ptr = NULL;
215
216		DLINK_FOREACH(ptr, support_list_lines.head)
217	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	<	source_p->name, ptr->data);
217	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218		}
219
220	<	/*
221	<	** register_local_user
222	<	**      This function is called when both NICK and USER messages
223	<	**      have been accepted for the client, in whatever order. Only
224	<	**      after this, is the USER message propagated.
225	<	**
226	<	**      NICK's must be propagated at once when received, although
227	<	**      it would be better to delay them too until full info is
228	<	**      available. Doing it is not so simple though, would have
229	<	**      to implement the following:
230	<	**
231	<	**      (actually it has been implemented already for a while) -orabidoo
232	<	**
233	<	**      1) user telnets in and gives only "NICK foobar" and waits
234	<	**      2) another user far away logs in normally with the nick
235	<	**         "foobar" (quite legal, as this server didn't propagate
236	<	**         it).
237	<	**      3) now this server gets nick "foobar" from outside, but
238	<	**         has alread the same defined locally. Current server
239	<	**         would just issue "KILL foobar" to clean out dups. But,
240	<	**         this is not fair. It should actually request another
241	<	**         nick from local user or kill him/her...
242	<	*/
220	>
221	>	/* report_and_set_user_flags()
222	>	*
223	>	* inputs       - pointer to source_p
224	>	*              - pointer to conf for this user
225	>	* output       - NONE
226	>	* side effects - Report to user any special flags
227	>	*                they are getting, and set them.
228	>	*/
229	>	static void
230	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
231	>	{
232	>	/* If this user is being spoofed, tell them so */
233	>	if (IsConfDoSpoofIp(conf))
234	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
235	>
236	>	/* If this user is in the exception class, Set it "E lined" */
237	>	if (IsConfExemptKline(conf))
238	>	{
239	>	SetExemptKline(source_p);
240	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
241	>	}
242	>
243	>	/*
244	>	* The else here is to make sure that G line exempt users
245	>	* do not get noticed twice.
246	>	*/
247	>	else if (IsConfExemptGline(conf))
248	>	{
249	>	SetExemptGline(source_p);
250	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
251	>	}
252	>
253	>	if (IsConfExemptResv(conf))
254	>	{
255	>	SetExemptResv(source_p);
256	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
257	>	}
258	>
259	>	/* If this user is exempt from user limits set it "F lined" */
260	>	if (IsConfExemptLimits(conf))
261	>	{
262	>	SetExemptLimits(source_p);
263	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
264	>	}
265	>
266	>	if (IsConfCanFlood(conf))
267	>	{
268	>	SetCanFlood(source_p);
269	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
270	>	"protection, aren't you fearsome.");
271	>	}
272	>	}
273	>
274	>	/* introduce_client()
275	>	*
276	>	* inputs       - source_p
277	>	* output       - NONE
278	>	* side effects - This common function introduces a client to the rest
279	>	*                of the net, either from a local client connect or
280	>	*                from a remote connect.
281	>	*/
282	>	static void
283	>	introduce_client(struct Client *source_p)
284	>	{
285	>	dlink_node *ptr = NULL;
286	>	char ubuf[IRCD_BUFSIZE] = "";
287	>
288	>	if (MyClient(source_p))
289	>	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
290	>	else
291	>	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
292	>
293	>	watch_check_hash(source_p, RPL_LOGON);
294	>
295	>	if (ubuf[0] == '\0')
296	>	{
297	>	ubuf[0] = '+';
298	>	ubuf[1] = '\0';
299	>	}
300	>
301	>	DLINK_FOREACH(ptr, serv_list.head)
302	>	{
303	>	struct Client *server = ptr->data;
304	>
305	>	if (server == source_p->from)
306	>	continue;
307	>
308	>	if (IsCapable(server, CAP_SVS))
309	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
310	>	source_p->servptr->id,
311	>	source_p->name, source_p->hopcount+1,
312	>	(unsigned long)source_p->tsinfo,
313	>	ubuf, source_p->username, source_p->host,
314	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
315	>	"0" : source_p->sockhost, source_p->id,
316	>	source_p->svid,
317	>	source_p->info);
318	>	else
319	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
320	>	source_p->servptr->id,
321	>	source_p->name, source_p->hopcount+1,
322	>	(unsigned long)source_p->tsinfo,
323	>	ubuf, source_p->username, source_p->host,
324	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
325	>	"0" : source_p->sockhost, source_p->id, source_p->info);
326	>
327	>	if (!EmptyString(source_p->certfp))
328	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
329	>	}
330	>	}
331	>
332	>	/* user_welcome()
333	>	*
334	>	* inputs       - client pointer to client to welcome
335	>	* output       - NONE
336	>	* side effects -
337	>	*/
338	>	static void
339	>	user_welcome(struct Client *source_p)
340	>	{
341	>	#if defined(__TIME__) && defined(__DATE__)
342	>	static const char built_date[] = __DATE__ " at " __TIME__;
343	>	#else
344	>	static const char built_date[] = "unknown";
345	>	#endif
346	>
347	>	#ifdef HAVE_LIBCRYPTO
348	>	if (HasFlag(source_p, FLAGS_SSL))
349	>	{
350	>	AddUMode(source_p, UMODE_SSL);
351	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
352	>	ssl_get_cipher(source_p->localClient->fd.ssl));
353	>	}
354	>	#endif
355	>
356	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
357	>	source_p->name);
358	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
359	>	get_listener_name(source_p->localClient->listener), ircd_version);
360	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
361	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362	>	show_isupport(source_p);
363	>
364	>	if (source_p->id[0])
365	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
366	>
367	>	show_lusers(source_p);
368	>	motd_signon(source_p);
369	>	}
370	>
371	>	/* check_xline()
372	>	*
373	>	* inputs       - pointer to client to test
374	>	* outupt       - 1 if exiting 0 if ok
375	>	* side effects -
376	>	*/
377	>	static int
378	>	check_xline(struct Client *source_p)
379	>	{
380	>	struct MaskItem *conf = NULL;
381	>	const char *reason = NULL;
382	>
383	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
384	>	{
385	>	++conf->count;
386	>
387	>	if (conf->reason)
388	>	reason = conf->reason;
389	>	else
390	>	reason = CONF_NOREASON;
391	>
392	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
393	>	"X-line Rejecting [%s] [%s], user %s [%s]",
394	>	source_p->info, reason,
395	>	get_client_name(source_p, HIDE_IP),
396	>	source_p->sockhost);
397	>
398	>	++ServerStats.is_ref;
399	>	exit_client(source_p, "Bad user info");
400	>	return 1;
401	>	}
402	>
403	>	return 0;
404	>	}
405	>
406	>	/*! \brief This function is called when both NICK and USER messages
407	>	*      have been accepted for the client, in whatever order. Only
408	>	*      after this, is the UID message propagated.
409	>	* \param source_p Pointer to given client to introduce
410	>	*/
411		void
412		register_local_user(struct Client *source_p)
413		{
414		const char *id = NULL;
415		const struct MaskItem *conf = NULL;
416
281	–	assert(source_p != NULL);
417		assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
419		assert(!source_p->localClient->registration);
#	Line 287 | Line 422 | register_local_user(struct Client *sourc
422
423		if (ConfigFileEntry.ping_cookie)
424		{
425	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
425	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
426		{
427		do
428		source_p->localClient->random_ping = genrand_int32();
#	Line 310 | Line 445 | register_local_user(struct Client *sourc
445		if (!check_client(source_p))
446		return;
447
448	<	if (valid_hostname(source_p->host) == 0)
448	>	if (!valid_hostname(source_p->host))
449		{
450	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
451	<	"character in your hostname", me.name, source_p->name);
450	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
451	>	"character in your hostname");
452		strlcpy(source_p->host, source_p->sockhost,
453		sizeof(source_p->host));
454		}
#	Line 322 | Line 457 | register_local_user(struct Client *sourc
457
458		if (!IsGotId(source_p))
459		{
460	<	char username[USERLEN + 1];
460	>	char username[USERLEN + 1] = "";
461		const char *p = username;
462		unsigned int i = 0;
463
464		if (IsNeedIdentd(conf))
465		{
466		++ServerStats.is_ref;
467	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
468	<	"identd to use this server", me.name, source_p->name);
469	<	exit_client(source_p, &me, "Install identd");
467	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
468	>	"identd to use this server");
469	>	exit_client(source_p, "Install identd");
470		return;
471		}
472
#	Line 347 | Line 482 | register_local_user(struct Client *sourc
482		source_p->username[i] = '\0';
483		}
484
485	<	/* password check */
485	>	/* Password check */
486		if (!EmptyString(conf->passwd))
487		{
488	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
488	>	if (!match_conf_password(source_p->localClient->passwd, conf))
489		{
490		++ServerStats.is_ref;
491	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
492	<	me.name, source_p->name);
493	<	exit_client(source_p, &me, "Bad Password");
491	>
492	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
493	>	exit_client(source_p, "Bad Password");
494		return;
495		}
496		}
497
498	<	/* don't free source_p->localClient->passwd here - it can be required
498	>	/*
499	>	* Don't free source_p->localClient->passwd here - it can be required
500		* by masked /stats I if there are auth{} blocks with need_password = no;
501		* --adx
502		*/
503
504	<	/* report if user has &^>= etc. and set flags as needed in source_p */
504	>	/*
505	>	* Report if user has &^>= etc. and set flags as needed in source_p
506	>	*/
507		report_and_set_user_flags(source_p, conf);
508
509		if (IsDead(source_p))
510		return;
511
512	<	/* Limit clients -
512	>	/*
513	>	* Limit clients -
514		* We want to be able to have servers and F-line clients
515		* connect, so save room for "buffer" connections.
516		* Smaller servers may want to decrease this, and it should
517		* probably be just a percentage of the MAXCLIENTS...
518		*   -Taner
519		*/
383	–	/* Except "F:" clients */
520		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
521		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
522		{
#	Line 388 | Line 524 | register_local_user(struct Client *sourc
524		"Too many clients, rejecting %s[%s].",
525		source_p->name, source_p->host);
526		++ServerStats.is_ref;
527	<	exit_client(source_p, &me, "Sorry, server is full - try later");
527	>	exit_client(source_p, "Sorry, server is full - try later");
528		return;
529		}
530
531	<	/* valid user name check */
396	<	if (valid_username(source_p->username, 1) == 0)
531	>	if (!valid_username(source_p->username, 1))
532		{
533	<	char tmpstr2[IRCD_BUFSIZE];
533	>	char buf[IRCD_BUFSIZE] = "";
534
535		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
536		"Invalid username: %s (%s@%s)",
537		source_p->name, source_p->username, source_p->host);
538		++ServerStats.is_ref;
539	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
540	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
539	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
540	>	exit_client(source_p, buf);
541		return;
542		}
543
544		if (check_xline(source_p))
545		return;
546
547	<	while (hash_find_id((id = uid_get())) != NULL)
547	>	while (hash_find_id((id = uid_get())))
548		;
549
550		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 430 | Line 564 | register_local_user(struct Client *sourc
564		++Count.invisi;
565		}
566
567	<	if ((++Count.local) > Count.max_loc)
567	>	if (++Count.local > Count.max_loc)
568		{
569		Count.max_loc = Count.local;
570
#	Line 440 | Line 574 | register_local_user(struct Client *sourc
574		Count.max_loc);
575		}
576
443	–	/* Increment our total user count here */
577		if (++Count.total > Count.max_tot)
578		Count.max_tot = Count.total;
579		++Count.totalrestartcount;
#	Line 449 | Line 582 | register_local_user(struct Client *sourc
582		SetClient(source_p);
583		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
584
452	–	source_p->localClient->allow_read = MAX_FLOOD_BURST;
453	–
585		assert(dlinkFind(&unknown_list, source_p));
586
587		dlink_move_node(&source_p->localClient->lclient_node,
#	Line 469 | Line 600 | register_local_user(struct Client *sourc
600		*              - username to register as
601		*              - host name to register as
602		*              - server name
472	–	*              - realname (gecos)
603		* output       - NONE
604		* side effects - This function is called when a remote client
605		*                is introduced by a server.
606		*/
607		void
608	<	register_remote_user(struct Client *source_p,
609	<	const char *username, const char *host, const char *server,
480	<	const char *realname)
608	>	register_remote_user(struct Client *source_p, const char *username,
609	>	const char *host, const char *server)
610		{
611		struct Client *target_p = NULL;
612
484	–	assert(source_p != NULL);
613		assert(source_p->username != username);
614
615	<	strlcpy(source_p->host, host, sizeof(source_p->host));
615	>	strlcpy(source_p->host, host, sizeof(source_p->host));
616		strlcpy(source_p->username, username, sizeof(source_p->username));
617
618		/*
619	<	* coming from another server, take the servers word for it
619	>	* Coming from another server, take the servers word for it
620		*/
621		source_p->servptr = hash_find_server(server);
622
#	Line 503 | Line 631 | register_remote_user(struct Client *sour
631		"No server %s for user %s[%s@%s] from %s",
632		server, source_p->name, source_p->username,
633		source_p->host, source_p->from->name);
634	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
634	>	sendto_one(source_p->from,
635	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636	>	me.id, source_p->id, me.name, server);
637
638		AddFlag(source_p, FLAGS_KILLED);
639	<	exit_client(source_p, &me, "Ghosted Client");
639	>	exit_client(source_p, "Ghosted Client");
640		return;
641		}
642
#	Line 517 | Line 647 | register_remote_user(struct Client *sour
647		source_p->from->name, source_p->name, source_p->username,
648		source_p->host, source_p->servptr->name,
649		target_p->name, target_p->from->name);
650	<	kill_client(source_p->from, source_p,
651	<	"%s (NICK from wrong direction (%s != %s))",
652	<	me.name, source_p->servptr->name, target_p->from->name);
650	>	sendto_one(source_p->from,
651	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
652	>	me.id, source_p->id, me.name, source_p->servptr->name,
653	>	target_p->from->name);
654	>
655		AddFlag(source_p, FLAGS_KILLED);
656	<	exit_client(source_p, &me, "USER server wrong direction");
656	>	exit_client(source_p, "USER server wrong direction");
657		return;
658		}
659
#	Line 532 | Line 664 | register_remote_user(struct Client *sour
664		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
665		AddFlag(source_p, FLAGS_SERVICE);
666
535	–	/* Increment our total user count here */
667		if (++Count.total > Count.max_tot)
668		Count.max_tot = Count.total;
669
#	Line 551 | Line 682 | register_remote_user(struct Client *sour
682		introduce_client(source_p);
683		}
684
554	–	/* introduce_client()
555	–	*
556	–	* inputs       - source_p
557	–	* output       - NONE
558	–	* side effects - This common function introduces a client to the rest
559	–	*                of the net, either from a local client connect or
560	–	*                from a remote connect.
561	–	*/
562	–	static void
563	–	introduce_client(struct Client *source_p)
564	–	{
565	–	dlink_node *server_node = NULL;
566	–	static char ubuf[12];
567	–
568	–	if (MyClient(source_p))
569	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
570	–	else
571	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
572	–
573	–	watch_check_hash(source_p, RPL_LOGON);
574	–
575	–	if (*ubuf == '\0')
576	–	{
577	–	ubuf[0] = '+';
578	–	ubuf[1] = '\0';
579	–	}
580	–
581	–	DLINK_FOREACH(server_node, serv_list.head)
582	–	{
583	–	struct Client *server = server_node->data;
584	–
585	–	if (server == source_p->from)
586	–	continue;
587	–
588	–	if (IsCapable(server, CAP_SVS))
589	–	{
590	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	–	source_p->servptr->id,
593	–	source_p->name, source_p->hopcount+1,
594	–	(unsigned long)source_p->tsinfo,
595	–	ubuf, source_p->username, source_p->host,
596	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	–	"0" : source_p->sockhost, source_p->id,
598	–	source_p->svid,
599	–	source_p->info);
600	–	else
601	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	–	source_p->name, source_p->hopcount+1,
603	–	(unsigned long)source_p->tsinfo,
604	–	ubuf, source_p->username, source_p->host,
605	–	source_p->servptr->name, source_p->svid,
606	–	source_p->info);
607	–
608	–	}
609	–	else
610	–	{
611	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
612	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
613	–	source_p->servptr->id,
614	–	source_p->name, source_p->hopcount+1,
615	–	(unsigned long)source_p->tsinfo,
616	–	ubuf, source_p->username, source_p->host,
617	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	–	"0" : source_p->sockhost, source_p->id, source_p->info);
619	–	else
620	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	–	source_p->name, source_p->hopcount+1,
622	–	(unsigned long)source_p->tsinfo,
623	–	ubuf, source_p->username, source_p->host,
624	–	source_p->servptr->name, source_p->info);
625	–	}
626	–
627	–	if (!EmptyString(source_p->certfp))
628	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629	–	}
630	–	}
631	–
685		/* valid_hostname()
686		*
687		* Inputs       - pointer to hostname
#	Line 643 | Line 696 | valid_hostname(const char *hostname)
696		{
697		const char *p = hostname;
698
699	<	assert(p != NULL);
699	>	assert(p);
700
701	<	if (*p == '.' || *p == ':')
701	>	if (EmptyString(p) || *p == '.' || *p == ':')
702		return 0;
703
704		for (; *p; ++p)
#	Line 669 | Line 722 | valid_hostname(const char *hostname)
722		int
723		valid_username(const char *username, const int local)
724		{
725	<	int dots      = 0;
725	>	unsigned int dots = 0;
726		const char *p = username;
727
728	<	assert(p != NULL);
728	>	assert(p);
729
730		if (*p == '~')
731		++p;
#	Line 689 | Line 742 | valid_username(const char *username, con
742		{
743		while (*++p)
744		{
745	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
745	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
746		{
747		if (++dots > ConfigFileEntry.dots_in_ident)
748		return 0;
#	Line 707 | Line 760 | valid_username(const char *username, con
760		return 0;
761		}
762
763	<	return  p - username <= USERLEN;;
763	>	return p - username <= USERLEN;
764		}
765
766		/* clean_nick_name()
#	Line 721 | Line 774 | int
774		valid_nickname(const char *nickname, const int local)
775		{
776		const char *p = nickname;
777	+
778		assert(nickname && *nickname);
779
780	<	/* nicks can't start with a digit or - or be 0 length */
781	<	/* This closer duplicates behaviour of hybrid-6 */
780	>	/*
781	>	* Nicks can't start with a digit or - or be 0 length.
782	>	*/
783		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
784		return 0;
785
#	Line 735 | Line 790 | valid_nickname(const char *nickname, con
790		return p - nickname <= NICKLEN;
791		}
792
738	–	/* report_and_set_user_flags()
739	–	*
740	–	* inputs       - pointer to source_p
741	–	*              - pointer to conf for this user
742	–	* output       - NONE
743	–	* side effects - Report to user any special flags
744	–	*                they are getting, and set them.
745	–	*/
746	–	static void
747	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748	–	{
749	–	/* If this user is being spoofed, tell them so */
750	–	if (IsConfDoSpoofIp(conf))
751	–	sendto_one(source_p,
752	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753	–	me.name, source_p->name);
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(conf))
757	–	{
758	–	SetExemptKline(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/* The else here is to make sure that G line exempt users
765	–	* do not get noticed twice.
766	–	*/
767	–	else if (IsConfExemptGline(conf))
768	–	{
769	–	SetExemptGline(source_p);
770	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
771	–	me.name, source_p->name);
772	–	}
773	–
774	–	if (IsConfExemptResv(conf))
775	–	{
776	–	SetExemptResv(source_p);
777	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
778	–	me.name, source_p->name);
779	–	}
780	–
781	–	/* If this user is exempt from user limits set it "F lined" */
782	–	if (IsConfExemptLimits(conf))
783	–	{
784	–	SetExemptLimits(source_p);
785	–	sendto_one(source_p,
786	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
787	–	me.name,source_p->name);
788	–	}
789	–
790	–	if (IsConfCanFlood(conf))
791	–	{
792	–	SetCanFlood(source_p);
793	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
794	–	"protection, aren't you fearsome.",
795	–	me.name, source_p->name);
796	–	}
797	–	}
798	–
799	–	/* set_user_mode()
800	–	*
801	–	* added 15/10/91 By Darren Reed.
802	–	* parv[0] - sender
803	–	* parv[1] - username to change mode for
804	–	* parv[2] - modes to change
805	–	*/
806	–	void
807	–	set_user_mode(struct Client *client_p, struct Client *source_p,
808	–	const int parc, char *parv[])
809	–	{
810	–	unsigned int flag, setflags;
811	–	char **p, *m, buf[IRCD_BUFSIZE];
812	–	struct Client *target_p;
813	–	int what = MODE_ADD, badflag = 0, i;
814	–
815	–	assert(!(parc < 2));
816	–
817	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
818	–	{
819	–	if (MyConnect(source_p))
820	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
821	–	me.name, source_p->name, parv[1]);
822	–	return;
823	–	}
824	–
825	–	if (source_p != target_p)
826	–	{
827	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
828	–	me.name, source_p->name);
829	–	return;
830	–	}
831	–
832	–	if (parc < 3)
833	–	{
834	–	m = buf;
835	–	*m++ = '+';
836	–
837	–	for (i = 0; i < 128; i++)
838	–	if (HasUMode(source_p, user_modes[i]))
839	–	*m++ = (char)i;
840	–	*m = '\0';
841	–
842	–	sendto_one(source_p, form_str(RPL_UMODEIS),
843	–	me.name, source_p->name, buf);
844	–	return;
845	–	}
846	–
847	–	/* find flags already set for user */
848	–	setflags = source_p->umodes;
849	–
850	–	/* parse mode change string(s) */
851	–	for (p = &parv[2]; p && *p; p++)
852	–	{
853	–	for (m = *p; *m; m++)
854	–	{
855	–	switch (*m)
856	–	{
857	–	case '+':
858	–	what = MODE_ADD;
859	–	break;
860	–	case '-':
861	–	what = MODE_DEL;
862	–	break;
863	–	case 'o':
864	–	if (what == MODE_ADD)
865	–	{
866	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
867	–	{
868	–	++Count.oper;
869	–	SetOper(source_p);
870	–	}
871	–	}
872	–	else
873	–	{
874	–	/* Only decrement the oper counts if an oper to begin with
875	–	* found by Pat Szuta, Perly , perly@xnet.com
876	–	*/
877	–	if (!HasUMode(source_p, UMODE_OPER))
878	–	break;
879	–
880	–	ClearOper(source_p);
881	–	Count.oper--;
882	–
883	–	if (MyConnect(source_p))
884	–	{
885	–	dlink_node *dm;
886	–
887	–	detach_conf(source_p, CONF_OPER);
888	–	ClrOFlag(source_p);
889	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
890	–
891	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
892	–	free_dlink_node(dm);
893	–	}
894	–	}
895	–
896	–	break;
897	–
898	–	case 'S':  /* Only servers may set +S in a burst */
899	–	case 'r':  /* Only services may set +r */
900	–	case 'x':  /* Only services may set +x */
901	–	break;
902	–
903	–	default:
904	–	if ((flag = user_modes[(unsigned char)*m]))
905	–	{
906	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
907	–	(ConfigFileEntry.oper_only_umodes & flag))
908	–	badflag = 1;
909	–	else
910	–	{
911	–	if (what == MODE_ADD)
912	–	AddUMode(source_p, flag);
913	–	else
914	–	DelUMode(source_p, flag);
915	–	}
916	–	}
917	–	else
918	–	{
919	–	if (MyConnect(source_p))
920	–	badflag = 1;
921	–	}
922	–
923	–	break;
924	–	}
925	–	}
926	–	}
927	–
928	–	if (badflag)
929	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
930	–	me.name, source_p->name);
931	–
932	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
933	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
934	–	{
935	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
936	–	me.name, source_p->name);
937	–	DelUMode(source_p, UMODE_ADMIN);
938	–	}
939	–
940	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
941	–	++Count.invisi;
942	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
943	–	--Count.invisi;
944	–
945	–	/*
946	–	* compare new flags with old flags and send string which
947	–	* will cause servers to update correctly.
948	–	*/
949	–	send_umode_out(client_p, source_p, setflags);
950	–	}
951	–
793		/* send_umode()
794		* send the MODE string for user (user) to connection client_p
795		* -avalon
#	Line 966 | Line 807 | send_umode(struct Client *client_p, stru
807		{
808		char *m = umode_buf;
809		int what = 0;
969	–	unsigned int i;
970	–	unsigned int flag;
810
811		/*
812	<	* build a string in umode_buf to represent the change in the user's
812	>	* Build a string in umode_buf to represent the change in the user's
813		* mode between the new (source_p->umodes) and 'old'.
814		*/
815	<	for (i = 0; i < 128; i++)
815	>	for (unsigned int i = 0; i < 128; ++i)
816		{
817	<	flag = user_modes[i];
817	>	unsigned int flag = user_modes[i];
818	>
819		if (!flag)
820		continue;
821
#	Line 1024 | Line 864 | void
864		send_umode_out(struct Client *client_p, struct Client *source_p,
865		unsigned int old)
866		{
867	<	char buf[IRCD_BUFSIZE] = { '\0' };
1028	<	dlink_node *ptr = NULL;
867	>	char buf[IRCD_BUFSIZE] = "";
868
869		send_umode(NULL, source_p, old, SEND_UMODES, buf);
870
871		if (buf[0])
872	<	{
873	<	DLINK_FOREACH(ptr, serv_list.head)
1035	<	{
1036	<	struct Client *target_p = ptr->data;
1037	<
1038	<	if ((target_p != client_p) && (target_p != source_p))
1039	<	sendto_one(target_p, ":%s MODE %s :%s",
1040	<	ID_or_name(source_p, target_p),
1041	<	ID_or_name(source_p, target_p), buf);
1042	<	}
1043	<	}
872	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
873	>	source_p->id, source_p->id, buf);
874
875		if (client_p && MyClient(client_p))
876		send_umode(client_p, source_p, old, 0xffffffff, buf);
#	Line 1083 | Line 913 | user_set_hostmask(struct Client *target_
913
914		if (MyClient(target_p))
915		{
916	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1087	<	target_p->name, target_p->host);
916	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
917		clear_ban_cache_client(target_p);
918		}
919
#	Line 1093 | Line 922 | user_set_hostmask(struct Client *target_
922
923		DLINK_FOREACH(ptr, target_p->channel.head)
924		{
925	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
925	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
926		char *p = modebuf;
927		int len = 0;
928		const struct Membership *ms = ptr->data;
#	Line 1135 | Line 964 | user_set_hostmask(struct Client *target_
964		target_p->host, target_p->away);
965		}
966
967	<	/* user_welcome()
968	<	*
969	<	* inputs       - client pointer to client to welcome
1141	<	* output       - NONE
1142	<	* side effects -
1143	<	*/
1144	<	static void
1145	<	user_welcome(struct Client *source_p)
1146	<	{
1147	<	#if defined(__TIME__) && defined(__DATE__)
1148	<	static const char built_date[] = __DATE__ " at " __TIME__;
1149	<	#else
1150	<	static const char built_date[] = "unknown";
1151	<	#endif
1152	<
1153	<	#ifdef HAVE_LIBCRYPTO
1154	<	if (HasFlag(source_p, FLAGS_SSL))
1155	<	{
1156	<	AddUMode(source_p, UMODE_SSL);
1157	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1158	<	me.name, source_p->name,
1159	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1160	<	}
1161	<	#endif
1162	<
1163	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1164	<	ServerInfo.network_name, source_p->name);
1165	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1166	<	get_listener_name(source_p->localClient->listener), ircd_version);
1167	<	sendto_one(source_p, form_str(RPL_CREATED),
1168	<	me.name, source_p->name, built_date);
1169	<	sendto_one(source_p, form_str(RPL_MYINFO),
1170	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1171	<	show_isupport(source_p);
1172	<
1173	<	if (source_p->id[0] != '\0')
1174	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1175	<	source_p->name, source_p->id);
1176	<
1177	<	show_lusers(source_p);
1178	<	motd_signon(source_p);
1179	<	}
1180	<
1181	<	/* check_xline()
1182	<	*
1183	<	* inputs       - pointer to client to test
1184	<	* outupt       - 1 if exiting 0 if ok
1185	<	* side effects -
1186	<	*/
1187	<	static int
1188	<	check_xline(struct Client *source_p)
1189	<	{
1190	<	struct MaskItem *conf = NULL;
1191	<	const char *reason = NULL;
1192	<
1193	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1194	<	{
1195	<	++conf->count;
1196	<
1197	<	if (conf->reason != NULL)
1198	<	reason = conf->reason;
1199	<	else
1200	<	reason = "No Reason";
1201	<
1202	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1203	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1204	<	source_p->info, reason,
1205	<	get_client_name(source_p, HIDE_IP),
1206	<	source_p->sockhost);
1207	<
1208	<	++ServerStats.is_ref;
1209	<	exit_client(source_p, &me, "Bad user info");
1210	<	return 1;
1211	<	}
1212	<
1213	<	return 0;
1214	<	}
1215	<
1216	<	/* oper_up()
1217	<	*
1218	<	* inputs       - pointer to given client to oper
1219	<	* output       - NONE
1220	<	* side effects - Blindly opers up given source_p, using conf info
1221	<	*                all checks on passwords have already been done.
1222	<	*                This could also be used by rsa oper routines.
967	>	/*! \brief Blindly opers up given source_p, using conf info.
968	>	*         All checks on passwords have already been done.
969	>	* \param source_p Pointer to given client to oper
970		*/
971		void
972		oper_up(struct Client *source_p)
#	Line 1253 | Line 1000 | oper_up(struct Client *source_p)
1000		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1001		get_oper_name(source_p));
1002		send_umode_out(source_p, source_p, old);
1003	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1003	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1004		}
1005
1006	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1006	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1007
1008		int
1009		valid_sid(const char *sid)
#	Line 1271 | Line 1018 | valid_sid(const char *sid)
1018
1019		/*
1020		* init_uid()
1021	<	*
1021	>	*
1022		* inputs       - NONE
1023		* output       - NONE
1024		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1281 | Line 1028 | valid_sid(const char *sid)
1028		void
1029		init_uid(void)
1030		{
1284	–	unsigned int i;
1285	–
1031		memset(new_uid, 0, sizeof(new_uid));
1032
1033		if (!EmptyString(ServerInfo.sid))
1034		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1035
1036	<	for (i = 0; i < IRC_MAXSID; ++i)
1037	<	if (new_uid[i] == '\0')
1036	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1037	>	if (new_uid[i] == '\0')
1038		new_uid[i] = 'A';
1039
1040		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1296	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1297	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1298	–	* -Dianora
1299	–	*/
1041		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1042		}
1043
#	Line 1309 | Line 1050 | init_uid(void)
1050		*                note this is a recursive function
1051		*/
1052		static void
1053	<	add_one_to_uid(int i)
1053	>	add_one_to_uid(unsigned int i)
1054		{
1055	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1055	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1056		{
1057		if (new_uid[i] == 'Z')
1058		new_uid[i] = '0';
1059		else if (new_uid[i] == '9')
1060		{
1061		new_uid[i] = 'A';
1062	<	add_one_to_uid(i-1);
1062	>	add_one_to_uid(i - 1);
1063		}
1064		else
1065		++new_uid[i];
#	Line 1343 | Line 1084 | add_one_to_uid(int i)
1084		static const char *
1085		uid_get(void)
1086		{
1087	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1087	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1088		return new_uid;
1089		}
1090
#	Line 1362 | Line 1103 | init_isupport(void)
1103		add_isupport("DEAF", "D", -1);
1104		add_isupport("KICKLEN", NULL, KICKLEN);
1105		add_isupport("MODES", NULL, MAXMODEPARAMS);
1365	–	#ifdef HALFOPS
1106		add_isupport("PREFIX", "(ohv)@%+", -1);
1107		add_isupport("STATUSMSG", "@%+", -1);
1368	–	#else
1369	–	add_isupport("PREFIX", "(ov)@+", -1);
1370	–	add_isupport("STATUSMSG", "@+", -1);
1371	–	#endif
1108		add_isupport("EXCEPTS", "e", -1);
1109		add_isupport("INVEX", "I", -1);
1110		}
#	Line 1386 | Line 1122 | void
1122		add_isupport(const char *name, const char *options, int n)
1123		{
1124		dlink_node *ptr;
1125	<	struct Isupport *support;
1125	>	struct Isupport *support = NULL;
1126
1127		DLINK_FOREACH(ptr, support_list.head)
1128		{
#	Line 1401 | Line 1137 | add_isupport(const char *name, const cha
1137
1138		if (ptr == NULL)
1139		{
1140	<	support = MyMalloc(sizeof(*support));
1140	>	support = MyCalloc(sizeof(*support));
1141		dlinkAddTail(support, &support->node, &support_list);
1142		}
1143
1144		support->name = xstrdup(name);
1145	<	if (options != NULL)
1145	>	if (options)
1146		support->options = xstrdup(options);
1147		support->number = n;
1148
#	Line 1458 | Line 1194 | rebuild_isupport_message_line(void)
1194		int n = 0;
1195		int tokens = 0;
1196		size_t len = 0;
1197	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1197	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1198
1199		DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1200		{
#	Line 1474 | Line 1210 | rebuild_isupport_message_line(void)
1210		p += (n = sprintf(p, "%s", support->name));
1211		len += n;
1212
1213	<	if (support->options != NULL)
1213	>	if (support->options)
1214		{
1215		p += (n = sprintf(p, "=%s", support->options));
1216		len += n;
#	Line 1502 | Line 1238 | rebuild_isupport_message_line(void)
1238		}
1239		}
1240
1241	<	if (len != 0)
1241	>	if (len)
1242		{
1243		if (*--p == ' ')
1244		*p = '\0';

Diff Legend

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