ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3135 by michael, Mon Mar 10 21:11:25 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4209 by michael, Sat Jul 12 18:15:19 2014 UTC

#	Line 26 | Line 26
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
30	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
#	Line 39 | Line 38
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
54	–
55	–	static void user_welcome(struct Client *);
56	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
57	–	static int check_xline(struct Client *);
58	–	static void introduce_client(struct Client *);
52		static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
64	–
57		struct Isupport
58		{
59		dlink_node node;
#	Line 124 | Line 116 | const unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121		UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
#	Line 134 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
127		UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 171 | Line 163 | show_lusers(struct Client *source_p)
163		{
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165		sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
166	<	Count.invisi, dlink_list_length(&global_serv_list));
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168		sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	<	(Count.total-Count.invisi), Count.invisi, 1);
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170
171	<	if (Count.oper > 0)
171	>	if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173
174	<	if (dlink_list_length(&unknown_list) > 0)
174	>	if (dlink_list_length(&unknown_list))
175		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176
177	<	if (dlink_list_length(&global_channel_list) > 0)
178	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
#	Line 224 | Line 216 | show_isupport(struct Client *source_p)
216		sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
219	>
220	>	/* report_and_set_user_flags()
221	>	*
222	>	* inputs       - pointer to source_p
223	>	*              - pointer to conf for this user
224	>	* output       - NONE
225	>	* side effects - Report to user any special flags
226	>	*                they are getting, and set them.
227	>	*/
228	>	static void
229	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
230	>	{
231	>	/* If this user is being spoofed, tell them so */
232	>	if (IsConfDoSpoofIp(conf))
233	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234	>
235	>	/* If this user is in the exception class, Set it "E lined" */
236	>	if (IsConfExemptKline(conf))
237	>	{
238	>	SetExemptKline(source_p);
239	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
240	>	}
241	>
242	>	/*
243	>	* The else here is to make sure that G line exempt users
244	>	* do not get noticed twice.
245	>	*/
246	>	else if (IsConfExemptGline(conf))
247	>	{
248	>	SetExemptGline(source_p);
249	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
250	>	}
251	>
252	>	if (IsConfExemptResv(conf))
253	>	{
254	>	SetExemptResv(source_p);
255	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
256	>	}
257	>
258	>	/* If this user is exempt from user limits set it "F lined" */
259	>	if (IsConfExemptLimits(conf))
260	>	{
261	>	SetExemptLimits(source_p);
262	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
263	>	}
264	>
265	>	if (IsConfCanFlood(conf))
266	>	{
267	>	SetCanFlood(source_p);
268	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	>	"protection, aren't you fearsome.");
270	>	}
271	>	}
272	>
273	>	/* introduce_client()
274	>	*
275	>	* inputs       - source_p
276	>	* output       - NONE
277	>	* side effects - This common function introduces a client to the rest
278	>	*                of the net, either from a local client connect or
279	>	*                from a remote connect.
280	>	*/
281	>	static void
282	>	introduce_client(struct Client *source_p)
283	>	{
284	>	dlink_node *ptr = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(ptr, serv_list.head)
301	>	{
302	>	struct Client *server = ptr->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	>	"0" : source_p->sockhost, source_p->id,
315	>	source_p->svid,
316	>	source_p->info);
317	>	else
318	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
319	>	source_p->servptr->id,
320	>	source_p->name, source_p->hopcount+1,
321	>	(unsigned long)source_p->tsinfo,
322	>	ubuf, source_p->username, source_p->host,
323	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	>	"0" : source_p->sockhost, source_p->id, source_p->info);
325	>
326	>	if (!EmptyString(source_p->certfp))
327	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
328	>	}
329	>	}
330	>
331	>	/* user_welcome()
332	>	*
333	>	* inputs       - client pointer to client to welcome
334	>	* output       - NONE
335	>	* side effects -
336	>	*/
337	>	static void
338	>	user_welcome(struct Client *source_p)
339	>	{
340	>	#if defined(__TIME__) && defined(__DATE__)
341	>	static const char built_date[] = __DATE__ " at " __TIME__;
342	>	#else
343	>	static const char built_date[] = "unknown";
344	>	#endif
345	>
346	>	#ifdef HAVE_LIBCRYPTO
347	>	if (HasFlag(source_p, FLAGS_SSL))
348	>	{
349	>	AddUMode(source_p, UMODE_SSL);
350	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351	>	ssl_get_cipher(source_p->localClient->fd.ssl));
352	>	}
353	>	#endif
354	>
355	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
356	>	source_p->name);
357	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358	>	get_listener_name(source_p->localClient->listener), ircd_version);
359	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
360	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361	>	show_isupport(source_p);
362	>
363	>	if (source_p->id[0])
364	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
365	>
366	>	show_lusers(source_p);
367	>	motd_signon(source_p);
368	>	}
369	>
370	>	/* check_xline()
371	>	*
372	>	* inputs       - pointer to client to test
373	>	* outupt       - 1 if exiting 0 if ok
374	>	* side effects -
375	>	*/
376	>	static int
377	>	check_xline(struct Client *source_p)
378	>	{
379	>	struct MaskItem *conf = NULL;
380	>	const char *reason = NULL;
381	>
382	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
383	>	{
384	>	++conf->count;
385	>
386	>	if (conf->reason)
387	>	reason = conf->reason;
388	>	else
389	>	reason = CONF_NOREASON;
390	>
391	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
392	>	"X-line Rejecting [%s] [%s], user %s [%s]",
393	>	source_p->info, reason,
394	>	get_client_name(source_p, HIDE_IP),
395	>	source_p->sockhost);
396	>
397	>	++ServerStats.is_ref;
398	>	exit_client(source_p, "Bad user info");
399	>	return 1;
400	>	}
401	>
402	>	return 0;
403	>	}
404	>
405	>	/*! \brief This function is called when both NICK and USER messages
406	>	*      have been accepted for the client, in whatever order. Only
407	>	*      after this, is the UID message propagated.
408	>	* \param source_p Pointer to given client to introduce
409	>	*/
410		void
411		register_local_user(struct Client *source_p)
412		{
413		const char *id = NULL;
414		const struct MaskItem *conf = NULL;
415
256	–	assert(source_p != NULL);
416		assert(source_p == source_p->from);
417		assert(MyConnect(source_p));
418		assert(!source_p->localClient->registration);
#	Line 297 | Line 456 | register_local_user(struct Client *sourc
456
457		if (!IsGotId(source_p))
458		{
459	<	char username[USERLEN + 1];
459	>	char username[USERLEN + 1] = "";
460		const char *p = username;
461		unsigned int i = 0;
462
#	Line 306 | Line 465 | register_local_user(struct Client *sourc
465		++ServerStats.is_ref;
466		sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
467		"identd to use this server");
468	<	exit_client(source_p, &me, "Install identd");
468	>	exit_client(source_p, "Install identd");
469		return;
470		}
471
#	Line 316 | Line 475 | register_local_user(struct Client *sourc
475		source_p->username[i++] = '~';
476
477		for (; *p && i < USERLEN; ++p)
478	<	if (*p != '[')
320	<	source_p->username[i++] = *p;
478	>	source_p->username[i++] = *p;
479
480		source_p->username[i] = '\0';
481		}
482
483	<	/* password check */
483	>	/* Password check */
484		if (!EmptyString(conf->passwd))
485		{
486	<	const char *pass = source_p->localClient->passwd;
329	<
330	<	if (!match_conf_password(pass, conf))
486	>	if (!match_conf_password(source_p->localClient->passwd, conf))
487		{
488		++ServerStats.is_ref;
489
490		sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
491	<	exit_client(source_p, &me, "Bad Password");
491	>	exit_client(source_p, "Bad Password");
492		return;
493		}
494		}
495
496	<	/* don't free source_p->localClient->passwd here - it can be required
496	>	/*
497	>	* Don't free source_p->localClient->passwd here - it can be required
498		* by masked /stats I if there are auth{} blocks with need_password = no;
499		* --adx
500		*/
501
502	<	/* report if user has &^>= etc. and set flags as needed in source_p */
502	>	/*
503	>	* Report if user has &^>= etc. and set flags as needed in source_p
504	>	*/
505		report_and_set_user_flags(source_p, conf);
506
507		if (IsDead(source_p))
508		return;
509
510	<	/* Limit clients -
510	>	/*
511	>	* Limit clients -
512		* We want to be able to have servers and F-line clients
513		* connect, so save room for "buffer" connections.
514		* Smaller servers may want to decrease this, and it should
515		* probably be just a percentage of the MAXCLIENTS...
516		*   -Taner
517		*/
358	–	/* Except "F:" clients */
518		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
519		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
520		{
#	Line 363 | Line 522 | register_local_user(struct Client *sourc
522		"Too many clients, rejecting %s[%s].",
523		source_p->name, source_p->host);
524		++ServerStats.is_ref;
525	<	exit_client(source_p, &me, "Sorry, server is full - try later");
525	>	exit_client(source_p, "Sorry, server is full - try later");
526		return;
527		}
528
370	–	/* valid user name check */
529		if (!valid_username(source_p->username, 1))
530		{
531	<	char tmpstr2[IRCD_BUFSIZE];
531	>	char buf[IRCD_BUFSIZE] = "";
532
533		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
534		"Invalid username: %s (%s@%s)",
535		source_p->name, source_p->username, source_p->host);
536		++ServerStats.is_ref;
537	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
538	<	source_p->username);
381	<	exit_client(source_p, &me, tmpstr2);
537	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
538	>	exit_client(source_p, buf);
539		return;
540		}
541
542		if (check_xline(source_p))
543		return;
544
545	<	while (hash_find_id((id = uid_get())) != NULL)
545	>	while (hash_find_id((id = uid_get())))
546		;
547
548		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 415 | Line 572 | register_local_user(struct Client *sourc
572		Count.max_loc);
573		}
574
418	–	/* Increment our total user count here */
575		if (++Count.total > Count.max_tot)
576		Count.max_tot = Count.total;
577		++Count.totalrestartcount;
#	Line 423 | Line 579 | register_local_user(struct Client *sourc
579		assert(source_p->servptr == &me);
580		SetClient(source_p);
581		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
582	<
427	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
582	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
583
584		assert(dlinkFind(&unknown_list, source_p));
585
#	Line 449 | Line 604 | register_local_user(struct Client *sourc
604		*                is introduced by a server.
605		*/
606		void
607	<	register_remote_user(struct Client *source_p, const char *username,
453	<	const char *host, const char *server)
607	>	register_remote_user(struct Client *source_p)
608		{
609		struct Client *target_p = NULL;
610
457	–	assert(source_p != NULL);
458	–	assert(source_p->username != username);
459	–
460	–	strlcpy(source_p->host, host, sizeof(source_p->host));
461	–	strlcpy(source_p->username, username, sizeof(source_p->username));
462	–
463	–	/*
464	–	* coming from another server, take the servers word for it
465	–	*/
466	–	source_p->servptr = hash_find_server(server);
467	–
468	–	/*
469	–	* Super GhostDetect:
470	–	* If we can't find the server the user is supposed to be on,
471	–	* then simply blow the user away.        -Taner
472	–	*/
473	–	if (source_p->servptr == NULL)
474	–	{
475	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
476	–	"No server %s for user %s[%s@%s] from %s",
477	–	server, source_p->name, source_p->username,
478	–	source_p->host, source_p->from->name);
479	–	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
480	–
481	–	AddFlag(source_p, FLAGS_KILLED);
482	–	exit_client(source_p, &me, "Ghosted Client");
483	–	return;
484	–	}
485	–
611		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
612		{
613		sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
#	Line 490 | Line 615 | register_remote_user(struct Client *sour
615		source_p->from->name, source_p->name, source_p->username,
616		source_p->host, source_p->servptr->name,
617		target_p->name, target_p->from->name);
618	<	kill_client(source_p->from, source_p,
619	<	"%s (NICK from wrong direction (%s != %s))",
620	<	me.name, source_p->servptr->name, target_p->from->name);
618	>	sendto_one(source_p->from,
619	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
620	>	me.id, source_p->id, me.name, source_p->servptr->name,
621	>	target_p->from->name);
622	>
623		AddFlag(source_p, FLAGS_KILLED);
624	<	exit_client(source_p, &me, "USER server wrong direction");
624	>	exit_client(source_p, "USER server wrong direction");
625		return;
626		}
627
#	Line 505 | Line 632 | register_remote_user(struct Client *sour
632		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
633		AddFlag(source_p, FLAGS_SERVICE);
634
508	–	/* Increment our total user count here */
635		if (++Count.total > Count.max_tot)
636		Count.max_tot = Count.total;
637
638		SetClient(source_p);
639		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
640	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
641		add_user_host(source_p->username, source_p->host, 1);
642		SetUserHost(source_p);
643
#	Line 524 | Line 651 | register_remote_user(struct Client *sour
651		introduce_client(source_p);
652		}
653
527	–	/* introduce_client()
528	–	*
529	–	* inputs       - source_p
530	–	* output       - NONE
531	–	* side effects - This common function introduces a client to the rest
532	–	*                of the net, either from a local client connect or
533	–	*                from a remote connect.
534	–	*/
535	–	static void
536	–	introduce_client(struct Client *source_p)
537	–	{
538	–	dlink_node *server_node = NULL;
539	–	char ubuf[IRCD_BUFSIZE];
540	–
541	–	if (MyClient(source_p))
542	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
543	–	else
544	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
545	–
546	–	watch_check_hash(source_p, RPL_LOGON);
547	–
548	–	if (ubuf[0] == '\0')
549	–	{
550	–	ubuf[0] = '+';
551	–	ubuf[1] = '\0';
552	–	}
553	–
554	–	DLINK_FOREACH(server_node, serv_list.head)
555	–	{
556	–	struct Client *server = server_node->data;
557	–
558	–	if (server == source_p->from)
559	–	continue;
560	–
561	–	if (IsCapable(server, CAP_SVS))
562	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
563	–	source_p->servptr->id,
564	–	source_p->name, source_p->hopcount+1,
565	–	(unsigned long)source_p->tsinfo,
566	–	ubuf, source_p->username, source_p->host,
567	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	–	"0" : source_p->sockhost, source_p->id,
569	–	source_p->svid,
570	–	source_p->info);
571	–	else
572	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	–	source_p->servptr->id,
574	–	source_p->name, source_p->hopcount+1,
575	–	(unsigned long)source_p->tsinfo,
576	–	ubuf, source_p->username, source_p->host,
577	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	–	"0" : source_p->sockhost, source_p->id, source_p->info);
579	–
580	–	if (!EmptyString(source_p->certfp))
581	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582	–	}
583	–	}
584	–
654		/* valid_hostname()
655		*
656		* Inputs       - pointer to hostname
#	Line 596 | Line 665 | valid_hostname(const char *hostname)
665		{
666		const char *p = hostname;
667
668	<	assert(p != NULL);
668	>	assert(p);
669
670		if (EmptyString(p) || *p == '.' || *p == ':')
671		return 0;
#	Line 622 | Line 691 | valid_hostname(const char *hostname)
691		int
692		valid_username(const char *username, const int local)
693		{
694	<	int dots      = 0;
694	>	unsigned int dots = 0;
695		const char *p = username;
696
697	<	assert(p != NULL);
697	>	assert(p);
698
699		if (*p == '~')
700		++p;
#	Line 642 | Line 711 | valid_username(const char *username, con
711		{
712		while (*++p)
713		{
714	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
714	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
715		{
716		if (++dots > ConfigFileEntry.dots_in_ident)
717		return 0;
#	Line 660 | Line 729 | valid_username(const char *username, con
729		return 0;
730		}
731
732	<	return  p - username <= USERLEN;;
732	>	return p - username <= USERLEN;
733		}
734
735		/* clean_nick_name()
#	Line 674 | Line 743 | int
743		valid_nickname(const char *nickname, const int local)
744		{
745		const char *p = nickname;
746	+
747		assert(nickname && *nickname);
748
749	<	/* nicks can't start with a digit or - or be 0 length */
750	<	/* This closer duplicates behaviour of hybrid-6 */
749	>	/*
750	>	* Nicks can't start with a digit or - or be 0 length.
751	>	*/
752		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
753		return 0;
754
#	Line 688 | Line 759 | valid_nickname(const char *nickname, con
759		return p - nickname <= NICKLEN;
760		}
761
691	–	/* report_and_set_user_flags()
692	–	*
693	–	* inputs       - pointer to source_p
694	–	*              - pointer to conf for this user
695	–	* output       - NONE
696	–	* side effects - Report to user any special flags
697	–	*                they are getting, and set them.
698	–	*/
699	–	static void
700	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
701	–	{
702	–	/* If this user is being spoofed, tell them so */
703	–	if (IsConfDoSpoofIp(conf))
704	–	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705	–
706	–	/* If this user is in the exception class, Set it "E lined" */
707	–	if (IsConfExemptKline(conf))
708	–	{
709	–	SetExemptKline(source_p);
710	–	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711	–	}
712	–
713	–	/*
714	–	* The else here is to make sure that G line exempt users
715	–	* do not get noticed twice.
716	–	*/
717	–	else if (IsConfExemptGline(conf))
718	–	{
719	–	SetExemptGline(source_p);
720	–	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721	–	}
722	–
723	–	if (IsConfExemptResv(conf))
724	–	{
725	–	SetExemptResv(source_p);
726	–	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727	–	}
728	–
729	–	/* If this user is exempt from user limits set it "F lined" */
730	–	if (IsConfExemptLimits(conf))
731	–	{
732	–	SetExemptLimits(source_p);
733	–	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734	–	}
735	–
736	–	if (IsConfCanFlood(conf))
737	–	{
738	–	SetCanFlood(source_p);
739	–	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	–	"protection, aren't you fearsome.");
741	–	}
742	–	}
743	–
744	–	/* set_user_mode()
745	–	*
746	–	* added 15/10/91 By Darren Reed.
747	–	* parv[0] - sender
748	–	* parv[1] - username to change mode for
749	–	* parv[2] - modes to change
750	–	*/
751	–	void
752	–	set_user_mode(struct Client *client_p, struct Client *source_p,
753	–	const int parc, char *parv[])
754	–	{
755	–	unsigned int flag, setflags;
756	–	char **p, *m, buf[IRCD_BUFSIZE];
757	–	struct Client *target_p;
758	–	int what = MODE_ADD, badflag = 0, i;
759	–
760	–	assert(!(parc < 2));
761	–
762	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
763	–	{
764	–	if (MyConnect(source_p))
765	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
766	–	return;
767	–	}
768	–
769	–	if (source_p != target_p)
770	–	{
771	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
772	–	return;
773	–	}
774	–
775	–	if (parc < 3)
776	–	{
777	–	m = buf;
778	–	*m++ = '+';
779	–
780	–	for (i = 0; i < 128; ++i)
781	–	if (HasUMode(source_p, user_modes[i]))
782	–	*m++ = (char)i;
783	–	*m = '\0';
784	–
785	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
786	–	return;
787	–	}
788	–
789	–	/* find flags already set for user */
790	–	setflags = source_p->umodes;
791	–
792	–	/* parse mode change string(s) */
793	–	for (p = &parv[2]; p && *p; ++p)
794	–	{
795	–	for (m = *p; *m; ++m)
796	–	{
797	–	switch (*m)
798	–	{
799	–	case '+':
800	–	what = MODE_ADD;
801	–	break;
802	–	case '-':
803	–	what = MODE_DEL;
804	–	break;
805	–	case 'o':
806	–	if (what == MODE_ADD)
807	–	{
808	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
809	–	{
810	–	++Count.oper;
811	–	SetOper(source_p);
812	–	}
813	–	}
814	–	else
815	–	{
816	–	if (!HasUMode(source_p, UMODE_OPER))
817	–	break;
818	–
819	–	ClearOper(source_p);
820	–	Count.oper--;
821	–
822	–	if (MyConnect(source_p))
823	–	{
824	–	dlink_node *dm = NULL;
825	–
826	–	detach_conf(source_p, CONF_OPER);
827	–	ClrOFlag(source_p);
828	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
829	–
830	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
831	–	free_dlink_node(dm);
832	–	}
833	–	}
834	–
835	–	break;
836	–
837	–	case 'S':  /* Only servers may set +S in a burst */
838	–	case 'W':  /* Only servers may set +W in a burst */
839	–	case 'r':  /* Only services may set +r */
840	–	case 'x':  /* Only services may set +x */
841	–	break;
842	–
843	–	default:
844	–	if ((flag = user_modes[(unsigned char)*m]))
845	–	{
846	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
847	–	(ConfigFileEntry.oper_only_umodes & flag))
848	–	badflag = 1;
849	–	else
850	–	{
851	–	if (what == MODE_ADD)
852	–	AddUMode(source_p, flag);
853	–	else
854	–	DelUMode(source_p, flag);
855	–	}
856	–	}
857	–	else if (MyConnect(source_p))
858	–	badflag = 1;
859	–
860	–	break;
861	–	}
862	–	}
863	–	}
864	–
865	–	if (badflag)
866	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
867	–
868	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
869	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
870	–	{
871	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
872	–	DelUMode(source_p, UMODE_ADMIN);
873	–	}
874	–
875	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
876	–	++Count.invisi;
877	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
878	–	--Count.invisi;
879	–
880	–	/*
881	–	* compare new flags with old flags and send string which
882	–	* will cause servers to update correctly.
883	–	*/
884	–	send_umode_out(client_p, source_p, setflags);
885	–	}
886	–
762		/* send_umode()
763		* send the MODE string for user (user) to connection client_p
764		* -avalon
#	Line 897 | Line 772 | set_user_mode(struct Client *client_p, s
772		*/
773		void
774		send_umode(struct Client *client_p, struct Client *source_p,
775	<	unsigned int old, unsigned int sendmask, char *umode_buf)
775	>	unsigned int old, char *umode_buf)
776		{
777		char *m = umode_buf;
778		int what = 0;
904	–	unsigned int i;
905	–	unsigned int flag;
779
780		/*
781	<	* build a string in umode_buf to represent the change in the user's
781	>	* Build a string in umode_buf to represent the change in the user's
782		* mode between the new (source_p->umodes) and 'old'.
783		*/
784	<	for (i = 0; i < 128; ++i)
784	>	for (unsigned int i = 0; i < 128; ++i)
785		{
786	<	flag = user_modes[i];
914	<	if (!flag)
915	<	continue;
786	>	unsigned int flag = user_modes[i];
787
788	<	if (MyClient(source_p) && !(flag & sendmask))
788	>	if (!flag)
789		continue;
790
791		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 959 | Line 830 | void
830		send_umode_out(struct Client *client_p, struct Client *source_p,
831		unsigned int old)
832		{
833	<	char buf[IRCD_BUFSIZE] = { '\0' };
963	<	dlink_node *ptr = NULL;
833	>	char buf[IRCD_BUFSIZE] = "";
834
835	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
835	>	send_umode(NULL, source_p, old, buf);
836
837		if (buf[0])
838	<	{
839	<	DLINK_FOREACH(ptr, serv_list.head)
970	<	{
971	<	struct Client *target_p = ptr->data;
972	<
973	<	if ((target_p != client_p) && (target_p != source_p))
974	<	sendto_one(target_p, ":%s MODE %s :%s",
975	<	ID_or_name(source_p, target_p),
976	<	ID_or_name(source_p, target_p), buf);
977	<	}
978	<	}
838	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
839	>	source_p->id, source_p->id, buf);
840
841		if (client_p && MyClient(client_p))
842	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
842	>	send_umode(client_p, source_p, old, buf);
843		}
844
845		void
#	Line 1027 | Line 888 | user_set_hostmask(struct Client *target_
888
889		DLINK_FOREACH(ptr, target_p->channel.head)
890		{
891	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
891	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
892		char *p = modebuf;
893		int len = 0;
894		const struct Membership *ms = ptr->data;
#	Line 1069 | Line 930 | user_set_hostmask(struct Client *target_
930		target_p->host, target_p->away);
931		}
932
933	<	/* user_welcome()
934	<	*
935	<	* inputs       - client pointer to client to welcome
1075	<	* output       - NONE
1076	<	* side effects -
1077	<	*/
1078	<	static void
1079	<	user_welcome(struct Client *source_p)
1080	<	{
1081	<	#if defined(__TIME__) && defined(__DATE__)
1082	<	static const char built_date[] = __DATE__ " at " __TIME__;
1083	<	#else
1084	<	static const char built_date[] = "unknown";
1085	<	#endif
1086	<
1087	<	#ifdef HAVE_LIBCRYPTO
1088	<	if (HasFlag(source_p, FLAGS_SSL))
1089	<	{
1090	<	AddUMode(source_p, UMODE_SSL);
1091	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1092	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	<	}
1094	<	#endif
1095	<
1096	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1097	<	source_p->name);
1098	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1099	<	get_listener_name(source_p->localClient->listener), ircd_version);
1100	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1101	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1102	<	show_isupport(source_p);
1103	<
1104	<	if (source_p->id[0] != '\0')
1105	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1106	<
1107	<	show_lusers(source_p);
1108	<	motd_signon(source_p);
1109	<	}
1110	<
1111	<	/* check_xline()
1112	<	*
1113	<	* inputs       - pointer to client to test
1114	<	* outupt       - 1 if exiting 0 if ok
1115	<	* side effects -
1116	<	*/
1117	<	static int
1118	<	check_xline(struct Client *source_p)
1119	<	{
1120	<	struct MaskItem *conf = NULL;
1121	<	const char *reason = NULL;
1122	<
1123	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1124	<	{
1125	<	++conf->count;
1126	<
1127	<	if (conf->reason != NULL)
1128	<	reason = conf->reason;
1129	<	else
1130	<	reason = "No Reason";
1131	<
1132	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1133	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1134	<	source_p->info, reason,
1135	<	get_client_name(source_p, HIDE_IP),
1136	<	source_p->sockhost);
1137	<
1138	<	++ServerStats.is_ref;
1139	<	exit_client(source_p, &me, "Bad user info");
1140	<	return 1;
1141	<	}
1142	<
1143	<	return 0;
1144	<	}
1145	<
1146	<	/* oper_up()
1147	<	*
1148	<	* inputs       - pointer to given client to oper
1149	<	* output       - NONE
1150	<	* side effects - Blindly opers up given source_p, using conf info
1151	<	*                all checks on passwords have already been done.
1152	<	*                This could also be used by rsa oper routines.
933	>	/*! \brief Blindly opers up given source_p, using conf info.
934	>	*         All checks on passwords have already been done.
935	>	* \param source_p Pointer to given client to oper
936		*/
937		void
938		oper_up(struct Client *source_p)
#	Line 1186 | Line 969 | oper_up(struct Client *source_p)
969		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
970		}
971
972	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
972	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
973
974		int
975		valid_sid(const char *sid)
#	Line 1211 | Line 994 | valid_sid(const char *sid)
994		void
995		init_uid(void)
996		{
1214	–	unsigned int i;
1215	–
997		memset(new_uid, 0, sizeof(new_uid));
998
999		if (!EmptyString(ServerInfo.sid))
1000		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1001
1002	<	for (i = 0; i < IRC_MAXSID; ++i)
1002	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1003		if (new_uid[i] == '\0')
1004		new_uid[i] = 'A';
1005
#	Line 1235 | Line 1016 | init_uid(void)
1016		*                note this is a recursive function
1017		*/
1018		static void
1019	<	add_one_to_uid(int i)
1019	>	add_one_to_uid(unsigned int i)
1020		{
1021	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1021	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1022		{
1023		if (new_uid[i] == 'Z')
1024		new_uid[i] = '0';
1025		else if (new_uid[i] == '9')
1026		{
1027		new_uid[i] = 'A';
1028	<	add_one_to_uid(i-1);
1028	>	add_one_to_uid(i - 1);
1029		}
1030		else
1031		++new_uid[i];
#	Line 1269 | Line 1050 | add_one_to_uid(int i)
1050		static const char *
1051		uid_get(void)
1052		{
1053	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1053	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1054		return new_uid;
1055		}
1056
#	Line 1284 | Line 1065 | void
1065		init_isupport(void)
1066		{
1067		add_isupport("CALLERID", NULL, -1);
1068	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1068	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1069		add_isupport("DEAF", "D", -1);
1070		add_isupport("KICKLEN", NULL, KICKLEN);
1071		add_isupport("MODES", NULL, MAXMODEPARAMS);
1291	–	#ifdef HALFOPS
1072		add_isupport("PREFIX", "(ohv)@%+", -1);
1073		add_isupport("STATUSMSG", "@%+", -1);
1294	–	#else
1295	–	add_isupport("PREFIX", "(ov)@+", -1);
1296	–	add_isupport("STATUSMSG", "@+", -1);
1297	–	#endif
1074		add_isupport("EXCEPTS", "e", -1);
1075		add_isupport("INVEX", "I", -1);
1076		}
#	Line 1312 | Line 1088 | void
1088		add_isupport(const char *name, const char *options, int n)
1089		{
1090		dlink_node *ptr;
1091	<	struct Isupport *support;
1091	>	struct Isupport *support = NULL;
1092
1093		DLINK_FOREACH(ptr, support_list.head)
1094		{
#	Line 1327 | Line 1103 | add_isupport(const char *name, const cha
1103
1104		if (ptr == NULL)
1105		{
1106	<	support = MyMalloc(sizeof(*support));
1106	>	support = MyCalloc(sizeof(*support));
1107		dlinkAddTail(support, &support->node, &support_list);
1108		}
1109
1110		support->name = xstrdup(name);
1111	<	if (options != NULL)
1111	>	if (options)
1112		support->options = xstrdup(options);
1113		support->number = n;
1114
#	Line 1400 | Line 1176 | rebuild_isupport_message_line(void)
1176		p += (n = sprintf(p, "%s", support->name));
1177		len += n;
1178
1179	<	if (support->options != NULL)
1179	>	if (support->options)
1180		{
1181		p += (n = sprintf(p, "=%s", support->options));
1182		len += n;
#	Line 1428 | Line 1204 | rebuild_isupport_message_line(void)
1204		}
1205		}
1206
1207	<	if (len != 0)
1207	>	if (len)
1208		{
1209		if (*--p == ' ')
1210		*p = '\0';

Diff Legend

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