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 3869 by michael, Thu Jun 5 22:19: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)
178	>	if (dlink_list_length(&global_channel_list))
179		sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
180
181		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
#	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, SEND_UMODES, ubuf);
290	>	else
291	>	send_umode(NULL, source_p, 0, SEND_UMODES, 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 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
#	Line 337 | Line 495 | register_local_user(struct Client *sourc
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 367 | Line 528 | register_local_user(struct Client *sourc
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, 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 478 | Line 633 | register_remote_user(struct Client *sour
633		source_p->host, source_p->from->name);
634		sendto_one(source_p->from,
635		":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636	<	ID(&me), ID(source_p), me.name, server);
636	>	me.id, source_p->id, me.name, server);
637
638		AddFlag(source_p, FLAGS_KILLED);
639		exit_client(source_p, "Ghosted Client");
#	Line 494 | Line 649 | register_remote_user(struct Client *sour
649		target_p->name, target_p->from->name);
650		sendto_one(source_p->from,
651		":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
652	<	ID(&me), ID(source_p), me.name, source_p->servptr->name,
652	>	me.id, source_p->id, me.name, source_p->servptr->name,
653		target_p->from->name);
654
655		AddFlag(source_p, FLAGS_KILLED);
#	Line 509 | Line 664 | register_remote_user(struct Client *sour
664		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
665		AddFlag(source_p, FLAGS_SERVICE);
666
512	–	/* Increment our total user count here */
667		if (++Count.total > Count.max_tot)
668		Count.max_tot = Count.total;
669
#	Line 528 | Line 682 | register_remote_user(struct Client *sour
682		introduce_client(source_p);
683		}
684
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	–
685		/* valid_hostname()
686		*
687		* Inputs       - pointer to hostname
#	Line 600 | 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 629 | Line 725 | valid_username(const char *username, con
725		int dots      = 0;
726		const char *p = username;
727
728	<	assert(p != NULL);
728	>	assert(p);
729
730		if (*p == '~')
731		++p;
#	Line 646 | 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 664 | 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 678 | 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 692 | Line 790 | valid_nickname(const char *nickname, con
790		return p - nickname <= NICKLEN;
791		}
792
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	–
793		/* send_umode()
794		* send the MODE string for user (user) to connection client_p
795		* -avalon
#	Line 904 | Line 807 | send_umode(struct Client *client_p, stru
807		{
808		char *m = umode_buf;
809		int what = 0;
907	–	unsigned int i;
908	–	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];
817	>	unsigned int flag = user_modes[i];
818	>
819		if (!flag)
820		continue;
821
#	Line 962 | Line 864 | void
864		send_umode_out(struct Client *client_p, struct Client *source_p,
865		unsigned int old)
866		{
867	<	char buf[IRCD_BUFSIZE] = { '\0' };
966	<	dlink_node *ptr = NULL;
867	>	char buf[IRCD_BUFSIZE] = "";
868
869		send_umode(NULL, source_p, old, SEND_UMODES, buf);
870
871		if (buf[0])
872		sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
873	<	ID(source_p), ID(source_p), buf);
873	>	source_p->id, source_p->id, buf);
874
875		if (client_p && MyClient(client_p))
876		send_umode(client_p, source_p, old, 0xffffffff, buf);
#	Line 1021 | Line 922 | user_set_hostmask(struct Client *target_
922
923		DLINK_FOREACH(ptr, target_p->channel.head)
924		{
925	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
925	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
926		char *p = modebuf;
927		int len = 0;
928		const struct Membership *ms = ptr->data;
#	Line 1063 | Line 964 | user_set_hostmask(struct Client *target_
964		target_p->host, target_p->away);
965		}
966
967	<	/* user_welcome()
968	<	*
969	<	* 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.
967	>	/*! \brief Blindly opers up given source_p, using conf info.
968	>	*         All checks on passwords have already been done.
969	>	* \param source_p Pointer to given client to oper
970		*/
971		void
972		oper_up(struct Client *source_p)
#	Line 1180 | Line 1003 | oper_up(struct Client *source_p)
1003		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1004		}
1005
1006	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1006	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1007
1008		int
1009		valid_sid(const char *sid)
#	Line 1205 | Line 1028 | valid_sid(const char *sid)
1028		void
1029		init_uid(void)
1030		{
1208	–	unsigned int i;
1209	–
1031		memset(new_uid, 0, sizeof(new_uid));
1032
1033		if (!EmptyString(ServerInfo.sid))
1034		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1035
1036	<	for (i = 0; i < IRC_MAXSID; ++i)
1036	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1037		if (new_uid[i] == '\0')
1038		new_uid[i] = 'A';
1039
#	Line 1229 | Line 1050 | init_uid(void)
1050		*                note this is a recursive function
1051		*/
1052		static void
1053	<	add_one_to_uid(int i)
1053	>	add_one_to_uid(unsigned int i)
1054		{
1055	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1055	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1056		{
1057		if (new_uid[i] == 'Z')
1058		new_uid[i] = '0';
1059		else if (new_uid[i] == '9')
1060		{
1061		new_uid[i] = 'A';
1062	<	add_one_to_uid(i-1);
1062	>	add_one_to_uid(i - 1);
1063		}
1064		else
1065		++new_uid[i];
#	Line 1263 | Line 1084 | add_one_to_uid(int i)
1084		static const char *
1085		uid_get(void)
1086		{
1087	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1087	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1088		return new_uid;
1089		}
1090
#	Line 1282 | Line 1103 | init_isupport(void)
1103		add_isupport("DEAF", "D", -1);
1104		add_isupport("KICKLEN", NULL, KICKLEN);
1105		add_isupport("MODES", NULL, MAXMODEPARAMS);
1285	–	#ifdef HALFOPS
1106		add_isupport("PREFIX", "(ohv)@%+", -1);
1107		add_isupport("STATUSMSG", "@%+", -1);
1288	–	#else
1289	–	add_isupport("PREFIX", "(ov)@+", -1);
1290	–	add_isupport("STATUSMSG", "@+", -1);
1291	–	#endif
1108		add_isupport("EXCEPTS", "e", -1);
1109		add_isupport("INVEX", "I", -1);
1110		}
#	Line 1321 | Line 1137 | add_isupport(const char *name, const cha
1137
1138		if (ptr == NULL)
1139		{
1140	<	support = MyMalloc(sizeof(*support));
1140	>	support = MyCalloc(sizeof(*support));
1141		dlinkAddTail(support, &support->node, &support_list);
1142		}
1143
1144		support->name = xstrdup(name);
1145	<	if (options != NULL)
1145	>	if (options)
1146		support->options = xstrdup(options);
1147		support->number = n;
1148
#	Line 1394 | Line 1210 | rebuild_isupport_message_line(void)
1210		p += (n = sprintf(p, "%s", support->name));
1211		len += n;
1212
1213	<	if (support->options != NULL)
1213	>	if (support->options)
1214		{
1215		p += (n = sprintf(p, "=%s", support->options));
1216		len += n;
#	Line 1422 | Line 1238 | rebuild_isupport_message_line(void)
1238		}
1239		}
1240
1241	<	if (len != 0)
1241	>	if (len)
1242		{
1243		if (*--p == ' ')
1244		*p = '\0';

Diff Legend

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