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 3171 by michael, Sun Mar 16 11:51:48 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5558 by michael, Fri Feb 13 20:45:49 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 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	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 73 | Line 65 | struct Isupport
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] =
68	>	const struct user_modes *umode_map[256];
69	>	const struct user_modes  umode_tab[] =
70		{
71	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	0,                  /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	UMODE_FARCONNECT,   /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	UMODE_HIDDEN,       /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
88	<	0,                  /* M */
89	<	0,                  /* N */
90	<	0,                  /* O */
91	<	0,                  /* P */
92	<	0,                  /* Q */
93	<	UMODE_REGONLY,      /* R */
94	<	UMODE_SSL,          /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	UMODE_WEBIRC,       /* W */
99	<	0,                  /* X */
108	<	0,                  /* Y */
109	<	0,                  /* Z 0x5A */
110	<	0, 0, 0, 0, 0,      /* 0x5F   */
111	<	0,                  /* 0x60   */
112	<	UMODE_ADMIN,        /* a */
113	<	UMODE_BOTS,         /* b */
114	<	UMODE_CCONN,        /* c */
115	<	UMODE_DEBUG,        /* d */
116	<	UMODE_EXTERNAL,     /* e */
117	<	UMODE_FULL,         /* f */
118	<	UMODE_CALLERID,     /* g */
119	<	0,                  /* h */
120	<	UMODE_INVISIBLE,    /* i */
121	<	UMODE_REJ,          /* j */
122	<	UMODE_SKILL,        /* k */
123	<	UMODE_LOCOPS,       /* l */
124	<	0,                  /* m */
125	<	UMODE_NCHANGE,      /* n */
126	<	UMODE_OPER,         /* o */
127	<	0,                  /* p */
128	<	0,                  /* q */
129	<	UMODE_REGISTERED,   /* r */
130	<	UMODE_SERVNOTICE,   /* s */
131	<	0,                  /* t */
132	<	UMODE_UNAUTH,       /* u */
133	<	0,                  /* v */
134	<	UMODE_WALLOP,       /* w */
135	<	UMODE_HIDDENHOST,   /* x */
136	<	UMODE_SPY,          /* y */
137	<	UMODE_OPERWALL,     /* z      0x7A */
138	<	0,0,0,0,0,          /* 0x7B - 0x7F */
139	<
140	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
141	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
142	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
143	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
144	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
145	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
146	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
147	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71	>	{ 'D', UMODE_DEAF         },
72	>	{ 'F', UMODE_FARCONNECT   },
73	>	{ 'G', UMODE_SOFTCALLERID },
74	>	{ 'H', UMODE_HIDDEN       },
75	>	{ 'R', UMODE_REGONLY      },
76	>	{ 'S', UMODE_SSL          },
77	>	{ 'W', UMODE_WEBIRC       },
78	>	{ 'a', UMODE_ADMIN        },
79	>	{ 'b', UMODE_BOTS         },
80	>	{ 'c', UMODE_CCONN        },
81	>	{ 'd', UMODE_DEBUG        },
82	>	{ 'e', UMODE_EXTERNAL     },
83	>	{ 'f', UMODE_FULL         },
84	>	{ 'g', UMODE_CALLERID     },
85	>	{ 'i', UMODE_INVISIBLE    },
86	>	{ 'j', UMODE_REJ          },
87	>	{ 'k', UMODE_SKILL        },
88	>	{ 'l', UMODE_LOCOPS       },
89	>	{ 'n', UMODE_NCHANGE      },
90	>	{ 'o', UMODE_OPER         },
91	>	{ 'p', UMODE_HIDECHANS    },
92	>	{ 'q', UMODE_HIDEIDLE     },
93	>	{ 'r', UMODE_REGISTERED   },
94	>	{ 's', UMODE_SERVNOTICE   },
95	>	{ 'u', UMODE_UNAUTH       },
96	>	{ 'w', UMODE_WALLOP       },
97	>	{ 'x', UMODE_HIDDENHOST   },
98	>	{ 'y', UMODE_SPY          },
99	>	{ '\0', 0 }
100		};
101
102		void
103	<	assemble_umode_buffer(void)
103	>	user_usermodes_init(void)
104		{
153	–	unsigned int idx = 0;
105		char *umode_buffer_ptr = umode_buffer;
106
107	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108	<	if (user_modes[idx])
109	<	*umode_buffer_ptr++ = idx;
107	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108	>	{
109	>	umode_map[tab->c] = tab;
110	>	*umode_buffer_ptr++ = tab->c;
111	>	}
112
113		*umode_buffer_ptr = '\0';
114		}
#	Line 170 | Line 123 | void
123		show_lusers(struct Client *source_p)
124		{
125		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
127	<	Count.invisi, dlink_list_length(&global_serv_list));
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
127	>	Count.invisi, dlink_list_length(&global_server_list));
128		else
129	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
130	<	(Count.total-Count.invisi), Count.invisi, 1);
129	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
130	>	Count.invisi, 1);
131
132	<	if (Count.oper > 0)
132	>	if (Count.oper)
133		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
134
135	<	if (dlink_list_length(&unknown_list) > 0)
135	>	if (dlink_list_length(&unknown_list))
136		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
137
138	<	if (dlink_list_length(&global_channel_list) > 0)
139	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
138	>	if (dlink_list_length(&channel_list))
139	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
140
141		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142		{
#	Line 218 | Line 171 | show_lusers(struct Client *source_p)
171		void
172		show_isupport(struct Client *source_p)
173		{
174	<	const dlink_node *ptr = NULL;
174	>	const dlink_node *node = NULL;
175
176	<	DLINK_FOREACH(ptr, support_list_lines.head)
177	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
176	>	DLINK_FOREACH(node, support_list_lines.head)
177	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178		}
179
180	<	/*
181	<	** register_local_user
182	<	**      This function is called when both NICK and USER messages
183	<	**      have been accepted for the client, in whatever order. Only
184	<	**      after this, is the USER message propagated.
185	<	**
186	<	**      NICK's must be propagated at once when received, although
187	<	**      it would be better to delay them too until full info is
188	<	**      available. Doing it is not so simple though, would have
189	<	**      to implement the following:
190	<	**
191	<	**      (actually it has been implemented already for a while) -orabidoo
192	<	**
193	<	**      1) user telnets in and gives only "NICK foobar" and waits
194	<	**      2) another user far away logs in normally with the nick
195	<	**         "foobar" (quite legal, as this server didn't propagate
196	<	**         it).
197	<	**      3) now this server gets nick "foobar" from outside, but
198	<	**         has alread the same defined locally. Current server
199	<	**         would just issue "KILL foobar" to clean out dups. But,
200	<	**         this is not fair. It should actually request another
201	<	**         nick from local user or kill him/her...
202	<	*/
180	>
181	>	/* report_and_set_user_flags()
182	>	*
183	>	* inputs       - pointer to source_p
184	>	*              - pointer to conf for this user
185	>	* output       - NONE
186	>	* side effects - Report to user any special flags
187	>	*                they are getting, and set them.
188	>	*/
189	>	static void
190	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
191	>	{
192	>	/* If this user is being spoofed, tell them so */
193	>	if (IsConfDoSpoofIp(conf))
194	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
195	>
196	>	/* If this user is in the exception class, set it "E lined" */
197	>	if (IsConfExemptKline(conf))
198	>	{
199	>	SetExemptKline(source_p);
200	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
201	>	}
202	>
203	>	/*
204	>	* The else here is to make sure that G line exempt users
205	>	* do not get noticed twice.
206	>	*/
207	>	else if (IsConfExemptGline(conf))
208	>	{
209	>	SetExemptGline(source_p);
210	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
211	>	}
212	>
213	>	if (IsConfExemptResv(conf))
214	>	{
215	>	SetExemptResv(source_p);
216	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
217	>	}
218	>
219	>	/* If this user is exempt from user limits set it "F lined" */
220	>	if (IsConfExemptLimits(conf))
221	>	{
222	>	SetExemptLimits(source_p);
223	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
224	>	}
225	>
226	>	if (IsConfCanFlood(conf))
227	>	{
228	>	SetCanFlood(source_p);
229	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
230	>	"protection, aren't you fearsome.");
231	>	}
232	>	}
233	>
234	>	/* introduce_client()
235	>	*
236	>	* inputs       - source_p
237	>	* output       - NONE
238	>	* side effects - This common function introduces a client to the rest
239	>	*                of the net, either from a local client connect or
240	>	*                from a remote connect.
241	>	*/
242	>	static void
243	>	introduce_client(struct Client *source_p)
244	>	{
245	>	dlink_node *node = NULL;
246	>	char ubuf[IRCD_BUFSIZE] = "";
247	>
248	>	if (MyClient(source_p))
249	>	send_umode(source_p, source_p, 0, ubuf);
250	>	else
251	>	send_umode(NULL, source_p, 0, ubuf);
252	>
253	>	watch_check_hash(source_p, RPL_LOGON);
254	>
255	>	if (ubuf[0] == '\0')
256	>	{
257	>	ubuf[0] = '+';
258	>	ubuf[1] = '\0';
259	>	}
260	>
261	>	DLINK_FOREACH(node, local_server_list.head)
262	>	{
263	>	struct Client *server = node->data;
264	>
265	>	if (server == source_p->from)
266	>	continue;
267	>
268	>	if (IsCapable(server, CAP_SVS))
269	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
270	>	source_p->servptr->id,
271	>	source_p->name, source_p->hopcount+1,
272	>	(unsigned long)source_p->tsinfo,
273	>	ubuf, source_p->username, source_p->host,
274	>	source_p->sockhost, source_p->id,
275	>	source_p->account,
276	>	source_p->info);
277	>	else
278	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
279	>	source_p->servptr->id,
280	>	source_p->name, source_p->hopcount+1,
281	>	(unsigned long)source_p->tsinfo,
282	>	ubuf, source_p->username, source_p->host,
283	>	source_p->sockhost, source_p->id, source_p->info);
284	>
285	>	if (!EmptyString(source_p->certfp))
286	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
287	>	}
288	>	}
289	>
290	>	/* user_welcome()
291	>	*
292	>	* inputs       - client pointer to client to welcome
293	>	* output       - NONE
294	>	* side effects -
295	>	*/
296	>	static void
297	>	user_welcome(struct Client *source_p)
298	>	{
299	>	#if defined(__TIME__) && defined(__DATE__)
300	>	static const char built_date[] = __DATE__ " at " __TIME__;
301	>	#else
302	>	static const char built_date[] = "unknown";
303	>	#endif
304	>
305	>	#ifdef HAVE_LIBCRYPTO
306	>	if (HasFlag(source_p, FLAGS_SSL))
307	>	{
308	>	AddUMode(source_p, UMODE_SSL);
309	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
310	>	ssl_get_cipher(source_p->connection->fd.ssl));
311	>	}
312	>	#endif
313	>
314	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
315	>	source_p->name);
316	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
317	>	get_listener_name(source_p->connection->listener), ircd_version);
318	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
319	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
320	>	show_isupport(source_p);
321	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
322	>
323	>	show_lusers(source_p);
324	>	motd_signon(source_p);
325	>	}
326	>
327	>	/* check_xline()
328	>	*
329	>	* inputs       - pointer to client to test
330	>	* outupt       - 1 if exiting 0 if ok
331	>	* side effects -
332	>	*/
333	>	static int
334	>	check_xline(struct Client *source_p)
335	>	{
336	>	struct MaskItem *conf = NULL;
337	>
338	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339	>	{
340	>	++conf->count;
341	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
342	>	"X-line Rejecting [%s] [%s], user %s [%s]",
343	>	source_p->info, conf->reason,
344	>	get_client_name(source_p, HIDE_IP),
345	>	source_p->sockhost);
346	>
347	>	++ServerStats.is_ref;
348	>	exit_client(source_p, "Bad user info");
349	>	return 1;
350	>	}
351	>
352	>	return 0;
353	>	}
354	>
355	>	/*! \brief This function is called when both NICK and USER messages
356	>	*      have been accepted for the client, in whatever order. Only
357	>	*      after this, is the UID message propagated.
358	>	* \param source_p Pointer to given client to introduce
359	>	*/
360		void
361		register_local_user(struct Client *source_p)
362		{
363		const char *id = NULL;
364		const struct MaskItem *conf = NULL;
365
256	–	assert(source_p != NULL);
366		assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	<	assert(!source_p->localClient->registration);
368	>	assert(!source_p->connection->registration);
369
370		ClearCap(source_p, CAP_TS6);
371
372	<	if (ConfigFileEntry.ping_cookie)
372	>	if (ConfigGeneral.ping_cookie)
373		{
374	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
374	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
375		{
376		do
377	<	source_p->localClient->random_ping = genrand_int32();
378	<	while (!source_p->localClient->random_ping);
377	>	source_p->connection->random_ping = genrand_int32();
378	>	while (!source_p->connection->random_ping);
379
380	<	sendto_one(source_p, "PING :%u",
272	<	source_p->localClient->random_ping);
380	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
381		SetPingSent(source_p);
382		return;
383		}
#	Line 278 | Line 386 | register_local_user(struct Client *sourc
386		return;
387		}
388
389	<	source_p->localClient->last_privmsg = CurrentTime;
389	>	source_p->connection->last_privmsg = CurrentTime;
390		/* Straight up the maximum rate of flooding... */
391	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
391	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
392
393		if (!check_client(source_p))
394		return;
#	Line 289 | Line 397 | register_local_user(struct Client *sourc
397		{
398		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
399		"character in your hostname");
400	<	strlcpy(source_p->host, source_p->sockhost,
293	<	sizeof(source_p->host));
400	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
401		}
402
403	<	conf = source_p->localClient->confs.head->data;
403	>	conf = source_p->connection->confs.head->data;
404
405		if (!IsGotId(source_p))
406		{
407	<	char username[USERLEN + 1];
407	>	char username[USERLEN + 1] = "";
408		const char *p = username;
409		unsigned int i = 0;
410
#	Line 316 | Line 423 | register_local_user(struct Client *sourc
423		source_p->username[i++] = '~';
424
425		for (; *p && i < USERLEN; ++p)
426	<	if (*p != '[')
320	<	source_p->username[i++] = *p;
426	>	source_p->username[i++] = *p;
427
428		source_p->username[i] = '\0';
429		}
430
431	<	/* password check */
431	>	/* Password check */
432		if (!EmptyString(conf->passwd))
433		{
434	<	const char *pass = source_p->localClient->passwd;
329	<
330	<	if (!match_conf_password(pass, conf))
434	>	if (!match_conf_password(source_p->connection->password, conf))
435		{
436		++ServerStats.is_ref;
437
#	Line 337 | Line 441 | register_local_user(struct Client *sourc
441		}
442		}
443
444	<	/* don't free source_p->localClient->passwd here - it can be required
445	<	* by masked /stats I if there are auth{} blocks with need_password = no;
444	>	/*
445	>	* Don't free source_p->connection->password here - it can be required
446	>	* by masked /stats I if there are auth {} blocks with need_password = no;
447		* --adx
448		*/
449
450	<	/* report if user has &^>= etc. and set flags as needed in source_p */
450	>	/*
451	>	* Report if user has &^>= etc. and set flags as needed in source_p
452	>	*/
453		report_and_set_user_flags(source_p, conf);
454
455		if (IsDead(source_p))
456		return;
457
458	<	/* Limit clients -
458	>	/*
459	>	* Limit clients -
460		* We want to be able to have servers and F-line clients
461		* connect, so save room for "buffer" connections.
462		* Smaller servers may want to decrease this, and it should
463		* probably be just a percentage of the MAXCLIENTS...
464		*   -Taner
465		*/
466	<	/* Except "F:" clients */
467	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
360	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
466	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
467	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
468		{
469		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
470		"Too many clients, rejecting %s[%s].",
#	Line 367 | Line 474 | register_local_user(struct Client *sourc
474		return;
475		}
476
370	–	/* valid user name check */
477		if (!valid_username(source_p->username, 1))
478		{
479	<	char tmpstr2[IRCD_BUFSIZE];
479	>	char buf[IRCD_BUFSIZE] = "";
480
481		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
482		"Invalid username: %s (%s@%s)",
483		source_p->name, source_p->username, source_p->host);
484		++ServerStats.is_ref;
485	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
486	<	source_p->username);
381	<	exit_client(source_p, tmpstr2);
485	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
486	>	exit_client(source_p, buf);
487		return;
488		}
489
490		if (check_xline(source_p))
491		return;
492
493	<	while (hash_find_id((id = uid_get())) != NULL)
493	>	while (hash_find_id((id = uid_get())))
494		;
495
496		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 394 | Line 499 | register_local_user(struct Client *sourc
499		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
500		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
501		source_p->name, source_p->username, source_p->host,
502	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
503	<	"255.255.255.255" : source_p->sockhost,
399	<	get_client_class(&source_p->localClient->confs),
502	>	source_p->sockhost,
503	>	get_client_class(&source_p->connection->confs),
504		source_p->info, source_p->id);
505
506	<	if (ConfigFileEntry.invisible_on_connect)
506	>	if (ConfigGeneral.invisible_on_connect)
507		{
508		AddUMode(source_p, UMODE_INVISIBLE);
509		++Count.invisi;
#	Line 411 | Line 515 | register_local_user(struct Client *sourc
515
516		if (!(Count.max_loc % 10))
517		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
518	<	"New Max Local Clients: %d",
518	>	"New maximum local client connections: %u",
519		Count.max_loc);
520		}
521
418	–	/* Increment our total user count here */
522		if (++Count.total > Count.max_tot)
523		Count.max_tot = Count.total;
524		++Count.totalrestartcount;
#	Line 423 | Line 526 | register_local_user(struct Client *sourc
526		assert(source_p->servptr == &me);
527		SetClient(source_p);
528		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
529	<
427	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
529	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
530
531		assert(dlinkFind(&unknown_list, source_p));
532
533	<	dlink_move_node(&source_p->localClient->lclient_node,
533	>	dlink_move_node(&source_p->connection->lclient_node,
534		&unknown_list, &local_client_list);
535
536		user_welcome(source_p);
#	Line 449 | Line 551 | register_local_user(struct Client *sourc
551		*                is introduced by a server.
552		*/
553		void
554	<	register_remote_user(struct Client *source_p, const char *username,
453	<	const char *host, const char *server)
554	>	register_remote_user(struct Client *source_p)
555		{
556	<	struct Client *target_p = NULL;
456	<
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, "Ghosted Client");
483	<	return;
484	<	}
556	>	const struct Client *target_p = NULL;
557
558		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
559		{
#	Line 490 | Line 562 | register_remote_user(struct Client *sour
562		source_p->from->name, source_p->name, source_p->username,
563		source_p->host, source_p->servptr->name,
564		target_p->name, target_p->from->name);
565	<	kill_client(source_p->from, source_p,
566	<	"%s (NICK from wrong direction (%s != %s))",
567	<	me.name, source_p->servptr->name, target_p->from->name);
565	>	sendto_one(source_p->from,
566	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
567	>	me.id, source_p->id, me.name, source_p->servptr->name,
568	>	target_p->from->name);
569	>
570		AddFlag(source_p, FLAGS_KILLED);
571	<	exit_client(source_p, "USER server wrong direction");
571	>	exit_client(source_p, "UID server wrong direction");
572		return;
573		}
574
#	Line 505 | Line 579 | register_remote_user(struct Client *sour
579		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
580		AddFlag(source_p, FLAGS_SERVICE);
581
508	–	/* Increment our total user count here */
582		if (++Count.total > Count.max_tot)
583		Count.max_tot = Count.total;
584
585		SetClient(source_p);
586		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
587	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
588		add_user_host(source_p->username, source_p->host, 1);
589		SetUserHost(source_p);
590
591		if (HasFlag(source_p->servptr, FLAGS_EOB))
518	–	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
519	–	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
520	–	source_p->servptr->name,
521	–	source_p->name, source_p->username, source_p->host,
522	–	source_p->info, source_p->id);
523	–
524	–	introduce_client(source_p);
525	–	}
526	–
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')
592		{
593	<	ubuf[0] = '+';
594	<	ubuf[1] = '\0';
595	<	}
596	<
597	<	DLINK_FOREACH(server_node, serv_list.head)
598	<	{
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);
593	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
594	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
595	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
596	>	source_p->servptr->name,
597	>	source_p->name, source_p->username, source_p->host,
598	>	source_p->sockhost, source_p->info, source_p->id);
599		else
600	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
601	<	source_p->servptr->id,
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
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);
600	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
601	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
602	>	source_p->servptr->name,
603	>	source_p->name, source_p->username, source_p->host,
604	>	source_p->info, source_p->id);
605		}
606	+
607	+	introduce_client(source_p);
608		}
609
610		/* valid_hostname()
#	Line 596 | Line 621 | valid_hostname(const char *hostname)
621		{
622		const char *p = hostname;
623
624	<	assert(p != NULL);
624	>	assert(p);
625
626		if (EmptyString(p) || *p == '.' || *p == ':')
627		return 0;
#	Line 622 | Line 647 | valid_hostname(const char *hostname)
647		int
648		valid_username(const char *username, const int local)
649		{
650	<	int dots      = 0;
650	>	unsigned int dots = 0;
651		const char *p = username;
652
653	<	assert(p != NULL);
653	>	assert(p);
654
655		if (*p == '~')
656		++p;
#	Line 642 | Line 667 | valid_username(const char *username, con
667		{
668		while (*++p)
669		{
670	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
670	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
671		{
672	<	if (++dots > ConfigFileEntry.dots_in_ident)
672	>	if (++dots > ConfigGeneral.dots_in_ident)
673		return 0;
674		if (!IsUserChar(*(p + 1)))
675		return 0;
#	Line 660 | Line 685 | valid_username(const char *username, con
685		return 0;
686		}
687
688	<	return  p - username <= USERLEN;;
688	>	return p - username <= USERLEN;
689		}
690
691		/* clean_nick_name()
#	Line 674 | Line 699 | int
699		valid_nickname(const char *nickname, const int local)
700		{
701		const char *p = nickname;
677	–	assert(nickname && *nickname);
702
703	<	/* nicks can't start with a digit or - or be 0 length */
704	<	/* This closer duplicates behaviour of hybrid-6 */
705	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
703	>	assert(p);
704	>
705	>	/*
706	>	* Nicks can't start with a digit or - or be 0 length.
707	>	*/
708	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
709		return 0;
710
711		for (; *p; ++p)
#	Line 688 | Line 715 | valid_nickname(const char *nickname, con
715		return p - nickname <= NICKLEN;
716		}
717
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] - command
748	–	* parv[1] - username to change mode for
749	–	* parv[2] - modes to change
750	–	*/
751	–	void
752	–	set_user_mode(struct Client *source_p, const int parc, char *parv[])
753	–	{
754	–	unsigned int flag, setflags;
755	–	char **p, *m, buf[IRCD_BUFSIZE];
756	–	struct Client *target_p;
757	–	int what = MODE_ADD, badflag = 0, i;
758	–
759	–	assert(!(parc < 2));
760	–
761	–	if ((target_p = find_person(source_p, parv[1])) == NULL)
762	–	{
763	–	if (MyConnect(source_p))
764	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
765	–	return;
766	–	}
767	–
768	–	if (source_p != target_p)
769	–	{
770	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
771	–	return;
772	–	}
773	–
774	–	if (parc < 3)
775	–	{
776	–	m = buf;
777	–	*m++ = '+';
778	–
779	–	for (i = 0; i < 128; ++i)
780	–	if (HasUMode(source_p, user_modes[i]))
781	–	*m++ = (char)i;
782	–	*m = '\0';
783	–
784	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
785	–	return;
786	–	}
787	–
788	–	/* find flags already set for user */
789	–	setflags = source_p->umodes;
790	–
791	–	/* parse mode change string(s) */
792	–	for (p = &parv[2]; p && *p; ++p)
793	–	{
794	–	for (m = *p; *m; ++m)
795	–	{
796	–	switch (*m)
797	–	{
798	–	case '+':
799	–	what = MODE_ADD;
800	–	break;
801	–	case '-':
802	–	what = MODE_DEL;
803	–	break;
804	–	case 'o':
805	–	if (what == MODE_ADD)
806	–	{
807	–	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
808	–	{
809	–	++Count.oper;
810	–	SetOper(source_p);
811	–	}
812	–	}
813	–	else
814	–	{
815	–	if (!HasUMode(source_p, UMODE_OPER))
816	–	break;
817	–
818	–	ClearOper(source_p);
819	–	Count.oper--;
820	–
821	–	if (MyConnect(source_p))
822	–	{
823	–	dlink_node *dm = NULL;
824	–
825	–	detach_conf(source_p, CONF_OPER);
826	–	ClrOFlag(source_p);
827	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
828	–
829	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
830	–	free_dlink_node(dm);
831	–	}
832	–	}
833	–
834	–	break;
835	–
836	–	case 'S':  /* Only servers may set +S in a burst */
837	–	case 'W':  /* Only servers may set +W in a burst */
838	–	case 'r':  /* Only services may set +r */
839	–	case 'x':  /* Only services may set +x */
840	–	break;
841	–
842	–	default:
843	–	if ((flag = user_modes[(unsigned char)*m]))
844	–	{
845	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
846	–	(ConfigFileEntry.oper_only_umodes & flag))
847	–	badflag = 1;
848	–	else
849	–	{
850	–	if (what == MODE_ADD)
851	–	AddUMode(source_p, flag);
852	–	else
853	–	DelUMode(source_p, flag);
854	–	}
855	–	}
856	–	else if (MyConnect(source_p))
857	–	badflag = 1;
858	–
859	–	break;
860	–	}
861	–	}
862	–	}
863	–
864	–	if (badflag)
865	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
866	–
867	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
868	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
869	–	{
870	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
871	–	DelUMode(source_p, UMODE_ADMIN);
872	–	}
873	–
874	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
875	–	++Count.invisi;
876	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
877	–	--Count.invisi;
878	–
879	–	/*
880	–	* compare new flags with old flags and send string which
881	–	* will cause servers to update correctly.
882	–	*/
883	–	send_umode_out(source_p, source_p, setflags);
884	–	}
885	–
718		/* send_umode()
719		* send the MODE string for user (user) to connection client_p
720		* -avalon
#	Line 896 | Line 728 | set_user_mode(struct Client *source_p, c
728		*/
729		void
730		send_umode(struct Client *client_p, struct Client *source_p,
731	<	unsigned int old, unsigned int sendmask, char *umode_buf)
731	>	unsigned int old, char *umode_buf)
732		{
733		char *m = umode_buf;
734		int what = 0;
903	–	unsigned int i;
904	–	unsigned int flag;
735
736		/*
737	<	* build a string in umode_buf to represent the change in the user's
737	>	* Build a string in umode_buf to represent the change in the user's
738		* mode between the new (source_p->umodes) and 'old'.
739		*/
740	<	for (i = 0; i < 128; ++i)
740	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
741		{
742	<	flag = user_modes[i];
913	<	if (!flag)
914	<	continue;
915	<
916	<	if (MyClient(source_p) && !(flag & sendmask))
917	<	continue;
918	<
919	<	if ((flag & old) && !HasUMode(source_p, flag))
742	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
743		{
744		if (what == MODE_DEL)
745	<	*m++ = (char)i;
745	>	*m++ = tab->c;
746		else
747		{
748		what = MODE_DEL;
749		*m++ = '-';
750	<	*m++ = (char)i;
750	>	*m++ = tab->c;
751		}
752		}
753	<	else if (!(flag & old) && HasUMode(source_p, flag))
753	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
754		{
755		if (what == MODE_ADD)
756	<	*m++ = (char)i;
756	>	*m++ = tab->c;
757		else
758		{
759		what = MODE_ADD;
760		*m++ = '+';
761	<	*m++ = (char)i;
761	>	*m++ = tab->c;
762		}
763		}
764		}
#	Line 944 | Line 767 | send_umode(struct Client *client_p, stru
767
768		if (*umode_buf && client_p)
769		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
770	<	source_p->name, source_p->username,
771	<	source_p->host, source_p->name, umode_buf);
770	>	client_p->name, client_p->username,
771	>	client_p->host, client_p->name, umode_buf);
772		}
773
774		/* send_umode_out()
#	Line 955 | Line 778 | send_umode(struct Client *client_p, stru
778		* side effects - Only send ubuf out to servers that know about this client
779		*/
780		void
781	<	send_umode_out(struct Client *client_p, struct Client *source_p,
959	<	unsigned int old)
781	>	send_umode_out(struct Client *source_p, unsigned int old)
782		{
783	<	char buf[IRCD_BUFSIZE] = { '\0' };
962	<	dlink_node *ptr = NULL;
783	>	char buf[IRCD_BUFSIZE] = "";
784
785	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
785	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
786
787		if (buf[0])
788	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
789	<	ID(source_p), ID(source_p), buf);
969	<
970	<	if (client_p && MyClient(client_p))
971	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
788	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
789	>	source_p->id, source_p->id, buf);
790		}
791
792		void
793		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
794		{
795	<	dlink_node *ptr = NULL;
795	>	dlink_node *node = NULL;
796
797		if (!strcmp(target_p->host, hostname))
798		return;
#	Line 983 | Line 801 | user_set_hostmask(struct Client *target_
801		{
802		case MODE_ADD:
803		AddUMode(target_p, UMODE_HIDDENHOST);
986	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
804		break;
805		case MODE_DEL:
806		DelUMode(target_p, UMODE_HIDDENHOST);
990	–
991	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
992	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
807		break;
808		default: return;
809		}
810
811	<	if (ConfigFileEntry.cycle_on_host_change)
811	>	if (ConfigGeneral.cycle_on_host_change)
812		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
813		target_p->name, target_p->username, target_p->host);
814
#	Line 1008 | Line 822 | user_set_hostmask(struct Client *target_
822
823		if (MyClient(target_p))
824		{
825	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
825	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
826		clear_ban_cache_client(target_p);
827		}
828
829	<	if (!ConfigFileEntry.cycle_on_host_change)
829	>	if (!ConfigGeneral.cycle_on_host_change)
830		return;
831
832	<	DLINK_FOREACH(ptr, target_p->channel.head)
832	>	DLINK_FOREACH(node, target_p->channel.head)
833		{
834	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
834	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
835		char *p = modebuf;
836		int len = 0;
837	<	const struct Membership *ms = ptr->data;
837	>	const struct Membership *member = node->data;
838
839	<	if (has_member_flags(ms, CHFL_CHANOP))
839	>	if (has_member_flags(member, CHFL_CHANOP))
840		{
841		*p++ = 'o';
842		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
843		}
844
845	<	if (has_member_flags(ms, CHFL_HALFOP))
845	>	if (has_member_flags(member, CHFL_HALFOP))
846		{
847		*p++ = 'h';
848		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
849		}
850
851	<	if (has_member_flags(ms, CHFL_VOICE))
851	>	if (has_member_flags(member, CHFL_VOICE))
852		{
853		*p++ = 'v';
854		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1042 | Line 856 | user_set_hostmask(struct Client *target_
856
857		*p = '\0';
858
859	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
860	<	target_p->name, target_p->username, target_p->host,
861	<	ms->chptr->chname);
859	>
860	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
861	>	target_p->name, target_p->username,
862	>	target_p->host, member->chptr->name,
863	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
864	>	target_p->info);
865	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
866	>	target_p->name, target_p->username,
867	>	target_p->host, member->chptr->name);
868	>
869		if (nickbuf[0])
870	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
871	<	target_p->servptr->name, ms->chptr->chname,
870	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
871	>	target_p->servptr->name, member->chptr->name,
872		modebuf, nickbuf);
873
874		}
#	Line 1059 | Line 880 | user_set_hostmask(struct Client *target_
880		target_p->host, target_p->away);
881		}
882
883	<	/* user_welcome()
884	<	*
885	<	* inputs       - client pointer to client to welcome
1065	<	* output       - NONE
1066	<	* side effects -
1067	<	*/
1068	<	static void
1069	<	user_welcome(struct Client *source_p)
1070	<	{
1071	<	#if defined(__TIME__) && defined(__DATE__)
1072	<	static const char built_date[] = __DATE__ " at " __TIME__;
1073	<	#else
1074	<	static const char built_date[] = "unknown";
1075	<	#endif
1076	<
1077	<	#ifdef HAVE_LIBCRYPTO
1078	<	if (HasFlag(source_p, FLAGS_SSL))
1079	<	{
1080	<	AddUMode(source_p, UMODE_SSL);
1081	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1082	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1083	<	}
1084	<	#endif
1085	<
1086	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1087	<	source_p->name);
1088	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1089	<	get_listener_name(source_p->localClient->listener), ircd_version);
1090	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1091	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1092	<	show_isupport(source_p);
1093	<
1094	<	if (source_p->id[0] != '\0')
1095	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1096	<
1097	<	show_lusers(source_p);
1098	<	motd_signon(source_p);
1099	<	}
1100	<
1101	<	/* check_xline()
1102	<	*
1103	<	* inputs       - pointer to client to test
1104	<	* outupt       - 1 if exiting 0 if ok
1105	<	* side effects -
1106	<	*/
1107	<	static int
1108	<	check_xline(struct Client *source_p)
1109	<	{
1110	<	struct MaskItem *conf = NULL;
1111	<	const char *reason = NULL;
1112	<
1113	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1114	<	{
1115	<	++conf->count;
1116	<
1117	<	if (conf->reason != NULL)
1118	<	reason = conf->reason;
1119	<	else
1120	<	reason = "No Reason";
1121	<
1122	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1123	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1124	<	source_p->info, reason,
1125	<	get_client_name(source_p, HIDE_IP),
1126	<	source_p->sockhost);
1127	<
1128	<	++ServerStats.is_ref;
1129	<	exit_client(source_p, "Bad user info");
1130	<	return 1;
1131	<	}
1132	<
1133	<	return 0;
1134	<	}
1135	<
1136	<	/* oper_up()
1137	<	*
1138	<	* inputs       - pointer to given client to oper
1139	<	* output       - NONE
1140	<	* side effects - Blindly opers up given source_p, using conf info
1141	<	*                all checks on passwords have already been done.
1142	<	*                This could also be used by rsa oper routines.
883	>	/*! \brief Blindly opers up given source_p, using conf info.
884	>	*         All checks on passwords have already been done.
885	>	* \param source_p Pointer to given client to oper
886		*/
887		void
888		oper_up(struct Client *source_p)
889		{
890		const unsigned int old = source_p->umodes;
891	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
891	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
892
893	<	assert(source_p->localClient->confs.head);
893	>	assert(source_p->connection->confs.head);
894
895		++Count.oper;
896		SetOper(source_p);
897
898		if (conf->modes)
899		AddUMode(source_p, conf->modes);
900	<	else if (ConfigFileEntry.oper_umodes)
901	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
900	>	else if (ConfigGeneral.oper_umodes)
901	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
902
903		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
904		++Count.invisi;
#	Line 1170 | Line 913 | oper_up(struct Client *source_p)
913		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
914		AddUMode(source_p, UMODE_ADMIN);
915
916	+	if (!EmptyString(conf->whois))
917	+	{
918	+	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
919	+	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
920	+	me.id, source_p->id, (unsigned long)source_p->tsinfo,
921	+	RPL_WHOISOPERATOR, conf->whois);
922	+	}
923	+
924		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
925		get_oper_name(source_p));
926	<	send_umode_out(source_p, source_p, old);
926	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
927	>	me.id, get_oper_name(source_p));
928	>	send_umode_out(source_p, old);
929		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
930		}
931
932	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
932	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
933
934		int
935		valid_sid(const char *sid)
#	Line 1201 | Line 954 | valid_sid(const char *sid)
954		void
955		init_uid(void)
956		{
1204	–	unsigned int i;
1205	–
957		memset(new_uid, 0, sizeof(new_uid));
958
959	<	if (!EmptyString(ServerInfo.sid))
960	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
959	>	if (!EmptyString(ConfigServerInfo.sid))
960	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
961
962	<	for (i = 0; i < IRC_MAXSID; ++i)
962	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
963		if (new_uid[i] == '\0')
964		new_uid[i] = 'A';
965
#	Line 1225 | Line 976 | init_uid(void)
976		*                note this is a recursive function
977		*/
978		static void
979	<	add_one_to_uid(int i)
979	>	add_one_to_uid(unsigned int i)
980		{
981	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
981	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
982		{
983		if (new_uid[i] == 'Z')
984		new_uid[i] = '0';
985		else if (new_uid[i] == '9')
986		{
987		new_uid[i] = 'A';
988	<	add_one_to_uid(i-1);
988	>	add_one_to_uid(i - 1);
989		}
990		else
991		++new_uid[i];
#	Line 1259 | Line 1010 | add_one_to_uid(int i)
1010		static const char *
1011		uid_get(void)
1012		{
1013	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1013	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1014		return new_uid;
1015		}
1016
#	Line 1274 | Line 1025 | void
1025		init_isupport(void)
1026		{
1027		add_isupport("CALLERID", NULL, -1);
1028	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1028	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1029		add_isupport("DEAF", "D", -1);
1030		add_isupport("KICKLEN", NULL, KICKLEN);
1031		add_isupport("MODES", NULL, MAXMODEPARAMS);
1281	–	#ifdef HALFOPS
1032		add_isupport("PREFIX", "(ohv)@%+", -1);
1033		add_isupport("STATUSMSG", "@%+", -1);
1034	<	#else
1035	<	add_isupport("PREFIX", "(ov)@+", -1);
1286	<	add_isupport("STATUSMSG", "@+", -1);
1287	<	#endif
1288	<	add_isupport("EXCEPTS", "e", -1);
1289	<	add_isupport("INVEX", "I", -1);
1034	>	add_isupport("EXCEPTS", NULL, -1);
1035	>	add_isupport("INVEX", NULL, -1);
1036		}
1037
1038		/*
#	Line 1301 | Line 1047 | init_isupport(void)
1047		void
1048		add_isupport(const char *name, const char *options, int n)
1049		{
1050	<	dlink_node *ptr;
1051	<	struct Isupport *support;
1050	>	dlink_node *node = NULL;
1051	>	struct Isupport *support = NULL;
1052
1053	<	DLINK_FOREACH(ptr, support_list.head)
1053	>	DLINK_FOREACH(node, support_list.head)
1054		{
1055	<	support = ptr->data;
1055	>	support = node->data;
1056		if (irccmp(support->name, name) == 0)
1057		{
1058		MyFree(support->name);
#	Line 1315 | Line 1061 | add_isupport(const char *name, const cha
1061		}
1062		}
1063
1064	<	if (ptr == NULL)
1064	>	if (node == NULL)
1065		{
1066	<	support = MyMalloc(sizeof(*support));
1066	>	support = MyCalloc(sizeof(*support));
1067		dlinkAddTail(support, &support->node, &support_list);
1068		}
1069
1070		support->name = xstrdup(name);
1071	<	if (options != NULL)
1071	>	if (options)
1072		support->options = xstrdup(options);
1073		support->number = n;
1074
#	Line 1339 | Line 1085 | add_isupport(const char *name, const cha
1085		void
1086		delete_isupport(const char *name)
1087		{
1088	<	dlink_node *ptr;
1343	<	struct Isupport *support;
1088	>	dlink_node *node = NULL;
1089
1090	<	DLINK_FOREACH(ptr, support_list.head)
1090	>	DLINK_FOREACH(node, support_list.head)
1091		{
1092	<	support = ptr->data;
1092	>	struct Isupport *support = node->data;
1093	>
1094		if (irccmp(support->name, name) == 0)
1095		{
1096	<	dlinkDelete(ptr, &support_list);
1096	>	dlinkDelete(node, &support_list);
1097		MyFree(support->name);
1098		MyFree(support->options);
1099		MyFree(support);
#	Line 1370 | Line 1116 | rebuild_isupport_message_line(void)
1116		{
1117		char isupportbuffer[IRCD_BUFSIZE];
1118		char *p = isupportbuffer;
1119	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1119	>	dlink_node *node = NULL, *node_next = NULL;
1120		int n = 0;
1121		int tokens = 0;
1122		size_t len = 0;
1123		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1124
1125	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1125	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1126		{
1127	<	dlinkDelete(ptr, &support_list_lines);
1128	<	MyFree(ptr->data);
1129	<	free_dlink_node(ptr);
1127	>	dlinkDelete(node, &support_list_lines);
1128	>	MyFree(node->data);
1129	>	free_dlink_node(node);
1130		}
1131
1132	<	DLINK_FOREACH(ptr, support_list.head)
1132	>	DLINK_FOREACH(node, support_list.head)
1133		{
1134	<	struct Isupport *support = ptr->data;
1134	>	struct Isupport *support = node->data;
1135
1136		p += (n = sprintf(p, "%s", support->name));
1137		len += n;
1138
1139	<	if (support->options != NULL)
1139	>	if (support->options)
1140		{
1141		p += (n = sprintf(p, "=%s", support->options));
1142		len += n;
#	Line 1418 | Line 1164 | rebuild_isupport_message_line(void)
1164		}
1165		}
1166
1167	<	if (len != 0)
1167	>	if (len)
1168		{
1169		if (*--p == ' ')
1170		*p = '\0';

Diff Legend

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