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 849 by db, Mon Feb 19 19:41:59 2007 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4709 by michael, Mon Oct 6 16:52: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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
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"
49	–	#include "supported.h"
50	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45	+	#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
48	<	#include "s_misc.h"
49	<	#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;
47	>	#include "misc.h"
48	>	#include "parse.h"
49	>	#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
52	<
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 void introduce_client(struct Client *, struct Client *);
71	<	static void *uid_get(va_list);
52	>	static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
57	<
77	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 82 | Line 62 | struct Isupport
62		int number;
63		};
64
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
65	>	static dlink_list support_list;
66	>	static dlink_list support_list_lines;
67
68		/* memory is cheap. map 0-255 to equivalent mode */
69	<	unsigned int user_modes[256] =
69	>	const unsigned int user_modes[256] =
70		{
71		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 95 | Line 75 | unsigned int user_modes[256] =
75		0,                  /* @ */
76		0,                  /* A */
77		0,                  /* B */
78	<	UMODE_CCONN_FULL,   /* C */
78	>	0,                  /* C */
79		UMODE_DEAF,         /* D */
80		0,                  /* E */
81	<	0,                  /* F */
81	>	UMODE_FARCONNECT,   /* F */
82		UMODE_SOFTCALLERID, /* G */
83	<	0,                  /* H */
83	>	UMODE_HIDDEN,       /* H */
84		0,                  /* I */
85		0,                  /* J */
86		0,                  /* K */
#	Line 110 | Line 90 | unsigned int user_modes[256] =
90		0,                  /* O */
91		0,                  /* P */
92		0,                  /* Q */
93	<	0,                  /* R */
94	<	0,                  /* S */
93	>	UMODE_REGONLY,      /* R */
94	>	UMODE_SSL,          /* S */
95		0,                  /* T */
96		0,                  /* U */
97		0,                  /* V */
98	<	0,                  /* W */
98	>	UMODE_WEBIRC,       /* W */
99		0,                  /* X */
100		0,                  /* Y */
101		0,                  /* Z 0x5A */
102	<	0, 0, 0, 0, 0,      /* 0x5F   */
102	>	0, 0, 0, 0, 0,      /* 0x5F   */
103		0,                  /* 0x60   */
104		UMODE_ADMIN,        /* a */
105		UMODE_BOTS,         /* b */
106		UMODE_CCONN,        /* c */
107		UMODE_DEBUG,        /* d */
108	<	0,                  /* e */
108	>	UMODE_EXTERNAL,     /* e */
109		UMODE_FULL,         /* f */
110		UMODE_CALLERID,     /* g */
111		0,                  /* h */
112		UMODE_INVISIBLE,    /* i */
113	<	0,                  /* j */
113	>	UMODE_REJ,          /* j */
114		UMODE_SKILL,        /* k */
115		UMODE_LOCOPS,       /* l */
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
121	<	UMODE_REJ,          /* r */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121	>	UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
124		UMODE_UNAUTH,       /* u */
125		0,                  /* v */
126		UMODE_WALLOP,       /* w */
127	<	UMODE_EXTERNAL,     /* x */
127	>	UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 165 | Line 145 | assemble_umode_buffer(void)
145		unsigned int idx = 0;
146		char *umode_buffer_ptr = umode_buffer;
147
148	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
148	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
149		if (user_modes[idx])
150		*umode_buffer_ptr++ = idx;
151
#	Line 179 | Line 159 | assemble_umode_buffer(void)
159		* side effects - display to client user counts etc.
160		*/
161		void
162	<	show_lusers(struct Client *source_p)
162	>	show_lusers(struct Client *source_p)
163		{
164	<	const char *from, *to;
164	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_server_list));
167	>	else
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170	>
171	>	if (Count.oper)
172	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173	>
174	>	if (dlink_list_length(&unknown_list))
175	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176	>
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
180	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
182	<	from = me.id;
183	<	to = source_p->id;
182	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
183	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
184		}
185		else
186		{
187	<	from = me.name;
188	<	to = source_p->name;
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
188	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
189		}
190
191	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
198	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
199	<	from, to, (Count.total-Count.invisi),
200	<	Count.invisi, dlink_list_length(&global_serv_list));
201	<	else
202	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
203	<	(Count.total-Count.invisi), Count.invisi, 1);
191	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192
193	<	if (Count.oper > 0)
194	<	sendto_one(source_p, form_str(RPL_LUSEROP),
195	<	from, to, Count.oper);
208	<
209	<	if (dlink_list_length(&unknown_list) > 0)
210	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
211	<	from, to, dlink_list_length(&unknown_list));
212	<
213	<	if (dlink_list_length(&global_channel_list) > 0)
214	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
215	<	from, to, dlink_list_length(&global_channel_list));
216	<
217	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
218	<	{
219	<	sendto_one(source_p, form_str(RPL_LUSERME),
220	<	from, to, Count.local, Count.myserver);
221	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
222	<	from, to, Count.local, Count.max_loc,
223	<	Count.local, Count.max_loc);
224	<	}
225	<	else
226	<	{
227	<	sendto_one(source_p, form_str(RPL_LUSERME),
228	<	from, to, Count.total, 0);
229	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
230	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
232	<	}
233	<
234	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
235	<	from, to, Count.total, Count.max_tot,
236	<	Count.total, Count.max_tot);
237	<
238	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
239	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
240	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
193	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
194	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
195	>	Count.max_loc_cli, Count.totalrestartcount);
196
197	<	if (Count.local > MaxClientCount)
198	<	MaxClientCount = Count.local;
197	>	if (Count.local > Count.max_loc_cli)
198	>	Count.max_loc_cli = Count.local;
199
200	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
201	<	MaxConnectionCount = Count.local + Count.myserver;
200	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
201	>	Count.max_loc_con = Count.local + Count.myserver;
202		}
203
204		/* show_isupport()
#	Line 253 | Line 208 | show_lusers(struct Client *source_p)
208		* side effects - display to client what we support (for them)
209		*/
210		void
211	<	show_isupport(struct Client *source_p)
211	>	show_isupport(struct Client *source_p)
212		{
213	<	send_message_file(source_p, isupportFile);
213	>	const dlink_node *ptr = NULL;
214	>
215	>	DLINK_FOREACH(ptr, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
242	<	void
243	<	register_local_user(struct Client *client_p, struct Client *source_p,
244	<	const char *nick, const char *username)
219	>
220	>	/* report_and_set_user_flags()
221	>	*
222	>	* inputs       - pointer to source_p
223	>	*              - pointer to conf for this user
224	>	* output       - NONE
225	>	* side effects - Report to user any special flags
226	>	*                they are getting, and set them.
227	>	*/
228	>	static void
229	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
230	>	{
231	>	/* If this user is being spoofed, tell them so */
232	>	if (IsConfDoSpoofIp(conf))
233	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234	>
235	>	/* If this user is in the exception class, Set it "E lined" */
236	>	if (IsConfExemptKline(conf))
237	>	{
238	>	SetExemptKline(source_p);
239	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
240	>	}
241	>
242	>	/*
243	>	* The else here is to make sure that G line exempt users
244	>	* do not get noticed twice.
245	>	*/
246	>	else if (IsConfExemptGline(conf))
247	>	{
248	>	SetExemptGline(source_p);
249	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
250	>	}
251	>
252	>	if (IsConfExemptResv(conf))
253	>	{
254	>	SetExemptResv(source_p);
255	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
256	>	}
257	>
258	>	/* If this user is exempt from user limits set it "F lined" */
259	>	if (IsConfExemptLimits(conf))
260	>	{
261	>	SetExemptLimits(source_p);
262	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
263	>	}
264	>
265	>	if (IsConfCanFlood(conf))
266	>	{
267	>	SetCanFlood(source_p);
268	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	>	"protection, aren't you fearsome.");
270	>	}
271	>	}
272	>
273	>	/* introduce_client()
274	>	*
275	>	* inputs       - source_p
276	>	* output       - NONE
277	>	* side effects - This common function introduces a client to the rest
278	>	*                of the net, either from a local client connect or
279	>	*                from a remote connect.
280	>	*/
281	>	static void
282	>	introduce_client(struct Client *source_p)
283		{
288	–	const struct AccessItem *aconf = NULL;
289	–	char ipaddr[HOSTIPLEN];
284		dlink_node *ptr = NULL;
285	<	dlink_node *m = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(ptr, local_server_list.head)
301	>	{
302	>	struct Client *server = ptr->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	>	"0" : source_p->sockhost, source_p->id,
315	>	source_p->svid,
316	>	source_p->info);
317	>	else
318	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
319	>	source_p->servptr->id,
320	>	source_p->name, source_p->hopcount+1,
321	>	(unsigned long)source_p->tsinfo,
322	>	ubuf, source_p->username, source_p->host,
323	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	>	"0" : source_p->sockhost, source_p->id, source_p->info);
325	>
326	>	if (!EmptyString(source_p->certfp))
327	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
328	>	}
329	>	}
330	>
331	>	/* user_welcome()
332	>	*
333	>	* inputs       - client pointer to client to welcome
334	>	* output       - NONE
335	>	* side effects -
336	>	*/
337	>	static void
338	>	user_welcome(struct Client *source_p)
339	>	{
340	>	#if defined(__TIME__) && defined(__DATE__)
341	>	static const char built_date[] = __DATE__ " at " __TIME__;
342	>	#else
343	>	static const char built_date[] = "unknown";
344	>	#endif
345	>
346	>	#ifdef HAVE_LIBCRYPTO
347	>	if (HasFlag(source_p, FLAGS_SSL))
348	>	{
349	>	AddUMode(source_p, UMODE_SSL);
350	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351	>	ssl_get_cipher(source_p->connection->fd.ssl));
352	>	}
353	>	#endif
354	>
355	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
356	>	source_p->name);
357	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358	>	get_listener_name(source_p->connection->listener), ircd_version);
359	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
360	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361	>	show_isupport(source_p);
362	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
363
364	<	assert(source_p != NULL);
364	>	show_lusers(source_p);
365	>	motd_signon(source_p);
366	>	}
367	>
368	>	/* check_xline()
369	>	*
370	>	* inputs       - pointer to client to test
371	>	* outupt       - 1 if exiting 0 if ok
372	>	* side effects -
373	>	*/
374	>	static int
375	>	check_xline(struct Client *source_p)
376	>	{
377	>	struct MaskItem *conf = NULL;
378	>	const char *reason = NULL;
379	>
380	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
381	>	{
382	>	++conf->count;
383	>
384	>	if (conf->reason)
385	>	reason = conf->reason;
386	>	else
387	>	reason = CONF_NOREASON;
388	>
389	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
390	>	"X-line Rejecting [%s] [%s], user %s [%s]",
391	>	source_p->info, reason,
392	>	get_client_name(source_p, HIDE_IP),
393	>	source_p->sockhost);
394	>
395	>	++ServerStats.is_ref;
396	>	exit_client(source_p, "Bad user info");
397	>	return 1;
398	>	}
399	>
400	>	return 0;
401	>	}
402	>
403	>	/*! \brief This function is called when both NICK and USER messages
404	>	*      have been accepted for the client, in whatever order. Only
405	>	*      after this, is the UID message propagated.
406	>	* \param source_p Pointer to given client to introduce
407	>	*/
408	>	void
409	>	register_local_user(struct Client *source_p)
410	>	{
411	>	const char *id = NULL;
412	>	const struct MaskItem *conf = NULL;
413	>
414	>	assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416	<	assert(source_p->username != username);
296	<	assert(!source_p->localClient->registration);
416	>	assert(!source_p->connection->registration);
417
418	<	ClearCap(client_p, CAP_TS6);
418	>	ClearCap(source_p, CAP_TS6);
419
420	<	if (ConfigFileEntry.ping_cookie)
420	>	if (ConfigGeneral.ping_cookie)
421		{
422	<	if (!IsPingSent(source_p) &&
303	<	source_p->localClient->random_ping == 0)
422	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
423		{
424	<	source_p->localClient->random_ping = (unsigned long)rand();
425	<	sendto_one(source_p, "PING :%lu",
426	<	source_p->localClient->random_ping);
424	>	do
425	>	source_p->connection->random_ping = genrand_int32();
426	>	while (!source_p->connection->random_ping);
427	>
428	>	sendto_one(source_p, "PING :%u",
429	>	source_p->connection->random_ping);
430		SetPingSent(source_p);
431		return;
432		}
#	Line 313 | Line 435 | register_local_user(struct Client *clien
435		return;
436		}
437
438	<	source_p->localClient->last = CurrentTime;
438	>	source_p->connection->last_privmsg = CurrentTime;
439		/* Straight up the maximum rate of flooding... */
440	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
440	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
441
442	<	if (!execute_callback(client_check_cb, source_p, username))
442	>	if (!check_client(source_p))
443		return;
444
445	<	if (valid_hostname(source_p->host) == 0)
445	>	if (!valid_hostname(source_p->host))
446		{
447	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
448	<	"character in your hostname", me.name, source_p->name);
447	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
448	>	"character in your hostname");
449		strlcpy(source_p->host, source_p->sockhost,
450		sizeof(source_p->host));
451		}
452
453	<	ptr   = source_p->localClient->confs.head;
332	<	aconf = map_to_conf(ptr->data);
453	>	conf = source_p->connection->confs.head->data;
454
455		if (!IsGotId(source_p))
456		{
457	<	const char *p = NULL;
457	>	char username[USERLEN + 1] = "";
458	>	const char *p = username;
459		unsigned int i = 0;
460
461	<	if (IsNeedIdentd(aconf))
461	>	if (IsNeedIdentd(conf))
462		{
463	<	ServerStats->is_ref++;
464	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
465	<	"identd to use this server", me.name, source_p->name);
466	<	exit_client(source_p, &me, "Install identd");
463	>	++ServerStats.is_ref;
464	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
465	>	"identd to use this server");
466	>	exit_client(source_p, "Install identd");
467		return;
468		}
469
470	<	p = username;
470	>	strlcpy(username, source_p->username, sizeof(username));
471
472	<	if (!IsNoTilde(aconf))
472	>	if (!IsNoTilde(conf))
473		source_p->username[i++] = '~';
474
475	<	while (*p && i < USERLEN)
476	<	{
355	<	if (*p != '[')
356	<	source_p->username[i++] = *p;
357	<	p++;
358	<	}
475	>	for (; *p && i < USERLEN; ++p)
476	>	source_p->username[i++] = *p;
477
478		source_p->username[i] = '\0';
479		}
480
481	<	/* password check */
482	<	if (!EmptyString(aconf->passwd))
481	>	/* Password check */
482	>	if (!EmptyString(conf->passwd))
483		{
484	<	const char *pass = source_p->localClient->passwd;
367	<
368	<	if (!match_conf_password(pass, aconf))
484	>	if (!match_conf_password(source_p->connection->password, conf))
485		{
486	<	ServerStats->is_ref++;
487	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
488	<	me.name, source_p->name);
489	<	exit_client(source_p, &me, "Bad Password");
486	>	++ServerStats.is_ref;
487	>
488	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
489	>	exit_client(source_p, "Bad Password");
490		return;
491		}
492		}
493
494	<	/* don't free source_p->localClient->passwd here - it can be required
494	>	/*
495	>	* Don't free source_p->connection->password here - it can be required
496		* by masked /stats I if there are auth{} blocks with need_password = no;
497		* --adx
498		*/
499
500	<	/* report if user has &^>= etc. and set flags as needed in source_p */
501	<	report_and_set_user_flags(source_p, aconf);
500	>	/*
501	>	* Report if user has &^>= etc. and set flags as needed in source_p
502	>	*/
503	>	report_and_set_user_flags(source_p, conf);
504	>
505	>	if (IsDead(source_p))
506	>	return;
507
508	<	/* Limit clients -
508	>	/*
509	>	* Limit clients -
510		* We want to be able to have servers and F-line clients
511		* connect, so save room for "buffer" connections.
512		* Smaller servers may want to decrease this, and it should
513		* probably be just a percentage of the MAXCLIENTS...
514		*   -Taner
515		*/
516	<	/* Except "F:" clients */
517	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
395	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
516	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
517	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
518		{
519	<	sendto_realops_flags(UMODE_FULL, L_ALL,
519	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
520		"Too many clients, rejecting %s[%s].",
521	<	nick, source_p->host);
522	<	ServerStats->is_ref++;
523	<	exit_client(source_p, &me, "Sorry, server is full - try later");
521	>	source_p->name, source_p->host);
522	>	++ServerStats.is_ref;
523	>	exit_client(source_p, "Sorry, server is full - try later");
524		return;
525		}
526
527	<	/* valid user name check */
406	<	if (valid_username(source_p->username) == 0)
527	>	if (!valid_username(source_p->username, 1))
528		{
529	<	char tmpstr2[IRCD_BUFSIZE];
529	>	char buf[IRCD_BUFSIZE] = "";
530
531	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
532	<	nick, source_p->username, source_p->host);
533	<	ServerStats->is_ref++;
534	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
535	<	exit_client(source_p, &me, tmpstr2);
531	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
532	>	"Invalid username: %s (%s@%s)",
533	>	source_p->name, source_p->username, source_p->host);
534	>	++ServerStats.is_ref;
535	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
536	>	exit_client(source_p, buf);
537		return;
538		}
539
418	–	assert(source_p == client_p);
419	–
540		if (check_xline(source_p))
541		return;
542
543	<	if (IsDead(client_p))
544	<	return;
425	<
426	<	if (me.id[0])
427	<	{
428	<	const char *id = execute_callback(uid_get_cb, source_p);
429	<
430	<	while (hash_find_id(id) != NULL)
431	<	id = uid_get(NULL);
432	<
433	<	strlcpy(source_p->id, id, sizeof(source_p->id));
434	<	hash_add_id(source_p);
435	<	}
436	<
437	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
438	<	source_p->localClient->ip.ss_len, ipaddr,
439	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
440	<
441	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
442	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
443	<	nick, source_p->username, source_p->host,
444	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
445	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
446	<	source_p->info);
447	<
448	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
449	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
450	<	nick, source_p->username, source_p->host,
451	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
452	<	"255.255.255.255" : ipaddr,
453	<	get_client_class(source_p),
454	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
455	<	"<hidden>" : source_p->client_host,
456	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
457	<	"<hidden>" : source_p->client_server,
458	<	source_p->info);
543	>	while (hash_find_id((id = uid_get())))
544	>	;
545
546	+	strlcpy(source_p->id, id, sizeof(source_p->id));
547	+	hash_add_id(source_p);
548
549	<	/* If they have died in send_* don't do anything. */
550	<	if (IsDead(source_p))
551	<	return;
549	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
550	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
551	>	source_p->name, source_p->username, source_p->host,
552	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553	>	"255.255.255.255" : source_p->sockhost,
554	>	get_client_class(&source_p->connection->confs),
555	>	source_p->info, source_p->id);
556
557	<	if (ConfigFileEntry.invisible_on_connect)
557	>	if (ConfigGeneral.invisible_on_connect)
558		{
559	<	source_p->umodes |= UMODE_INVISIBLE;
560	<	Count.invisi++;
559	>	AddUMode(source_p, UMODE_INVISIBLE);
560	>	++Count.invisi;
561		}
562
563	<	if ((++Count.local) > Count.max_loc)
563	>	if (++Count.local > Count.max_loc)
564		{
565		Count.max_loc = Count.local;
566
567		if (!(Count.max_loc % 10))
568	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
568	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
569	>	"New maximum local client connections: %u",
570		Count.max_loc);
571		}
572
480	–	SetClient(source_p);
481	–
482	–	source_p->servptr = &me;
483	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
484	–
485	–	/* Increment our total user count here */
573		if (++Count.total > Count.max_tot)
574		Count.max_tot = Count.total;
575	<	Count.totalrestartcount++;
575	>	++Count.totalrestartcount;
576
577	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
577	>	assert(source_p->servptr == &me);
578	>	SetClient(source_p);
579	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
580	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
581
582	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
583	<	{
584	<	free_dlink_node(m);
585	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
496	<	}
497	<	else assert(0);
582	>	assert(dlinkFind(&unknown_list, source_p));
583	>
584	>	dlink_move_node(&source_p->connection->lclient_node,
585	>	&unknown_list, &local_client_list);
586
587		user_welcome(source_p);
588		add_user_host(source_p->username, source_p->host, 0);
589		SetUserHost(source_p);
590
591	<	introduce_client(client_p, source_p);
591	>	introduce_client(source_p);
592		}
593
594		/* register_remote_user()
595		*
596	<	* inputs       - client_p directly connected client
509	<	*              - source_p remote or directly connected client
596	>	* inputs       - source_p remote or directly connected client
597		*              - username to register as
598		*              - host name to register as
599		*              - server name
513	–	*              - realname (gecos)
600		* output       - NONE
601		* side effects - This function is called when a remote client
602		*                is introduced by a server.
603		*/
604		void
605	<	register_remote_user(struct Client *client_p, struct Client *source_p,
606	<	const char *username, const char *host, const char *server,
607	<	const char *realname)
522	<	{
523	<	struct Client *target_p = NULL;
524	<
525	<	assert(source_p != NULL);
526	<	assert(source_p->username != username);
527	<
528	<	strlcpy(source_p->host, host, sizeof(source_p->host));
529	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
530	<	strlcpy(source_p->username, username, sizeof(source_p->username));
531	<
532	<	/*
533	<	* coming from another server, take the servers word for it
534	<	*/
535	<	source_p->servptr = find_server(server);
536	<
537	<	/* Super GhostDetect:
538	<	* If we can't find the server the user is supposed to be on,
539	<	* then simply blow the user away.        -Taner
540	<	*/
541	<	if (source_p->servptr == NULL)
542	<	{
543	<	sendto_realops_flags(UMODE_ALL, L_ALL,
544	<	"No server %s for user %s[%s@%s] from %s",
545	<	server, source_p->name, source_p->username,
546	<	source_p->host, source_p->from->name);
547	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
548	<
549	<	SetKilled(source_p);
550	<	exit_client(source_p, &me, "Ghosted Client");
551	<	return;
552	<	}
605	>	register_remote_user(struct Client *source_p)
606	>	{
607	>	const struct Client *target_p = NULL;
608
609		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
610		{
611	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
611	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
612		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
613	<	client_p->name, source_p->name, source_p->username,
613	>	source_p->from->name, source_p->name, source_p->username,
614		source_p->host, source_p->servptr->name,
615		target_p->name, target_p->from->name);
616	<	kill_client(client_p, source_p,
617	<	"%s (NICK from wrong direction (%s != %s))",
618	<	me.name, source_p->servptr->name, target_p->from->name);
619	<	SetKilled(source_p);
620	<	exit_client(source_p, &me, "USER server wrong direction");
616	>	sendto_one(source_p->from,
617	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
618	>	me.id, source_p->id, me.name, source_p->servptr->name,
619	>	target_p->from->name);
620	>
621	>	AddFlag(source_p, FLAGS_KILLED);
622	>	exit_client(source_p, "USER server wrong direction");
623		return;
624		}
625
626	<	/* Increment our total user count here */
626	>	/*
627	>	* If the nick has been introduced by a services server,
628	>	* make it a service as well.
629	>	*/
630	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
631	>	AddFlag(source_p, FLAGS_SERVICE);
632	>
633		if (++Count.total > Count.max_tot)
634		Count.max_tot = Count.total;
635
573	–	++source_p->from->serv->dep_users;
574	–
636		SetClient(source_p);
637	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
637	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
638	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
639		add_user_host(source_p->username, source_p->host, 1);
640		SetUserHost(source_p);
641
642	<	introduce_client(client_p, source_p);
643	<	}
644	<
645	<	/* introduce_client()
646	<	*
647	<	* inputs       - client_p
586	<	*              - source_p
587	<	* output       - NONE
588	<	* side effects - This common function introduces a client to the rest
589	<	*                of the net, either from a local client connect or
590	<	*                from a remote connect.
591	<	*/
592	<	static void
593	<	introduce_client(struct Client *client_p, struct Client *source_p)
594	<	{
595	<	dlink_node *server_node = NULL;
596	<	static char ubuf[12];
597	<
598	<	if (MyClient(source_p))
599	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
600	<	else
601	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
602	<
603	<	if (*ubuf == '\0')
604	<	{
605	<	ubuf[0] = '+';
606	<	ubuf[1] = '\0';
607	<	}
608	<
609	<	/* arghhh one could try not introducing new nicks to ll leafs
610	<	* but then you have to introduce them "on the fly" in SJOIN
611	<	* not fun.
612	<	* Its not going to cost much more bandwidth to simply let new
613	<	* nicks just ride on through.
614	<	*/
642	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
643	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
644	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
645	>	source_p->servptr->name,
646	>	source_p->name, source_p->username, source_p->host,
647	>	source_p->info, source_p->id);
648
649	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
617	<	* you _need_ to if you aren't going to burst everyone initially.
618	<	*
619	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
620	<	* in that case just send it to the uplink.
621	<	* -davidt
622	<	* rewritten to cope with SIDs .. eww eww eww --is
623	<	*/
624	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
625	<	client_p != uplink)
626	<	{
627	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
628	<	{
629	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
630	<	source_p->servptr->id,
631	<	source_p->name, source_p->hopcount+1,
632	<	(unsigned long)source_p->tsinfo,
633	<	ubuf, source_p->username, source_p->host,
634	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
635	<	"0" : source_p->sockhost, source_p->id, source_p->info);
636	<	}
637	<	else
638	<	{
639	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
640	<	source_p->name, source_p->hopcount+1,
641	<	(unsigned long)source_p->tsinfo,
642	<	ubuf, source_p->username, source_p->host,
643	<	source_p->servptr->name, source_p->info);
644	<	}
645	<	}
646	<	else
647	<	{
648	<	DLINK_FOREACH(server_node, serv_list.head)
649	<	{
650	<	struct Client *server = server_node->data;
651	<
652	<	if (IsCapable(server, CAP_LL) || server == client_p)
653	<	continue;
654	<
655	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
656	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
657	<	source_p->servptr->id,
658	<	source_p->name, source_p->hopcount+1,
659	<	(unsigned long)source_p->tsinfo,
660	<	ubuf, source_p->username, source_p->host,
661	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
662	<	"0" : source_p->sockhost, source_p->id, source_p->info);
663	<	else
664	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
665	<	source_p->name, source_p->hopcount+1,
666	<	(unsigned long)source_p->tsinfo,
667	<	ubuf, source_p->username, source_p->host,
668	<	source_p->servptr->name, source_p->info);
669	<	}
670	<	}
649	>	introduce_client(source_p);
650		}
651
652		/* valid_hostname()
#	Line 684 | Line 663 | valid_hostname(const char *hostname)
663		{
664		const char *p = hostname;
665
666	<	assert(p != NULL);
666	>	assert(p);
667
668	<	if ('.' == *p || ':' == *p)
668	>	if (EmptyString(p) || *p == '.' || *p == ':')
669		return 0;
670
671	<	while (*p)
693	<	{
671	>	for (; *p; ++p)
672		if (!IsHostChar(*p))
673		return 0;
696	–	p++;
697	–	}
674
675	<	return 1;
675	>	return p - hostname <= HOSTLEN;
676		}
677
678		/* valid_username()
#	Line 711 | Line 687 | valid_hostname(const char *hostname)
687		* style of username
688		*/
689		int
690	<	valid_username(const char *username)
690	>	valid_username(const char *username, const int local)
691		{
692	<	int dots      = 0;
692	>	unsigned int dots = 0;
693		const char *p = username;
694
695	<	assert(p != NULL);
695	>	assert(p);
696
697	<	if ('~' == *p)
697	>	if (*p == '~')
698		++p;
699
700	<	/* reject usernames that don't start with an alphanum
700	>	/*
701	>	* Reject usernames that don't start with an alphanum
702		* i.e. reject jokers who have '-@somehost' or '.@somehost'
703		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
704		*/
705		if (!IsAlNum(*p))
706		return 0;
707
708	<	while (*++p)
708	>	if (local)
709		{
710	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
710	>	while (*++p)
711		{
712	<	dots++;
713	<
714	<	if (dots > ConfigFileEntry.dots_in_ident)
715	<	return 0;
716	<	if (!IsUserChar(p[1]))
712	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
713	>	{
714	>	if (++dots > ConfigGeneral.dots_in_ident)
715	>	return 0;
716	>	if (!IsUserChar(*(p + 1)))
717	>	return 0;
718	>	}
719	>	else if (!IsUserChar(*p))
720		return 0;
721		}
742	–	else if (!IsUserChar(*p))
743	–	return 0;
744	–	}
745	–
746	–	return 1;
747	–	}
748	–
749	–	/* report_and_set_user_flags()
750	–	*
751	–	* inputs       - pointer to source_p
752	–	*              - pointer to aconf for this user
753	–	* output       - NONE
754	–	* side effects - Report to user any special flags
755	–	*                they are getting, and set them.
756	–	*/
757	–	static void
758	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
759	–	{
760	–	/* If this user is being spoofed, tell them so */
761	–	if (IsConfDoSpoofIp(aconf))
762	–	{
763	–	sendto_one(source_p,
764	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
765	–	me.name, source_p->name);
766	–	}
767	–
768	–	/* If this user is in the exception class, Set it "E lined" */
769	–	if (IsConfExemptKline(aconf))
770	–	{
771	–	SetExemptKline(source_p);
772	–	sendto_one(source_p,
773	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
774	–	me.name, source_p->name);
775	–	}
776	–
777	–	/* The else here is to make sure that G line exempt users
778	–	* do not get noticed twice.
779	–	*/
780	–	else if (IsConfExemptGline(aconf))
781	–	{
782	–	SetExemptGline(source_p);
783	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
784	–	me.name, source_p->name);
785	–	}
786	–
787	–	if (IsConfExemptResv(aconf))
788	–	{
789	–	SetExemptResv(source_p);
790	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
791	–	me.name, source_p->name);
792	–	}
793	–
794	–	/* If this user is exempt from user limits set it "F lined" */
795	–	if (IsConfExemptLimits(aconf))
796	–	{
797	–	SetExemptLimits(source_p);
798	–	sendto_one(source_p,
799	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
800	–	me.name,source_p->name);
722		}
723	<
803	<	/* If this user is exempt from idle time outs */
804	<	if (IsConfIdlelined(aconf))
723	>	else
724		{
725	<	SetIdlelined(source_p);
726	<	sendto_one(source_p,
727	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
809	<	me.name, source_p->name);
725	>	while (*++p)
726	>	if (!IsUserChar(*p))
727	>	return 0;
728		}
729
730	<	if (IsConfCanFlood(aconf))
813	<	{
814	<	SetCanFlood(source_p);
815	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
816	<	"protection, aren't you fearsome.",
817	<	me.name, source_p->name);
818	<	}
730	>	return p - username <= USERLEN;
731		}
732
733	<	/* do_local_user()
733	>	/* clean_nick_name()
734		*
735	<	* inputs       -
736	<	* output       - NONE
737	<	* side effects -
735	>	* input        - nickname
736	>	*              - whether it's a local nick (1) or remote (0)
737	>	* output       - none
738	>	* side effects - walks through the nickname, returning 0 if erroneous
739		*/
740	<	void
741	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
829	<	const char *username, const char *host, const char *server,
830	<	const char *realname)
740	>	int
741	>	valid_nickname(const char *nickname, const int local)
742		{
743	<	assert(source_p != NULL);
833	<	assert(source_p->username != username);
743	>	const char *p = nickname;
744
745	<	if (source_p == NULL)
836	<	return;
837	<
838	<	if (!IsUnknown(source_p))
839	<	{
840	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
841	<	me.name, nick);
842	<	return;
843	<	}
844	<
845	<	source_p->localClient->registration &= ~REG_NEED_USER;
745	>	assert(nickname && *nickname);
746
747		/*
748	<	* don't take the clients word for it, ever
748	>	* Nicks can't start with a digit or - or be 0 length.
749		*/
750	<	source_p->servptr = &me;
751	<
852	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
853	<
854	<	/* stash for later */
855	<	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
856	<	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
857	<
858	<	if (!IsGotId(source_p))
859	<	{
860	<	/* save the username in the client
861	<	* If you move this you'll break ping cookies..you've been warned
862	<	*/
863	<	strlcpy(source_p->username, username, sizeof(source_p->username));
864	<	}
865	<
866	<	if (!source_p->localClient->registration)
867	<	/* NICK already received, now I have USER... */
868	<	register_local_user(client_p, source_p, source_p->name, username);
869	<	}
870	<
871	<	/* change_simple_umode()
872	<	*
873	<	* this callback can be hooked to allow special handling of
874	<	* certain usermodes
875	<	*/
876	<	static void *
877	<	change_simple_umode(va_list args)
878	<	{
879	<	struct Client *client_p;
880	<	struct Client *source_p;
881	<	int what;
882	<	unsigned int flag;
883	<
884	<	client_p = va_arg(args, struct Client *);
885	<	source_p = va_arg(args, struct Client *);
886	<	what = va_arg(args, int);
887	<	flag = va_arg(args, unsigned int);
888	<
889	<	if (what == MODE_ADD)
890	<	source_p->umodes |= flag;
891	<	else
892	<	source_p->umodes &= ~flag;
893	<
894	<	return NULL;
895	<	}
896	<
897	<	/* set_user_mode()
898	<	*
899	<	* added 15/10/91 By Darren Reed.
900	<	* parv[0] - sender
901	<	* parv[1] - username to change mode for
902	<	* parv[2] - modes to change
903	<	*/
904	<	void
905	<	set_user_mode(struct Client *client_p, struct Client *source_p,
906	<	int parc, char *parv[])
907	<	{
908	<	unsigned int flag, setflags;
909	<	char **p, *m, buf[IRCD_BUFSIZE];
910	<	struct Client *target_p;
911	<	int what = MODE_ADD, badflag = 0, i;
912	<
913	<	assert(!(parc < 2));
914	<
915	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
916	<	{
917	<	if (MyConnect(source_p))
918	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
919	<	me.name, source_p->name, parv[1]);
920	<	return;
921	<	}
922	<
923	<	if (IsServer(source_p))
924	<	{
925	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
926	<	parv[1], source_p->name);
927	<	return;
928	<	}
929	<
930	<	if (source_p != target_p || target_p->from != source_p->from)
931	<	{
932	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
933	<	me.name, source_p->name);
934	<	return;
935	<	}
936	<
937	<	if (parc < 3)
938	<	{
939	<	m = buf;
940	<	*m++ = '+';
941	<
942	<	for (i = 0; i < 128; i++)
943	<	if (source_p->umodes & user_modes[i])
944	<	*m++ = (char)i;
945	<	*m = '\0';
946	<
947	<	sendto_one(source_p, form_str(RPL_UMODEIS),
948	<	me.name, source_p->name, buf);
949	<	return;
950	<	}
951	<
952	<	execute_callback(entering_umode_cb, client_p, source_p);
953	<
954	<	/* find flags already set for user */
955	<	setflags = source_p->umodes;
956	<
957	<	/* parse mode change string(s) */
958	<	for (p = &parv[2]; p && *p; p++)
959	<	{
960	<	for (m = *p; *m; m++)
961	<	{
962	<	switch (*m)
963	<	{
964	<	case '+':
965	<	what = MODE_ADD;
966	<	break;
967	<	case '-':
968	<	what = MODE_DEL;
969	<	break;
970	<	case 'o':
971	<	if (what == MODE_ADD)
972	<	{
973	<	if (IsServer(client_p) && !IsOper(source_p))
974	<	{
975	<	++Count.oper;
976	<	SetOper(source_p);
977	<	}
978	<	}
979	<	else
980	<	{
981	<	/* Only decrement the oper counts if an oper to begin with
982	<	* found by Pat Szuta, Perly , perly@xnet.com
983	<	*/
984	<	if (!IsOper(source_p))
985	<	break;
986	<
987	<	ClearOper(source_p);
988	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
989	<	Count.oper--;
990	<
991	<	if (MyConnect(source_p))
992	<	{
993	<	dlink_node *dm;
994	<
995	<	detach_conf(source_p, OPER_TYPE);
996	<	ClearOperFlags(source_p);
997	<
998	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
999	<	free_dlink_node(dm);
1000	<	}
1001	<	}
1002	<
1003	<	break;
1004	<
1005	<	/* we may not get these,
1006	<	* but they shouldnt be in default
1007	<	*/
1008	<	case ' ' :
1009	<	case '\n':
1010	<	case '\r':
1011	<	case '\t':
1012	<	break;
1013	<
1014	<	default:
1015	<	if ((flag = user_modes[(unsigned char)*m]))
1016	<	{
1017	<	if (MyConnect(source_p) && !IsOper(source_p) &&
1018	<	(ConfigFileEntry.oper_only_umodes & flag))
1019	<	{
1020	<	badflag = 1;
1021	<	}
1022	<	else
1023	<	execute_callback(umode_cb, client_p, source_p, what, flag);
1024	<	}
1025	<	else
1026	<	{
1027	<	if (MyConnect(source_p))
1028	<	badflag = 1;
1029	<	}
1030	<
1031	<	break;
1032	<	}
1033	<	}
1034	<	}
1035	<
1036	<	if (badflag)
1037	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1038	<	me.name, source_p->name);
1039	<
1040	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1041	<	{
1042	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1043	<	me.name, source_p->name);
1044	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1045	<	}
1046	<
1047	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1048	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1049	<	{
1050	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1051	<	me.name, source_p->name);
1052	<	source_p->umodes &= ~UMODE_ADMIN;
1053	<	}
750	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
751	>	return 0;
752
753	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
754	<	++Count.invisi;
755	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1058	<	--Count.invisi;
753	>	for (; *p; ++p)
754	>	if (!IsNickChar(*p))
755	>	return 0;
756
757	<	/*
1061	<	* compare new flags with old flags and send string which
1062	<	* will cause servers to update correctly.
1063	<	*/
1064	<	send_umode_out(client_p, source_p, setflags);
757	>	return p - nickname <= NICKLEN;
758		}
759
760		/* send_umode()
#	Line 1077 | Line 770 | set_user_mode(struct Client *client_p, s
770		*/
771		void
772		send_umode(struct Client *client_p, struct Client *source_p,
773	<	unsigned int old, unsigned int sendmask, char *umode_buf)
773	>	unsigned int old, char *umode_buf)
774		{
1082	–	int what = 0;
1083	–	unsigned int i;
1084	–	unsigned int flag;
775		char *m = umode_buf;
776	+	int what = 0;
777
778		/*
779	<	* build a string in umode_buf to represent the change in the user's
779	>	* Build a string in umode_buf to represent the change in the user's
780		* mode between the new (source_p->umodes) and 'old'.
781		*/
782	<	for (i = 0; i < 128; i++)
782	>	for (unsigned int i = 0; i < 128; ++i)
783		{
784	<	flag = user_modes[i];
1094	<	if (!flag)
1095	<	continue;
784	>	unsigned int flag = user_modes[i];
785
786	<	if (MyClient(source_p) && !(flag & sendmask))
786	>	if (!flag)
787		continue;
788
789	<	if ((flag & old) && !(source_p->umodes & flag))
789	>	if ((flag & old) && !HasUMode(source_p, flag))
790		{
791		if (what == MODE_DEL)
792		*m++ = (char)i;
#	Line 1108 | Line 797 | send_umode(struct Client *client_p, stru
797		*m++ = (char)i;
798		}
799		}
800	<	else if (!(flag & old) && (source_p->umodes & flag))
800	>	else if (!(flag & old) && HasUMode(source_p, flag))
801		{
802		if (what == MODE_ADD)
803		*m++ = (char)i;
#	Line 1125 | Line 814 | send_umode(struct Client *client_p, stru
814
815		if (*umode_buf && client_p)
816		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
817	<	source_p->name, source_p->username,
818	<	source_p->host, source_p->name, umode_buf);
817	>	client_p->name, client_p->username,
818	>	client_p->host, client_p->name, umode_buf);
819		}
820
821		/* send_umode_out()
#	Line 1136 | Line 825 | send_umode(struct Client *client_p, stru
825		* side effects - Only send ubuf out to servers that know about this client
826		*/
827		void
828	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1140	<	unsigned int old)
828	>	send_umode_out(struct Client *source_p, unsigned int old)
829		{
830	<	char buf[IRCD_BUFSIZE] = { '\0' };
1143	<	dlink_node *ptr = NULL;
830	>	char buf[IRCD_BUFSIZE] = "";
831
832	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1146	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
832	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
833
834		if (buf[0])
835	<	{
836	<	DLINK_FOREACH(ptr, serv_list.head)
1151	<	{
1152	<	struct Client *target_p = ptr->data;
1153	<
1154	<	if ((target_p != client_p) && (target_p != source_p))
1155	<	{
1156	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1157	<	(target_p->localClient->serverMask &
1158	<	source_p->lazyLinkClientExists))
1159	<	sendto_one(target_p, ":%s MODE %s :%s",
1160	<	ID_or_name(source_p, target_p),
1161	<	ID_or_name(source_p, target_p), buf);
1162	<	}
1163	<	}
1164	<	}
1165	<
1166	<	if (client_p && MyClient(client_p))
1167	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
835	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
836	>	source_p->id, source_p->id, buf);
837		}
838
839	<	/* user_welcome()
840	<	*
1172	<	* inputs       - client pointer to client to welcome
1173	<	* output       - NONE
1174	<	* side effects -
1175	<	*/
1176	<	static void
1177	<	user_welcome(struct Client *source_p)
839	>	void
840	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
841		{
842	<	#if defined(__TIME__) && defined(__DATE__)
1180	<	static const char built_date[] = __DATE__ " at " __TIME__;
1181	<	#else
1182	<	static const char built_date[] = "unknown";
1183	<	#endif
842	>	dlink_node *ptr = NULL;
843
844	<	#ifdef HAVE_LIBCRYPTO
845	<	if (source_p->localClient->fd.ssl != NULL)
1187	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1188	<	me.name, source_p->name,
1189	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1190	<	#endif
844	>	if (!strcmp(target_p->host, hostname))
845	>	return;
846
847	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
848	<	ServerInfo.network_name, source_p->name);
849	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
850	<	get_listener_name(source_p->localClient->listener), ircd_version);
851	<	sendto_one(source_p, form_str(RPL_CREATED),
852	<	me.name, source_p->name, built_date);
853	<	sendto_one(source_p, form_str(RPL_MYINFO),
854	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1200	<	show_isupport(source_p);
847	>	switch (what)
848	>	{
849	>	case MODE_ADD:
850	>	AddUMode(target_p, UMODE_HIDDENHOST);
851	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
852	>	break;
853	>	case MODE_DEL:
854	>	DelUMode(target_p, UMODE_HIDDENHOST);
855
856	<	if (source_p->id[0] != '\0')
857	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
858	<	source_p->name, source_p->id);
856	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
857	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
858	>	break;
859	>	default: return;
860	>	}
861
862	<	show_lusers(source_p);
862	>	if (ConfigGeneral.cycle_on_host_change)
863	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
864	>	target_p->name, target_p->username, target_p->host);
865	>
866	>	if (IsUserHostIp(target_p))
867	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
868
869	<	if (ConfigFileEntry.short_motd)
869	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
870	>
871	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
872	>	SetUserHost(target_p);
873	>
874	>	if (MyClient(target_p))
875		{
876	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
877	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1212	<	sendto_one(source_p,
1213	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1214	<	"read it", source_p->name);
1215	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1216	<	me.name, source_p->name, me.name);
1217	<	sendto_one(source_p, form_str(RPL_MOTD),
1218	<	me.name, source_p->name,
1219	<	"*** This is the short motd ***");
1220	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1221	<	me.name, source_p->name);
876	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
877	>	clear_ban_cache_client(target_p);
878		}
1223	–	else
1224	–	send_message_file(source_p, &ConfigFileEntry.motd);
1225	–	}
879
880	<	/* check_xline()
881	<	*
1229	<	* inputs       - pointer to client to test
1230	<	* outupt       - 1 if exiting 0 if ok
1231	<	* side effects -
1232	<	*/
1233	<	static int
1234	<	check_xline(struct Client *source_p)
1235	<	{
1236	<	struct ConfItem *conf = NULL;
1237	<	const char *reason = NULL;
880	>	if (!ConfigGeneral.cycle_on_host_change)
881	>	return;
882
883	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1240	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
883	>	DLINK_FOREACH(ptr, target_p->channel.head)
884		{
885	<	struct MatchItem *reg = map_to_conf(conf);
885	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
886	>	char *p = modebuf;
887	>	int len = 0;
888	>	const struct Membership *ms = ptr->data;
889
890	<	++reg->count;
891	<
892	<	if (reg->reason != NULL)
893	<	reason = reg->reason;
894	<	else
1249	<	reason = "No Reason";
890	>	if (has_member_flags(ms, CHFL_CHANOP))
891	>	{
892	>	*p++ = 'o';
893	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
894	>	}
895
896	<	sendto_realops_flags(UMODE_REJ, L_ALL,
897	<	"X-line Rejecting [%s] [%s], user %s [%s]",
898	<	source_p->info, reason,
899	<	get_client_name(source_p, HIDE_IP),
900	<	source_p->sockhost);
896	>	if (has_member_flags(ms, CHFL_HALFOP))
897	>	{
898	>	*p++ = 'h';
899	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
900	>	}
901
902	<	ServerStats->is_ref++;
1258	<	if (REJECT_HOLD_TIME > 0)
902	>	if (has_member_flags(ms, CHFL_VOICE))
903		{
904	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
905	<	me.name, source_p->name);
1262	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1263	<	SetCaptured(source_p);
904	>	*p++ = 'v';
905	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
906		}
1265	–	else
1266	–	exit_client(source_p, &me, "Bad user info");
1267	–	return 1;
1268	–	}
907
908	<	return 0;
1271	<	}
908	>	*p = '\0';
909
910	<	/* oper_up()
911	<	*
912	<	* inputs       - pointer to given client to oper
913	<	* output       - NONE
914	<	* side effects - Blindly opers up given source_p, using aconf info
915	<	*                all checks on passwords have already been done.
916	<	*                This could also be used by rsa oper routines.
910	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
911	>	target_p->name, target_p->username, target_p->host,
912	>	ms->chptr->name);
913	>	if (nickbuf[0])
914	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
915	>	target_p->servptr->name, ms->chptr->name,
916	>	modebuf, nickbuf);
917	>
918	>	}
919	>
920	>	if (target_p->away[0])
921	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
922	>	":%s!%s@%s AWAY :%s",
923	>	target_p->name, target_p->username,
924	>	target_p->host, target_p->away);
925	>	}
926	>
927	>	/*! \brief Blindly opers up given source_p, using conf info.
928	>	*         All checks on passwords have already been done.
929	>	* \param source_p Pointer to given client to oper
930		*/
931		void
932		oper_up(struct Client *source_p)
933		{
934	<	unsigned int old = source_p->umodes;
935	<	const char *operprivs = "";
1286	<	const struct AccessItem *oconf = NULL;
934	>	const unsigned int old = source_p->umodes;
935	>	const struct MaskItem *conf = source_p->connection->confs.head->data;
936
937	<	assert(source_p->localClient->confs.head);
1289	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
937	>	assert(source_p->connection->confs.head);
938
939		++Count.oper;
940		SetOper(source_p);
941
942	<	if (oconf->modes)
943	<	source_p->umodes |= oconf->modes;
944	<	else if (ConfigFileEntry.oper_umodes)
945	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
946	<	else
947	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
948	<	UMODE_WALLOP|UMODE_LOCOPS);
942	>	if (conf->modes)
943	>	AddUMode(source_p, conf->modes);
944	>	else if (ConfigGeneral.oper_umodes)
945	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
946	>
947	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
948	>	++Count.invisi;
949	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
950	>	--Count.invisi;
951
952		assert(dlinkFind(&oper_list, source_p) == NULL);
953		dlinkAdd(source_p, make_dlink_node(), &oper_list);
954
955	<	operprivs = oper_privs_as_string(oconf->port);
955	>	AddOFlag(source_p, conf->port);
956
957	<	SetOFlag(source_p, oconf->port);
957	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
958	>	AddUMode(source_p, UMODE_ADMIN);
959
960	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
961	<	source_p->umodes |= UMODE_ADMIN;
962	<	if (!IsOperN(source_p))
963	<	source_p->umodes &= ~UMODE_NCHANGE;
964	<
965	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1315	<	source_p->name, source_p->username, source_p->host);
1316	<	send_umode_out(source_p, source_p, old);
1317	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1318	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1319	<	me.name, source_p->name, operprivs);
1320	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
960	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
961	>	get_oper_name(source_p));
962	>	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
963	>	me.id, get_oper_name(source_p));
964	>	send_umode_out(source_p, old);
965	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
966		}
967
968	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
968	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
969
970		int
971		valid_sid(const char *sid)
972		{
1328	–
973		if (strlen(sid) == IRC_MAXSID)
974		if (IsDigit(*sid))
975		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1336 | Line 980 | valid_sid(const char *sid)
980
981		/*
982		* init_uid()
983	<	*
983	>	*
984		* inputs       - NONE
985		* output       - NONE
986		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1346 | Line 990 | valid_sid(const char *sid)
990		void
991		init_uid(void)
992		{
1349	–	int i;
1350	–
993		memset(new_uid, 0, sizeof(new_uid));
994
995	<	if (ServerInfo.sid != NULL)
996	<	{
1355	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1356	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1357	<
1358	<	hash_add_id(&me);
1359	<	}
995	>	if (!EmptyString(ConfigServerInfo.sid))
996	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
997
998	<	for (i = 0; i < IRC_MAXSID; i++)
999	<	if (new_uid[i] == '\0')
998	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
999	>	if (new_uid[i] == '\0')
1000		new_uid[i] = 'A';
1001
1002		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1366	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1367	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1368	–	* -Dianora
1369	–	*/
1003		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1371	–
1372	–	entering_umode_cb = register_callback("entering_umode", NULL);
1373	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1374	–	uid_get_cb = register_callback("uid_get", uid_get);
1004		}
1005
1006		/*
#	Line 1383 | Line 1012 | init_uid(void)
1012		*                note this is a recursive function
1013		*/
1014		static void
1015	<	add_one_to_uid(int i)
1015	>	add_one_to_uid(unsigned int i)
1016		{
1017	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1017	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1018		{
1019		if (new_uid[i] == 'Z')
1020		new_uid[i] = '0';
1021		else if (new_uid[i] == '9')
1022		{
1023		new_uid[i] = 'A';
1024	<	add_one_to_uid(i-1);
1024	>	add_one_to_uid(i - 1);
1025		}
1026		else
1027		++new_uid[i];
#	Line 1414 | Line 1043 | add_one_to_uid(int i)
1043		* output       - new UID is returned to caller
1044		* side effects - new_uid is incremented by one.
1045		*/
1046	<	static void *
1047	<	uid_get(va_list args)
1046	>	static const char *
1047	>	uid_get(void)
1048		{
1049	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1049	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1050		return new_uid;
1051		}
1052
#	Line 1431 | Line 1060 | uid_get(va_list args)
1060		void
1061		init_isupport(void)
1062		{
1434	–	isupportFile = init_MessageLine();
1435	–
1063		add_isupport("CALLERID", NULL, -1);
1064	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1064	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1065		add_isupport("DEAF", "D", -1);
1066		add_isupport("KICKLEN", NULL, KICKLEN);
1067		add_isupport("MODES", NULL, MAXMODEPARAMS);
1441	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1442	–	#ifdef HALFOPS
1068		add_isupport("PREFIX", "(ohv)@%+", -1);
1069		add_isupport("STATUSMSG", "@%+", -1);
1070	<	#else
1071	<	add_isupport("PREFIX", "(ov)@+", -1);
1447	<	add_isupport("STATUSMSG", "@+", -1);
1448	<	#endif
1449	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1070	>	add_isupport("EXCEPTS", "e", -1);
1071	>	add_isupport("INVEX", "I", -1);
1072		}
1073
1074		/*
#	Line 1462 | Line 1084 | void
1084		add_isupport(const char *name, const char *options, int n)
1085		{
1086		dlink_node *ptr;
1087	<	struct Isupport *support;
1087	>	struct Isupport *support = NULL;
1088
1089		DLINK_FOREACH(ptr, support_list.head)
1090		{
#	Line 1477 | Line 1099 | add_isupport(const char *name, const cha
1099
1100		if (ptr == NULL)
1101		{
1102	<	support = MyMalloc(sizeof(*support));
1102	>	support = MyCalloc(sizeof(*support));
1103		dlinkAddTail(support, &support->node, &support_list);
1104		}
1105
1106	<	DupString(support->name, name);
1107	<	if (options != NULL)
1108	<	DupString(support->options, options);
1106	>	support->name = xstrdup(name);
1107	>	if (options)
1108	>	support->options = xstrdup(options);
1109		support->number = n;
1110
1111		rebuild_isupport_message_line();
#	Line 1530 | Line 1152 | rebuild_isupport_message_line(void)
1152		{
1153		char isupportbuffer[IRCD_BUFSIZE];
1154		char *p = isupportbuffer;
1155	<	dlink_node *ptr = NULL;
1155	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1156		int n = 0;
1157		int tokens = 0;
1158		size_t len = 0;
1159	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1159	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1160
1161	<	destroy_MessageLine(isupportFile);
1161	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1162	>	{
1163	>	dlinkDelete(ptr, &support_list_lines);
1164	>	MyFree(ptr->data);
1165	>	free_dlink_node(ptr);
1166	>	}
1167
1168		DLINK_FOREACH(ptr, support_list.head)
1169		{
1170		struct Isupport *support = ptr->data;
1171
1172	<	p += (n = ircsprintf(p, "%s", support->name));
1172	>	p += (n = sprintf(p, "%s", support->name));
1173		len += n;
1174
1175	<	if (support->options != NULL)
1175	>	if (support->options)
1176		{
1177	<	p += (n = ircsprintf(p, "=%s", support->options));
1177	>	p += (n = sprintf(p, "=%s", support->options));
1178		len += n;
1179		}
1180
1181		if (support->number > 0)
1182		{
1183	<	p += (n = ircsprintf(p, "=%d", support->number));
1183	>	p += (n = sprintf(p, "=%d", support->number));
1184		len += n;
1185		}
1186
#	Line 1566 | Line 1193 | rebuild_isupport_message_line(void)
1193		if (*--p == ' ')
1194		*p = '\0';
1195
1196	<	addto_MessageLine(isupportFile, isupportbuffer);
1196	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1197		p = isupportbuffer;
1198		len = 0;
1199		n = tokens = 0;
1200		}
1201		}
1202
1203	<	if (len != 0)
1203	>	if (len)
1204		{
1205		if (*--p == ' ')
1206		*p = '\0';
1207	<	addto_MessageLine(isupportFile, isupportbuffer);
1207	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1208		}
1209		}

Diff Legend

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