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/user.c (file contents):
Revision 4704 by michael, Sun Oct 5 16:25:02 2014 UTC vs.
Revision 6904 by michael, Mon Dec 7 17:48:05 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 19 | Line 19
19		*  USA
20		*/
21
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
#	Line 31 | Line 31
31		#include "channel_mode.h"
32		#include "client.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 47 | Line 48
48		#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
52	–	static const char *uid_get(void);
54
55	<	/* Used for building up the isupport string,
56	<	* used with init_isupport, add_isupport, delete_isupport
56	<	*/
57	<	struct Isupport
58	<	{
59	<	dlink_node node;
60	<	char *name;
61	<	char *options;
62	<	int number;
63	<	};
64	<
65	<	static dlink_list support_list;
66	<	static dlink_list support_list_lines;
67	<
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	0,                  /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	UMODE_SSL,          /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	UMODE_WEBIRC,       /* W */
86	<	0,                  /* X */
100	<	0,                  /* Y */
101	<	0,                  /* Z 0x5A */
102	<	0, 0, 0, 0, 0,      /* 0x5F   */
103	<	0,                  /* 0x60   */
104	<	UMODE_ADMIN,        /* a */
105	<	UMODE_BOTS,         /* b */
106	<	UMODE_CCONN,        /* c */
107	<	UMODE_DEBUG,        /* d */
108	<	UMODE_EXTERNAL,     /* e */
109	<	UMODE_FULL,         /* f */
110	<	UMODE_CALLERID,     /* g */
111	<	0,                  /* h */
112	<	UMODE_INVISIBLE,    /* i */
113	<	UMODE_REJ,          /* j */
114	<	UMODE_SKILL,        /* k */
115	<	UMODE_LOCOPS,       /* l */
116	<	0,                  /* m */
117	<	UMODE_NCHANGE,      /* n */
118	<	UMODE_OPER,         /* o */
119	<	UMODE_HIDECHANS,    /* p */
120	<	UMODE_HIDEIDLE,     /* q */
121	<	UMODE_REGISTERED,   /* r */
122	<	UMODE_SERVNOTICE,   /* s */
123	<	0,                  /* t */
124	<	UMODE_UNAUTH,       /* u */
125	<	0,                  /* v */
126	<	UMODE_WALLOP,       /* w */
127	<	UMODE_HIDDENHOST,   /* x */
128	<	UMODE_SPY,          /* y */
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 */
133	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
134	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
135	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
136	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
137	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
138	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
139	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
145	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 162 | Line 110 | void
110		show_lusers(struct Client *source_p)
111		{
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114		Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117	<	(Count.total - Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119		if (Count.oper)
120		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 201 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
204	–	/* show_isupport()
205	–	*
206	–	* inputs       - pointer to client
207	–	* output       - NONE
208	–	* side effects - display to client what we support (for them)
209	–	*/
210	–	void
211	–	show_isupport(struct Client *source_p)
212	–	{
213	–	const dlink_node *ptr = NULL;
214	–
215	–	DLINK_FOREACH(ptr, support_list_lines.head)
216	–	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
217	–	}
218	–
219	–
152		/* report_and_set_user_flags()
153		*
154		* inputs       - pointer to source_p
#	Line 230 | Line 162 | report_and_set_user_flags(struct Client
162		{
163		/* If this user is being spoofed, tell them so */
164		if (IsConfDoSpoofIp(conf))
165	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
166
167	<	/* If this user is in the exception class, Set it "E lined" */
167	>	/* If this user is in the exception class, set it "E lined" */
168		if (IsConfExemptKline(conf))
169		{
170	<	SetExemptKline(source_p);
171	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
172		}
173
174	<	/*
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))
174	>	if (IsConfExemptXline(conf))
175		{
176	<	SetExemptGline(source_p);
177	<	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
176	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
178		}
179
180		if (IsConfExemptResv(conf))
181		{
182	<	SetExemptResv(source_p);
183	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
184		}
185
186		/* If this user is exempt from user limits set it "F lined" */
187		if (IsConfExemptLimits(conf))
188		{
189	<	SetExemptLimits(source_p);
190	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
191		}
192
193		if (IsConfCanFlood(conf))
194		{
195	<	SetCanFlood(source_p);
196	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	<	"protection, aren't you fearsome.");
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
197		}
198		}
199
#	Line 281 | Line 208 | report_and_set_user_flags(struct Client
208		static void
209		introduce_client(struct Client *source_p)
210		{
211	<	dlink_node *ptr = NULL;
211	>	dlink_node *node = NULL;
212		char ubuf[IRCD_BUFSIZE] = "";
213
214		if (MyClient(source_p))
#	Line 297 | Line 224 | introduce_client(struct Client *source_p
224		ubuf[1] = '\0';
225		}
226
227	<	DLINK_FOREACH(ptr, local_server_list.head)
227	>	DLINK_FOREACH(node, local_server_list.head)
228		{
229	<	struct Client *server = ptr->data;
229	>	struct Client *server = node->data;
230
231		if (server == source_p->from)
232		continue;
233
234	<	if (IsCapable(server, CAP_SVS))
235	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
236	<	source_p->servptr->id,
237	<	source_p->name, source_p->hopcount+1,
238	<	(unsigned long)source_p->tsinfo,
239	<	ubuf, source_p->username, source_p->host,
240	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
241	<	"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);
234	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235	>	source_p->servptr->id,
236	>	source_p->name, source_p->hopcount+1,
237	>	source_p->tsinfo,
238	>	ubuf, source_p->username, source_p->host,
239	>	source_p->sockhost, source_p->id,
240	>	source_p->account,
241	>	source_p->info);
242
243		if (!EmptyString(source_p->certfp))
244		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 337 | Line 254 | introduce_client(struct Client *source_p
254		static void
255		user_welcome(struct Client *source_p)
256		{
340	–	#if defined(__TIME__) && defined(__DATE__)
257		static const char built_date[] = __DATE__ " at " __TIME__;
342	–	#else
343	–	static const char built_date[] = "unknown";
344	–	#endif
258
259		#ifdef HAVE_LIBCRYPTO
260		if (HasFlag(source_p, FLAGS_SSL))
#	Line 355 | Line 268 | user_welcome(struct Client *source_p)
268		sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
269		source_p->name);
270		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
271	<	get_listener_name(source_p->connection->listener), ircd_version);
271	>	listener_get_name(source_p->connection->listener), ircd_version);
272		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
273		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361	–	show_isupport(source_p);
362	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
274
275	+	isupport_show(source_p);
276		show_lusers(source_p);
277		motd_signon(source_p);
278		}
#	Line 375 | Line 287 | static int
287		check_xline(struct Client *source_p)
288		{
289		struct MaskItem *conf = NULL;
290	<	const char *reason = NULL;
290	>
291	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
292	>	return 0;
293
294		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
295		{
296		++conf->count;
383	–
384	–	if (conf->reason)
385	–	reason = conf->reason;
386	–	else
387	–	reason = CONF_NOREASON;
388	–
297		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
298		"X-line Rejecting [%s] [%s], user %s [%s]",
299	<	source_p->info, reason,
299	>	source_p->info, conf->reason,
300		get_client_name(source_p, HIDE_IP),
301		source_p->sockhost);
302
#	Line 413 | Line 321 | register_local_user(struct Client *sourc
321
322		assert(source_p == source_p->from);
323		assert(MyConnect(source_p));
324	+	assert(IsUnknown(source_p));
325		assert(!source_p->connection->registration);
326
418	–	ClearCap(source_p, CAP_TS6);
419	–
327		if (ConfigGeneral.ping_cookie)
328		{
329	<	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
329	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
330		{
331		do
332		source_p->connection->random_ping = genrand_int32();
333		while (!source_p->connection->random_ping);
334
335	<	sendto_one(source_p, "PING :%u",
336	<	source_p->connection->random_ping);
430	<	SetPingSent(source_p);
335	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
336	>	AddFlag(source_p, FLAGS_PINGSENT);
337		return;
338		}
339
340	<	if (!HasPingCookie(source_p))
340	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
341		return;
342		}
343
#	Line 446 | Line 352 | register_local_user(struct Client *sourc
352		{
353		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
354		"character in your hostname");
355	<	strlcpy(source_p->host, source_p->sockhost,
450	<	sizeof(source_p->host));
355	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
356		}
357
358		conf = source_p->connection->confs.head->data;
359
360	<	if (!IsGotId(source_p))
360	>	if (!HasFlag(source_p, FLAGS_GOTID))
361		{
362		char username[USERLEN + 1] = "";
458	–	const char *p = username;
363		unsigned int i = 0;
364
365		if (IsNeedIdentd(conf))
#	Line 472 | Line 376 | register_local_user(struct Client *sourc
376		if (!IsNoTilde(conf))
377		source_p->username[i++] = '~';
378
379	<	for (; *p && i < USERLEN; ++p)
379	>	for (const char *p = username; *p && i < USERLEN; ++p)
380		source_p->username[i++] = *p;
381
382		source_p->username[i] = '\0';
#	Line 493 | Line 397 | register_local_user(struct Client *sourc
397
398		/*
399		* Don't free source_p->connection->password here - it can be required
400	<	* by masked /stats I if there are auth{} blocks with need_password = no;
400	>	* by masked /stats I if there are auth {} blocks with need_password = no;
401		* --adx
402		*/
403
#	Line 513 | Line 417 | register_local_user(struct Client *sourc
417		* probably be just a percentage of the MAXCLIENTS...
418		*   -Taner
419		*/
420	<	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
421	<	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
420	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
421	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
422		{
423		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
424		"Too many clients, rejecting %s[%s].",
#	Line 549 | Line 453 | register_local_user(struct Client *sourc
453		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
454		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
455		source_p->name, source_p->username, source_p->host,
456	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553	<	"255.255.255.255" : source_p->sockhost,
456	>	source_p->sockhost,
457		get_client_class(&source_p->connection->confs),
458		source_p->info, source_p->id);
459
#	Line 565 | Line 468 | register_local_user(struct Client *sourc
468		Count.max_loc = Count.local;
469
470		if (!(Count.max_loc % 10))
471	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
471	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
472		"New maximum local client connections: %u",
473		Count.max_loc);
474		}
#	Line 585 | Line 488 | register_local_user(struct Client *sourc
488		&unknown_list, &local_client_list);
489
490		user_welcome(source_p);
491	<	add_user_host(source_p->username, source_p->host, 0);
492	<	SetUserHost(source_p);
491	>	userhost_add(source_p->username, source_p->host, 0);
492	>	AddFlag(source_p, FLAGS_USERHOST);
493
494		introduce_client(source_p);
495		}
#	Line 614 | Line 517 | register_remote_user(struct Client *sour
517		source_p->host, source_p->servptr->name,
518		target_p->name, target_p->from->name);
519		sendto_one(source_p->from,
520	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
520	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
521		me.id, source_p->id, me.name, source_p->servptr->name,
522		target_p->from->name);
523
524		AddFlag(source_p, FLAGS_KILLED);
525	<	exit_client(source_p, "USER server wrong direction");
525	>	exit_client(source_p, "UID server wrong direction");
526		return;
527		}
528
#	Line 636 | Line 539 | register_remote_user(struct Client *sour
539		SetClient(source_p);
540		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
541		dlinkAdd(source_p, &source_p->node, &global_client_list);
542	<	add_user_host(source_p->username, source_p->host, 1);
543	<	SetUserHost(source_p);
542	>	userhost_add(source_p->username, source_p->host, 1);
543	>	AddFlag(source_p, FLAGS_USERHOST);
544
545		if (HasFlag(source_p->servptr, FLAGS_EOB))
546		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
547	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
548		source_p->servptr->name,
549		source_p->name, source_p->username, source_p->host,
550	<	source_p->info, source_p->id);
550	>	source_p->sockhost, source_p->info, source_p->id);
551
552		introduce_client(source_p);
553		}
#	Line 689 | Line 592 | valid_hostname(const char *hostname)
592		int
593		valid_username(const char *username, const int local)
594		{
692	–	unsigned int dots = 0;
595		const char *p = username;
596
597		assert(p);
#	Line 707 | Line 609 | valid_username(const char *username, con
609
610		if (local)
611		{
612	+	unsigned int dots = 0;
613	+
614		while (*++p)
615		{
616		if (*p == '.' && ConfigGeneral.dots_in_ident)
#	Line 742 | Line 646 | valid_nickname(const char *nickname, con
646		{
647		const char *p = nickname;
648
649	<	assert(nickname && *nickname);
649	>	assert(p);
650
651		/*
652		* Nicks can't start with a digit or - or be 0 length.
653		*/
654	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
654	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
655		return 0;
656
657		for (; *p; ++p)
#	Line 764 | Line 668 | valid_nickname(const char *nickname, con
668		* inputs       - client_p
669		*              - source_p
670		*              - int old
767	–	*              - sendmask mask of modes to send
671		*              - suplied umode_buf
672		* output       - NONE
673		*/
#	Line 779 | Line 682 | send_umode(struct Client *client_p, stru
682		* Build a string in umode_buf to represent the change in the user's
683		* mode between the new (source_p->umodes) and 'old'.
684		*/
685	<	for (unsigned int i = 0; i < 128; ++i)
685	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
686		{
687	<	unsigned int flag = user_modes[i];
785	<
786	<	if (!flag)
787	<	continue;
788	<
789	<	if ((flag & old) && !HasUMode(source_p, flag))
687	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
688		{
689		if (what == MODE_DEL)
690	<	*m++ = (char)i;
690	>	*m++ = tab->c;
691		else
692		{
693		what = MODE_DEL;
694		*m++ = '-';
695	<	*m++ = (char)i;
695	>	*m++ = tab->c;
696		}
697		}
698	<	else if (!(flag & old) && HasUMode(source_p, flag))
698	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
699		{
700		if (what == MODE_ADD)
701	<	*m++ = (char)i;
701	>	*m++ = tab->c;
702		else
703		{
704		what = MODE_ADD;
705		*m++ = '+';
706	<	*m++ = (char)i;
706	>	*m++ = tab->c;
707		}
708		}
709		}
#	Line 825 | Line 723 | send_umode(struct Client *client_p, stru
723		* side effects - Only send ubuf out to servers that know about this client
724		*/
725		void
726	<	send_umode_out(struct Client *client_p, struct Client *source_p,
829	<	unsigned int old)
726	>	send_umode_out(struct Client *source_p, unsigned int old)
727		{
728		char buf[IRCD_BUFSIZE] = "";
729
730	<	send_umode(NULL, source_p, old, buf);
730	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
731
732		if (buf[0])
733	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
733	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
734		source_p->id, source_p->id, buf);
838	–
839	–	if (client_p && MyClient(client_p))
840	–	send_umode(client_p, source_p, old, buf);
735		}
736
737		void
738		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
739		{
740	<	dlink_node *ptr = NULL;
740	>	dlink_node *node = NULL;
741
742		if (!strcmp(target_p->host, hostname))
743		return;
#	Line 852 | Line 746 | user_set_hostmask(struct Client *target_
746		{
747		case MODE_ADD:
748		AddUMode(target_p, UMODE_HIDDENHOST);
855	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
749		break;
750		case MODE_DEL:
751		DelUMode(target_p, UMODE_HIDDENHOST);
859	–
860	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
861	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
752		break;
753		default: return;
754		}
755
756		if (ConfigGeneral.cycle_on_host_change)
757	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
757	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
758		target_p->name, target_p->username, target_p->host);
759
760	<	if (IsUserHostIp(target_p))
761	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
760	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
761	>	target_p->name, target_p->username,
762	>	target_p->host, target_p->username, hostname);
763	>
764	>	if (HasFlag(target_p, FLAGS_USERHOST))
765	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
766
767		strlcpy(target_p->host, hostname, sizeof(target_p->host));
768
769	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
770	<	SetUserHost(target_p);
769	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
770	>	AddFlag(target_p, FLAGS_USERHOST);
771
772	<	if (MyClient(target_p))
772	>	if (MyConnect(target_p))
773		{
774		sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
775		clear_ban_cache_client(target_p);
#	Line 884 | Line 778 | user_set_hostmask(struct Client *target_
778		if (!ConfigGeneral.cycle_on_host_change)
779		return;
780
781	<	DLINK_FOREACH(ptr, target_p->channel.head)
781	>	DLINK_FOREACH(node, target_p->channel.head)
782		{
783	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
783	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
784	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
785		char *p = modebuf;
786		int len = 0;
787	<	const struct Membership *ms = ptr->data;
787	>	const struct Membership *member = node->data;
788
789	<	if (has_member_flags(ms, CHFL_CHANOP))
789	>	if (has_member_flags(member, CHFL_CHANOP))
790		{
791		*p++ = 'o';
792		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
793		}
794
795	<	if (has_member_flags(ms, CHFL_HALFOP))
795	>	if (has_member_flags(member, CHFL_HALFOP))
796		{
797		*p++ = 'h';
798		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
799		}
800
801	<	if (has_member_flags(ms, CHFL_VOICE))
801	>	if (has_member_flags(member, CHFL_VOICE))
802		{
803		*p++ = 'v';
804		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 911 | Line 806 | user_set_hostmask(struct Client *target_
806
807		*p = '\0';
808
809	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
810	<	target_p->name, target_p->username, target_p->host,
811	<	ms->chptr->name);
812	<	if (nickbuf[0])
813	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
814	<	target_p->servptr->name, ms->chptr->name,
815	<	modebuf, nickbuf);
809	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
810	>	target_p->name, target_p->username,
811	>	target_p->host, member->chptr->name,
812	>	target_p->account, target_p->info);
813	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
814	>	target_p->name, target_p->username,
815	>	target_p->host, member->chptr->name);
816
817	+	if (nickbuf[0])
818	+	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
819	+	target_p->servptr->name, member->chptr->name,
820	+	modebuf, nickbuf);
821		}
822
823		if (target_p->away[0])
824	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
824	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
825		":%s!%s@%s AWAY :%s",
826		target_p->name, target_p->username,
827		target_p->host, target_p->away);
828		}
930	–
931	–	/*! \brief Blindly opers up given source_p, using conf info.
932	–	*         All checks on passwords have already been done.
933	–	* \param source_p Pointer to given client to oper
934	–	*/
935	–	void
936	–	oper_up(struct Client *source_p)
937	–	{
938	–	const unsigned int old = source_p->umodes;
939	–	const struct MaskItem *conf = source_p->connection->confs.head->data;
940	–
941	–	assert(source_p->connection->confs.head);
942	–
943	–	++Count.oper;
944	–	SetOper(source_p);
945	–
946	–	if (conf->modes)
947	–	AddUMode(source_p, conf->modes);
948	–	else if (ConfigGeneral.oper_umodes)
949	–	AddUMode(source_p, ConfigGeneral.oper_umodes);
950	–
951	–	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
952	–	++Count.invisi;
953	–	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
954	–	--Count.invisi;
955	–
956	–	assert(dlinkFind(&oper_list, source_p) == NULL);
957	–	dlinkAdd(source_p, make_dlink_node(), &oper_list);
958	–
959	–	AddOFlag(source_p, conf->port);
960	–
961	–	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
962	–	AddUMode(source_p, UMODE_ADMIN);
963	–
964	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
965	–	get_oper_name(source_p));
966	–	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
967	–	me.id, get_oper_name(source_p));
968	–	send_umode_out(source_p, source_p, old);
969	–	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
970	–	}
971	–
972	–	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
973	–
974	–	int
975	–	valid_sid(const char *sid)
976	–	{
977	–	if (strlen(sid) == IRC_MAXSID)
978	–	if (IsDigit(*sid))
979	–	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
980	–	return 1;
981	–
982	–	return 0;
983	–	}
984	–
985	–	/*
986	–	* init_uid()
987	–	*
988	–	* inputs       - NONE
989	–	* output       - NONE
990	–	* side effects - new_uid is filled in with server id portion (sid)
991	–	*                (first 3 bytes) or defaulted to 'A'.
992	–	*                Rest is filled in with 'A'
993	–	*/
994	–	void
995	–	init_uid(void)
996	–	{
997	–	memset(new_uid, 0, sizeof(new_uid));
998	–
999	–	if (!EmptyString(ConfigServerInfo.sid))
1000	–	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
1001	–
1002	–	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1003	–	if (new_uid[i] == '\0')
1004	–	new_uid[i] = 'A';
1005	–
1006	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1007	–	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1008	–	}
1009	–
1010	–	/*
1011	–	* add_one_to_uid
1012	–	*
1013	–	* inputs       - index number into new_uid
1014	–	* output       - NONE
1015	–	* side effects - new_uid is incremented by one
1016	–	*                note this is a recursive function
1017	–	*/
1018	–	static void
1019	–	add_one_to_uid(unsigned int i)
1020	–	{
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);
1029	–	}
1030	–	else
1031	–	++new_uid[i];
1032	–	}
1033	–	else
1034	–	{
1035	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1036	–	if (new_uid[i] == 'Z')
1037	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1038	–	else
1039	–	++new_uid[i];
1040	–	}
1041	–	}
1042	–
1043	–	/*
1044	–	* uid_get
1045	–	*
1046	–	* inputs       - struct Client *
1047	–	* output       - new UID is returned to caller
1048	–	* side effects - new_uid is incremented by one.
1049	–	*/
1050	–	static const char *
1051	–	uid_get(void)
1052	–	{
1053	–	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1054	–	return new_uid;
1055	–	}
1056	–
1057	–	/*
1058	–	* init_isupport()
1059	–	*
1060	–	* input        - NONE
1061	–	* output       - NONE
1062	–	* side effects - Must be called before isupport is enabled
1063	–	*/
1064	–	void
1065	–	init_isupport(void)
1066	–	{
1067	–	add_isupport("CALLERID", NULL, -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);
1072	–	add_isupport("PREFIX", "(ohv)@%+", -1);
1073	–	add_isupport("STATUSMSG", "@%+", -1);
1074	–	add_isupport("EXCEPTS", "e", -1);
1075	–	add_isupport("INVEX", "I", -1);
1076	–	}
1077	–
1078	–	/*
1079	–	* add_isupport()
1080	–	*
1081	–	* input        - name of supported function
1082	–	*              - options if any
1083	–	*              - number if any
1084	–	* output       - NONE
1085	–	* side effects - Each supported item must call this when activated
1086	–	*/
1087	–	void
1088	–	add_isupport(const char *name, const char *options, int n)
1089	–	{
1090	–	dlink_node *ptr;
1091	–	struct Isupport *support = NULL;
1092	–
1093	–	DLINK_FOREACH(ptr, support_list.head)
1094	–	{
1095	–	support = ptr->data;
1096	–	if (irccmp(support->name, name) == 0)
1097	–	{
1098	–	MyFree(support->name);
1099	–	MyFree(support->options);
1100	–	break;
1101	–	}
1102	–	}
1103	–
1104	–	if (ptr == NULL)
1105	–	{
1106	–	support = MyCalloc(sizeof(*support));
1107	–	dlinkAddTail(support, &support->node, &support_list);
1108	–	}
1109	–
1110	–	support->name = xstrdup(name);
1111	–	if (options)
1112	–	support->options = xstrdup(options);
1113	–	support->number = n;
1114	–
1115	–	rebuild_isupport_message_line();
1116	–	}
1117	–
1118	–	/*
1119	–	* delete_isupport()
1120	–	*
1121	–	* input        - name of supported function
1122	–	* output       - NONE
1123	–	* side effects - Each supported item must call this when deactivated
1124	–	*/
1125	–	void
1126	–	delete_isupport(const char *name)
1127	–	{
1128	–	dlink_node *ptr;
1129	–	struct Isupport *support;
1130	–
1131	–	DLINK_FOREACH(ptr, support_list.head)
1132	–	{
1133	–	support = ptr->data;
1134	–	if (irccmp(support->name, name) == 0)
1135	–	{
1136	–	dlinkDelete(ptr, &support_list);
1137	–	MyFree(support->name);
1138	–	MyFree(support->options);
1139	–	MyFree(support);
1140	–	break;
1141	–	}
1142	–	}
1143	–
1144	–	rebuild_isupport_message_line();
1145	–	}
1146	–
1147	–	/*
1148	–	* rebuild_isupport_message_line
1149	–	*
1150	–	* input        - NONE
1151	–	* output       - NONE
1152	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1153	–	*/
1154	–	void
1155	–	rebuild_isupport_message_line(void)
1156	–	{
1157	–	char isupportbuffer[IRCD_BUFSIZE];
1158	–	char *p = isupportbuffer;
1159	–	dlink_node *ptr = NULL, *ptr_next = NULL;
1160	–	int n = 0;
1161	–	int tokens = 0;
1162	–	size_t len = 0;
1163	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1164	–
1165	–	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1166	–	{
1167	–	dlinkDelete(ptr, &support_list_lines);
1168	–	MyFree(ptr->data);
1169	–	free_dlink_node(ptr);
1170	–	}
1171	–
1172	–	DLINK_FOREACH(ptr, support_list.head)
1173	–	{
1174	–	struct Isupport *support = ptr->data;
1175	–
1176	–	p += (n = sprintf(p, "%s", support->name));
1177	–	len += n;
1178	–
1179	–	if (support->options)
1180	–	{
1181	–	p += (n = sprintf(p, "=%s", support->options));
1182	–	len += n;
1183	–	}
1184	–
1185	–	if (support->number > 0)
1186	–	{
1187	–	p += (n = sprintf(p, "=%d", support->number));
1188	–	len += n;
1189	–	}
1190	–
1191	–	*p++ = ' ';
1192	–	len++;
1193	–	*p = '\0';
1194	–
1195	–	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1196	–	{ /* arbritrary for now */
1197	–	if (*--p == ' ')
1198	–	*p = '\0';
1199	–
1200	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1201	–	p = isupportbuffer;
1202	–	len = 0;
1203	–	n = tokens = 0;
1204	–	}
1205	–	}
1206	–
1207	–	if (len)
1208	–	{
1209	–	if (*--p == ' ')
1210	–	*p = '\0';
1211	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1212	–	}
1213	–	}

Diff Legend

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