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 3176 by michael, Tue Mar 18 20:00:16 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4223 by michael, Mon Jul 14 19:08:48 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"
44	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		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 *);
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		*/
64	–
57		struct Isupport
58		{
59		dlink_node node;
#	Line 124 | Line 116 | const 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 */
#	Line 134 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
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 171 | Line 163 | show_lusers(struct Client *source_p)
163		{
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_serv_list));
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168		sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	<	(Count.total-Count.invisi), Count.invisi, 1);
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170
171	<	if (Count.oper > 0)
171	>	if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173
174	<	if (dlink_list_length(&unknown_list) > 0)
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(&global_channel_list) > 0)
178	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
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		{
#	Line 224 | Line 216 | show_isupport(struct Client *source_p)
216		sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
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 *ptr = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(ptr, local_server_list.head)
301	>	{
302	>	struct Client *server = ptr->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	>	"0" : source_p->sockhost, source_p->id,
315	>	source_p->svid,
316	>	source_p->info);
317	>	else
318	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
319	>	source_p->servptr->id,
320	>	source_p->name, source_p->hopcount+1,
321	>	(unsigned long)source_p->tsinfo,
322	>	ubuf, source_p->username, source_p->host,
323	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	>	"0" : source_p->sockhost, source_p->id, source_p->info);
325	>
326	>	if (!EmptyString(source_p->certfp))
327	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
328	>	}
329	>	}
330	>
331	>	/* user_welcome()
332	>	*
333	>	* inputs       - client pointer to client to welcome
334	>	* output       - NONE
335	>	* side effects -
336	>	*/
337	>	static void
338	>	user_welcome(struct Client *source_p)
339	>	{
340	>	#if defined(__TIME__) && defined(__DATE__)
341	>	static const char built_date[] = __DATE__ " at " __TIME__;
342	>	#else
343	>	static const char built_date[] = "unknown";
344	>	#endif
345	>
346	>	#ifdef HAVE_LIBCRYPTO
347	>	if (HasFlag(source_p, FLAGS_SSL))
348	>	{
349	>	AddUMode(source_p, UMODE_SSL);
350	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351	>	ssl_get_cipher(source_p->localClient->fd.ssl));
352	>	}
353	>	#endif
354	>
355	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
356	>	source_p->name);
357	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358	>	get_listener_name(source_p->localClient->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 MaskItem *conf = NULL;
413
256	–	assert(source_p != NULL);
414		assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416		assert(!source_p->localClient->registration);
#	Line 297 | Line 454 | register_local_user(struct Client *sourc
454
455		if (!IsGotId(source_p))
456		{
457	<	char username[USERLEN + 1];
457	>	char username[USERLEN + 1] = "";
458		const char *p = username;
459		unsigned int i = 0;
460
#	Line 316 | Line 473 | register_local_user(struct Client *sourc
473		source_p->username[i++] = '~';
474
475		for (; *p && i < USERLEN; ++p)
476	<	if (*p != '[')
320	<	source_p->username[i++] = *p;
476	>	source_p->username[i++] = *p;
477
478		source_p->username[i] = '\0';
479		}
480
481	<	/* password check */
481	>	/* Password check */
482		if (!EmptyString(conf->passwd))
483		{
484	<	const char *pass = source_p->localClient->passwd;
329	<
330	<	if (!match_conf_password(pass, conf))
484	>	if (!match_conf_password(source_p->localClient->passwd, conf))
485		{
486		++ServerStats.is_ref;
487
#	Line 337 | Line 491 | register_local_user(struct Client *sourc
491		}
492		}
493
494	<	/* don't free source_p->localClient->passwd here - it can be required
494	>	/*
495	>	* Don't free source_p->localClient->passwd here - it can be required
496		* by masked /stats I if there are auth{} blocks with need_password = no;
497		* --adx
498		*/
499
500	<	/* report if user has &^>= etc. and set flags as needed in source_p */
500	>	/*
501	>	* Report if user has &^>= etc. and set flags as needed in source_p
502	>	*/
503		report_and_set_user_flags(source_p, conf);
504
505		if (IsDead(source_p))
506		return;
507
508	<	/* Limit clients -
508	>	/*
509	>	* Limit clients -
510		* We want to be able to have servers and F-line clients
511		* connect, so save room for "buffer" connections.
512		* Smaller servers may want to decrease this, and it should
513		* probably be just a percentage of the MAXCLIENTS...
514		*   -Taner
515		*/
358	–	/* Except "F:" clients */
516		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
517		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
518		{
#	Line 367 | Line 524 | register_local_user(struct Client *sourc
524		return;
525		}
526
370	–	/* valid user name check */
527		if (!valid_username(source_p->username, 1))
528		{
529	<	char tmpstr2[IRCD_BUFSIZE];
529	>	char buf[IRCD_BUFSIZE] = "";
530
531		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
532		"Invalid username: %s (%s@%s)",
533		source_p->name, source_p->username, source_p->host);
534		++ServerStats.is_ref;
535	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
536	<	source_p->username);
381	<	exit_client(source_p, tmpstr2);
535	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
536	>	exit_client(source_p, buf);
537		return;
538		}
539
540		if (check_xline(source_p))
541		return;
542
543	<	while (hash_find_id((id = uid_get())) != NULL)
543	>	while (hash_find_id((id = uid_get())))
544		;
545
546		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 415 | Line 570 | register_local_user(struct Client *sourc
570		Count.max_loc);
571		}
572
418	–	/* Increment our total user count here */
573		if (++Count.total > Count.max_tot)
574		Count.max_tot = Count.total;
575		++Count.totalrestartcount;
#	Line 423 | Line 577 | register_local_user(struct Client *sourc
577		assert(source_p->servptr == &me);
578		SetClient(source_p);
579		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
580	<
427	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
580	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
581
582		assert(dlinkFind(&unknown_list, source_p));
583
#	Line 449 | Line 602 | register_local_user(struct Client *sourc
602		*                is introduced by a server.
603		*/
604		void
605	<	register_remote_user(struct Client *source_p, const char *username,
453	<	const char *host, const char *server)
605	>	register_remote_user(struct Client *source_p)
606		{
607	<	struct Client *target_p = NULL;
456	<
457	<	assert(source_p != NULL);
458	<	assert(source_p->username != username);
459	<
460	<	strlcpy(source_p->host, host, sizeof(source_p->host));
461	<	strlcpy(source_p->username, username, sizeof(source_p->username));
462	<
463	<	/*
464	<	* coming from another server, take the servers word for it
465	<	*/
466	<	source_p->servptr = hash_find_server(server);
467	<
468	<	/*
469	<	* Super GhostDetect:
470	<	* If we can't find the server the user is supposed to be on,
471	<	* then simply blow the user away.        -Taner
472	<	*/
473	<	if (source_p->servptr == NULL)
474	<	{
475	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
476	<	"No server %s for user %s[%s@%s] from %s",
477	<	server, source_p->name, source_p->username,
478	<	source_p->host, source_p->from->name);
479	<	sendto_one(source_p->from,
480	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
481	<	ID(&me), ID(source_p), me.name, server);
482	<
483	<	AddFlag(source_p, FLAGS_KILLED);
484	<	exit_client(source_p, "Ghosted Client");
485	<	return;
486	<	}
607	>	const struct Client *target_p = NULL;
608
609		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
610		{
#	Line 494 | Line 615 | register_remote_user(struct Client *sour
615		target_p->name, target_p->from->name);
616		sendto_one(source_p->from,
617		":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
618	<	ID(&me), ID(source_p), me.name, source_p->servptr->name,
618	>	me.id, source_p->id, me.name, source_p->servptr->name,
619		target_p->from->name);
620
621		AddFlag(source_p, FLAGS_KILLED);
#	Line 509 | Line 630 | register_remote_user(struct Client *sour
630		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
631		AddFlag(source_p, FLAGS_SERVICE);
632
512	–	/* Increment our total user count here */
633		if (++Count.total > Count.max_tot)
634		Count.max_tot = Count.total;
635
636		SetClient(source_p);
637		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
638	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
639		add_user_host(source_p->username, source_p->host, 1);
640		SetUserHost(source_p);
641
#	Line 528 | Line 649 | register_remote_user(struct Client *sour
649		introduce_client(source_p);
650		}
651
531	–	/* introduce_client()
532	–	*
533	–	* inputs       - source_p
534	–	* output       - NONE
535	–	* side effects - This common function introduces a client to the rest
536	–	*                of the net, either from a local client connect or
537	–	*                from a remote connect.
538	–	*/
539	–	static void
540	–	introduce_client(struct Client *source_p)
541	–	{
542	–	dlink_node *server_node = NULL;
543	–	char ubuf[IRCD_BUFSIZE];
544	–
545	–	if (MyClient(source_p))
546	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
547	–	else
548	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
549	–
550	–	watch_check_hash(source_p, RPL_LOGON);
551	–
552	–	if (ubuf[0] == '\0')
553	–	{
554	–	ubuf[0] = '+';
555	–	ubuf[1] = '\0';
556	–	}
557	–
558	–	DLINK_FOREACH(server_node, serv_list.head)
559	–	{
560	–	struct Client *server = server_node->data;
561	–
562	–	if (server == source_p->from)
563	–	continue;
564	–
565	–	if (IsCapable(server, CAP_SVS))
566	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
567	–	source_p->servptr->id,
568	–	source_p->name, source_p->hopcount+1,
569	–	(unsigned long)source_p->tsinfo,
570	–	ubuf, source_p->username, source_p->host,
571	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
572	–	"0" : source_p->sockhost, source_p->id,
573	–	source_p->svid,
574	–	source_p->info);
575	–	else
576	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
577	–	source_p->servptr->id,
578	–	source_p->name, source_p->hopcount+1,
579	–	(unsigned long)source_p->tsinfo,
580	–	ubuf, source_p->username, source_p->host,
581	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
582	–	"0" : source_p->sockhost, source_p->id, source_p->info);
583	–
584	–	if (!EmptyString(source_p->certfp))
585	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
586	–	}
587	–	}
588	–
652		/* valid_hostname()
653		*
654		* Inputs       - pointer to hostname
#	Line 600 | Line 663 | valid_hostname(const char *hostname)
663		{
664		const char *p = hostname;
665
666	<	assert(p != NULL);
666	>	assert(p);
667
668		if (EmptyString(p) || *p == '.' || *p == ':')
669		return 0;
#	Line 626 | Line 689 | valid_hostname(const char *hostname)
689		int
690		valid_username(const char *username, const int local)
691		{
692	<	int dots      = 0;
692	>	unsigned int dots = 0;
693		const char *p = username;
694
695	<	assert(p != NULL);
695	>	assert(p);
696
697		if (*p == '~')
698		++p;
#	Line 646 | Line 709 | valid_username(const char *username, con
709		{
710		while (*++p)
711		{
712	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
712	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
713		{
714		if (++dots > ConfigFileEntry.dots_in_ident)
715		return 0;
#	Line 664 | Line 727 | valid_username(const char *username, con
727		return 0;
728		}
729
730	<	return  p - username <= USERLEN;;
730	>	return p - username <= USERLEN;
731		}
732
733		/* clean_nick_name()
#	Line 678 | Line 741 | int
741		valid_nickname(const char *nickname, const int local)
742		{
743		const char *p = nickname;
744	+
745		assert(nickname && *nickname);
746
747	<	/* nicks can't start with a digit or - or be 0 length */
748	<	/* This closer duplicates behaviour of hybrid-6 */
747	>	/*
748	>	* Nicks can't start with a digit or - or be 0 length.
749	>	*/
750		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
751		return 0;
752
#	Line 692 | Line 757 | valid_nickname(const char *nickname, con
757		return p - nickname <= NICKLEN;
758		}
759
695	–	/* report_and_set_user_flags()
696	–	*
697	–	* inputs       - pointer to source_p
698	–	*              - pointer to conf for this user
699	–	* output       - NONE
700	–	* side effects - Report to user any special flags
701	–	*                they are getting, and set them.
702	–	*/
703	–	static void
704	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
705	–	{
706	–	/* If this user is being spoofed, tell them so */
707	–	if (IsConfDoSpoofIp(conf))
708	–	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
709	–
710	–	/* If this user is in the exception class, Set it "E lined" */
711	–	if (IsConfExemptKline(conf))
712	–	{
713	–	SetExemptKline(source_p);
714	–	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
715	–	}
716	–
717	–	/*
718	–	* The else here is to make sure that G line exempt users
719	–	* do not get noticed twice.
720	–	*/
721	–	else if (IsConfExemptGline(conf))
722	–	{
723	–	SetExemptGline(source_p);
724	–	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
725	–	}
726	–
727	–	if (IsConfExemptResv(conf))
728	–	{
729	–	SetExemptResv(source_p);
730	–	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
731	–	}
732	–
733	–	/* If this user is exempt from user limits set it "F lined" */
734	–	if (IsConfExemptLimits(conf))
735	–	{
736	–	SetExemptLimits(source_p);
737	–	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
738	–	}
739	–
740	–	if (IsConfCanFlood(conf))
741	–	{
742	–	SetCanFlood(source_p);
743	–	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
744	–	"protection, aren't you fearsome.");
745	–	}
746	–	}
747	–
748	–	/* set_user_mode()
749	–	*
750	–	* added 15/10/91 By Darren Reed.
751	–	* parv[0] - command
752	–	* parv[1] - username to change mode for
753	–	* parv[2] - modes to change
754	–	*/
755	–	void
756	–	set_user_mode(struct Client *source_p, const int parc, char *parv[])
757	–	{
758	–	unsigned int flag, setflags;
759	–	char **p, *m, buf[IRCD_BUFSIZE];
760	–	struct Client *target_p;
761	–	int what = MODE_ADD, badflag = 0, i;
762	–
763	–	assert(!(parc < 2));
764	–
765	–	if ((target_p = find_person(source_p, parv[1])) == NULL)
766	–	{
767	–	if (MyConnect(source_p))
768	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
769	–	return;
770	–	}
771	–
772	–	if (source_p != target_p)
773	–	{
774	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
775	–	return;
776	–	}
777	–
778	–	if (parc < 3)
779	–	{
780	–	m = buf;
781	–	*m++ = '+';
782	–
783	–	for (i = 0; i < 128; ++i)
784	–	if (HasUMode(source_p, user_modes[i]))
785	–	*m++ = (char)i;
786	–	*m = '\0';
787	–
788	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
789	–	return;
790	–	}
791	–
792	–	/* find flags already set for user */
793	–	setflags = source_p->umodes;
794	–
795	–	/* parse mode change string(s) */
796	–	for (p = &parv[2]; p && *p; ++p)
797	–	{
798	–	for (m = *p; *m; ++m)
799	–	{
800	–	switch (*m)
801	–	{
802	–	case '+':
803	–	what = MODE_ADD;
804	–	break;
805	–	case '-':
806	–	what = MODE_DEL;
807	–	break;
808	–	case 'o':
809	–	if (what == MODE_ADD)
810	–	{
811	–	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
812	–	{
813	–	++Count.oper;
814	–	SetOper(source_p);
815	–	}
816	–	}
817	–	else
818	–	{
819	–	if (!HasUMode(source_p, UMODE_OPER))
820	–	break;
821	–
822	–	ClearOper(source_p);
823	–	Count.oper--;
824	–
825	–	if (MyConnect(source_p))
826	–	{
827	–	dlink_node *dm = NULL;
828	–
829	–	detach_conf(source_p, CONF_OPER);
830	–	ClrOFlag(source_p);
831	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
832	–
833	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
834	–	free_dlink_node(dm);
835	–	}
836	–	}
837	–
838	–	break;
839	–
840	–	case 'S':  /* Only servers may set +S in a burst */
841	–	case 'W':  /* Only servers may set +W in a burst */
842	–	case 'r':  /* Only services may set +r */
843	–	case 'x':  /* Only services may set +x */
844	–	break;
845	–
846	–	default:
847	–	if ((flag = user_modes[(unsigned char)*m]))
848	–	{
849	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
850	–	(ConfigFileEntry.oper_only_umodes & flag))
851	–	badflag = 1;
852	–	else
853	–	{
854	–	if (what == MODE_ADD)
855	–	AddUMode(source_p, flag);
856	–	else
857	–	DelUMode(source_p, flag);
858	–	}
859	–	}
860	–	else if (MyConnect(source_p))
861	–	badflag = 1;
862	–
863	–	break;
864	–	}
865	–	}
866	–	}
867	–
868	–	if (badflag)
869	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
870	–
871	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
872	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
873	–	{
874	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
875	–	DelUMode(source_p, UMODE_ADMIN);
876	–	}
877	–
878	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
879	–	++Count.invisi;
880	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
881	–	--Count.invisi;
882	–
883	–	/*
884	–	* compare new flags with old flags and send string which
885	–	* will cause servers to update correctly.
886	–	*/
887	–	send_umode_out(source_p, source_p, setflags);
888	–	}
889	–
760		/* send_umode()
761		* send the MODE string for user (user) to connection client_p
762		* -avalon
#	Line 900 | Line 770 | set_user_mode(struct Client *source_p, c
770		*/
771		void
772		send_umode(struct Client *client_p, struct Client *source_p,
773	<	unsigned int old, unsigned int sendmask, char *umode_buf)
773	>	unsigned int old, char *umode_buf)
774		{
775		char *m = umode_buf;
776		int what = 0;
907	–	unsigned int i;
908	–	unsigned int flag;
777
778		/*
779	<	* build a string in umode_buf to represent the change in the user's
779	>	* Build a string in umode_buf to represent the change in the user's
780		* mode between the new (source_p->umodes) and 'old'.
781		*/
782	<	for (i = 0; i < 128; ++i)
782	>	for (unsigned int i = 0; i < 128; ++i)
783		{
784	<	flag = user_modes[i];
917	<	if (!flag)
918	<	continue;
784	>	unsigned int flag = user_modes[i];
785
786	<	if (MyClient(source_p) && !(flag & sendmask))
786	>	if (!flag)
787		continue;
788
789		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 962 | Line 828 | void
828		send_umode_out(struct Client *client_p, struct Client *source_p,
829		unsigned int old)
830		{
831	<	char buf[IRCD_BUFSIZE] = { '\0' };
966	<	dlink_node *ptr = NULL;
831	>	char buf[IRCD_BUFSIZE] = "";
832
833	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
833	>	send_umode(NULL, source_p, old, buf);
834
835		if (buf[0])
836		sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
837	<	ID(source_p), ID(source_p), buf);
837	>	source_p->id, source_p->id, buf);
838
839		if (client_p && MyClient(client_p))
840	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
840	>	send_umode(client_p, source_p, old, buf);
841		}
842
843		void
#	Line 1021 | Line 886 | user_set_hostmask(struct Client *target_
886
887		DLINK_FOREACH(ptr, target_p->channel.head)
888		{
889	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
889	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
890		char *p = modebuf;
891		int len = 0;
892		const struct Membership *ms = ptr->data;
#	Line 1063 | Line 928 | user_set_hostmask(struct Client *target_
928		target_p->host, target_p->away);
929		}
930
931	<	/* user_welcome()
932	<	*
933	<	* inputs       - client pointer to client to welcome
1069	<	* output       - NONE
1070	<	* side effects -
1071	<	*/
1072	<	static void
1073	<	user_welcome(struct Client *source_p)
1074	<	{
1075	<	#if defined(__TIME__) && defined(__DATE__)
1076	<	static const char built_date[] = __DATE__ " at " __TIME__;
1077	<	#else
1078	<	static const char built_date[] = "unknown";
1079	<	#endif
1080	<
1081	<	#ifdef HAVE_LIBCRYPTO
1082	<	if (HasFlag(source_p, FLAGS_SSL))
1083	<	{
1084	<	AddUMode(source_p, UMODE_SSL);
1085	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1086	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1087	<	}
1088	<	#endif
1089	<
1090	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1091	<	source_p->name);
1092	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1093	<	get_listener_name(source_p->localClient->listener), ircd_version);
1094	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1095	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1096	<	show_isupport(source_p);
1097	<
1098	<	if (source_p->id[0] != '\0')
1099	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1100	<
1101	<	show_lusers(source_p);
1102	<	motd_signon(source_p);
1103	<	}
1104	<
1105	<	/* check_xline()
1106	<	*
1107	<	* inputs       - pointer to client to test
1108	<	* outupt       - 1 if exiting 0 if ok
1109	<	* side effects -
1110	<	*/
1111	<	static int
1112	<	check_xline(struct Client *source_p)
1113	<	{
1114	<	struct MaskItem *conf = NULL;
1115	<	const char *reason = NULL;
1116	<
1117	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1118	<	{
1119	<	++conf->count;
1120	<
1121	<	if (conf->reason != NULL)
1122	<	reason = conf->reason;
1123	<	else
1124	<	reason = "No Reason";
1125	<
1126	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1127	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1128	<	source_p->info, reason,
1129	<	get_client_name(source_p, HIDE_IP),
1130	<	source_p->sockhost);
1131	<
1132	<	++ServerStats.is_ref;
1133	<	exit_client(source_p, "Bad user info");
1134	<	return 1;
1135	<	}
1136	<
1137	<	return 0;
1138	<	}
1139	<
1140	<	/* oper_up()
1141	<	*
1142	<	* inputs       - pointer to given client to oper
1143	<	* output       - NONE
1144	<	* side effects - Blindly opers up given source_p, using conf info
1145	<	*                all checks on passwords have already been done.
1146	<	*                This could also be used by rsa oper routines.
931	>	/*! \brief Blindly opers up given source_p, using conf info.
932	>	*         All checks on passwords have already been done.
933	>	* \param source_p Pointer to given client to oper
934		*/
935		void
936		oper_up(struct Client *source_p)
#	Line 1180 | Line 967 | oper_up(struct Client *source_p)
967		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
968		}
969
970	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
970	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
971
972		int
973		valid_sid(const char *sid)
#	Line 1205 | Line 992 | valid_sid(const char *sid)
992		void
993		init_uid(void)
994		{
1208	–	unsigned int i;
1209	–
995		memset(new_uid, 0, sizeof(new_uid));
996
997		if (!EmptyString(ServerInfo.sid))
998		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
999
1000	<	for (i = 0; i < IRC_MAXSID; ++i)
1000	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1001		if (new_uid[i] == '\0')
1002		new_uid[i] = 'A';
1003
#	Line 1229 | Line 1014 | init_uid(void)
1014		*                note this is a recursive function
1015		*/
1016		static void
1017	<	add_one_to_uid(int i)
1017	>	add_one_to_uid(unsigned int i)
1018		{
1019	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1019	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1020		{
1021		if (new_uid[i] == 'Z')
1022		new_uid[i] = '0';
1023		else if (new_uid[i] == '9')
1024		{
1025		new_uid[i] = 'A';
1026	<	add_one_to_uid(i-1);
1026	>	add_one_to_uid(i - 1);
1027		}
1028		else
1029		++new_uid[i];
#	Line 1263 | Line 1048 | add_one_to_uid(int i)
1048		static const char *
1049		uid_get(void)
1050		{
1051	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1051	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1052		return new_uid;
1053		}
1054
#	Line 1278 | Line 1063 | void
1063		init_isupport(void)
1064		{
1065		add_isupport("CALLERID", NULL, -1);
1066	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1066	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1067		add_isupport("DEAF", "D", -1);
1068		add_isupport("KICKLEN", NULL, KICKLEN);
1069		add_isupport("MODES", NULL, MAXMODEPARAMS);
1285	–	#ifdef HALFOPS
1070		add_isupport("PREFIX", "(ohv)@%+", -1);
1071		add_isupport("STATUSMSG", "@%+", -1);
1288	–	#else
1289	–	add_isupport("PREFIX", "(ov)@+", -1);
1290	–	add_isupport("STATUSMSG", "@+", -1);
1291	–	#endif
1072		add_isupport("EXCEPTS", "e", -1);
1073		add_isupport("INVEX", "I", -1);
1074		}
#	Line 1306 | Line 1086 | void
1086		add_isupport(const char *name, const char *options, int n)
1087		{
1088		dlink_node *ptr;
1089	<	struct Isupport *support;
1089	>	struct Isupport *support = NULL;
1090
1091		DLINK_FOREACH(ptr, support_list.head)
1092		{
#	Line 1321 | Line 1101 | add_isupport(const char *name, const cha
1101
1102		if (ptr == NULL)
1103		{
1104	<	support = MyMalloc(sizeof(*support));
1104	>	support = MyCalloc(sizeof(*support));
1105		dlinkAddTail(support, &support->node, &support_list);
1106		}
1107
1108		support->name = xstrdup(name);
1109	<	if (options != NULL)
1109	>	if (options)
1110		support->options = xstrdup(options);
1111		support->number = n;
1112
#	Line 1394 | Line 1174 | rebuild_isupport_message_line(void)
1174		p += (n = sprintf(p, "%s", support->name));
1175		len += n;
1176
1177	<	if (support->options != NULL)
1177	>	if (support->options)
1178		{
1179		p += (n = sprintf(p, "=%s", support->options));
1180		len += n;
#	Line 1422 | Line 1202 | rebuild_isupport_message_line(void)
1202		}
1203		}
1204
1205	<	if (len != 0)
1205	>	if (len)
1206		{
1207		if (*--p == ' ')
1208		*p = '\0';

Diff Legend

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