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 7601 by michael, Mon Jun 13 19:03:05 2016 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-2016 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"
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41	+	#include "conf_gecos.h"
42		#include "log.h"
43		#include "server.h"
44		#include "send.h"
#	Line 47 | Line 49
49		#include "misc.h"
50		#include "parse.h"
51		#include "watch.h"
52	+	#include "isupport.h"
53	+	#include "tls.h"
54
55		static char umode_buffer[IRCD_BUFSIZE];
52	–	static const char *uid_get(void);
56
57	<	/* Used for building up the isupport string,
58	<	* 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] =
57	>	const struct user_modes *umode_map[256];
58	>	const struct user_modes  umode_tab[] =
59		{
60	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
61	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
62	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
63	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
64	<	0,                  /* @ */
65	<	0,                  /* A */
66	<	0,                  /* B */
67	<	0,                  /* C */
68	<	UMODE_DEAF,         /* D */
69	<	0,                  /* E */
70	<	UMODE_FARCONNECT,   /* F */
71	<	UMODE_SOFTCALLERID, /* G */
72	<	UMODE_HIDDEN,       /* H */
73	<	0,                  /* I */
74	<	0,                  /* J */
75	<	0,                  /* K */
76	<	0,                  /* L */
77	<	0,                  /* M */
78	<	0,                  /* N */
79	<	0,                  /* O */
80	<	0,                  /* P */
81	<	0,                  /* Q */
82	<	UMODE_REGONLY,      /* R */
83	<	UMODE_SSL,          /* S */
84	<	0,                  /* T */
85	<	0,                  /* U */
86	<	0,                  /* V */
87	<	UMODE_WEBIRC,       /* W */
88	<	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 */
60	>	{ 'D', UMODE_DEAF         },
61	>	{ 'F', UMODE_FARCONNECT   },
62	>	{ 'G', UMODE_SOFTCALLERID },
63	>	{ 'H', UMODE_HIDDEN       },
64	>	{ 'R', UMODE_REGONLY      },
65	>	{ 'S', UMODE_SSL          },
66	>	{ 'W', UMODE_WEBIRC       },
67	>	{ 'a', UMODE_ADMIN        },
68	>	{ 'b', UMODE_BOTS         },
69	>	{ 'c', UMODE_CCONN        },
70	>	{ 'd', UMODE_DEBUG        },
71	>	{ 'e', UMODE_EXTERNAL     },
72	>	{ 'f', UMODE_FULL         },
73	>	{ 'g', UMODE_CALLERID     },
74	>	{ 'i', UMODE_INVISIBLE    },
75	>	{ 'j', UMODE_REJ          },
76	>	{ 'k', UMODE_SKILL        },
77	>	{ 'l', UMODE_LOCOPS       },
78	>	{ 'n', UMODE_NCHANGE      },
79	>	{ 'o', UMODE_OPER         },
80	>	{ 'p', UMODE_HIDECHANS    },
81	>	{ 'q', UMODE_HIDEIDLE     },
82	>	{ 'r', UMODE_REGISTERED   },
83	>	{ 's', UMODE_SERVNOTICE   },
84	>	{ 'u', UMODE_UNAUTH       },
85	>	{ 'w', UMODE_WALLOP       },
86	>	{ 'x', UMODE_HIDDENHOST   },
87	>	{ 'y', UMODE_SPY          },
88	>	{ '\0', 0 }
89		};
90
91		void
92	<	assemble_umode_buffer(void)
92	>	user_modes_init(void)
93		{
145	–	unsigned int idx = 0;
94		char *umode_buffer_ptr = umode_buffer;
95
96	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
97	<	if (user_modes[idx])
98	<	*umode_buffer_ptr++ = idx;
96	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
97	>	{
98	>	umode_map[tab->c] = tab;
99	>	*umode_buffer_ptr++ = tab->c;
100	>	}
101
102		*umode_buffer_ptr = '\0';
103		}
#	Line 162 | Line 112 | void
112		show_lusers(struct Client *source_p)
113		{
114		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
115	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
115	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
116		Count.invisi, dlink_list_length(&global_server_list));
117		else
118	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
119	<	(Count.total - Count.invisi), Count.invisi, 1);
118	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
119	>	Count.invisi, 1);
120
121		if (Count.oper)
122		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 201 | Line 151 | show_lusers(struct Client *source_p)
151		Count.max_loc_con = Count.local + Count.myserver;
152		}
153
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	–
154		/* report_and_set_user_flags()
155		*
156		* inputs       - pointer to source_p
#	Line 230 | Line 164 | report_and_set_user_flags(struct Client
164		{
165		/* If this user is being spoofed, tell them so */
166		if (IsConfDoSpoofIp(conf))
167	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
167	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
168
169	<	/* If this user is in the exception class, Set it "E lined" */
169	>	/* If this user is in the exception class, set it "E lined" */
170		if (IsConfExemptKline(conf))
171		{
172	<	SetExemptKline(source_p);
173	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
172	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
173	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
174		}
175
176	<	/*
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))
176	>	if (IsConfExemptXline(conf))
177		{
178	<	SetExemptGline(source_p);
179	<	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
178	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
179	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
180		}
181
182		if (IsConfExemptResv(conf))
183		{
184	<	SetExemptResv(source_p);
185	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
185	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
186		}
187
188		/* If this user is exempt from user limits set it "F lined" */
189		if (IsConfExemptLimits(conf))
190		{
191	<	SetExemptLimits(source_p);
192	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	>	AddFlag(source_p, FLAGS_NOLIMIT);
192	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
193		}
194
195		if (IsConfCanFlood(conf))
196		{
197	<	SetCanFlood(source_p);
198	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	<	"protection, aren't you fearsome.");
197	>	AddFlag(source_p, FLAGS_CANFLOOD);
198	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
199		}
200		}
201
#	Line 281 | Line 210 | report_and_set_user_flags(struct Client
210		static void
211		introduce_client(struct Client *source_p)
212		{
213	<	dlink_node *ptr = NULL;
213	>	dlink_node *node = NULL;
214		char ubuf[IRCD_BUFSIZE] = "";
215
216	<	if (MyClient(source_p))
288	<	send_umode(source_p, source_p, 0, ubuf);
289	<	else
290	<	send_umode(NULL, source_p, 0, ubuf);
291	<
216	>	send_umode(source_p, MyConnect(source_p), 0, ubuf);
217		watch_check_hash(source_p, RPL_LOGON);
218
219		if (ubuf[0] == '\0')
#	Line 297 | Line 222 | introduce_client(struct Client *source_p
222		ubuf[1] = '\0';
223		}
224
225	<	DLINK_FOREACH(ptr, local_server_list.head)
225	>	DLINK_FOREACH(node, local_server_list.head)
226		{
227	<	struct Client *server = ptr->data;
227	>	struct Client *server = node->data;
228
229		if (server == source_p->from)
230		continue;
231
232	<	if (IsCapable(server, CAP_SVS))
233	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
234	<	source_p->servptr->id,
235	<	source_p->name, source_p->hopcount+1,
236	<	(unsigned long)source_p->tsinfo,
237	<	ubuf, source_p->username, source_p->host,
238	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
239	<	"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);
232	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
233	>	source_p->servptr->id,
234	>	source_p->name, source_p->hopcount+1,
235	>	source_p->tsinfo,
236	>	ubuf, source_p->username, source_p->host,
237	>	source_p->sockhost, source_p->id,
238	>	source_p->account,
239	>	source_p->info);
240
241		if (!EmptyString(source_p->certfp))
242		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 337 | Line 252 | introduce_client(struct Client *source_p
252		static void
253		user_welcome(struct Client *source_p)
254		{
340	–	#if defined(__TIME__) && defined(__DATE__)
255		static const char built_date[] = __DATE__ " at " __TIME__;
342	–	#else
343	–	static const char built_date[] = "unknown";
344	–	#endif
256
346	–	#ifdef HAVE_LIBCRYPTO
257		if (HasFlag(source_p, FLAGS_SSL))
258		{
259		AddUMode(source_p, UMODE_SSL);
260		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
261	<	ssl_get_cipher(source_p->connection->fd.ssl));
261	>	tls_get_cipher(&source_p->connection->fd.ssl));
262		}
353	–	#endif
263
264		sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
265		source_p->name);
266		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
267	<	get_listener_name(source_p->connection->listener), ircd_version);
267	>	listener_get_name(source_p->connection->listener), ircd_version);
268		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
269		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);
270
271	+	isupport_show(source_p);
272		show_lusers(source_p);
273		motd_signon(source_p);
274		}
#	Line 374 | Line 282 | user_welcome(struct Client *source_p)
282		static int
283		check_xline(struct Client *source_p)
284		{
285	<	struct MaskItem *conf = NULL;
378	<	const char *reason = NULL;
379	<
380	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
381	<	{
382	<	++conf->count;
285	>	const struct GecosItem *gecos = NULL;
286
287	<	if (conf->reason)
288	<	reason = conf->reason;
386	<	else
387	<	reason = CONF_NOREASON;
287	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
288	>	return 0;
289
290	+	if ((gecos = gecos_find(source_p->info, match)))
291	+	{
292		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
293		"X-line Rejecting [%s] [%s], user %s [%s]",
294	<	source_p->info, reason,
294	>	source_p->info, gecos->reason,
295		get_client_name(source_p, HIDE_IP),
296		source_p->sockhost);
297
#	Line 408 | Line 311 | check_xline(struct Client *source_p)
311		void
312		register_local_user(struct Client *source_p)
313		{
411	–	const char *id = NULL;
314		const struct MaskItem *conf = NULL;
315
316		assert(source_p == source_p->from);
317		assert(MyConnect(source_p));
318	+	assert(IsUnknown(source_p));
319		assert(!source_p->connection->registration);
320
418	–	ClearCap(source_p, CAP_TS6);
419	–
321		if (ConfigGeneral.ping_cookie)
322		{
323	<	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
323	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
324		{
325		do
326		source_p->connection->random_ping = genrand_int32();
327		while (!source_p->connection->random_ping);
328
329	<	sendto_one(source_p, "PING :%u",
330	<	source_p->connection->random_ping);
430	<	SetPingSent(source_p);
329	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
330	>	AddFlag(source_p, FLAGS_PINGSENT);
331		return;
332		}
333
334	<	if (!HasPingCookie(source_p))
334	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
335		return;
336		}
337
#	Line 446 | Line 346 | register_local_user(struct Client *sourc
346		{
347		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
348		"character in your hostname");
349	<	strlcpy(source_p->host, source_p->sockhost,
450	<	sizeof(source_p->host));
349	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
350		}
351
352		conf = source_p->connection->confs.head->data;
353
354	<	if (!IsGotId(source_p))
354	>	if (!HasFlag(source_p, FLAGS_GOTID))
355		{
356		char username[USERLEN + 1] = "";
458	–	const char *p = username;
357		unsigned int i = 0;
358
359		if (IsNeedIdentd(conf))
#	Line 472 | Line 370 | register_local_user(struct Client *sourc
370		if (!IsNoTilde(conf))
371		source_p->username[i++] = '~';
372
373	<	for (; *p && i < USERLEN; ++p)
373	>	for (const char *p = username; *p && i < USERLEN; ++p)
374		source_p->username[i++] = *p;
375
376		source_p->username[i] = '\0';
#	Line 493 | Line 391 | register_local_user(struct Client *sourc
391
392		/*
393		* Don't free source_p->connection->password here - it can be required
394	<	* by masked /stats I if there are auth{} blocks with need_password = no;
394	>	* by masked /stats I if there are auth {} blocks with need_password = no;
395		* --adx
396		*/
397
#	Line 513 | Line 411 | register_local_user(struct Client *sourc
411		* probably be just a percentage of the MAXCLIENTS...
412		*   -Taner
413		*/
414	<	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
415	<	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
414	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
415	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
416		{
417		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
418		"Too many clients, rejecting %s[%s].",
#	Line 540 | Line 438 | register_local_user(struct Client *sourc
438		if (check_xline(source_p))
439		return;
440
441	+	const char *id;
442		while (hash_find_id((id = uid_get())))
443		;
444
#	Line 549 | Line 448 | register_local_user(struct Client *sourc
448		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
449		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
450		source_p->name, source_p->username, source_p->host,
451	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553	<	"255.255.255.255" : source_p->sockhost,
451	>	source_p->sockhost,
452		get_client_class(&source_p->connection->confs),
453		source_p->info, source_p->id);
454
#	Line 565 | Line 463 | register_local_user(struct Client *sourc
463		Count.max_loc = Count.local;
464
465		if (!(Count.max_loc % 10))
466	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
466	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
467		"New maximum local client connections: %u",
468		Count.max_loc);
469		}
#	Line 585 | Line 483 | register_local_user(struct Client *sourc
483		&unknown_list, &local_client_list);
484
485		user_welcome(source_p);
486	<	add_user_host(source_p->username, source_p->host, 0);
487	<	SetUserHost(source_p);
486	>	userhost_add(source_p->username, source_p->host, 0);
487	>	AddFlag(source_p, FLAGS_USERHOST);
488
489		introduce_client(source_p);
490		}
#	Line 614 | Line 512 | register_remote_user(struct Client *sour
512		source_p->host, source_p->servptr->name,
513		target_p->name, target_p->from->name);
514		sendto_one(source_p->from,
515	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
515	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
516		me.id, source_p->id, me.name, source_p->servptr->name,
517		target_p->from->name);
518
519		AddFlag(source_p, FLAGS_KILLED);
520	<	exit_client(source_p, "USER server wrong direction");
520	>	exit_client(source_p, "UID server wrong direction");
521		return;
522		}
523
#	Line 636 | Line 534 | register_remote_user(struct Client *sour
534		SetClient(source_p);
535		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
536		dlinkAdd(source_p, &source_p->node, &global_client_list);
537	<	add_user_host(source_p->username, source_p->host, 1);
538	<	SetUserHost(source_p);
537	>	userhost_add(source_p->username, source_p->host, 1);
538	>	AddFlag(source_p, FLAGS_USERHOST);
539
540		if (HasFlag(source_p->servptr, FLAGS_EOB))
541		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
542	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
542	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
543		source_p->servptr->name,
544		source_p->name, source_p->username, source_p->host,
545	<	source_p->info, source_p->id);
545	>	source_p->sockhost, source_p->info, source_p->id);
546
547		introduce_client(source_p);
548		}
#	Line 689 | Line 587 | valid_hostname(const char *hostname)
587		int
588		valid_username(const char *username, const int local)
589		{
692	–	unsigned int dots = 0;
590		const char *p = username;
591
592		assert(p);
#	Line 707 | Line 604 | valid_username(const char *username, con
604
605		if (local)
606		{
607	+	unsigned int dots = 0;
608	+
609		while (*++p)
610		{
611		if (*p == '.' && ConfigGeneral.dots_in_ident)
#	Line 742 | Line 641 | valid_nickname(const char *nickname, con
641		{
642		const char *p = nickname;
643
644	<	assert(nickname && *nickname);
644	>	assert(p);
645
646		/*
647		* Nicks can't start with a digit or - or be 0 length.
648		*/
649	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
649	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
650		return 0;
651
652		for (; *p; ++p)
#	Line 757 | Line 656 | valid_nickname(const char *nickname, con
656		return p - nickname <= NICKLEN;
657		}
658
659	<	/* send_umode()
660	<	* send the MODE string for user (user) to connection client_p
661	<	* -avalon
662	<	*
663	<	* inputs       - client_p
765	<	*              - source_p
766	<	*              - int old
767	<	*              - sendmask mask of modes to send
768	<	*              - suplied umode_buf
769	<	* output       - NONE
659	>	/*! \brief Builds a mode change string to buffer pointed by \a buf
660	>	* \param client_p  Pointer to client
661	>	* \param send      Whether to send a MODE message to client_p
662	>	* \param old       Old user mode to compare against when building new mode buffer
663	>	* \param buf       Pointer to buffer to build string in
664		*/
665		void
666	<	send_umode(struct Client *client_p, struct Client *source_p,
667	<	unsigned int old, char *umode_buf)
666	>	send_umode(struct Client *client_p, unsigned int send,
667	>	unsigned int old, char *buf)
668		{
669	<	char *m = umode_buf;
669	>	char *m = buf;
670		int what = 0;
671
672		/*
673		* Build a string in umode_buf to represent the change in the user's
674		* mode between the new (source_p->umodes) and 'old'.
675		*/
676	<	for (unsigned int i = 0; i < 128; ++i)
676	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
677		{
678	<	unsigned int flag = user_modes[i];
785	<
786	<	if (!flag)
787	<	continue;
788	<
789	<	if ((flag & old) && !HasUMode(source_p, flag))
678	>	if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
679		{
680		if (what == MODE_DEL)
681	<	*m++ = (char)i;
681	>	*m++ = tab->c;
682		else
683		{
684		what = MODE_DEL;
685		*m++ = '-';
686	<	*m++ = (char)i;
686	>	*m++ = tab->c;
687		}
688		}
689	<	else if (!(flag & old) && HasUMode(source_p, flag))
689	>	else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
690		{
691		if (what == MODE_ADD)
692	<	*m++ = (char)i;
692	>	*m++ = tab->c;
693		else
694		{
695		what = MODE_ADD;
696		*m++ = '+';
697	<	*m++ = (char)i;
697	>	*m++ = tab->c;
698		}
699		}
700		}
701
702		*m = '\0';
703
704	<	if (*umode_buf && client_p)
704	>	if (send && *buf)
705		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
706		client_p->name, client_p->username,
707	<	client_p->host, client_p->name, umode_buf);
707	>	client_p->host, client_p->name, buf);
708		}
709
710		/* send_umode_out()
#	Line 825 | Line 714 | send_umode(struct Client *client_p, stru
714		* side effects - Only send ubuf out to servers that know about this client
715		*/
716		void
717	<	send_umode_out(struct Client *client_p, struct Client *source_p,
829	<	unsigned int old)
717	>	send_umode_out(struct Client *source_p, unsigned int old)
718		{
719		char buf[IRCD_BUFSIZE] = "";
720
721	<	send_umode(NULL, source_p, old, buf);
721	>	send_umode(source_p, MyConnect(source_p), old, buf);
722
723		if (buf[0])
724	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
724	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
725		source_p->id, source_p->id, buf);
838	–
839	–	if (client_p && MyClient(client_p))
840	–	send_umode(client_p, source_p, old, buf);
726		}
727
728		void
729		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
730		{
731	<	dlink_node *ptr = NULL;
731	>	dlink_node *node = NULL;
732
733		if (!strcmp(target_p->host, hostname))
734		return;
#	Line 852 | Line 737 | user_set_hostmask(struct Client *target_
737		{
738		case MODE_ADD:
739		AddUMode(target_p, UMODE_HIDDENHOST);
855	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
740		break;
741		case MODE_DEL:
742		DelUMode(target_p, UMODE_HIDDENHOST);
859	–
860	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
861	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
743		break;
744		default: return;
745		}
746
747		if (ConfigGeneral.cycle_on_host_change)
748	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
748	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
749		target_p->name, target_p->username, target_p->host);
750
751	<	if (IsUserHostIp(target_p))
752	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
751	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
752	>	target_p->name, target_p->username,
753	>	target_p->host, target_p->username, hostname);
754	>
755	>	if (HasFlag(target_p, FLAGS_USERHOST))
756	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
757
758		strlcpy(target_p->host, hostname, sizeof(target_p->host));
759
760	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
761	<	SetUserHost(target_p);
760	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
761	>	AddFlag(target_p, FLAGS_USERHOST);
762
763	<	if (MyClient(target_p))
763	>	if (MyConnect(target_p))
764		{
765		sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
766		clear_ban_cache_client(target_p);
#	Line 884 | Line 769 | user_set_hostmask(struct Client *target_
769		if (!ConfigGeneral.cycle_on_host_change)
770		return;
771
772	<	DLINK_FOREACH(ptr, target_p->channel.head)
772	>	DLINK_FOREACH(node, target_p->channel.head)
773		{
774	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
774	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
775	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
776		char *p = modebuf;
777		int len = 0;
778	<	const struct Membership *ms = ptr->data;
778	>	const struct Membership *member = node->data;
779
780	<	if (has_member_flags(ms, CHFL_CHANOP))
780	>	if (has_member_flags(member, CHFL_CHANOP))
781		{
782		*p++ = 'o';
783		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
784		}
785
786	<	if (has_member_flags(ms, CHFL_HALFOP))
786	>	if (has_member_flags(member, CHFL_HALFOP))
787		{
788		*p++ = 'h';
789		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
790		}
791
792	<	if (has_member_flags(ms, CHFL_VOICE))
792	>	if (has_member_flags(member, CHFL_VOICE))
793		{
794		*p++ = 'v';
795		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 911 | Line 797 | user_set_hostmask(struct Client *target_
797
798		*p = '\0';
799
800	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
801	<	target_p->name, target_p->username, target_p->host,
802	<	ms->chptr->name);
803	<	if (nickbuf[0])
804	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
805	<	target_p->servptr->name, ms->chptr->name,
806	<	modebuf, nickbuf);
800	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
801	>	target_p->name, target_p->username,
802	>	target_p->host, member->chptr->name,
803	>	target_p->account, target_p->info);
804	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
805	>	target_p->name, target_p->username,
806	>	target_p->host, member->chptr->name);
807
808	+	if (nickbuf[0])
809	+	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
810	+	target_p->servptr->name, member->chptr->name,
811	+	modebuf, nickbuf);
812		}
813
814		if (target_p->away[0])
815	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
815	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
816		":%s!%s@%s AWAY :%s",
817		target_p->name, target_p->username,
818		target_p->host, target_p->away);
819		}
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)