ViewVC Help

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

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

Comparing:
ircd-hybrid/src/s_user.c (file contents), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid-8/src/s_user.c (file contents), Revision 1165 by michael, Thu Aug 11 18:56:53 2011 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"
#	Line 35 | Line 35
35		#include "irc_string.h"
36		#include "sprintf_irc.h"
37		#include "s_bsd.h"
38	–	#include "irc_getnameinfo.h"
38		#include "ircd.h"
40	–	#include "list.h"
39		#include "listener.h"
40		#include "motd.h"
41		#include "numeric.h"
42		#include "s_conf.h"
43		#include "s_log.h"
44		#include "s_serv.h"
47	–	#include "s_stats.h"
45		#include "send.h"
46		#include "supported.h"
47		#include "whowas.h"
48		#include "memory.h"
49		#include "packet.h"
50	+	#include "rng_mt.h"
51		#include "userhost.h"
52		#include "hook.h"
53		#include "s_misc.h"
54		#include "msg.h"
55	<	#include "pcre.h"
55	>	#include "watch.h"
56	>
57
59	–	int MaxClientCount     = 1;
60	–	int MaxConnectionCount = 1;
58		struct Callback *entering_umode_cb = NULL;
59		struct Callback *umode_cb = NULL;
63	–	struct Callback *uid_get_cb = NULL;
60
61		static char umode_buffer[IRCD_BUFSIZE];
62
63		static void user_welcome(struct Client *);
64		static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
65		static int check_xline(struct Client *);
66	<	static int check_regexp_xline(struct Client *);
67	<	static void introduce_client(struct Client *, struct Client *);
72	<	static void *uid_get(va_list);
66	>	static void introduce_client(struct Client *);
67	>	static const char *uid_get(void);
68
69		/* Used for building up the isupport string,
70		* used with init_isupport, add_isupport, delete_isupport
#	Line 96 | Line 91 | unsigned int user_modes[256] =
91		0,                  /* @ */
92		0,                  /* A */
93		0,                  /* B */
94	<	0,                  /* C */
94	>	UMODE_CCONN_FULL,   /* C */
95		UMODE_DEAF,         /* D */
96		0,                  /* E */
97		0,                  /* F */
#	Line 131 | Line 126 | unsigned int user_modes[256] =
126		UMODE_CALLERID,     /* g */
127		0,                  /* h */
128		UMODE_INVISIBLE,    /* i */
129	<	0,                  /* j */
129	>	UMODE_REJ,          /* j */
130		UMODE_SKILL,        /* k */
131		UMODE_LOCOPS,       /* l */
132		0,                  /* m */
#	Line 139 | Line 134 | unsigned int user_modes[256] =
134		UMODE_OPER,         /* o */
135		0,                  /* p */
136		0,                  /* q */
137	<	UMODE_REJ,          /* r */
137	>	UMODE_REGISTERED,   /* r */
138		UMODE_SERVNOTICE,   /* s */
139		0,                  /* t */
140		UMODE_UNAUTH,       /* u */
#	Line 166 | Line 161 | assemble_umode_buffer(void)
161		unsigned int idx = 0;
162		char *umode_buffer_ptr = umode_buffer;
163
164	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
164	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
165		if (user_modes[idx])
166		*umode_buffer_ptr++ = idx;
167
#	Line 201 | Line 196 | show_lusers(struct Client *source_p)
196		Count.invisi, dlink_list_length(&global_serv_list));
197		else
198		sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
199	<	(Count.total-Count.invisi), Count.invisi, 1);
199	>	(Count.total-Count.invisi), Count.invisi, 1);
200
201		if (Count.oper > 0)
202		sendto_one(source_p, form_str(RPL_LUSEROP),
203	<	from, to, Count.oper);
203	>	from, to, Count.oper);
204
205		if (dlink_list_length(&unknown_list) > 0)
206		sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
207	<	from, to, dlink_list_length(&unknown_list));
207	>	from, to, dlink_list_length(&unknown_list));
208
209		if (dlink_list_length(&global_channel_list) > 0)
210		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
211	<	from, to,
217	<	dlink_list_length(&global_channel_list));
211	>	from, to, dlink_list_length(&global_channel_list));
212
213		if (!ConfigServerHide.hide_servers || IsOper(source_p))
214		{
215		sendto_one(source_p, form_str(RPL_LUSERME),
216	<	from, to,
223	<	Count.local, Count.myserver);
216	>	from, to, Count.local, Count.myserver);
217		sendto_one(source_p, form_str(RPL_LOCALUSERS),
218	<	from, to, Count.local, Count.max_loc,
219	<	Count.local, Count.max_loc);
218	>	from, to, Count.local, Count.max_loc,
219	>	Count.local, Count.max_loc);
220		}
221		else
222		{
223		sendto_one(source_p, form_str(RPL_LUSERME),
224	<	from, to, Count.total, 0);
224	>	from, to, Count.total, 0);
225		sendto_one(source_p, form_str(RPL_LOCALUSERS),
226	<	from, to, Count.total, Count.max_tot,
226	>	from, to, Count.total, Count.max_tot,
227		Count.total, Count.max_tot);
228		}
229
#	Line 240 | Line 233 | show_lusers(struct Client *source_p)
233
234		if (!ConfigServerHide.hide_servers || IsOper(source_p))
235		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
236	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
236	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
237
238	<	if (Count.local > MaxClientCount)
239	<	MaxClientCount = Count.local;
238	>	if (Count.local > Count.max_loc_cli)
239	>	Count.max_loc_cli = Count.local;
240
241	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
242	<	MaxConnectionCount = Count.local + Count.myserver;
241	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
242	>	Count.max_loc_con = Count.local + Count.myserver;
243		}
244
245		/* show_isupport()
#	Line 285 | Line 278 | show_isupport(struct Client *source_p)
278		**         nick from local user or kill him/her...
279		*/
280		void
281	<	register_local_user(struct Client *client_p, struct Client *source_p,
289	<	const char *nick, const char *username)
281	>	register_local_user(struct Client *source_p)
282		{
283	+	const char *id = NULL;
284		const struct AccessItem *aconf = NULL;
285	<	char ipaddr[HOSTIPLEN];
293	<	dlink_node *ptr;
294	<	dlink_node *m;
285	>	dlink_node *ptr = NULL;
286
287		assert(source_p != NULL);
288	+	assert(source_p == source_p->from);
289		assert(MyConnect(source_p));
290	<	assert(source_p->username != username);
290	>	assert(!source_p->localClient->registration);
291	>
292	>	ClearCap(source_p, CAP_TS6);
293
294		if (ConfigFileEntry.ping_cookie)
295		{
296	<	if (!IsPingSent(source_p) &&
303	<	source_p->localClient->random_ping == 0)
296	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
297		{
298	<	source_p->localClient->random_ping = (unsigned long)rand();
299	<	sendto_one(source_p, "PING :%lu",
298	>	do
299	>	source_p->localClient->random_ping = genrand_int32();
300	>	while (!source_p->localClient->random_ping);
301	>
302	>	sendto_one(source_p, "PING :%u",
303		source_p->localClient->random_ping);
304		SetPingSent(source_p);
305		return;
#	Line 317 | Line 313 | register_local_user(struct Client *clien
313		/* Straight up the maximum rate of flooding... */
314		source_p->localClient->allow_read = MAX_FLOOD_BURST;
315
316	<	if (!execute_callback(client_check_cb, source_p, username))
316	>	if (!execute_callback(client_check_cb, source_p, source_p->username))
317		return;
318
319		if (valid_hostname(source_p->host) == 0)
#	Line 333 | Line 329 | register_local_user(struct Client *clien
329
330		if (!IsGotId(source_p))
331		{
332	<	const char *p = NULL;
332	>	char username[USERLEN + 1];
333	>	const char *p = username;
334		unsigned int i = 0;
335
336		if (IsNeedIdentd(aconf))
337		{
338	<	ServerStats->is_ref++;
338	>	++ServerStats.is_ref;
339		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
340		"identd to use this server", me.name, source_p->name);
341		exit_client(source_p, &me, "Install identd");
342		return;
343		}
344
345	<	p = username;
345	>	strlcpy(username, source_p->username, sizeof(username));
346
347		if (!IsNoTilde(aconf))
348		source_p->username[i++] = '~';
349
350	<	while (*p && i < USERLEN)
354	<	{
350	>	for (; *p && i < USERLEN; ++p)
351		if (*p != '[')
352		source_p->username[i++] = *p;
357	–	p++;
358	–	}
353
354		source_p->username[i] = '\0';
355		}
#	Line 367 | Line 361 | register_local_user(struct Client *clien
361
362		if (!match_conf_password(pass, aconf))
363		{
364	<	ServerStats->is_ref++;
364	>	++ServerStats.is_ref;
365		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
366		me.name, source_p->name);
367		exit_client(source_p, &me, "Bad Password");
#	Line 383 | Line 377 | register_local_user(struct Client *clien
377		/* report if user has &^>= etc. and set flags as needed in source_p */
378		report_and_set_user_flags(source_p, aconf);
379
380	+	if (IsDead(source_p))
381	+	return;
382	+
383		/* Limit clients -
384		* We want to be able to have servers and F-line clients
385		* connect, so save room for "buffer" connections.
#	Line 396 | Line 393 | register_local_user(struct Client *clien
393		{
394		sendto_realops_flags(UMODE_FULL, L_ALL,
395		"Too many clients, rejecting %s[%s].",
396	<	nick, source_p->host);
397	<	ServerStats->is_ref++;
396	>	source_p->name, source_p->host);
397	>	++ServerStats.is_ref;
398		exit_client(source_p, &me, "Sorry, server is full - try later");
399		return;
400		}
#	Line 408 | Line 405 | register_local_user(struct Client *clien
405		char tmpstr2[IRCD_BUFSIZE];
406
407		sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
408	<	nick, source_p->username, source_p->host);
409	<	ServerStats->is_ref++;
410	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
408	>	source_p->name, source_p->username, source_p->host);
409	>	++ServerStats.is_ref;
410	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
411	>	source_p->username);
412		exit_client(source_p, &me, tmpstr2);
413		return;
414		}
415
416	<	assert(source_p == client_p);
419	<
420	<	/* end of valid user name check */
421	<	if (check_xline(source_p) || check_regexp_xline(source_p))
422	<	return;
423	<
424	<	if (IsDead(client_p))
416	>	if (check_xline(source_p))
417		return;
418
419	<	if (source_p->id[0] == '\0' && me.id[0])
420	<	{
429	<	char *id = (char *) execute_callback(uid_get_cb, source_p);
430	<	while (hash_find_id(id) != NULL)
431	<	id = uid_get(NULL);
419	>	while (hash_find_id((id = uid_get())) != NULL)
420	>	;
421
422	<	strlcpy(source_p->id, id, sizeof(source_p->id));
423	<	hash_add_id(source_p);
435	<	}
436	<
437	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
438	<	source_p->localClient->ip.ss_len, ipaddr,
439	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
422	>	strlcpy(source_p->id, id, sizeof(source_p->id));
423	>	hash_add_id(source_p);
424
425		sendto_realops_flags(UMODE_CCONN, L_ALL,
426	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
427	<	nick, source_p->username, source_p->host,
426	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
427	>	source_p->name, source_p->username, source_p->host,
428	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
429	>	"255.255.255.255" : source_p->sockhost,
430	>	get_client_class(source_p),
431	>	source_p->info, source_p->id);
432	>
433	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
434	>	"CLICONN %s %s %s %s %s %s %s 0 %s",
435	>	source_p->name, source_p->username, source_p->host,
436		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
437	>	"255.255.255.255" : source_p->sockhost,
438	>	get_client_class(source_p),
439	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	>	"<hidden>" : source_p->localClient->client_host,
441	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	>	"<hidden>" : source_p->localClient->client_server,
443		source_p->info);
444
448	–	/* If they have died in send_* don't do anything. */
449	–	if (IsDead(source_p))
450	–	return;
445
446		if (ConfigFileEntry.invisible_on_connect)
447	+	{
448		source_p->umodes |= UMODE_INVISIBLE;
449	<	Count.invisi++;
449	>	++Count.invisi;
450	>	}
451
452		if ((++Count.local) > Count.max_loc)
453		{
#	Line 462 | Line 458 | register_local_user(struct Client *clien
458		Count.max_loc);
459		}
460
465	–	SetClient(source_p);
466	–
467	–	source_p->servptr = &me;
468	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
469	–
461		/* Increment our total user count here */
462		if (++Count.total > Count.max_tot)
463		Count.max_tot = Count.total;
464	<	Count.totalrestartcount++;
464	>	++Count.totalrestartcount;
465	>
466	>	assert(source_p->servptr == &me);
467	>	SetClient(source_p);
468	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
469
470		source_p->localClient->allow_read = MAX_FLOOD_BURST;
471
472	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
473	<	{
474	<	free_dlink_node(m);
475	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
481	<	}
482	<	else assert(0);
472	>	assert(dlinkFind(&unknown_list, source_p));
473	>
474	>	dlink_move_node(&source_p->localClient->lclient_node,
475	>	&unknown_list, &local_client_list);
476
477		user_welcome(source_p);
478		add_user_host(source_p->username, source_p->host, 0);
479		SetUserHost(source_p);
480
481	<	introduce_client(client_p, source_p);
481	>	introduce_client(source_p);
482		}
483
484		/* register_remote_user()
485		*
486	<	* inputs       - client_p directly connected client
494	<	*              - source_p remote or directly connected client
486	>	* inputs       - source_p remote or directly connected client
487		*              - username to register as
488		*              - host name to register as
489		*              - server name
#	Line 501 | Line 493 | register_local_user(struct Client *clien
493		*                is introduced by a server.
494		*/
495		void
496	<	register_remote_user(struct Client *client_p, struct Client *source_p,
497	<	const char *username, const char *host, const char *server,
498	<	const char *realname)
496	>	register_remote_user(struct Client *source_p,
497	>	const char *username, const char *host, const char *server,
498	>	const char *realname)
499		{
500	<	struct Client *target_p;
500	>	struct Client *target_p = NULL;
501
502		assert(source_p != NULL);
503		assert(source_p->username != username);
504
505		strlcpy(source_p->host, host, sizeof(source_p->host));
514	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
506		strlcpy(source_p->username, username, sizeof(source_p->username));
507
517	–	/* Increment our total user count here */
518	–	if (++Count.total > Count.max_tot)
519	–	Count.max_tot = Count.total;
520	–
521	–	source_p->from->serv->dep_users++;
522	–
508		/*
509		* coming from another server, take the servers word for it
510		*/
#	Line 535 | Line 520 | register_remote_user(struct Client *clie
520		"No server %s for user %s[%s@%s] from %s",
521		server, source_p->name, source_p->username,
522		source_p->host, source_p->from->name);
523	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
523	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
524
540	–	/* XXX */
525		SetKilled(source_p);
526		exit_client(source_p, &me, "Ghosted Client");
527		return;
#	Line 547 | Line 531 | register_remote_user(struct Client *clie
531		{
532		sendto_realops_flags(UMODE_DEBUG, L_ALL,
533		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
534	<	client_p->name, source_p->name, source_p->username,
534	>	source_p->from->name, source_p->name, source_p->username,
535		source_p->host, source_p->servptr->name,
536		target_p->name, target_p->from->name);
537	<	kill_client(client_p, source_p,
537	>	kill_client(source_p->from, source_p,
538		"%s (NICK from wrong direction (%s != %s))",
539		me.name, source_p->servptr->name, target_p->from->name);
540		SetKilled(source_p);
#	Line 558 | Line 542 | register_remote_user(struct Client *clie
542		return;
543		}
544
545	+	/* Increment our total user count here */
546	+	if (++Count.total > Count.max_tot)
547	+	Count.max_tot = Count.total;
548	+
549		SetClient(source_p);
550	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
550	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
551		add_user_host(source_p->username, source_p->host, 1);
552		SetUserHost(source_p);
553
554	<	introduce_client(client_p, source_p);
554	>	introduce_client(source_p);
555		}
556
557		/* introduce_client()
558		*
559	<	* inputs       - client_p
572	<	*              - source_p
559	>	* inputs       - source_p
560		* output       - NONE
561		* side effects - This common function introduces a client to the rest
562		*                of the net, either from a local client connect or
563		*                from a remote connect.
564		*/
565		static void
566	<	introduce_client(struct Client *client_p, struct Client *source_p)
566	>	introduce_client(struct Client *source_p)
567		{
568	<	dlink_node *server_node;
568	>	dlink_node *server_node = NULL;
569		static char ubuf[12];
570
571		if (MyClient(source_p))
#	Line 586 | Line 573 | introduce_client(struct Client *client_p
573		else
574		send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
575
576	+	watch_check_hash(source_p, RPL_LOGON);
577	+
578		if (*ubuf == '\0')
579		{
580		ubuf[0] = '+';
581		ubuf[1] = '\0';
582		}
583
584	<	/* arghhh one could try not introducing new nicks to ll leafs
585	<	* but then you have to introduce them "on the fly" in SJOIN
586	<	* not fun.
598	<	* Its not going to cost much more bandwidth to simply let new
599	<	* nicks just ride on through.
600	<	*/
584	>	DLINK_FOREACH(server_node, serv_list.head)
585	>	{
586	>	struct Client *server = server_node->data;
587
588	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
589	<	* you _need_ to if you aren't going to burst everyone initially.
604	<	*
605	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
606	<	* in that case just send it to the uplink.
607	<	* -davidt
608	<	* rewritten to cope with SIDs .. eww eww eww --is
609	<	*/
588	>	if (server == source_p->from)
589	>	continue;
590
591	<	/* XXX THESE NEED A PREFIX!?!?!? */
592	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
613	<	client_p != uplink)
614	<	{
615	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
616	<	{
617	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
591	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
592	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
593		source_p->servptr->id,
594		source_p->name, source_p->hopcount+1,
595	<	(unsigned long)source_p->tsinfo,
595	>	(unsigned long)source_p->tsinfo,
596		ubuf, source_p->username, source_p->host,
597	<	((MyClient(source_p) && !IsIPSpoof(source_p)) ?
598	<	source_p->sockhost : "0"),
624	<	source_p->id, source_p->info);
625	<	}
597	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
598	>	"0" : source_p->sockhost, source_p->id, source_p->info);
599		else
600	<	{
628	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
600	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
601		source_p->name, source_p->hopcount+1,
602	<	(unsigned long)source_p->tsinfo,
602	>	(unsigned long)source_p->tsinfo,
603		ubuf, source_p->username, source_p->host,
604	<	source_p->servptr->name,
633	<	source_p->info);
634	<	}
635	<	}
636	<	else
637	<	{
638	<	DLINK_FOREACH(server_node, serv_list.head)
639	<	{
640	<	struct Client *server = server_node->data;
641	<
642	<	if (IsCapable(server, CAP_LL) || server == client_p)
643	<	continue;
644	<
645	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
646	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
647	<	source_p->servptr->id,
648	<	source_p->name, source_p->hopcount+1,
649	<	(unsigned long)source_p->tsinfo,
650	<	ubuf, source_p->username, source_p->host,
651	<	((MyClient(source_p)&&!IsIPSpoof(source_p))?source_p->sockhost:"0"),
652	<	source_p->id, source_p->info);
653	<	else
654	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
655	<	source_p->name, source_p->hopcount+1,
656	<	(unsigned long)source_p->tsinfo,
657	<	ubuf, source_p->username, source_p->host,
658	<	source_p->servptr->name,
659	<	source_p->info);
660	<	}
604	>	source_p->servptr->name, source_p->info);
605		}
606		}
607
#	Line 677 | Line 621 | valid_hostname(const char *hostname)
621
622		assert(p != NULL);
623
624	<	if (('.' == *p) || (':' == *p))
625	<	return (0);
624	>	if (*p == '.' || *p == ':')
625	>	return 0;
626
627	<	while (*p)
684	<	{
627	>	for (; *p; ++p)
628		if (!IsHostChar(*p))
629	<	return (0);
687	<	p++;
688	<	}
629	>	return 0;
630
631	<	return (1);
631	>	return 1;
632		}
633
634		/* valid_username()
#	Line 709 | Line 650 | valid_username(const char *username)
650
651		assert(p != NULL);
652
653	<	if ('~' == *p)
653	>	if (*p == '~')
654		++p;
655
656		/* reject usernames that don't start with an alphanum
#	Line 717 | Line 658 | valid_username(const char *username)
658		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
659		*/
660		if (!IsAlNum(*p))
661	<	return (0);
661	>	return 0;
662
663		while (*++p)
664		{
665		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
666		{
667	<	dots++;
668	<
669	<	if (dots > ConfigFileEntry.dots_in_ident)
670	<	return (0);
730	<	if (!IsUserChar(p[1]))
731	<	return (0);
667	>	if (++dots > ConfigFileEntry.dots_in_ident)
668	>	return 0;
669	>	if (!IsUserChar(*(p + 1)))
670	>	return 0;
671		}
672		else if (!IsUserChar(*p))
673	<	return (0);
673	>	return 0;
674		}
675
676	<	return (1);
676	>	return 1;
677	>	}
678	>
679	>	/* clean_nick_name()
680	>	*
681	>	* input        - nickname
682	>	*              - whether it's a local nick (1) or remote (0)
683	>	* output       - none
684	>	* side effects - walks through the nickname, returning 0 if erroneous
685	>	*/
686	>	int
687	>	valid_nickname(const char *nickname, const int local)
688	>	{
689	>	const char *p = nickname;
690	>	assert(nickname && *nickname);
691	>
692	>	/* nicks can't start with a digit or - or be 0 length */
693	>	/* This closer duplicates behaviour of hybrid-6 */
694	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
695	>	return 0;
696	>
697	>	for (; *p; ++p)
698	>	if (!IsNickChar(*p))
699	>	return 0;
700	>
701	>	return p - nickname <= (NICKLEN - 1);
702		}
703
704		/* report_and_set_user_flags()
#	Line 809 | Line 773 | report_and_set_user_flags(struct Client
773		}
774		}
775
812	–	/* do_local_user()
813	–	*
814	–	* inputs       -
815	–	* output       - NONE
816	–	* side effects -
817	–	*/
818	–	void
819	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
820	–	const char *username, const char *host, const char *server,
821	–	const char *realname)
822	–	{
823	–	assert(source_p != NULL);
824	–	assert(source_p->username != username);
825	–
826	–	if (source_p == NULL)
827	–	return;
828	–
829	–	if (!IsUnknown(source_p))
830	–	{
831	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
832	–	me.name, nick);
833	–	return;
834	–	}
835	–
836	–	source_p->flags |= FLAGS_GOTUSER;
837	–
838	–	/*
839	–	* don't take the clients word for it, ever
840	–	*/
841	–	source_p->servptr = &me;
842	–
843	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
844	–
845	–	if (!IsGotId(source_p))
846	–	{
847	–	/* save the username in the client
848	–	* If you move this you'll break ping cookies..you've been warned
849	–	*/
850	–	strlcpy(source_p->username, username, sizeof(source_p->username));
851	–	}
852	–
853	–	if (source_p->name[0])
854	–	{
855	–	/* NICK already received, now I have USER... */
856	–	register_local_user(client_p, source_p, source_p->name, username);
857	–	}
858	–	}
859	–
776		/* change_simple_umode()
777		*
778		* this callback can be hooked to allow special handling of
#	Line 865 | Line 781 | do_local_user(const char *nick, struct C
781		static void *
782		change_simple_umode(va_list args)
783		{
784	+	struct Client *client_p;
785		struct Client *source_p;
786		int what;
787		unsigned int flag;
788
789	<	va_arg(args, struct Client *);
789	>	client_p = va_arg(args, struct Client *);
790		source_p = va_arg(args, struct Client *);
791		what = va_arg(args, int);
792		flag = va_arg(args, unsigned int);
#	Line 897 | Line 814 | set_user_mode(struct Client *client_p, s
814		char **p, *m, buf[IRCD_BUFSIZE];
815		struct Client *target_p;
816		int what = MODE_ADD, badflag = 0, i;
817	<	#if 0
818	<	/* already covered by m_mode */
819	<	if (parc < 2)
903	<	{
904	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
905	<	me.name, source_p->name, "MODE");
906	<	return;
907	<	}
908	<	#endif
817	>
818	>	assert(!(parc < 2));
819	>
820		if ((target_p = find_person(client_p, parv[1])) == NULL)
821		{
822		if (MyConnect(source_p))
#	Line 914 | Line 825 | set_user_mode(struct Client *client_p, s
825		return;
826		}
827
917	–	/* Dont know why these were commented out..
918	–	* put them back using new sendto() funcs
919	–	*/
828		if (IsServer(source_p))
829		{
830		sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
#	Line 924 | Line 832 | set_user_mode(struct Client *client_p, s
832		return;
833		}
834
835	<	if (source_p != target_p || target_p->from != source_p->from)
835	>	if (source_p != target_p)
836		{
837		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
838		me.name, source_p->name);
#	Line 982 | Line 890 | set_user_mode(struct Client *client_p, s
890		break;
891
892		ClearOper(source_p);
985	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
893		Count.oper--;
894
895		if (MyConnect(source_p))
#	Line 991 | Line 898 | set_user_mode(struct Client *client_p, s
898
899		detach_conf(source_p, OPER_TYPE);
900		ClearOperFlags(source_p);
901	+	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
902
903		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
904		free_dlink_node(dm);
#	Line 1002 | Line 910 | set_user_mode(struct Client *client_p, s
910		/* we may not get these,
911		* but they shouldnt be in default
912		*/
913	+	case 'r':
914		case ' ' :
915		case '\n':
916		case '\r':
#	Line 1017 | Line 926 | set_user_mode(struct Client *client_p, s
926		badflag = 1;
927		}
928		else
929	<	execute_callback(umode_cb, client_p, source_p, what, flag);
929	>	execute_callback(umode_cb, client_p, source_p, what, flag);
930		}
931		else
932		{
#	Line 1034 | Line 943 | set_user_mode(struct Client *client_p, s
943		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
944		me.name, source_p->name);
945
946	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
946	>	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
947		{
948		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
949		me.name, source_p->name);
950	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
950	>	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
951		}
952
953		if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
#	Line 1054 | Line 963 | set_user_mode(struct Client *client_p, s
963		if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
964		--Count.invisi;
965
966	<	/* compare new flags with old flags and send string which
966	>	/*
967	>	* compare new flags with old flags and send string which
968		* will cause servers to update correctly.
969		*/
970		send_umode_out(client_p, source_p, setflags);
#	Line 1063 | Line 973 | set_user_mode(struct Client *client_p, s
973		/* send_umode()
974		* send the MODE string for user (user) to connection client_p
975		* -avalon
976	+	*
977	+	* inputs       - client_p
978	+	*              - source_p
979	+	*              - int old
980	+	*              - sendmask mask of modes to send
981	+	*              - suplied umode_buf
982	+	* output       - NONE
983		*/
984		void
985		send_umode(struct Client *client_p, struct Client *source_p,
986		unsigned int old, unsigned int sendmask, char *umode_buf)
987		{
988	+	char *m = umode_buf;
989		int what = 0;
990		unsigned int i;
991		unsigned int flag;
1074	–	char *m = umode_buf;
992
993	<	/* build a string in umode_buf to represent the change in the user's
993	>	/*
994	>	* build a string in umode_buf to represent the change in the user's
995		* mode between the new (source_p->umodes) and 'old'.
996		*/
997		for (i = 0; i < 128; i++)
#	Line 1112 | Line 1030 | send_umode(struct Client *client_p, stru
1030		*m = '\0';
1031
1032		if (*umode_buf && client_p)
1033	<	sendto_one(client_p, ":%s MODE %s :%s",
1034	<	source_p->name, source_p->name, umode_buf);
1033	>	sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
1034	>	source_p->name, source_p->username,
1035	>	source_p->host, source_p->name, umode_buf);
1036		}
1037
1038		/* send_umode_out()
#	Line 1126 | Line 1045 | void
1045		send_umode_out(struct Client *client_p, struct Client *source_p,
1046		unsigned int old)
1047		{
1048	<	char buf[IRCD_BUFSIZE];
1048	>	char buf[IRCD_BUFSIZE] = { '\0' };
1049		dlink_node *ptr = NULL;
1050
1051		send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1052		SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1053
1054	<	if (*buf)
1054	>	if (buf[0])
1055		{
1056		DLINK_FOREACH(ptr, serv_list.head)
1057		{
1058		struct Client *target_p = ptr->data;
1059
1060		if ((target_p != client_p) && (target_p != source_p))
1061	<	{
1062	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1063	<	(target_p->localClient->serverMask &
1145	<	source_p->lazyLinkClientExists))
1146	<	sendto_one(target_p, ":%s MODE %s :%s",
1147	<	ID_or_name(source_p, target_p),
1148	<	ID_or_name(source_p, target_p), buf);
1149	<	}
1061	>	sendto_one(target_p, ":%s MODE %s :%s",
1062	>	ID_or_name(source_p, target_p),
1063	>	ID_or_name(source_p, target_p), buf);
1064		}
1065		}
1066
#	Line 1179 | Line 1093 | user_welcome(struct Client *source_p)
1093		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1094		ServerInfo.network_name, source_p->name);
1095		sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1096	<	get_listener_name(source_p->localClient->listener), ircd_version);
1096	>	get_listener_name(source_p->localClient->listener), ircd_version);
1097		sendto_one(source_p, form_str(RPL_CREATED),
1098	<	me.name, source_p->name, built_date);
1098	>	me.name, source_p->name, built_date);
1099		sendto_one(source_p, form_str(RPL_MYINFO),
1100		me.name, source_p->name, me.name, ircd_version, umode_buffer);
1101		show_isupport(source_p);
#	Line 1194 | Line 1108 | user_welcome(struct Client *source_p)
1108
1109		if (ConfigFileEntry.short_motd)
1110		{
1111	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1112	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1111	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1112	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1113		sendto_one(source_p,
1114	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1115	<	"read it", source_p->name);
1114	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1115	>	"read it", me.name, source_p->name);
1116		sendto_one(source_p, form_str(RPL_MOTDSTART),
1117		me.name, source_p->name, me.name);
1118		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1220 | Line 1134 | user_welcome(struct Client *source_p)
1134		static int
1135		check_xline(struct Client *source_p)
1136		{
1223	–	struct ConfItem *conf;
1224	–	struct MatchItem *xconf;
1225	–	const char *reason;
1226	–
1227	–	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info,
1228	–	NULL, NULL, 0)) != NULL)
1229	–	{
1230	–	xconf = map_to_conf(conf);
1231	–	xconf->count++;
1232	–
1233	–	if (xconf->reason != NULL)
1234	–	reason = xconf->reason;
1235	–	else
1236	–	reason = "No Reason";
1237	–
1238	–	sendto_realops_flags(UMODE_REJ, L_ALL,
1239	–	"X-line Rejecting [%s] [%s], user %s [%s]",
1240	–	source_p->info, reason,
1241	–	get_client_name(source_p, HIDE_IP),
1242	–	source_p->sockhost);
1243	–
1244	–	ServerStats->is_ref++;
1245	–	if(REJECT_HOLD_TIME > 0)
1246	–	{
1247	–	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1248	–	me.name, source_p->name);
1249	–	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1250	–	SetCaptured(source_p);
1251	–	}
1252	–	else
1253	–	exit_client(source_p, &me, "Bad user info");
1254	–	return 1;
1255	–	}
1256	–
1257	–	return 0;
1258	–	}
1259	–
1260	–	static int
1261	–	check_regexp_xline(struct Client *source_p)
1262	–	{
1137		struct ConfItem *conf = NULL;
1138		const char *reason = NULL;
1139
1140	<	if ((conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1140	>	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1141	>	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1142		{
1143		struct MatchItem *reg = map_to_conf(conf);
1144
#	Line 1275 | Line 1150 | check_regexp_xline(struct Client *source
1150		reason = "No Reason";
1151
1152		sendto_realops_flags(UMODE_REJ, L_ALL,
1153	<	"X-line (REGEX) Rejecting [%s] [%s], user %s [%s]",
1153	>	"X-line Rejecting [%s] [%s], user %s [%s]",
1154		source_p->info, reason,
1155		get_client_name(source_p, HIDE_IP),
1156		source_p->sockhost);
1157
1158	<	ServerStats->is_ref++;
1159	<	exit_client(source_p, &me, "Bad user info");
1158	>	++ServerStats.is_ref;
1159	>	if (REJECT_HOLD_TIME > 0)
1160	>	{
1161	>	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1162	>	me.name, source_p->name);
1163	>	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1164	>	SetCaptured(source_p);
1165	>	}
1166	>	else
1167	>	exit_client(source_p, &me, "Bad user info");
1168		return 1;
1169		}
1170
#	Line 1301 | Line 1184 | oper_up(struct Client *source_p)
1184		{
1185		unsigned int old = source_p->umodes;
1186		const char *operprivs = "";
1187	<	struct AccessItem *oconf;
1187	>	const struct AccessItem *oconf = NULL;
1188
1189	+	assert(source_p->localClient->confs.head);
1190	+	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1191	+
1192	+	++Count.oper;
1193		SetOper(source_p);
1194
1195	<	if (ConfigFileEntry.oper_umodes)
1195	>	if (oconf->modes)
1196	>	source_p->umodes |= oconf->modes;
1197	>	else if (ConfigFileEntry.oper_umodes)
1198		source_p->umodes |= ConfigFileEntry.oper_umodes;
1199		else
1200		source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1201	<	UMODE_WALLOP|UMODE_LOCOPS);
1201	>	UMODE_WALLOP|UMODE_LOCOPS);
1202
1203	<	Count.oper++;
1203	>	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1204	>	++Count.invisi;
1205	>	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1206	>	--Count.invisi;
1207
1208		assert(dlinkFind(&oper_list, source_p) == NULL);
1209		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1210
1319	–	assert(source_p->localClient->confs.head);
1320	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1211		operprivs = oper_privs_as_string(oconf->port);
1212
1213		SetOFlag(source_p, oconf->port);
1214
1215		if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1216	<	source_p->umodes |= UMODE_ADMIN;
1216	>	AddUMode(source_p, UMODE_ADMIN);
1217		if (!IsOperN(source_p))
1218	<	source_p->umodes &= ~UMODE_NCHANGE;
1218	>	DelUMode(source_p, UMODE_NCHANGE);
1219
1220		sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1221		source_p->name, source_p->username, source_p->host);
#	Line 1336 | Line 1226 | oper_up(struct Client *source_p)
1226		send_message_file(source_p, &ConfigFileEntry.opermotd);
1227		}
1228
1229	<	/*
1340	<	* Quick and dirty UID code for new proposed SID on EFnet
1341	<	*
1342	<	*/
1229	>	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1230
1231	<	static char new_uid[TOTALSIDUID+1];     /* allow for \0 */
1232	<	static void add_one_to_uid(int i);
1231	>	int
1232	>	valid_sid(const char *sid)
1233	>	{
1234	>	if (strlen(sid) == IRC_MAXSID)
1235	>	if (IsDigit(*sid))
1236	>	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1237	>	return 1;
1238	>
1239	>	return 0;
1240	>	}
1241
1242		/*
1243		* init_uid()
#	Line 1360 | Line 1255 | init_uid(void)
1255
1256		memset(new_uid, 0, sizeof(new_uid));
1257
1258	<	if (ServerInfo.sid != NULL)
1259	<	{
1365	<	memcpy(new_uid, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1366	<	IRC_MAXSID));
1367	<	memcpy(&me.id, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1368	<	IRC_MAXSID));
1369	<	hash_add_id(&me);
1370	<	}
1258	>	if (!EmptyString(ServerInfo.sid))
1259	>	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1260
1261	<	for (i = 0; i < IRC_MAXSID; i++)
1261	>	for (i = 0; i < IRC_MAXSID; ++i)
1262		if (new_uid[i] == '\0')
1263		new_uid[i] = 'A';
1264
1265	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1265	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1266		/* Yes nenolod, I have known it was off by one ever since I wrote it
1267		* But *JUST* for you, though, it really doesn't look as *pretty*
1268		* -Dianora
1269		*/
1270	<	memcpy(new_uid+IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1270	>	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1271
1272		entering_umode_cb = register_callback("entering_umode", NULL);
1273		umode_cb = register_callback("changing_umode", change_simple_umode);
1385	–	uid_get_cb = register_callback("uid_get", uid_get);
1386	–	}
1387	–
1388	–	/*
1389	–	* uid_get
1390	–	*
1391	–	* inputs       - struct Client *
1392	–	* output       - new UID is returned to caller
1393	–	* side effects - new_uid is incremented by one.
1394	–	*/
1395	–	static void *
1396	–	uid_get(va_list args)
1397	–	{
1398	–	add_one_to_uid(TOTALSIDUID-1);        /* index from 0 */
1399	–	return ((void *) new_uid);
1274		}
1275
1276		/*
#	Line 1410 | Line 1284 | uid_get(va_list args)
1284		static void
1285		add_one_to_uid(int i)
1286		{
1287	<	if (i != IRC_MAXSID)          /* Not reached server SID portion yet? */
1287	>	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1288		{
1289		if (new_uid[i] == 'Z')
1290		new_uid[i] = '0';
#	Line 1419 | Line 1293 | add_one_to_uid(int i)
1293		new_uid[i] = 'A';
1294		add_one_to_uid(i-1);
1295		}
1296	<	else new_uid[i] = new_uid[i] + 1;
1296	>	else
1297	>	++new_uid[i];
1298		}
1299		else
1300		{
1301	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1301	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1302		if (new_uid[i] == 'Z')
1303	<	memcpy(new_uid+IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1303	>	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1304		else
1305	<	new_uid[i] = new_uid[i] + 1;
1305	>	++new_uid[i];
1306		}
1307		}
1308
1309		/*
1310	+	* uid_get
1311	+	*
1312	+	* inputs       - struct Client *
1313	+	* output       - new UID is returned to caller
1314	+	* side effects - new_uid is incremented by one.
1315	+	*/
1316	+	static const char *
1317	+	uid_get(void)
1318	+	{
1319	+	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1320	+	return new_uid;
1321	+	}
1322	+
1323	+	/*
1324		* init_isupport()
1325		*
1326		* input        - NONE
#	Line 1445 | Line 1334 | init_isupport(void)
1334
1335		add_isupport("CALLERID", NULL, -1);
1336		add_isupport("CASEMAPPING", CASEMAP, -1);
1337	+	add_isupport("DEAF", "D", -1);
1338		add_isupport("KICKLEN", NULL, KICKLEN);
1339		add_isupport("MODES", NULL, MAXMODEPARAMS);
1340		add_isupport("NICKLEN", NULL, NICKLEN-1);
#	Line 1573 | Line 1463 | rebuild_isupport_message_line(void)
1463		if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1464		{ /* arbritrary for now */
1465		if (*--p == ' ')
1466	<	*p = '\0';
1466	>	*p = '\0';
1467
1468		addto_MessageLine(isupportFile, isupportbuffer);
1469		p = isupportbuffer;

Comparing:
ircd-hybrid/src/s_user.c (property svn:keywords), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid-8/src/s_user.c (property svn:keywords), Revision 1165 by michael, Thu Aug 11 18:56:53 2011 UTC

#	Line 1 | Line 1
1	<	"Id Revision"
1	>	Id Revision

Diff Legend

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