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 386 by adx, Tue Jan 31 12:40:56 2006 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 3504 by michael, Sat May 10 19:51:29 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"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
28	>	#include "list.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
38	–	#include "irc_getnameinfo.h"
35		#include "ircd.h"
40	–	#include "list.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39	<	#include "s_conf.h"
40	<	#include "s_log.h"
41	<	#include "s_serv.h"
47	<	#include "s_stats.h"
39	>	#include "conf.h"
40	>	#include "log.h"
41	>	#include "server.h"
42		#include "send.h"
43		#include "supported.h"
50	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46	+	#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
49	<	#include "s_misc.h"
50	<	#include "msg.h"
57	<	#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;
48	>	#include "misc.h"
49	>	#include "parse.h"
50	>	#include "watch.h"
51
52		static char umode_buffer[IRCD_BUFSIZE];
53	<
67	<	static void user_welcome(struct Client *);
68	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
69	<	static int check_xline(struct Client *);
70	<	static int check_regexp_xline(struct Client *);
71	<	static void introduce_client(struct Client *, struct Client *);
72	<	static void *uid_get(va_list);
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	<
78	<	struct Isupport
58	>	struct Isupport
59		{
60		dlink_node node;
61		char *name;
#	Line 83 | Line 63 | struct Isupport
63		int number;
64		};
65
66	<	static dlink_list support_list = { NULL, NULL, 0 };
67	<	MessageFile *isupportFile;
66	>	static dlink_list support_list;
67	>	static dlink_list support_list_lines;
68
69		/* memory is cheap. map 0-255 to equivalent mode */
70	<	unsigned int user_modes[256] =
70	>	const unsigned int user_modes[256] =
71		{
72		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
73		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 99 | Line 79 | unsigned int user_modes[256] =
79		0,                  /* C */
80		UMODE_DEAF,         /* D */
81		0,                  /* E */
82	<	0,                  /* F */
82	>	UMODE_FARCONNECT,   /* F */
83		UMODE_SOFTCALLERID, /* G */
84	<	0,                  /* H */
84	>	UMODE_HIDDEN,       /* H */
85		0,                  /* I */
86		0,                  /* J */
87		0,                  /* K */
#	Line 111 | Line 91 | unsigned int user_modes[256] =
91		0,                  /* O */
92		0,                  /* P */
93		0,                  /* Q */
94	<	0,                  /* R */
95	<	0,                  /* S */
94	>	UMODE_REGONLY,      /* R */
95	>	UMODE_SSL,          /* S */
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 */
107		UMODE_CCONN,        /* c */
108		UMODE_DEBUG,        /* d */
109	<	0,                  /* e */
109	>	UMODE_EXTERNAL,     /* e */
110		UMODE_FULL,         /* f */
111		UMODE_CALLERID,     /* g */
112		0,                  /* h */
113		UMODE_INVISIBLE,    /* i */
114	<	0,                  /* j */
114	>	UMODE_REJ,          /* j */
115		UMODE_SKILL,        /* k */
116		UMODE_LOCOPS,       /* l */
117		0,                  /* m */
#	Line 139 | Line 119 | unsigned int user_modes[256] =
119		UMODE_OPER,         /* o */
120		0,                  /* p */
121		0,                  /* q */
122	<	UMODE_REJ,          /* r */
122	>	UMODE_REGISTERED,   /* r */
123		UMODE_SERVNOTICE,   /* s */
124		0,                  /* t */
125		UMODE_UNAUTH,       /* u */
126		0,                  /* v */
127		UMODE_WALLOP,       /* w */
128	<	UMODE_EXTERNAL,     /* x */
128	>	UMODE_HIDDENHOST,   /* x */
129		UMODE_SPY,          /* y */
130		UMODE_OPERWALL,     /* z      0x7A */
131		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 166 | Line 146 | assemble_umode_buffer(void)
146		unsigned int idx = 0;
147		char *umode_buffer_ptr = umode_buffer;
148
149	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
149	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
150		if (user_modes[idx])
151		*umode_buffer_ptr++ = idx;
152
#	Line 180 | 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		{
165	<	const char *from, *to;
165	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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_numeric(source_p, &me, RPL_LUSERCLIENT,
170	>	(Count.total - Count.invisi), Count.invisi, 1);
171
172	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
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	<	from = me.id;
184	<	to = source_p->id;
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	<	from = me.name;
189	<	to = source_p->name;
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	<	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);
192	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
193
194	<	if (Count.oper > 0)
195	<	sendto_one(source_p, form_str(RPL_LUSEROP),
196	<	from, to, Count.oper);
209	<
210	<	if (dlink_list_length(&unknown_list) > 0)
211	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
212	<	from, to, dlink_list_length(&unknown_list));
213	<
214	<	if (dlink_list_length(&global_channel_list) > 0)
215	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
216	<	from, to, dlink_list_length(&global_channel_list));
217	<
218	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
219	<	{
220	<	sendto_one(source_p, form_str(RPL_LUSERME),
221	<	from, to, Count.local, Count.myserver);
222	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.local, Count.max_loc,
224	<	Count.local, Count.max_loc);
225	<	}
226	<	else
227	<	{
228	<	sendto_one(source_p, form_str(RPL_LUSERME),
229	<	from, to, Count.total, 0);
230	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
231	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
233	<	}
234	<
235	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
236	<	from, to, Count.total, Count.max_tot,
237	<	Count.total, Count.max_tot);
238	<
239	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
240	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
241	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
194	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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 > MaxClientCount)
199	<	MaxClientCount = Count.local;
198	>	if (Count.local > Count.max_loc_cli)
199	>	Count.max_loc_cli = Count.local;
200
201	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
202	<	MaxConnectionCount = Count.local + Count.myserver;
201	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
202	>	Count.max_loc_con = Count.local + Count.myserver;
203		}
204
205		/* show_isupport()
#	Line 254 | 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	<	send_message_file(source_p, isupportFile);
214	>	const dlink_node *ptr = NULL;
215	>
216	>	DLINK_FOREACH(ptr, support_list_lines.head)
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	<	*/
243	<	void
244	<	register_local_user(struct Client *client_p, struct Client *source_p,
245	<	const char *nick, const char *username)
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		{
289	–	const struct AccessItem *aconf = NULL;
290	–	char ipaddr[HOSTIPLEN];
285		dlink_node *ptr = NULL;
286	<	dlink_node *m = 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	<	assert(source_p != NULL);
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	>
417	>	assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
419	<	assert(source_p->username != username);
419	>	assert(!source_p->localClient->registration);
420	>
421	>	ClearCap(source_p, CAP_TS6);
422
423		if (ConfigFileEntry.ping_cookie)
424		{
425	<	if (!IsPingSent(source_p) &&
301	<	source_p->localClient->random_ping == 0)
425	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
426		{
427	<	source_p->localClient->random_ping = (unsigned long)rand();
428	<	sendto_one(source_p, "PING :%lu",
427	>	do
428	>	source_p->localClient->random_ping = genrand_int32();
429	>	while (!source_p->localClient->random_ping);
430	>
431	>	sendto_one(source_p, "PING :%u",
432		source_p->localClient->random_ping);
433		SetPingSent(source_p);
434		return;
#	Line 311 | Line 438 | register_local_user(struct Client *clien
438		return;
439		}
440
441	<	source_p->localClient->last = CurrentTime;
441	>	source_p->localClient->last_privmsg = CurrentTime;
442		/* Straight up the maximum rate of flooding... */
443		source_p->localClient->allow_read = MAX_FLOOD_BURST;
444
445	<	if (!execute_callback(client_check_cb, source_p, username))
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		}
455
456	<	ptr   = source_p->localClient->confs.head;
330	<	aconf = map_to_conf(ptr->data);
456	>	conf = source_p->localClient->confs.head->data;
457
458		if (!IsGotId(source_p))
459		{
460	<	const char *p = NULL;
460	>	char username[USERLEN + 1] = "";
461	>	const char *p = username;
462		unsigned int i = 0;
463
464	<	if (IsNeedIdentd(aconf))
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");
466	>	++ServerStats.is_ref;
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
473	<	p = username;
473	>	strlcpy(username, source_p->username, sizeof(username));
474
475	<	if (!IsNoTilde(aconf))
475	>	if (!IsNoTilde(conf))
476		source_p->username[i++] = '~';
477
478	<	while (*p && i < USERLEN)
352	<	{
478	>	for (; *p && i < USERLEN; ++p)
479		if (*p != '[')
480		source_p->username[i++] = *p;
355	–	p++;
356	–	}
481
482		source_p->username[i] = '\0';
483		}
484
485	<	/* password check */
486	<	if (!EmptyString(aconf->passwd))
485	>	/* Password check */
486	>	if (!EmptyString(conf->passwd))
487		{
488		const char *pass = source_p->localClient->passwd;
489
490	<	if (!match_conf_password(pass, aconf))
490	>	if (!match_conf_password(pass, conf))
491		{
492	<	ServerStats->is_ref++;
493	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
494	<	me.name, source_p->name);
495	<	exit_client(source_p, &me, "Bad Password");
492	>	++ServerStats.is_ref;
493	>
494	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
495	>	exit_client(source_p, "Bad Password");
496		return;
497		}
498		}
499
500	<	/* don't free source_p->localClient->passwd here - it can be required
500	>	/*
501	>	* Don't free source_p->localClient->passwd here - it can be required
502		* by masked /stats I if there are auth{} blocks with need_password = no;
503		* --adx
504		*/
505
506	<	/* report if user has &^>= etc. and set flags as needed in source_p */
507	<	report_and_set_user_flags(source_p, aconf);
506	>	/*
507	>	* Report if user has &^>= etc. and set flags as needed in source_p
508	>	*/
509	>	report_and_set_user_flags(source_p, conf);
510	>
511	>	if (IsDead(source_p))
512	>	return;
513
514	<	/* Limit clients -
514	>	/*
515	>	* Limit clients -
516		* We want to be able to have servers and F-line clients
517		* connect, so save room for "buffer" connections.
518		* Smaller servers may want to decrease this, and it should
519		* probably be just a percentage of the MAXCLIENTS...
520		*   -Taner
521		*/
391	–	/* Except "F:" clients */
522		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
523		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
524		{
525	<	sendto_realops_flags(UMODE_FULL, L_ALL,
525	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
526		"Too many clients, rejecting %s[%s].",
527	<	nick, source_p->host);
528	<	ServerStats->is_ref++;
529	<	exit_client(source_p, &me, "Sorry, server is full - try later");
527	>	source_p->name, source_p->host);
528	>	++ServerStats.is_ref;
529	>	exit_client(source_p, "Sorry, server is full - try later");
530		return;
531		}
532
533	<	/* valid user name check */
404	<	if (valid_username(source_p->username) == 0)
533	>	if (!valid_username(source_p->username, 1))
534		{
535	<	char tmpstr2[IRCD_BUFSIZE];
535	>	char buf[IRCD_BUFSIZE] = "";
536
537	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
538	<	nick, source_p->username, source_p->host);
539	<	ServerStats->is_ref++;
540	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
541	<	exit_client(source_p, &me, tmpstr2);
537	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
538	>	"Invalid username: %s (%s@%s)",
539	>	source_p->name, source_p->username, source_p->host);
540	>	++ServerStats.is_ref;
541	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
542	>	exit_client(source_p, buf);
543		return;
544		}
545
546	<	assert(source_p == client_p);
417	<
418	<	/* end of valid user name check */
419	<	if (check_xline(source_p) || check_regexp_xline(source_p))
420	<	return;
421	<
422	<	if (IsDead(client_p))
546	>	if (check_xline(source_p))
547		return;
548
549	<	if (source_p->id[0] == '\0' && me.id[0])
550	<	{
427	<	char *id = (char *)execute_callback(uid_get_cb, source_p);
428	<	while (hash_find_id(id) != NULL)
429	<	id = uid_get(NULL);
430	<
431	<	strlcpy(source_p->id, id, sizeof(source_p->id));
432	<	hash_add_id(source_p);
433	<	}
549	>	while (hash_find_id((id = uid_get())))
550	>	;
551
552	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
553	<	source_p->localClient->ip.ss_len, ipaddr,
437	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
552	>	strlcpy(source_p->id, id, sizeof(source_p->id));
553	>	hash_add_id(source_p);
554
555	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
556	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
557	<	nick, source_p->username, source_p->host,
555	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
556	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
557	>	source_p->name, source_p->username, source_p->host,
558		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
559	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
560	<	source_p->info);
561	<
446	<	/* If they have died in send_* don't do anything. */
447	<	if (IsDead(source_p))
448	<	return;
559	>	"255.255.255.255" : source_p->sockhost,
560	>	get_client_class(&source_p->localClient->confs),
561	>	source_p->info, source_p->id);
562
563		if (ConfigFileEntry.invisible_on_connect)
564		{
565	<	source_p->umodes |= UMODE_INVISIBLE;
566	<	Count.invisi++;
565	>	AddUMode(source_p, UMODE_INVISIBLE);
566	>	++Count.invisi;
567		}
568
569	<	if ((++Count.local) > Count.max_loc)
569	>	if (++Count.local > Count.max_loc)
570		{
571		Count.max_loc = Count.local;
572
573		if (!(Count.max_loc % 10))
574	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
574	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
575	>	"New Max Local Clients: %d",
576		Count.max_loc);
577		}
578
465	–	SetClient(source_p);
466	–
467	–	source_p->servptr = &me;
468	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
469	–
470	–	/* Increment our total user count here */
579		if (++Count.total > Count.max_tot)
580		Count.max_tot = Count.total;
581	<	Count.totalrestartcount++;
581	>	++Count.totalrestartcount;
582	>
583	>	assert(source_p->servptr == &me);
584	>	SetClient(source_p);
585	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
586
587		source_p->localClient->allow_read = MAX_FLOOD_BURST;
588
589	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
590	<	{
591	<	free_dlink_node(m);
592	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
481	<	}
482	<	else assert(0);
589	>	assert(dlinkFind(&unknown_list, source_p));
590	>
591	>	dlink_move_node(&source_p->localClient->lclient_node,
592	>	&unknown_list, &local_client_list);
593
594		user_welcome(source_p);
595		add_user_host(source_p->username, source_p->host, 0);
596		SetUserHost(source_p);
597
598	<	introduce_client(client_p, source_p);
598	>	introduce_client(source_p);
599		}
600
601		/* register_remote_user()
602		*
603	<	* inputs       - client_p directly connected client
494	<	*              - source_p remote or directly connected client
603	>	* inputs       - source_p remote or directly connected client
604		*              - username to register as
605		*              - host name to register as
606		*              - server name
498	–	*              - realname (gecos)
607		* output       - NONE
608		* side effects - This function is called when a remote client
609		*                is introduced by a server.
610		*/
611		void
612	<	register_remote_user(struct Client *client_p, struct Client *source_p,
613	<	const char *username, const char *host, const char *server,
506	<	const char *realname)
612	>	register_remote_user(struct Client *source_p, const char *username,
613	>	const char *host, const char *server)
614		{
615		struct Client *target_p = NULL;
616
510	–	assert(source_p != NULL);
617		assert(source_p->username != username);
618
619	<	strlcpy(source_p->host, host, sizeof(source_p->host));
514	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
619	>	strlcpy(source_p->host, host, sizeof(source_p->host));
620		strlcpy(source_p->username, username, sizeof(source_p->username));
621
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	–
622		/*
623	<	* coming from another server, take the servers word for it
623	>	* Coming from another server, take the servers word for it
624		*/
625	<	source_p->servptr = find_server(server);
625	>	source_p->servptr = hash_find_server(server);
626
627	<	/* Super GhostDetect:
627	>	/*
628	>	* Super GhostDetect:
629		* If we can't find the server the user is supposed to be on,
630		* then simply blow the user away.        -Taner
631		*/
632		if (source_p->servptr == NULL)
633		{
634	<	sendto_realops_flags(UMODE_ALL, L_ALL,
634	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
635		"No server %s for user %s[%s@%s] from %s",
636		server, source_p->name, source_p->username,
637		source_p->host, source_p->from->name);
638	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
638	>	sendto_one(source_p->from,
639	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
640	>	me.id, source_p->id, me.name, server);
641
642	<	/* XXX */
643	<	SetKilled(source_p);
542	<	exit_client(source_p, &me, "Ghosted Client");
642	>	AddFlag(source_p, FLAGS_KILLED);
643	>	exit_client(source_p, "Ghosted Client");
644		return;
645		}
646
647		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
648		{
649	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
649	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
650		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
651	<	client_p->name, source_p->name, source_p->username,
651	>	source_p->from->name, source_p->name, source_p->username,
652		source_p->host, source_p->servptr->name,
653		target_p->name, target_p->from->name);
654	<	kill_client(client_p, source_p,
655	<	"%s (NICK from wrong direction (%s != %s))",
656	<	me.name, source_p->servptr->name, target_p->from->name);
657	<	SetKilled(source_p);
557	<	exit_client(source_p, &me, "USER server wrong direction");
558	<	return;
559	<	}
560	<
561	<	SetClient(source_p);
562	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
563	<	add_user_host(source_p->username, source_p->host, 1);
564	<	SetUserHost(source_p);
565	<
566	<	introduce_client(client_p, source_p);
567	<	}
568	<
569	<	/* introduce_client()
570	<	*
571	<	* inputs       - client_p
572	<	*              - source_p
573	<	* output       - NONE
574	<	* side effects - This common function introduces a client to the rest
575	<	*                of the net, either from a local client connect or
576	<	*                from a remote connect.
577	<	*/
578	<	static void
579	<	introduce_client(struct Client *client_p, struct Client *source_p)
580	<	{
581	<	dlink_node *server_node = NULL;
582	<	static char ubuf[12];
654	>	sendto_one(source_p->from,
655	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
656	>	me.id, source_p->id, me.name, source_p->servptr->name,
657	>	target_p->from->name);
658
659	<	if (MyClient(source_p))
660	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
661	<	else
587	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
588	<
589	<	if (*ubuf == '\0')
590	<	{
591	<	ubuf[0] = '+';
592	<	ubuf[1] = '\0';
659	>	AddFlag(source_p, FLAGS_KILLED);
660	>	exit_client(source_p, "USER server wrong direction");
661	>	return;
662		}
663
664	<	/* arghhh one could try not introducing new nicks to ll leafs
665	<	* but then you have to introduce them "on the fly" in SJOIN
666	<	* not fun.
598	<	* Its not going to cost much more bandwidth to simply let new
599	<	* nicks just ride on through.
664	>	/*
665	>	* If the nick has been introduced by a services server,
666	>	* make it a service as well.
667		*/
668	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
669	+	AddFlag(source_p, FLAGS_SERVICE);
670
671	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
672	<	* 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	<	*/
671	>	if (++Count.total > Count.max_tot)
672	>	Count.max_tot = Count.total;
673
674	<	/* XXX THESE NEED A PREFIX!?!?!? */
675	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
676	<	client_p != uplink)
677	<	{
615	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
616	<	{
617	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
618	<	source_p->servptr->id,
619	<	source_p->name, source_p->hopcount+1,
620	<	(unsigned long)source_p->tsinfo,
621	<	ubuf, source_p->username, source_p->host,
622	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
623	<	"0" : source_p->sockhost, source_p->id, source_p->info);
624	<	}
625	<	else
626	<	{
627	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
628	<	source_p->name, source_p->hopcount+1,
629	<	(unsigned long)source_p->tsinfo,
630	<	ubuf, source_p->username, source_p->host,
631	<	source_p->servptr->name, source_p->info);
632	<	}
633	<	}
634	<	else
635	<	{
636	<	DLINK_FOREACH(server_node, serv_list.head)
637	<	{
638	<	struct Client *server = server_node->data;
674	>	SetClient(source_p);
675	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
676	>	add_user_host(source_p->username, source_p->host, 1);
677	>	SetUserHost(source_p);
678
679	<	if (IsCapable(server, CAP_LL) || server == client_p)
680	<	continue;
679	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
680	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
681	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
682	>	source_p->servptr->name,
683	>	source_p->name, source_p->username, source_p->host,
684	>	source_p->info, source_p->id);
685
686	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
644	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
645	<	source_p->servptr->id,
646	<	source_p->name, source_p->hopcount+1,
647	<	(unsigned long)source_p->tsinfo,
648	<	ubuf, source_p->username, source_p->host,
649	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
650	<	"0" : source_p->sockhost, source_p->id, source_p->info);
651	<	else
652	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
653	<	source_p->name, source_p->hopcount+1,
654	<	(unsigned long)source_p->tsinfo,
655	<	ubuf, source_p->username, source_p->host,
656	<	source_p->servptr->name, source_p->info);
657	<	}
658	<	}
686	>	introduce_client(source_p);
687		}
688
689		/* valid_hostname()
#	Line 672 | Line 700 | valid_hostname(const char *hostname)
700		{
701		const char *p = hostname;
702
703	<	assert(p != NULL);
703	>	assert(p);
704
705	<	if ('.' == *p || ':' == *p)
705	>	if (EmptyString(p) || *p == '.' || *p == ':')
706		return 0;
707
708	<	while (*p)
681	<	{
708	>	for (; *p; ++p)
709		if (!IsHostChar(*p))
710		return 0;
684	–	p++;
685	–	}
711
712	<	return 1;
712	>	return p - hostname <= HOSTLEN;
713		}
714
715		/* valid_username()
#	Line 699 | Line 724 | valid_hostname(const char *hostname)
724		* style of username
725		*/
726		int
727	<	valid_username(const char *username)
727	>	valid_username(const char *username, const int local)
728		{
729		int dots      = 0;
730		const char *p = username;
731
732	<	assert(p != NULL);
732	>	assert(p);
733
734	<	if ('~' == *p)
734	>	if (*p == '~')
735		++p;
736
737	<	/* reject usernames that don't start with an alphanum
737	>	/*
738	>	* Reject usernames that don't start with an alphanum
739		* i.e. reject jokers who have '-@somehost' or '.@somehost'
740		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
741		*/
742		if (!IsAlNum(*p))
743		return 0;
744
745	<	while (*++p)
745	>	if (local)
746		{
747	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
747	>	while (*++p)
748		{
749	<	dots++;
750	<
751	<	if (dots > ConfigFileEntry.dots_in_ident)
752	<	return 0;
753	<	if (!IsUserChar(p[1]))
749	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
750	>	{
751	>	if (++dots > ConfigFileEntry.dots_in_ident)
752	>	return 0;
753	>	if (!IsUserChar(*(p + 1)))
754	>	return 0;
755	>	}
756	>	else if (!IsUserChar(*p))
757		return 0;
758		}
730	–	else if (!IsUserChar(*p))
731	–	return 0;
732	–	}
733	–
734	–	return 1;
735	–	}
736	–
737	–	/* report_and_set_user_flags()
738	–	*
739	–	* inputs       - pointer to source_p
740	–	*              - pointer to aconf for this user
741	–	* output       - NONE
742	–	* side effects - Report to user any special flags
743	–	*                they are getting, and set them.
744	–	*/
745	–	static void
746	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
747	–	{
748	–	/* If this user is being spoofed, tell them so */
749	–	if (IsConfDoSpoofIp(aconf))
750	–	{
751	–	sendto_one(source_p,
752	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
753	–	me.name, source_p->name);
754	–	}
755	–
756	–	/* If this user is in the exception class, Set it "E lined" */
757	–	if (IsConfExemptKline(aconf))
758	–	{
759	–	SetExemptKline(source_p);
760	–	sendto_one(source_p,
761	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
762	–	me.name, source_p->name);
763	–	}
764	–
765	–	/* The else here is to make sure that G line exempt users
766	–	* do not get noticed twice.
767	–	*/
768	–	else if (IsConfExemptGline(aconf))
769	–	{
770	–	SetExemptGline(source_p);
771	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
772	–	me.name, source_p->name);
759		}
760	<
775	<	if (IsConfExemptResv(aconf))
776	<	{
777	<	SetExemptResv(source_p);
778	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
779	<	me.name, source_p->name);
780	<	}
781	<
782	<	/* If this user is exempt from user limits set it "F lined" */
783	<	if (IsConfExemptLimits(aconf))
784	<	{
785	<	SetExemptLimits(source_p);
786	<	sendto_one(source_p,
787	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
788	<	me.name,source_p->name);
789	<	}
790	<
791	<	/* If this user is exempt from idle time outs */
792	<	if (IsConfIdlelined(aconf))
760	>	else
761		{
762	<	SetIdlelined(source_p);
763	<	sendto_one(source_p,
764	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
797	<	me.name, source_p->name);
762	>	while (*++p)
763	>	if (!IsUserChar(*p))
764	>	return 0;
765		}
766
767	<	if (IsConfCanFlood(aconf))
801	<	{
802	<	SetCanFlood(source_p);
803	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
804	<	"protection, aren't you fearsome.",
805	<	me.name, source_p->name);
806	<	}
767	>	return  p - username <= USERLEN;;
768		}
769
770	<	/* do_local_user()
770	>	/* clean_nick_name()
771		*
772	<	* inputs       -
773	<	* output       - NONE
774	<	* side effects -
772	>	* input        - nickname
773	>	*              - whether it's a local nick (1) or remote (0)
774	>	* output       - none
775	>	* side effects - walks through the nickname, returning 0 if erroneous
776		*/
777	<	void
778	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
817	<	const char *username, const char *host, const char *server,
818	<	const char *realname)
777	>	int
778	>	valid_nickname(const char *nickname, const int local)
779		{
780	<	assert(source_p != NULL);
821	<	assert(source_p->username != username);
780	>	const char *p = nickname;
781
782	<	if (source_p == NULL)
824	<	return;
825	<
826	<	if (!IsUnknown(source_p))
827	<	{
828	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
829	<	me.name, nick);
830	<	return;
831	<	}
832	<
833	<	source_p->flags |= FLAGS_GOTUSER;
782	>	assert(nickname && *nickname);
783
784		/*
785	<	* don't take the clients word for it, ever
785	>	* Nicks can't start with a digit or - or be 0 length.
786		*/
787	<	source_p->servptr = &me;
788	<
840	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
841	<
842	<	if (!IsGotId(source_p))
843	<	{
844	<	/* save the username in the client
845	<	* If you move this you'll break ping cookies..you've been warned
846	<	*/
847	<	strlcpy(source_p->username, username, sizeof(source_p->username));
848	<	}
849	<
850	<	if (source_p->name[0])
851	<	{
852	<	/* NICK already received, now I have USER... */
853	<	register_local_user(client_p, source_p, source_p->name, username);
854	<	}
855	<	}
856	<
857	<	/* change_simple_umode()
858	<	*
859	<	* this callback can be hooked to allow special handling of
860	<	* certain usermodes
861	<	*/
862	<	static void *
863	<	change_simple_umode(va_list args)
864	<	{
865	<	struct Client *source_p;
866	<	int what;
867	<	unsigned int flag;
868	<
869	<	va_arg(args, struct Client *);
870	<	source_p = va_arg(args, struct Client *);
871	<	what = va_arg(args, int);
872	<	flag = va_arg(args, unsigned int);
873	<
874	<	if (what == MODE_ADD)
875	<	source_p->umodes |= flag;
876	<	else
877	<	source_p->umodes &= ~flag;
878	<
879	<	return NULL;
880	<	}
881	<
882	<	/* set_user_mode()
883	<	*
884	<	* added 15/10/91 By Darren Reed.
885	<	* parv[0] - sender
886	<	* parv[1] - username to change mode for
887	<	* parv[2] - modes to change
888	<	*/
889	<	void
890	<	set_user_mode(struct Client *client_p, struct Client *source_p,
891	<	int parc, char *parv[])
892	<	{
893	<	unsigned int flag, setflags;
894	<	char **p, *m, buf[IRCD_BUFSIZE];
895	<	struct Client *target_p;
896	<	int what = MODE_ADD, badflag = 0, i;
897	<
898	<	assert(!(parc < 2));
899	<
900	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
901	<	{
902	<	if (MyConnect(source_p))
903	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
904	<	me.name, source_p->name, parv[1]);
905	<	return;
906	<	}
907	<
908	<	if (IsServer(source_p))
909	<	{
910	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
911	<	parv[1], source_p->name);
912	<	return;
913	<	}
914	<
915	<	if (source_p != target_p || target_p->from != source_p->from)
916	<	{
917	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
918	<	me.name, source_p->name);
919	<	return;
920	<	}
921	<
922	<	if (parc < 3)
923	<	{
924	<	m = buf;
925	<	*m++ = '+';
926	<
927	<	for (i = 0; i < 128; i++)
928	<	if (source_p->umodes & user_modes[i])
929	<	*m++ = (char)i;
930	<	*m = '\0';
931	<
932	<	sendto_one(source_p, form_str(RPL_UMODEIS),
933	<	me.name, source_p->name, buf);
934	<	return;
935	<	}
936	<
937	<	execute_callback(entering_umode_cb, client_p, source_p);
938	<
939	<	/* find flags already set for user */
940	<	setflags = source_p->umodes;
941	<
942	<	/* parse mode change string(s) */
943	<	for (p = &parv[2]; p && *p; p++)
944	<	{
945	<	for (m = *p; *m; m++)
946	<	{
947	<	switch (*m)
948	<	{
949	<	case '+':
950	<	what = MODE_ADD;
951	<	break;
952	<	case '-':
953	<	what = MODE_DEL;
954	<	break;
955	<	case 'o':
956	<	if (what == MODE_ADD)
957	<	{
958	<	if (IsServer(client_p) && !IsOper(source_p))
959	<	{
960	<	++Count.oper;
961	<	SetOper(source_p);
962	<	}
963	<	}
964	<	else
965	<	{
966	<	/* Only decrement the oper counts if an oper to begin with
967	<	* found by Pat Szuta, Perly , perly@xnet.com
968	<	*/
969	<	if (!IsOper(source_p))
970	<	break;
971	<
972	<	ClearOper(source_p);
973	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
974	<	Count.oper--;
975	<
976	<	if (MyConnect(source_p))
977	<	{
978	<	dlink_node *dm;
979	<
980	<	detach_conf(source_p, OPER_TYPE);
981	<	ClearOperFlags(source_p);
982	<
983	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
984	<	free_dlink_node(dm);
985	<	}
986	<	}
987	<
988	<	break;
989	<
990	<	/* we may not get these,
991	<	* but they shouldnt be in default
992	<	*/
993	<	case ' ' :
994	<	case '\n':
995	<	case '\r':
996	<	case '\t':
997	<	break;
998	<
999	<	default:
1000	<	if ((flag = user_modes[(unsigned char)*m]))
1001	<	{
1002	<	if (MyConnect(source_p) && !IsOper(source_p) &&
1003	<	(ConfigFileEntry.oper_only_umodes & flag))
1004	<	{
1005	<	badflag = 1;
1006	<	}
1007	<	else
1008	<	execute_callback(umode_cb, client_p, source_p, what, flag);
1009	<	}
1010	<	else
1011	<	{
1012	<	if (MyConnect(source_p))
1013	<	badflag = 1;
1014	<	}
1015	<
1016	<	break;
1017	<	}
1018	<	}
1019	<	}
1020	<
1021	<	if (badflag)
1022	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1023	<	me.name, source_p->name);
1024	<
1025	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1026	<	{
1027	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1028	<	me.name, source_p->name);
1029	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1030	<	}
1031	<
1032	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1033	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1034	<	{
1035	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1036	<	me.name, source_p->name);
1037	<	source_p->umodes &= ~UMODE_ADMIN;
1038	<	}
787	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
788	>	return 0;
789
790	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
791	<	++Count.invisi;
792	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1043	<	--Count.invisi;
790	>	for (; *p; ++p)
791	>	if (!IsNickChar(*p))
792	>	return 0;
793
794	<	/*
1046	<	* compare new flags with old flags and send string which
1047	<	* will cause servers to update correctly.
1048	<	*/
1049	<	send_umode_out(client_p, source_p, setflags);
794	>	return p - nickname <= NICKLEN;
795		}
796
797		/* send_umode()
798		* send the MODE string for user (user) to connection client_p
799		* -avalon
800	+	*
801	+	* inputs       - client_p
802	+	*              - source_p
803	+	*              - int old
804	+	*              - sendmask mask of modes to send
805	+	*              - suplied umode_buf
806	+	* output       - NONE
807		*/
808		void
809		send_umode(struct Client *client_p, struct Client *source_p,
810		unsigned int old, unsigned int sendmask, char *umode_buf)
811		{
1060	–	int what = 0;
1061	–	unsigned int i;
1062	–	unsigned int flag;
812		char *m = umode_buf;
813	+	int what = 0;
814
815		/*
816	<	* build a string in umode_buf to represent the change in the user's
816	>	* Build a string in umode_buf to represent the change in the user's
817		* mode between the new (source_p->umodes) and 'old'.
818		*/
819	<	for (i = 0; i < 128; i++)
819	>	for (unsigned int i = 0; i < 128; ++i)
820		{
821	<	flag = user_modes[i];
821	>	unsigned int flag = user_modes[i];
822	>
823		if (!flag)
824		continue;
825
826		if (MyClient(source_p) && !(flag & sendmask))
827		continue;
828
829	<	if ((flag & old) && !(source_p->umodes & flag))
829	>	if ((flag & old) && !HasUMode(source_p, flag))
830		{
831		if (what == MODE_DEL)
832		*m++ = (char)i;
#	Line 1086 | Line 837 | send_umode(struct Client *client_p, stru
837		*m++ = (char)i;
838		}
839		}
840	<	else if (!(flag & old) && (source_p->umodes & flag))
840	>	else if (!(flag & old) && HasUMode(source_p, flag))
841		{
842		if (what == MODE_ADD)
843		*m++ = (char)i;
#	Line 1102 | Line 853 | send_umode(struct Client *client_p, stru
853		*m = '\0';
854
855		if (*umode_buf && client_p)
856	<	sendto_one(client_p, ":%s MODE %s :%s",
857	<	source_p->name, source_p->name, umode_buf);
856	>	sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
857	>	source_p->name, source_p->username,
858	>	source_p->host, source_p->name, umode_buf);
859		}
860
861		/* send_umode_out()
#	Line 1116 | Line 868 | void
868		send_umode_out(struct Client *client_p, struct Client *source_p,
869		unsigned int old)
870		{
871	<	char buf[IRCD_BUFSIZE];
1120	<	dlink_node *ptr = NULL;
1121	<
1122	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1123	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
871	>	char buf[IRCD_BUFSIZE] = "";
872
873	<	if (*buf)
1126	<	{
1127	<	DLINK_FOREACH(ptr, serv_list.head)
1128	<	{
1129	<	struct Client *target_p = ptr->data;
873	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
874
875	<	if ((target_p != client_p) && (target_p != source_p))
876	<	{
877	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1134	<	(target_p->localClient->serverMask &
1135	<	source_p->lazyLinkClientExists))
1136	<	sendto_one(target_p, ":%s MODE %s :%s",
1137	<	ID_or_name(source_p, target_p),
1138	<	ID_or_name(source_p, target_p), buf);
1139	<	}
1140	<	}
1141	<	}
875	>	if (buf[0])
876	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
877	>	source_p->id, source_p->id, buf);
878
879		if (client_p && MyClient(client_p))
880		send_umode(client_p, source_p, old, 0xffffffff, buf);
881		}
882
883	<	/* user_welcome()
884	<	*
1149	<	* inputs       - client pointer to client to welcome
1150	<	* output       - NONE
1151	<	* side effects -
1152	<	*/
1153	<	static void
1154	<	user_welcome(struct Client *source_p)
883	>	void
884	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
885		{
886	<	#if defined(__TIME__) && defined(__DATE__)
1157	<	static const char built_date[] = __DATE__ " at " __TIME__;
1158	<	#else
1159	<	static const char built_date[] = "unknown";
1160	<	#endif
886	>	dlink_node *ptr = NULL;
887
888	<	#ifdef HAVE_LIBCRYPTO
889	<	if (source_p->localClient->fd.ssl != NULL)
1164	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1165	<	me.name, source_p->name,
1166	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1167	<	#endif
888	>	if (!strcmp(target_p->host, hostname))
889	>	return;
890
891	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
892	<	ServerInfo.network_name, source_p->name);
893	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
894	<	get_listener_name(source_p->localClient->listener), ircd_version);
895	<	sendto_one(source_p, form_str(RPL_CREATED),
896	<	me.name, source_p->name, built_date);
897	<	sendto_one(source_p, form_str(RPL_MYINFO),
898	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1177	<	show_isupport(source_p);
891	>	switch (what)
892	>	{
893	>	case MODE_ADD:
894	>	AddUMode(target_p, UMODE_HIDDENHOST);
895	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
896	>	break;
897	>	case MODE_DEL:
898	>	DelUMode(target_p, UMODE_HIDDENHOST);
899
900	<	if (source_p->id[0] != '\0')
901	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
902	<	source_p->name, source_p->id);
900	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
901	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
902	>	break;
903	>	default: return;
904	>	}
905
906	<	show_lusers(source_p);
906	>	if (ConfigFileEntry.cycle_on_host_change)
907	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
908	>	target_p->name, target_p->username, target_p->host);
909
910	<	if (ConfigFileEntry.short_motd)
911	<	{
1187	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1188	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1189	<	sendto_one(source_p,
1190	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1191	<	"read it", source_p->name);
1192	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1193	<	me.name, source_p->name, me.name);
1194	<	sendto_one(source_p, form_str(RPL_MOTD),
1195	<	me.name, source_p->name,
1196	<	"*** This is the short motd ***");
1197	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1198	<	me.name, source_p->name);
1199	<	}
1200	<	else
1201	<	send_message_file(source_p, &ConfigFileEntry.motd);
1202	<	}
910	>	if (IsUserHostIp(target_p))
911	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
912
913	<	/* check_xline()
1205	<	*
1206	<	* inputs       - pointer to client to test
1207	<	* outupt       - 1 if exiting 0 if ok
1208	<	* side effects -
1209	<	*/
1210	<	static int
1211	<	check_xline(struct Client *source_p)
1212	<	{
1213	<	struct ConfItem *conf;
1214	<	struct MatchItem *xconf;
1215	<	const char *reason;
913	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
914
915	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info,
916	<	NULL, NULL, 0)) != NULL)
915	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
916	>	SetUserHost(target_p);
917	>
918	>	if (MyClient(target_p))
919		{
920	<	xconf = map_to_conf(conf);
921	<	xconf->count++;
920	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
921	>	clear_ban_cache_client(target_p);
922	>	}
923
924	<	if (xconf->reason != NULL)
925	<	reason = xconf->reason;
1225	<	else
1226	<	reason = "No Reason";
924	>	if (!ConfigFileEntry.cycle_on_host_change)
925	>	return;
926
927	<	sendto_realops_flags(UMODE_REJ, L_ALL,
928	<	"X-line Rejecting [%s] [%s], user %s [%s]",
929	<	source_p->info, reason,
930	<	get_client_name(source_p, HIDE_IP),
931	<	source_p->sockhost);
927	>	DLINK_FOREACH(ptr, target_p->channel.head)
928	>	{
929	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
930	>	char *p = modebuf;
931	>	int len = 0;
932	>	const struct Membership *ms = ptr->data;
933
934	<	ServerStats->is_ref++;
1235	<	if (REJECT_HOLD_TIME > 0)
934	>	if (has_member_flags(ms, CHFL_CHANOP))
935		{
936	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
937	<	me.name, source_p->name);
1239	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1240	<	SetCaptured(source_p);
936	>	*p++ = 'o';
937	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
938		}
1242	–	else
1243	–	exit_client(source_p, &me, "Bad user info");
1244	–	return 1;
1245	–	}
939
940	<	return 0;
941	<	}
942	<
943	<	static int
944	<	check_regexp_xline(struct Client *source_p)
1252	<	{
1253	<	struct ConfItem *conf = NULL;
1254	<	const char *reason = NULL;
1255	<
1256	<	if ((conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1257	<	{
1258	<	struct MatchItem *reg = map_to_conf(conf);
940	>	if (has_member_flags(ms, CHFL_HALFOP))
941	>	{
942	>	*p++ = 'h';
943	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
944	>	}
945
946	<	++reg->count;
946	>	if (has_member_flags(ms, CHFL_VOICE))
947	>	{
948	>	*p++ = 'v';
949	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
950	>	}
951
952	<	if (reg->reason != NULL)
1263	<	reason = reg->reason;
1264	<	else
1265	<	reason = "No Reason";
952	>	*p = '\0';
953
954	<	sendto_realops_flags(UMODE_REJ, L_ALL,
955	<	"X-line (REGEX) Rejecting [%s] [%s], user %s [%s]",
956	<	source_p->info, reason,
957	<	get_client_name(source_p, HIDE_IP),
958	<	source_p->sockhost);
954	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
955	>	target_p->name, target_p->username, target_p->host,
956	>	ms->chptr->chname);
957	>	if (nickbuf[0])
958	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
959	>	target_p->servptr->name, ms->chptr->chname,
960	>	modebuf, nickbuf);
961
1273	–	ServerStats->is_ref++;
1274	–	exit_client(source_p, &me, "Bad user info");
1275	–	return 1;
962		}
963
964	<	return 0;
965	<	}
966	<
967	<	/* oper_up()
968	<	*
969	<	* inputs       - pointer to given client to oper
970	<	* output       - NONE
971	<	* side effects - Blindly opers up given source_p, using aconf info
972	<	*                all checks on passwords have already been done.
973	<	*                This could also be used by rsa oper routines.
964	>	if (target_p->away[0])
965	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
966	>	":%s!%s@%s AWAY :%s",
967	>	target_p->name, target_p->username,
968	>	target_p->host, target_p->away);
969	>	}
970	>
971	>	/*! \brief Blindly opers up given source_p, using conf info.
972	>	*         All checks on passwords have already been done.
973	>	* \param source_p Pointer to given client to oper
974		*/
975		void
976		oper_up(struct Client *source_p)
977		{
978	<	unsigned int old = source_p->umodes;
979	<	const char *operprivs = "";
1294	<	const struct AccessItem *oconf = NULL;
978	>	const unsigned int old = source_p->umodes;
979	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
980
981		assert(source_p->localClient->confs.head);
1297	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
982
983		++Count.oper;
984		SetOper(source_p);
985
986	<	if (oconf->modes)
987	<	source_p->umodes |= oconf->modes;
986	>	if (conf->modes)
987	>	AddUMode(source_p, conf->modes);
988		else if (ConfigFileEntry.oper_umodes)
989	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
990	<	else
991	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
992	<	UMODE_WALLOP|UMODE_LOCOPS);
989	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
990	>
991	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
992	>	++Count.invisi;
993	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
994	>	--Count.invisi;
995
996		assert(dlinkFind(&oper_list, source_p) == NULL);
997		dlinkAdd(source_p, make_dlink_node(), &oper_list);
998
999	<	operprivs = oper_privs_as_string(oconf->port);
1314	<
1315	<	SetOFlag(source_p, oconf->port);
999	>	AddOFlag(source_p, conf->port);
1000
1001	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1002	<	source_p->umodes |= UMODE_ADMIN;
1319	<	if (!IsOperN(source_p))
1320	<	source_p->umodes &= ~UMODE_NCHANGE;
1001	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1002	>	AddUMode(source_p, UMODE_ADMIN);
1003
1004	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1005	<	source_p->name, source_p->username, source_p->host);
1004	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1005	>	get_oper_name(source_p));
1006		send_umode_out(source_p, source_p, old);
1007	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1326	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1327	<	me.name, source_p->name, operprivs);
1328	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1007	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1008		}
1009
1010	<	/*
1332	<	* Quick and dirty UID code for new proposed SID on EFnet
1333	<	*
1334	<	*/
1010	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1011
1012	<	static char new_uid[TOTALSIDUID+1];     /* allow for \0 */
1013	<	static void add_one_to_uid(int i);
1012	>	int
1013	>	valid_sid(const char *sid)
1014	>	{
1015	>	if (strlen(sid) == IRC_MAXSID)
1016	>	if (IsDigit(*sid))
1017	>	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1018	>	return 1;
1019	>
1020	>	return 0;
1021	>	}
1022
1023		/*
1024		* init_uid()
1025	<	*
1025	>	*
1026		* inputs       - NONE
1027		* output       - NONE
1028		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1348 | Line 1032 | static void add_one_to_uid(int i);
1032		void
1033		init_uid(void)
1034		{
1351	–	int i;
1352	–
1035		memset(new_uid, 0, sizeof(new_uid));
1036
1037	<	if (ServerInfo.sid != NULL)
1038	<	{
1357	<	memcpy(new_uid, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1358	<	IRC_MAXSID));
1359	<	memcpy(&me.id, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1360	<	IRC_MAXSID));
1361	<	hash_add_id(&me);
1362	<	}
1037	>	if (!EmptyString(ServerInfo.sid))
1038	>	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1039
1040	<	for (i = 0; i < IRC_MAXSID; i++)
1041	<	if (new_uid[i] == '\0')
1040	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1041	>	if (new_uid[i] == '\0')
1042		new_uid[i] = 'A';
1043
1044	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1045	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1370	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1371	<	* -Dianora
1372	<	*/
1373	<	memcpy(new_uid+IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1374	<
1375	<	entering_umode_cb = register_callback("entering_umode", NULL);
1376	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1377	<	uid_get_cb = register_callback("uid_get", uid_get);
1378	<	}
1379	<
1380	<	/*
1381	<	* uid_get
1382	<	*
1383	<	* inputs       - struct Client *
1384	<	* output       - new UID is returned to caller
1385	<	* side effects - new_uid is incremented by one.
1386	<	*/
1387	<	static void *
1388	<	uid_get(va_list args)
1389	<	{
1390	<	add_one_to_uid(TOTALSIDUID-1);    /* index from 0 */
1391	<	return ((void *) new_uid);
1044	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1045	>	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1046		}
1047
1048		/*
#	Line 1402 | Line 1056 | uid_get(va_list args)
1056		static void
1057		add_one_to_uid(int i)
1058		{
1059	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1059	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1060		{
1061		if (new_uid[i] == 'Z')
1062		new_uid[i] = '0';
#	Line 1411 | Line 1065 | add_one_to_uid(int i)
1065		new_uid[i] = 'A';
1066		add_one_to_uid(i-1);
1067		}
1068	<	else new_uid[i] = new_uid[i] + 1;
1068	>	else
1069	>	++new_uid[i];
1070		}
1071		else
1072		{
1073	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1073	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1074		if (new_uid[i] == 'Z')
1075	<	memcpy(new_uid+IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1075	>	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1076		else
1077	<	new_uid[i] = new_uid[i] + 1;
1077	>	++new_uid[i];
1078		}
1079		}
1080
1081		/*
1082	+	* uid_get
1083	+	*
1084	+	* inputs       - struct Client *
1085	+	* output       - new UID is returned to caller
1086	+	* side effects - new_uid is incremented by one.
1087	+	*/
1088	+	static const char *
1089	+	uid_get(void)
1090	+	{
1091	+	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1092	+	return new_uid;
1093	+	}
1094	+
1095	+	/*
1096		* init_isupport()
1097		*
1098		* input        - NONE
#	Line 1433 | Line 1102 | add_one_to_uid(int i)
1102		void
1103		init_isupport(void)
1104		{
1436	–	isupportFile = init_MessageLine();
1437	–
1105		add_isupport("CALLERID", NULL, -1);
1106		add_isupport("CASEMAPPING", CASEMAP, -1);
1107	+	add_isupport("DEAF", "D", -1);
1108		add_isupport("KICKLEN", NULL, KICKLEN);
1109		add_isupport("MODES", NULL, MAXMODEPARAMS);
1442	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1110		#ifdef HALFOPS
1111		add_isupport("PREFIX", "(ohv)@%+", -1);
1112		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1447 | Line 1114 | init_isupport(void)
1114		add_isupport("PREFIX", "(ov)@+", -1);
1115		add_isupport("STATUSMSG", "@+", -1);
1116		#endif
1117	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1117	>	add_isupport("EXCEPTS", "e", -1);
1118	>	add_isupport("INVEX", "I", -1);
1119		}
1120
1121		/*
#	Line 1478 | Line 1146 | add_isupport(const char *name, const cha
1146
1147		if (ptr == NULL)
1148		{
1149	<	support = MyMalloc(sizeof(*support));
1149	>	support = MyCalloc(sizeof(*support));
1150		dlinkAddTail(support, &support->node, &support_list);
1151		}
1152
1153	<	DupString(support->name, name);
1154	<	if (options != NULL)
1155	<	DupString(support->options, options);
1153	>	support->name = xstrdup(name);
1154	>	if (options)
1155	>	support->options = xstrdup(options);
1156		support->number = n;
1157
1158		rebuild_isupport_message_line();
#	Line 1531 | Line 1199 | rebuild_isupport_message_line(void)
1199		{
1200		char isupportbuffer[IRCD_BUFSIZE];
1201		char *p = isupportbuffer;
1202	<	dlink_node *ptr = NULL;
1202	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1203		int n = 0;
1204		int tokens = 0;
1205		size_t len = 0;
1206	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1206	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1207
1208	<	destroy_MessageLine(isupportFile);
1208	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1209	>	{
1210	>	dlinkDelete(ptr, &support_list_lines);
1211	>	MyFree(ptr->data);
1212	>	free_dlink_node(ptr);
1213	>	}
1214
1215		DLINK_FOREACH(ptr, support_list.head)
1216		{
1217		struct Isupport *support = ptr->data;
1218
1219	<	p += (n = ircsprintf(p, "%s", support->name));
1219	>	p += (n = sprintf(p, "%s", support->name));
1220		len += n;
1221
1222	<	if (support->options != NULL)
1222	>	if (support->options)
1223		{
1224	<	p += (n = ircsprintf(p, "=%s", support->options));
1224	>	p += (n = sprintf(p, "=%s", support->options));
1225		len += n;
1226		}
1227
1228		if (support->number > 0)
1229		{
1230	<	p += (n = ircsprintf(p, "=%d", support->number));
1230	>	p += (n = sprintf(p, "=%d", support->number));
1231		len += n;
1232		}
1233
#	Line 1567 | Line 1240 | rebuild_isupport_message_line(void)
1240		if (*--p == ' ')
1241		*p = '\0';
1242
1243	<	addto_MessageLine(isupportFile, isupportbuffer);
1243	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1244		p = isupportbuffer;
1245		len = 0;
1246		n = tokens = 0;
1247		}
1248		}
1249
1250	<	if (len != 0)
1250	>	if (len)
1251		{
1252		if (*--p == ' ')
1253		*p = '\0';
1254	<	addto_MessageLine(isupportFile, isupportbuffer);
1254	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1255		}
1256		}

Diff Legend

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