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 627 by michael, Fri May 26 11:33:57 2006 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5301 by michael, Sun Jan 4 16:58:27 2015 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 98 | Line 78 | unsigned int user_modes[256] =
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, (Count.total - Count.invisi),
169	>	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 *node = NULL;
214	>
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->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	<	*/
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	>	{
284	>	dlink_node *node = 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(node, local_server_list.head)
301	>	{
302	>	struct Client *server = node->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	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315	>	source_p->info);
316	>	else
317	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
318	>	source_p->servptr->id,
319	>	source_p->name, source_p->hopcount+1,
320	>	(unsigned long)source_p->tsinfo,
321	>	ubuf, source_p->username, source_p->host,
322	>	source_p->sockhost, source_p->id, source_p->info);
323	>
324	>	if (!EmptyString(source_p->certfp))
325	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
326	>	}
327	>	}
328	>
329	>	/* user_welcome()
330	>	*
331	>	* inputs       - client pointer to client to welcome
332	>	* output       - NONE
333	>	* side effects -
334	>	*/
335	>	static void
336	>	user_welcome(struct Client *source_p)
337	>	{
338	>	#if defined(__TIME__) && defined(__DATE__)
339	>	static const char built_date[] = __DATE__ " at " __TIME__;
340	>	#else
341	>	static const char built_date[] = "unknown";
342	>	#endif
343	>
344	>	#ifdef HAVE_LIBCRYPTO
345	>	if (HasFlag(source_p, FLAGS_SSL))
346	>	{
347	>	AddUMode(source_p, UMODE_SSL);
348	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
349	>	ssl_get_cipher(source_p->connection->fd.ssl));
350	>	}
351	>	#endif
352	>
353	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
354	>	source_p->name);
355	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
356	>	get_listener_name(source_p->connection->listener), ircd_version);
357	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
358	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
359	>	show_isupport(source_p);
360	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
361	>
362	>	show_lusers(source_p);
363	>	motd_signon(source_p);
364	>	}
365	>
366	>	/* check_xline()
367	>	*
368	>	* inputs       - pointer to client to test
369	>	* outupt       - 1 if exiting 0 if ok
370	>	* side effects -
371	>	*/
372	>	static int
373	>	check_xline(struct Client *source_p)
374	>	{
375	>	struct MaskItem *conf = NULL;
376	>
377	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378	>	{
379	>	++conf->count;
380	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381	>	"X-line Rejecting [%s] [%s], user %s [%s]",
382	>	source_p->info, conf->reason,
383	>	get_client_name(source_p, HIDE_IP),
384	>	source_p->sockhost);
385	>
386	>	++ServerStats.is_ref;
387	>	exit_client(source_p, "Bad user info");
388	>	return 1;
389	>	}
390	>
391	>	return 0;
392	>	}
393	>
394	>	/*! \brief This function is called when both NICK and USER messages
395	>	*      have been accepted for the client, in whatever order. Only
396	>	*      after this, is the UID message propagated.
397	>	* \param source_p Pointer to given client to introduce
398	>	*/
399		void
400	<	register_local_user(struct Client *client_p, struct Client *source_p,
286	<	const char *nick, const char *username)
400	>	register_local_user(struct Client *source_p)
401		{
402	<	const struct AccessItem *aconf = NULL;
403	<	char ipaddr[HOSTIPLEN];
290	<	dlink_node *ptr = NULL;
291	<	dlink_node *m = NULL;
402	>	const char *id = NULL;
403	>	const struct MaskItem *conf = NULL;
404
405	<	assert(source_p != NULL);
405	>	assert(source_p == source_p->from);
406		assert(MyConnect(source_p));
407	<	assert(source_p->username != username);
296	<	assert(!source_p->localClient->registration);
407	>	assert(!source_p->connection->registration);
408
409	<	ClearCap(client_p, CAP_TS6);
409	>	ClearCap(source_p, CAP_TS6);
410
411	<	if (ConfigFileEntry.ping_cookie)
411	>	if (ConfigGeneral.ping_cookie)
412		{
413	<	if (!IsPingSent(source_p) &&
303	<	source_p->localClient->random_ping == 0)
413	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
414		{
415	<	source_p->localClient->random_ping = (unsigned long)rand();
416	<	sendto_one(source_p, "PING :%lu",
417	<	source_p->localClient->random_ping);
415	>	do
416	>	source_p->connection->random_ping = genrand_int32();
417	>	while (!source_p->connection->random_ping);
418	>
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 313 | Line 425 | register_local_user(struct Client *clien
425		return;
426		}
427
428	<	source_p->localClient->last = CurrentTime;
428	>	source_p->connection->last_privmsg = CurrentTime;
429		/* Straight up the maximum rate of flooding... */
430	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
430	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
431
432	<	if (!execute_callback(client_check_cb, source_p, username))
432	>	if (!check_client(source_p))
433		return;
434
435	<	if (valid_hostname(source_p->host) == 0)
435	>	if (!valid_hostname(source_p->host))
436		{
437	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
438	<	"character in your hostname", me.name, source_p->name);
439	<	strlcpy(source_p->host, source_p->sockhost,
328	<	sizeof(source_p->host));
437	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438	>	"character in your hostname");
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442	<	ptr   = source_p->localClient->confs.head;
332	<	aconf = map_to_conf(ptr->data);
442	>	conf = source_p->connection->confs.head->data;
443
444		if (!IsGotId(source_p))
445		{
446	<	const char *p = NULL;
446	>	char username[USERLEN + 1] = "";
447	>	const char *p = username;
448		unsigned int i = 0;
449
450	<	if (IsNeedIdentd(aconf))
450	>	if (IsNeedIdentd(conf))
451		{
452	<	ServerStats->is_ref++;
453	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
454	<	"identd to use this server", me.name, source_p->name);
455	<	exit_client(source_p, &me, "Install identd");
452	>	++ServerStats.is_ref;
453	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
454	>	"identd to use this server");
455	>	exit_client(source_p, "Install identd");
456		return;
457		}
458
459	<	p = username;
459	>	strlcpy(username, source_p->username, sizeof(username));
460
461	<	if (!IsNoTilde(aconf))
461	>	if (!IsNoTilde(conf))
462		source_p->username[i++] = '~';
463
464	<	while (*p && i < USERLEN)
465	<	{
355	<	if (*p != '[')
356	<	source_p->username[i++] = *p;
357	<	p++;
358	<	}
464	>	for (; *p && i < USERLEN; ++p)
465	>	source_p->username[i++] = *p;
466
467		source_p->username[i] = '\0';
468		}
469
470	<	/* password check */
471	<	if (!EmptyString(aconf->passwd))
470	>	/* Password check */
471	>	if (!EmptyString(conf->passwd))
472		{
473	<	const char *pass = source_p->localClient->passwd;
367	<
368	<	if (!match_conf_password(pass, aconf))
473	>	if (!match_conf_password(source_p->connection->password, conf))
474		{
475	<	ServerStats->is_ref++;
476	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
477	<	me.name, source_p->name);
478	<	exit_client(source_p, &me, "Bad Password");
475	>	++ServerStats.is_ref;
476	>
477	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
478	>	exit_client(source_p, "Bad Password");
479		return;
480		}
481		}
482
483	<	/* don't free source_p->localClient->passwd here - it can be required
484	<	* by masked /stats I if there are auth{} blocks with need_password = no;
483	>	/*
484	>	* Don't free source_p->connection->password here - it can be required
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
489	<	/* report if user has &^>= etc. and set flags as needed in source_p */
490	<	report_and_set_user_flags(source_p, aconf);
489	>	/*
490	>	* Report if user has &^>= etc. and set flags as needed in source_p
491	>	*/
492	>	report_and_set_user_flags(source_p, conf);
493	>
494	>	if (IsDead(source_p))
495	>	return;
496
497	<	/* Limit clients -
497	>	/*
498	>	* Limit clients -
499		* We want to be able to have servers and F-line clients
500		* connect, so save room for "buffer" connections.
501		* Smaller servers may want to decrease this, and it should
502		* probably be just a percentage of the MAXCLIENTS...
503		*   -Taner
504		*/
505	<	/* Except "F:" clients */
506	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
395	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
505	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
506	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
507		{
508	<	sendto_realops_flags(UMODE_FULL, L_ALL,
508	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
509		"Too many clients, rejecting %s[%s].",
510	<	nick, source_p->host);
511	<	ServerStats->is_ref++;
512	<	exit_client(source_p, &me, "Sorry, server is full - try later");
510	>	source_p->name, source_p->host);
511	>	++ServerStats.is_ref;
512	>	exit_client(source_p, "Sorry, server is full - try later");
513		return;
514		}
515
516	<	/* valid user name check */
406	<	if (valid_username(source_p->username) == 0)
516	>	if (!valid_username(source_p->username, 1))
517		{
518	<	char tmpstr2[IRCD_BUFSIZE];
518	>	char buf[IRCD_BUFSIZE] = "";
519
520	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
521	<	nick, source_p->username, source_p->host);
522	<	ServerStats->is_ref++;
523	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
524	<	exit_client(source_p, &me, tmpstr2);
520	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
521	>	"Invalid username: %s (%s@%s)",
522	>	source_p->name, source_p->username, source_p->host);
523	>	++ServerStats.is_ref;
524	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
525	>	exit_client(source_p, buf);
526		return;
527		}
528
418	–	assert(source_p == client_p);
419	–
529		if (check_xline(source_p))
530		return;
531
532	<	if (IsDead(client_p))
533	<	return;
532	>	while (hash_find_id((id = uid_get())))
533	>	;
534
535	<	if (me.id[0])
536	<	{
428	<	const char *id = execute_callback(uid_get_cb, source_p);
535	>	strlcpy(source_p->id, id, sizeof(source_p->id));
536	>	hash_add_id(source_p);
537
538	<	while (hash_find_id(id) != NULL)
539	<	id = uid_get(NULL);
538	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540	>	source_p->name, source_p->username, source_p->host,
541	>	source_p->sockhost,
542	>	get_client_class(&source_p->connection->confs),
543	>	source_p->info, source_p->id);
544
545	<	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	<	/* If they have died in send_* don't do anything. */
449	<	if (IsDead(source_p))
450	<	return;
451	<
452	<	if (ConfigFileEntry.invisible_on_connect)
545	>	if (ConfigGeneral.invisible_on_connect)
546		{
547	<	source_p->umodes |= UMODE_INVISIBLE;
548	<	Count.invisi++;
547	>	AddUMode(source_p, UMODE_INVISIBLE);
548	>	++Count.invisi;
549		}
550
551	<	if ((++Count.local) > Count.max_loc)
551	>	if (++Count.local > Count.max_loc)
552		{
553		Count.max_loc = Count.local;
554
555		if (!(Count.max_loc % 10))
556	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
556	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
557	>	"New maximum local client connections: %u",
558		Count.max_loc);
559		}
560
467	–	SetClient(source_p);
468	–
469	–	source_p->servptr = &me;
470	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
471	–
472	–	/* Increment our total user count here */
561		if (++Count.total > Count.max_tot)
562		Count.max_tot = Count.total;
563	<	Count.totalrestartcount++;
563	>	++Count.totalrestartcount;
564
565	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
565	>	assert(source_p->servptr == &me);
566	>	SetClient(source_p);
567	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
568	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
569
570	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
571	<	{
572	<	free_dlink_node(m);
573	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
483	<	}
484	<	else assert(0);
570	>	assert(dlinkFind(&unknown_list, source_p));
571	>
572	>	dlink_move_node(&source_p->connection->lclient_node,
573	>	&unknown_list, &local_client_list);
574
575		user_welcome(source_p);
576		add_user_host(source_p->username, source_p->host, 0);
577		SetUserHost(source_p);
578
579	<	introduce_client(client_p, source_p);
579	>	introduce_client(source_p);
580		}
581
582		/* register_remote_user()
583		*
584	<	* inputs       - client_p directly connected client
496	<	*              - source_p remote or directly connected client
584	>	* inputs       - source_p remote or directly connected client
585		*              - username to register as
586		*              - host name to register as
587		*              - server name
500	–	*              - realname (gecos)
588		* output       - NONE
589		* side effects - This function is called when a remote client
590		*                is introduced by a server.
591		*/
592		void
593	<	register_remote_user(struct Client *client_p, struct Client *source_p,
594	<	const char *username, const char *host, const char *server,
595	<	const char *realname)
509	<	{
510	<	struct Client *target_p = NULL;
511	<
512	<	assert(source_p != NULL);
513	<	assert(source_p->username != username);
514	<
515	<	strlcpy(source_p->host, host, sizeof(source_p->host));
516	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
517	<	strlcpy(source_p->username, username, sizeof(source_p->username));
518	<
519	<	/*
520	<	* coming from another server, take the servers word for it
521	<	*/
522	<	source_p->servptr = find_server(server);
523	<
524	<	/* Super GhostDetect:
525	<	* If we can't find the server the user is supposed to be on,
526	<	* then simply blow the user away.        -Taner
527	<	*/
528	<	if (source_p->servptr == NULL)
529	<	{
530	<	sendto_realops_flags(UMODE_ALL, L_ALL,
531	<	"No server %s for user %s[%s@%s] from %s",
532	<	server, source_p->name, source_p->username,
533	<	source_p->host, source_p->from->name);
534	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
535	<
536	<	SetKilled(source_p);
537	<	exit_client(source_p, &me, "Ghosted Client");
538	<	return;
539	<	}
593	>	register_remote_user(struct Client *source_p)
594	>	{
595	>	const struct Client *target_p = NULL;
596
597		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
598		{
599	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
599	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
600		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
601	<	client_p->name, source_p->name, source_p->username,
601	>	source_p->from->name, source_p->name, source_p->username,
602		source_p->host, source_p->servptr->name,
603		target_p->name, target_p->from->name);
604	<	kill_client(client_p, source_p,
605	<	"%s (NICK from wrong direction (%s != %s))",
606	<	me.name, source_p->servptr->name, target_p->from->name);
607	<	SetKilled(source_p);
608	<	exit_client(source_p, &me, "USER server wrong direction");
604	>	sendto_one(source_p->from,
605	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
606	>	me.id, source_p->id, me.name, source_p->servptr->name,
607	>	target_p->from->name);
608	>
609	>	AddFlag(source_p, FLAGS_KILLED);
610	>	exit_client(source_p, "UID server wrong direction");
611		return;
612		}
613
614	<	/* Increment our total user count here */
614	>	/*
615	>	* If the nick has been introduced by a services server,
616	>	* make it a service as well.
617	>	*/
618	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
619	>	AddFlag(source_p, FLAGS_SERVICE);
620	>
621		if (++Count.total > Count.max_tot)
622		Count.max_tot = Count.total;
623
560	–	++source_p->from->serv->dep_users;
561	–
624		SetClient(source_p);
625	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
625	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
626	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
627		add_user_host(source_p->username, source_p->host, 1);
628		SetUserHost(source_p);
629
630	<	introduce_client(client_p, source_p);
631	<	}
632	<
633	<	/* introduce_client()
634	<	*
635	<	* inputs       - client_p
636	<	*              - source_p
574	<	* output       - NONE
575	<	* side effects - This common function introduces a client to the rest
576	<	*                of the net, either from a local client connect or
577	<	*                from a remote connect.
578	<	*/
579	<	static void
580	<	introduce_client(struct Client *client_p, struct Client *source_p)
581	<	{
582	<	dlink_node *server_node = NULL;
583	<	static char ubuf[12];
584	<
585	<	if (MyClient(source_p))
586	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
587	<	else
588	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
589	<
590	<	if (*ubuf == '\0')
591	<	{
592	<	ubuf[0] = '+';
593	<	ubuf[1] = '\0';
594	<	}
595	<
596	<	/* arghhh one could try not introducing new nicks to ll leafs
597	<	* but then you have to introduce them "on the fly" in SJOIN
598	<	* not fun.
599	<	* Its not going to cost much more bandwidth to simply let new
600	<	* nicks just ride on through.
601	<	*/
602	<
603	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
604	<	* you _need_ to if you aren't going to burst everyone initially.
605	<	*
606	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
607	<	* in that case just send it to the uplink.
608	<	* -davidt
609	<	* rewritten to cope with SIDs .. eww eww eww --is
610	<	*/
611	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
612	<	client_p != uplink)
613	<	{
614	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
615	<	{
616	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
617	<	source_p->servptr->id,
618	<	source_p->name, source_p->hopcount+1,
619	<	(unsigned long)source_p->tsinfo,
620	<	ubuf, source_p->username, source_p->host,
621	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
622	<	"0" : source_p->sockhost, source_p->id, source_p->info);
623	<	}
630	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
631	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
632	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
633	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
634	>	source_p->servptr->name,
635	>	source_p->name, source_p->username, source_p->host,
636	>	source_p->sockhost, source_p->info, source_p->id);
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,
630	<	source_p->servptr->name, source_p->info);
631	<	}
632	<	}
633	<	else
634	<	{
635	<	DLINK_FOREACH(server_node, serv_list.head)
636	<	{
637	<	struct Client *server = server_node->data;
638	<
639	<	if (IsCapable(server, CAP_LL) || server == client_p)
640	<	continue;
638	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
639	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
640	>	source_p->servptr->name,
641	>	source_p->name, source_p->username, source_p->host,
642	>	source_p->info, source_p->id);
643
644	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
643	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
644	<	source_p->servptr->id,
645	<	source_p->name, source_p->hopcount+1,
646	<	(unsigned long)source_p->tsinfo,
647	<	ubuf, source_p->username, source_p->host,
648	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
649	<	"0" : source_p->sockhost, source_p->id, source_p->info);
650	<	else
651	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
652	<	source_p->name, source_p->hopcount+1,
653	<	(unsigned long)source_p->tsinfo,
654	<	ubuf, source_p->username, source_p->host,
655	<	source_p->servptr->name, source_p->info);
656	<	}
657	<	}
644	>	introduce_client(source_p);
645		}
646
647		/* valid_hostname()
#	Line 671 | Line 658 | valid_hostname(const char *hostname)
658		{
659		const char *p = hostname;
660
661	<	assert(p != NULL);
661	>	assert(p);
662
663	<	if ('.' == *p || ':' == *p)
663	>	if (EmptyString(p) || *p == '.' || *p == ':')
664		return 0;
665
666	<	while (*p)
680	<	{
666	>	for (; *p; ++p)
667		if (!IsHostChar(*p))
668		return 0;
683	–	p++;
684	–	}
669
670	<	return 1;
670	>	return p - hostname <= HOSTLEN;
671		}
672
673		/* valid_username()
#	Line 698 | Line 682 | valid_hostname(const char *hostname)
682		* style of username
683		*/
684		int
685	<	valid_username(const char *username)
685	>	valid_username(const char *username, const int local)
686		{
687	<	int dots      = 0;
687	>	unsigned int dots = 0;
688		const char *p = username;
689
690	<	assert(p != NULL);
690	>	assert(p);
691
692	<	if ('~' == *p)
692	>	if (*p == '~')
693		++p;
694
695	<	/* reject usernames that don't start with an alphanum
695	>	/*
696	>	* Reject usernames that don't start with an alphanum
697		* i.e. reject jokers who have '-@somehost' or '.@somehost'
698		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
699		*/
700		if (!IsAlNum(*p))
701		return 0;
702
703	<	while (*++p)
703	>	if (local)
704		{
705	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
705	>	while (*++p)
706		{
707	<	dots++;
708	<
709	<	if (dots > ConfigFileEntry.dots_in_ident)
710	<	return 0;
711	<	if (!IsUserChar(p[1]))
707	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
708	>	{
709	>	if (++dots > ConfigGeneral.dots_in_ident)
710	>	return 0;
711	>	if (!IsUserChar(*(p + 1)))
712	>	return 0;
713	>	}
714	>	else if (!IsUserChar(*p))
715		return 0;
716		}
729	–	else if (!IsUserChar(*p))
730	–	return 0;
731	–	}
732	–
733	–	return 1;
734	–	}
735	–
736	–	/* report_and_set_user_flags()
737	–	*
738	–	* inputs       - pointer to source_p
739	–	*              - pointer to aconf for this user
740	–	* output       - NONE
741	–	* side effects - Report to user any special flags
742	–	*                they are getting, and set them.
743	–	*/
744	–	static void
745	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
746	–	{
747	–	/* If this user is being spoofed, tell them so */
748	–	if (IsConfDoSpoofIp(aconf))
749	–	{
750	–	sendto_one(source_p,
751	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	–	me.name, source_p->name);
753	–	}
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(aconf))
757	–	{
758	–	SetExemptKline(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/* The else here is to make sure that G line exempt users
765	–	* do not get noticed twice.
766	–	*/
767	–	else if (IsConfExemptGline(aconf))
768	–	{
769	–	SetExemptGline(source_p);
770	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
771	–	me.name, source_p->name);
717		}
718	<
774	<	if (IsConfExemptResv(aconf))
775	<	{
776	<	SetExemptResv(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
778	<	me.name, source_p->name);
779	<	}
780	<
781	<	/* If this user is exempt from user limits set it "F lined" */
782	<	if (IsConfExemptLimits(aconf))
783	<	{
784	<	SetExemptLimits(source_p);
785	<	sendto_one(source_p,
786	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
787	<	me.name,source_p->name);
788	<	}
789	<
790	<	/* If this user is exempt from idle time outs */
791	<	if (IsConfIdlelined(aconf))
718	>	else
719		{
720	<	SetIdlelined(source_p);
721	<	sendto_one(source_p,
722	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
796	<	me.name, source_p->name);
720	>	while (*++p)
721	>	if (!IsUserChar(*p))
722	>	return 0;
723		}
724
725	<	if (IsConfCanFlood(aconf))
800	<	{
801	<	SetCanFlood(source_p);
802	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
803	<	"protection, aren't you fearsome.",
804	<	me.name, source_p->name);
805	<	}
725	>	return p - username <= USERLEN;
726		}
727
728	<	/* do_local_user()
728	>	/* clean_nick_name()
729		*
730	<	* inputs       -
731	<	* output       - NONE
732	<	* side effects -
730	>	* input        - nickname
731	>	*              - whether it's a local nick (1) or remote (0)
732	>	* output       - none
733	>	* side effects - walks through the nickname, returning 0 if erroneous
734		*/
735	<	void
736	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
816	<	const char *username, const char *host, const char *server,
817	<	const char *realname)
735	>	int
736	>	valid_nickname(const char *nickname, const int local)
737		{
738	<	assert(source_p != NULL);
820	<	assert(source_p->username != username);
821	<
822	<	if (source_p == NULL)
823	<	return;
824	<
825	<	if (!IsUnknown(source_p))
826	<	{
827	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
828	<	me.name, nick);
829	<	return;
830	<	}
738	>	const char *p = nickname;
739
740	<	source_p->localClient->registration &= ~REG_NEED_USER;
740	>	assert(p);
741
742		/*
743	<	* don't take the clients word for it, ever
743	>	* Nicks can't start with a digit or - or be 0 length.
744		*/
745	<	source_p->servptr = &me;
746	<
839	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
840	<
841	<	if (!IsGotId(source_p))
842	<	{
843	<	/* save the username in the client
844	<	* If you move this you'll break ping cookies..you've been warned
845	<	*/
846	<	strlcpy(source_p->username, username, sizeof(source_p->username));
847	<	}
848	<
849	<	if (!source_p->localClient->registration)
850	<	/* NICK already received, now I have USER... */
851	<	register_local_user(client_p, source_p, source_p->name, username);
852	<	}
853	<
854	<	/* change_simple_umode()
855	<	*
856	<	* this callback can be hooked to allow special handling of
857	<	* certain usermodes
858	<	*/
859	<	static void *
860	<	change_simple_umode(va_list args)
861	<	{
862	<	struct Client *client_p;
863	<	struct Client *source_p;
864	<	int what;
865	<	unsigned int flag;
866	<
867	<	client_p = va_arg(args, struct Client *);
868	<	source_p = va_arg(args, struct Client *);
869	<	what = va_arg(args, int);
870	<	flag = va_arg(args, unsigned int);
871	<
872	<	if (what == MODE_ADD)
873	<	source_p->umodes |= flag;
874	<	else
875	<	source_p->umodes &= ~flag;
876	<
877	<	return NULL;
878	<	}
879	<
880	<	/* set_user_mode()
881	<	*
882	<	* added 15/10/91 By Darren Reed.
883	<	* parv[0] - sender
884	<	* parv[1] - username to change mode for
885	<	* parv[2] - modes to change
886	<	*/
887	<	void
888	<	set_user_mode(struct Client *client_p, struct Client *source_p,
889	<	int parc, char *parv[])
890	<	{
891	<	unsigned int flag, setflags;
892	<	char **p, *m, buf[IRCD_BUFSIZE];
893	<	struct Client *target_p;
894	<	int what = MODE_ADD, badflag = 0, i;
895	<
896	<	assert(!(parc < 2));
897	<
898	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
899	<	{
900	<	if (MyConnect(source_p))
901	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
902	<	me.name, source_p->name, parv[1]);
903	<	return;
904	<	}
905	<
906	<	if (IsServer(source_p))
907	<	{
908	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
909	<	parv[1], source_p->name);
910	<	return;
911	<	}
912	<
913	<	if (source_p != target_p || target_p->from != source_p->from)
914	<	{
915	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
916	<	me.name, source_p->name);
917	<	return;
918	<	}
919	<
920	<	if (parc < 3)
921	<	{
922	<	m = buf;
923	<	*m++ = '+';
924	<
925	<	for (i = 0; i < 128; i++)
926	<	if (source_p->umodes & user_modes[i])
927	<	*m++ = (char)i;
928	<	*m = '\0';
929	<
930	<	sendto_one(source_p, form_str(RPL_UMODEIS),
931	<	me.name, source_p->name, buf);
932	<	return;
933	<	}
934	<
935	<	execute_callback(entering_umode_cb, client_p, source_p);
936	<
937	<	/* find flags already set for user */
938	<	setflags = source_p->umodes;
939	<
940	<	/* parse mode change string(s) */
941	<	for (p = &parv[2]; p && *p; p++)
942	<	{
943	<	for (m = *p; *m; m++)
944	<	{
945	<	switch (*m)
946	<	{
947	<	case '+':
948	<	what = MODE_ADD;
949	<	break;
950	<	case '-':
951	<	what = MODE_DEL;
952	<	break;
953	<	case 'o':
954	<	if (what == MODE_ADD)
955	<	{
956	<	if (IsServer(client_p) && !IsOper(source_p))
957	<	{
958	<	++Count.oper;
959	<	SetOper(source_p);
960	<	}
961	<	}
962	<	else
963	<	{
964	<	/* Only decrement the oper counts if an oper to begin with
965	<	* found by Pat Szuta, Perly , perly@xnet.com
966	<	*/
967	<	if (!IsOper(source_p))
968	<	break;
969	<
970	<	ClearOper(source_p);
971	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
972	<	Count.oper--;
973	<
974	<	if (MyConnect(source_p))
975	<	{
976	<	dlink_node *dm;
977	<
978	<	detach_conf(source_p, OPER_TYPE);
979	<	ClearOperFlags(source_p);
980	<
981	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
982	<	free_dlink_node(dm);
983	<	}
984	<	}
985	<
986	<	break;
987	<
988	<	/* we may not get these,
989	<	* but they shouldnt be in default
990	<	*/
991	<	case ' ' :
992	<	case '\n':
993	<	case '\r':
994	<	case '\t':
995	<	break;
996	<
997	<	default:
998	<	if ((flag = user_modes[(unsigned char)*m]))
999	<	{
1000	<	if (MyConnect(source_p) && !IsOper(source_p) &&
1001	<	(ConfigFileEntry.oper_only_umodes & flag))
1002	<	{
1003	<	badflag = 1;
1004	<	}
1005	<	else
1006	<	execute_callback(umode_cb, client_p, source_p, what, flag);
1007	<	}
1008	<	else
1009	<	{
1010	<	if (MyConnect(source_p))
1011	<	badflag = 1;
1012	<	}
1013	<
1014	<	break;
1015	<	}
1016	<	}
1017	<	}
1018	<
1019	<	if (badflag)
1020	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1021	<	me.name, source_p->name);
1022	<
1023	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1024	<	{
1025	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1026	<	me.name, source_p->name);
1027	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1028	<	}
1029	<
1030	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1031	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1032	<	{
1033	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1034	<	me.name, source_p->name);
1035	<	source_p->umodes &= ~UMODE_ADMIN;
1036	<	}
745	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
746	>	return 0;
747
748	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
749	<	++Count.invisi;
750	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1041	<	--Count.invisi;
748	>	for (; *p; ++p)
749	>	if (!IsNickChar(*p))
750	>	return 0;
751
752	<	/*
1044	<	* compare new flags with old flags and send string which
1045	<	* will cause servers to update correctly.
1046	<	*/
1047	<	send_umode_out(client_p, source_p, setflags);
752	>	return p - nickname <= NICKLEN;
753		}
754
755		/* send_umode()
756		* send the MODE string for user (user) to connection client_p
757		* -avalon
758	+	*
759	+	* inputs       - client_p
760	+	*              - source_p
761	+	*              - int old
762	+	*              - sendmask mask of modes to send
763	+	*              - suplied umode_buf
764	+	* output       - NONE
765		*/
766		void
767		send_umode(struct Client *client_p, struct Client *source_p,
768	<	unsigned int old, unsigned int sendmask, char *umode_buf)
768	>	unsigned int old, char *umode_buf)
769		{
1058	–	int what = 0;
1059	–	unsigned int i;
1060	–	unsigned int flag;
770		char *m = umode_buf;
771	+	int what = 0;
772
773		/*
774	<	* build a string in umode_buf to represent the change in the user's
774	>	* Build a string in umode_buf to represent the change in the user's
775		* mode between the new (source_p->umodes) and 'old'.
776		*/
777	<	for (i = 0; i < 128; i++)
777	>	for (unsigned int i = 0; i < 128; ++i)
778		{
779	<	flag = user_modes[i];
1070	<	if (!flag)
1071	<	continue;
779	>	unsigned int flag = user_modes[i];
780
781	<	if (MyClient(source_p) && !(flag & sendmask))
781	>	if (!flag)
782		continue;
783
784	<	if ((flag & old) && !(source_p->umodes & flag))
784	>	if ((flag & old) && !HasUMode(source_p, flag))
785		{
786		if (what == MODE_DEL)
787		*m++ = (char)i;
#	Line 1084 | Line 792 | send_umode(struct Client *client_p, stru
792		*m++ = (char)i;
793		}
794		}
795	<	else if (!(flag & old) && (source_p->umodes & flag))
795	>	else if (!(flag & old) && HasUMode(source_p, flag))
796		{
797		if (what == MODE_ADD)
798		*m++ = (char)i;
#	Line 1101 | Line 809 | send_umode(struct Client *client_p, stru
809
810		if (*umode_buf && client_p)
811		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
812	<	source_p->name, source_p->username,
813	<	source_p->host, source_p->name, umode_buf);
812	>	client_p->name, client_p->username,
813	>	client_p->host, client_p->name, umode_buf);
814		}
815
816		/* send_umode_out()
#	Line 1112 | Line 820 | send_umode(struct Client *client_p, stru
820		* side effects - Only send ubuf out to servers that know about this client
821		*/
822		void
823	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1116	<	unsigned int old)
823	>	send_umode_out(struct Client *source_p, unsigned int old)
824		{
825	<	char buf[IRCD_BUFSIZE] = { '\0' };
1119	<	dlink_node *ptr = NULL;
825	>	char buf[IRCD_BUFSIZE] = "";
826
827	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1122	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
827	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
828
829		if (buf[0])
830	<	{
831	<	DLINK_FOREACH(ptr, serv_list.head)
1127	<	{
1128	<	struct Client *target_p = ptr->data;
1129	<
1130	<	if ((target_p != client_p) && (target_p != source_p))
1131	<	{
1132	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1133	<	(target_p->localClient->serverMask &
1134	<	source_p->lazyLinkClientExists))
1135	<	sendto_one(target_p, ":%s MODE %s :%s",
1136	<	ID_or_name(source_p, target_p),
1137	<	ID_or_name(source_p, target_p), buf);
1138	<	}
1139	<	}
1140	<	}
1141	<
1142	<	if (client_p && MyClient(client_p))
1143	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
830	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
831	>	source_p->id, source_p->id, buf);
832		}
833
834	<	/* user_welcome()
835	<	*
1148	<	* inputs       - client pointer to client to welcome
1149	<	* output       - NONE
1150	<	* side effects -
1151	<	*/
1152	<	static void
1153	<	user_welcome(struct Client *source_p)
834	>	void
835	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
836		{
837	<	#if defined(__TIME__) && defined(__DATE__)
1156	<	static const char built_date[] = __DATE__ " at " __TIME__;
1157	<	#else
1158	<	static const char built_date[] = "unknown";
1159	<	#endif
837	>	dlink_node *node = NULL;
838
839	<	#ifdef HAVE_LIBCRYPTO
840	<	if (source_p->localClient->fd.ssl != NULL)
1163	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1164	<	me.name, source_p->name,
1165	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1166	<	#endif
839	>	if (!strcmp(target_p->host, hostname))
840	>	return;
841
842	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
843	<	ServerInfo.network_name, source_p->name);
844	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
845	<	get_listener_name(source_p->localClient->listener), ircd_version);
846	<	sendto_one(source_p, form_str(RPL_CREATED),
847	<	me.name, source_p->name, built_date);
848	<	sendto_one(source_p, form_str(RPL_MYINFO),
849	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
850	<	show_isupport(source_p);
842	>	switch (what)
843	>	{
844	>	case MODE_ADD:
845	>	AddUMode(target_p, UMODE_HIDDENHOST);
846	>	break;
847	>	case MODE_DEL:
848	>	DelUMode(target_p, UMODE_HIDDENHOST);
849	>	break;
850	>	default: return;
851	>	}
852
853	<	if (source_p->id[0] != '\0')
854	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
855	<	source_p->name, source_p->id);
853	>	if (ConfigGeneral.cycle_on_host_change)
854	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
855	>	target_p->name, target_p->username, target_p->host);
856
857	<	show_lusers(source_p);
857	>	if (IsUserHostIp(target_p))
858	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
859
860	<	if (ConfigFileEntry.short_motd)
860	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
861	>
862	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
863	>	SetUserHost(target_p);
864	>
865	>	if (MyClient(target_p))
866		{
867	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
868	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1188	<	sendto_one(source_p,
1189	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1190	<	"read it", source_p->name);
1191	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1192	<	me.name, source_p->name, me.name);
1193	<	sendto_one(source_p, form_str(RPL_MOTD),
1194	<	me.name, source_p->name,
1195	<	"*** This is the short motd ***");
1196	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1197	<	me.name, source_p->name);
867	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
868	>	clear_ban_cache_client(target_p);
869		}
1199	–	else
1200	–	send_message_file(source_p, &ConfigFileEntry.motd);
1201	–	}
870
871	<	/* check_xline()
872	<	*
1205	<	* inputs       - pointer to client to test
1206	<	* outupt       - 1 if exiting 0 if ok
1207	<	* side effects -
1208	<	*/
1209	<	static int
1210	<	check_xline(struct Client *source_p)
1211	<	{
1212	<	struct ConfItem *conf = NULL;
1213	<	const char *reason = NULL;
871	>	if (!ConfigGeneral.cycle_on_host_change)
872	>	return;
873
874	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1216	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
874	>	DLINK_FOREACH(node, target_p->channel.head)
875		{
876	<	struct MatchItem *reg = map_to_conf(conf);
877	<
878	<	++reg->count;
876	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
877	>	char *p = modebuf;
878	>	int len = 0;
879	>	const struct Membership *member = node->data;
880
881	<	if (reg->reason != NULL)
882	<	reason = reg->reason;
883	<	else
884	<	reason = "No Reason";
881	>	if (has_member_flags(member, CHFL_CHANOP))
882	>	{
883	>	*p++ = 'o';
884	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
885	>	}
886
887	<	sendto_realops_flags(UMODE_REJ, L_ALL,
888	<	"X-line Rejecting [%s] [%s], user %s [%s]",
889	<	source_p->info, reason,
890	<	get_client_name(source_p, HIDE_IP),
891	<	source_p->sockhost);
887	>	if (has_member_flags(member, CHFL_HALFOP))
888	>	{
889	>	*p++ = 'h';
890	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
891	>	}
892
893	<	ServerStats->is_ref++;
1234	<	if (REJECT_HOLD_TIME > 0)
893	>	if (has_member_flags(member, CHFL_VOICE))
894		{
895	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
896	<	me.name, source_p->name);
1238	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1239	<	SetCaptured(source_p);
895	>	*p++ = 'v';
896	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
897		}
1241	–	else
1242	–	exit_client(source_p, &me, "Bad user info");
1243	–	return 1;
1244	–	}
898
899	<	return 0;
1247	<	}
899	>	*p = '\0';
900
901	<	/* oper_up()
902	<	*
903	<	* inputs       - pointer to given client to oper
904	<	* output       - NONE
905	<	* side effects - Blindly opers up given source_p, using aconf info
906	<	*                all checks on passwords have already been done.
907	<	*                This could also be used by rsa oper routines.
901	>
902	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
903	>	target_p->name, target_p->username,
904	>	target_p->host, member->chptr->name,
905	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
906	>	target_p->info);
907	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
908	>	target_p->name, target_p->username,
909	>	target_p->host, member->chptr->name);
910	>
911	>	if (nickbuf[0])
912	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
913	>	target_p->servptr->name, member->chptr->name,
914	>	modebuf, nickbuf);
915	>
916	>	}
917	>
918	>	if (target_p->away[0])
919	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
920	>	":%s!%s@%s AWAY :%s",
921	>	target_p->name, target_p->username,
922	>	target_p->host, target_p->away);
923	>	}
924	>
925	>	/*! \brief Blindly opers up given source_p, using conf info.
926	>	*         All checks on passwords have already been done.
927	>	* \param source_p Pointer to given client to oper
928		*/
929		void
930		oper_up(struct Client *source_p)
931		{
932	<	unsigned int old = source_p->umodes;
933	<	const char *operprivs = "";
1262	<	const struct AccessItem *oconf = NULL;
932	>	const unsigned int old = source_p->umodes;
933	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
934
935	<	assert(source_p->localClient->confs.head);
1265	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
935	>	assert(source_p->connection->confs.head);
936
937		++Count.oper;
938		SetOper(source_p);
939
940	<	if (oconf->modes)
941	<	source_p->umodes |= oconf->modes;
942	<	else if (ConfigFileEntry.oper_umodes)
943	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
944	<	else
945	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
946	<	UMODE_WALLOP|UMODE_LOCOPS);
940	>	if (conf->modes)
941	>	AddUMode(source_p, conf->modes);
942	>	else if (ConfigGeneral.oper_umodes)
943	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
944	>
945	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946	>	++Count.invisi;
947	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
948	>	--Count.invisi;
949
950		assert(dlinkFind(&oper_list, source_p) == NULL);
951		dlinkAdd(source_p, make_dlink_node(), &oper_list);
952
953	<	operprivs = oper_privs_as_string(oconf->port);
1282	<
1283	<	SetOFlag(source_p, oconf->port);
953	>	AddOFlag(source_p, conf->port);
954
955	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
956	<	source_p->umodes |= UMODE_ADMIN;
1287	<	if (!IsOperN(source_p))
1288	<	source_p->umodes &= ~UMODE_NCHANGE;
955	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
956	>	AddUMode(source_p, UMODE_ADMIN);
957
958	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
959	<	source_p->name, source_p->username, source_p->host);
960	<	send_umode_out(source_p, source_p, old);
961	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
962	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
963	<	me.name, source_p->name, operprivs);
1296	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
958	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
959	>	get_oper_name(source_p));
960	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
961	>	me.id, get_oper_name(source_p));
962	>	send_umode_out(source_p, old);
963	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
964		}
965
966	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
966	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
967
968		int
969		valid_sid(const char *sid)
970		{
1304	–
971		if (strlen(sid) == IRC_MAXSID)
972		if (IsDigit(*sid))
973		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1312 | Line 978 | valid_sid(const char *sid)
978
979		/*
980		* init_uid()
981	<	*
981	>	*
982		* inputs       - NONE
983		* output       - NONE
984		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1322 | Line 988 | valid_sid(const char *sid)
988		void
989		init_uid(void)
990		{
1325	–	int i;
1326	–
991		memset(new_uid, 0, sizeof(new_uid));
992
993	<	if (ServerInfo.sid != NULL)
994	<	{
1331	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1332	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
993	>	if (!EmptyString(ConfigServerInfo.sid))
994	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
995
996	<	hash_add_id(&me);
997	<	}
1336	<
1337	<	for (i = 0; i < IRC_MAXSID; i++)
1338	<	if (new_uid[i] == '\0')
996	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
997	>	if (new_uid[i] == '\0')
998		new_uid[i] = 'A';
999
1000		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1342	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1343	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1344	–	* -Dianora
1345	–	*/
1001		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1347	–
1348	–	entering_umode_cb = register_callback("entering_umode", NULL);
1349	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1350	–	uid_get_cb = register_callback("uid_get", uid_get);
1002		}
1003
1004		/*
#	Line 1359 | Line 1010 | init_uid(void)
1010		*                note this is a recursive function
1011		*/
1012		static void
1013	<	add_one_to_uid(int i)
1013	>	add_one_to_uid(unsigned int i)
1014		{
1015	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1015	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1016		{
1017		if (new_uid[i] == 'Z')
1018		new_uid[i] = '0';
1019		else if (new_uid[i] == '9')
1020		{
1021		new_uid[i] = 'A';
1022	<	add_one_to_uid(i-1);
1022	>	add_one_to_uid(i - 1);
1023		}
1024		else
1025		++new_uid[i];
#	Line 1390 | Line 1041 | add_one_to_uid(int i)
1041		* output       - new UID is returned to caller
1042		* side effects - new_uid is incremented by one.
1043		*/
1044	<	static void *
1045	<	uid_get(va_list args)
1044	>	static const char *
1045	>	uid_get(void)
1046		{
1047	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1047	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1048		return new_uid;
1049		}
1050
#	Line 1407 | Line 1058 | uid_get(va_list args)
1058		void
1059		init_isupport(void)
1060		{
1410	–	isupportFile = init_MessageLine();
1411	–
1061		add_isupport("CALLERID", NULL, -1);
1062	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1062	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1063	>	add_isupport("DEAF", "D", -1);
1064		add_isupport("KICKLEN", NULL, KICKLEN);
1065		add_isupport("MODES", NULL, MAXMODEPARAMS);
1416	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1417	–	#ifdef HALFOPS
1066		add_isupport("PREFIX", "(ohv)@%+", -1);
1067		add_isupport("STATUSMSG", "@%+", -1);
1068	<	#else
1069	<	add_isupport("PREFIX", "(ov)@+", -1);
1422	<	add_isupport("STATUSMSG", "@+", -1);
1423	<	#endif
1424	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1068	>	add_isupport("EXCEPTS", NULL, -1);
1069	>	add_isupport("INVEX", NULL, -1);
1070		}
1071
1072		/*
#	Line 1436 | Line 1081 | init_isupport(void)
1081		void
1082		add_isupport(const char *name, const char *options, int n)
1083		{
1084	<	dlink_node *ptr;
1085	<	struct Isupport *support;
1084	>	dlink_node *node = NULL;
1085	>	struct Isupport *support = NULL;
1086
1087	<	DLINK_FOREACH(ptr, support_list.head)
1087	>	DLINK_FOREACH(node, support_list.head)
1088		{
1089	<	support = ptr->data;
1089	>	support = node->data;
1090		if (irccmp(support->name, name) == 0)
1091		{
1092		MyFree(support->name);
#	Line 1450 | Line 1095 | add_isupport(const char *name, const cha
1095		}
1096		}
1097
1098	<	if (ptr == NULL)
1098	>	if (node == NULL)
1099		{
1100	<	support = MyMalloc(sizeof(*support));
1100	>	support = MyCalloc(sizeof(*support));
1101		dlinkAddTail(support, &support->node, &support_list);
1102		}
1103
1104	<	DupString(support->name, name);
1105	<	if (options != NULL)
1106	<	DupString(support->options, options);
1104	>	support->name = xstrdup(name);
1105	>	if (options)
1106	>	support->options = xstrdup(options);
1107		support->number = n;
1108
1109		rebuild_isupport_message_line();
#	Line 1474 | Line 1119 | add_isupport(const char *name, const cha
1119		void
1120		delete_isupport(const char *name)
1121		{
1122	<	dlink_node *ptr;
1478	<	struct Isupport *support;
1122	>	dlink_node *node = NULL;
1123
1124	<	DLINK_FOREACH(ptr, support_list.head)
1124	>	DLINK_FOREACH(node, support_list.head)
1125		{
1126	<	support = ptr->data;
1126	>	struct Isupport *support = node->data;
1127	>
1128		if (irccmp(support->name, name) == 0)
1129		{
1130	<	dlinkDelete(ptr, &support_list);
1130	>	dlinkDelete(node, &support_list);
1131		MyFree(support->name);
1132		MyFree(support->options);
1133		MyFree(support);
#	Line 1505 | Line 1150 | rebuild_isupport_message_line(void)
1150		{
1151		char isupportbuffer[IRCD_BUFSIZE];
1152		char *p = isupportbuffer;
1153	<	dlink_node *ptr = NULL;
1153	>	dlink_node *node = NULL, *node_next = NULL;
1154		int n = 0;
1155		int tokens = 0;
1156		size_t len = 0;
1157	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1157	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1158
1159	<	destroy_MessageLine(isupportFile);
1159	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1160	>	{
1161	>	dlinkDelete(node, &support_list_lines);
1162	>	MyFree(node->data);
1163	>	free_dlink_node(node);
1164	>	}
1165
1166	<	DLINK_FOREACH(ptr, support_list.head)
1166	>	DLINK_FOREACH(node, support_list.head)
1167		{
1168	<	struct Isupport *support = ptr->data;
1168	>	struct Isupport *support = node->data;
1169
1170	<	p += (n = ircsprintf(p, "%s", support->name));
1170	>	p += (n = sprintf(p, "%s", support->name));
1171		len += n;
1172
1173	<	if (support->options != NULL)
1173	>	if (support->options)
1174		{
1175	<	p += (n = ircsprintf(p, "=%s", support->options));
1175	>	p += (n = sprintf(p, "=%s", support->options));
1176		len += n;
1177		}
1178
1179		if (support->number > 0)
1180		{
1181	<	p += (n = ircsprintf(p, "=%d", support->number));
1181	>	p += (n = sprintf(p, "=%d", support->number));
1182		len += n;
1183		}
1184
#	Line 1541 | Line 1191 | rebuild_isupport_message_line(void)
1191		if (*--p == ' ')
1192		*p = '\0';
1193
1194	<	addto_MessageLine(isupportFile, isupportbuffer);
1194	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1195		p = isupportbuffer;
1196		len = 0;
1197		n = tokens = 0;
1198		}
1199		}
1200
1201	<	if (len != 0)
1201	>	if (len)
1202		{
1203		if (*--p == ' ')
1204		*p = '\0';
1205	<	addto_MessageLine(isupportFile, isupportbuffer);
1205	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1206		}
1207		}

Diff Legend

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