ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 896 by michael, Sat Nov 3 08:54:09 2007 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1813 by michael, Fri Apr 12 08:52:37 2013 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
26	>	#include "list.h"
27		#include "s_user.h"
28		#include "s_misc.h"
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
39	–	#include "list.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42		#include "s_serv.h"
43		#include "send.h"
44		#include "supported.h"
45		#include "whowas.h"
46		#include "memory.h"
47		#include "packet.h"
48	+	#include "rng_mt.h"
49		#include "userhost.h"
50		#include "hook.h"
51		#include "s_misc.h"
52	<	#include "msg.h"
55	<	#include "pcre.h"
52	>	#include "parse.h"
53		#include "watch.h"
54
55	<	int MaxClientCount     = 1;
59	<	int MaxConnectionCount = 1;
55	>
56		struct Callback *entering_umode_cb = NULL;
57		struct Callback *umode_cb = NULL;
62	–	struct Callback *uid_get_cb = NULL;
58
59		static char umode_buffer[IRCD_BUFSIZE];
60
61		static void user_welcome(struct Client *);
62	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
62	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
63		static int check_xline(struct Client *);
64	<	static void introduce_client(struct Client *, struct Client *);
65	<	static void *uid_get(va_list);
64	>	static void introduce_client(struct Client *);
65	>	static const char *uid_get(void);
66
67		/* Used for building up the isupport string,
68		* used with init_isupport, add_isupport, delete_isupport
#	Line 99 | Line 94 | unsigned int user_modes[256] =
94		0,                  /* E */
95		0,                  /* F */
96		UMODE_SOFTCALLERID, /* G */
97	<	0,                  /* H */
97	>	UMODE_HIDDEN,       /* H */
98		0,                  /* I */
99		0,                  /* J */
100		0,                  /* K */
#	Line 109 | Line 104 | unsigned int user_modes[256] =
104		0,                  /* O */
105		0,                  /* P */
106		0,                  /* Q */
107	<	0,                  /* R */
107	>	UMODE_REGONLY,      /* R */
108		0,                  /* S */
109		0,                  /* T */
110		0,                  /* U */
#	Line 129 | Line 124 | unsigned int user_modes[256] =
124		UMODE_CALLERID,     /* g */
125		0,                  /* h */
126		UMODE_INVISIBLE,    /* i */
127	<	0,                  /* j */
127	>	UMODE_REJ,          /* j */
128		UMODE_SKILL,        /* k */
129		UMODE_LOCOPS,       /* l */
130		0,                  /* m */
#	Line 137 | Line 132 | unsigned int user_modes[256] =
132		UMODE_OPER,         /* o */
133		0,                  /* p */
134		0,                  /* q */
135	<	UMODE_REJ,          /* r */
135	>	UMODE_REGISTERED,   /* r */
136		UMODE_SERVNOTICE,   /* s */
137		0,                  /* t */
138		UMODE_UNAUTH,       /* u */
#	Line 164 | Line 159 | assemble_umode_buffer(void)
159		unsigned int idx = 0;
160		char *umode_buffer_ptr = umode_buffer;
161
162	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
162	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
163		if (user_modes[idx])
164		*umode_buffer_ptr++ = idx;
165
#	Line 193 | Line 188 | show_lusers(struct Client *source_p)
188		to = source_p->name;
189		}
190
191	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
191	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
192		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
193		from, to, (Count.total-Count.invisi),
194		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 213 | Line 208 | show_lusers(struct Client *source_p)
208		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209		from, to, dlink_list_length(&global_channel_list));
210
211	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
211	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
212		{
213		sendto_one(source_p, form_str(RPL_LUSERME),
214		from, to, Count.local, Count.myserver);
#	Line 234 | Line 229 | show_lusers(struct Client *source_p)
229		from, to, Count.total, Count.max_tot,
230		Count.total, Count.max_tot);
231
232	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
232	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
233		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
234	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
234	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
235
236	<	if (Count.local > MaxClientCount)
237	<	MaxClientCount = Count.local;
236	>	if (Count.local > Count.max_loc_cli)
237	>	Count.max_loc_cli = Count.local;
238
239	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
240	<	MaxConnectionCount = Count.local + Count.myserver;
239	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
240	>	Count.max_loc_con = Count.local + Count.myserver;
241		}
242
243		/* show_isupport()
#	Line 281 | Line 276 | show_isupport(struct Client *source_p)
276		**         nick from local user or kill him/her...
277		*/
278		void
279	<	register_local_user(struct Client *client_p, struct Client *source_p,
285	<	const char *nick, const char *username)
279	>	register_local_user(struct Client *source_p)
280		{
281	<	const struct AccessItem *aconf = NULL;
282	<	dlink_node *ptr = NULL;
289	<	dlink_node *m = NULL;
281	>	const char *id = NULL;
282	>	const struct MaskItem *conf = NULL;
283
284		assert(source_p != NULL);
285	+	assert(source_p == source_p->from);
286		assert(MyConnect(source_p));
293	–	assert(source_p->username != username);
287		assert(!source_p->localClient->registration);
288
289	<	ClearCap(client_p, CAP_TS6);
289	>	ClearCap(source_p, CAP_TS6);
290
291		if (ConfigFileEntry.ping_cookie)
292		{
293	<	if (!IsPingSent(source_p) &&
301	<	source_p->localClient->random_ping == 0)
293	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
294		{
295	<	source_p->localClient->random_ping = (unsigned long)rand();
296	<	sendto_one(source_p, "PING :%lu",
295	>	do
296	>	source_p->localClient->random_ping = genrand_int32();
297	>	while (!source_p->localClient->random_ping);
298	>
299	>	sendto_one(source_p, "PING :%u",
300		source_p->localClient->random_ping);
301		SetPingSent(source_p);
302		return;
#	Line 311 | Line 306 | register_local_user(struct Client *clien
306		return;
307		}
308
309	<	source_p->localClient->last = CurrentTime;
309	>	source_p->localClient->last_privmsg = CurrentTime;
310		/* Straight up the maximum rate of flooding... */
311		source_p->localClient->allow_read = MAX_FLOOD_BURST;
312
313	<	if (!execute_callback(client_check_cb, source_p, username))
313	>	if (!check_client(source_p))
314		return;
315
316		if (valid_hostname(source_p->host) == 0)
#	Line 326 | Line 321 | register_local_user(struct Client *clien
321		sizeof(source_p->host));
322		}
323
324	<	ptr   = source_p->localClient->confs.head;
330	<	aconf = map_to_conf(ptr->data);
324	>	conf = source_p->localClient->confs.head->data;
325
326		if (!IsGotId(source_p))
327		{
328	<	const char *p = NULL;
328	>	char username[USERLEN + 1];
329	>	const char *p = username;
330		unsigned int i = 0;
331
332	<	if (IsNeedIdentd(aconf))
332	>	if (IsNeedIdentd(conf))
333		{
334		++ServerStats.is_ref;
335		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 343 | Line 338 | register_local_user(struct Client *clien
338		return;
339		}
340
341	<	p = username;
341	>	strlcpy(username, source_p->username, sizeof(username));
342
343	<	if (!IsNoTilde(aconf))
343	>	if (!IsNoTilde(conf))
344		source_p->username[i++] = '~';
345
346	<	while (*p && i < USERLEN)
352	<	{
346	>	for (; *p && i < USERLEN; ++p)
347		if (*p != '[')
348		source_p->username[i++] = *p;
355	–	p++;
356	–	}
349
350		source_p->username[i] = '\0';
351		}
352
353		/* password check */
354	<	if (!EmptyString(aconf->passwd))
354	>	if (!EmptyString(conf->passwd))
355		{
356		const char *pass = source_p->localClient->passwd;
357
358	<	if (!match_conf_password(pass, aconf))
358	>	if (!match_conf_password(pass, conf))
359		{
360		++ServerStats.is_ref;
361		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 379 | Line 371 | register_local_user(struct Client *clien
371		*/
372
373		/* report if user has &^>= etc. and set flags as needed in source_p */
374	<	report_and_set_user_flags(source_p, aconf);
374	>	report_and_set_user_flags(source_p, conf);
375	>
376	>	if (IsDead(source_p))
377	>	return;
378
379		/* Limit clients -
380		* We want to be able to have servers and F-line clients
#	Line 392 | Line 387 | register_local_user(struct Client *clien
387		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
388		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
389		{
390	<	sendto_realops_flags(UMODE_FULL, L_ALL,
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391		"Too many clients, rejecting %s[%s].",
392	<	nick, source_p->host);
392	>	source_p->name, source_p->host);
393		++ServerStats.is_ref;
394		exit_client(source_p, &me, "Sorry, server is full - try later");
395		return;
#	Line 405 | Line 400 | register_local_user(struct Client *clien
400		{
401		char tmpstr2[IRCD_BUFSIZE];
402
403	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
404	<	nick, source_p->username, source_p->host);
403	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
404	>	"Invalid username: %s (%s@%s)",
405	>	source_p->name, source_p->username, source_p->host);
406		++ServerStats.is_ref;
407	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
407	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
408	>	source_p->username);
409		exit_client(source_p, &me, tmpstr2);
410		return;
411		}
412
416	–	assert(source_p == client_p);
417	–
413		if (check_xline(source_p))
414		return;
415
416	<	if (IsDead(client_p))
417	<	return;
423	<
424	<	if (me.id[0])
425	<	{
426	<	const char *id = execute_callback(uid_get_cb, source_p);
427	<
428	<	while (hash_find_id(id) != NULL)
429	<	id = uid_get(NULL);
416	>	while (hash_find_id((id = uid_get())) != NULL)
417	>	;
418
419	<	strlcpy(source_p->id, id, sizeof(source_p->id));
420	<	hash_add_id(source_p);
433	<	}
419	>	strlcpy(source_p->id, id, sizeof(source_p->id));
420	>	hash_add_id(source_p);
421
422	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
423	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
424	<	nick, source_p->username, source_p->host,
422	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
423	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
424	>	source_p->name, source_p->username, source_p->host,
425		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
426		"255.255.255.255" : source_p->sockhost,
427	<	get_client_class(source_p),
428	<	source_p->info);
427	>	get_client_class(&source_p->localClient->confs),
428	>	source_p->info, source_p->id);
429
430	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
430	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
431		"CLICONN %s %s %s %s %s %s %s 0 %s",
432	<	nick, source_p->username, source_p->host,
432	>	source_p->name, source_p->username, source_p->host,
433		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434		"255.255.255.255" : source_p->sockhost,
435	<	get_client_class(source_p),
435	>	get_client_class(&source_p->localClient->confs),
436		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	<	"<hidden>" : source_p->client_host,
437	>	"<hidden>" : source_p->localClient->client_host,
438		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	<	"<hidden>" : source_p->client_server,
439	>	"<hidden>" : source_p->localClient->client_server,
440		source_p->info);
441
442
456	–	/* If they have died in send_* don't do anything. */
457	–	if (IsDead(source_p))
458	–	return;
459	–
443		if (ConfigFileEntry.invisible_on_connect)
444		{
445	<	source_p->umodes |= UMODE_INVISIBLE;
446	<	Count.invisi++;
445	>	AddUMode(source_p, UMODE_INVISIBLE);
446	>	++Count.invisi;
447		}
448
449		if ((++Count.local) > Count.max_loc)
#	Line 468 | Line 451 | register_local_user(struct Client *clien
451		Count.max_loc = Count.local;
452
453		if (!(Count.max_loc % 10))
454	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
454	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
455	>	"New Max Local Clients: %d",
456		Count.max_loc);
457		}
458
475	–	SetClient(source_p);
476	–
477	–	source_p->servptr = &me;
478	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
479	–
459		/* Increment our total user count here */
460		if (++Count.total > Count.max_tot)
461		Count.max_tot = Count.total;
462	<	Count.totalrestartcount++;
462	>	++Count.totalrestartcount;
463	>
464	>	assert(source_p->servptr == &me);
465	>	SetClient(source_p);
466	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
467
468		source_p->localClient->allow_read = MAX_FLOOD_BURST;
469
470	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
471	<	{
472	<	free_dlink_node(m);
473	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
491	<	}
492	<	else assert(0);
470	>	assert(dlinkFind(&unknown_list, source_p));
471	>
472	>	dlink_move_node(&source_p->localClient->lclient_node,
473	>	&unknown_list, &local_client_list);
474
475		user_welcome(source_p);
476		add_user_host(source_p->username, source_p->host, 0);
477		SetUserHost(source_p);
478
479	<	introduce_client(client_p, source_p);
479	>	introduce_client(source_p);
480		}
481
482		/* register_remote_user()
483		*
484	<	* inputs       - client_p directly connected client
504	<	*              - source_p remote or directly connected client
484	>	* inputs       - source_p remote or directly connected client
485		*              - username to register as
486		*              - host name to register as
487		*              - server name
#	Line 511 | Line 491 | register_local_user(struct Client *clien
491		*                is introduced by a server.
492		*/
493		void
494	<	register_remote_user(struct Client *client_p, struct Client *source_p,
494	>	register_remote_user(struct Client *source_p,
495		const char *username, const char *host, const char *server,
496		const char *realname)
497		{
#	Line 521 | Line 501 | register_remote_user(struct Client *clie
501		assert(source_p->username != username);
502
503		strlcpy(source_p->host, host, sizeof(source_p->host));
524	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
504		strlcpy(source_p->username, username, sizeof(source_p->username));
505
506		/*
507		* coming from another server, take the servers word for it
508		*/
509	<	source_p->servptr = find_server(server);
509	>	source_p->servptr = hash_find_server(server);
510
511	<	/* Super GhostDetect:
511	>	/*
512	>	* Super GhostDetect:
513		* If we can't find the server the user is supposed to be on,
514		* then simply blow the user away.        -Taner
515		*/
516		if (source_p->servptr == NULL)
517		{
518	<	sendto_realops_flags(UMODE_ALL, L_ALL,
518	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
519		"No server %s for user %s[%s@%s] from %s",
520		server, source_p->name, source_p->username,
521		source_p->host, source_p->from->name);
522	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
522	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
523
524	<	SetKilled(source_p);
524	>	AddFlag(source_p, FLAGS_KILLED);
525		exit_client(source_p, &me, "Ghosted Client");
526		return;
527		}
528
529		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
530		{
531	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
531	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
532		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
533	<	client_p->name, source_p->name, source_p->username,
533	>	source_p->from->name, source_p->name, source_p->username,
534		source_p->host, source_p->servptr->name,
535		target_p->name, target_p->from->name);
536	<	kill_client(client_p, source_p,
536	>	kill_client(source_p->from, source_p,
537		"%s (NICK from wrong direction (%s != %s))",
538		me.name, source_p->servptr->name, target_p->from->name);
539	<	SetKilled(source_p);
539	>	AddFlag(source_p, FLAGS_KILLED);
540		exit_client(source_p, &me, "USER server wrong direction");
541		return;
542		}
543
544	+	/*
545	+	* If the nick has been introduced by a services server,
546	+	* make it a service as well.
547	+	*/
548	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
549	+	AddFlag(source_p, FLAGS_SERVICE);
550	+
551		/* Increment our total user count here */
552		if (++Count.total > Count.max_tot)
553		Count.max_tot = Count.total;
#	Line 570 | Line 557 | register_remote_user(struct Client *clie
557		add_user_host(source_p->username, source_p->host, 1);
558		SetUserHost(source_p);
559
560	<	introduce_client(client_p, source_p);
560	>	introduce_client(source_p);
561		}
562
563		/* introduce_client()
564		*
565	<	* inputs       - client_p
579	<	*              - source_p
565	>	* inputs       - source_p
566		* output       - NONE
567		* side effects - This common function introduces a client to the rest
568		*                of the net, either from a local client connect or
569		*                from a remote connect.
570		*/
571		static void
572	<	introduce_client(struct Client *client_p, struct Client *source_p)
572	>	introduce_client(struct Client *source_p)
573		{
574		dlink_node *server_node = NULL;
575		static char ubuf[12];
#	Line 605 | Line 591 | introduce_client(struct Client *client_p
591		{
592		struct Client *server = server_node->data;
593
594	<	if (server == client_p)
594	>	if (server == source_p->from)
595		continue;
596
597	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
598	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
599	<	source_p->servptr->id,
600	<	source_p->name, source_p->hopcount+1,
601	<	(unsigned long)source_p->tsinfo,
602	<	ubuf, source_p->username, source_p->host,
603	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
604	<	"0" : source_p->sockhost, source_p->id, source_p->info);
597	>	if (IsCapable(server, CAP_SVS))
598	>	{
599	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
601	>	source_p->servptr->id,
602	>	source_p->name, source_p->hopcount+1,
603	>	(unsigned long)source_p->tsinfo,
604	>	ubuf, source_p->username, source_p->host,
605	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
606	>	"0" : source_p->sockhost, source_p->id,
607	>	source_p->svid,
608	>	source_p->info);
609	>	else
610	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
611	>	source_p->name, source_p->hopcount+1,
612	>	(unsigned long)source_p->tsinfo,
613	>	ubuf, source_p->username, source_p->host,
614	>	source_p->servptr->name, source_p->svid,
615	>	source_p->info);
616	>
617	>	}
618		else
619	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
620	<	source_p->name, source_p->hopcount+1,
621	<	(unsigned long)source_p->tsinfo,
622	<	ubuf, source_p->username, source_p->host,
623	<	source_p->servptr->name, source_p->info);
619	>	{
620	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
621	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
622	>	source_p->servptr->id,
623	>	source_p->name, source_p->hopcount+1,
624	>	(unsigned long)source_p->tsinfo,
625	>	ubuf, source_p->username, source_p->host,
626	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
627	>	"0" : source_p->sockhost, source_p->id, source_p->info);
628	>	else
629	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	>	source_p->name, source_p->hopcount+1,
631	>	(unsigned long)source_p->tsinfo,
632	>	ubuf, source_p->username, source_p->host,
633	>	source_p->servptr->name, source_p->info);
634	>	}
635		}
636		}
637
#	Line 641 | Line 651 | valid_hostname(const char *hostname)
651
652		assert(p != NULL);
653
654	<	if ('.' == *p || ':' == *p)
654	>	if (*p == '.' || *p == ':')
655		return 0;
656
657	<	while (*p)
648	<	{
657	>	for (; *p; ++p)
658		if (!IsHostChar(*p))
659		return 0;
651	–	p++;
652	–	}
660
661	<	return 1;
661	>	return p - hostname <= HOSTLEN;
662		}
663
664		/* valid_username()
#	Line 673 | Line 680 | valid_username(const char *username)
680
681		assert(p != NULL);
682
683	<	if ('~' == *p)
683	>	if (*p == '~')
684		++p;
685
686		/* reject usernames that don't start with an alphanum
#	Line 687 | Line 694 | valid_username(const char *username)
694		{
695		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
696		{
697	<	dots++;
691	<
692	<	if (dots > ConfigFileEntry.dots_in_ident)
697	>	if (++dots > ConfigFileEntry.dots_in_ident)
698		return 0;
699	<	if (!IsUserChar(p[1]))
699	>	if (!IsUserChar(*(p + 1)))
700		return 0;
701		}
702		else if (!IsUserChar(*p))
#	Line 701 | Line 706 | valid_username(const char *username)
706		return 1;
707		}
708
709	+	/* clean_nick_name()
710	+	*
711	+	* input        - nickname
712	+	*              - whether it's a local nick (1) or remote (0)
713	+	* output       - none
714	+	* side effects - walks through the nickname, returning 0 if erroneous
715	+	*/
716	+	int
717	+	valid_nickname(const char *nickname, const int local)
718	+	{
719	+	const char *p = nickname;
720	+	assert(nickname && *nickname);
721	+
722	+	/* nicks can't start with a digit or - or be 0 length */
723	+	/* This closer duplicates behaviour of hybrid-6 */
724	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
725	+	return 0;
726	+
727	+	for (; *p; ++p)
728	+	if (!IsNickChar(*p))
729	+	return 0;
730	+
731	+	return p - nickname <= NICKLEN;
732	+	}
733	+
734		/* report_and_set_user_flags()
735		*
736		* inputs       - pointer to source_p
737	<	*              - pointer to aconf for this user
737	>	*              - pointer to conf for this user
738		* output       - NONE
739		* side effects - Report to user any special flags
740		*                they are getting, and set them.
741		*/
742		static void
743	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
743	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
744		{
745		/* If this user is being spoofed, tell them so */
746	<	if (IsConfDoSpoofIp(aconf))
746	>	if (IsConfDoSpoofIp(conf))
747		{
748		sendto_one(source_p,
749		":%s NOTICE %s :*** Spoofing your IP. congrats.",
#	Line 721 | Line 751 | report_and_set_user_flags(struct Client
751		}
752
753		/* If this user is in the exception class, Set it "E lined" */
754	<	if (IsConfExemptKline(aconf))
754	>	if (IsConfExemptKline(conf))
755		{
756		SetExemptKline(source_p);
757		sendto_one(source_p,
#	Line 732 | Line 762 | report_and_set_user_flags(struct Client
762		/* The else here is to make sure that G line exempt users
763		* do not get noticed twice.
764		*/
765	<	else if (IsConfExemptGline(aconf))
765	>	else if (IsConfExemptGline(conf))
766		{
767		SetExemptGline(source_p);
768		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769		me.name, source_p->name);
770		}
771
772	<	if (IsConfExemptResv(aconf))
772	>	if (IsConfExemptResv(conf))
773		{
774		SetExemptResv(source_p);
775		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
#	Line 747 | Line 777 | report_and_set_user_flags(struct Client
777		}
778
779		/* If this user is exempt from user limits set it "F lined" */
780	<	if (IsConfExemptLimits(aconf))
780	>	if (IsConfExemptLimits(conf))
781		{
782		SetExemptLimits(source_p);
783		sendto_one(source_p,
#	Line 755 | Line 785 | report_and_set_user_flags(struct Client
785		me.name,source_p->name);
786		}
787
788	<	/* If this user is exempt from idle time outs */
759	<	if (IsConfIdlelined(aconf))
760	<	{
761	<	SetIdlelined(source_p);
762	<	sendto_one(source_p,
763	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
764	<	me.name, source_p->name);
765	<	}
766	<
767	<	if (IsConfCanFlood(aconf))
788	>	if (IsConfCanFlood(conf))
789		{
790		SetCanFlood(source_p);
791		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 773 | Line 794 | report_and_set_user_flags(struct Client
794		}
795		}
796
776	–	/* do_local_user()
777	–	*
778	–	* inputs       -
779	–	* output       - NONE
780	–	* side effects -
781	–	*/
782	–	void
783	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
784	–	const char *username, const char *host, const char *server,
785	–	const char *realname)
786	–	{
787	–	assert(source_p != NULL);
788	–	assert(source_p->username != username);
789	–
790	–	if (source_p == NULL)
791	–	return;
792	–
793	–	if (!IsUnknown(source_p))
794	–	{
795	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
796	–	me.name, nick);
797	–	return;
798	–	}
799	–
800	–	source_p->localClient->registration &= ~REG_NEED_USER;
801	–
802	–	/*
803	–	* don't take the clients word for it, ever
804	–	*/
805	–	source_p->servptr = &me;
806	–
807	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
808	–
809	–	/* stash for later */
810	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
811	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
812	–
813	–	if (!IsGotId(source_p))
814	–	{
815	–	/* save the username in the client
816	–	* If you move this you'll break ping cookies..you've been warned
817	–	*/
818	–	strlcpy(source_p->username, username, sizeof(source_p->username));
819	–	}
820	–
821	–	if (!source_p->localClient->registration)
822	–	/* NICK already received, now I have USER... */
823	–	register_local_user(client_p, source_p, source_p->name, username);
824	–	}
825	–
797		/* change_simple_umode()
798		*
799		* this callback can be hooked to allow special handling of
#	Line 842 | Line 813 | change_simple_umode(va_list args)
813		flag = va_arg(args, unsigned int);
814
815		if (what == MODE_ADD)
816	<	source_p->umodes |= flag;
816	>	AddUMode(source_p, flag);
817		else
818	<	source_p->umodes &= ~flag;
818	>	DelUMode(source_p, flag);
819
820		return NULL;
821		}
#	Line 875 | Line 846 | set_user_mode(struct Client *client_p, s
846		return;
847		}
848
849	<	if (IsServer(source_p))
879	<	{
880	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
881	<	parv[1], source_p->name);
882	<	return;
883	<	}
884	<
885	<	if (source_p != target_p || target_p->from != source_p->from)
849	>	if (source_p != target_p)
850		{
851		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
852		me.name, source_p->name);
#	Line 895 | Line 859 | set_user_mode(struct Client *client_p, s
859		*m++ = '+';
860
861		for (i = 0; i < 128; i++)
862	<	if (source_p->umodes & user_modes[i])
862	>	if (HasUMode(source_p, user_modes[i]))
863		*m++ = (char)i;
864		*m = '\0';
865
#	Line 925 | Line 889 | set_user_mode(struct Client *client_p, s
889		case 'o':
890		if (what == MODE_ADD)
891		{
892	<	if (IsServer(client_p) && !IsOper(source_p))
892	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
893		{
894		++Count.oper;
895		SetOper(source_p);
#	Line 936 | Line 900 | set_user_mode(struct Client *client_p, s
900		/* Only decrement the oper counts if an oper to begin with
901		* found by Pat Szuta, Perly , perly@xnet.com
902		*/
903	<	if (!IsOper(source_p))
903	>	if (!HasUMode(source_p, UMODE_OPER))
904		break;
905
906		ClearOper(source_p);
943	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
907		Count.oper--;
908
909		if (MyConnect(source_p))
910		{
911		dlink_node *dm;
912
913	<	detach_conf(source_p, OPER_TYPE);
914	<	ClearOperFlags(source_p);
913	>	detach_conf(source_p, CONF_OPER);
914	>	ClrOFlag(source_p);
915	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
916
917		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
918		free_dlink_node(dm);
#	Line 960 | Line 924 | set_user_mode(struct Client *client_p, s
924		/* we may not get these,
925		* but they shouldnt be in default
926		*/
927	+	case 'r':
928		case ' ' :
929		case '\n':
930		case '\r':
#	Line 969 | Line 934 | set_user_mode(struct Client *client_p, s
934		default:
935		if ((flag = user_modes[(unsigned char)*m]))
936		{
937	<	if (MyConnect(source_p) && !IsOper(source_p) &&
937	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
938		(ConfigFileEntry.oper_only_umodes & flag))
939		{
940		badflag = 1;
#	Line 992 | Line 957 | set_user_mode(struct Client *client_p, s
957		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
958		me.name, source_p->name);
959
960	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
960	>	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
961		{
962	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
962	>	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
963		me.name, source_p->name);
964	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
964	>	DelUMode(source_p, UMODE_NCHANGE);
965		}
966
967	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
968	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
967	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
968	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
969		{
970		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
971		me.name, source_p->name);
972	<	source_p->umodes &= ~UMODE_ADMIN;
972	>	DelUMode(source_p, UMODE_ADMIN);
973		}
974
975	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
975	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
976		++Count.invisi;
977	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
977	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
978		--Count.invisi;
979
980		/*
#	Line 1034 | Line 999 | void
999		send_umode(struct Client *client_p, struct Client *source_p,
1000		unsigned int old, unsigned int sendmask, char *umode_buf)
1001		{
1002	+	char *m = umode_buf;
1003		int what = 0;
1004		unsigned int i;
1005		unsigned int flag;
1040	–	char *m = umode_buf;
1006
1007		/*
1008		* build a string in umode_buf to represent the change in the user's
#	Line 1052 | Line 1017 | send_umode(struct Client *client_p, stru
1017		if (MyClient(source_p) && !(flag & sendmask))
1018		continue;
1019
1020	<	if ((flag & old) && !(source_p->umodes & flag))
1020	>	if ((flag & old) && !HasUMode(source_p, flag))
1021		{
1022		if (what == MODE_DEL)
1023		*m++ = (char)i;
#	Line 1063 | Line 1028 | send_umode(struct Client *client_p, stru
1028		*m++ = (char)i;
1029		}
1030		}
1031	<	else if (!(flag & old) && (source_p->umodes & flag))
1031	>	else if (!(flag & old) && HasUMode(source_p, flag))
1032		{
1033		if (what == MODE_ADD)
1034		*m++ = (char)i;
#	Line 1097 | Line 1062 | send_umode_out(struct Client *client_p,
1062		char buf[IRCD_BUFSIZE] = { '\0' };
1063		dlink_node *ptr = NULL;
1064
1065	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1101	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1065	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1066
1067		if (buf[0])
1068		{
#	Line 1157 | Line 1121 | user_welcome(struct Client *source_p)
1121
1122		if (ConfigFileEntry.short_motd)
1123		{
1124	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1125	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1124	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1125	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1126		sendto_one(source_p,
1127	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1128	<	"read it", source_p->name);
1127	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1128	>	"read it", me.name, source_p->name);
1129		sendto_one(source_p, form_str(RPL_MOTDSTART),
1130		me.name, source_p->name, me.name);
1131		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1183 | Line 1147 | user_welcome(struct Client *source_p)
1147		static int
1148		check_xline(struct Client *source_p)
1149		{
1150	<	struct ConfItem *conf = NULL;
1150	>	struct MaskItem *conf = NULL;
1151		const char *reason = NULL;
1152
1153	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1154	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1153	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1154	>	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1155		{
1156	<	struct MatchItem *reg = map_to_conf(conf);
1193	<
1194	<	++reg->count;
1156	>	++conf->count;
1157
1158	<	if (reg->reason != NULL)
1159	<	reason = reg->reason;
1158	>	if (conf->reason != NULL)
1159	>	reason = conf->reason;
1160		else
1161		reason = "No Reason";
1162
1163	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1163	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1164		"X-line Rejecting [%s] [%s], user %s [%s]",
1165		source_p->info, reason,
1166		get_client_name(source_p, HIDE_IP),
1167		source_p->sockhost);
1168
1169		++ServerStats.is_ref;
1170	<	if (REJECT_HOLD_TIME > 0)
1209	<	{
1210	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1211	<	me.name, source_p->name);
1212	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1213	<	SetCaptured(source_p);
1214	<	}
1215	<	else
1216	<	exit_client(source_p, &me, "Bad user info");
1170	>	exit_client(source_p, &me, "Bad user info");
1171		return 1;
1172		}
1173
#	Line 1224 | Line 1178 | check_xline(struct Client *source_p)
1178		*
1179		* inputs       - pointer to given client to oper
1180		* output       - NONE
1181	<	* side effects - Blindly opers up given source_p, using aconf info
1181	>	* side effects - Blindly opers up given source_p, using conf info
1182		*                all checks on passwords have already been done.
1183		*                This could also be used by rsa oper routines.
1184		*/
1185		void
1186		oper_up(struct Client *source_p)
1187		{
1188	<	unsigned int old = source_p->umodes;
1189	<	const char *operprivs = "";
1236	<	const struct AccessItem *oconf = NULL;
1188	>	const unsigned int old = source_p->umodes;
1189	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1190
1191		assert(source_p->localClient->confs.head);
1239	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1192
1193		++Count.oper;
1194		SetOper(source_p);
1195
1196	<	if (oconf->modes)
1197	<	source_p->umodes |= oconf->modes;
1196	>	if (conf->modes)
1197	>	AddUMode(source_p, conf->modes);
1198		else if (ConfigFileEntry.oper_umodes)
1199	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1248	<	else
1249	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1250	<	UMODE_WALLOP|UMODE_LOCOPS);
1199	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1200
1201	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1201	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1202		++Count.invisi;
1203	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1203	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1204		--Count.invisi;
1205
1206		assert(dlinkFind(&oper_list, source_p) == NULL);
1207		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1208
1209	<	operprivs = oper_privs_as_string(oconf->port);
1209	>	AddOFlag(source_p, conf->port);
1210
1211	<	SetOFlag(source_p, oconf->port);
1211	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1212	>	AddUMode(source_p, UMODE_ADMIN);
1213	>	if (!HasOFlag(source_p, OPER_FLAG_N))
1214	>	DelUMode(source_p, UMODE_NCHANGE);
1215
1216	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1217	<	source_p->umodes |= UMODE_ADMIN;
1266	<	if (!IsOperN(source_p))
1267	<	source_p->umodes &= ~UMODE_NCHANGE;
1268	<
1269	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1270	<	source_p->name, source_p->username, source_p->host);
1216	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1217	>	get_oper_name(source_p));
1218		send_umode_out(source_p, source_p, old);
1219		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1273	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1274	–	me.name, source_p->name, operprivs);
1275	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1220		}
1221
1222		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1280 | Line 1224 | static char new_uid[TOTALSIDUID + 1];
1224		int
1225		valid_sid(const char *sid)
1226		{
1283	–
1227		if (strlen(sid) == IRC_MAXSID)
1228		if (IsDigit(*sid))
1229		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1305 | Line 1248 | init_uid(void)
1248
1249		memset(new_uid, 0, sizeof(new_uid));
1250
1251	<	if (ServerInfo.sid != NULL)
1309	<	{
1251	>	if (!EmptyString(ServerInfo.sid))
1252		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1311	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1253
1254	<	hash_add_id(&me);
1314	<	}
1315	<
1316	<	for (i = 0; i < IRC_MAXSID; i++)
1254	>	for (i = 0; i < IRC_MAXSID; ++i)
1255		if (new_uid[i] == '\0')
1256		new_uid[i] = 'A';
1257
#	Line 1326 | Line 1264 | init_uid(void)
1264
1265		entering_umode_cb = register_callback("entering_umode", NULL);
1266		umode_cb = register_callback("changing_umode", change_simple_umode);
1329	–	uid_get_cb = register_callback("uid_get", uid_get);
1267		}
1268
1269		/*
#	Line 1369 | Line 1306 | add_one_to_uid(int i)
1306		* output       - new UID is returned to caller
1307		* side effects - new_uid is incremented by one.
1308		*/
1309	<	static void *
1310	<	uid_get(va_list args)
1309	>	static const char *
1310	>	uid_get(void)
1311		{
1312		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1313		return new_uid;
#	Line 1393 | Line 1330 | init_isupport(void)
1330		add_isupport("DEAF", "D", -1);
1331		add_isupport("KICKLEN", NULL, KICKLEN);
1332		add_isupport("MODES", NULL, MAXMODEPARAMS);
1396	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1333		#ifdef HALFOPS
1334		add_isupport("PREFIX", "(ohv)@%+", -1);
1335		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1401 | Line 1337 | init_isupport(void)
1337		add_isupport("PREFIX", "(ov)@+", -1);
1338		add_isupport("STATUSMSG", "@+", -1);
1339		#endif
1404	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1340		}
1341
1342		/*
#	Line 1436 | Line 1371 | add_isupport(const char *name, const cha
1371		dlinkAddTail(support, &support->node, &support_list);
1372		}
1373
1374	<	DupString(support->name, name);
1374	>	support->name = xstrdup(name);
1375		if (options != NULL)
1376	<	DupString(support->options, options);
1376	>	support->options = xstrdup(options);
1377		support->number = n;
1378
1379		rebuild_isupport_message_line();
#	Line 1497 | Line 1432 | rebuild_isupport_message_line(void)
1432		{
1433		struct Isupport *support = ptr->data;
1434
1435	<	p += (n = ircsprintf(p, "%s", support->name));
1435	>	p += (n = sprintf(p, "%s", support->name));
1436		len += n;
1437
1438		if (support->options != NULL)
1439		{
1440	<	p += (n = ircsprintf(p, "=%s", support->options));
1440	>	p += (n = sprintf(p, "=%s", support->options));
1441		len += n;
1442		}
1443
1444		if (support->number > 0)
1445		{
1446	<	p += (n = ircsprintf(p, "=%d", support->number));
1446	>	p += (n = sprintf(p, "=%d", support->number));
1447		len += n;
1448		}
1449

Diff Legend

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