ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/user.c

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1899 by michael, Sat Apr 27 18:55:28 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/user.c (file contents), Revision 4091 by michael, Sun Jun 29 09:36:39 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "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 "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
43		#include "supported.h"
45	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
51	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51
55	–
56	–	struct Callback *entering_umode_cb = NULL;
57	–	struct Callback *umode_cb = NULL;
58	–
52		static char umode_buffer[IRCD_BUFSIZE];
60	–
61	–	static void user_welcome(struct Client *);
62	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
63	–	static int check_xline(struct Client *);
64	–	static void introduce_client(struct Client *);
53		static const char *uid_get(void);
54
55		/* Used for building up the isupport string,
56		* used with init_isupport, add_isupport, delete_isupport
57		*/
58	<
71	<	struct Isupport
58	>	struct Isupport
59		{
60		dlink_node node;
61		char *name;
#	Line 76 | Line 63 | struct Isupport
63		int number;
64		};
65
66	<	static dlink_list support_list = { NULL, NULL, 0 };
67	<	MessageFile *isupportFile;
66	>	static dlink_list support_list;
67	>	static dlink_list support_list_lines;
68
69		/* memory is cheap. map 0-255 to equivalent mode */
70	<	unsigned int user_modes[256] =
70	>	const unsigned int user_modes[256] =
71		{
72		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
73		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 89 | Line 76 | unsigned int user_modes[256] =
76		0,                  /* @ */
77		0,                  /* A */
78		0,                  /* B */
79	<	UMODE_CCONN_FULL,   /* C */
79	>	0,                  /* C */
80		UMODE_DEAF,         /* D */
81		0,                  /* E */
82	<	0,                  /* F */
82	>	UMODE_FARCONNECT,   /* F */
83		UMODE_SOFTCALLERID, /* G */
84		UMODE_HIDDEN,       /* H */
85		0,                  /* I */
#	Line 105 | Line 92 | unsigned int user_modes[256] =
92		0,                  /* P */
93		0,                  /* Q */
94		UMODE_REGONLY,      /* R */
95	<	0,                  /* S */
95	>	UMODE_SSL,          /* S */
96		0,                  /* T */
97		0,                  /* U */
98		0,                  /* V */
99	<	0,                  /* W */
99	>	UMODE_WEBIRC,       /* W */
100		0,                  /* X */
101		0,                  /* Y */
102		0,                  /* Z 0x5A */
103	<	0, 0, 0, 0, 0,      /* 0x5F   */
103	>	0, 0, 0, 0, 0,      /* 0x5F   */
104		0,                  /* 0x60   */
105		UMODE_ADMIN,        /* a */
106		UMODE_BOTS,         /* b */
#	Line 130 | Line 117 | unsigned int user_modes[256] =
117		0,                  /* m */
118		UMODE_NCHANGE,      /* n */
119		UMODE_OPER,         /* o */
120	<	0,                  /* p */
121	<	0,                  /* q */
120	>	UMODE_HIDECHANS,    /* p */
121	>	UMODE_HIDEIDLE,     /* q */
122		UMODE_REGISTERED,   /* r */
123		UMODE_SERVNOTICE,   /* s */
124		0,                  /* t */
125		UMODE_UNAUTH,       /* u */
126		0,                  /* v */
127		UMODE_WALLOP,       /* w */
128	<	0,                  /* x */
128	>	UMODE_HIDDENHOST,   /* x */
129		UMODE_SPY,          /* y */
130	<	UMODE_OPERWALL,     /* z      0x7A */
130	>	0,                  /* z      0x7A */
131		0,0,0,0,0,          /* 0x7B - 0x7F */
132
133		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 173 | Line 160 | assemble_umode_buffer(void)
160		* side effects - display to client user counts etc.
161		*/
162		void
163	<	show_lusers(struct Client *source_p)
163	>	show_lusers(struct Client *source_p)
164		{
178	–	const char *from, *to;
179	–
180	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
181	–	{
182	–	from = me.id;
183	–	to = source_p->id;
184	–	}
185	–	else
186	–	{
187	–	from = me.name;
188	–	to = source_p->name;
189	–	}
190	–
165		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
166	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
167	<	from, to, (Count.total-Count.invisi),
194	<	Count.invisi, dlink_list_length(&global_serv_list));
166	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
167	>	Count.invisi, dlink_list_length(&global_serv_list));
168		else
169	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
170	<	(Count.total-Count.invisi), Count.invisi, 1);
169	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
170	>	(Count.total - Count.invisi), Count.invisi, 1);
171	>
172	>	if (Count.oper)
173	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
174
175	<	if (Count.oper > 0)
176	<	sendto_one(source_p, form_str(RPL_LUSEROP),
177	<	from, to, Count.oper);
178	<
179	<	if (dlink_list_length(&unknown_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
205	<	from, to, dlink_list_length(&unknown_list));
206	<
207	<	if (dlink_list_length(&global_channel_list) > 0)
208	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209	<	from, to, dlink_list_length(&global_channel_list));
175	>	if (dlink_list_length(&unknown_list))
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
177	>
178	>	if (dlink_list_length(&channel_list))
179	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
180
181		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
182		{
183	<	sendto_one(source_p, form_str(RPL_LUSERME),
184	<	from, to, Count.local, Count.myserver);
215	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc);
183	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
184	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
185		}
186		else
187		{
188	<	sendto_one(source_p, form_str(RPL_LUSERME),
189	<	from, to, Count.total, 0);
222	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.total, Count.max_tot);
188	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
189	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
190		}
191
192	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
227	<	from, to, Count.total, Count.max_tot);
192	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
193
194		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
195	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
196	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
195	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
196	>	Count.max_loc_cli, Count.totalrestartcount);
197
198		if (Count.local > Count.max_loc_cli)
199		Count.max_loc_cli = Count.local;
200
201		if ((Count.local + Count.myserver) > Count.max_loc_con)
202	<	Count.max_loc_con = Count.local + Count.myserver;
202	>	Count.max_loc_con = Count.local + Count.myserver;
203		}
204
205		/* show_isupport()
#	Line 244 | Line 209 | show_lusers(struct Client *source_p)
209		* side effects - display to client what we support (for them)
210		*/
211		void
212	<	show_isupport(struct Client *source_p)
212	>	show_isupport(struct Client *source_p)
213		{
214	<	send_message_file(source_p, isupportFile);
214	>	const dlink_node *ptr = NULL;
215	>
216	>	DLINK_FOREACH(ptr, support_list_lines.head)
217	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218		}
219
220	<	/*
221	<	** register_local_user
222	<	**      This function is called when both NICK and USER messages
223	<	**      have been accepted for the client, in whatever order. Only
224	<	**      after this, is the USER message propagated.
225	<	**
226	<	**      NICK's must be propagated at once when received, although
227	<	**      it would be better to delay them too until full info is
228	<	**      available. Doing it is not so simple though, would have
229	<	**      to implement the following:
230	<	**
231	<	**      (actually it has been implemented already for a while) -orabidoo
232	<	**
233	<	**      1) user telnets in and gives only "NICK foobar" and waits
234	<	**      2) another user far away logs in normally with the nick
235	<	**         "foobar" (quite legal, as this server didn't propagate
236	<	**         it).
237	<	**      3) now this server gets nick "foobar" from outside, but
238	<	**         has alread the same defined locally. Current server
239	<	**         would just issue "KILL foobar" to clean out dups. But,
240	<	**         this is not fair. It should actually request another
241	<	**         nick from local user or kill him/her...
242	<	*/
220	>
221	>	/* report_and_set_user_flags()
222	>	*
223	>	* inputs       - pointer to source_p
224	>	*              - pointer to conf for this user
225	>	* output       - NONE
226	>	* side effects - Report to user any special flags
227	>	*                they are getting, and set them.
228	>	*/
229	>	static void
230	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
231	>	{
232	>	/* If this user is being spoofed, tell them so */
233	>	if (IsConfDoSpoofIp(conf))
234	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
235	>
236	>	/* If this user is in the exception class, Set it "E lined" */
237	>	if (IsConfExemptKline(conf))
238	>	{
239	>	SetExemptKline(source_p);
240	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
241	>	}
242	>
243	>	/*
244	>	* The else here is to make sure that G line exempt users
245	>	* do not get noticed twice.
246	>	*/
247	>	else if (IsConfExemptGline(conf))
248	>	{
249	>	SetExemptGline(source_p);
250	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
251	>	}
252	>
253	>	if (IsConfExemptResv(conf))
254	>	{
255	>	SetExemptResv(source_p);
256	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
257	>	}
258	>
259	>	/* If this user is exempt from user limits set it "F lined" */
260	>	if (IsConfExemptLimits(conf))
261	>	{
262	>	SetExemptLimits(source_p);
263	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
264	>	}
265	>
266	>	if (IsConfCanFlood(conf))
267	>	{
268	>	SetCanFlood(source_p);
269	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
270	>	"protection, aren't you fearsome.");
271	>	}
272	>	}
273	>
274	>	/* introduce_client()
275	>	*
276	>	* inputs       - source_p
277	>	* output       - NONE
278	>	* side effects - This common function introduces a client to the rest
279	>	*                of the net, either from a local client connect or
280	>	*                from a remote connect.
281	>	*/
282	>	static void
283	>	introduce_client(struct Client *source_p)
284	>	{
285	>	dlink_node *ptr = NULL;
286	>	char ubuf[IRCD_BUFSIZE] = "";
287	>
288	>	if (MyClient(source_p))
289	>	send_umode(source_p, source_p, 0, ubuf);
290	>	else
291	>	send_umode(NULL, source_p, 0, ubuf);
292	>
293	>	watch_check_hash(source_p, RPL_LOGON);
294	>
295	>	if (ubuf[0] == '\0')
296	>	{
297	>	ubuf[0] = '+';
298	>	ubuf[1] = '\0';
299	>	}
300	>
301	>	DLINK_FOREACH(ptr, serv_list.head)
302	>	{
303	>	struct Client *server = ptr->data;
304	>
305	>	if (server == source_p->from)
306	>	continue;
307	>
308	>	if (IsCapable(server, CAP_SVS))
309	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
310	>	source_p->servptr->id,
311	>	source_p->name, source_p->hopcount+1,
312	>	(unsigned long)source_p->tsinfo,
313	>	ubuf, source_p->username, source_p->host,
314	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
315	>	"0" : source_p->sockhost, source_p->id,
316	>	source_p->svid,
317	>	source_p->info);
318	>	else
319	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
320	>	source_p->servptr->id,
321	>	source_p->name, source_p->hopcount+1,
322	>	(unsigned long)source_p->tsinfo,
323	>	ubuf, source_p->username, source_p->host,
324	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
325	>	"0" : source_p->sockhost, source_p->id, source_p->info);
326	>
327	>	if (!EmptyString(source_p->certfp))
328	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
329	>	}
330	>	}
331	>
332	>	/* user_welcome()
333	>	*
334	>	* inputs       - client pointer to client to welcome
335	>	* output       - NONE
336	>	* side effects -
337	>	*/
338	>	static void
339	>	user_welcome(struct Client *source_p)
340	>	{
341	>	#if defined(__TIME__) && defined(__DATE__)
342	>	static const char built_date[] = __DATE__ " at " __TIME__;
343	>	#else
344	>	static const char built_date[] = "unknown";
345	>	#endif
346	>
347	>	#ifdef HAVE_LIBCRYPTO
348	>	if (HasFlag(source_p, FLAGS_SSL))
349	>	{
350	>	AddUMode(source_p, UMODE_SSL);
351	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
352	>	ssl_get_cipher(source_p->localClient->fd.ssl));
353	>	}
354	>	#endif
355	>
356	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
357	>	source_p->name);
358	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
359	>	get_listener_name(source_p->localClient->listener), ircd_version);
360	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
361	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362	>	show_isupport(source_p);
363	>
364	>	if (source_p->id[0])
365	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
366	>
367	>	show_lusers(source_p);
368	>	motd_signon(source_p);
369	>	}
370	>
371	>	/* check_xline()
372	>	*
373	>	* inputs       - pointer to client to test
374	>	* outupt       - 1 if exiting 0 if ok
375	>	* side effects -
376	>	*/
377	>	static int
378	>	check_xline(struct Client *source_p)
379	>	{
380	>	struct MaskItem *conf = NULL;
381	>	const char *reason = NULL;
382	>
383	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
384	>	{
385	>	++conf->count;
386	>
387	>	if (conf->reason)
388	>	reason = conf->reason;
389	>	else
390	>	reason = CONF_NOREASON;
391	>
392	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
393	>	"X-line Rejecting [%s] [%s], user %s [%s]",
394	>	source_p->info, reason,
395	>	get_client_name(source_p, HIDE_IP),
396	>	source_p->sockhost);
397	>
398	>	++ServerStats.is_ref;
399	>	exit_client(source_p, "Bad user info");
400	>	return 1;
401	>	}
402	>
403	>	return 0;
404	>	}
405	>
406	>	/*! \brief This function is called when both NICK and USER messages
407	>	*      have been accepted for the client, in whatever order. Only
408	>	*      after this, is the UID message propagated.
409	>	* \param source_p Pointer to given client to introduce
410	>	*/
411		void
412		register_local_user(struct Client *source_p)
413		{
414		const char *id = NULL;
415		const struct MaskItem *conf = NULL;
416
281	–	assert(source_p != NULL);
417		assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
419		assert(!source_p->localClient->registration);
#	Line 287 | Line 422 | register_local_user(struct Client *sourc
422
423		if (ConfigFileEntry.ping_cookie)
424		{
425	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
425	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
426		{
427		do
428		source_p->localClient->random_ping = genrand_int32();
#	Line 310 | Line 445 | register_local_user(struct Client *sourc
445		if (!check_client(source_p))
446		return;
447
448	<	if (valid_hostname(source_p->host) == 0)
448	>	if (!valid_hostname(source_p->host))
449		{
450	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
451	<	"character in your hostname", me.name, source_p->name);
450	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
451	>	"character in your hostname");
452		strlcpy(source_p->host, source_p->sockhost,
453		sizeof(source_p->host));
454		}
#	Line 322 | Line 457 | register_local_user(struct Client *sourc
457
458		if (!IsGotId(source_p))
459		{
460	<	char username[USERLEN + 1];
460	>	char username[USERLEN + 1] = "";
461		const char *p = username;
462		unsigned int i = 0;
463
464		if (IsNeedIdentd(conf))
465		{
466		++ServerStats.is_ref;
467	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
468	<	"identd to use this server", me.name, source_p->name);
469	<	exit_client(source_p, &me, "Install identd");
467	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
468	>	"identd to use this server");
469	>	exit_client(source_p, "Install identd");
470		return;
471		}
472
#	Line 347 | Line 482 | register_local_user(struct Client *sourc
482		source_p->username[i] = '\0';
483		}
484
485	<	/* password check */
485	>	/* Password check */
486		if (!EmptyString(conf->passwd))
487		{
488	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
488	>	if (!match_conf_password(source_p->localClient->passwd, conf))
489		{
490		++ServerStats.is_ref;
491	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
492	<	me.name, source_p->name);
493	<	exit_client(source_p, &me, "Bad Password");
491	>
492	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
493	>	exit_client(source_p, "Bad Password");
494		return;
495		}
496		}
497
498	<	/* don't free source_p->localClient->passwd here - it can be required
498	>	/*
499	>	* Don't free source_p->localClient->passwd here - it can be required
500		* by masked /stats I if there are auth{} blocks with need_password = no;
501		* --adx
502		*/
503
504	<	/* report if user has &^>= etc. and set flags as needed in source_p */
504	>	/*
505	>	* Report if user has &^>= etc. and set flags as needed in source_p
506	>	*/
507		report_and_set_user_flags(source_p, conf);
508
509		if (IsDead(source_p))
510		return;
511
512	<	/* Limit clients -
512	>	/*
513	>	* Limit clients -
514		* We want to be able to have servers and F-line clients
515		* connect, so save room for "buffer" connections.
516		* Smaller servers may want to decrease this, and it should
517		* probably be just a percentage of the MAXCLIENTS...
518		*   -Taner
519		*/
383	–	/* Except "F:" clients */
520		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
521		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
522		{
#	Line 388 | Line 524 | register_local_user(struct Client *sourc
524		"Too many clients, rejecting %s[%s].",
525		source_p->name, source_p->host);
526		++ServerStats.is_ref;
527	<	exit_client(source_p, &me, "Sorry, server is full - try later");
527	>	exit_client(source_p, "Sorry, server is full - try later");
528		return;
529		}
530
531	<	/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
531	>	if (!valid_username(source_p->username, 1))
532		{
533	<	char tmpstr2[IRCD_BUFSIZE];
533	>	char buf[IRCD_BUFSIZE] = "";
534
535		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
536		"Invalid username: %s (%s@%s)",
537		source_p->name, source_p->username, source_p->host);
538		++ServerStats.is_ref;
539	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
540	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
539	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
540	>	exit_client(source_p, buf);
541		return;
542		}
543
544		if (check_xline(source_p))
545		return;
546
547	<	while (hash_find_id((id = uid_get())) != NULL)
547	>	while (hash_find_id((id = uid_get())))
548		;
549
550		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 424 | Line 558 | register_local_user(struct Client *sourc
558		get_client_class(&source_p->localClient->confs),
559		source_p->info, source_p->id);
560
427	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	–	source_p->name, source_p->username, source_p->host,
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"255.255.255.255" : source_p->sockhost,
432	–	get_client_class(&source_p->localClient->confs),
433	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	–	"<hidden>" : source_p->localClient->client_host,
435	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	–	"<hidden>" : source_p->localClient->client_server,
437	–	source_p->info);
438	–
439	–
561		if (ConfigFileEntry.invisible_on_connect)
562		{
563		AddUMode(source_p, UMODE_INVISIBLE);
564		++Count.invisi;
565		}
566
567	<	if ((++Count.local) > Count.max_loc)
567	>	if (++Count.local > Count.max_loc)
568		{
569		Count.max_loc = Count.local;
570
#	Line 453 | Line 574 | register_local_user(struct Client *sourc
574		Count.max_loc);
575		}
576
456	–	/* Increment our total user count here */
577		if (++Count.total > Count.max_tot)
578		Count.max_tot = Count.total;
579		++Count.totalrestartcount;
#	Line 462 | Line 582 | register_local_user(struct Client *sourc
582		SetClient(source_p);
583		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
584
465	–	source_p->localClient->allow_read = MAX_FLOOD_BURST;
466	–
585		assert(dlinkFind(&unknown_list, source_p));
586
587		dlink_move_node(&source_p->localClient->lclient_node,
#	Line 482 | Line 600 | register_local_user(struct Client *sourc
600		*              - username to register as
601		*              - host name to register as
602		*              - server name
485	–	*              - realname (gecos)
603		* output       - NONE
604		* side effects - This function is called when a remote client
605		*                is introduced by a server.
606		*/
607		void
608	<	register_remote_user(struct Client *source_p,
492	<	const char *username, const char *host, const char *server,
493	<	const char *realname)
608	>	register_remote_user(struct Client *source_p)
609		{
610		struct Client *target_p = NULL;
611
497	–	assert(source_p != NULL);
498	–	assert(source_p->username != username);
499	–
500	–	strlcpy(source_p->host, host, sizeof(source_p->host));
501	–	strlcpy(source_p->username, username, sizeof(source_p->username));
502	–
503	–	/*
504	–	* coming from another server, take the servers word for it
505	–	*/
506	–	source_p->servptr = hash_find_server(server);
507	–
508	–	/*
509	–	* Super GhostDetect:
510	–	* If we can't find the server the user is supposed to be on,
511	–	* then simply blow the user away.        -Taner
512	–	*/
513	–	if (source_p->servptr == NULL)
514	–	{
515	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516	–	"No server %s for user %s[%s@%s] from %s",
517	–	server, source_p->name, source_p->username,
518	–	source_p->host, source_p->from->name);
519	–	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520	–
521	–	AddFlag(source_p, FLAGS_KILLED);
522	–	exit_client(source_p, &me, "Ghosted Client");
523	–	return;
524	–	}
525	–
612		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
613		{
614		sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
#	Line 530 | Line 616 | register_remote_user(struct Client *sour
616		source_p->from->name, source_p->name, source_p->username,
617		source_p->host, source_p->servptr->name,
618		target_p->name, target_p->from->name);
619	<	kill_client(source_p->from, source_p,
620	<	"%s (NICK from wrong direction (%s != %s))",
621	<	me.name, source_p->servptr->name, target_p->from->name);
619	>	sendto_one(source_p->from,
620	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
621	>	me.id, source_p->id, me.name, source_p->servptr->name,
622	>	target_p->from->name);
623	>
624		AddFlag(source_p, FLAGS_KILLED);
625	<	exit_client(source_p, &me, "USER server wrong direction");
625	>	exit_client(source_p, "USER server wrong direction");
626		return;
627		}
628
#	Line 545 | Line 633 | register_remote_user(struct Client *sour
633		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
634		AddFlag(source_p, FLAGS_SERVICE);
635
548	–	/* Increment our total user count here */
636		if (++Count.total > Count.max_tot)
637		Count.max_tot = Count.total;
638
#	Line 554 | Line 641 | register_remote_user(struct Client *sour
641		add_user_host(source_p->username, source_p->host, 1);
642		SetUserHost(source_p);
643
644	<	introduce_client(source_p);
645	<	}
646	<
647	<	/* introduce_client()
648	<	*
649	<	* inputs       - source_p
563	<	* output       - NONE
564	<	* side effects - This common function introduces a client to the rest
565	<	*                of the net, either from a local client connect or
566	<	*                from a remote connect.
567	<	*/
568	<	static void
569	<	introduce_client(struct Client *source_p)
570	<	{
571	<	dlink_node *server_node = NULL;
572	<	static char ubuf[12];
573	<
574	<	if (MyClient(source_p))
575	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
576	<	else
577	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
578	<
579	<	watch_check_hash(source_p, RPL_LOGON);
580	<
581	<	if (*ubuf == '\0')
582	<	{
583	<	ubuf[0] = '+';
584	<	ubuf[1] = '\0';
585	<	}
586	<
587	<	DLINK_FOREACH(server_node, serv_list.head)
588	<	{
589	<	struct Client *server = server_node->data;
590	<
591	<	if (server == source_p->from)
592	<	continue;
593	<
594	<	if (IsCapable(server, CAP_SVS))
595	<	{
596	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
597	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
598	<	source_p->servptr->id,
599	<	source_p->name, source_p->hopcount+1,
600	<	(unsigned long)source_p->tsinfo,
601	<	ubuf, source_p->username, source_p->host,
602	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
603	<	"0" : source_p->sockhost, source_p->id,
604	<	source_p->svid,
605	<	source_p->info);
606	<	else
607	<	sendto_one(server, "NICK %s %d %lu %s %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->svid,
612	<	source_p->info);
644	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
645	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
646	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
647	>	source_p->servptr->name,
648	>	source_p->name, source_p->username, source_p->host,
649	>	source_p->info, source_p->id);
650
651	<	}
615	<	else
616	<	{
617	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
618	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
619	<	source_p->servptr->id,
620	<	source_p->name, source_p->hopcount+1,
621	<	(unsigned long)source_p->tsinfo,
622	<	ubuf, source_p->username, source_p->host,
623	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
624	<	"0" : source_p->sockhost, source_p->id, source_p->info);
625	<	else
626	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
627	<	source_p->name, source_p->hopcount+1,
628	<	(unsigned long)source_p->tsinfo,
629	<	ubuf, source_p->username, source_p->host,
630	<	source_p->servptr->name, source_p->info);
631	<	}
632	<	}
651	>	introduce_client(source_p);
652		}
653
654		/* valid_hostname()
#	Line 646 | Line 665 | valid_hostname(const char *hostname)
665		{
666		const char *p = hostname;
667
668	<	assert(p != NULL);
668	>	assert(p);
669
670	<	if (*p == '.' || *p == ':')
670	>	if (EmptyString(p) || *p == '.' || *p == ':')
671		return 0;
672
673		for (; *p; ++p)
#	Line 670 | Line 689 | valid_hostname(const char *hostname)
689		* style of username
690		*/
691		int
692	<	valid_username(const char *username)
692	>	valid_username(const char *username, const int local)
693		{
694	<	int dots      = 0;
694	>	unsigned int dots = 0;
695		const char *p = username;
696
697	<	assert(p != NULL);
697	>	assert(p);
698
699		if (*p == '~')
700		++p;
701
702	<	/* reject usernames that don't start with an alphanum
702	>	/*
703	>	* Reject usernames that don't start with an alphanum
704		* i.e. reject jokers who have '-@somehost' or '.@somehost'
705		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
706		*/
707		if (!IsAlNum(*p))
708		return 0;
709
710	<	while (*++p)
710	>	if (local)
711		{
712	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
712	>	while (*++p)
713		{
714	<	if (++dots > ConfigFileEntry.dots_in_ident)
715	<	return 0;
716	<	if (!IsUserChar(*(p + 1)))
714	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
715	>	{
716	>	if (++dots > ConfigFileEntry.dots_in_ident)
717	>	return 0;
718	>	if (!IsUserChar(*(p + 1)))
719	>	return 0;
720	>	}
721	>	else if (!IsUserChar(*p))
722		return 0;
723		}
724	<	else if (!IsUserChar(*p))
725	<	return 0;
724	>	}
725	>	else
726	>	{
727	>	while (*++p)
728	>	if (!IsUserChar(*p))
729	>	return 0;
730		}
731
732	<	return 1;
732	>	return p - username <= USERLEN;
733		}
734
735		/* clean_nick_name()
#	Line 714 | Line 743 | int
743		valid_nickname(const char *nickname, const int local)
744		{
745		const char *p = nickname;
746	+
747		assert(nickname && *nickname);
748
749	<	/* nicks can't start with a digit or - or be 0 length */
750	<	/* This closer duplicates behaviour of hybrid-6 */
749	>	/*
750	>	* Nicks can't start with a digit or - or be 0 length.
751	>	*/
752		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
753		return 0;
754
#	Line 728 | Line 759 | valid_nickname(const char *nickname, con
759		return p - nickname <= NICKLEN;
760		}
761
731	–	/* report_and_set_user_flags()
732	–	*
733	–	* inputs       - pointer to source_p
734	–	*              - pointer to conf for this user
735	–	* output       - NONE
736	–	* side effects - Report to user any special flags
737	–	*                they are getting, and set them.
738	–	*/
739	–	static void
740	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
741	–	{
742	–	/* If this user is being spoofed, tell them so */
743	–	if (IsConfDoSpoofIp(conf))
744	–	{
745	–	sendto_one(source_p,
746	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
747	–	me.name, source_p->name);
748	–	}
749	–
750	–	/* If this user is in the exception class, Set it "E lined" */
751	–	if (IsConfExemptKline(conf))
752	–	{
753	–	SetExemptKline(source_p);
754	–	sendto_one(source_p,
755	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
756	–	me.name, source_p->name);
757	–	}
758	–
759	–	/* The else here is to make sure that G line exempt users
760	–	* do not get noticed twice.
761	–	*/
762	–	else if (IsConfExemptGline(conf))
763	–	{
764	–	SetExemptGline(source_p);
765	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
766	–	me.name, source_p->name);
767	–	}
768	–
769	–	if (IsConfExemptResv(conf))
770	–	{
771	–	SetExemptResv(source_p);
772	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
773	–	me.name, source_p->name);
774	–	}
775	–
776	–	/* If this user is exempt from user limits set it "F lined" */
777	–	if (IsConfExemptLimits(conf))
778	–	{
779	–	SetExemptLimits(source_p);
780	–	sendto_one(source_p,
781	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
782	–	me.name,source_p->name);
783	–	}
784	–
785	–	if (IsConfCanFlood(conf))
786	–	{
787	–	SetCanFlood(source_p);
788	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
789	–	"protection, aren't you fearsome.",
790	–	me.name, source_p->name);
791	–	}
792	–	}
793	–
794	–	/* change_simple_umode()
795	–	*
796	–	* this callback can be hooked to allow special handling of
797	–	* certain usermodes
798	–	*/
799	–	static void *
800	–	change_simple_umode(va_list args)
801	–	{
802	–	struct Client *client_p;
803	–	struct Client *source_p;
804	–	int what;
805	–	unsigned int flag;
806	–
807	–	client_p = va_arg(args, struct Client *);
808	–	source_p = va_arg(args, struct Client *);
809	–	what = va_arg(args, int);
810	–	flag = va_arg(args, unsigned int);
811	–
812	–	if (what == MODE_ADD)
813	–	AddUMode(source_p, flag);
814	–	else
815	–	DelUMode(source_p, flag);
816	–
817	–	return NULL;
818	–	}
819	–
820	–	/* set_user_mode()
821	–	*
822	–	* added 15/10/91 By Darren Reed.
823	–	* parv[0] - sender
824	–	* parv[1] - username to change mode for
825	–	* parv[2] - modes to change
826	–	*/
827	–	void
828	–	set_user_mode(struct Client *client_p, struct Client *source_p,
829	–	const int parc, char *parv[])
830	–	{
831	–	unsigned int flag, setflags;
832	–	char **p, *m, buf[IRCD_BUFSIZE];
833	–	struct Client *target_p;
834	–	int what = MODE_ADD, badflag = 0, i;
835	–
836	–	assert(!(parc < 2));
837	–
838	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
839	–	{
840	–	if (MyConnect(source_p))
841	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
842	–	me.name, source_p->name, parv[1]);
843	–	return;
844	–	}
845	–
846	–	if (source_p != target_p)
847	–	{
848	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
849	–	me.name, source_p->name);
850	–	return;
851	–	}
852	–
853	–	if (parc < 3)
854	–	{
855	–	m = buf;
856	–	*m++ = '+';
857	–
858	–	for (i = 0; i < 128; i++)
859	–	if (HasUMode(source_p, user_modes[i]))
860	–	*m++ = (char)i;
861	–	*m = '\0';
862	–
863	–	sendto_one(source_p, form_str(RPL_UMODEIS),
864	–	me.name, source_p->name, buf);
865	–	return;
866	–	}
867	–
868	–	execute_callback(entering_umode_cb, client_p, source_p);
869	–
870	–	/* find flags already set for user */
871	–	setflags = source_p->umodes;
872	–
873	–	/* parse mode change string(s) */
874	–	for (p = &parv[2]; p && *p; p++)
875	–	{
876	–	for (m = *p; *m; m++)
877	–	{
878	–	switch (*m)
879	–	{
880	–	case '+':
881	–	what = MODE_ADD;
882	–	break;
883	–	case '-':
884	–	what = MODE_DEL;
885	–	break;
886	–	case 'o':
887	–	if (what == MODE_ADD)
888	–	{
889	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
890	–	{
891	–	++Count.oper;
892	–	SetOper(source_p);
893	–	}
894	–	}
895	–	else
896	–	{
897	–	/* Only decrement the oper counts if an oper to begin with
898	–	* found by Pat Szuta, Perly , perly@xnet.com
899	–	*/
900	–	if (!HasUMode(source_p, UMODE_OPER))
901	–	break;
902	–
903	–	ClearOper(source_p);
904	–	Count.oper--;
905	–
906	–	if (MyConnect(source_p))
907	–	{
908	–	dlink_node *dm;
909	–
910	–	detach_conf(source_p, CONF_OPER);
911	–	ClrOFlag(source_p);
912	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
913	–
914	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
915	–	free_dlink_node(dm);
916	–	}
917	–	}
918	–
919	–	break;
920	–
921	–	/* we may not get these,
922	–	* but they shouldnt be in default
923	–	*/
924	–	case 'r':
925	–	case ' ' :
926	–	case '\n':
927	–	case '\r':
928	–	case '\t':
929	–	break;
930	–
931	–	default:
932	–	if ((flag = user_modes[(unsigned char)*m]))
933	–	{
934	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
935	–	(ConfigFileEntry.oper_only_umodes & flag))
936	–	{
937	–	badflag = 1;
938	–	}
939	–	else
940	–	execute_callback(umode_cb, client_p, source_p, what, flag);
941	–	}
942	–	else
943	–	{
944	–	if (MyConnect(source_p))
945	–	badflag = 1;
946	–	}
947	–
948	–	break;
949	–	}
950	–	}
951	–	}
952	–
953	–	if (badflag)
954	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
955	–	me.name, source_p->name);
956	–
957	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
958	–	{
959	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
960	–	me.name, source_p->name);
961	–	DelUMode(source_p, UMODE_NCHANGE);
962	–	}
963	–
964	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
965	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
966	–	{
967	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
968	–	me.name, source_p->name);
969	–	DelUMode(source_p, UMODE_ADMIN);
970	–	}
971	–
972	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
973	–	++Count.invisi;
974	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
975	–	--Count.invisi;
976	–
977	–	/*
978	–	* compare new flags with old flags and send string which
979	–	* will cause servers to update correctly.
980	–	*/
981	–	send_umode_out(client_p, source_p, setflags);
982	–	}
983	–
762		/* send_umode()
763		* send the MODE string for user (user) to connection client_p
764		* -avalon
#	Line 994 | Line 772 | set_user_mode(struct Client *client_p, s
772		*/
773		void
774		send_umode(struct Client *client_p, struct Client *source_p,
775	<	unsigned int old, unsigned int sendmask, char *umode_buf)
775	>	unsigned int old, char *umode_buf)
776		{
777		char *m = umode_buf;
778		int what = 0;
1001	–	unsigned int i;
1002	–	unsigned int flag;
779
780		/*
781	<	* build a string in umode_buf to represent the change in the user's
781	>	* Build a string in umode_buf to represent the change in the user's
782		* mode between the new (source_p->umodes) and 'old'.
783		*/
784	<	for (i = 0; i < 128; i++)
784	>	for (unsigned int i = 0; i < 128; ++i)
785		{
786	<	flag = user_modes[i];
1011	<	if (!flag)
1012	<	continue;
786	>	unsigned int flag = user_modes[i];
787
788	<	if (MyClient(source_p) && !(flag & sendmask))
788	>	if (!flag)
789		continue;
790
791		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1056 | Line 830 | void
830		send_umode_out(struct Client *client_p, struct Client *source_p,
831		unsigned int old)
832		{
833	<	char buf[IRCD_BUFSIZE] = { '\0' };
1060	<	dlink_node *ptr = NULL;
833	>	char buf[IRCD_BUFSIZE] = "";
834
835	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
835	>	send_umode(NULL, source_p, old, buf);
836
837		if (buf[0])
838	<	{
839	<	DLINK_FOREACH(ptr, serv_list.head)
1067	<	{
1068	<	struct Client *target_p = ptr->data;
1069	<
1070	<	if ((target_p != client_p) && (target_p != source_p))
1071	<	sendto_one(target_p, ":%s MODE %s :%s",
1072	<	ID_or_name(source_p, target_p),
1073	<	ID_or_name(source_p, target_p), buf);
1074	<	}
1075	<	}
838	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
839	>	source_p->id, source_p->id, buf);
840
841		if (client_p && MyClient(client_p))
842	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
842	>	send_umode(client_p, source_p, old, buf);
843		}
844
845		void
846	<	user_set_hostmask(struct Client *target_p, const char *hostname)
846	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
847		{
848	<	if (!valid_hostname(hostname))
848	>	dlink_node *ptr = NULL;
849	>
850	>	if (!strcmp(target_p->host, hostname))
851		return;
852
853	+	switch (what)
854	+	{
855	+	case MODE_ADD:
856	+	AddUMode(target_p, UMODE_HIDDENHOST);
857	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
858	+	break;
859	+	case MODE_DEL:
860	+	DelUMode(target_p, UMODE_HIDDENHOST);
861	+
862	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
863	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
864	+	break;
865	+	default: return;
866	+	}
867	+
868	+	if (ConfigFileEntry.cycle_on_host_change)
869	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
870	+	target_p->name, target_p->username, target_p->host);
871	+
872		if (IsUserHostIp(target_p))
873		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
874
875		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091	–	SetIPSpoof(target_p);
876
877		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
878		SetUserHost(target_p);
879
880		if (MyClient(target_p))
881	+	{
882	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
883		clear_ban_cache_client(target_p);
884	<	}
1099	<
1100	<	/* user_welcome()
1101	<	*
1102	<	* inputs       - client pointer to client to welcome
1103	<	* output       - NONE
1104	<	* side effects -
1105	<	*/
1106	<	static void
1107	<	user_welcome(struct Client *source_p)
1108	<	{
1109	<	#if defined(__TIME__) && defined(__DATE__)
1110	<	static const char built_date[] = __DATE__ " at " __TIME__;
1111	<	#else
1112	<	static const char built_date[] = "unknown";
1113	<	#endif
1114	<
1115	<	#ifdef HAVE_LIBCRYPTO
1116	<	if (source_p->localClient->fd.ssl != NULL)
1117	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1118	<	me.name, source_p->name,
1119	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1120	<	#endif
1121	<
1122	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1123	<	ServerInfo.network_name, source_p->name,
1124	<	source_p->username, source_p->host);
1125	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1126	<	get_listener_name(source_p->localClient->listener), ircd_version);
1127	<	sendto_one(source_p, form_str(RPL_CREATED),
1128	<	me.name, source_p->name, built_date);
1129	<	sendto_one(source_p, form_str(RPL_MYINFO),
1130	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131	<	show_isupport(source_p);
1132	<
1133	<	if (source_p->id[0] != '\0')
1134	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1135	<	source_p->name, source_p->id);
884	>	}
885
886	<	show_lusers(source_p);
886	>	if (!ConfigFileEntry.cycle_on_host_change)
887	>	return;
888
889	<	if (ConfigFileEntry.short_motd)
889	>	DLINK_FOREACH(ptr, target_p->channel.head)
890		{
891	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
892	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
893	<	sendto_one(source_p,
894	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1145	<	"read it", me.name, source_p->name);
1146	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1147	<	me.name, source_p->name, me.name);
1148	<	sendto_one(source_p, form_str(RPL_MOTD),
1149	<	me.name, source_p->name,
1150	<	"*** This is the short motd ***");
1151	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1152	<	me.name, source_p->name);
1153	<	}
1154	<	else
1155	<	send_message_file(source_p, &ConfigFileEntry.motd);
1156	<	}
891	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
892	>	char *p = modebuf;
893	>	int len = 0;
894	>	const struct Membership *ms = ptr->data;
895
896	<	/* check_xline()
897	<	*
898	<	* inputs       - pointer to client to test
899	<	* outupt       - 1 if exiting 0 if ok
900	<	* side effects -
1163	<	*/
1164	<	static int
1165	<	check_xline(struct Client *source_p)
1166	<	{
1167	<	struct MaskItem *conf = NULL;
1168	<	const char *reason = NULL;
896	>	if (has_member_flags(ms, CHFL_CHANOP))
897	>	{
898	>	*p++ = 'o';
899	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
900	>	}
901
902	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
903	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
904	<	{
905	<	++conf->count;
902	>	if (has_member_flags(ms, CHFL_HALFOP))
903	>	{
904	>	*p++ = 'h';
905	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
906	>	}
907
908	<	if (conf->reason != NULL)
909	<	reason = conf->reason;
910	<	else
911	<	reason = "No Reason";
908	>	if (has_member_flags(ms, CHFL_VOICE))
909	>	{
910	>	*p++ = 'v';
911	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
912	>	}
913
914	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1181	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1182	<	source_p->info, reason,
1183	<	get_client_name(source_p, HIDE_IP),
1184	<	source_p->sockhost);
914	>	*p = '\0';
915
916	<	++ServerStats.is_ref;
917	<	exit_client(source_p, &me, "Bad user info");
918	<	return 1;
919	<	}
916	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
917	>	target_p->name, target_p->username, target_p->host,
918	>	ms->chptr->chname);
919	>	if (nickbuf[0])
920	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
921	>	target_p->servptr->name, ms->chptr->chname,
922	>	modebuf, nickbuf);
923
924	<	return 0;
1192	<	}
924	>	}
925
926	<	/* oper_up()
927	<	*
928	<	* inputs       - pointer to given client to oper
929	<	* output       - NONE
930	<	* side effects - Blindly opers up given source_p, using conf info
931	<	*                all checks on passwords have already been done.
932	<	*                This could also be used by rsa oper routines.
926	>	if (target_p->away[0])
927	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
928	>	":%s!%s@%s AWAY :%s",
929	>	target_p->name, target_p->username,
930	>	target_p->host, target_p->away);
931	>	}
932	>
933	>	/*! \brief Blindly opers up given source_p, using conf info.
934	>	*         All checks on passwords have already been done.
935	>	* \param source_p Pointer to given client to oper
936		*/
937		void
938		oper_up(struct Client *source_p)
#	Line 1227 | Line 962 | oper_up(struct Client *source_p)
962
963		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
964		AddUMode(source_p, UMODE_ADMIN);
1230	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1231	–	DelUMode(source_p, UMODE_NCHANGE);
965
966		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
967		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);
969	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
970		}
971
972	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
972	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
973
974		int
975		valid_sid(const char *sid)
#	Line 1251 | Line 984 | valid_sid(const char *sid)
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 1261 | Line 994 | valid_sid(const char *sid)
994		void
995		init_uid(void)
996		{
1264	–	unsigned int i;
1265	–
997		memset(new_uid, 0, sizeof(new_uid));
998
999		if (!EmptyString(ServerInfo.sid))
1000		strlcpy(new_uid, ServerInfo.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		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1276	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1277	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1278	–	* -Dianora
1279	–	*/
1007		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1281	–
1282	–	entering_umode_cb = register_callback("entering_umode", NULL);
1283	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1008		}
1009
1010		/*
#	Line 1292 | Line 1016 | init_uid(void)
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
1031		++new_uid[i];
#	Line 1326 | Line 1050 | add_one_to_uid(int i)
1050		static const char *
1051		uid_get(void)
1052		{
1053	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1053	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1054		return new_uid;
1055		}
1056
#	Line 1340 | Line 1064 | uid_get(void)
1064		void
1065		init_isupport(void)
1066		{
1343	–	isupportFile = init_MessageLine();
1344	–
1067		add_isupport("CALLERID", NULL, -1);
1068		add_isupport("CASEMAPPING", CASEMAP, -1);
1069		add_isupport("DEAF", "D", -1);
1070		add_isupport("KICKLEN", NULL, KICKLEN);
1071		add_isupport("MODES", NULL, MAXMODEPARAMS);
1350	–	#ifdef HALFOPS
1072		add_isupport("PREFIX", "(ohv)@%+", -1);
1073		add_isupport("STATUSMSG", "@%+", -1);
1074	<	#else
1075	<	add_isupport("PREFIX", "(ov)@+", -1);
1355	<	add_isupport("STATUSMSG", "@+", -1);
1356	<	#endif
1074	>	add_isupport("EXCEPTS", "e", -1);
1075	>	add_isupport("INVEX", "I", -1);
1076		}
1077
1078		/*
#	Line 1369 | 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 1384 | 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		support->name = xstrdup(name);
1111	<	if (options != NULL)
1111	>	if (options)
1112		support->options = xstrdup(options);
1113		support->number = n;
1114
#	Line 1437 | 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		{
#	Line 1452 | Line 1176 | rebuild_isupport_message_line(void)
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 = sprintf(p, "=%s", support->options));
1182		len += n;
#	Line 1473 | 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)