ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3135 by michael, Mon Mar 10 21:11:25 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4020 by michael, Fri Jun 20 16:17:27 2014 UTC

#	Line 26 | Line 26
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
30	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
#	Line 39 | Line 38
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"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51
52		static char umode_buffer[IRCD_BUFSIZE];
54	–
55	–	static void user_welcome(struct Client *);
56	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
57	–	static int check_xline(struct Client *);
58	–	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		*/
64	–
58		struct Isupport
59		{
60		dlink_node node;
#	Line 124 | Line 117 | const 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 */
#	Line 134 | Line 127 | const unsigned int user_modes[256] =
127		UMODE_WALLOP,       /* w */
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 174 | Line 167 | show_lusers(struct Client *source_p)
167		Count.invisi, dlink_list_length(&global_serv_list));
168		else
169		sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
170	<	(Count.total-Count.invisi), Count.invisi, 1);
170	>	(Count.total - Count.invisi), Count.invisi, 1);
171
172	<	if (Count.oper > 0)
172	>	if (Count.oper)
173		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
174
175	<	if (dlink_list_length(&unknown_list) > 0)
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(&global_channel_list) > 0)
179	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
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		{
#	Line 224 | Line 217 | show_isupport(struct Client *source_p)
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
256	–	assert(source_p != NULL);
417		assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
419		assert(!source_p->localClient->registration);
#	Line 297 | 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
#	Line 306 | Line 466 | register_local_user(struct Client *sourc
466		++ServerStats.is_ref;
467		sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
468		"identd to use this server");
469	<	exit_client(source_p, &me, "Install identd");
469	>	exit_client(source_p, "Install identd");
470		return;
471		}
472
#	Line 322 | 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;
329	<
330	<	if (!match_conf_password(pass, conf))
488	>	if (!match_conf_password(source_p->localClient->passwd, conf))
489		{
490		++ServerStats.is_ref;
491
492		sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
493	<	exit_client(source_p, &me, "Bad Password");
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		*/
358	–	/* Except "F:" clients */
520		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
521		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
522		{
#	Line 363 | 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
370	–	/* valid user name check */
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);
381	<	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 415 | Line 574 | register_local_user(struct Client *sourc
574		Count.max_loc);
575		}
576
418	–	/* Increment our total user count here */
577		if (++Count.total > Count.max_tot)
578		Count.max_tot = Count.total;
579		++Count.totalrestartcount;
#	Line 424 | 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
427	–	source_p->localClient->allow_read = MAX_FLOOD_BURST;
428	–
585		assert(dlinkFind(&unknown_list, source_p));
586
587		dlink_move_node(&source_p->localClient->lclient_node,
#	Line 454 | Line 610 | register_remote_user(struct Client *sour
610		{
611		struct Client *target_p = NULL;
612
457	–	assert(source_p != NULL);
613		assert(source_p->username != username);
614
615		strlcpy(source_p->host, host, sizeof(source_p->host));
616		strlcpy(source_p->username, username, sizeof(source_p->username));
617
618		/*
619	<	* coming from another server, take the servers word for it
619	>	* Coming from another server, take the servers word for it
620		*/
621		source_p->servptr = hash_find_server(server);
622
#	Line 476 | Line 631 | register_remote_user(struct Client *sour
631		"No server %s for user %s[%s@%s] from %s",
632		server, source_p->name, source_p->username,
633		source_p->host, source_p->from->name);
634	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
634	>	sendto_one(source_p->from,
635	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636	>	me.id, source_p->id, me.name, server);
637
638		AddFlag(source_p, FLAGS_KILLED);
639	<	exit_client(source_p, &me, "Ghosted Client");
639	>	exit_client(source_p, "Ghosted Client");
640		return;
641		}
642
#	Line 490 | Line 647 | register_remote_user(struct Client *sour
647		source_p->from->name, source_p->name, source_p->username,
648		source_p->host, source_p->servptr->name,
649		target_p->name, target_p->from->name);
650	<	kill_client(source_p->from, source_p,
651	<	"%s (NICK from wrong direction (%s != %s))",
652	<	me.name, source_p->servptr->name, target_p->from->name);
650	>	sendto_one(source_p->from,
651	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
652	>	me.id, source_p->id, me.name, source_p->servptr->name,
653	>	target_p->from->name);
654	>
655		AddFlag(source_p, FLAGS_KILLED);
656	<	exit_client(source_p, &me, "USER server wrong direction");
656	>	exit_client(source_p, "USER server wrong direction");
657		return;
658		}
659
#	Line 505 | Line 664 | register_remote_user(struct Client *sour
664		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
665		AddFlag(source_p, FLAGS_SERVICE);
666
508	–	/* Increment our total user count here */
667		if (++Count.total > Count.max_tot)
668		Count.max_tot = Count.total;
669
#	Line 524 | Line 682 | register_remote_user(struct Client *sour
682		introduce_client(source_p);
683		}
684
527	–	/* introduce_client()
528	–	*
529	–	* inputs       - source_p
530	–	* output       - NONE
531	–	* side effects - This common function introduces a client to the rest
532	–	*                of the net, either from a local client connect or
533	–	*                from a remote connect.
534	–	*/
535	–	static void
536	–	introduce_client(struct Client *source_p)
537	–	{
538	–	dlink_node *server_node = NULL;
539	–	char ubuf[IRCD_BUFSIZE];
540	–
541	–	if (MyClient(source_p))
542	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
543	–	else
544	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
545	–
546	–	watch_check_hash(source_p, RPL_LOGON);
547	–
548	–	if (ubuf[0] == '\0')
549	–	{
550	–	ubuf[0] = '+';
551	–	ubuf[1] = '\0';
552	–	}
553	–
554	–	DLINK_FOREACH(server_node, serv_list.head)
555	–	{
556	–	struct Client *server = server_node->data;
557	–
558	–	if (server == source_p->from)
559	–	continue;
560	–
561	–	if (IsCapable(server, CAP_SVS))
562	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
563	–	source_p->servptr->id,
564	–	source_p->name, source_p->hopcount+1,
565	–	(unsigned long)source_p->tsinfo,
566	–	ubuf, source_p->username, source_p->host,
567	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	–	"0" : source_p->sockhost, source_p->id,
569	–	source_p->svid,
570	–	source_p->info);
571	–	else
572	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	–	source_p->servptr->id,
574	–	source_p->name, source_p->hopcount+1,
575	–	(unsigned long)source_p->tsinfo,
576	–	ubuf, source_p->username, source_p->host,
577	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	–	"0" : source_p->sockhost, source_p->id, source_p->info);
579	–
580	–	if (!EmptyString(source_p->certfp))
581	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582	–	}
583	–	}
584	–
685		/* valid_hostname()
686		*
687		* Inputs       - pointer to hostname
#	Line 596 | Line 696 | valid_hostname(const char *hostname)
696		{
697		const char *p = hostname;
698
699	<	assert(p != NULL);
699	>	assert(p);
700
701		if (EmptyString(p) || *p == '.' || *p == ':')
702		return 0;
#	Line 622 | Line 722 | valid_hostname(const char *hostname)
722		int
723		valid_username(const char *username, const int local)
724		{
725	<	int dots      = 0;
725	>	unsigned int dots = 0;
726		const char *p = username;
727
728	<	assert(p != NULL);
728	>	assert(p);
729
730		if (*p == '~')
731		++p;
#	Line 642 | Line 742 | valid_username(const char *username, con
742		{
743		while (*++p)
744		{
745	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
745	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
746		{
747		if (++dots > ConfigFileEntry.dots_in_ident)
748		return 0;
#	Line 660 | Line 760 | valid_username(const char *username, con
760		return 0;
761		}
762
763	<	return  p - username <= USERLEN;;
763	>	return p - username <= USERLEN;
764		}
765
766		/* clean_nick_name()
#	Line 674 | Line 774 | int
774		valid_nickname(const char *nickname, const int local)
775		{
776		const char *p = nickname;
777	+
778		assert(nickname && *nickname);
779
780	<	/* nicks can't start with a digit or - or be 0 length */
781	<	/* This closer duplicates behaviour of hybrid-6 */
780	>	/*
781	>	* Nicks can't start with a digit or - or be 0 length.
782	>	*/
783		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
784		return 0;
785
#	Line 688 | Line 790 | valid_nickname(const char *nickname, con
790		return p - nickname <= NICKLEN;
791		}
792
691	–	/* report_and_set_user_flags()
692	–	*
693	–	* inputs       - pointer to source_p
694	–	*              - pointer to conf for this user
695	–	* output       - NONE
696	–	* side effects - Report to user any special flags
697	–	*                they are getting, and set them.
698	–	*/
699	–	static void
700	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
701	–	{
702	–	/* If this user is being spoofed, tell them so */
703	–	if (IsConfDoSpoofIp(conf))
704	–	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705	–
706	–	/* If this user is in the exception class, Set it "E lined" */
707	–	if (IsConfExemptKline(conf))
708	–	{
709	–	SetExemptKline(source_p);
710	–	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711	–	}
712	–
713	–	/*
714	–	* The else here is to make sure that G line exempt users
715	–	* do not get noticed twice.
716	–	*/
717	–	else if (IsConfExemptGline(conf))
718	–	{
719	–	SetExemptGline(source_p);
720	–	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721	–	}
722	–
723	–	if (IsConfExemptResv(conf))
724	–	{
725	–	SetExemptResv(source_p);
726	–	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727	–	}
728	–
729	–	/* If this user is exempt from user limits set it "F lined" */
730	–	if (IsConfExemptLimits(conf))
731	–	{
732	–	SetExemptLimits(source_p);
733	–	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734	–	}
735	–
736	–	if (IsConfCanFlood(conf))
737	–	{
738	–	SetCanFlood(source_p);
739	–	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	–	"protection, aren't you fearsome.");
741	–	}
742	–	}
743	–
744	–	/* set_user_mode()
745	–	*
746	–	* added 15/10/91 By Darren Reed.
747	–	* parv[0] - sender
748	–	* parv[1] - username to change mode for
749	–	* parv[2] - modes to change
750	–	*/
751	–	void
752	–	set_user_mode(struct Client *client_p, struct Client *source_p,
753	–	const int parc, char *parv[])
754	–	{
755	–	unsigned int flag, setflags;
756	–	char **p, *m, buf[IRCD_BUFSIZE];
757	–	struct Client *target_p;
758	–	int what = MODE_ADD, badflag = 0, i;
759	–
760	–	assert(!(parc < 2));
761	–
762	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
763	–	{
764	–	if (MyConnect(source_p))
765	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
766	–	return;
767	–	}
768	–
769	–	if (source_p != target_p)
770	–	{
771	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
772	–	return;
773	–	}
774	–
775	–	if (parc < 3)
776	–	{
777	–	m = buf;
778	–	*m++ = '+';
779	–
780	–	for (i = 0; i < 128; ++i)
781	–	if (HasUMode(source_p, user_modes[i]))
782	–	*m++ = (char)i;
783	–	*m = '\0';
784	–
785	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
786	–	return;
787	–	}
788	–
789	–	/* find flags already set for user */
790	–	setflags = source_p->umodes;
791	–
792	–	/* parse mode change string(s) */
793	–	for (p = &parv[2]; p && *p; ++p)
794	–	{
795	–	for (m = *p; *m; ++m)
796	–	{
797	–	switch (*m)
798	–	{
799	–	case '+':
800	–	what = MODE_ADD;
801	–	break;
802	–	case '-':
803	–	what = MODE_DEL;
804	–	break;
805	–	case 'o':
806	–	if (what == MODE_ADD)
807	–	{
808	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
809	–	{
810	–	++Count.oper;
811	–	SetOper(source_p);
812	–	}
813	–	}
814	–	else
815	–	{
816	–	if (!HasUMode(source_p, UMODE_OPER))
817	–	break;
818	–
819	–	ClearOper(source_p);
820	–	Count.oper--;
821	–
822	–	if (MyConnect(source_p))
823	–	{
824	–	dlink_node *dm = NULL;
825	–
826	–	detach_conf(source_p, CONF_OPER);
827	–	ClrOFlag(source_p);
828	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
829	–
830	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
831	–	free_dlink_node(dm);
832	–	}
833	–	}
834	–
835	–	break;
836	–
837	–	case 'S':  /* Only servers may set +S in a burst */
838	–	case 'W':  /* Only servers may set +W in a burst */
839	–	case 'r':  /* Only services may set +r */
840	–	case 'x':  /* Only services may set +x */
841	–	break;
842	–
843	–	default:
844	–	if ((flag = user_modes[(unsigned char)*m]))
845	–	{
846	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
847	–	(ConfigFileEntry.oper_only_umodes & flag))
848	–	badflag = 1;
849	–	else
850	–	{
851	–	if (what == MODE_ADD)
852	–	AddUMode(source_p, flag);
853	–	else
854	–	DelUMode(source_p, flag);
855	–	}
856	–	}
857	–	else if (MyConnect(source_p))
858	–	badflag = 1;
859	–
860	–	break;
861	–	}
862	–	}
863	–	}
864	–
865	–	if (badflag)
866	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
867	–
868	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
869	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
870	–	{
871	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
872	–	DelUMode(source_p, UMODE_ADMIN);
873	–	}
874	–
875	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
876	–	++Count.invisi;
877	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
878	–	--Count.invisi;
879	–
880	–	/*
881	–	* compare new flags with old flags and send string which
882	–	* will cause servers to update correctly.
883	–	*/
884	–	send_umode_out(client_p, source_p, setflags);
885	–	}
886	–
793		/* send_umode()
794		* send the MODE string for user (user) to connection client_p
795		* -avalon
#	Line 897 | Line 803 | set_user_mode(struct Client *client_p, s
803		*/
804		void
805		send_umode(struct Client *client_p, struct Client *source_p,
806	<	unsigned int old, unsigned int sendmask, char *umode_buf)
806	>	unsigned int old, char *umode_buf)
807		{
808		char *m = umode_buf;
809		int what = 0;
904	–	unsigned int i;
905	–	unsigned int flag;
810
811		/*
812	<	* build a string in umode_buf to represent the change in the user's
812	>	* Build a string in umode_buf to represent the change in the user's
813		* mode between the new (source_p->umodes) and 'old'.
814		*/
815	<	for (i = 0; i < 128; ++i)
815	>	for (unsigned int i = 0; i < 128; ++i)
816		{
817	<	flag = user_modes[i];
914	<	if (!flag)
915	<	continue;
817	>	unsigned int flag = user_modes[i];
818
819	<	if (MyClient(source_p) && !(flag & sendmask))
819	>	if (!flag)
820		continue;
821
822		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 959 | Line 861 | void
861		send_umode_out(struct Client *client_p, struct Client *source_p,
862		unsigned int old)
863		{
864	<	char buf[IRCD_BUFSIZE] = { '\0' };
963	<	dlink_node *ptr = NULL;
864	>	char buf[IRCD_BUFSIZE] = "";
865
866	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
866	>	send_umode(NULL, source_p, old, buf);
867
868		if (buf[0])
869	<	{
870	<	DLINK_FOREACH(ptr, serv_list.head)
970	<	{
971	<	struct Client *target_p = ptr->data;
972	<
973	<	if ((target_p != client_p) && (target_p != source_p))
974	<	sendto_one(target_p, ":%s MODE %s :%s",
975	<	ID_or_name(source_p, target_p),
976	<	ID_or_name(source_p, target_p), buf);
977	<	}
978	<	}
869	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
870	>	source_p->id, source_p->id, buf);
871
872		if (client_p && MyClient(client_p))
873	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
873	>	send_umode(client_p, source_p, old, buf);
874		}
875
876		void
#	Line 1027 | Line 919 | user_set_hostmask(struct Client *target_
919
920		DLINK_FOREACH(ptr, target_p->channel.head)
921		{
922	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
922	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
923		char *p = modebuf;
924		int len = 0;
925		const struct Membership *ms = ptr->data;
#	Line 1069 | Line 961 | user_set_hostmask(struct Client *target_
961		target_p->host, target_p->away);
962		}
963
964	<	/* user_welcome()
965	<	*
966	<	* inputs       - client pointer to client to welcome
1075	<	* output       - NONE
1076	<	* side effects -
1077	<	*/
1078	<	static void
1079	<	user_welcome(struct Client *source_p)
1080	<	{
1081	<	#if defined(__TIME__) && defined(__DATE__)
1082	<	static const char built_date[] = __DATE__ " at " __TIME__;
1083	<	#else
1084	<	static const char built_date[] = "unknown";
1085	<	#endif
1086	<
1087	<	#ifdef HAVE_LIBCRYPTO
1088	<	if (HasFlag(source_p, FLAGS_SSL))
1089	<	{
1090	<	AddUMode(source_p, UMODE_SSL);
1091	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1092	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	<	}
1094	<	#endif
1095	<
1096	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1097	<	source_p->name);
1098	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1099	<	get_listener_name(source_p->localClient->listener), ircd_version);
1100	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1101	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1102	<	show_isupport(source_p);
1103	<
1104	<	if (source_p->id[0] != '\0')
1105	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1106	<
1107	<	show_lusers(source_p);
1108	<	motd_signon(source_p);
1109	<	}
1110	<
1111	<	/* check_xline()
1112	<	*
1113	<	* inputs       - pointer to client to test
1114	<	* outupt       - 1 if exiting 0 if ok
1115	<	* side effects -
1116	<	*/
1117	<	static int
1118	<	check_xline(struct Client *source_p)
1119	<	{
1120	<	struct MaskItem *conf = NULL;
1121	<	const char *reason = NULL;
1122	<
1123	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1124	<	{
1125	<	++conf->count;
1126	<
1127	<	if (conf->reason != NULL)
1128	<	reason = conf->reason;
1129	<	else
1130	<	reason = "No Reason";
1131	<
1132	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1133	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1134	<	source_p->info, reason,
1135	<	get_client_name(source_p, HIDE_IP),
1136	<	source_p->sockhost);
1137	<
1138	<	++ServerStats.is_ref;
1139	<	exit_client(source_p, &me, "Bad user info");
1140	<	return 1;
1141	<	}
1142	<
1143	<	return 0;
1144	<	}
1145	<
1146	<	/* oper_up()
1147	<	*
1148	<	* inputs       - pointer to given client to oper
1149	<	* output       - NONE
1150	<	* side effects - Blindly opers up given source_p, using conf info
1151	<	*                all checks on passwords have already been done.
1152	<	*                This could also be used by rsa oper routines.
964	>	/*! \brief Blindly opers up given source_p, using conf info.
965	>	*         All checks on passwords have already been done.
966	>	* \param source_p Pointer to given client to oper
967		*/
968		void
969		oper_up(struct Client *source_p)
#	Line 1186 | Line 1000 | oper_up(struct Client *source_p)
1000		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1001		}
1002
1003	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1003	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1004
1005		int
1006		valid_sid(const char *sid)
#	Line 1211 | Line 1025 | valid_sid(const char *sid)
1025		void
1026		init_uid(void)
1027		{
1214	–	unsigned int i;
1215	–
1028		memset(new_uid, 0, sizeof(new_uid));
1029
1030		if (!EmptyString(ServerInfo.sid))
1031		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1032
1033	<	for (i = 0; i < IRC_MAXSID; ++i)
1033	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1034		if (new_uid[i] == '\0')
1035		new_uid[i] = 'A';
1036
#	Line 1235 | Line 1047 | init_uid(void)
1047		*                note this is a recursive function
1048		*/
1049		static void
1050	<	add_one_to_uid(int i)
1050	>	add_one_to_uid(unsigned int i)
1051		{
1052	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1052	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1053		{
1054		if (new_uid[i] == 'Z')
1055		new_uid[i] = '0';
1056		else if (new_uid[i] == '9')
1057		{
1058		new_uid[i] = 'A';
1059	<	add_one_to_uid(i-1);
1059	>	add_one_to_uid(i - 1);
1060		}
1061		else
1062		++new_uid[i];
#	Line 1269 | Line 1081 | add_one_to_uid(int i)
1081		static const char *
1082		uid_get(void)
1083		{
1084	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1084	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1085		return new_uid;
1086		}
1087
#	Line 1288 | Line 1100 | init_isupport(void)
1100		add_isupport("DEAF", "D", -1);
1101		add_isupport("KICKLEN", NULL, KICKLEN);
1102		add_isupport("MODES", NULL, MAXMODEPARAMS);
1291	–	#ifdef HALFOPS
1103		add_isupport("PREFIX", "(ohv)@%+", -1);
1104		add_isupport("STATUSMSG", "@%+", -1);
1294	–	#else
1295	–	add_isupport("PREFIX", "(ov)@+", -1);
1296	–	add_isupport("STATUSMSG", "@+", -1);
1297	–	#endif
1105		add_isupport("EXCEPTS", "e", -1);
1106		add_isupport("INVEX", "I", -1);
1107		}
#	Line 1312 | Line 1119 | void
1119		add_isupport(const char *name, const char *options, int n)
1120		{
1121		dlink_node *ptr;
1122	<	struct Isupport *support;
1122	>	struct Isupport *support = NULL;
1123
1124		DLINK_FOREACH(ptr, support_list.head)
1125		{
#	Line 1327 | Line 1134 | add_isupport(const char *name, const cha
1134
1135		if (ptr == NULL)
1136		{
1137	<	support = MyMalloc(sizeof(*support));
1137	>	support = MyCalloc(sizeof(*support));
1138		dlinkAddTail(support, &support->node, &support_list);
1139		}
1140
1141		support->name = xstrdup(name);
1142	<	if (options != NULL)
1142	>	if (options)
1143		support->options = xstrdup(options);
1144		support->number = n;
1145
#	Line 1400 | Line 1207 | rebuild_isupport_message_line(void)
1207		p += (n = sprintf(p, "%s", support->name));
1208		len += n;
1209
1210	<	if (support->options != NULL)
1210	>	if (support->options)
1211		{
1212		p += (n = sprintf(p, "=%s", support->options));
1213		len += n;
#	Line 1428 | Line 1235 | rebuild_isupport_message_line(void)
1235		}
1236		}
1237
1238	<	if (len != 0)
1238	>	if (len)
1239		{
1240		if (*--p == ' ')
1241		*p = '\0';

Diff Legend

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