ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3135 by michael, Mon Mar 10 21:11:25 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6252 by michael, Fri Jul 10 15:32:00 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
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
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"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 39 | Line 39
39		#include "numeric.h"
40		#include "conf.h"
41		#include "log.h"
42	<	#include "s_serv.h"
42	>	#include "server.h"
43		#include "send.h"
44	–	#include "supported.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		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 *);
59	<	static const char *uid_get(void);
60	<
61	<	/* Used for building up the isupport string,
62	<	* used with init_isupport, add_isupport, delete_isupport
63	<	*/
64	<
65	<	struct Isupport
66	<	{
67	<	dlink_node node;
68	<	char *name;
69	<	char *options;
70	<	int number;
71	<	};
72	<
73	<	static dlink_list support_list;
74	<	static dlink_list support_list_lines;
75	<
76	<	/* memory is cheap. map 0-255 to equivalent mode */
77	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	0,                  /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	UMODE_SSL,          /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	UMODE_WEBIRC,       /* W */
86	<	0,                  /* X */
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 */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
153	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 170 | Line 110 | void
110		show_lusers(struct Client *source_p)
111		{
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
114	<	Count.invisi, dlink_list_length(&global_serv_list));
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117	<	(Count.total-Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119	<	if (Count.oper > 0)
119	>	if (Count.oper)
120		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121
122	<	if (dlink_list_length(&unknown_list) > 0)
122	>	if (dlink_list_length(&unknown_list))
123		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124
125	<	if (dlink_list_length(&global_channel_list) > 0)
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127
128		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
#	Line 209 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
152	<	/* show_isupport()
152	>	/* report_and_set_user_flags()
153		*
154	<	* inputs       - pointer to client
154	>	* inputs       - pointer to source_p
155	>	*              - pointer to conf for this user
156		* output       - NONE
157	<	* side effects - display to client what we support (for them)
157	>	* side effects - Report to user any special flags
158	>	*                they are getting, and set them.
159		*/
160	<	void
161	<	show_isupport(struct Client *source_p)
160	>	static void
161	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
162		{
163	<	const dlink_node *ptr = NULL;
163	>	/* If this user is being spoofed, tell them so */
164	>	if (IsConfDoSpoofIp(conf))
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
166	>
167	>	/* If this user is in the exception class, set it "E lined" */
168	>	if (IsConfExemptKline(conf))
169	>	{
170	>	SetExemptKline(source_p);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172	>	}
173	>
174	>	if (IsConfExemptXline(conf))
175	>	{
176	>	SetExemptXline(source_p);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178	>	}
179	>
180	>	if (IsConfExemptResv(conf))
181	>	{
182	>	SetExemptResv(source_p);
183	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	>	}
185	>
186	>	/* If this user is exempt from user limits set it "F lined" */
187	>	if (IsConfExemptLimits(conf))
188	>	{
189	>	SetExemptLimits(source_p);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	>	}
192
193	<	DLINK_FOREACH(ptr, support_list_lines.head)
194	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
193	>	if (IsConfCanFlood(conf))
194	>	{
195	>	SetCanFlood(source_p);
196	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197	>	"protection, aren't you fearsome.");
198	>	}
199		}
200
201	<	/*
202	<	** register_local_user
203	<	**      This function is called when both NICK and USER messages
204	<	**      have been accepted for the client, in whatever order. Only
205	<	**      after this, is the USER message propagated.
206	<	**
207	<	**      NICK's must be propagated at once when received, although
208	<	**      it would be better to delay them too until full info is
209	<	**      available. Doing it is not so simple though, would have
210	<	**      to implement the following:
211	<	**
212	<	**      (actually it has been implemented already for a while) -orabidoo
213	<	**
214	<	**      1) user telnets in and gives only "NICK foobar" and waits
215	<	**      2) another user far away logs in normally with the nick
216	<	**         "foobar" (quite legal, as this server didn't propagate
217	<	**         it).
218	<	**      3) now this server gets nick "foobar" from outside, but
219	<	**         has alread the same defined locally. Current server
220	<	**         would just issue "KILL foobar" to clean out dups. But,
221	<	**         this is not fair. It should actually request another
222	<	**         nick from local user or kill him/her...
223	<	*/
201	>	/* introduce_client()
202	>	*
203	>	* inputs       - source_p
204	>	* output       - NONE
205	>	* side effects - This common function introduces a client to the rest
206	>	*                of the net, either from a local client connect or
207	>	*                from a remote connect.
208	>	*/
209	>	static void
210	>	introduce_client(struct Client *source_p)
211	>	{
212	>	dlink_node *node = NULL;
213	>	char ubuf[IRCD_BUFSIZE] = "";
214	>
215	>	if (MyClient(source_p))
216	>	send_umode(source_p, source_p, 0, ubuf);
217	>	else
218	>	send_umode(NULL, source_p, 0, ubuf);
219	>
220	>	watch_check_hash(source_p, RPL_LOGON);
221	>
222	>	if (ubuf[0] == '\0')
223	>	{
224	>	ubuf[0] = '+';
225	>	ubuf[1] = '\0';
226	>	}
227	>
228	>	DLINK_FOREACH(node, local_server_list.head)
229	>	{
230	>	struct Client *server = node->data;
231	>
232	>	if (server == source_p->from)
233	>	continue;
234	>
235	>	if (IsCapable(server, CAP_SVS))
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237	>	source_p->servptr->id,
238	>	source_p->name, source_p->hopcount+1,
239	>	(unsigned long)source_p->tsinfo,
240	>	ubuf, source_p->username, source_p->host,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243	>	source_p->info);
244	>	else
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246	>	source_p->servptr->id,
247	>	source_p->name, source_p->hopcount+1,
248	>	(unsigned long)source_p->tsinfo,
249	>	ubuf, source_p->username, source_p->host,
250	>	source_p->sockhost, source_p->id, source_p->info);
251	>
252	>	if (!EmptyString(source_p->certfp))
253	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
254	>	}
255	>	}
256	>
257	>	/* user_welcome()
258	>	*
259	>	* inputs       - client pointer to client to welcome
260	>	* output       - NONE
261	>	* side effects -
262	>	*/
263	>	static void
264	>	user_welcome(struct Client *source_p)
265	>	{
266	>	#if defined(__TIME__) && defined(__DATE__)
267	>	static const char built_date[] = __DATE__ " at " __TIME__;
268	>	#else
269	>	static const char built_date[] = "unknown";
270	>	#endif
271	>
272	>	#ifdef HAVE_LIBCRYPTO
273	>	if (HasFlag(source_p, FLAGS_SSL))
274	>	{
275	>	AddUMode(source_p, UMODE_SSL);
276	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
277	>	ssl_get_cipher(source_p->connection->fd.ssl));
278	>	}
279	>	#endif
280	>
281	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
282	>	source_p->name);
283	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
284	>	get_listener_name(source_p->connection->listener), ircd_version);
285	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
286	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
287	>
288	>	isupport_show(source_p);
289	>	show_lusers(source_p);
290	>	motd_signon(source_p);
291	>	}
292	>
293	>	/* check_xline()
294	>	*
295	>	* inputs       - pointer to client to test
296	>	* outupt       - 1 if exiting 0 if ok
297	>	* side effects -
298	>	*/
299	>	static int
300	>	check_xline(struct Client *source_p)
301	>	{
302	>	struct MaskItem *conf = NULL;
303	>
304	>	if (IsExemptXline(source_p))
305	>	return 0;
306	>
307	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
308	>	{
309	>	++conf->count;
310	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
311	>	"X-line Rejecting [%s] [%s], user %s [%s]",
312	>	source_p->info, conf->reason,
313	>	get_client_name(source_p, HIDE_IP),
314	>	source_p->sockhost);
315	>
316	>	++ServerStats.is_ref;
317	>	exit_client(source_p, "Bad user info");
318	>	return 1;
319	>	}
320	>
321	>	return 0;
322	>	}
323	>
324	>	/*! \brief This function is called when both NICK and USER messages
325	>	*      have been accepted for the client, in whatever order. Only
326	>	*      after this, is the UID message propagated.
327	>	* \param source_p Pointer to given client to introduce
328	>	*/
329		void
330		register_local_user(struct Client *source_p)
331		{
332		const char *id = NULL;
333		const struct MaskItem *conf = NULL;
334
256	–	assert(source_p != NULL);
335		assert(source_p == source_p->from);
336		assert(MyConnect(source_p));
337	<	assert(!source_p->localClient->registration);
338	<
261	<	ClearCap(source_p, CAP_TS6);
337	>	assert(IsUnknown(source_p));
338	>	assert(!source_p->connection->registration);
339
340	<	if (ConfigFileEntry.ping_cookie)
340	>	if (ConfigGeneral.ping_cookie)
341		{
342	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
342	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
343		{
344		do
345	<	source_p->localClient->random_ping = genrand_int32();
346	<	while (!source_p->localClient->random_ping);
345	>	source_p->connection->random_ping = genrand_int32();
346	>	while (!source_p->connection->random_ping);
347
348	<	sendto_one(source_p, "PING :%u",
272	<	source_p->localClient->random_ping);
348	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
349		SetPingSent(source_p);
350		return;
351		}
#	Line 278 | Line 354 | register_local_user(struct Client *sourc
354		return;
355		}
356
357	<	source_p->localClient->last_privmsg = CurrentTime;
357	>	source_p->connection->last_privmsg = CurrentTime;
358		/* Straight up the maximum rate of flooding... */
359	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
359	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
360
361		if (!check_client(source_p))
362		return;
#	Line 289 | Line 365 | register_local_user(struct Client *sourc
365		{
366		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
367		"character in your hostname");
368	<	strlcpy(source_p->host, source_p->sockhost,
293	<	sizeof(source_p->host));
368	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
369		}
370
371	<	conf = source_p->localClient->confs.head->data;
371	>	conf = source_p->connection->confs.head->data;
372
373		if (!IsGotId(source_p))
374		{
375	<	char username[USERLEN + 1];
375	>	char username[USERLEN + 1] = "";
376		const char *p = username;
377		unsigned int i = 0;
378
#	Line 306 | Line 381 | register_local_user(struct Client *sourc
381		++ServerStats.is_ref;
382		sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
383		"identd to use this server");
384	<	exit_client(source_p, &me, "Install identd");
384	>	exit_client(source_p, "Install identd");
385		return;
386		}
387
#	Line 316 | Line 391 | register_local_user(struct Client *sourc
391		source_p->username[i++] = '~';
392
393		for (; *p && i < USERLEN; ++p)
394	<	if (*p != '[')
320	<	source_p->username[i++] = *p;
394	>	source_p->username[i++] = *p;
395
396		source_p->username[i] = '\0';
397		}
398
399	<	/* password check */
399	>	/* Password check */
400		if (!EmptyString(conf->passwd))
401		{
402	<	const char *pass = source_p->localClient->passwd;
329	<
330	<	if (!match_conf_password(pass, conf))
402	>	if (!match_conf_password(source_p->connection->password, conf))
403		{
404		++ServerStats.is_ref;
405
406		sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
407	<	exit_client(source_p, &me, "Bad Password");
407	>	exit_client(source_p, "Bad Password");
408		return;
409		}
410		}
411
412	<	/* don't free source_p->localClient->passwd here - it can be required
413	<	* by masked /stats I if there are auth{} blocks with need_password = no;
412	>	/*
413	>	* Don't free source_p->connection->password here - it can be required
414	>	* by masked /stats I if there are auth {} blocks with need_password = no;
415		* --adx
416		*/
417
418	<	/* report if user has &^>= etc. and set flags as needed in source_p */
418	>	/*
419	>	* Report if user has &^>= etc. and set flags as needed in source_p
420	>	*/
421		report_and_set_user_flags(source_p, conf);
422
423		if (IsDead(source_p))
424		return;
425
426	<	/* Limit clients -
426	>	/*
427	>	* Limit clients -
428		* We want to be able to have servers and F-line clients
429		* connect, so save room for "buffer" connections.
430		* Smaller servers may want to decrease this, and it should
431		* probably be just a percentage of the MAXCLIENTS...
432		*   -Taner
433		*/
434	<	/* Except "F:" clients */
435	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
360	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
434	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
435	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
436		{
437		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
438		"Too many clients, rejecting %s[%s].",
439		source_p->name, source_p->host);
440		++ServerStats.is_ref;
441	<	exit_client(source_p, &me, "Sorry, server is full - try later");
441	>	exit_client(source_p, "Sorry, server is full - try later");
442		return;
443		}
444
370	–	/* valid user name check */
445		if (!valid_username(source_p->username, 1))
446		{
447	<	char tmpstr2[IRCD_BUFSIZE];
447	>	char buf[IRCD_BUFSIZE] = "";
448
449		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
450		"Invalid username: %s (%s@%s)",
451		source_p->name, source_p->username, source_p->host);
452		++ServerStats.is_ref;
453	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
454	<	source_p->username);
381	<	exit_client(source_p, &me, tmpstr2);
453	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
454	>	exit_client(source_p, buf);
455		return;
456		}
457
458		if (check_xline(source_p))
459		return;
460
461	<	while (hash_find_id((id = uid_get())) != NULL)
461	>	while (hash_find_id((id = uid_get())))
462		;
463
464		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 394 | Line 467 | register_local_user(struct Client *sourc
467		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
468		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
469		source_p->name, source_p->username, source_p->host,
470	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
471	<	"255.255.255.255" : source_p->sockhost,
399	<	get_client_class(&source_p->localClient->confs),
470	>	source_p->sockhost,
471	>	get_client_class(&source_p->connection->confs),
472		source_p->info, source_p->id);
473
474	<	if (ConfigFileEntry.invisible_on_connect)
474	>	if (ConfigGeneral.invisible_on_connect)
475		{
476		AddUMode(source_p, UMODE_INVISIBLE);
477		++Count.invisi;
#	Line 411 | Line 483 | register_local_user(struct Client *sourc
483
484		if (!(Count.max_loc % 10))
485		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
486	<	"New Max Local Clients: %d",
486	>	"New maximum local client connections: %u",
487		Count.max_loc);
488		}
489
418	–	/* Increment our total user count here */
490		if (++Count.total > Count.max_tot)
491		Count.max_tot = Count.total;
492		++Count.totalrestartcount;
#	Line 423 | Line 494 | register_local_user(struct Client *sourc
494		assert(source_p->servptr == &me);
495		SetClient(source_p);
496		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
497	<
427	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
497	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
498
499		assert(dlinkFind(&unknown_list, source_p));
500
501	<	dlink_move_node(&source_p->localClient->lclient_node,
501	>	dlink_move_node(&source_p->connection->lclient_node,
502		&unknown_list, &local_client_list);
503
504		user_welcome(source_p);
#	Line 449 | Line 519 | register_local_user(struct Client *sourc
519		*                is introduced by a server.
520		*/
521		void
522	<	register_remote_user(struct Client *source_p, const char *username,
453	<	const char *host, const char *server)
522	>	register_remote_user(struct Client *source_p)
523		{
524	<	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, &me, "Ghosted Client");
483	<	return;
484	<	}
524	>	const struct Client *target_p = NULL;
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
#	Line 490 | Line 530 | register_remote_user(struct Client *sour
530		source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
532		target_p->name, target_p->from->name);
533	<	kill_client(source_p->from, source_p,
534	<	"%s (NICK from wrong direction (%s != %s))",
535	<	me.name, source_p->servptr->name, target_p->from->name);
533	>	sendto_one(source_p->from,
534	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
535	>	me.id, source_p->id, me.name, source_p->servptr->name,
536	>	target_p->from->name);
537	>
538		AddFlag(source_p, FLAGS_KILLED);
539	<	exit_client(source_p, &me, "USER server wrong direction");
539	>	exit_client(source_p, "UID server wrong direction");
540		return;
541		}
542
#	Line 505 | Line 547 | register_remote_user(struct Client *sour
547		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
548		AddFlag(source_p, FLAGS_SERVICE);
549
508	–	/* Increment our total user count here */
550		if (++Count.total > Count.max_tot)
551		Count.max_tot = Count.total;
552
553		SetClient(source_p);
554		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
555	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
556		add_user_host(source_p->username, source_p->host, 1);
557		SetUserHost(source_p);
558
559		if (HasFlag(source_p->servptr, FLAGS_EOB))
560		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
561	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
561	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
562		source_p->servptr->name,
563		source_p->name, source_p->username, source_p->host,
564	<	source_p->info, source_p->id);
564	>	source_p->sockhost, source_p->info, source_p->id);
565
566		introduce_client(source_p);
567		}
568
527	–	/* introduce_client()
528	–	*
529	–	* inputs       - source_p
530	–	* output       - NONE
531	–	* side effects - This common function introduces a client to the rest
532	–	*                of the net, either from a local client connect or
533	–	*                from a remote connect.
534	–	*/
535	–	static void
536	–	introduce_client(struct Client *source_p)
537	–	{
538	–	dlink_node *server_node = NULL;
539	–	char ubuf[IRCD_BUFSIZE];
540	–
541	–	if (MyClient(source_p))
542	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
543	–	else
544	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
545	–
546	–	watch_check_hash(source_p, RPL_LOGON);
547	–
548	–	if (ubuf[0] == '\0')
549	–	{
550	–	ubuf[0] = '+';
551	–	ubuf[1] = '\0';
552	–	}
553	–
554	–	DLINK_FOREACH(server_node, serv_list.head)
555	–	{
556	–	struct Client *server = server_node->data;
557	–
558	–	if (server == source_p->from)
559	–	continue;
560	–
561	–	if (IsCapable(server, CAP_SVS))
562	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
563	–	source_p->servptr->id,
564	–	source_p->name, source_p->hopcount+1,
565	–	(unsigned long)source_p->tsinfo,
566	–	ubuf, source_p->username, source_p->host,
567	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	–	"0" : source_p->sockhost, source_p->id,
569	–	source_p->svid,
570	–	source_p->info);
571	–	else
572	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	–	source_p->servptr->id,
574	–	source_p->name, source_p->hopcount+1,
575	–	(unsigned long)source_p->tsinfo,
576	–	ubuf, source_p->username, source_p->host,
577	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	–	"0" : source_p->sockhost, source_p->id, source_p->info);
579	–
580	–	if (!EmptyString(source_p->certfp))
581	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582	–	}
583	–	}
584	–
569		/* valid_hostname()
570		*
571		* Inputs       - pointer to hostname
#	Line 596 | Line 580 | valid_hostname(const char *hostname)
580		{
581		const char *p = hostname;
582
583	<	assert(p != NULL);
583	>	assert(p);
584
585		if (EmptyString(p) || *p == '.' || *p == ':')
586		return 0;
#	Line 622 | Line 606 | valid_hostname(const char *hostname)
606		int
607		valid_username(const char *username, const int local)
608		{
609	<	int dots      = 0;
609	>	unsigned int dots = 0;
610		const char *p = username;
611
612	<	assert(p != NULL);
612	>	assert(p);
613
614		if (*p == '~')
615		++p;
#	Line 642 | Line 626 | valid_username(const char *username, con
626		{
627		while (*++p)
628		{
629	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
629	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
630		{
631	<	if (++dots > ConfigFileEntry.dots_in_ident)
631	>	if (++dots > ConfigGeneral.dots_in_ident)
632		return 0;
633		if (!IsUserChar(*(p + 1)))
634		return 0;
#	Line 660 | Line 644 | valid_username(const char *username, con
644		return 0;
645		}
646
647	<	return  p - username <= USERLEN;;
647	>	return p - username <= USERLEN;
648		}
649
650		/* clean_nick_name()
#	Line 674 | Line 658 | int
658		valid_nickname(const char *nickname, const int local)
659		{
660		const char *p = nickname;
677	–	assert(nickname && *nickname);
661
662	<	/* nicks can't start with a digit or - or be 0 length */
663	<	/* This closer duplicates behaviour of hybrid-6 */
664	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
662	>	assert(p);
663	>
664	>	/*
665	>	* Nicks can't start with a digit or - or be 0 length.
666	>	*/
667	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
668		return 0;
669
670		for (; *p; ++p)
#	Line 688 | Line 674 | valid_nickname(const char *nickname, con
674		return p - nickname <= NICKLEN;
675		}
676
691	–	/* report_and_set_user_flags()
692	–	*
693	–	* inputs       - pointer to source_p
694	–	*              - pointer to conf for this user
695	–	* output       - NONE
696	–	* side effects - Report to user any special flags
697	–	*                they are getting, and set them.
698	–	*/
699	–	static void
700	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
701	–	{
702	–	/* If this user is being spoofed, tell them so */
703	–	if (IsConfDoSpoofIp(conf))
704	–	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705	–
706	–	/* If this user is in the exception class, Set it "E lined" */
707	–	if (IsConfExemptKline(conf))
708	–	{
709	–	SetExemptKline(source_p);
710	–	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711	–	}
712	–
713	–	/*
714	–	* The else here is to make sure that G line exempt users
715	–	* do not get noticed twice.
716	–	*/
717	–	else if (IsConfExemptGline(conf))
718	–	{
719	–	SetExemptGline(source_p);
720	–	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721	–	}
722	–
723	–	if (IsConfExemptResv(conf))
724	–	{
725	–	SetExemptResv(source_p);
726	–	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727	–	}
728	–
729	–	/* If this user is exempt from user limits set it "F lined" */
730	–	if (IsConfExemptLimits(conf))
731	–	{
732	–	SetExemptLimits(source_p);
733	–	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734	–	}
735	–
736	–	if (IsConfCanFlood(conf))
737	–	{
738	–	SetCanFlood(source_p);
739	–	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	–	"protection, aren't you fearsome.");
741	–	}
742	–	}
743	–
744	–	/* set_user_mode()
745	–	*
746	–	* added 15/10/91 By Darren Reed.
747	–	* parv[0] - sender
748	–	* parv[1] - username to change mode for
749	–	* parv[2] - modes to change
750	–	*/
751	–	void
752	–	set_user_mode(struct Client *client_p, struct Client *source_p,
753	–	const int parc, char *parv[])
754	–	{
755	–	unsigned int flag, setflags;
756	–	char **p, *m, buf[IRCD_BUFSIZE];
757	–	struct Client *target_p;
758	–	int what = MODE_ADD, badflag = 0, i;
759	–
760	–	assert(!(parc < 2));
761	–
762	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
763	–	{
764	–	if (MyConnect(source_p))
765	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
766	–	return;
767	–	}
768	–
769	–	if (source_p != target_p)
770	–	{
771	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
772	–	return;
773	–	}
774	–
775	–	if (parc < 3)
776	–	{
777	–	m = buf;
778	–	*m++ = '+';
779	–
780	–	for (i = 0; i < 128; ++i)
781	–	if (HasUMode(source_p, user_modes[i]))
782	–	*m++ = (char)i;
783	–	*m = '\0';
784	–
785	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
786	–	return;
787	–	}
788	–
789	–	/* find flags already set for user */
790	–	setflags = source_p->umodes;
791	–
792	–	/* parse mode change string(s) */
793	–	for (p = &parv[2]; p && *p; ++p)
794	–	{
795	–	for (m = *p; *m; ++m)
796	–	{
797	–	switch (*m)
798	–	{
799	–	case '+':
800	–	what = MODE_ADD;
801	–	break;
802	–	case '-':
803	–	what = MODE_DEL;
804	–	break;
805	–	case 'o':
806	–	if (what == MODE_ADD)
807	–	{
808	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
809	–	{
810	–	++Count.oper;
811	–	SetOper(source_p);
812	–	}
813	–	}
814	–	else
815	–	{
816	–	if (!HasUMode(source_p, UMODE_OPER))
817	–	break;
818	–
819	–	ClearOper(source_p);
820	–	Count.oper--;
821	–
822	–	if (MyConnect(source_p))
823	–	{
824	–	dlink_node *dm = NULL;
825	–
826	–	detach_conf(source_p, CONF_OPER);
827	–	ClrOFlag(source_p);
828	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
829	–
830	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
831	–	free_dlink_node(dm);
832	–	}
833	–	}
834	–
835	–	break;
836	–
837	–	case 'S':  /* Only servers may set +S in a burst */
838	–	case 'W':  /* Only servers may set +W in a burst */
839	–	case 'r':  /* Only services may set +r */
840	–	case 'x':  /* Only services may set +x */
841	–	break;
842	–
843	–	default:
844	–	if ((flag = user_modes[(unsigned char)*m]))
845	–	{
846	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
847	–	(ConfigFileEntry.oper_only_umodes & flag))
848	–	badflag = 1;
849	–	else
850	–	{
851	–	if (what == MODE_ADD)
852	–	AddUMode(source_p, flag);
853	–	else
854	–	DelUMode(source_p, flag);
855	–	}
856	–	}
857	–	else if (MyConnect(source_p))
858	–	badflag = 1;
859	–
860	–	break;
861	–	}
862	–	}
863	–	}
864	–
865	–	if (badflag)
866	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
867	–
868	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
869	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
870	–	{
871	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
872	–	DelUMode(source_p, UMODE_ADMIN);
873	–	}
874	–
875	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
876	–	++Count.invisi;
877	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
878	–	--Count.invisi;
879	–
880	–	/*
881	–	* compare new flags with old flags and send string which
882	–	* will cause servers to update correctly.
883	–	*/
884	–	send_umode_out(client_p, source_p, setflags);
885	–	}
886	–
677		/* send_umode()
678		* send the MODE string for user (user) to connection client_p
679		* -avalon
#	Line 897 | Line 687 | set_user_mode(struct Client *client_p, s
687		*/
688		void
689		send_umode(struct Client *client_p, struct Client *source_p,
690	<	unsigned int old, unsigned int sendmask, char *umode_buf)
690	>	unsigned int old, char *umode_buf)
691		{
692		char *m = umode_buf;
693		int what = 0;
904	–	unsigned int i;
905	–	unsigned int flag;
694
695		/*
696	<	* build a string in umode_buf to represent the change in the user's
696	>	* Build a string in umode_buf to represent the change in the user's
697		* mode between the new (source_p->umodes) and 'old'.
698		*/
699	<	for (i = 0; i < 128; ++i)
699	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
700		{
701	<	flag = user_modes[i];
914	<	if (!flag)
915	<	continue;
916	<
917	<	if (MyClient(source_p) && !(flag & sendmask))
918	<	continue;
919	<
920	<	if ((flag & old) && !HasUMode(source_p, flag))
701	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
702		{
703		if (what == MODE_DEL)
704	<	*m++ = (char)i;
704	>	*m++ = tab->c;
705		else
706		{
707		what = MODE_DEL;
708		*m++ = '-';
709	<	*m++ = (char)i;
709	>	*m++ = tab->c;
710		}
711		}
712	<	else if (!(flag & old) && HasUMode(source_p, flag))
712	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
713		{
714		if (what == MODE_ADD)
715	<	*m++ = (char)i;
715	>	*m++ = tab->c;
716		else
717		{
718		what = MODE_ADD;
719		*m++ = '+';
720	<	*m++ = (char)i;
720	>	*m++ = tab->c;
721		}
722		}
723		}
#	Line 945 | Line 726 | send_umode(struct Client *client_p, stru
726
727		if (*umode_buf && client_p)
728		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
729	<	source_p->name, source_p->username,
730	<	source_p->host, source_p->name, umode_buf);
729	>	client_p->name, client_p->username,
730	>	client_p->host, client_p->name, umode_buf);
731		}
732
733		/* send_umode_out()
#	Line 956 | Line 737 | send_umode(struct Client *client_p, stru
737		* side effects - Only send ubuf out to servers that know about this client
738		*/
739		void
740	<	send_umode_out(struct Client *client_p, struct Client *source_p,
960	<	unsigned int old)
740	>	send_umode_out(struct Client *source_p, unsigned int old)
741		{
742	<	char buf[IRCD_BUFSIZE] = { '\0' };
963	<	dlink_node *ptr = NULL;
742	>	char buf[IRCD_BUFSIZE] = "";
743
744	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
744	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
745
746		if (buf[0])
747	<	{
748	<	DLINK_FOREACH(ptr, serv_list.head)
970	<	{
971	<	struct Client *target_p = ptr->data;
972	<
973	<	if ((target_p != client_p) && (target_p != source_p))
974	<	sendto_one(target_p, ":%s MODE %s :%s",
975	<	ID_or_name(source_p, target_p),
976	<	ID_or_name(source_p, target_p), buf);
977	<	}
978	<	}
979	<
980	<	if (client_p && MyClient(client_p))
981	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
747	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
748	>	source_p->id, source_p->id, buf);
749		}
750
751		void
752		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
753		{
754	<	dlink_node *ptr = NULL;
754	>	dlink_node *node = NULL;
755
756		if (!strcmp(target_p->host, hostname))
757		return;
#	Line 993 | Line 760 | user_set_hostmask(struct Client *target_
760		{
761		case MODE_ADD:
762		AddUMode(target_p, UMODE_HIDDENHOST);
996	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
763		break;
764		case MODE_DEL:
765		DelUMode(target_p, UMODE_HIDDENHOST);
1000	–
1001	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1002	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
766		break;
767		default: return;
768		}
769
770	<	if (ConfigFileEntry.cycle_on_host_change)
770	>	if (ConfigGeneral.cycle_on_host_change)
771		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
772		target_p->name, target_p->username, target_p->host);
773
#	Line 1018 | Line 781 | user_set_hostmask(struct Client *target_
781
782		if (MyClient(target_p))
783		{
784	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
784	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
785		clear_ban_cache_client(target_p);
786		}
787
788	<	if (!ConfigFileEntry.cycle_on_host_change)
788	>	if (!ConfigGeneral.cycle_on_host_change)
789		return;
790
791	<	DLINK_FOREACH(ptr, target_p->channel.head)
791	>	DLINK_FOREACH(node, target_p->channel.head)
792		{
793	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
793	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
794		char *p = modebuf;
795		int len = 0;
796	<	const struct Membership *ms = ptr->data;
796	>	const struct Membership *member = node->data;
797
798	<	if (has_member_flags(ms, CHFL_CHANOP))
798	>	if (has_member_flags(member, CHFL_CHANOP))
799		{
800		*p++ = 'o';
801		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
802		}
803
804	<	if (has_member_flags(ms, CHFL_HALFOP))
804	>	if (has_member_flags(member, CHFL_HALFOP))
805		{
806		*p++ = 'h';
807		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
808		}
809
810	<	if (has_member_flags(ms, CHFL_VOICE))
810	>	if (has_member_flags(member, CHFL_VOICE))
811		{
812		*p++ = 'v';
813		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1052 | Line 815 | user_set_hostmask(struct Client *target_
815
816		*p = '\0';
817
818	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
819	<	target_p->name, target_p->username, target_p->host,
820	<	ms->chptr->chname);
818	>
819	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
820	>	target_p->name, target_p->username,
821	>	target_p->host, member->chptr->name,
822	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
823	>	target_p->info);
824	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
825	>	target_p->name, target_p->username,
826	>	target_p->host, member->chptr->name);
827	>
828		if (nickbuf[0])
829	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
830	<	target_p->servptr->name, ms->chptr->chname,
829	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
830	>	target_p->servptr->name, member->chptr->name,
831		modebuf, nickbuf);
832
833		}
#	Line 1069 | Line 839 | user_set_hostmask(struct Client *target_
839		target_p->host, target_p->away);
840		}
841
842	<	/* user_welcome()
843	<	*
844	<	* inputs       - client pointer to client to welcome
1075	<	* output       - NONE
1076	<	* side effects -
1077	<	*/
1078	<	static void
1079	<	user_welcome(struct Client *source_p)
1080	<	{
1081	<	#if defined(__TIME__) && defined(__DATE__)
1082	<	static const char built_date[] = __DATE__ " at " __TIME__;
1083	<	#else
1084	<	static const char built_date[] = "unknown";
1085	<	#endif
1086	<
1087	<	#ifdef HAVE_LIBCRYPTO
1088	<	if (HasFlag(source_p, FLAGS_SSL))
1089	<	{
1090	<	AddUMode(source_p, UMODE_SSL);
1091	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1092	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	<	}
1094	<	#endif
1095	<
1096	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1097	<	source_p->name);
1098	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1099	<	get_listener_name(source_p->localClient->listener), ircd_version);
1100	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1101	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1102	<	show_isupport(source_p);
1103	<
1104	<	if (source_p->id[0] != '\0')
1105	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1106	<
1107	<	show_lusers(source_p);
1108	<	motd_signon(source_p);
1109	<	}
1110	<
1111	<	/* check_xline()
1112	<	*
1113	<	* inputs       - pointer to client to test
1114	<	* outupt       - 1 if exiting 0 if ok
1115	<	* side effects -
1116	<	*/
1117	<	static int
1118	<	check_xline(struct Client *source_p)
1119	<	{
1120	<	struct MaskItem *conf = NULL;
1121	<	const char *reason = NULL;
1122	<
1123	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1124	<	{
1125	<	++conf->count;
1126	<
1127	<	if (conf->reason != NULL)
1128	<	reason = conf->reason;
1129	<	else
1130	<	reason = "No Reason";
1131	<
1132	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1133	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1134	<	source_p->info, reason,
1135	<	get_client_name(source_p, HIDE_IP),
1136	<	source_p->sockhost);
1137	<
1138	<	++ServerStats.is_ref;
1139	<	exit_client(source_p, &me, "Bad user info");
1140	<	return 1;
1141	<	}
1142	<
1143	<	return 0;
1144	<	}
1145	<
1146	<	/* oper_up()
1147	<	*
1148	<	* inputs       - pointer to given client to oper
1149	<	* output       - NONE
1150	<	* side effects - Blindly opers up given source_p, using conf info
1151	<	*                all checks on passwords have already been done.
1152	<	*                This could also be used by rsa oper routines.
842	>	/*! \brief Blindly opers up given source_p, using conf info.
843	>	*         All checks on passwords have already been done.
844	>	* \param source_p Pointer to given client to oper
845		*/
846		void
847	<	oper_up(struct Client *source_p)
847	>	user_oper_up(struct Client *source_p)
848		{
849		const unsigned int old = source_p->umodes;
850	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
850	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
851
852	<	assert(source_p->localClient->confs.head);
852	>	assert(source_p->connection->confs.head);
853
854		++Count.oper;
855		SetOper(source_p);
856
857		if (conf->modes)
858		AddUMode(source_p, conf->modes);
859	<	else if (ConfigFileEntry.oper_umodes)
860	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
859	>	else if (ConfigGeneral.oper_umodes)
860	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
861
862		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
863		++Count.invisi;
#	Line 1180 | Line 872 | oper_up(struct Client *source_p)
872		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
873		AddUMode(source_p, UMODE_ADMIN);
874
875	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1184	<	get_oper_name(source_p));
1185	<	send_umode_out(source_p, source_p, old);
1186	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1187	<	}
1188	<
1189	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1190	<
1191	<	int
1192	<	valid_sid(const char *sid)
1193	<	{
1194	<	if (strlen(sid) == IRC_MAXSID)
1195	<	if (IsDigit(*sid))
1196	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1197	<	return 1;
1198	<
1199	<	return 0;
1200	<	}
1201	<
1202	<	/*
1203	<	* init_uid()
1204	<	*
1205	<	* inputs       - NONE
1206	<	* output       - NONE
1207	<	* side effects - new_uid is filled in with server id portion (sid)
1208	<	*                (first 3 bytes) or defaulted to 'A'.
1209	<	*                Rest is filled in with 'A'
1210	<	*/
1211	<	void
1212	<	init_uid(void)
1213	<	{
1214	<	unsigned int i;
1215	<
1216	<	memset(new_uid, 0, sizeof(new_uid));
1217	<
1218	<	if (!EmptyString(ServerInfo.sid))
1219	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1220	<
1221	<	for (i = 0; i < IRC_MAXSID; ++i)
1222	<	if (new_uid[i] == '\0')
1223	<	new_uid[i] = 'A';
1224	<
1225	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1226	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1227	<	}
1228	<
1229	<	/*
1230	<	* add_one_to_uid
1231	<	*
1232	<	* inputs       - index number into new_uid
1233	<	* output       - NONE
1234	<	* side effects - new_uid is incremented by one
1235	<	*                note this is a recursive function
1236	<	*/
1237	<	static void
1238	<	add_one_to_uid(int i)
1239	<	{
1240	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1241	<	{
1242	<	if (new_uid[i] == 'Z')
1243	<	new_uid[i] = '0';
1244	<	else if (new_uid[i] == '9')
1245	<	{
1246	<	new_uid[i] = 'A';
1247	<	add_one_to_uid(i-1);
1248	<	}
1249	<	else
1250	<	++new_uid[i];
1251	<	}
1252	<	else
1253	<	{
1254	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1255	<	if (new_uid[i] == 'Z')
1256	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1257	<	else
1258	<	++new_uid[i];
1259	<	}
1260	<	}
1261	<
1262	<	/*
1263	<	* uid_get
1264	<	*
1265	<	* inputs       - struct Client *
1266	<	* output       - new UID is returned to caller
1267	<	* side effects - new_uid is incremented by one.
1268	<	*/
1269	<	static const char *
1270	<	uid_get(void)
1271	<	{
1272	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1273	<	return new_uid;
1274	<	}
1275	<
1276	<	/*
1277	<	* init_isupport()
1278	<	*
1279	<	* input        - NONE
1280	<	* output       - NONE
1281	<	* side effects - Must be called before isupport is enabled
1282	<	*/
1283	<	void
1284	<	init_isupport(void)
1285	<	{
1286	<	add_isupport("CALLERID", NULL, -1);
1287	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1288	<	add_isupport("DEAF", "D", -1);
1289	<	add_isupport("KICKLEN", NULL, KICKLEN);
1290	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1291	<	#ifdef HALFOPS
1292	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1293	<	add_isupport("STATUSMSG", "@%+", -1);
1294	<	#else
1295	<	add_isupport("PREFIX", "(ov)@+", -1);
1296	<	add_isupport("STATUSMSG", "@+", -1);
1297	<	#endif
1298	<	add_isupport("EXCEPTS", "e", -1);
1299	<	add_isupport("INVEX", "I", -1);
1300	<	}
1301	<
1302	<	/*
1303	<	* add_isupport()
1304	<	*
1305	<	* input        - name of supported function
1306	<	*              - options if any
1307	<	*              - number if any
1308	<	* output       - NONE
1309	<	* side effects - Each supported item must call this when activated
1310	<	*/
1311	<	void
1312	<	add_isupport(const char *name, const char *options, int n)
1313	<	{
1314	<	dlink_node *ptr;
1315	<	struct Isupport *support;
1316	<
1317	<	DLINK_FOREACH(ptr, support_list.head)
875	>	if (!EmptyString(conf->whois))
876		{
877	<	support = ptr->data;
878	<	if (irccmp(support->name, name) == 0)
879	<	{
880	<	MyFree(support->name);
1323	<	MyFree(support->options);
1324	<	break;
1325	<	}
1326	<	}
1327	<
1328	<	if (ptr == NULL)
1329	<	{
1330	<	support = MyMalloc(sizeof(*support));
1331	<	dlinkAddTail(support, &support->node, &support_list);
877	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
878	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
879	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
880	>	RPL_WHOISOPERATOR, conf->whois);
881		}
882
883	<	support->name = xstrdup(name);
884	<	if (options != NULL)
885	<	support->options = xstrdup(options);
886	<	support->number = n;
887	<
888	<	rebuild_isupport_message_line();
1340	<	}
1341	<
1342	<	/*
1343	<	* delete_isupport()
1344	<	*
1345	<	* input        - name of supported function
1346	<	* output       - NONE
1347	<	* side effects - Each supported item must call this when deactivated
1348	<	*/
1349	<	void
1350	<	delete_isupport(const char *name)
1351	<	{
1352	<	dlink_node *ptr;
1353	<	struct Isupport *support;
1354	<
1355	<	DLINK_FOREACH(ptr, support_list.head)
1356	<	{
1357	<	support = ptr->data;
1358	<	if (irccmp(support->name, name) == 0)
1359	<	{
1360	<	dlinkDelete(ptr, &support_list);
1361	<	MyFree(support->name);
1362	<	MyFree(support->options);
1363	<	MyFree(support);
1364	<	break;
1365	<	}
1366	<	}
1367	<
1368	<	rebuild_isupport_message_line();
1369	<	}
1370	<
1371	<	/*
1372	<	* rebuild_isupport_message_line
1373	<	*
1374	<	* input        - NONE
1375	<	* output       - NONE
1376	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1377	<	*/
1378	<	void
1379	<	rebuild_isupport_message_line(void)
1380	<	{
1381	<	char isupportbuffer[IRCD_BUFSIZE];
1382	<	char *p = isupportbuffer;
1383	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1384	<	int n = 0;
1385	<	int tokens = 0;
1386	<	size_t len = 0;
1387	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1388	<
1389	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1390	<	{
1391	<	dlinkDelete(ptr, &support_list_lines);
1392	<	MyFree(ptr->data);
1393	<	free_dlink_node(ptr);
1394	<	}
1395	<
1396	<	DLINK_FOREACH(ptr, support_list.head)
1397	<	{
1398	<	struct Isupport *support = ptr->data;
1399	<
1400	<	p += (n = sprintf(p, "%s", support->name));
1401	<	len += n;
1402	<
1403	<	if (support->options != NULL)
1404	<	{
1405	<	p += (n = sprintf(p, "=%s", support->options));
1406	<	len += n;
1407	<	}
1408	<
1409	<	if (support->number > 0)
1410	<	{
1411	<	p += (n = sprintf(p, "=%d", support->number));
1412	<	len += n;
1413	<	}
1414	<
1415	<	*p++ = ' ';
1416	<	len++;
1417	<	*p = '\0';
1418	<
1419	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1420	<	{ /* arbritrary for now */
1421	<	if (*--p == ' ')
1422	<	*p = '\0';
1423	<
1424	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1425	<	p = isupportbuffer;
1426	<	len = 0;
1427	<	n = tokens = 0;
1428	<	}
1429	<	}
1430	<
1431	<	if (len != 0)
1432	<	{
1433	<	if (*--p == ' ')
1434	<	*p = '\0';
1435	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1436	<	}
883	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
884	>	get_oper_name(source_p));
885	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
886	>	me.id, get_oper_name(source_p));
887	>	send_umode_out(source_p, old);
888	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
889		}

Diff Legend

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