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 2955 by michael, Tue Jan 28 16:40:30 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5301 by michael, Sun Jan 4 16:58:27 2015 UTC

#	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"
34	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
37	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
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"
46	–	#include "supported.h"
47	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
53	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
58	–
59	–	static void user_welcome(struct Client *);
60	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
61	–	static int check_xline(struct Client *);
62	–	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		*/
68	–
57		struct Isupport
58		{
59		dlink_node node;
#	Line 128 | Line 116 | const unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121		UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
#	Line 138 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
127		UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 173 | Line 161 | assemble_umode_buffer(void)
161		void
162		show_lusers(struct Client *source_p)
163		{
176	–	const char *from, *to;
177	–
178	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
179	–	{
180	–	from = me.id;
181	–	to = source_p->id;
182	–	}
183	–	else
184	–	{
185	–	from = me.name;
186	–	to = source_p->name;
187	–	}
188	–
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
166	<	from, to, (Count.total-Count.invisi),
192	<	Count.invisi, dlink_list_length(&global_serv_list));
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
169	<	(Count.total-Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171	<	if (Count.oper > 0)
172	<	sendto_one(source_p, form_str(RPL_LUSEROP),
173	<	from, to, Count.oper);
174	<
175	<	if (dlink_list_length(&unknown_list) > 0)
176	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
177	<	from, to, dlink_list_length(&unknown_list));
178	<
205	<	if (dlink_list_length(&global_channel_list) > 0)
206	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
207	<	from, to, dlink_list_length(&global_channel_list));
171	>	if (Count.oper)
172	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173	>
174	>	if (dlink_list_length(&unknown_list))
175	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176	>
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
182	<	sendto_one(source_p, form_str(RPL_LUSERME),
183	<	from, to, Count.local, Count.myserver);
213	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
214	<	from, to, Count.local, Count.max_loc);
182	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
183	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
184		}
185		else
186		{
187	<	sendto_one(source_p, form_str(RPL_LUSERME),
188	<	from, to, Count.total, 0);
220	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
221	<	from, to, Count.total, Count.max_tot);
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
188	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
189		}
190
191	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
225	<	from, to, Count.total, Count.max_tot);
191	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192
193		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
194	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
195	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
194	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
195	>	Count.max_loc_cli, Count.totalrestartcount);
196
197		if (Count.local > Count.max_loc_cli)
198		Count.max_loc_cli = Count.local;
#	Line 244 | Line 210 | show_lusers(struct Client *source_p)
210		void
211		show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
251	<	source_p->name, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
219	>
220	>	/* report_and_set_user_flags()
221	>	*
222	>	* inputs       - pointer to source_p
223	>	*              - pointer to conf for this user
224	>	* output       - NONE
225	>	* side effects - Report to user any special flags
226	>	*                they are getting, and set them.
227	>	*/
228	>	static void
229	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
230	>	{
231	>	/* If this user is being spoofed, tell them so */
232	>	if (IsConfDoSpoofIp(conf))
233	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234	>
235	>	/* If this user is in the exception class, set it "E lined" */
236	>	if (IsConfExemptKline(conf))
237	>	{
238	>	SetExemptKline(source_p);
239	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
240	>	}
241	>
242	>	/*
243	>	* The else here is to make sure that G line exempt users
244	>	* do not get noticed twice.
245	>	*/
246	>	else if (IsConfExemptGline(conf))
247	>	{
248	>	SetExemptGline(source_p);
249	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
250	>	}
251	>
252	>	if (IsConfExemptResv(conf))
253	>	{
254	>	SetExemptResv(source_p);
255	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
256	>	}
257	>
258	>	/* If this user is exempt from user limits set it "F lined" */
259	>	if (IsConfExemptLimits(conf))
260	>	{
261	>	SetExemptLimits(source_p);
262	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
263	>	}
264	>
265	>	if (IsConfCanFlood(conf))
266	>	{
267	>	SetCanFlood(source_p);
268	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	>	"protection, aren't you fearsome.");
270	>	}
271	>	}
272	>
273	>	/* introduce_client()
274	>	*
275	>	* inputs       - source_p
276	>	* output       - NONE
277	>	* side effects - This common function introduces a client to the rest
278	>	*                of the net, either from a local client connect or
279	>	*                from a remote connect.
280	>	*/
281	>	static void
282	>	introduce_client(struct Client *source_p)
283	>	{
284	>	dlink_node *node = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(node, local_server_list.head)
301	>	{
302	>	struct Client *server = node->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315	>	source_p->info);
316	>	else
317	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
318	>	source_p->servptr->id,
319	>	source_p->name, source_p->hopcount+1,
320	>	(unsigned long)source_p->tsinfo,
321	>	ubuf, source_p->username, source_p->host,
322	>	source_p->sockhost, source_p->id, source_p->info);
323	>
324	>	if (!EmptyString(source_p->certfp))
325	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
326	>	}
327	>	}
328	>
329	>	/* user_welcome()
330	>	*
331	>	* inputs       - client pointer to client to welcome
332	>	* output       - NONE
333	>	* side effects -
334	>	*/
335	>	static void
336	>	user_welcome(struct Client *source_p)
337	>	{
338	>	#if defined(__TIME__) && defined(__DATE__)
339	>	static const char built_date[] = __DATE__ " at " __TIME__;
340	>	#else
341	>	static const char built_date[] = "unknown";
342	>	#endif
343	>
344	>	#ifdef HAVE_LIBCRYPTO
345	>	if (HasFlag(source_p, FLAGS_SSL))
346	>	{
347	>	AddUMode(source_p, UMODE_SSL);
348	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
349	>	ssl_get_cipher(source_p->connection->fd.ssl));
350	>	}
351	>	#endif
352	>
353	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
354	>	source_p->name);
355	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
356	>	get_listener_name(source_p->connection->listener), ircd_version);
357	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
358	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
359	>	show_isupport(source_p);
360	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
361	>
362	>	show_lusers(source_p);
363	>	motd_signon(source_p);
364	>	}
365	>
366	>	/* check_xline()
367	>	*
368	>	* inputs       - pointer to client to test
369	>	* outupt       - 1 if exiting 0 if ok
370	>	* side effects -
371	>	*/
372	>	static int
373	>	check_xline(struct Client *source_p)
374	>	{
375	>	struct MaskItem *conf = NULL;
376	>
377	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378	>	{
379	>	++conf->count;
380	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381	>	"X-line Rejecting [%s] [%s], user %s [%s]",
382	>	source_p->info, conf->reason,
383	>	get_client_name(source_p, HIDE_IP),
384	>	source_p->sockhost);
385	>
386	>	++ServerStats.is_ref;
387	>	exit_client(source_p, "Bad user info");
388	>	return 1;
389	>	}
390	>
391	>	return 0;
392	>	}
393	>
394	>	/*! \brief This function is called when both NICK and USER messages
395	>	*      have been accepted for the client, in whatever order. Only
396	>	*      after this, is the UID message propagated.
397	>	* \param source_p Pointer to given client to introduce
398	>	*/
399		void
400		register_local_user(struct Client *source_p)
401		{
402		const char *id = NULL;
403		const struct MaskItem *conf = NULL;
404
283	–	assert(source_p != NULL);
405		assert(source_p == source_p->from);
406		assert(MyConnect(source_p));
407	<	assert(!source_p->localClient->registration);
407	>	assert(!source_p->connection->registration);
408
409		ClearCap(source_p, CAP_TS6);
410
411	<	if (ConfigFileEntry.ping_cookie)
411	>	if (ConfigGeneral.ping_cookie)
412		{
413	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
413	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
414		{
415		do
416	<	source_p->localClient->random_ping = genrand_int32();
417	<	while (!source_p->localClient->random_ping);
416	>	source_p->connection->random_ping = genrand_int32();
417	>	while (!source_p->connection->random_ping);
418
419	<	sendto_one(source_p, "PING :%u",
299	<	source_p->localClient->random_ping);
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 305 | Line 425 | register_local_user(struct Client *sourc
425		return;
426		}
427
428	<	source_p->localClient->last_privmsg = CurrentTime;
428	>	source_p->connection->last_privmsg = CurrentTime;
429		/* Straight up the maximum rate of flooding... */
430	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
430	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
431
432		if (!check_client(source_p))
433		return;
434
435		if (!valid_hostname(source_p->host))
436		{
437	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
438	<	"character in your hostname", me.name, source_p->name);
439	<	strlcpy(source_p->host, source_p->sockhost,
320	<	sizeof(source_p->host));
437	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438	>	"character in your hostname");
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442	<	conf = source_p->localClient->confs.head->data;
442	>	conf = source_p->connection->confs.head->data;
443
444		if (!IsGotId(source_p))
445		{
446	<	char username[USERLEN + 1];
446	>	char username[USERLEN + 1] = "";
447		const char *p = username;
448		unsigned int i = 0;
449
450		if (IsNeedIdentd(conf))
451		{
452		++ServerStats.is_ref;
453	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
454	<	"identd to use this server", me.name, source_p->name);
455	<	exit_client(source_p, &me, "Install identd");
453	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
454	>	"identd to use this server");
455	>	exit_client(source_p, "Install identd");
456		return;
457		}
458
#	Line 343 | Line 462 | register_local_user(struct Client *sourc
462		source_p->username[i++] = '~';
463
464		for (; *p && i < USERLEN; ++p)
465	<	if (*p != '[')
347	<	source_p->username[i++] = *p;
465	>	source_p->username[i++] = *p;
466
467		source_p->username[i] = '\0';
468		}
469
470	<	/* password check */
470	>	/* Password check */
471		if (!EmptyString(conf->passwd))
472		{
473	<	const char *pass = source_p->localClient->passwd;
356	<
357	<	if (!match_conf_password(pass, conf))
473	>	if (!match_conf_password(source_p->connection->password, conf))
474		{
475		++ServerStats.is_ref;
476	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
477	<	me.name, source_p->name);
478	<	exit_client(source_p, &me, "Bad Password");
476	>
477	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
478	>	exit_client(source_p, "Bad Password");
479		return;
480		}
481		}
482
483	<	/* don't free source_p->localClient->passwd here - it can be required
484	<	* by masked /stats I if there are auth{} blocks with need_password = no;
483	>	/*
484	>	* Don't free source_p->connection->password here - it can be required
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
489	<	/* report if user has &^>= etc. and set flags as needed in source_p */
489	>	/*
490	>	* Report if user has &^>= etc. and set flags as needed in source_p
491	>	*/
492		report_and_set_user_flags(source_p, conf);
493
494		if (IsDead(source_p))
495		return;
496
497	<	/* Limit clients -
497	>	/*
498	>	* Limit clients -
499		* We want to be able to have servers and F-line clients
500		* connect, so save room for "buffer" connections.
501		* Smaller servers may want to decrease this, and it should
502		* probably be just a percentage of the MAXCLIENTS...
503		*   -Taner
504		*/
505	<	/* Except "F:" clients */
506	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
387	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
505	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
506	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
507		{
508		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
509		"Too many clients, rejecting %s[%s].",
510		source_p->name, source_p->host);
511		++ServerStats.is_ref;
512	<	exit_client(source_p, &me, "Sorry, server is full - try later");
512	>	exit_client(source_p, "Sorry, server is full - try later");
513		return;
514		}
515
397	–	/* valid user name check */
516		if (!valid_username(source_p->username, 1))
517		{
518	<	char tmpstr2[IRCD_BUFSIZE];
518	>	char buf[IRCD_BUFSIZE] = "";
519
520		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
521		"Invalid username: %s (%s@%s)",
522		source_p->name, source_p->username, source_p->host);
523		++ServerStats.is_ref;
524	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
525	<	source_p->username);
408	<	exit_client(source_p, &me, tmpstr2);
524	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
525	>	exit_client(source_p, buf);
526		return;
527		}
528
529		if (check_xline(source_p))
530		return;
531
532	<	while (hash_find_id((id = uid_get())) != NULL)
532	>	while (hash_find_id((id = uid_get())))
533		;
534
535		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 421 | Line 538 | register_local_user(struct Client *sourc
538		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540		source_p->name, source_p->username, source_p->host,
541	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
542	<	"255.255.255.255" : source_p->sockhost,
426	<	get_client_class(&source_p->localClient->confs),
541	>	source_p->sockhost,
542	>	get_client_class(&source_p->connection->confs),
543		source_p->info, source_p->id);
544
545	<	if (ConfigFileEntry.invisible_on_connect)
545	>	if (ConfigGeneral.invisible_on_connect)
546		{
547		AddUMode(source_p, UMODE_INVISIBLE);
548		++Count.invisi;
#	Line 438 | Line 554 | register_local_user(struct Client *sourc
554
555		if (!(Count.max_loc % 10))
556		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
557	<	"New Max Local Clients: %d",
557	>	"New maximum local client connections: %u",
558		Count.max_loc);
559		}
560
445	–	/* Increment our total user count here */
561		if (++Count.total > Count.max_tot)
562		Count.max_tot = Count.total;
563		++Count.totalrestartcount;
#	Line 450 | Line 565 | register_local_user(struct Client *sourc
565		assert(source_p->servptr == &me);
566		SetClient(source_p);
567		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
568	<
454	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
568	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
569
570		assert(dlinkFind(&unknown_list, source_p));
571
572	<	dlink_move_node(&source_p->localClient->lclient_node,
572	>	dlink_move_node(&source_p->connection->lclient_node,
573		&unknown_list, &local_client_list);
574
575		user_welcome(source_p);
#	Line 476 | Line 590 | register_local_user(struct Client *sourc
590		*                is introduced by a server.
591		*/
592		void
593	<	register_remote_user(struct Client *source_p, const char *username,
480	<	const char *host, const char *server)
593	>	register_remote_user(struct Client *source_p)
594		{
595	<	struct Client *target_p = NULL;
483	<
484	<	assert(source_p != NULL);
485	<	assert(source_p->username != username);
486	<
487	<	strlcpy(source_p->host, host, sizeof(source_p->host));
488	<	strlcpy(source_p->username, username, sizeof(source_p->username));
489	<
490	<	/*
491	<	* coming from another server, take the servers word for it
492	<	*/
493	<	source_p->servptr = hash_find_server(server);
494	<
495	<	/*
496	<	* Super GhostDetect:
497	<	* If we can't find the server the user is supposed to be on,
498	<	* then simply blow the user away.        -Taner
499	<	*/
500	<	if (source_p->servptr == NULL)
501	<	{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503	<	"No server %s for user %s[%s@%s] from %s",
504	<	server, source_p->name, source_p->username,
505	<	source_p->host, source_p->from->name);
506	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
507	<
508	<	AddFlag(source_p, FLAGS_KILLED);
509	<	exit_client(source_p, &me, "Ghosted Client");
510	<	return;
511	<	}
595	>	const struct Client *target_p = NULL;
596
597		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
598		{
#	Line 517 | Line 601 | register_remote_user(struct Client *sour
601		source_p->from->name, source_p->name, source_p->username,
602		source_p->host, source_p->servptr->name,
603		target_p->name, target_p->from->name);
604	<	kill_client(source_p->from, source_p,
605	<	"%s (NICK from wrong direction (%s != %s))",
606	<	me.name, source_p->servptr->name, target_p->from->name);
604	>	sendto_one(source_p->from,
605	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
606	>	me.id, source_p->id, me.name, source_p->servptr->name,
607	>	target_p->from->name);
608	>
609		AddFlag(source_p, FLAGS_KILLED);
610	<	exit_client(source_p, &me, "USER server wrong direction");
610	>	exit_client(source_p, "UID server wrong direction");
611		return;
612		}
613
#	Line 532 | Line 618 | register_remote_user(struct Client *sour
618		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
619		AddFlag(source_p, FLAGS_SERVICE);
620
535	–	/* Increment our total user count here */
621		if (++Count.total > Count.max_tot)
622		Count.max_tot = Count.total;
623
624		SetClient(source_p);
625		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
626	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
627		add_user_host(source_p->username, source_p->host, 1);
628		SetUserHost(source_p);
629
630		if (HasFlag(source_p->servptr, FLAGS_EOB))
631	<	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
632	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
633	<	source_p->servptr->name,
634	<	source_p->name, source_p->username, source_p->host,
635	<	source_p->info, source_p->id);
636	<
551	<	introduce_client(source_p);
552	<	}
553	<
554	<	/* introduce_client()
555	<	*
556	<	* inputs       - source_p
557	<	* output       - NONE
558	<	* side effects - This common function introduces a client to the rest
559	<	*                of the net, either from a local client connect or
560	<	*                from a remote connect.
561	<	*/
562	<	static void
563	<	introduce_client(struct Client *source_p)
564	<	{
565	<	dlink_node *server_node = NULL;
566	<	char ubuf[IRCD_BUFSIZE];
567	<
568	<	if (MyClient(source_p))
569	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
570	<	else
571	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
572	<
573	<	watch_check_hash(source_p, RPL_LOGON);
574	<
575	<	if (ubuf[0] == '\0')
576	<	{
577	<	ubuf[0] = '+';
578	<	ubuf[1] = '\0';
579	<	}
580	<
581	<	DLINK_FOREACH(server_node, serv_list.head)
582	<	{
583	<	struct Client *server = server_node->data;
584	<
585	<	if (server == source_p->from)
586	<	continue;
587	<
588	<	if (IsCapable(server, CAP_SVS))
589	<	{
590	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	<	source_p->servptr->id,
593	<	source_p->name, source_p->hopcount+1,
594	<	(unsigned long)source_p->tsinfo,
595	<	ubuf, source_p->username, source_p->host,
596	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	<	"0" : source_p->sockhost, source_p->id,
598	<	source_p->svid,
599	<	source_p->info);
600	<	else
601	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
605	<	source_p->servptr->name, source_p->svid,
606	<	source_p->info);
607	<
608	<	}
631	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
632	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
633	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
634	>	source_p->servptr->name,
635	>	source_p->name, source_p->username, source_p->host,
636	>	source_p->sockhost, source_p->info, source_p->id);
637		else
638	<	{
639	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
640	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
641	<	source_p->servptr->id,
642	<	source_p->name, source_p->hopcount+1,
615	<	(unsigned long)source_p->tsinfo,
616	<	ubuf, source_p->username, source_p->host,
617	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	<	"0" : source_p->sockhost, source_p->id, source_p->info);
619	<	else
620	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	<	source_p->name, source_p->hopcount+1,
622	<	(unsigned long)source_p->tsinfo,
623	<	ubuf, source_p->username, source_p->host,
624	<	source_p->servptr->name, source_p->info);
625	<	}
638	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
639	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
640	>	source_p->servptr->name,
641	>	source_p->name, source_p->username, source_p->host,
642	>	source_p->info, source_p->id);
643
644	<	if (!EmptyString(source_p->certfp))
628	<	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629	<	}
644	>	introduce_client(source_p);
645		}
646
647		/* valid_hostname()
#	Line 643 | Line 658 | valid_hostname(const char *hostname)
658		{
659		const char *p = hostname;
660
661	<	assert(p != NULL);
661	>	assert(p);
662
663		if (EmptyString(p) || *p == '.' || *p == ':')
664		return 0;
#	Line 669 | Line 684 | valid_hostname(const char *hostname)
684		int
685		valid_username(const char *username, const int local)
686		{
687	<	int dots      = 0;
687	>	unsigned int dots = 0;
688		const char *p = username;
689
690	<	assert(p != NULL);
690	>	assert(p);
691
692		if (*p == '~')
693		++p;
#	Line 689 | Line 704 | valid_username(const char *username, con
704		{
705		while (*++p)
706		{
707	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
707	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
708		{
709	<	if (++dots > ConfigFileEntry.dots_in_ident)
709	>	if (++dots > ConfigGeneral.dots_in_ident)
710		return 0;
711		if (!IsUserChar(*(p + 1)))
712		return 0;
#	Line 707 | Line 722 | valid_username(const char *username, con
722		return 0;
723		}
724
725	<	return  p - username <= USERLEN;;
725	>	return p - username <= USERLEN;
726		}
727
728		/* clean_nick_name()
#	Line 721 | Line 736 | int
736		valid_nickname(const char *nickname, const int local)
737		{
738		const char *p = nickname;
724	–	assert(nickname && *nickname);
739
740	<	/* nicks can't start with a digit or - or be 0 length */
741	<	/* This closer duplicates behaviour of hybrid-6 */
742	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
740	>	assert(p);
741	>
742	>	/*
743	>	* Nicks can't start with a digit or - or be 0 length.
744	>	*/
745	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
746		return 0;
747
748		for (; *p; ++p)
#	Line 735 | Line 752 | valid_nickname(const char *nickname, con
752		return p - nickname <= NICKLEN;
753		}
754
738	–	/* report_and_set_user_flags()
739	–	*
740	–	* inputs       - pointer to source_p
741	–	*              - pointer to conf for this user
742	–	* output       - NONE
743	–	* side effects - Report to user any special flags
744	–	*                they are getting, and set them.
745	–	*/
746	–	static void
747	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748	–	{
749	–	/* If this user is being spoofed, tell them so */
750	–	if (IsConfDoSpoofIp(conf))
751	–	sendto_one(source_p,
752	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753	–	me.name, source_p->name);
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(conf))
757	–	{
758	–	SetExemptKline(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/*
765	–	* The else here is to make sure that G line exempt users
766	–	* do not get noticed twice.
767	–	*/
768	–	else if (IsConfExemptGline(conf))
769	–	{
770	–	SetExemptGline(source_p);
771	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
772	–	me.name, source_p->name);
773	–	}
774	–
775	–	if (IsConfExemptResv(conf))
776	–	{
777	–	SetExemptResv(source_p);
778	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
779	–	me.name, source_p->name);
780	–	}
781	–
782	–	/* If this user is exempt from user limits set it "F lined" */
783	–	if (IsConfExemptLimits(conf))
784	–	{
785	–	SetExemptLimits(source_p);
786	–	sendto_one(source_p,
787	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
788	–	me.name,source_p->name);
789	–	}
790	–
791	–	if (IsConfCanFlood(conf))
792	–	{
793	–	SetCanFlood(source_p);
794	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
795	–	"protection, aren't you fearsome.",
796	–	me.name, source_p->name);
797	–	}
798	–	}
799	–
800	–	/* set_user_mode()
801	–	*
802	–	* added 15/10/91 By Darren Reed.
803	–	* parv[0] - sender
804	–	* parv[1] - username to change mode for
805	–	* parv[2] - modes to change
806	–	*/
807	–	void
808	–	set_user_mode(struct Client *client_p, struct Client *source_p,
809	–	const int parc, char *parv[])
810	–	{
811	–	unsigned int flag, setflags;
812	–	char **p, *m, buf[IRCD_BUFSIZE];
813	–	struct Client *target_p;
814	–	int what = MODE_ADD, badflag = 0, i;
815	–
816	–	assert(!(parc < 2));
817	–
818	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
819	–	{
820	–	if (MyConnect(source_p))
821	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	–	me.name, source_p->name, parv[1]);
823	–	return;
824	–	}
825	–
826	–	if (source_p != target_p)
827	–	{
828	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
829	–	me.name, source_p->name);
830	–	return;
831	–	}
832	–
833	–	if (parc < 3)
834	–	{
835	–	m = buf;
836	–	*m++ = '+';
837	–
838	–	for (i = 0; i < 128; ++i)
839	–	if (HasUMode(source_p, user_modes[i]))
840	–	*m++ = (char)i;
841	–	*m = '\0';
842	–
843	–	sendto_one(source_p, form_str(RPL_UMODEIS),
844	–	me.name, source_p->name, buf);
845	–	return;
846	–	}
847	–
848	–	/* find flags already set for user */
849	–	setflags = source_p->umodes;
850	–
851	–	/* parse mode change string(s) */
852	–	for (p = &parv[2]; p && *p; ++p)
853	–	{
854	–	for (m = *p; *m; ++m)
855	–	{
856	–	switch (*m)
857	–	{
858	–	case '+':
859	–	what = MODE_ADD;
860	–	break;
861	–	case '-':
862	–	what = MODE_DEL;
863	–	break;
864	–	case 'o':
865	–	if (what == MODE_ADD)
866	–	{
867	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
868	–	{
869	–	++Count.oper;
870	–	SetOper(source_p);
871	–	}
872	–	}
873	–	else
874	–	{
875	–	if (!HasUMode(source_p, UMODE_OPER))
876	–	break;
877	–
878	–	ClearOper(source_p);
879	–	Count.oper--;
880	–
881	–	if (MyConnect(source_p))
882	–	{
883	–	dlink_node *dm = NULL;
884	–
885	–	detach_conf(source_p, CONF_OPER);
886	–	ClrOFlag(source_p);
887	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
888	–
889	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
890	–	free_dlink_node(dm);
891	–	}
892	–	}
893	–
894	–	break;
895	–
896	–	case 'S':  /* Only servers may set +S in a burst */
897	–	case 'W':  /* Only servers may set +W in a burst */
898	–	case 'r':  /* Only services may set +r */
899	–	case 'x':  /* Only services may set +x */
900	–	break;
901	–
902	–	default:
903	–	if ((flag = user_modes[(unsigned char)*m]))
904	–	{
905	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
906	–	(ConfigFileEntry.oper_only_umodes & flag))
907	–	badflag = 1;
908	–	else
909	–	{
910	–	if (what == MODE_ADD)
911	–	AddUMode(source_p, flag);
912	–	else
913	–	DelUMode(source_p, flag);
914	–	}
915	–	}
916	–	else if (MyConnect(source_p))
917	–	badflag = 1;
918	–
919	–	break;
920	–	}
921	–	}
922	–	}
923	–
924	–	if (badflag)
925	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926	–	me.name, source_p->name);
927	–
928	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
929	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
930	–	{
931	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
932	–	me.name, source_p->name);
933	–	DelUMode(source_p, UMODE_ADMIN);
934	–	}
935	–
936	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
937	–	++Count.invisi;
938	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
939	–	--Count.invisi;
940	–
941	–	/*
942	–	* compare new flags with old flags and send string which
943	–	* will cause servers to update correctly.
944	–	*/
945	–	send_umode_out(client_p, source_p, setflags);
946	–	}
947	–
755		/* send_umode()
756		* send the MODE string for user (user) to connection client_p
757		* -avalon
#	Line 958 | Line 765 | set_user_mode(struct Client *client_p, s
765		*/
766		void
767		send_umode(struct Client *client_p, struct Client *source_p,
768	<	unsigned int old, unsigned int sendmask, char *umode_buf)
768	>	unsigned int old, char *umode_buf)
769		{
770		char *m = umode_buf;
771		int what = 0;
965	–	unsigned int i;
966	–	unsigned int flag;
772
773		/*
774	<	* build a string in umode_buf to represent the change in the user's
774	>	* Build a string in umode_buf to represent the change in the user's
775		* mode between the new (source_p->umodes) and 'old'.
776		*/
777	<	for (i = 0; i < 128; ++i)
777	>	for (unsigned int i = 0; i < 128; ++i)
778		{
779	<	flag = user_modes[i];
975	<	if (!flag)
976	<	continue;
779	>	unsigned int flag = user_modes[i];
780
781	<	if (MyClient(source_p) && !(flag & sendmask))
781	>	if (!flag)
782		continue;
783
784		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1006 | Line 809 | send_umode(struct Client *client_p, stru
809
810		if (*umode_buf && client_p)
811		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
812	<	source_p->name, source_p->username,
813	<	source_p->host, source_p->name, umode_buf);
812	>	client_p->name, client_p->username,
813	>	client_p->host, client_p->name, umode_buf);
814		}
815
816		/* send_umode_out()
#	Line 1017 | Line 820 | send_umode(struct Client *client_p, stru
820		* side effects - Only send ubuf out to servers that know about this client
821		*/
822		void
823	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1021	<	unsigned int old)
823	>	send_umode_out(struct Client *source_p, unsigned int old)
824		{
825	<	char buf[IRCD_BUFSIZE] = { '\0' };
1024	<	dlink_node *ptr = NULL;
825	>	char buf[IRCD_BUFSIZE] = "";
826
827	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
827	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
828
829		if (buf[0])
830	<	{
831	<	DLINK_FOREACH(ptr, serv_list.head)
1031	<	{
1032	<	struct Client *target_p = ptr->data;
1033	<
1034	<	if ((target_p != client_p) && (target_p != source_p))
1035	<	sendto_one(target_p, ":%s MODE %s :%s",
1036	<	ID_or_name(source_p, target_p),
1037	<	ID_or_name(source_p, target_p), buf);
1038	<	}
1039	<	}
1040	<
1041	<	if (client_p && MyClient(client_p))
1042	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
830	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
831	>	source_p->id, source_p->id, buf);
832		}
833
834		void
835		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
836		{
837	<	dlink_node *ptr = NULL;
837	>	dlink_node *node = NULL;
838
839		if (!strcmp(target_p->host, hostname))
840		return;
#	Line 1054 | Line 843 | user_set_hostmask(struct Client *target_
843		{
844		case MODE_ADD:
845		AddUMode(target_p, UMODE_HIDDENHOST);
1057	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
846		break;
847		case MODE_DEL:
848		DelUMode(target_p, UMODE_HIDDENHOST);
1061	–
1062	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1063	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
849		break;
850		default: return;
851		}
852
853	<	if (ConfigFileEntry.cycle_on_host_change)
853	>	if (ConfigGeneral.cycle_on_host_change)
854		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
855		target_p->name, target_p->username, target_p->host);
856
#	Line 1079 | Line 864 | user_set_hostmask(struct Client *target_
864
865		if (MyClient(target_p))
866		{
867	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1083	<	target_p->name, target_p->host);
867	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
868		clear_ban_cache_client(target_p);
869		}
870
871	<	if (!ConfigFileEntry.cycle_on_host_change)
871	>	if (!ConfigGeneral.cycle_on_host_change)
872		return;
873
874	<	DLINK_FOREACH(ptr, target_p->channel.head)
874	>	DLINK_FOREACH(node, target_p->channel.head)
875		{
876	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
876	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
877		char *p = modebuf;
878		int len = 0;
879	<	const struct Membership *ms = ptr->data;
879	>	const struct Membership *member = node->data;
880
881	<	if (has_member_flags(ms, CHFL_CHANOP))
881	>	if (has_member_flags(member, CHFL_CHANOP))
882		{
883		*p++ = 'o';
884		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
885		}
886
887	<	if (has_member_flags(ms, CHFL_HALFOP))
887	>	if (has_member_flags(member, CHFL_HALFOP))
888		{
889		*p++ = 'h';
890		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
891		}
892
893	<	if (has_member_flags(ms, CHFL_VOICE))
893	>	if (has_member_flags(member, CHFL_VOICE))
894		{
895		*p++ = 'v';
896		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1114 | Line 898 | user_set_hostmask(struct Client *target_
898
899		*p = '\0';
900
901	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
902	<	target_p->name, target_p->username, target_p->host,
903	<	ms->chptr->chname);
901	>
902	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
903	>	target_p->name, target_p->username,
904	>	target_p->host, member->chptr->name,
905	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
906	>	target_p->info);
907	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
908	>	target_p->name, target_p->username,
909	>	target_p->host, member->chptr->name);
910	>
911		if (nickbuf[0])
912	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
913	<	target_p->servptr->name, ms->chptr->chname,
912	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
913	>	target_p->servptr->name, member->chptr->name,
914		modebuf, nickbuf);
915
916		}
#	Line 1131 | Line 922 | user_set_hostmask(struct Client *target_
922		target_p->host, target_p->away);
923		}
924
925	<	/* user_welcome()
926	<	*
927	<	* inputs       - client pointer to client to welcome
1137	<	* output       - NONE
1138	<	* side effects -
1139	<	*/
1140	<	static void
1141	<	user_welcome(struct Client *source_p)
1142	<	{
1143	<	#if defined(__TIME__) && defined(__DATE__)
1144	<	static const char built_date[] = __DATE__ " at " __TIME__;
1145	<	#else
1146	<	static const char built_date[] = "unknown";
1147	<	#endif
1148	<
1149	<	#ifdef HAVE_LIBCRYPTO
1150	<	if (HasFlag(source_p, FLAGS_SSL))
1151	<	{
1152	<	AddUMode(source_p, UMODE_SSL);
1153	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1154	<	me.name, source_p->name,
1155	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1156	<	}
1157	<	#endif
1158	<
1159	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1160	<	ServerInfo.network_name, source_p->name);
1161	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1162	<	get_listener_name(source_p->localClient->listener), ircd_version);
1163	<	sendto_one(source_p, form_str(RPL_CREATED),
1164	<	me.name, source_p->name, built_date);
1165	<	sendto_one(source_p, form_str(RPL_MYINFO),
1166	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1167	<	show_isupport(source_p);
1168	<
1169	<	if (source_p->id[0] != '\0')
1170	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1171	<	source_p->name, source_p->id);
1172	<
1173	<	show_lusers(source_p);
1174	<	motd_signon(source_p);
1175	<	}
1176	<
1177	<	/* check_xline()
1178	<	*
1179	<	* inputs       - pointer to client to test
1180	<	* outupt       - 1 if exiting 0 if ok
1181	<	* side effects -
1182	<	*/
1183	<	static int
1184	<	check_xline(struct Client *source_p)
1185	<	{
1186	<	struct MaskItem *conf = NULL;
1187	<	const char *reason = NULL;
1188	<
1189	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1190	<	{
1191	<	++conf->count;
1192	<
1193	<	if (conf->reason != NULL)
1194	<	reason = conf->reason;
1195	<	else
1196	<	reason = "No Reason";
1197	<
1198	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1199	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1200	<	source_p->info, reason,
1201	<	get_client_name(source_p, HIDE_IP),
1202	<	source_p->sockhost);
1203	<
1204	<	++ServerStats.is_ref;
1205	<	exit_client(source_p, &me, "Bad user info");
1206	<	return 1;
1207	<	}
1208	<
1209	<	return 0;
1210	<	}
1211	<
1212	<	/* oper_up()
1213	<	*
1214	<	* inputs       - pointer to given client to oper
1215	<	* output       - NONE
1216	<	* side effects - Blindly opers up given source_p, using conf info
1217	<	*                all checks on passwords have already been done.
1218	<	*                This could also be used by rsa oper routines.
925	>	/*! \brief Blindly opers up given source_p, using conf info.
926	>	*         All checks on passwords have already been done.
927	>	* \param source_p Pointer to given client to oper
928		*/
929		void
930		oper_up(struct Client *source_p)
931		{
932		const unsigned int old = source_p->umodes;
933	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
933	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
934
935	<	assert(source_p->localClient->confs.head);
935	>	assert(source_p->connection->confs.head);
936
937		++Count.oper;
938		SetOper(source_p);
939
940		if (conf->modes)
941		AddUMode(source_p, conf->modes);
942	<	else if (ConfigFileEntry.oper_umodes)
943	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
942	>	else if (ConfigGeneral.oper_umodes)
943	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
944
945		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946		++Count.invisi;
#	Line 1248 | Line 957 | oper_up(struct Client *source_p)
957
958		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
959		get_oper_name(source_p));
960	<	send_umode_out(source_p, source_p, old);
961	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
960	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
961	>	me.id, get_oper_name(source_p));
962	>	send_umode_out(source_p, old);
963	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
964		}
965
966	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
966	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
967
968		int
969		valid_sid(const char *sid)
#	Line 1277 | Line 988 | valid_sid(const char *sid)
988		void
989		init_uid(void)
990		{
1280	–	unsigned int i;
1281	–
991		memset(new_uid, 0, sizeof(new_uid));
992
993	<	if (!EmptyString(ServerInfo.sid))
994	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
993	>	if (!EmptyString(ConfigServerInfo.sid))
994	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
995
996	<	for (i = 0; i < IRC_MAXSID; ++i)
996	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
997		if (new_uid[i] == '\0')
998		new_uid[i] = 'A';
999
#	Line 1301 | Line 1010 | init_uid(void)
1010		*                note this is a recursive function
1011		*/
1012		static void
1013	<	add_one_to_uid(int i)
1013	>	add_one_to_uid(unsigned int i)
1014		{
1015	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1015	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1016		{
1017		if (new_uid[i] == 'Z')
1018		new_uid[i] = '0';
1019		else if (new_uid[i] == '9')
1020		{
1021		new_uid[i] = 'A';
1022	<	add_one_to_uid(i-1);
1022	>	add_one_to_uid(i - 1);
1023		}
1024		else
1025		++new_uid[i];
#	Line 1335 | Line 1044 | add_one_to_uid(int i)
1044		static const char *
1045		uid_get(void)
1046		{
1047	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1047	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1048		return new_uid;
1049		}
1050
#	Line 1350 | Line 1059 | void
1059		init_isupport(void)
1060		{
1061		add_isupport("CALLERID", NULL, -1);
1062	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1062	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1063		add_isupport("DEAF", "D", -1);
1064		add_isupport("KICKLEN", NULL, KICKLEN);
1065		add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	–	#ifdef HALFOPS
1066		add_isupport("PREFIX", "(ohv)@%+", -1);
1067		add_isupport("STATUSMSG", "@%+", -1);
1068	<	#else
1069	<	add_isupport("PREFIX", "(ov)@+", -1);
1362	<	add_isupport("STATUSMSG", "@+", -1);
1363	<	#endif
1364	<	add_isupport("EXCEPTS", "e", -1);
1365	<	add_isupport("INVEX", "I", -1);
1068	>	add_isupport("EXCEPTS", NULL, -1);
1069	>	add_isupport("INVEX", NULL, -1);
1070		}
1071
1072		/*
#	Line 1377 | Line 1081 | init_isupport(void)
1081		void
1082		add_isupport(const char *name, const char *options, int n)
1083		{
1084	<	dlink_node *ptr;
1085	<	struct Isupport *support;
1084	>	dlink_node *node = NULL;
1085	>	struct Isupport *support = NULL;
1086
1087	<	DLINK_FOREACH(ptr, support_list.head)
1087	>	DLINK_FOREACH(node, support_list.head)
1088		{
1089	<	support = ptr->data;
1089	>	support = node->data;
1090		if (irccmp(support->name, name) == 0)
1091		{
1092		MyFree(support->name);
#	Line 1391 | Line 1095 | add_isupport(const char *name, const cha
1095		}
1096		}
1097
1098	<	if (ptr == NULL)
1098	>	if (node == NULL)
1099		{
1100	<	support = MyMalloc(sizeof(*support));
1100	>	support = MyCalloc(sizeof(*support));
1101		dlinkAddTail(support, &support->node, &support_list);
1102		}
1103
1104		support->name = xstrdup(name);
1105	<	if (options != NULL)
1105	>	if (options)
1106		support->options = xstrdup(options);
1107		support->number = n;
1108
#	Line 1415 | Line 1119 | add_isupport(const char *name, const cha
1119		void
1120		delete_isupport(const char *name)
1121		{
1122	<	dlink_node *ptr;
1419	<	struct Isupport *support;
1122	>	dlink_node *node = NULL;
1123
1124	<	DLINK_FOREACH(ptr, support_list.head)
1124	>	DLINK_FOREACH(node, support_list.head)
1125		{
1126	<	support = ptr->data;
1126	>	struct Isupport *support = node->data;
1127	>
1128		if (irccmp(support->name, name) == 0)
1129		{
1130	<	dlinkDelete(ptr, &support_list);
1130	>	dlinkDelete(node, &support_list);
1131		MyFree(support->name);
1132		MyFree(support->options);
1133		MyFree(support);
#	Line 1446 | Line 1150 | rebuild_isupport_message_line(void)
1150		{
1151		char isupportbuffer[IRCD_BUFSIZE];
1152		char *p = isupportbuffer;
1153	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1153	>	dlink_node *node = NULL, *node_next = NULL;
1154		int n = 0;
1155		int tokens = 0;
1156		size_t len = 0;
1157	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1157	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1158
1159	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1159	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1160		{
1161	<	dlinkDelete(ptr, &support_list_lines);
1162	<	MyFree(ptr->data);
1163	<	free_dlink_node(ptr);
1161	>	dlinkDelete(node, &support_list_lines);
1162	>	MyFree(node->data);
1163	>	free_dlink_node(node);
1164		}
1165
1166	<	DLINK_FOREACH(ptr, support_list.head)
1166	>	DLINK_FOREACH(node, support_list.head)
1167		{
1168	<	struct Isupport *support = ptr->data;
1168	>	struct Isupport *support = node->data;
1169
1170		p += (n = sprintf(p, "%s", support->name));
1171		len += n;
1172
1173	<	if (support->options != NULL)
1173	>	if (support->options)
1174		{
1175		p += (n = sprintf(p, "=%s", support->options));
1176		len += n;
#	Line 1494 | Line 1198 | rebuild_isupport_message_line(void)
1198		}
1199		}
1200
1201	<	if (len != 0)
1201	>	if (len)
1202		{
1203		if (*--p == ' ')
1204		*p = '\0';

Diff Legend

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