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 159 by michael, Wed Oct 19 09:39:13 2005 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4704 by michael, Sun Oct 5 16:25:02 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 int check_regexp_xline(struct Client *);
71	<	static void introduce_client(struct Client *, struct Client *);
72	<	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	<
78	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 83 | 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 99 | 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 111 | 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 166 | 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 180 | 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 (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
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 (!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))
199	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
200	<	from, to, (Count.total-Count.invisi),
201	<	Count.invisi, dlink_list_length(&global_serv_list));
202	<	else
203	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
204	<	(Count.total-Count.invisi), Count.invisi, 1);
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);
209	<
210	<	if (dlink_list_length(&unknown_list) > 0)
211	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
212	<	from, to, dlink_list_length(&unknown_list));
213	<
214	<	if (dlink_list_length(&global_channel_list) > 0)
215	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
216	<	from, to, dlink_list_length(&global_channel_list));
217	<
218	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
219	<	{
220	<	sendto_one(source_p, form_str(RPL_LUSERME),
221	<	from, to, Count.local, Count.myserver);
222	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.local, Count.max_loc,
224	<	Count.local, Count.max_loc);
225	<	}
226	<	else
227	<	{
228	<	sendto_one(source_p, form_str(RPL_LUSERME),
229	<	from, to, Count.total, 0);
230	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
231	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
233	<	}
234	<
235	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
236	<	from, to, Count.total, Count.max_tot,
237	<	Count.total, Count.max_tot);
238	<
239	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
240	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
241	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
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 254 | 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		{
289	–	const struct AccessItem *aconf = NULL;
290	–	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	>	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	<	assert(source_p != NULL);
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);
416	>	assert(!source_p->connection->registration);
417
418	<	if (ConfigFileEntry.ping_cookie)
418	>	ClearCap(source_p, CAP_TS6);
419	>
420	>	if (ConfigGeneral.ping_cookie)
421		{
422	<	if (!IsPingSent(source_p) &&
301	<	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 311 | 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;
330	<	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	<	{
353	<	if (*p != '[')
354	<	source_p->username[i++] = *p;
355	<	p++;
356	<	}
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;
365	<
366	<	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	<	/* Limit clients -
505	>	if (IsDead(source_p))
506	>	return;
507	>
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) ||
393	<	(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 */
404	<	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
540	<	assert(source_p == client_p);
417	<
418	<	/* end of valid user name check */
419	<	if (check_xline(source_p) || check_regexp_xline(source_p))
420	<	return;
421	<
422	<	if (IsDead(client_p))
540	>	if (check_xline(source_p))
541		return;
542
543	<	if (source_p->id[0] == '\0' && me.id[0])
544	<	{
427	<	char *id = (char *)execute_callback(uid_get_cb, source_p);
428	<	while (hash_find_id(id) != NULL)
429	<	id = uid_get(NULL);
430	<
431	<	strlcpy(source_p->id, id, sizeof(source_p->id));
432	<	hash_add_id(source_p);
433	<	}
543	>	while (hash_find_id((id = uid_get())))
544	>	;
545
546	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
547	<	source_p->localClient->ip.ss_len, ipaddr,
437	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
546	>	strlcpy(source_p->id, id, sizeof(source_p->id));
547	>	hash_add_id(source_p);
548
549	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
550	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
551	<	nick, source_p->username, source_p->host,
552	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
553	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
554	<	source_p->info);
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 they have died in send_* don't do anything. */
447	<	if (IsDead(source_p))
448	<	return;
449	<
450	<	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
465	–	SetClient(source_p);
466	–
467	–	source_p->servptr = &me;
468	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
469	–
470	–	/* Increment our total user count here */
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);
481	<	}
482	<	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
494	<	*              - 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
498	–	*              - 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,
505	<	const char *username, const char *host, const char *server,
506	<	const char *realname)
605	>	register_remote_user(struct Client *source_p)
606		{
607	<	struct Client *target_p = NULL;
509	<
510	<	assert(source_p != NULL);
511	<	assert(source_p->username != username);
512	<
513	<	strlcpy(source_p->host, host, sizeof(source_p->host));
514	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
515	<	strlcpy(source_p->username, username, sizeof(source_p->username));
516	<
517	<	/* Increment our total user count here */
518	<	if (++Count.total > Count.max_tot)
519	<	Count.max_tot = Count.total;
520	<
521	<	source_p->from->serv->dep_users++;
522	<
523	<	/*
524	<	* coming from another server, take the servers word for it
525	<	*/
526	<	source_p->servptr = find_server(server);
527	<
528	<	/* Super GhostDetect:
529	<	* If we can't find the server the user is supposed to be on,
530	<	* then simply blow the user away.        -Taner
531	<	*/
532	<	if (source_p->servptr == NULL)
533	<	{
534	<	sendto_realops_flags(UMODE_ALL, L_ALL,
535	<	"No server %s for user %s[%s@%s] from %s",
536	<	server, source_p->name, source_p->username,
537	<	source_p->host, source_p->from->name);
538	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
539	<
540	<	/* XXX */
541	<	SetKilled(source_p);
542	<	exit_client(source_p, &me, "Ghosted Client");
543	<	return;
544	<	}
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);
557	<	exit_client(source_p, &me, "USER server wrong direction");
558	<	return;
559	<	}
560	<
561	<	SetClient(source_p);
562	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
563	<	add_user_host(source_p->username, source_p->host, 1);
564	<	SetUserHost(source_p);
565	<
566	<	introduce_client(client_p, source_p);
567	<	}
568	<
569	<	/* introduce_client()
570	<	*
571	<	* inputs       - client_p
572	<	*              - source_p
573	<	* output       - NONE
574	<	* side effects - This common function introduces a client to the rest
575	<	*                of the net, either from a local client connect or
576	<	*                from a remote connect.
577	<	*/
578	<	static void
579	<	introduce_client(struct Client *client_p, struct Client *source_p)
580	<	{
581	<	dlink_node *server_node = NULL;
582	<	static char ubuf[12];
583	<
584	<	if (MyClient(source_p))
585	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
586	<	else
587	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
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	<	if (*ubuf == '\0')
622	<	{
623	<	ubuf[0] = '+';
592	<	ubuf[1] = '\0';
621	>	AddFlag(source_p, FLAGS_KILLED);
622	>	exit_client(source_p, "USER server wrong direction");
623	>	return;
624		}
625
626	<	/* arghhh one could try not introducing new nicks to ll leafs
627	<	* but then you have to introduce them "on the fly" in SJOIN
628	<	* not fun.
598	<	* Its not going to cost much more bandwidth to simply let new
599	<	* nicks just ride on through.
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	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
634	<	* you _need_ to if you aren't going to burst everyone initially.
604	<	*
605	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
606	<	* in that case just send it to the uplink.
607	<	* -davidt
608	<	* rewritten to cope with SIDs .. eww eww eww --is
609	<	*/
633	>	if (++Count.total > Count.max_tot)
634	>	Count.max_tot = Count.total;
635
636	<	/* XXX THESE NEED A PREFIX!?!?!? */
637	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
638	<	client_p != uplink)
639	<	{
640	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
616	<	{
617	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
618	<	source_p->servptr->id,
619	<	source_p->name, source_p->hopcount+1,
620	<	(unsigned long)source_p->tsinfo,
621	<	ubuf, source_p->username, source_p->host,
622	<	((MyClient(source_p) && !IsIPSpoof(source_p)) ?
623	<	source_p->sockhost : "0"),
624	<	source_p->id, source_p->info);
625	<	}
626	<	else
627	<	{
628	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
629	<	source_p->name, source_p->hopcount+1,
630	<	(unsigned long)source_p->tsinfo,
631	<	ubuf, source_p->username, source_p->host,
632	<	source_p->servptr->name,
633	<	source_p->info);
634	<	}
635	<	}
636	<	else
637	<	{
638	<	DLINK_FOREACH(server_node, serv_list.head)
639	<	{
640	<	struct Client *server = server_node->data;
636	>	SetClient(source_p);
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	<	if (IsCapable(server, CAP_LL) || server == client_p)
643	<	continue;
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	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
646	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
647	<	source_p->servptr->id,
648	<	source_p->name, source_p->hopcount+1,
649	<	(unsigned long)source_p->tsinfo,
650	<	ubuf, source_p->username, source_p->host,
651	<	((MyClient(source_p)&&!IsIPSpoof(source_p))?source_p->sockhost:"0"),
652	<	source_p->id, source_p->info);
653	<	else
654	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
655	<	source_p->name, source_p->hopcount+1,
656	<	(unsigned long)source_p->tsinfo,
657	<	ubuf, source_p->username, source_p->host,
658	<	source_p->servptr->name,
659	<	source_p->info);
660	<	}
661	<	}
649	>	introduce_client(source_p);
650		}
651
652		/* valid_hostname()
#	Line 675 | 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)
684	<	{
671	>	for (; *p; ++p)
672		if (!IsHostChar(*p))
673		return 0;
687	–	p++;
688	–	}
674
675	<	return 1;
675	>	return p - hostname <= HOSTLEN;
676		}
677
678		/* valid_username()
#	Line 702 | 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		}
733	–	else if (!IsUserChar(*p))
734	–	return 0;
735	–	}
736	–
737	–	return 1;
738	–	}
739	–
740	–	/* report_and_set_user_flags()
741	–	*
742	–	* inputs       - pointer to source_p
743	–	*              - pointer to aconf for this user
744	–	* output       - NONE
745	–	* side effects - Report to user any special flags
746	–	*                they are getting, and set them.
747	–	*/
748	–	static void
749	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
750	–	{
751	–	/* If this user is being spoofed, tell them so */
752	–	if (IsConfDoSpoofIp(aconf))
753	–	{
754	–	sendto_one(source_p,
755	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
756	–	me.name, source_p->name);
757	–	}
758	–
759	–	/* If this user is in the exception class, Set it "E lined" */
760	–	if (IsConfExemptKline(aconf))
761	–	{
762	–	SetExemptKline(source_p);
763	–	sendto_one(source_p,
764	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
765	–	me.name, source_p->name);
766	–	}
767	–
768	–	/* The else here is to make sure that G line exempt users
769	–	* do not get noticed twice.
770	–	*/
771	–	else if (IsConfExemptGline(aconf))
772	–	{
773	–	SetExemptGline(source_p);
774	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
775	–	me.name, source_p->name);
776	–	}
777	–
778	–	if (IsConfExemptResv(aconf))
779	–	{
780	–	SetExemptResv(source_p);
781	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
782	–	me.name, source_p->name);
722		}
723	<
785	<	/* If this user is exempt from user limits set it "F lined" */
786	<	if (IsConfExemptLimits(aconf))
787	<	{
788	<	SetExemptLimits(source_p);
789	<	sendto_one(source_p,
790	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
791	<	me.name,source_p->name);
792	<	}
793	<
794	<	/* If this user is exempt from idle time outs */
795	<	if (IsConfIdlelined(aconf))
723	>	else
724		{
725	<	SetIdlelined(source_p);
726	<	sendto_one(source_p,
727	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
800	<	me.name, source_p->name);
725	>	while (*++p)
726	>	if (!IsUserChar(*p))
727	>	return 0;
728		}
729
730	<	if (IsConfCanFlood(aconf))
804	<	{
805	<	SetCanFlood(source_p);
806	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
807	<	"protection, aren't you fearsome.",
808	<	me.name, source_p->name);
809	<	}
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,
820	<	const char *username, const char *host, const char *server,
821	<	const char *realname)
740	>	int
741	>	valid_nickname(const char *nickname, const int local)
742		{
743	<	assert(source_p != NULL);
824	<	assert(source_p->username != username);
825	<
826	<	if (source_p == NULL)
827	<	return;
828	<
829	<	if (!IsUnknown(source_p))
830	<	{
831	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
832	<	me.name, nick);
833	<	return;
834	<	}
743	>	const char *p = nickname;
744
745	<	source_p->flags |= FLAGS_GOTUSER;
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	<
843	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
844	<
845	<	if (!IsGotId(source_p))
846	<	{
847	<	/* save the username in the client
848	<	* If you move this you'll break ping cookies..you've been warned
849	<	*/
850	<	strlcpy(source_p->username, username, sizeof(source_p->username));
851	<	}
852	<
853	<	if (source_p->name[0])
854	<	{
855	<	/* NICK already received, now I have USER... */
856	<	register_local_user(client_p, source_p, source_p->name, username);
857	<	}
858	<	}
859	<
860	<	/* change_simple_umode()
861	<	*
862	<	* this callback can be hooked to allow special handling of
863	<	* certain usermodes
864	<	*/
865	<	static void *
866	<	change_simple_umode(va_list args)
867	<	{
868	<	struct Client *source_p;
869	<	int what;
870	<	unsigned int flag;
871	<
872	<	va_arg(args, struct Client *);
873	<	source_p = va_arg(args, struct Client *);
874	<	what = va_arg(args, int);
875	<	flag = va_arg(args, unsigned int);
876	<
877	<	if (what == MODE_ADD)
878	<	source_p->umodes |= flag;
879	<	else
880	<	source_p->umodes &= ~flag;
881	<
882	<	return NULL;
883	<	}
884	<
885	<	/* set_user_mode()
886	<	*
887	<	* added 15/10/91 By Darren Reed.
888	<	* parv[0] - sender
889	<	* parv[1] - username to change mode for
890	<	* parv[2] - modes to change
891	<	*/
892	<	void
893	<	set_user_mode(struct Client *client_p, struct Client *source_p,
894	<	int parc, char *parv[])
895	<	{
896	<	unsigned int flag, setflags;
897	<	char **p, *m, buf[IRCD_BUFSIZE];
898	<	struct Client *target_p;
899	<	int what = MODE_ADD, badflag = 0, i;
900	<
901	<	assert(!(parc < 2));
902	<
903	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
904	<	{
905	<	if (MyConnect(source_p))
906	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
907	<	me.name, source_p->name, parv[1]);
908	<	return;
909	<	}
910	<
911	<	if (IsServer(source_p))
912	<	{
913	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
914	<	parv[1], source_p->name);
915	<	return;
916	<	}
917	<
918	<	if (source_p != target_p || target_p->from != source_p->from)
919	<	{
920	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
921	<	me.name, source_p->name);
922	<	return;
923	<	}
924	<
925	<	if (parc < 3)
926	<	{
927	<	m = buf;
928	<	*m++ = '+';
929	<
930	<	for (i = 0; i < 128; i++)
931	<	if (source_p->umodes & user_modes[i])
932	<	*m++ = (char)i;
933	<	*m = '\0';
934	<
935	<	sendto_one(source_p, form_str(RPL_UMODEIS),
936	<	me.name, source_p->name, buf);
937	<	return;
938	<	}
939	<
940	<	execute_callback(entering_umode_cb, client_p, source_p);
941	<
942	<	/* find flags already set for user */
943	<	setflags = source_p->umodes;
944	<
945	<	/* parse mode change string(s) */
946	<	for (p = &parv[2]; p && *p; p++)
947	<	{
948	<	for (m = *p; *m; m++)
949	<	{
950	<	switch (*m)
951	<	{
952	<	case '+':
953	<	what = MODE_ADD;
954	<	break;
955	<	case '-':
956	<	what = MODE_DEL;
957	<	break;
958	<	case 'o':
959	<	if (what == MODE_ADD)
960	<	{
961	<	if (IsServer(client_p) && !IsOper(source_p))
962	<	{
963	<	++Count.oper;
964	<	SetOper(source_p);
965	<	}
966	<	}
967	<	else
968	<	{
969	<	/* Only decrement the oper counts if an oper to begin with
970	<	* found by Pat Szuta, Perly , perly@xnet.com
971	<	*/
972	<	if (!IsOper(source_p))
973	<	break;
974	<
975	<	ClearOper(source_p);
976	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
977	<	Count.oper--;
978	<
979	<	if (MyConnect(source_p))
980	<	{
981	<	dlink_node *dm;
982	<
983	<	detach_conf(source_p, OPER_TYPE);
984	<	ClearOperFlags(source_p);
985	<
986	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
987	<	free_dlink_node(dm);
988	<	}
989	<	}
990	<
991	<	break;
992	<
993	<	/* we may not get these,
994	<	* but they shouldnt be in default
995	<	*/
996	<	case ' ' :
997	<	case '\n':
998	<	case '\r':
999	<	case '\t':
1000	<	break;
1001	<
1002	<	default:
1003	<	if ((flag = user_modes[(unsigned char)*m]))
1004	<	{
1005	<	if (MyConnect(source_p) && !IsOper(source_p) &&
1006	<	(ConfigFileEntry.oper_only_umodes & flag))
1007	<	{
1008	<	badflag = 1;
1009	<	}
1010	<	else
1011	<	execute_callback(umode_cb, client_p, source_p, what, flag);
1012	<	}
1013	<	else
1014	<	{
1015	<	if (MyConnect(source_p))
1016	<	badflag = 1;
1017	<	}
1018	<
1019	<	break;
1020	<	}
1021	<	}
1022	<	}
1023	<
1024	<	if (badflag)
1025	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1026	<	me.name, source_p->name);
1027	<
1028	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1029	<	{
1030	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1031	<	me.name, source_p->name);
1032	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1033	<	}
1034	<
1035	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1036	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1037	<	{
1038	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1039	<	me.name, source_p->name);
1040	<	source_p->umodes &= ~UMODE_ADMIN;
1041	<	}
750	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
751	>	return 0;
752
753	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
754	<	++Count.invisi;
755	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1046	<	--Count.invisi;
753	>	for (; *p; ++p)
754	>	if (!IsNickChar(*p))
755	>	return 0;
756
757	<	/*
1049	<	* compare new flags with old flags and send string which
1050	<	* will cause servers to update correctly.
1051	<	*/
1052	<	send_umode_out(client_p, source_p, setflags);
757	>	return p - nickname <= NICKLEN;
758		}
759
760		/* send_umode()
761		* send the MODE string for user (user) to connection client_p
762		* -avalon
763	+	*
764	+	* inputs       - client_p
765	+	*              - source_p
766	+	*              - int old
767	+	*              - sendmask mask of modes to send
768	+	*              - suplied umode_buf
769	+	* output       - NONE
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		{
1063	–	int what = 0;
1064	–	unsigned int i;
1065	–	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];
1075	<	if (!flag)
1076	<	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 1089 | 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 1105 | Line 813 | send_umode(struct Client *client_p, stru
813		*m = '\0';
814
815		if (*umode_buf && client_p)
816	<	sendto_one(client_p, ":%s MODE %s :%s",
817	<	source_p->name, source_p->name, umode_buf);
816	>	sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
817	>	client_p->name, client_p->username,
818	>	client_p->host, client_p->name, umode_buf);
819		}
820
821		/* send_umode_out()
#	Line 1119 | Line 828 | void
828		send_umode_out(struct Client *client_p, struct Client *source_p,
829		unsigned int old)
830		{
831	<	char buf[IRCD_BUFSIZE];
1123	<	dlink_node *ptr = NULL;
831	>	char buf[IRCD_BUFSIZE] = "";
832
833	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1126	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
833	>	send_umode(NULL, source_p, old, buf);
834
835	<	if (*buf)
836	<	{
837	<	DLINK_FOREACH(ptr, serv_list.head)
1131	<	{
1132	<	struct Client *target_p = ptr->data;
1133	<
1134	<	if ((target_p != client_p) && (target_p != source_p))
1135	<	{
1136	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1137	<	(target_p->localClient->serverMask &
1138	<	source_p->lazyLinkClientExists))
1139	<	sendto_one(target_p, ":%s MODE %s :%s",
1140	<	ID_or_name(source_p, target_p),
1141	<	ID_or_name(source_p, target_p), buf);
1142	<	}
1143	<	}
1144	<	}
835	>	if (buf[0])
836	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
837	>	source_p->id, source_p->id, buf);
838
839		if (client_p && MyClient(client_p))
840	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
840	>	send_umode(client_p, source_p, old, buf);
841		}
842
843	<	/* user_welcome()
844	<	*
1152	<	* inputs       - client pointer to client to welcome
1153	<	* output       - NONE
1154	<	* side effects -
1155	<	*/
1156	<	static void
1157	<	user_welcome(struct Client *source_p)
843	>	void
844	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
845		{
846	<	#if defined(__TIME__) && defined(__DATE__)
1160	<	static const char built_date[] = __DATE__ " at " __TIME__;
1161	<	#else
1162	<	static const char built_date[] = "unknown";
1163	<	#endif
846	>	dlink_node *ptr = NULL;
847
848	<	#ifdef HAVE_LIBCRYPTO
849	<	if (source_p->localClient->fd.ssl != NULL)
1167	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1168	<	me.name, source_p->name,
1169	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1170	<	#endif
848	>	if (!strcmp(target_p->host, hostname))
849	>	return;
850
851	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
852	<	ServerInfo.network_name, source_p->name);
853	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
854	<	get_listener_name(source_p->localClient->listener), ircd_version);
855	<	sendto_one(source_p, form_str(RPL_CREATED),
856	<	me.name, source_p->name, built_date);
857	<	sendto_one(source_p, form_str(RPL_MYINFO),
858	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1180	<	show_isupport(source_p);
851	>	switch (what)
852	>	{
853	>	case MODE_ADD:
854	>	AddUMode(target_p, UMODE_HIDDENHOST);
855	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
856	>	break;
857	>	case MODE_DEL:
858	>	DelUMode(target_p, UMODE_HIDDENHOST);
859
860	<	if (source_p->id[0] != '\0')
861	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
862	<	source_p->name, source_p->id);
860	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
861	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
862	>	break;
863	>	default: return;
864	>	}
865
866	<	show_lusers(source_p);
866	>	if (ConfigGeneral.cycle_on_host_change)
867	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
868	>	target_p->name, target_p->username, target_p->host);
869
870	<	if (ConfigFileEntry.short_motd)
871	<	{
1190	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1191	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1192	<	sendto_one(source_p,
1193	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1194	<	"read it", source_p->name);
1195	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1196	<	me.name, source_p->name, me.name);
1197	<	sendto_one(source_p, form_str(RPL_MOTD),
1198	<	me.name, source_p->name,
1199	<	"*** This is the short motd ***");
1200	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1201	<	me.name, source_p->name);
1202	<	}
1203	<	else
1204	<	send_message_file(source_p, &ConfigFileEntry.motd);
1205	<	}
870	>	if (IsUserHostIp(target_p))
871	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
872
873	<	/* check_xline()
874	<	*
875	<	* inputs       - pointer to client to test
876	<	* outupt       - 1 if exiting 0 if ok
1211	<	* side effects -
1212	<	*/
1213	<	static int
1214	<	check_xline(struct Client *source_p)
1215	<	{
1216	<	struct ConfItem *conf;
1217	<	struct MatchItem *xconf;
1218	<	const char *reason;
873	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
874	>
875	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
876	>	SetUserHost(target_p);
877
878	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info,
1221	<	NULL, NULL, 0)) != NULL)
878	>	if (MyClient(target_p))
879		{
880	<	xconf = map_to_conf(conf);
881	<	xconf->count++;
880	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
881	>	clear_ban_cache_client(target_p);
882	>	}
883
884	<	if (xconf->reason != NULL)
885	<	reason = xconf->reason;
1228	<	else
1229	<	reason = "No Reason";
884	>	if (!ConfigGeneral.cycle_on_host_change)
885	>	return;
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	>	DLINK_FOREACH(ptr, target_p->channel.head)
888	>	{
889	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
890	>	char *p = modebuf;
891	>	int len = 0;
892	>	const struct Membership *ms = ptr->data;
893
894	<	ServerStats->is_ref++;
1238	<	if (REJECT_HOLD_TIME > 0)
894	>	if (has_member_flags(ms, CHFL_CHANOP))
895		{
896	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
897	<	me.name, source_p->name);
1242	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1243	<	SetCaptured(source_p);
896	>	*p++ = 'o';
897	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
898		}
1245	–	else
1246	–	exit_client(source_p, &me, "Bad user info");
1247	–	return 1;
1248	–	}
899
900	<	return 0;
901	<	}
902	<
903	<	static int
904	<	check_regexp_xline(struct Client *source_p)
1255	<	{
1256	<	struct ConfItem *conf = NULL;
1257	<	const char *reason = NULL;
1258	<
1259	<	if ((conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1260	<	{
1261	<	struct MatchItem *reg = map_to_conf(conf);
900	>	if (has_member_flags(ms, CHFL_HALFOP))
901	>	{
902	>	*p++ = 'h';
903	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
904	>	}
905
906	<	++reg->count;
906	>	if (has_member_flags(ms, CHFL_VOICE))
907	>	{
908	>	*p++ = 'v';
909	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
910	>	}
911
912	<	if (reg->reason != NULL)
1266	<	reason = reg->reason;
1267	<	else
1268	<	reason = "No Reason";
912	>	*p = '\0';
913
914	<	sendto_realops_flags(UMODE_REJ, L_ALL,
915	<	"X-line (REGEX) Rejecting [%s] [%s], user %s [%s]",
916	<	source_p->info, reason,
917	<	get_client_name(source_p, HIDE_IP),
918	<	source_p->sockhost);
914	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
915	>	target_p->name, target_p->username, target_p->host,
916	>	ms->chptr->name);
917	>	if (nickbuf[0])
918	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
919	>	target_p->servptr->name, ms->chptr->name,
920	>	modebuf, nickbuf);
921
1276	–	ServerStats->is_ref++;
1277	–	exit_client(source_p, &me, "Bad user info");
1278	–	return 1;
922		}
923
924	<	return 0;
925	<	}
926	<
927	<	/* oper_up()
928	<	*
929	<	* inputs       - pointer to given client to oper
930	<	* output       - NONE
931	<	* side effects - Blindly opers up given source_p, using aconf info
932	<	*                all checks on passwords have already been done.
933	<	*                This could also be used by rsa oper routines.
924	>	if (target_p->away[0])
925	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
926	>	":%s!%s@%s AWAY :%s",
927	>	target_p->name, target_p->username,
928	>	target_p->host, target_p->away);
929	>	}
930	>
931	>	/*! \brief Blindly opers up given source_p, using conf info.
932	>	*         All checks on passwords have already been done.
933	>	* \param source_p Pointer to given client to oper
934		*/
935		void
936		oper_up(struct Client *source_p)
937		{
938	<	unsigned int old = source_p->umodes;
939	<	const char *operprivs = "";
1297	<	const struct AccessItem *oconf = NULL;
938	>	const unsigned int old = source_p->umodes;
939	>	const struct MaskItem *conf = source_p->connection->confs.head->data;
940
941	<	assert(source_p->localClient->confs.head);
1300	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
941	>	assert(source_p->connection->confs.head);
942
943		++Count.oper;
944		SetOper(source_p);
945
946	<	if (oconf->modes)
947	<	source_p->umodes |= oconf->modes;
948	<	else if (ConfigFileEntry.oper_umodes)
949	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
950	<	else
951	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
952	<	UMODE_WALLOP|UMODE_LOCOPS);
946	>	if (conf->modes)
947	>	AddUMode(source_p, conf->modes);
948	>	else if (ConfigGeneral.oper_umodes)
949	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
950	>
951	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
952	>	++Count.invisi;
953	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
954	>	--Count.invisi;
955
956		assert(dlinkFind(&oper_list, source_p) == NULL);
957		dlinkAdd(source_p, make_dlink_node(), &oper_list);
958
959	<	operprivs = oper_privs_as_string(oconf->port);
959	>	AddOFlag(source_p, conf->port);
960
961	<	SetOFlag(source_p, oconf->port);
961	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
962	>	AddUMode(source_p, UMODE_ADMIN);
963
964	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
965	<	source_p->umodes |= UMODE_ADMIN;
966	<	if (!IsOperN(source_p))
967	<	source_p->umodes &= ~UMODE_NCHANGE;
1324	<
1325	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1326	<	source_p->name, source_p->username, source_p->host);
964	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
965	>	get_oper_name(source_p));
966	>	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
967	>	me.id, get_oper_name(source_p));
968		send_umode_out(source_p, source_p, old);
969	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1329	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1330	<	me.name, source_p->name, operprivs);
1331	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
969	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
970		}
971
972	<	/*
973	<	* Quick and dirty UID code for new proposed SID on EFnet
974	<	*
975	<	*/
972	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
973	>
974	>	int
975	>	valid_sid(const char *sid)
976	>	{
977	>	if (strlen(sid) == IRC_MAXSID)
978	>	if (IsDigit(*sid))
979	>	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
980	>	return 1;
981
982	<	static char new_uid[TOTALSIDUID+1];     /* allow for \0 */
983	<	static void add_one_to_uid(int i);
982	>	return 0;
983	>	}
984
985		/*
986		* init_uid()
987	<	*
987	>	*
988		* inputs       - NONE
989		* output       - NONE
990		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1351 | Line 994 | static void add_one_to_uid(int i);
994		void
995		init_uid(void)
996		{
1354	–	int i;
1355	–
997		memset(new_uid, 0, sizeof(new_uid));
998
999	<	if (ServerInfo.sid != NULL)
1000	<	{
1360	<	memcpy(new_uid, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1361	<	IRC_MAXSID));
1362	<	memcpy(&me.id, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1363	<	IRC_MAXSID));
1364	<	hash_add_id(&me);
1365	<	}
999	>	if (!EmptyString(ConfigServerInfo.sid))
1000	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
1001
1002	<	for (i = 0; i < IRC_MAXSID; i++)
1003	<	if (new_uid[i] == '\0')
1002	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1003	>	if (new_uid[i] == '\0')
1004		new_uid[i] = 'A';
1005
1006	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1007	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1373	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1374	<	* -Dianora
1375	<	*/
1376	<	memcpy(new_uid+IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1377	<
1378	<	entering_umode_cb = register_callback("entering_umode", NULL);
1379	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1380	<	uid_get_cb = register_callback("uid_get", uid_get);
1381	<	}
1382	<
1383	<	/*
1384	<	* uid_get
1385	<	*
1386	<	* inputs       - struct Client *
1387	<	* output       - new UID is returned to caller
1388	<	* side effects - new_uid is incremented by one.
1389	<	*/
1390	<	static void *
1391	<	uid_get(va_list args)
1392	<	{
1393	<	add_one_to_uid(TOTALSIDUID-1);    /* index from 0 */
1394	<	return ((void *) new_uid);
1006	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1007	>	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1008		}
1009
1010		/*
#	Line 1403 | Line 1016 | uid_get(va_list args)
1016		*                note this is a recursive function
1017		*/
1018		static void
1019	<	add_one_to_uid(int i)
1019	>	add_one_to_uid(unsigned int i)
1020		{
1021	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1021	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1022		{
1023		if (new_uid[i] == 'Z')
1024		new_uid[i] = '0';
1025		else if (new_uid[i] == '9')
1026		{
1027		new_uid[i] = 'A';
1028	<	add_one_to_uid(i-1);
1028	>	add_one_to_uid(i - 1);
1029		}
1030	<	else new_uid[i] = new_uid[i] + 1;
1030	>	else
1031	>	++new_uid[i];
1032		}
1033		else
1034		{
1035	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1035	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1036		if (new_uid[i] == 'Z')
1037	<	memcpy(new_uid+IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1037	>	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1038		else
1039	<	new_uid[i] = new_uid[i] + 1;
1039	>	++new_uid[i];
1040		}
1041		}
1042
1043		/*
1044	+	* uid_get
1045	+	*
1046	+	* inputs       - struct Client *
1047	+	* output       - new UID is returned to caller
1048	+	* side effects - new_uid is incremented by one.
1049	+	*/
1050	+	static const char *
1051	+	uid_get(void)
1052	+	{
1053	+	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1054	+	return new_uid;
1055	+	}
1056	+
1057	+	/*
1058		* init_isupport()
1059		*
1060		* input        - NONE
#	Line 1436 | Line 1064 | add_one_to_uid(int i)
1064		void
1065		init_isupport(void)
1066		{
1439	–	isupportFile = init_MessageLine();
1440	–
1067		add_isupport("CALLERID", NULL, -1);
1068	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1068	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1069	>	add_isupport("DEAF", "D", -1);
1070		add_isupport("KICKLEN", NULL, KICKLEN);
1071		add_isupport("MODES", NULL, MAXMODEPARAMS);
1445	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1446	–	#ifdef HALFOPS
1072		add_isupport("PREFIX", "(ohv)@%+", -1);
1073		add_isupport("STATUSMSG", "@%+", -1);
1074	<	#else
1075	<	add_isupport("PREFIX", "(ov)@+", -1);
1451	<	add_isupport("STATUSMSG", "@+", -1);
1452	<	#endif
1453	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1074	>	add_isupport("EXCEPTS", "e", -1);
1075	>	add_isupport("INVEX", "I", -1);
1076		}
1077
1078		/*
#	Line 1466 | Line 1088 | void
1088		add_isupport(const char *name, const char *options, int n)
1089		{
1090		dlink_node *ptr;
1091	<	struct Isupport *support;
1091	>	struct Isupport *support = NULL;
1092
1093		DLINK_FOREACH(ptr, support_list.head)
1094		{
#	Line 1481 | Line 1103 | add_isupport(const char *name, const cha
1103
1104		if (ptr == NULL)
1105		{
1106	<	support = MyMalloc(sizeof(*support));
1106	>	support = MyCalloc(sizeof(*support));
1107		dlinkAddTail(support, &support->node, &support_list);
1108		}
1109
1110	<	DupString(support->name, name);
1111	<	if (options != NULL)
1112	<	DupString(support->options, options);
1110	>	support->name = xstrdup(name);
1111	>	if (options)
1112	>	support->options = xstrdup(options);
1113		support->number = n;
1114
1115		rebuild_isupport_message_line();
#	Line 1534 | Line 1156 | rebuild_isupport_message_line(void)
1156		{
1157		char isupportbuffer[IRCD_BUFSIZE];
1158		char *p = isupportbuffer;
1159	<	dlink_node *ptr = NULL;
1159	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1160		int n = 0;
1161		int tokens = 0;
1162		size_t len = 0;
1163	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1163	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1164
1165	<	destroy_MessageLine(isupportFile);
1165	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1166	>	{
1167	>	dlinkDelete(ptr, &support_list_lines);
1168	>	MyFree(ptr->data);
1169	>	free_dlink_node(ptr);
1170	>	}
1171
1172		DLINK_FOREACH(ptr, support_list.head)
1173		{
1174		struct Isupport *support = ptr->data;
1175
1176	<	p += (n = ircsprintf(p, "%s", support->name));
1176	>	p += (n = sprintf(p, "%s", support->name));
1177		len += n;
1178
1179	<	if (support->options != NULL)
1179	>	if (support->options)
1180		{
1181	<	p += (n = ircsprintf(p, "=%s", support->options));
1181	>	p += (n = sprintf(p, "=%s", support->options));
1182		len += n;
1183		}
1184
1185		if (support->number > 0)
1186		{
1187	<	p += (n = ircsprintf(p, "=%d", support->number));
1187	>	p += (n = sprintf(p, "=%d", support->number));
1188		len += n;
1189		}
1190
#	Line 1570 | Line 1197 | rebuild_isupport_message_line(void)
1197		if (*--p == ' ')
1198		*p = '\0';
1199
1200	<	addto_MessageLine(isupportFile, isupportbuffer);
1200	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1201		p = isupportbuffer;
1202		len = 0;
1203		n = tokens = 0;
1204		}
1205		}
1206
1207	<	if (len != 0)
1207	>	if (len)
1208		{
1209		if (*--p == ' ')
1210		*p = '\0';
1211	<	addto_MessageLine(isupportFile, isupportbuffer);
1211	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1212		}
1213		}

Diff Legend

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