ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4819 by michael, Sat Nov 1 16:49:40 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 "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "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"
35		#include "ircd.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"
39	>	#include "conf.h"
40	>	#include "log.h"
41	>	#include "server.h"
42		#include "send.h"
46	–	#include "supported.h"
47	–	#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"
54	<	#include "msg.h"
47	>	#include "misc.h"
48	>	#include "parse.h"
49		#include "watch.h"
50
57	–
58	–	struct Callback *entering_umode_cb = NULL;
59	–	struct Callback *umode_cb = NULL;
60	–
51		static char umode_buffer[IRCD_BUFSIZE];
62	–
63	–	static void user_welcome(struct Client *);
64	–	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
65	–	static int check_xline(struct Client *);
66	–	static void introduce_client(struct Client *);
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	<
73	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 78 | 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 91 | Line 75 | unsigned int user_modes[256] =
75		0,                  /* @ */
76		0,                  /* A */
77		0,                  /* B */
78	<	UMODE_CCONN_FULL,   /* C */
78	>	0,                  /* C */
79		UMODE_DEAF,         /* D */
80		0,                  /* E */
81	<	0,                  /* F */
81	>	UMODE_FARCONNECT,   /* F */
82		UMODE_SOFTCALLERID, /* G */
83	<	0,                  /* H */
83	>	UMODE_HIDDEN,       /* H */
84		0,                  /* I */
85		0,                  /* J */
86		0,                  /* K */
#	Line 107 | Line 91 | unsigned int user_modes[256] =
91		0,                  /* P */
92		0,                  /* Q */
93		UMODE_REGONLY,      /* R */
94	<	0,                  /* S */
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 */
#	Line 132 | Line 116 | unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
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 175 | 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;
165	<
166	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
183	<	{
184	<	from = me.id;
185	<	to = source_p->id;
186	<	}
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	<	{
169	<	from = me.name;
190	<	to = source_p->name;
191	<	}
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
172	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
195	<	from, to, (Count.total-Count.invisi),
196	<	Count.invisi, dlink_list_length(&global_serv_list));
197	<	else
198	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
199	<	(Count.total-Count.invisi), Count.invisi, 1);
171	>	if (Count.oper)
172	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173
174	<	if (Count.oper > 0)
175	<	sendto_one(source_p, form_str(RPL_LUSEROP),
176	<	from, to, Count.oper);
177	<
178	<	if (dlink_list_length(&unknown_list) > 0)
179	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
180	<	from, to, dlink_list_length(&unknown_list));
181	<
182	<	if (dlink_list_length(&global_channel_list) > 0)
183	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
211	<	from, to, dlink_list_length(&global_channel_list));
212	<
213	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
214	<	{
215	<	sendto_one(source_p, form_str(RPL_LUSERME),
216	<	from, to, Count.local, Count.myserver);
217	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
218	<	from, to, Count.local, Count.max_loc,
219	<	Count.local, Count.max_loc);
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	>	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	<	sendto_one(source_p, form_str(RPL_LUSERME),
188	<	from, to, Count.total, 0);
225	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
226	<	from, to, Count.total, Count.max_tot,
227	<	Count.total, Count.max_tot);
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	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
192	<	from, to, Count.total, Count.max_tot,
193	<	Count.total, Count.max_tot);
194	<
195	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
235	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
236	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
191	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192	>
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 > Count.max_loc_cli)
198		Count.max_loc_cli = Count.local;
199
200		if ((Count.local + Count.myserver) > Count.max_loc_con)
201	<	Count.max_loc_con = Count.local + Count.myserver;
201	>	Count.max_loc_con = Count.local + Count.myserver;
202		}
203
204		/* show_isupport()
#	Line 249 | 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	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	>	"0" : source_p->sockhost, source_p->id,
315	>	source_p->account,
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	>	/*! \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 AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
412	>	const struct MaskItem *conf = NULL;
413
287	–	assert(source_p != NULL);
414		assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416	<	assert(!source_p->localClient->registration);
416	>	assert(!source_p->connection->registration);
417
418		ClearCap(source_p, CAP_TS6);
419
420	<	if (ConfigFileEntry.ping_cookie)
420	>	if (ConfigGeneral.ping_cookie)
421		{
422	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
422	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
423		{
424		do
425	<	source_p->localClient->random_ping = genrand_int32();
426	<	while (!source_p->localClient->random_ping);
425	>	source_p->connection->random_ping = genrand_int32();
426	>	while (!source_p->connection->random_ping);
427
428	<	sendto_one(source_p, "PING :%u",
303	<	source_p->localClient->random_ping);
428	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
429		SetPingSent(source_p);
430		return;
431		}
#	Line 309 | Line 434 | register_local_user(struct Client *sourc
434		return;
435		}
436
437	<	source_p->localClient->last_privmsg = CurrentTime;
437	>	source_p->connection->last_privmsg = CurrentTime;
438		/* Straight up the maximum rate of flooding... */
439	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
439	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
440
441	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
441	>	if (!check_client(source_p))
442		return;
443
444	<	if (valid_hostname(source_p->host) == 0)
444	>	if (!valid_hostname(source_p->host))
445		{
446	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
447	<	"character in your hostname", me.name, source_p->name);
448	<	strlcpy(source_p->host, source_p->sockhost,
324	<	sizeof(source_p->host));
446	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
447	>	"character in your hostname");
448	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
449		}
450
451	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
451	>	conf = source_p->connection->confs.head->data;
452
453		if (!IsGotId(source_p))
454		{
455	<	char username[USERLEN + 1];
455	>	char username[USERLEN + 1] = "";
456		const char *p = username;
457		unsigned int i = 0;
458
459	<	if (IsNeedIdentd(aconf))
459	>	if (IsNeedIdentd(conf))
460		{
461		++ServerStats.is_ref;
462	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
463	<	"identd to use this server", me.name, source_p->name);
464	<	exit_client(source_p, &me, "Install identd");
462	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
463	>	"identd to use this server");
464	>	exit_client(source_p, "Install identd");
465		return;
466		}
467
468		strlcpy(username, source_p->username, sizeof(username));
469
470	<	if (!IsNoTilde(aconf))
470	>	if (!IsNoTilde(conf))
471		source_p->username[i++] = '~';
472
473		for (; *p && i < USERLEN; ++p)
474	<	if (*p != '[')
352	<	source_p->username[i++] = *p;
474	>	source_p->username[i++] = *p;
475
476		source_p->username[i] = '\0';
477		}
478
479	<	/* password check */
480	<	if (!EmptyString(aconf->passwd))
479	>	/* Password check */
480	>	if (!EmptyString(conf->passwd))
481		{
482	<	const char *pass = source_p->localClient->passwd;
361	<
362	<	if (!match_conf_password(pass, aconf))
482	>	if (!match_conf_password(source_p->connection->password, conf))
483		{
484		++ServerStats.is_ref;
485	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
486	<	me.name, source_p->name);
487	<	exit_client(source_p, &me, "Bad Password");
485	>
486	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
487	>	exit_client(source_p, "Bad Password");
488		return;
489		}
490		}
491
492	<	/* don't free source_p->localClient->passwd here - it can be required
493	<	* by masked /stats I if there are auth{} blocks with need_password = no;
492	>	/*
493	>	* Don't free source_p->connection->password here - it can be required
494	>	* by masked /stats I if there are auth {} blocks with need_password = no;
495		* --adx
496		*/
497
498	<	/* report if user has &^>= etc. and set flags as needed in source_p */
499	<	report_and_set_user_flags(source_p, aconf);
498	>	/*
499	>	* Report if user has &^>= etc. and set flags as needed in source_p
500	>	*/
501	>	report_and_set_user_flags(source_p, conf);
502
503		if (IsDead(source_p))
504		return;
505
506	<	/* Limit clients -
506	>	/*
507	>	* Limit clients -
508		* We want to be able to have servers and F-line clients
509		* connect, so save room for "buffer" connections.
510		* Smaller servers may want to decrease this, and it should
511		* probably be just a percentage of the MAXCLIENTS...
512		*   -Taner
513		*/
514	<	/* Except "F:" clients */
515	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
392	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
514	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
515	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
516		{
517	<	sendto_realops_flags(UMODE_FULL, L_ALL,
517	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
518		"Too many clients, rejecting %s[%s].",
519		source_p->name, source_p->host);
520		++ServerStats.is_ref;
521	<	exit_client(source_p, &me, "Sorry, server is full - try later");
521	>	exit_client(source_p, "Sorry, server is full - try later");
522		return;
523		}
524
525	<	/* valid user name check */
403	<	if (valid_username(source_p->username) == 0)
525	>	if (!valid_username(source_p->username, 1))
526		{
527	<	char tmpstr2[IRCD_BUFSIZE];
527	>	char buf[IRCD_BUFSIZE] = "";
528
529	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
529	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
530	>	"Invalid username: %s (%s@%s)",
531		source_p->name, source_p->username, source_p->host);
532		++ServerStats.is_ref;
533	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
534	<	source_p->username);
412	<	exit_client(source_p, &me, tmpstr2);
533	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
534	>	exit_client(source_p, buf);
535		return;
536		}
537
538		if (check_xline(source_p))
539		return;
540
541	<	while (hash_find_id((id = uid_get())) != NULL)
541	>	while (hash_find_id((id = uid_get())))
542		;
543
544		strlcpy(source_p->id, id, sizeof(source_p->id));
545		hash_add_id(source_p);
546
547	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
547	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
548		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
549		source_p->name, source_p->username, source_p->host,
550	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
550	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
551		"255.255.255.255" : source_p->sockhost,
552	<	get_client_class(source_p),
552	>	get_client_class(&source_p->connection->confs),
553		source_p->info, source_p->id);
554
555	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
434	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
435	<	source_p->name, source_p->username, source_p->host,
436	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	<	"255.255.255.255" : source_p->sockhost,
438	<	get_client_class(source_p),
439	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	<	"<hidden>" : source_p->localClient->client_host,
441	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	<	"<hidden>" : source_p->localClient->client_server,
443	<	source_p->info);
444	<
445	<
446	<	if (ConfigFileEntry.invisible_on_connect)
555	>	if (ConfigGeneral.invisible_on_connect)
556		{
557	<	source_p->umodes |= UMODE_INVISIBLE;
557	>	AddUMode(source_p, UMODE_INVISIBLE);
558		++Count.invisi;
559		}
560
561	<	if ((++Count.local) > Count.max_loc)
561	>	if (++Count.local > Count.max_loc)
562		{
563		Count.max_loc = Count.local;
564
565		if (!(Count.max_loc % 10))
566	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
566	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
567	>	"New maximum local client connections: %u",
568		Count.max_loc);
569		}
570
461	–	/* Increment our total user count here */
571		if (++Count.total > Count.max_tot)
572		Count.max_tot = Count.total;
573		++Count.totalrestartcount;
#	Line 466 | Line 575 | register_local_user(struct Client *sourc
575		assert(source_p->servptr == &me);
576		SetClient(source_p);
577		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
578	<
470	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
578	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
579
580		assert(dlinkFind(&unknown_list, source_p));
581
582	<	dlink_move_node(&source_p->localClient->lclient_node,
582	>	dlink_move_node(&source_p->connection->lclient_node,
583		&unknown_list, &local_client_list);
584
585		user_welcome(source_p);
#	Line 487 | Line 595 | register_local_user(struct Client *sourc
595		*              - username to register as
596		*              - host name to register as
597		*              - server name
490	–	*              - realname (gecos)
598		* output       - NONE
599		* side effects - This function is called when a remote client
600		*                is introduced by a server.
601		*/
602		void
603	<	register_remote_user(struct Client *source_p,
497	<	const char *username, const char *host, const char *server,
498	<	const char *realname)
603	>	register_remote_user(struct Client *source_p)
604		{
605	<	struct Client *target_p = NULL;
501	<
502	<	assert(source_p != NULL);
503	<	assert(source_p->username != username);
504	<
505	<	strlcpy(source_p->host, host, sizeof(source_p->host));
506	<	strlcpy(source_p->username, username, sizeof(source_p->username));
507	<
508	<	/*
509	<	* coming from another server, take the servers word for it
510	<	*/
511	<	source_p->servptr = hash_find_server(server);
512	<
513	<	/* Super GhostDetect:
514	<	* If we can't find the server the user is supposed to be on,
515	<	* then simply blow the user away.        -Taner
516	<	*/
517	<	if (source_p->servptr == NULL)
518	<	{
519	<	sendto_realops_flags(UMODE_ALL, L_ALL,
520	<	"No server %s for user %s[%s@%s] from %s",
521	<	server, source_p->name, source_p->username,
522	<	source_p->host, source_p->from->name);
523	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
524	<
525	<	SetKilled(source_p);
526	<	exit_client(source_p, &me, "Ghosted Client");
527	<	return;
528	<	}
605	>	const struct Client *target_p = NULL;
606
607		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
608		{
609	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
609	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
610		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
611		source_p->from->name, source_p->name, source_p->username,
612		source_p->host, source_p->servptr->name,
613		target_p->name, target_p->from->name);
614	<	kill_client(source_p->from, source_p,
615	<	"%s (NICK from wrong direction (%s != %s))",
616	<	me.name, source_p->servptr->name, target_p->from->name);
617	<	SetKilled(source_p);
618	<	exit_client(source_p, &me, "USER server wrong direction");
614	>	sendto_one(source_p->from,
615	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
616	>	me.id, source_p->id, me.name, source_p->servptr->name,
617	>	target_p->from->name);
618	>
619	>	AddFlag(source_p, FLAGS_KILLED);
620	>	exit_client(source_p, "USER server wrong direction");
621		return;
622		}
623
#	Line 546 | Line 625 | register_remote_user(struct Client *sour
625		* If the nick has been introduced by a services server,
626		* make it a service as well.
627		*/
628	<	if (IsService(source_p->servptr))
629	<	SetService(source_p);
628	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
629	>	AddFlag(source_p, FLAGS_SERVICE);
630
552	–	/* Increment our total user count here */
631		if (++Count.total > Count.max_tot)
632		Count.max_tot = Count.total;
633
634		SetClient(source_p);
635		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
636	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
637		add_user_host(source_p->username, source_p->host, 1);
638		SetUserHost(source_p);
639
640	<	introduce_client(source_p);
641	<	}
640	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
641	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
642	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
643	>	source_p->servptr->name,
644	>	source_p->name, source_p->username, source_p->host,
645	>	source_p->info, source_p->id);
646
647	<	/* introduce_client()
565	<	*
566	<	* inputs       - source_p
567	<	* output       - NONE
568	<	* side effects - This common function introduces a client to the rest
569	<	*                of the net, either from a local client connect or
570	<	*                from a remote connect.
571	<	*/
572	<	static void
573	<	introduce_client(struct Client *source_p)
574	<	{
575	<	dlink_node *server_node = NULL;
576	<	static char ubuf[12];
577	<
578	<	if (MyClient(source_p))
579	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
580	<	else
581	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
582	<
583	<	watch_check_hash(source_p, RPL_LOGON);
584	<
585	<	if (*ubuf == '\0')
586	<	{
587	<	ubuf[0] = '+';
588	<	ubuf[1] = '\0';
589	<	}
590	<
591	<	DLINK_FOREACH(server_node, serv_list.head)
592	<	{
593	<	struct Client *server = server_node->data;
594	<
595	<	if (server == source_p->from)
596	<	continue;
597	<
598	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
599	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
600	<	source_p->servptr->id,
601	<	source_p->name, source_p->hopcount+1,
602	<	(unsigned long)source_p->tsinfo,
603	<	ubuf, source_p->username, source_p->host,
604	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
605	<	"0" : source_p->sockhost, source_p->id, source_p->info);
606	<	else
607	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
608	<	source_p->name, source_p->hopcount+1,
609	<	(unsigned long)source_p->tsinfo,
610	<	ubuf, source_p->username, source_p->host,
611	<	source_p->servptr->name, source_p->info);
612	<	}
647	>	introduce_client(source_p);
648		}
649
650		/* valid_hostname()
#	Line 626 | Line 661 | valid_hostname(const char *hostname)
661		{
662		const char *p = hostname;
663
664	<	assert(p != NULL);
664	>	assert(p);
665
666	<	if (*p == '.' || *p == ':')
666	>	if (EmptyString(p) || *p == '.' || *p == ':')
667		return 0;
668
669		for (; *p; ++p)
670		if (!IsHostChar(*p))
671		return 0;
672
673	<	return 1;
673	>	return p - hostname <= HOSTLEN;
674		}
675
676		/* valid_username()
#	Line 650 | Line 685 | valid_hostname(const char *hostname)
685		* style of username
686		*/
687		int
688	<	valid_username(const char *username)
688	>	valid_username(const char *username, const int local)
689		{
690	<	int dots      = 0;
690	>	unsigned int dots = 0;
691		const char *p = username;
692
693	<	assert(p != NULL);
693	>	assert(p);
694
695		if (*p == '~')
696		++p;
697
698	<	/* reject usernames that don't start with an alphanum
698	>	/*
699	>	* Reject usernames that don't start with an alphanum
700		* i.e. reject jokers who have '-@somehost' or '.@somehost'
701		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
702		*/
703		if (!IsAlNum(*p))
704		return 0;
705
706	<	while (*++p)
706	>	if (local)
707		{
708	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
708	>	while (*++p)
709		{
710	<	if (++dots > ConfigFileEntry.dots_in_ident)
711	<	return 0;
712	<	if (!IsUserChar(*(p + 1)))
710	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
711	>	{
712	>	if (++dots > ConfigGeneral.dots_in_ident)
713	>	return 0;
714	>	if (!IsUserChar(*(p + 1)))
715	>	return 0;
716	>	}
717	>	else if (!IsUserChar(*p))
718		return 0;
719		}
720	<	else if (!IsUserChar(*p))
721	<	return 0;
720	>	}
721	>	else
722	>	{
723	>	while (*++p)
724	>	if (!IsUserChar(*p))
725	>	return 0;
726		}
727
728	<	return 1;
728	>	return p - username <= USERLEN;
729		}
730
731		/* clean_nick_name()
#	Line 694 | Line 739 | int
739		valid_nickname(const char *nickname, const int local)
740		{
741		const char *p = nickname;
742	+
743		assert(nickname && *nickname);
744
745	<	/* nicks can't start with a digit or - or be 0 length */
746	<	/* This closer duplicates behaviour of hybrid-6 */
747	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
745	>	/*
746	>	* Nicks can't start with a digit or - or be 0 length.
747	>	*/
748	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
749		return 0;
750
751		for (; *p; ++p)
752		if (!IsNickChar(*p))
753		return 0;
754
755	<	return p - nickname <= (NICKLEN - 1);
709	<	}
710	<
711	<	/* report_and_set_user_flags()
712	<	*
713	<	* inputs       - pointer to source_p
714	<	*              - pointer to aconf for this user
715	<	* output       - NONE
716	<	* side effects - Report to user any special flags
717	<	*                they are getting, and set them.
718	<	*/
719	<	static void
720	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
721	<	{
722	<	/* If this user is being spoofed, tell them so */
723	<	if (IsConfDoSpoofIp(aconf))
724	<	{
725	<	sendto_one(source_p,
726	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
727	<	me.name, source_p->name);
728	<	}
729	<
730	<	/* If this user is in the exception class, Set it "E lined" */
731	<	if (IsConfExemptKline(aconf))
732	<	{
733	<	SetExemptKline(source_p);
734	<	sendto_one(source_p,
735	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
736	<	me.name, source_p->name);
737	<	}
738	<
739	<	/* The else here is to make sure that G line exempt users
740	<	* do not get noticed twice.
741	<	*/
742	<	else if (IsConfExemptGline(aconf))
743	<	{
744	<	SetExemptGline(source_p);
745	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
746	<	me.name, source_p->name);
747	<	}
748	<
749	<	if (IsConfExemptResv(aconf))
750	<	{
751	<	SetExemptResv(source_p);
752	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
753	<	me.name, source_p->name);
754	<	}
755	<
756	<	/* If this user is exempt from user limits set it "F lined" */
757	<	if (IsConfExemptLimits(aconf))
758	<	{
759	<	SetExemptLimits(source_p);
760	<	sendto_one(source_p,
761	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
762	<	me.name,source_p->name);
763	<	}
764	<
765	<	if (IsConfCanFlood(aconf))
766	<	{
767	<	SetCanFlood(source_p);
768	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
769	<	"protection, aren't you fearsome.",
770	<	me.name, source_p->name);
771	<	}
772	<	}
773	<
774	<	/* change_simple_umode()
775	<	*
776	<	* this callback can be hooked to allow special handling of
777	<	* certain usermodes
778	<	*/
779	<	static void *
780	<	change_simple_umode(va_list args)
781	<	{
782	<	struct Client *client_p;
783	<	struct Client *source_p;
784	<	int what;
785	<	unsigned int flag;
786	<
787	<	client_p = va_arg(args, struct Client *);
788	<	source_p = va_arg(args, struct Client *);
789	<	what = va_arg(args, int);
790	<	flag = va_arg(args, unsigned int);
791	<
792	<	if (what == MODE_ADD)
793	<	source_p->umodes |= flag;
794	<	else
795	<	source_p->umodes &= ~flag;
796	<
797	<	return NULL;
798	<	}
799	<
800	<	/* set_user_mode()
801	<	*
802	<	* added 15/10/91 By Darren Reed.
803	<	* parv[0] - sender
804	<	* parv[1] - username to change mode for
805	<	* parv[2] - modes to change
806	<	*/
807	<	void
808	<	set_user_mode(struct Client *client_p, struct Client *source_p,
809	<	int parc, char *parv[])
810	<	{
811	<	unsigned int flag, setflags;
812	<	char **p, *m, buf[IRCD_BUFSIZE];
813	<	struct Client *target_p;
814	<	int what = MODE_ADD, badflag = 0, i;
815	<
816	<	assert(!(parc < 2));
817	<
818	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
819	<	{
820	<	if (MyConnect(source_p))
821	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	<	me.name, source_p->name, parv[1]);
823	<	return;
824	<	}
825	<
826	<	if (IsServer(source_p))
827	<	{
828	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
829	<	parv[1], source_p->name);
830	<	return;
831	<	}
832	<
833	<	if (source_p != target_p)
834	<	{
835	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
836	<	me.name, source_p->name);
837	<	return;
838	<	}
839	<
840	<	if (parc < 3)
841	<	{
842	<	m = buf;
843	<	*m++ = '+';
844	<
845	<	for (i = 0; i < 128; i++)
846	<	if (source_p->umodes & user_modes[i])
847	<	*m++ = (char)i;
848	<	*m = '\0';
849	<
850	<	sendto_one(source_p, form_str(RPL_UMODEIS),
851	<	me.name, source_p->name, buf);
852	<	return;
853	<	}
854	<
855	<	execute_callback(entering_umode_cb, client_p, source_p);
856	<
857	<	/* find flags already set for user */
858	<	setflags = source_p->umodes;
859	<
860	<	/* parse mode change string(s) */
861	<	for (p = &parv[2]; p && *p; p++)
862	<	{
863	<	for (m = *p; *m; m++)
864	<	{
865	<	switch (*m)
866	<	{
867	<	case '+':
868	<	what = MODE_ADD;
869	<	break;
870	<	case '-':
871	<	what = MODE_DEL;
872	<	break;
873	<	case 'o':
874	<	if (what == MODE_ADD)
875	<	{
876	<	if (IsServer(client_p) && !IsOper(source_p))
877	<	{
878	<	++Count.oper;
879	<	SetOper(source_p);
880	<	}
881	<	}
882	<	else
883	<	{
884	<	/* Only decrement the oper counts if an oper to begin with
885	<	* found by Pat Szuta, Perly , perly@xnet.com
886	<	*/
887	<	if (!IsOper(source_p))
888	<	break;
889	<
890	<	ClearOper(source_p);
891	<	Count.oper--;
892	<
893	<	if (MyConnect(source_p))
894	<	{
895	<	dlink_node *dm;
896	<
897	<	detach_conf(source_p, OPER_TYPE);
898	<	ClearOperFlags(source_p);
899	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
900	<
901	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
902	<	free_dlink_node(dm);
903	<	}
904	<	}
905	<
906	<	break;
907	<
908	<	/* we may not get these,
909	<	* but they shouldnt be in default
910	<	*/
911	<	case 'r':
912	<	case ' ' :
913	<	case '\n':
914	<	case '\r':
915	<	case '\t':
916	<	break;
917	<
918	<	default:
919	<	if ((flag = user_modes[(unsigned char)*m]))
920	<	{
921	<	if (MyConnect(source_p) && !IsOper(source_p) &&
922	<	(ConfigFileEntry.oper_only_umodes & flag))
923	<	{
924	<	badflag = 1;
925	<	}
926	<	else
927	<	execute_callback(umode_cb, client_p, source_p, what, flag);
928	<	}
929	<	else
930	<	{
931	<	if (MyConnect(source_p))
932	<	badflag = 1;
933	<	}
934	<
935	<	break;
936	<	}
937	<	}
938	<	}
939	<
940	<	if (badflag)
941	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
942	<	me.name, source_p->name);
943	<
944	<	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
945	<	{
946	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
947	<	me.name, source_p->name);
948	<	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
949	<	}
950	<
951	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
952	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
953	<	{
954	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
955	<	me.name, source_p->name);
956	<	source_p->umodes &= ~UMODE_ADMIN;
957	<	}
958	<
959	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
960	<	++Count.invisi;
961	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
962	<	--Count.invisi;
963	<
964	<	/*
965	<	* compare new flags with old flags and send string which
966	<	* will cause servers to update correctly.
967	<	*/
968	<	send_umode_out(client_p, source_p, setflags);
755	>	return p - nickname <= NICKLEN;
756		}
757
758		/* send_umode()
#	Line 981 | Line 768 | set_user_mode(struct Client *client_p, s
768		*/
769		void
770		send_umode(struct Client *client_p, struct Client *source_p,
771	<	unsigned int old, unsigned int sendmask, char *umode_buf)
771	>	unsigned int old, char *umode_buf)
772		{
773		char *m = umode_buf;
774		int what = 0;
988	–	unsigned int i;
989	–	unsigned int flag;
775
776		/*
777	<	* build a string in umode_buf to represent the change in the user's
777	>	* Build a string in umode_buf to represent the change in the user's
778		* mode between the new (source_p->umodes) and 'old'.
779		*/
780	<	for (i = 0; i < 128; i++)
780	>	for (unsigned int i = 0; i < 128; ++i)
781		{
782	<	flag = user_modes[i];
998	<	if (!flag)
999	<	continue;
782	>	unsigned int flag = user_modes[i];
783
784	<	if (MyClient(source_p) && !(flag & sendmask))
784	>	if (!flag)
785		continue;
786
787	<	if ((flag & old) && !(source_p->umodes & flag))
787	>	if ((flag & old) && !HasUMode(source_p, flag))
788		{
789		if (what == MODE_DEL)
790		*m++ = (char)i;
#	Line 1012 | Line 795 | send_umode(struct Client *client_p, stru
795		*m++ = (char)i;
796		}
797		}
798	<	else if (!(flag & old) && (source_p->umodes & flag))
798	>	else if (!(flag & old) && HasUMode(source_p, flag))
799		{
800		if (what == MODE_ADD)
801		*m++ = (char)i;
#	Line 1029 | Line 812 | send_umode(struct Client *client_p, stru
812
813		if (*umode_buf && client_p)
814		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
815	<	source_p->name, source_p->username,
816	<	source_p->host, source_p->name, umode_buf);
815	>	client_p->name, client_p->username,
816	>	client_p->host, client_p->name, umode_buf);
817		}
818
819		/* send_umode_out()
#	Line 1040 | Line 823 | send_umode(struct Client *client_p, stru
823		* side effects - Only send ubuf out to servers that know about this client
824		*/
825		void
826	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1044	<	unsigned int old)
826	>	send_umode_out(struct Client *source_p, unsigned int old)
827		{
828	<	char buf[IRCD_BUFSIZE] = { '\0' };
1047	<	dlink_node *ptr = NULL;
828	>	char buf[IRCD_BUFSIZE] = "";
829
830	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1050	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
830	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
831
832		if (buf[0])
833	<	{
834	<	DLINK_FOREACH(ptr, serv_list.head)
1055	<	{
1056	<	struct Client *target_p = ptr->data;
1057	<
1058	<	if ((target_p != client_p) && (target_p != source_p))
1059	<	sendto_one(target_p, ":%s MODE %s :%s",
1060	<	ID_or_name(source_p, target_p),
1061	<	ID_or_name(source_p, target_p), buf);
1062	<	}
1063	<	}
1064	<
1065	<	if (client_p && MyClient(client_p))
1066	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
833	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
834	>	source_p->id, source_p->id, buf);
835		}
836
837	<	/* user_welcome()
838	<	*
1071	<	* inputs       - client pointer to client to welcome
1072	<	* output       - NONE
1073	<	* side effects -
1074	<	*/
1075	<	static void
1076	<	user_welcome(struct Client *source_p)
837	>	void
838	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
839		{
840	<	#if defined(__TIME__) && defined(__DATE__)
1079	<	static const char built_date[] = __DATE__ " at " __TIME__;
1080	<	#else
1081	<	static const char built_date[] = "unknown";
1082	<	#endif
840	>	dlink_node *node = NULL;
841
842	<	#ifdef HAVE_LIBCRYPTO
843	<	if (source_p->localClient->fd.ssl != NULL)
1086	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1087	<	me.name, source_p->name,
1088	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1089	<	#endif
842	>	if (!strcmp(target_p->host, hostname))
843	>	return;
844
845	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
846	<	ServerInfo.network_name, source_p->name);
847	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
848	<	get_listener_name(source_p->localClient->listener), ircd_version);
849	<	sendto_one(source_p, form_str(RPL_CREATED),
850	<	me.name, source_p->name, built_date);
851	<	sendto_one(source_p, form_str(RPL_MYINFO),
852	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
853	<	show_isupport(source_p);
845	>	switch (what)
846	>	{
847	>	case MODE_ADD:
848	>	AddUMode(target_p, UMODE_HIDDENHOST);
849	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
850	>	break;
851	>	case MODE_DEL:
852	>	DelUMode(target_p, UMODE_HIDDENHOST);
853	>
854	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
855	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
856	>	break;
857	>	default: return;
858	>	}
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 (ConfigGeneral.cycle_on_host_change)
861	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
862	>	target_p->name, target_p->username, target_p->host);
863
864	<	show_lusers(source_p);
864	>	if (IsUserHostIp(target_p))
865	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
866
867	<	if (ConfigFileEntry.short_motd)
867	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
868	>
869	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
870	>	SetUserHost(target_p);
871	>
872	>	if (MyClient(target_p))
873		{
874	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
875	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1111	<	sendto_one(source_p,
1112	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1113	<	"read it", me.name, source_p->name);
1114	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1115	<	me.name, source_p->name, me.name);
1116	<	sendto_one(source_p, form_str(RPL_MOTD),
1117	<	me.name, source_p->name,
1118	<	"*** This is the short motd ***");
1119	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1120	<	me.name, source_p->name);
874	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
875	>	clear_ban_cache_client(target_p);
876		}
1122	–	else
1123	–	send_message_file(source_p, &ConfigFileEntry.motd);
1124	–	}
877
878	<	/* check_xline()
879	<	*
1128	<	* inputs       - pointer to client to test
1129	<	* outupt       - 1 if exiting 0 if ok
1130	<	* side effects -
1131	<	*/
1132	<	static int
1133	<	check_xline(struct Client *source_p)
1134	<	{
1135	<	struct ConfItem *conf = NULL;
1136	<	const char *reason = NULL;
878	>	if (!ConfigGeneral.cycle_on_host_change)
879	>	return;
880
881	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1139	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
881	>	DLINK_FOREACH(node, target_p->channel.head)
882		{
883	<	struct MatchItem *reg = map_to_conf(conf);
884	<
885	<	++reg->count;
883	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
884	>	char *p = modebuf;
885	>	int len = 0;
886	>	const struct Membership *member = node->data;
887
888	<	if (reg->reason != NULL)
889	<	reason = reg->reason;
890	<	else
891	<	reason = "No Reason";
888	>	if (has_member_flags(member, CHFL_CHANOP))
889	>	{
890	>	*p++ = 'o';
891	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
892	>	}
893
894	<	sendto_realops_flags(UMODE_REJ, L_ALL,
895	<	"X-line Rejecting [%s] [%s], user %s [%s]",
896	<	source_p->info, reason,
897	<	get_client_name(source_p, HIDE_IP),
898	<	source_p->sockhost);
894	>	if (has_member_flags(member, CHFL_HALFOP))
895	>	{
896	>	*p++ = 'h';
897	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
898	>	}
899
900	<	++ServerStats.is_ref;
1157	<	if (REJECT_HOLD_TIME > 0)
900	>	if (has_member_flags(member, CHFL_VOICE))
901		{
902	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
903	<	me.name, source_p->name);
1161	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1162	<	SetCaptured(source_p);
902	>	*p++ = 'v';
903	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
904		}
1164	–	else
1165	–	exit_client(source_p, &me, "Bad user info");
1166	–	return 1;
1167	–	}
905
906	<	return 0;
1170	<	}
906	>	*p = '\0';
907
908	<	/* oper_up()
909	<	*
910	<	* inputs       - pointer to given client to oper
911	<	* output       - NONE
912	<	* side effects - Blindly opers up given source_p, using aconf info
913	<	*                all checks on passwords have already been done.
914	<	*                This could also be used by rsa oper routines.
908	>
909	>	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
910	>	target_p->name, target_p->username,
911	>	target_p->host, member->chptr->name,
912	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
913	>	target_p->info);
914	>	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
915	>	target_p->name, target_p->username,
916	>	target_p->host, member->chptr->name);
917	>
918	>	if (nickbuf[0])
919	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
920	>	target_p->servptr->name, member->chptr->name,
921	>	modebuf, nickbuf);
922	>
923	>	}
924	>
925	>	if (target_p->away[0])
926	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
927	>	":%s!%s@%s AWAY :%s",
928	>	target_p->name, target_p->username,
929	>	target_p->host, target_p->away);
930	>	}
931	>
932	>	/*! \brief Blindly opers up given source_p, using conf info.
933	>	*         All checks on passwords have already been done.
934	>	* \param source_p Pointer to given client to oper
935		*/
936		void
937		oper_up(struct Client *source_p)
938		{
939	<	unsigned int old = source_p->umodes;
940	<	const char *operprivs = "";
1185	<	const struct AccessItem *oconf = NULL;
939	>	const unsigned int old = source_p->umodes;
940	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
941
942	<	assert(source_p->localClient->confs.head);
1188	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
942	>	assert(source_p->connection->confs.head);
943
944		++Count.oper;
945		SetOper(source_p);
946
947	<	if (oconf->modes)
948	<	source_p->umodes |= oconf->modes;
949	<	else if (ConfigFileEntry.oper_umodes)
950	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1197	<	else
1198	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1199	<	UMODE_WALLOP|UMODE_LOCOPS);
947	>	if (conf->modes)
948	>	AddUMode(source_p, conf->modes);
949	>	else if (ConfigGeneral.oper_umodes)
950	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
951
952	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
952	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
953		++Count.invisi;
954	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
954	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
955		--Count.invisi;
956
957		assert(dlinkFind(&oper_list, source_p) == NULL);
958		dlinkAdd(source_p, make_dlink_node(), &oper_list);
959
960	<	operprivs = oper_privs_as_string(oconf->port);
1210	<
1211	<	SetOFlag(source_p, oconf->port);
960	>	AddOFlag(source_p, conf->port);
961
962	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
962	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
963		AddUMode(source_p, UMODE_ADMIN);
1215	–	if (!IsOperN(source_p))
1216	–	DelUMode(source_p, UMODE_NCHANGE);
964
965	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
966	<	source_p->name, source_p->username, source_p->host);
967	<	send_umode_out(source_p, source_p, old);
968	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
969	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
970	<	me.name, source_p->name, operprivs);
1224	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
965	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
966	>	get_oper_name(source_p));
967	>	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
968	>	me.id, get_oper_name(source_p));
969	>	send_umode_out(source_p, old);
970	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
971		}
972
973	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
973	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
974
975		int
976		valid_sid(const char *sid)
#	Line 1239 | Line 985 | valid_sid(const char *sid)
985
986		/*
987		* init_uid()
988	<	*
988	>	*
989		* inputs       - NONE
990		* output       - NONE
991		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1249 | Line 995 | valid_sid(const char *sid)
995		void
996		init_uid(void)
997		{
1252	–	int i;
1253	–
998		memset(new_uid, 0, sizeof(new_uid));
999
1000	<	if (!EmptyString(ServerInfo.sid))
1001	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1000	>	if (!EmptyString(ConfigServerInfo.sid))
1001	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
1002
1003	<	for (i = 0; i < IRC_MAXSID; ++i)
1004	<	if (new_uid[i] == '\0')
1003	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1004	>	if (new_uid[i] == '\0')
1005		new_uid[i] = 'A';
1006
1007		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1264	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1265	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1266	–	* -Dianora
1267	–	*/
1008		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1269	–
1270	–	entering_umode_cb = register_callback("entering_umode", NULL);
1271	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1009		}
1010
1011		/*
#	Line 1280 | Line 1017 | init_uid(void)
1017		*                note this is a recursive function
1018		*/
1019		static void
1020	<	add_one_to_uid(int i)
1020	>	add_one_to_uid(unsigned int i)
1021		{
1022	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1022	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1023		{
1024		if (new_uid[i] == 'Z')
1025		new_uid[i] = '0';
1026		else if (new_uid[i] == '9')
1027		{
1028		new_uid[i] = 'A';
1029	<	add_one_to_uid(i-1);
1029	>	add_one_to_uid(i - 1);
1030		}
1031		else
1032		++new_uid[i];
#	Line 1314 | Line 1051 | add_one_to_uid(int i)
1051		static const char *
1052		uid_get(void)
1053		{
1054	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1054	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1055		return new_uid;
1056		}
1057
#	Line 1328 | Line 1065 | uid_get(void)
1065		void
1066		init_isupport(void)
1067		{
1331	–	isupportFile = init_MessageLine();
1332	–
1068		add_isupport("CALLERID", NULL, -1);
1069	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1069	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1070		add_isupport("DEAF", "D", -1);
1071		add_isupport("KICKLEN", NULL, KICKLEN);
1072		add_isupport("MODES", NULL, MAXMODEPARAMS);
1338	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1339	–	#ifdef HALFOPS
1073		add_isupport("PREFIX", "(ohv)@%+", -1);
1074		add_isupport("STATUSMSG", "@%+", -1);
1075	<	#else
1076	<	add_isupport("PREFIX", "(ov)@+", -1);
1344	<	add_isupport("STATUSMSG", "@+", -1);
1345	<	#endif
1346	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1075	>	add_isupport("EXCEPTS", "e", -1);
1076	>	add_isupport("INVEX", "I", -1);
1077		}
1078
1079		/*
#	Line 1358 | Line 1088 | init_isupport(void)
1088		void
1089		add_isupport(const char *name, const char *options, int n)
1090		{
1091	<	dlink_node *ptr;
1092	<	struct Isupport *support;
1091	>	dlink_node *node = NULL;
1092	>	struct Isupport *support = NULL;
1093
1094	<	DLINK_FOREACH(ptr, support_list.head)
1094	>	DLINK_FOREACH(node, support_list.head)
1095		{
1096	<	support = ptr->data;
1096	>	support = node->data;
1097		if (irccmp(support->name, name) == 0)
1098		{
1099		MyFree(support->name);
#	Line 1372 | Line 1102 | add_isupport(const char *name, const cha
1102		}
1103		}
1104
1105	<	if (ptr == NULL)
1105	>	if (node == NULL)
1106		{
1107	<	support = MyMalloc(sizeof(*support));
1107	>	support = MyCalloc(sizeof(*support));
1108		dlinkAddTail(support, &support->node, &support_list);
1109		}
1110
1111	<	DupString(support->name, name);
1112	<	if (options != NULL)
1113	<	DupString(support->options, options);
1111	>	support->name = xstrdup(name);
1112	>	if (options)
1113	>	support->options = xstrdup(options);
1114		support->number = n;
1115
1116		rebuild_isupport_message_line();
#	Line 1396 | Line 1126 | add_isupport(const char *name, const cha
1126		void
1127		delete_isupport(const char *name)
1128		{
1129	<	dlink_node *ptr;
1400	<	struct Isupport *support;
1129	>	dlink_node *node = NULL;
1130
1131	<	DLINK_FOREACH(ptr, support_list.head)
1131	>	DLINK_FOREACH(node, support_list.head)
1132		{
1133	<	support = ptr->data;
1133	>	struct Isupport *support = node->data;
1134	>
1135		if (irccmp(support->name, name) == 0)
1136		{
1137	<	dlinkDelete(ptr, &support_list);
1137	>	dlinkDelete(node, &support_list);
1138		MyFree(support->name);
1139		MyFree(support->options);
1140		MyFree(support);
#	Line 1427 | Line 1157 | rebuild_isupport_message_line(void)
1157		{
1158		char isupportbuffer[IRCD_BUFSIZE];
1159		char *p = isupportbuffer;
1160	<	dlink_node *ptr = NULL;
1160	>	dlink_node *node = NULL, *node_next = NULL;
1161		int n = 0;
1162		int tokens = 0;
1163		size_t len = 0;
1164	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1164	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1165
1166	<	destroy_MessageLine(isupportFile);
1166	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1167	>	{
1168	>	dlinkDelete(node, &support_list_lines);
1169	>	MyFree(node->data);
1170	>	free_dlink_node(node);
1171	>	}
1172
1173	<	DLINK_FOREACH(ptr, support_list.head)
1173	>	DLINK_FOREACH(node, support_list.head)
1174		{
1175	<	struct Isupport *support = ptr->data;
1175	>	struct Isupport *support = node->data;
1176
1177	<	p += (n = ircsprintf(p, "%s", support->name));
1177	>	p += (n = sprintf(p, "%s", support->name));
1178		len += n;
1179
1180	<	if (support->options != NULL)
1180	>	if (support->options)
1181		{
1182	<	p += (n = ircsprintf(p, "=%s", support->options));
1182	>	p += (n = sprintf(p, "=%s", support->options));
1183		len += n;
1184		}
1185
1186		if (support->number > 0)
1187		{
1188	<	p += (n = ircsprintf(p, "=%d", support->number));
1188	>	p += (n = sprintf(p, "=%d", support->number));
1189		len += n;
1190		}
1191
#	Line 1463 | Line 1198 | rebuild_isupport_message_line(void)
1198		if (*--p == ' ')
1199		*p = '\0';
1200
1201	<	addto_MessageLine(isupportFile, isupportbuffer);
1201	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1202		p = isupportbuffer;
1203		len = 0;
1204		n = tokens = 0;
1205		}
1206		}
1207
1208	<	if (len != 0)
1208	>	if (len)
1209		{
1210		if (*--p == ' ')
1211		*p = '\0';
1212	<	addto_MessageLine(isupportFile, isupportbuffer);
1212	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1213		}
1214		}

Diff Legend

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