ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 1851 by michael, Wed Apr 24 18:31:06 2013 UTC vs.
Revision 4744 by michael, Thu Oct 16 11:46:19 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 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 16 | 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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
34	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 42 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
45	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "mempool.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54		#include "conf_db.h"
55		#include "conf_class.h"
56	+	#include "motd.h"
57	+	#include "ipcache.h"
58
57	–	struct config_server_hide ConfigServerHide;
59
60		/* general conf items link list root, other than k lines etc. */
61		dlink_list service_items = { NULL, NULL, 0 };
#	Line 63 | Line 64 | dlink_list cluster_items = { NULL, NULL,
64		dlink_list oconf_items   = { NULL, NULL, 0 };
65		dlink_list uconf_items   = { NULL, NULL, 0 };
66		dlink_list xconf_items   = { NULL, NULL, 0 };
66	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
67	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
67		dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list temporary_resv = { NULL, NULL, 0 };
68	>	dlink_list cresv_items   = { NULL, NULL, 0 };
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
73		extern int yyparse(); /* defined in y.tab.c */
74
76	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
77	–
75		/* internally defined functions */
76		static void read_conf(FILE *);
77		static void clear_out_old_conf(void);
78		static void expire_tklines(dlink_list *);
82	–	static void garbage_collect_ip_entries(void);
83	–	static int hash_ip(struct irc_ssaddr *);
79		static int verify_access(struct Client *);
80		static int attach_iline(struct Client *, struct MaskItem *);
86	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
81		static dlink_list *map_to_list(enum maskitem_type);
88	–	static struct MaskItem *find_regexp_kline(const char *[]);
82		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
83
84
92	–	/* usually, with hash tables, you use a prime number...
93	–	* but in this case I am dealing with ip addresses,
94	–	* not ascii strings.
95	–	*/
96	–	#define IP_HASH_SIZE 0x1000
97	–
98	–	struct ip_entry
99	–	{
100	–	struct irc_ssaddr ip;
101	–	unsigned int count;
102	–	time_t last_attempt;
103	–	struct ip_entry *next;
104	–	};
105	–
106	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
107	–	static mp_pool_t *ip_entry_pool = NULL;
108	–	static int ip_entries_count = 0;
109	–
110	–
85		/* conf_dns_callback()
86		*
87		* inputs       - pointer to struct MaskItem
#	Line 119 | Line 93 | static int ip_entries_count = 0;
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98		struct MaskItem *conf = vptr;
99
100		conf->dns_pending = 0;
101
102	<	if (addr != NULL)
102	>	if (addr)
103		memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105		conf->dns_failed = 1;
#	Line 143 | Line 117 | conf_dns_lookup(struct MaskItem *conf)
117		if (!conf->dns_pending)
118		{
119		conf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, conf, conf->host);
120	>
121	>	if (conf->aftype == AF_INET)
122	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
123	>	else
124	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
125		}
126		}
127
128		struct MaskItem *
129		conf_make(enum maskitem_type type)
130		{
131	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
131	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
132		dlink_list *list = NULL;
133
134		conf->type   = type;
#	Line 168 | Line 146 | conf_free(struct MaskItem *conf)
146		dlink_node *ptr = NULL, *ptr_next = NULL;
147		dlink_list *list = NULL;
148
149	<	if (conf->node.next)
150	<	if ((list = map_to_list(conf->type)))
173	<	dlinkDelete(&conf->node, list);
149	>	if ((list = map_to_list(conf->type)))
150	>	dlinkFindDelete(list, conf);
151
152		MyFree(conf->name);
153
154		if (conf->dns_pending)
155		delete_resolver_queries(conf);
156	<	if (conf->passwd != NULL)
156	>	if (conf->passwd)
157		memset(conf->passwd, 0, strlen(conf->passwd));
158	<	if (conf->spasswd != NULL)
158	>	if (conf->spasswd)
159		memset(conf->spasswd, 0, strlen(conf->spasswd));
160
161		conf->class = NULL;
#	Line 186 | Line 163 | conf_free(struct MaskItem *conf)
163		MyFree(conf->passwd);
164		MyFree(conf->spasswd);
165		MyFree(conf->reason);
166	+	MyFree(conf->certfp);
167		MyFree(conf->user);
168		MyFree(conf->host);
191	–	MyFree(conf->regexuser);
192	–	MyFree(conf->regexhost);
169		#ifdef HAVE_LIBCRYPTO
170		MyFree(conf->cipher_list);
171
#	Line 199 | Line 175 | conf_free(struct MaskItem *conf)
175		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
176		{
177		MyFree(ptr->data);
178	+	dlinkDelete(ptr, &conf->hub_list);
179		free_dlink_node(ptr);
180		}
181
182		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
183		{
184		MyFree(ptr->data);
185	+	dlinkDelete(ptr, &conf->leaf_list);
186		free_dlink_node(ptr);
187		}
188
189	<	MyFree(conf);
212	<	}
213	<
214	<	static const struct shared_flags
215	<	{
216	<	const unsigned int type;
217	<	const unsigned char letter;
218	<	} flag_table[] = {
219	<	{ SHARED_KLINE,   'K' },
220	<	{ SHARED_UNKLINE, 'U' },
221	<	{ SHARED_XLINE,   'X' },
222	<	{ SHARED_UNXLINE, 'Y' },
223	<	{ SHARED_RESV,    'Q' },
224	<	{ SHARED_UNRESV,  'R' },
225	<	{ SHARED_LOCOPS,  'L' },
226	<	{ SHARED_DLINE,   'D' },
227	<	{ SHARED_UNDLINE, 'E' },
228	<	{ 0, '\0' }
229	<	};
230	<
231	<	/*
232	<	* inputs       - pointer to client requesting confitem report
233	<	*              - ConfType to report
234	<	* output       - none
235	<	* side effects -
236	<	*/
237	<	void
238	<	report_confitem_types(struct Client *source_p, enum maskitem_type type)
239	<	{
240	<	dlink_node *ptr = NULL, *dptr = NULL;
241	<	struct MaskItem *conf = NULL;
242	<	const struct ClassItem *class = NULL;
243	<	const struct shared_flags *shared = NULL;
244	<	char buf[12];
245	<	char *p = NULL;
246	<
247	<	switch (type)
189	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
190		{
191	<	case CONF_XLINE:
250	<	DLINK_FOREACH(ptr, xconf_items.head)
251	<	{
252	<	conf = ptr->data;
191	>	struct exempt *exptr = ptr->data;
192
193	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
194	<	me.name, source_p->name,
195	<	conf->until ? "x": "X", conf->count,
196	<	conf->name, conf->reason);
197	<	}
259	<	break;
260	<
261	<	#ifdef HAVE_LIBPCRE
262	<	case CONF_RXLINE:
263	<	DLINK_FOREACH(ptr, rxconf_items.head)
264	<	{
265	<	conf = ptr->data;
266	<
267	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
268	<	me.name, source_p->name,
269	<	"XR", conf->count,
270	<	conf->name, conf->reason);
271	<	}
272	<	break;
273	<
274	<	case CONF_RKLINE:
275	<	DLINK_FOREACH(ptr, rkconf_items.head)
276	<	{
277	<	conf = ptr->data;
278	<
279	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
280	<	source_p->name, "KR", conf->host, conf->user,
281	<	conf->reason);
282	<	}
283	<	break;
284	<	#endif
285	<
286	<	case CONF_ULINE:
287	<	shared = flag_table;
288	<	DLINK_FOREACH(ptr, uconf_items.head)
289	<	{
290	<	conf = ptr->data;
291	<
292	<	p = buf;
293	<
294	<	*p++ = 'c';
295	<	for (; shared->type; ++shared)
296	<	if (shared->type & conf->flags)
297	<	*p++ = shared->letter;
298	<	else
299	<	*p++ = ToLower(shared->letter);
300	<
301	<	sendto_one(source_p, form_str(RPL_STATSULINE),
302	<	me.name, source_p->name, conf->name,
303	<	conf->user?conf->user: "*",
304	<	conf->host?conf->host: "*", buf);
305	<	}
306	<
307	<	shared = flag_table;
308	<	DLINK_FOREACH(ptr, cluster_items.head)
309	<	{
310	<	conf = ptr->data;
311	<
312	<	p = buf;
313	<
314	<	*p++ = 'C';
315	<	for (; shared->type; ++shared)
316	<	if (shared->type & conf->flags)
317	<	*p++ = shared->letter;
318	<	else
319	<	*p++ = ToLower(shared->letter);
320	<
321	<	sendto_one(source_p, form_str(RPL_STATSULINE),
322	<	me.name, source_p->name, conf->name,
323	<	"*", "*", buf);
324	<	}
325	<
326	<	break;
327	<
328	<	case CONF_OPER:
329	<	DLINK_FOREACH(ptr, oconf_items.head)
330	<	{
331	<	conf = ptr->data;
332	<
333	<	/* Don't allow non opers to see oper privs */
334	<	if (HasUMode(source_p, UMODE_OPER))
335	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
336	<	me.name, source_p->name, 'O', conf->user, conf->host,
337	<	conf->name, oper_privs_as_string(conf->port),
338	<	conf->class ? conf->class->name : "<default>");
339	<	else
340	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
341	<	me.name, source_p->name, 'O', conf->user, conf->host,
342	<	conf->name, "0",
343	<	conf->class ? conf->class->name : "<default>");
344	<	}
345	<	break;
346	<
347	<	case CONF_CLASS:
348	<	DLINK_FOREACH(ptr, class_get_list()->head)
349	<	{
350	<	class = ptr->data;
351	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
352	<	me.name, source_p->name, 'Y',
353	<	class->name, class->ping_freq,
354	<	class->con_freq,
355	<	class->max_total, class->max_sendq,
356	<	class->max_recvq,
357	<	class->ref_count,
358	<	class->number_per_cidr, class->cidr_bitlen_ipv4,
359	<	class->number_per_cidr, class->cidr_bitlen_ipv6,
360	<	class->active ? "active" : "disabled");
361	<	}
362	<	break;
363	<
364	<	case CONF_SERVICE:
365	<	DLINK_FOREACH(ptr, service_items.head)
366	<	{
367	<	conf = ptr->data;
368	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
369	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
370	<	}
371	<	break;
372	<
373	<	case CONF_SERVER:
374	<	DLINK_FOREACH(ptr, server_items.head)
375	<	{
376	<	p = buf;
377	<	conf = ptr->data;
378	<
379	<	buf[0] = '\0';
380	<
381	<	if (IsConfAllowAutoConn(conf))
382	<	*p++ = 'A';
383	<	if (IsConfSSL(conf))
384	<	*p++ = 'S';
385	<	if (buf[0] == '\0')
386	<	*p++ = '*';
387	<
388	<	*p = '\0';
389	<
390	<	/*
391	<	* Allow admins to see actual ips unless hide_server_ips is enabled
392	<	*/
393	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
394	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
395	<	me.name, source_p->name, 'C', conf->host,
396	<	buf, conf->name, conf->port,
397	<	conf->class ? conf->class->name : "<default>");
398	<	else
399	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
400	<	me.name, source_p->name, 'C',
401	<	"*@127.0.0.1", buf, conf->name, conf->port,
402	<	conf->class ? conf->class->name : "<default>");
403	<	}
404	<	break;
405	<
406	<	case CONF_HUB:
407	<	DLINK_FOREACH(ptr, server_items.head)
408	<	{
409	<	conf = ptr->data;
410	<
411	<	DLINK_FOREACH(dptr, conf->hub_list.head)
412	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
413	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
414	<	}
415	<
416	<	DLINK_FOREACH(ptr, server_items.head)
417	<	{
418	<	conf = ptr->data;
419	<
420	<	DLINK_FOREACH(dptr, conf->leaf_list.head)
421	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
422	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
423	<	}
424	<
425	<	break;
426	<
427	<	default:
428	<	break;
193	>	dlinkDelete(ptr, &conf->exempt_list);
194	>	MyFree(exptr->name);
195	>	MyFree(exptr->user);
196	>	MyFree(exptr->host);
197	>	MyFree(exptr);
198		}
199	+
200	+	MyFree(conf);
201		}
202
203		/* check_client()
#	Line 446 | Line 217 | int
217		check_client(struct Client *source_p)
218		{
219		int i;
220	<
220	>
221		if ((i = verify_access(source_p)))
222	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
222	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
223		source_p->name, source_p->sockhost);
224
225		switch (i)
#	Line 456 | Line 227 | check_client(struct Client *source_p)
227		case TOO_MANY:
228		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
229		"Too many on IP for %s (%s).",
230	<	get_client_name(source_p, SHOW_IP),
231	<	source_p->sockhost);
230	>	get_client_name(source_p, SHOW_IP),
231	>	source_p->sockhost);
232		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
233	<	get_client_name(source_p, SHOW_IP));
233	>	get_client_name(source_p, SHOW_IP));
234		++ServerStats.is_ref;
235	<	exit_client(source_p, &me, "No more connections allowed on that IP");
235	>	exit_client(source_p, "No more connections allowed on that IP");
236		break;
237
238		case I_LINE_FULL:
239		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
240		"auth{} block is full for %s (%s).",
241	<	get_client_name(source_p, SHOW_IP),
242	<	source_p->sockhost);
241	>	get_client_name(source_p, SHOW_IP),
242	>	source_p->sockhost);
243		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
244	<	get_client_name(source_p, SHOW_IP));
244	>	get_client_name(source_p, SHOW_IP));
245		++ServerStats.is_ref;
246	<	exit_client(source_p, &me,
476	<	"No more connections allowed in your connection class");
246	>	exit_client(source_p, "No more connections allowed in your connection class");
247		break;
248
249		case NOT_AUTHORIZED:
#	Line 481 | Line 251 | check_client(struct Client *source_p)
251		/* jdc - lists server name & port connections are on */
252		/*       a purely cosmetical change */
253		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
254	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
255	<	get_client_name(source_p, SHOW_IP),
256	<	source_p->sockhost,
257	<	source_p->localClient->listener->name,
258	<	source_p->localClient->listener->port);
254	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
255	>	get_client_name(source_p, SHOW_IP),
256	>	source_p->sockhost,
257	>	source_p->connection->listener->name,
258	>	source_p->connection->listener->port);
259		ilog(LOG_TYPE_IRCD,
260	<	"Unauthorized client connection from %s on [%s/%u].",
261	<	get_client_name(source_p, SHOW_IP),
262	<	source_p->localClient->listener->name,
263	<	source_p->localClient->listener->port);
260	>	"Unauthorized client connection from %s on [%s/%u].",
261	>	get_client_name(source_p, SHOW_IP),
262	>	source_p->connection->listener->name,
263	>	source_p->connection->listener->port);
264
265	<	exit_client(source_p, &me, "You are not authorized to use this server");
265	>	exit_client(source_p, "You are not authorized to use this server");
266		break;
267
268		case BANNED_CLIENT:
269	<	exit_client(source_p, &me, "Banned");
269	>	exit_client(source_p, "Banned");
270		++ServerStats.is_ref;
271		break;
272
#	Line 517 | Line 287 | check_client(struct Client *source_p)
287		static int
288		verify_access(struct Client *client_p)
289		{
290	<	struct MaskItem *conf = NULL, *rkconf = NULL;
291	<	char non_ident[USERLEN + 1] = { '~', '\0' };
522	<	const char *uhi[3];
290	>	struct MaskItem *conf = NULL;
291	>	char non_ident[USERLEN + 1] = "~";
292
293		if (IsGotId(client_p))
294		{
295		conf = find_address_conf(client_p->host, client_p->username,
296	<	&client_p->localClient->ip,
297	<	client_p->localClient->aftype,
298	<	client_p->localClient->passwd);
296	>	&client_p->connection->ip,
297	>	client_p->connection->aftype,
298	>	client_p->connection->password);
299		}
300		else
301		{
302	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
302	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
303		conf = find_address_conf(client_p->host,non_ident,
304	<	&client_p->localClient->ip,
305	<	client_p->localClient->aftype,
306	<	client_p->localClient->passwd);
304	>	&client_p->connection->ip,
305	>	client_p->connection->aftype,
306	>	client_p->connection->password);
307		}
308
309	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
541	<	uhi[1] = client_p->host;
542	<	uhi[2] = client_p->sockhost;
543	<
544	<	rkconf = find_regexp_kline(uhi);
545	<
546	<	if (conf != NULL)
309	>	if (conf)
310		{
311	<	if (IsConfClient(conf) && !rkconf)
311	>	if (IsConfClient(conf))
312		{
313		if (IsConfRedir(conf))
314		{
315	<	sendto_one(client_p, form_str(RPL_REDIR),
316	<	me.name, client_p->name,
317	<	conf->name ? conf->name : "",
318	<	conf->port);
556	<	return(NOT_AUTHORIZED);
315	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
316	>	conf->name ? conf->name : "",
317	>	conf->port);
318	>	return NOT_AUTHORIZED;
319		}
320
321		if (IsConfDoIdentd(conf))
322	<	SetNeedId(client_p);
322	>	SetNeedId(client_p);
323
324		/* Thanks for spoof idea amm */
325		if (IsConfDoSpoofIp(conf))
326		{
327	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
327	>	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
328		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
329		"%s spoofing: %s as %s",
330		client_p->name, client_p->host, conf->name);
331		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332	<	SetIPSpoof(client_p);
332	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
333		}
334
335	<	return(attach_iline(client_p, conf));
335	>	return attach_iline(client_p, conf);
336		}
337	<	else if (rkconf || IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
337	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
338		{
577	–	/* XXX */
578	–	conf = rkconf ? rkconf : conf;
339		if (IsConfGline(conf))
340	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
341	<	client_p->name);
342	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
583	<	me.name, client_p->name, conf->reason);
584	<	return(BANNED_CLIENT);
340	>	sendto_one_notice(client_p, &me, ":*** G-lined");
341	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342	>	return BANNED_CLIENT;
343		}
344		}
345
346	<	return(NOT_AUTHORIZED);
346	>	return NOT_AUTHORIZED;
347		}
348
349		/* attach_iline()
#	Line 598 | Line 356 | verify_access(struct Client *client_p)
356		static int
357		attach_iline(struct Client *client_p, struct MaskItem *conf)
358		{
359	<	struct ClassItem *class = NULL;
359	>	const struct ClassItem *class = conf->class;
360		struct ip_entry *ip_found;
361		int a_limit_reached = 0;
362		unsigned int local = 0, global = 0, ident = 0;
363
364	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
364	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
365		ip_found->count++;
366	<	SetIpHash(client_p);
609	<
610	<	if (conf->class == NULL)
611	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
612	<
613	<	class = conf->class;
366	>	AddFlag(client_p, FLAGS_IPHASH);
367
368		count_user_host(client_p->username, client_p->host,
369		&global, &local, &ident);
#	Line 619 | Line 372 | attach_iline(struct Client *client_p, st
372		* setting a_limit_reached if any limit is reached.
373		* - Dianora
374		*/
375	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
375	>	if (class->max_total && class->ref_count >= class->max_total)
376		a_limit_reached = 1;
377	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
377	>	else if (class->max_perip && ip_found->count > class->max_perip)
378		a_limit_reached = 1;
379	<	else if (class->max_local != 0 && local >= class->max_local)
379	>	else if (class->max_local && local >= class->max_local)
380		a_limit_reached = 1;
381	<	else if (class->max_global != 0 && global >= class->max_global)
381	>	else if (class->max_global && global >= class->max_global)
382		a_limit_reached = 1;
383	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
383	>	else if (class->max_ident && ident >= class->max_ident &&
384		client_p->username[0] != '~')
385		a_limit_reached = 1;
386
#	Line 636 | Line 389 | attach_iline(struct Client *client_p, st
389		if (!IsConfExemptLimits(conf))
390		return TOO_MANY;   /* Already at maximum allowed */
391
392	<	sendto_one(client_p,
393	<	":%s NOTICE %s :*** Your connection class is full, "
641	<	"but you have exceed_limit = yes;", me.name, client_p->name);
392	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
393	>	"but you have exceed_limit = yes;");
394		}
395
396		return attach_conf(client_p, conf);
397		}
398
647	–	/* init_ip_hash_table()
648	–	*
649	–	* inputs               - NONE
650	–	* output               - NONE
651	–	* side effects         - allocate memory for ip_entry(s)
652	–	*                      - clear the ip hash table
653	–	*/
654	–	void
655	–	init_ip_hash_table(void)
656	–	{
657	–	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry),
658	–	2 * hard_fdlimit);
659	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
660	–	}
661	–
662	–	/* find_or_add_ip()
663	–	*
664	–	* inputs       - pointer to struct irc_ssaddr
665	–	* output       - pointer to a struct ip_entry
666	–	* side effects -
667	–	*
668	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
669	–	* count set to 0.
670	–	*/
671	–	static struct ip_entry *
672	–	find_or_add_ip(struct irc_ssaddr *ip_in)
673	–	{
674	–	struct ip_entry *ptr, *newptr;
675	–	int hash_index = hash_ip(ip_in), res;
676	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
677	–	#ifdef IPV6
678	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
679	–	#endif
680	–
681	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
682	–	{
683	–	#ifdef IPV6
684	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
685	–	continue;
686	–	if (ip_in->ss.ss_family == AF_INET6)
687	–	{
688	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
689	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
690	–	}
691	–	else
692	–	#endif
693	–	{
694	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
695	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
696	–	}
697	–	if (res == 0)
698	–	{
699	–	/* Found entry already in hash, return it. */
700	–	return ptr;
701	–	}
702	–	}
703	–
704	–	if (ip_entries_count >= 2 * hard_fdlimit)
705	–	garbage_collect_ip_entries();
706	–
707	–	newptr = mp_pool_get(ip_entry_pool);
708	–	memset(newptr, 0, sizeof(*newptr));
709	–	ip_entries_count++;
710	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
711	–
712	–	newptr->next = ip_hash_table[hash_index];
713	–	ip_hash_table[hash_index] = newptr;
714	–
715	–	return newptr;
716	–	}
717	–
718	–	/* remove_one_ip()
719	–	*
720	–	* inputs        - unsigned long IP address value
721	–	* output        - NONE
722	–	* side effects  - The ip address given, is looked up in ip hash table
723	–	*                 and number of ip#'s for that ip decremented.
724	–	*                 If ip # count reaches 0 and has expired,
725	–	*                 the struct ip_entry is returned to the ip_entry_heap
726	–	*/
727	–	void
728	–	remove_one_ip(struct irc_ssaddr *ip_in)
729	–	{
730	–	struct ip_entry *ptr;
731	–	struct ip_entry *last_ptr = NULL;
732	–	int hash_index = hash_ip(ip_in), res;
733	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
734	–	#ifdef IPV6
735	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
736	–	#endif
737	–
738	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
739	–	{
740	–	#ifdef IPV6
741	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
742	–	continue;
743	–	if (ip_in->ss.ss_family == AF_INET6)
744	–	{
745	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
746	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
747	–	}
748	–	else
749	–	#endif
750	–	{
751	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
752	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
753	–	}
754	–	if (res)
755	–	continue;
756	–	if (ptr->count > 0)
757	–	ptr->count--;
758	–	if (ptr->count == 0 &&
759	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
760	–	{
761	–	if (last_ptr != NULL)
762	–	last_ptr->next = ptr->next;
763	–	else
764	–	ip_hash_table[hash_index] = ptr->next;
765	–
766	–	mp_pool_release(ptr);
767	–	ip_entries_count--;
768	–	return;
769	–	}
770	–	last_ptr = ptr;
771	–	}
772	–	}
773	–
774	–	/* hash_ip()
775	–	*
776	–	* input        - pointer to an irc_inaddr
777	–	* output       - integer value used as index into hash table
778	–	* side effects - hopefully, none
779	–	*/
780	–	static int
781	–	hash_ip(struct irc_ssaddr *addr)
782	–	{
783	–	if (addr->ss.ss_family == AF_INET)
784	–	{
785	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
786	–	int hash;
787	–	uint32_t ip;
788	–
789	–	ip   = ntohl(v4->sin_addr.s_addr);
790	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
791	–	return hash;
792	–	}
793	–	#ifdef IPV6
794	–	else
795	–	{
796	–	int hash;
797	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
798	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
799	–
800	–	hash  = ip[0] ^ ip[3];
801	–	hash ^= hash >> 16;
802	–	hash ^= hash >> 8;
803	–	hash  = hash & (IP_HASH_SIZE - 1);
804	–	return hash;
805	–	}
806	–	#else
807	–	return 0;
808	–	#endif
809	–	}
810	–
811	–	/* count_ip_hash()
812	–	*
813	–	* inputs        - pointer to counter of number of ips hashed
814	–	*               - pointer to memory used for ip hash
815	–	* output        - returned via pointers input
816	–	* side effects  - NONE
817	–	*
818	–	* number of hashed ip #'s is counted up, plus the amount of memory
819	–	* used in the hash.
820	–	*/
821	–	void
822	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
823	–	{
824	–	struct ip_entry *ptr;
825	–	int i;
826	–
827	–	*number_ips_stored = 0;
828	–	*mem_ips_stored    = 0;
829	–
830	–	for (i = 0; i < IP_HASH_SIZE; i++)
831	–	{
832	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
833	–	{
834	–	*number_ips_stored += 1;
835	–	*mem_ips_stored += sizeof(struct ip_entry);
836	–	}
837	–	}
838	–	}
839	–
840	–	/* garbage_collect_ip_entries()
841	–	*
842	–	* input        - NONE
843	–	* output       - NONE
844	–	* side effects - free up all ip entries with no connections
845	–	*/
846	–	static void
847	–	garbage_collect_ip_entries(void)
848	–	{
849	–	struct ip_entry *ptr;
850	–	struct ip_entry *last_ptr;
851	–	struct ip_entry *next_ptr;
852	–	int i;
853	–
854	–	for (i = 0; i < IP_HASH_SIZE; i++)
855	–	{
856	–	last_ptr = NULL;
857	–
858	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
859	–	{
860	–	next_ptr = ptr->next;
861	–
862	–	if (ptr->count == 0 &&
863	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
864	–	{
865	–	if (last_ptr != NULL)
866	–	last_ptr->next = ptr->next;
867	–	else
868	–	ip_hash_table[i] = ptr->next;
869	–	mp_pool_release(ptr);
870	–	ip_entries_count--;
871	–	}
872	–	else
873	–	last_ptr = ptr;
874	–	}
875	–	}
876	–	}
877	–
399		/* detach_conf()
400		*
401		* inputs       - pointer to client to detach
#	Line 886 | Line 407 | garbage_collect_ip_entries(void)
407		void
408		detach_conf(struct Client *client_p, enum maskitem_type type)
409		{
410	<	dlink_node *ptr = NULL, *next_ptr = NULL;
410	>	dlink_node *ptr = NULL, *ptr_next = NULL;
411
412	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
412	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->connection->confs.head)
413		{
414		struct MaskItem *conf = ptr->data;
415
#	Line 899 | Line 420 | detach_conf(struct Client *client_p, enu
420		if (!(conf->type & type))
421		continue;
422
423	<	dlinkDelete(ptr, &client_p->localClient->confs);
423	>	dlinkDelete(ptr, &client_p->connection->confs);
424		free_dlink_node(ptr);
425
426		if (conf->type == CONF_CLIENT)
427	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
427	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
428
429		if (--conf->class->ref_count == 0 && conf->class->active == 0)
430		{
#	Line 929 | Line 450 | detach_conf(struct Client *client_p, enu
450		int
451		attach_conf(struct Client *client_p, struct MaskItem *conf)
452		{
453	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
453	>	if (dlinkFind(&client_p->connection->confs, conf))
454		return 1;
455
456		if (conf->type == CONF_CLIENT)
457		if (cidr_limit_reached(IsConfExemptLimits(conf),
458	<	&client_p->localClient->ip, conf->class))
458	>	&client_p->connection->ip, conf->class))
459		return TOO_MANY;    /* Already at maximum allowed */
460
461		conf->class->ref_count++;
462		conf->ref_count++;
463
464	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
464	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
465
466		return 0;
467		}
#	Line 998 | Line 519 | find_conf_name(dlink_list *list, const c
519		DLINK_FOREACH(ptr, list->head)
520		{
521		conf = ptr->data;
522	<
522	>
523		if (conf->type == type)
524		{
525	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
526	<	!match(conf->name, name)))
1006	<	return conf;
525	>	if (conf->name && !irccmp(conf->name, name))
526	>	return conf;
527		}
528		}
529
#	Line 1021 | Line 541 | map_to_list(enum maskitem_type type)
541		{
542		switch(type)
543		{
1024	–	case CONF_RKLINE:
1025	–	return(&rkconf_items);
1026	–	break;
1027	–	case CONF_RXLINE:
1028	–	return(&rxconf_items);
1029	–	break;
544		case CONF_XLINE:
545		return(&xconf_items);
546		break;
#	Line 1037 | Line 551 | map_to_list(enum maskitem_type type)
551		return(&nresv_items);
552		break;
553		case CONF_CRESV:
554	<	return(&resv_channel_list);
554	>	return(&cresv_items);
555		case CONF_OPER:
556		return(&oconf_items);
557		break;
#	Line 1075 | Line 589 | find_matching_name_conf(enum maskitem_ty
589
590		switch (type)
591		{
1078	–	#ifdef HAVE_LIBPCRE
1079	–	case CONF_RXLINE:
1080	–	DLINK_FOREACH(ptr, list_p->head)
1081	–	{
1082	–	conf = ptr->data;
1083	–	assert(conf->regexuser);
1084	–
1085	–	if (!ircd_pcre_exec(conf->regexuser, name))
1086	–	return conf;
1087	–	}
1088	–	break;
1089	–	#endif
592		case CONF_SERVICE:
593		DLINK_FOREACH(ptr, list_p->head)
594		{
#	Line 1108 | Line 610 | find_matching_name_conf(enum maskitem_ty
610		conf = ptr->data;
611
612		if (EmptyString(conf->name))
613	<	continue;
613	>	continue;
614		if ((name != NULL) && !match(conf->name, name))
615		{
616	<	if ((user == NULL && (host == NULL)))
617	<	return conf;
618	<	if ((conf->flags & flags) != flags)
616	>	if ((user == NULL && (host == NULL)))
617	>	return conf;
618	>	if ((conf->flags & flags) != flags)
619		continue;
620	<	if (EmptyString(conf->user) || EmptyString(conf->host))
621	<	return conf;
622	<	if (!match(conf->user, user) && !match(conf->host, host))
623	<	return conf;
620	>	if (EmptyString(conf->user) || EmptyString(conf->host))
621	>	return conf;
622	>	if (!match(conf->user, user) && !match(conf->host, host))
623	>	return conf;
624		}
625		}
626		break;
#	Line 1134 | Line 636 | find_matching_name_conf(enum maskitem_ty
636		return conf;
637		}
638		break;
639	<
639	>
640		default:
641		break;
642		}
#	Line 1160 | Line 662 | find_exact_name_conf(enum maskitem_type
662
663		switch(type)
664		{
1163	–	case CONF_RXLINE:
665		case CONF_XLINE:
666		case CONF_ULINE:
667		case CONF_NRESV:
#	Line 1171 | Line 672 | find_exact_name_conf(enum maskitem_type
672		conf = ptr->data;
673
674		if (EmptyString(conf->name))
675	<	continue;
676	<
675	>	continue;
676	>
677		if (irccmp(conf->name, name) == 0)
678		{
679	<	if ((user == NULL && (host == NULL)))
680	<	return (conf);
681	<	if (EmptyString(conf->user) || EmptyString(conf->host))
682	<	return (conf);
683	<	if (!match(conf->user, user) && !match(conf->host, host))
684	<	return (conf);
679	>	if ((user == NULL && (host == NULL)))
680	>	return conf;
681	>	if (EmptyString(conf->user) || EmptyString(conf->host))
682	>	return conf;
683	>	if (!match(conf->user, user) && !match(conf->host, host))
684	>	return conf;
685		}
686		}
687		break;
#	Line 1209 | Line 710 | find_exact_name_conf(enum maskitem_type
710		return conf;
711		break;
712		case HM_IPV4:
713	<	if (who->localClient->aftype == AF_INET)
714	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
713	>	if (who->connection->aftype == AF_INET)
714	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
715		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
716		return conf;
717		break;
1217	–	#ifdef IPV6
718		case HM_IPV6:
719	<	if (who->localClient->aftype == AF_INET6)
720	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
719	>	if (who->connection->aftype == AF_INET6)
720	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
721		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
722		return conf;
723		break;
1224	–	#endif
724		default:
725		assert(0);
726		}
#	Line 1237 | Line 736 | find_exact_name_conf(enum maskitem_type
736		conf = ptr->data;
737
738		if (EmptyString(conf->name))
739	<	continue;
740	<
739	>	continue;
740	>
741		if (name == NULL)
742		{
743	<	if (EmptyString(conf->host))
744	<	continue;
745	<	if (irccmp(conf->host, host) == 0)
746	<	return(conf);
743	>	if (EmptyString(conf->host))
744	>	continue;
745	>	if (irccmp(conf->host, host) == 0)
746	>	return conf;
747		}
748		else if (irccmp(conf->name, name) == 0)
749	<	{
1251	<	return (conf);
1252	<	}
749	>	return conf;
750		}
751	+
752		break;
753
754		default:
755		break;
756		}
757	<	return(NULL);
757	>
758	>	return NULL;
759		}
760
761		/* rehash()
#	Line 1268 | Line 767 | find_exact_name_conf(enum maskitem_type
767		int
768		rehash(int sig)
769		{
770	<	if (sig != 0)
770	>	if (sig)
771		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
772	<	"Got signal SIGHUP, reloading ircd.conf file");
772	>	"Got signal SIGHUP, reloading configuration file(s)");
773
774		restart_resolver();
775
776		/* don't close listeners until we know we can go ahead with the rehash */
777
1279	–	/* Check to see if we magically got(or lost) IPv6 support */
1280	–	check_can_use_v6();
1281	–
778		read_conf_files(0);
779
1284	–	if (ServerInfo.description != NULL)
1285	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1286	–
780		load_conf_modules();
781	<
1289	<	rehashed_klines = 1;
781	>	check_conf_klines();
782
783		return 0;
784		}
#	Line 1309 | Line 801 | set_default_conf(void)
801		assert(class_default == class_get_list()->tail->data);
802
803		#ifdef HAVE_LIBCRYPTO
804	<	ServerInfo.rsa_private_key = NULL;
805	<	ServerInfo.rsa_private_key_file = NULL;
804	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
805	>	{
806	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
807	>
808	>	if (key)
809	>	{
810	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
811	>	EC_KEY_free(key);
812	>	}
813	>	}
814	>
815	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
816		#endif
817
818	<	/* ServerInfo.name is not rehashable */
819	<	/* ServerInfo.name = ServerInfo.name; */
820	<	ServerInfo.description = NULL;
821	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
822	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
823	<
824	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
825	<	ServerInfo.specific_ipv4_vhost = 0;
826	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
827	<	ServerInfo.specific_ipv6_vhost = 0;
828	<
829	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
830	<	ServerInfo.max_nick_length = 9;
831	<	ServerInfo.max_topic_length = 80;
832	<
833	<	ServerInfo.hub = 0;
834	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
835	<	ServerInfo.dns_host.sin_port = 0;
836	<	AdminInfo.name = NULL;
837	<	AdminInfo.email = NULL;
838	<	AdminInfo.description = NULL;
818	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
819	>	ConfigServerInfo.rsa_private_key = NULL;
820	>	ConfigServerInfo.rsa_private_key_file = NULL;
821	>	#endif
822	>
823	>	/* ConfigServerInfo.name is not rehashable */
824	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
825	>	ConfigServerInfo.description = NULL;
826	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
827	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
828	>
829	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
830	>	ConfigServerInfo.specific_ipv4_vhost = 0;
831	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
832	>	ConfigServerInfo.specific_ipv6_vhost = 0;
833	>
834	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
835	>	ConfigServerInfo.max_nick_length = 9;
836	>	ConfigServerInfo.max_topic_length = 80;
837	>	ConfigServerInfo.hub = 0;
838	>
839	>	ConfigAdminInfo.name = NULL;
840	>	ConfigAdminInfo.email = NULL;
841	>	ConfigAdminInfo.description = NULL;
842
843		log_del_all();
844
845	<	ConfigLoggingEntry.use_logging = 1;
845	>	ConfigLog.use_logging = 1;
846
847		ConfigChannel.disable_fake_channels = 0;
848	<	ConfigChannel.restrict_channels = 0;
849	<	ConfigChannel.knock_delay = 300;
848	>	ConfigChannel.invite_client_count = 10;
849	>	ConfigChannel.invite_client_time = 300;
850	>	ConfigChannel.knock_client_count = 1;
851	>	ConfigChannel.knock_client_time = 300;
852		ConfigChannel.knock_delay_channel = 60;
853	<	ConfigChannel.max_chans_per_user = 25;
1347	<	ConfigChannel.max_chans_per_oper = 50;
1348	<	ConfigChannel.quiet_on_ban = 1;
853	>	ConfigChannel.max_channels = 25;
854		ConfigChannel.max_bans = 25;
855		ConfigChannel.default_split_user_count = 0;
856		ConfigChannel.default_split_server_count = 0;
#	Line 1359 | Line 864 | set_default_conf(void)
864		ConfigServerHide.hide_services = 0;
865		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
866		ConfigServerHide.hide_server_ips = 0;
867	+	ConfigServerHide.disable_remote_commands = 0;
868
869	<
870	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
871	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
872	<	ConfigFileEntry.glines = 0;
873	<	ConfigFileEntry.gline_time = 12 * 3600;
874	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
875	<	ConfigFileEntry.gline_min_cidr = 16;
876	<	ConfigFileEntry.gline_min_cidr6 = 48;
877	<	ConfigFileEntry.invisible_on_connect = 1;
878	<	ConfigFileEntry.tkline_expire_notices = 1;
879	<	ConfigFileEntry.hide_spoof_ips = 1;
880	<	ConfigFileEntry.ignore_bogus_ts = 0;
881	<	ConfigFileEntry.disable_auth = 0;
882	<	ConfigFileEntry.disable_remote = 0;
883	<	ConfigFileEntry.kill_chase_time_limit = 90;
884	<	ConfigFileEntry.default_floodcount = 8;
885	<	ConfigFileEntry.failed_oper_notice = 1;
886	<	ConfigFileEntry.dots_in_ident = 0;
887	<	ConfigFileEntry.min_nonwildcard = 4;
888	<	ConfigFileEntry.min_nonwildcard_simple = 3;
889	<	ConfigFileEntry.max_accept = 20;
890	<	ConfigFileEntry.anti_nick_flood = 0;
891	<	ConfigFileEntry.max_nick_time = 20;
892	<	ConfigFileEntry.max_nick_changes = 5;
893	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
894	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
896	<	ConfigFileEntry.warn_no_nline = 1;
897	<	ConfigFileEntry.stats_o_oper_only = 0;
898	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
899	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
900	<	ConfigFileEntry.stats_P_oper_only = 0;
901	<	ConfigFileEntry.caller_id_wait = 60;
902	<	ConfigFileEntry.opers_bypass_callerid = 0;
903	<	ConfigFileEntry.pace_wait = 10;
904	<	ConfigFileEntry.pace_wait_simple = 1;
905	<	ConfigFileEntry.short_motd = 0;
906	<	ConfigFileEntry.ping_cookie = 0;
907	<	ConfigFileEntry.no_oper_flood = 0;
908	<	ConfigFileEntry.true_no_oper_flood = 0;
909	<	ConfigFileEntry.oper_pass_resv = 1;
910	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
911	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
912	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
913	<	UMODE_OPERWALL | UMODE_WALLOP;
914	<	ConfigFileEntry.use_egd = 0;
915	<	ConfigFileEntry.egdpool_path = NULL;
916	<	ConfigFileEntry.throttle_time = 10;
869	>	ConfigGeneral.away_count = 2;
870	>	ConfigGeneral.away_time = 10;
871	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
872	>	ConfigGeneral.cycle_on_host_change = 1;
873	>	ConfigGeneral.glines = 0;
874	>	ConfigGeneral.gline_time = 12 * 3600;
875	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
876	>	ConfigGeneral.gline_min_cidr = 16;
877	>	ConfigGeneral.gline_min_cidr6 = 48;
878	>	ConfigGeneral.invisible_on_connect = 1;
879	>	ConfigGeneral.tkline_expire_notices = 1;
880	>	ConfigGeneral.hide_spoof_ips = 1;
881	>	ConfigGeneral.ignore_bogus_ts = 0;
882	>	ConfigGeneral.disable_auth = 0;
883	>	ConfigGeneral.kill_chase_time_limit = 90;
884	>	ConfigGeneral.default_floodcount = 8;
885	>	ConfigGeneral.failed_oper_notice = 1;
886	>	ConfigGeneral.dots_in_ident = 0;
887	>	ConfigGeneral.min_nonwildcard = 4;
888	>	ConfigGeneral.min_nonwildcard_simple = 3;
889	>	ConfigGeneral.max_accept = 20;
890	>	ConfigGeneral.anti_nick_flood = 0;
891	>	ConfigGeneral.max_nick_time = 20;
892	>	ConfigGeneral.max_nick_changes = 5;
893	>	ConfigGeneral.anti_spam_exit_message_time = 0;
894	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
896	>	ConfigGeneral.warn_no_connect_block = 1;
897	>	ConfigGeneral.stats_e_disabled = 0;
898	>	ConfigGeneral.stats_o_oper_only = 0;
899	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
900	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
901	>	ConfigGeneral.stats_P_oper_only = 0;
902	>	ConfigGeneral.stats_u_oper_only = 0;
903	>	ConfigGeneral.caller_id_wait = 60;
904	>	ConfigGeneral.opers_bypass_callerid = 0;
905	>	ConfigGeneral.pace_wait = 10;
906	>	ConfigGeneral.pace_wait_simple = 1;
907	>	ConfigGeneral.short_motd = 0;
908	>	ConfigGeneral.ping_cookie = 0;
909	>	ConfigGeneral.no_oper_flood = 0;
910	>	ConfigGeneral.true_no_oper_flood = 0;
911	>	ConfigGeneral.oper_pass_resv = 1;
912	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
913	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
914	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
915	>	ConfigGeneral.throttle_count = 1;
916	>	ConfigGeneral.throttle_time = 1;
917		}
918
919		static void
920		validate_conf(void)
921		{
922	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
923	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1418	<
1419	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1420	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
922	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
923	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
924
925	<	if (ServerInfo.network_name == NULL)
926	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
925	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
926	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
927
928	<	if (ServerInfo.network_desc == NULL)
929	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
928	>	if (ConfigServerInfo.network_name == NULL)
929	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
930
931	<	if (ConfigFileEntry.service_name == NULL)
932	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
931	>	if (ConfigServerInfo.network_desc == NULL)
932	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
933
934	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
934	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
935		}
936
937	<	/* read_conf()
937	>	/* read_conf()
938		*
939		* inputs       - file descriptor pointing to config file to use
940		* output       - None
#	Line 1442 | Line 945 | read_conf(FILE *file)
945		{
946		lineno = 0;
947
948	<	set_default_conf(); /* Set default values prior to conf parsing */
948	>	set_default_conf();  /* Set default values prior to conf parsing */
949		conf_parser_ctx.pass = 1;
950	<	yyparse();          /* pick up the classes first */
950	>	yyparse();  /* Pick up the classes first */
951
952		rewind(file);
953
954		conf_parser_ctx.pass = 2;
955	<	yyparse();          /* Load the values from the conf */
956	<	validate_conf();    /* Check to make sure some values are still okay. */
957	<	/* Some global values are also loaded here. */
958	<	class_delete_marked();      /* Make sure classes are valid */
955	>	yyparse();  /* Load the values from the conf */
956	>	validate_conf();  /* Check to make sure some values are still okay. */
957	>	/* Some global values are also loaded here. */
958	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
959		}
960
961		/* lookup_confhost()
#	Line 1465 | Line 968 | lookup_confhost(struct MaskItem *conf)
968		{
969		struct addrinfo hints, *res;
970
971	<	/* Do name lookup now on hostnames given and store the
971	>	/*
972	>	* Do name lookup now on hostnames given and store the
973		* ip numbers in conf structure.
974		*/
975		memset(&hints, 0, sizeof(hints));
#	Line 1482 | Line 986 | lookup_confhost(struct MaskItem *conf)
986		return;
987		}
988
989	<	assert(res != NULL);
989	>	assert(res);
990
991		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
992		conf->addr.ss_len = res->ai_addrlen;
#	Line 1501 | Line 1005 | lookup_confhost(struct MaskItem *conf)
1005		int
1006		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1007		{
1008	<	struct ip_entry *ip_found;
1008	>	struct ip_entry *ip_found = NULL;
1009		struct MaskItem *conf = find_dline_conf(addr, aftype);
1010
1011		/* DLINE exempt also gets you out of static limits/pacing... */
1012		if (conf && (conf->type == CONF_EXEMPT))
1013		return 0;
1014
1015	<	if (conf != NULL)
1015	>	if (conf)
1016		return BANNED_CLIENT;
1017
1018	<	ip_found = find_or_add_ip(addr);
1018	>	ip_found = ipcache_find_or_add_address(addr);
1019
1020	<	if ((CurrentTime - ip_found->last_attempt) <
1517	<	ConfigFileEntry.throttle_time)
1020	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1021		{
1022	<	ip_found->last_attempt = CurrentTime;
1023	<	return TOO_FAST;
1022	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1023	>	return TOO_FAST;
1024	>
1025	>	++ip_found->connection_count;
1026		}
1027	+	else
1028	+	ip_found->connection_count = 1;
1029
1030		ip_found->last_attempt = CurrentTime;
1031		return 0;
1032		}
1033
1527	–	static struct MaskItem *
1528	–	find_regexp_kline(const char *uhi[])
1529	–	{
1530	–	#ifdef HAVE_LIBPCRE
1531	–	const dlink_node *ptr = NULL;
1532	–
1533	–	DLINK_FOREACH(ptr, rkconf_items.head)
1534	–	{
1535	–	struct MaskItem *aptr = ptr->data;
1536	–
1537	–	assert(aptr->regexuser);
1538	–	assert(aptr->regexhost);
1539	–
1540	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1541	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1542	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1543	–	return aptr;
1544	–	}
1545	–	#endif
1546	–	return NULL;
1547	–	}
1548	–
1549	–	/* find_kill()
1550	–	*
1551	–	* inputs       - pointer to client structure
1552	–	* output       - pointer to struct MaskItem if found
1553	–	* side effects - See if this user is klined already,
1554	–	*                and if so, return struct MaskItem pointer
1555	–	*/
1556	–	struct MaskItem *
1557	–	find_kill(struct Client *client_p)
1558	–	{
1559	–	struct MaskItem *conf = NULL;
1560	–	const char *uhi[3];
1561	–
1562	–	uhi[0] = client_p->username;
1563	–	uhi[1] = client_p->host;
1564	–	uhi[2] = client_p->sockhost;
1565	–
1566	–	assert(client_p != NULL);
1567	–
1568	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1569	–	CONF_KLINE, client_p->localClient->aftype,
1570	–	client_p->username, NULL, 1);
1571	–	if (conf == NULL)
1572	–	conf = find_regexp_kline(uhi);
1573	–
1574	–	return conf;
1575	–	}
1576	–
1577	–	struct MaskItem *
1578	–	find_gline(struct Client *client_p)
1579	–	{
1580	–	struct MaskItem *conf;
1581	–
1582	–	assert(client_p != NULL);
1583	–
1584	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1585	–	CONF_GLINE, client_p->localClient->aftype,
1586	–	client_p->username, NULL, 1);
1587	–	return conf;
1588	–	}
1589	–
1034		/* cleanup_tklines()
1035		*
1036		* inputs       - NONE
#	Line 1595 | Line 1039 | find_gline(struct Client *client_p)
1039		*                This is an event started off in ircd.c
1040		*/
1041		void
1042	<	cleanup_tklines(void *notused)
1042	>	cleanup_tklines(void *unused)
1043		{
1044		hostmask_expire_temporary();
1045	<	expire_tklines(&xconf_items);
1045	>	expire_tklines(&xconf_items);
1046		expire_tklines(&nresv_items);
1047	<	expire_tklines(&resv_channel_list);
1047	>	expire_tklines(&cresv_items);
1048		}
1049
1050		/* expire_tklines()
#	Line 1612 | Line 1056 | cleanup_tklines(void *notused)
1056		static void
1057		expire_tklines(dlink_list *tklist)
1058		{
1059	<	dlink_node *ptr;
1060	<	dlink_node *next_ptr;
1617	<	struct MaskItem *conf;
1059	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1060	>	struct MaskItem *conf = NULL;
1061
1062	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1062	>	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1063		{
1064		conf = ptr->data;
1065
#	Line 1625 | Line 1068 | expire_tklines(dlink_list *tklist)
1068
1069		if (conf->type == CONF_XLINE)
1070		{
1071	<	if (ConfigFileEntry.tkline_expire_notices)
1071	>	if (ConfigGeneral.tkline_expire_notices)
1072		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073		"Temporary X-line for [%s] expired", conf->name);
1074		conf_free(conf);
1075		}
1076		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1077		{
1078	<	if (ConfigFileEntry.tkline_expire_notices)
1078	>	if (ConfigGeneral.tkline_expire_notices)
1079		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1080		"Temporary RESV for [%s] expired", conf->name);
1081		conf_free(conf);
#	Line 1651 | Line 1094 | static const struct oper_privs
1094		const unsigned int flag;
1095		const unsigned char c;
1096		} flag_list[] = {
1097	<	{ OPER_FLAG_ADMIN,       'A' },
1098	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1099	<	{ OPER_FLAG_DIE,         'D' },
1100	<	{ OPER_FLAG_GLINE,       'G' },
1101	<	{ OPER_FLAG_REHASH,      'H' },
1102	<	{ OPER_FLAG_K,           'K' },
1103	<	{ OPER_FLAG_OPERWALL,    'L' },
1104	<	{ OPER_FLAG_N,           'N' },
1105	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1106	<	{ OPER_FLAG_REMOTE,      'R' },
1107	<	{ OPER_FLAG_OPER_SPY,    'S' },
1108	<	{ OPER_FLAG_UNKLINE,     'U' },
1109	<	{ OPER_FLAG_X,           'X' },
1097	>	{ OPER_FLAG_ADMIN,          'A' },
1098	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1099	>	{ OPER_FLAG_DIE,            'D' },
1100	>	{ OPER_FLAG_GLINE,          'G' },
1101	>	{ OPER_FLAG_REHASH,         'H' },
1102	>	{ OPER_FLAG_KLINE,          'K' },
1103	>	{ OPER_FLAG_KILL,           'N' },
1104	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1105	>	{ OPER_FLAG_CONNECT,        'P' },
1106	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1107	>	{ OPER_FLAG_SQUIT,          'R' },
1108	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1109	>	{ OPER_FLAG_UNKLINE,        'U' },
1110	>	{ OPER_FLAG_XLINE,          'X' },
1111		{ 0, '\0' }
1112		};
1113
1114		char *
1115		oper_privs_as_string(const unsigned int port)
1116		{
1117	<	static char privs_out[16];
1117	>	static char privs_out[IRCD_BUFSIZE];
1118		char *privs_ptr = privs_out;
1675	–	const struct oper_privs *opriv = flag_list;
1119
1120	<	for (; opriv->flag; ++opriv)
1120	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1121		{
1122		if (port & opriv->flag)
1123		*privs_ptr++ = opriv->c;
#	Line 1688 | Line 1131 | oper_privs_as_string(const unsigned int
1131		}
1132
1133		/*
1134	<	* Input: A client to find the active oper{} name for.
1134	>	* Input: A client to find the active operator {} name for.
1135		* Output: The nick!user@host{oper} of the oper.
1136		*         "oper" is server name for remote opers
1137		* Side effects: None.
#	Line 1696 | Line 1139 | oper_privs_as_string(const unsigned int
1139		const char *
1140		get_oper_name(const struct Client *client_p)
1141		{
1142	<	dlink_node *cnode = NULL;
1142	>	const dlink_node *cnode = NULL;
1143		/* +5 for !,@,{,} and null */
1144		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1145
1146	+	if (IsServer(client_p))
1147	+	return client_p->name;
1148	+
1149		if (MyConnect(client_p))
1150		{
1151	<	if ((cnode = client_p->localClient->confs.head))
1151	>	if ((cnode = client_p->connection->confs.head))
1152		{
1153	<	struct MaskItem *conf = cnode->data;
1153	>	const struct MaskItem *conf = cnode->data;
1154
1155		if (IsConfOperator(conf))
1156		{
1157	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1157	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1158		client_p->username, client_p->host, conf->name);
1159	<	return buffer;
1159	>	return buffer;
1160		}
1161		}
1162
1163	<	/* Probably should assert here for now. If there is an oper out there
1164	<	* with no oper{} conf attached, it would be good for us to know...
1163	>	/*
1164	>	* Probably should assert here for now. If there is an oper out there
1165	>	* with no operator {} conf attached, it would be good for us to know...
1166		*/
1167	<	assert(0); /* Oper without oper conf! */
1167	>	assert(0);  /* Oper without oper conf! */
1168		}
1169
1170		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1171	<	client_p->username, client_p->host, client_p->servptr->name);
1171	>	client_p->username, client_p->host, client_p->servptr->name);
1172		return buffer;
1173		}
1174
#	Line 1734 | Line 1181 | get_oper_name(const struct Client *clien
1181		void
1182		read_conf_files(int cold)
1183		{
1184	<	const char *filename;
1185	<	char chanmodes[32];
1186	<	char chanlimit[32];
1184	>	const char *filename = NULL;
1185	>	char chanmodes[IRCD_BUFSIZE] = "";
1186	>	char chanlimit[IRCD_BUFSIZE] = "";
1187
1188		conf_parser_ctx.boot = cold;
1189	<	filename = ConfigFileEntry.configfile;
1189	>	filename = ConfigGeneral.configfile;
1190
1191		/* We need to know the initial filename for the yyerror() to report
1192		FIXME: The full path is in conffilenamebuf first time since we
1193	<	dont know anything else
1193	>	don't know anything else
1194
1195	<	- Gozem 2002-07-21
1195	>	- Gozem 2002-07-21
1196		*/
1197		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1198
#	Line 1760 | Line 1207 | read_conf_files(int cold)
1207		else
1208		{
1209		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1210	<	"Unable to read configuration file '%s': %s",
1211	<	filename, strerror(errno));
1210	>	"Unable to read configuration file '%s': %s",
1211	>	filename, strerror(errno));
1212		return;
1213		}
1214		}
#	Line 1774 | Line 1221 | read_conf_files(int cold)
1221
1222		log_reopen_all();
1223
1224	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1225	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1224	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1225	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1226
1227		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1228		add_isupport("MAXLIST", chanmodes, -1);
1229	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1229	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1230		add_isupport("CHANTYPES", "#", -1);
1231
1232		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1233	<	ConfigChannel.max_chans_per_user);
1233	>	ConfigChannel.max_channels);
1234		add_isupport("CHANLIMIT", chanlimit, -1);
1235	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1236	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1237	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1791	<	add_isupport("EXCEPTS", "e", -1);
1792	<	add_isupport("INVEX", "I", -1);
1235	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1236	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1237	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1238		add_isupport("CHANMODES", chanmodes, -1);
1239
1240		/*
#	Line 1809 | Line 1254 | static void
1254		clear_out_old_conf(void)
1255		{
1256		dlink_node *ptr = NULL, *next_ptr = NULL;
1812	–	struct MaskItem *conf;
1257		dlink_list *free_items [] = {
1258		&server_items,   &oconf_items,
1259	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1260	<	&nresv_items, &cluster_items,  &service_items, &resv_channel_list, NULL
1259	>	&uconf_items,   &xconf_items,
1260	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1261		};
1262
1263		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 1821 | Line 1265 | clear_out_old_conf(void)
1265		/* We only need to free anything allocated by yyparse() here.
1266		* Resetting structs, etc, is taken care of by set_default_conf().
1267		*/
1268	<
1268	>
1269		for (; *iterator != NULL; iterator++)
1270		{
1271		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1272		{
1273	<	conf = ptr->data;
1273	>	struct MaskItem *conf = ptr->data;
1274
1275	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1275	>	conf->active = 0;
1276	>	dlinkDelete(&conf->node, *iterator);
1277
1278		/* XXX This is less than pretty */
1279		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1280		{
1281		if (!conf->ref_count)
1282	<	conf_free(conf);
1282	>	conf_free(conf);
1283		}
1284	<	else if (conf->type == CONF_XLINE  ||
1840	<	conf->type == CONF_RXLINE ||
1841	<	conf->type == CONF_RKLINE)
1284	>	else if (conf->type == CONF_XLINE)
1285		{
1286		if (!conf->until)
1287		conf_free(conf);
#	Line 1848 | Line 1291 | clear_out_old_conf(void)
1291		}
1292		}
1293
1294	+	motd_clear();
1295	+
1296		/*
1297		* don't delete the class table, rather mark all entries
1298		* for deletion. The table is cleaned up by class_delete_marked. - avalon
#	Line 1859 | Line 1304 | clear_out_old_conf(void)
1304		/* clean out module paths */
1305		mod_clear_paths();
1306
1307	<	/* clean out ServerInfo */
1308	<	MyFree(ServerInfo.description);
1309	<	ServerInfo.description = NULL;
1310	<	MyFree(ServerInfo.network_name);
1311	<	ServerInfo.network_name = NULL;
1312	<	MyFree(ServerInfo.network_desc);
1313	<	ServerInfo.network_desc = NULL;
1314	<	MyFree(ConfigFileEntry.egdpool_path);
1315	<	ConfigFileEntry.egdpool_path = NULL;
1307	>	pseudo_clear();
1308	>
1309	>	/* clean out ConfigServerInfo */
1310	>	MyFree(ConfigServerInfo.description);
1311	>	ConfigServerInfo.description = NULL;
1312	>	MyFree(ConfigServerInfo.network_name);
1313	>	ConfigServerInfo.network_name = NULL;
1314	>	MyFree(ConfigServerInfo.network_desc);
1315	>	ConfigServerInfo.network_desc = NULL;
1316		#ifdef HAVE_LIBCRYPTO
1317	<	if (ServerInfo.rsa_private_key != NULL)
1317	>	if (ConfigServerInfo.rsa_private_key)
1318		{
1319	<	RSA_free(ServerInfo.rsa_private_key);
1320	<	ServerInfo.rsa_private_key = NULL;
1319	>	RSA_free(ConfigServerInfo.rsa_private_key);
1320	>	ConfigServerInfo.rsa_private_key = NULL;
1321		}
1322
1323	<	MyFree(ServerInfo.rsa_private_key_file);
1324	<	ServerInfo.rsa_private_key_file = NULL;
1880	<
1881	<	if (ServerInfo.server_ctx)
1882	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1883	<	SSL_OP_NO_SSLv3|
1884	<	SSL_OP_NO_TLSv1);
1885	<	if (ServerInfo.client_ctx)
1886	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1887	<	SSL_OP_NO_SSLv3|
1888	<	SSL_OP_NO_TLSv1);
1323	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1324	>	ConfigServerInfo.rsa_private_key_file = NULL;
1325		#endif
1326
1327	<	/* clean out AdminInfo */
1328	<	MyFree(AdminInfo.name);
1329	<	AdminInfo.name = NULL;
1330	<	MyFree(AdminInfo.email);
1331	<	AdminInfo.email = NULL;
1332	<	MyFree(AdminInfo.description);
1333	<	AdminInfo.description = NULL;
1327	>	/* clean out ConfigAdminInfo */
1328	>	MyFree(ConfigAdminInfo.name);
1329	>	ConfigAdminInfo.name = NULL;
1330	>	MyFree(ConfigAdminInfo.email);
1331	>	ConfigAdminInfo.email = NULL;
1332	>	MyFree(ConfigAdminInfo.description);
1333	>	ConfigAdminInfo.description = NULL;
1334
1335		/* clean out listeners */
1336		close_listeners();
1901	–
1902	–	/* clean out general */
1903	–	MyFree(ConfigFileEntry.service_name);
1904	–	ConfigFileEntry.service_name = NULL;
1905	–
1906	–	delete_isupport("INVEX");
1907	–	delete_isupport("EXCEPTS");
1337		}
1338
1339		/* conf_add_class_to_conf()
1340		*
1341		* inputs       - pointer to config item
1342		* output       - NONE
1343	<	* side effects - Add a class pointer to a conf
1343	>	* side effects - Add a class pointer to a conf
1344		*/
1345		void
1346		conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1347		{
1348	<	if (class_name == NULL)
1348	>	if (class_name == NULL)
1349		{
1350		conf->class = class_default;
1351
1352		if (conf->type == CONF_CLIENT)
1353		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1354	<	"Warning *** Defaulting to default class for %s@%s",
1355	<	conf->user, conf->host);
1354	>	"Warning *** Defaulting to default class for %s@%s",
1355	>	conf->user, conf->host);
1356		else
1357		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1358	<	"Warning *** Defaulting to default class for %s",
1359	<	conf->name);
1358	>	"Warning *** Defaulting to default class for %s",
1359	>	conf->name);
1360		}
1361		else
1362		conf->class = class_find(class_name, 1);
#	Line 1936 | Line 1365 | conf_add_class_to_conf(struct MaskItem *
1365		{
1366		if (conf->type == CONF_CLIENT)
1367		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1368	<	"Warning *** Defaulting to default class for %s@%s",
1369	<	conf->user, conf->host);
1368	>	"Warning *** Defaulting to default class for %s@%s",
1369	>	conf->user, conf->host);
1370		else
1371		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1372	<	"Warning *** Defaulting to default class for %s",
1373	<	conf->name);
1372	>	"Warning *** Defaulting to default class for %s",
1373	>	conf->name);
1374		conf->class = class_default;
1375		}
1376		}
#	Line 1983 | Line 1412 | conf_error_report(const char *msg)
1412
1413		/*
1414		* valid_tkline()
1415	<	*
1415	>	*
1416		* inputs       - pointer to ascii string to check
1417		*              - whether the specified time is in seconds or minutes
1418		* output       - -1 not enough parameters
#	Line 1992 | Line 1421 | conf_error_report(const char *msg)
1421		* Originally written by Dianora (Diane, db@db.net)
1422		*/
1423		time_t
1424	<	valid_tkline(const char *p, int minutes)
1424	>	valid_tkline(const char *data, const int minutes)
1425		{
1426	+	const unsigned char *p = (const unsigned char *)data;
1427	+	unsigned char tmpch = '\0';
1428		time_t result = 0;
1429
1430	<	for (; *p; ++p)
1430	>	while ((tmpch = *p++))
1431		{
1432	<	if (!IsDigit(*p))
1432	>	if (!IsDigit(tmpch))
1433		return 0;
1434
1435		result *= 10;
1436	<	result += ((*p) & 0xF);
1436	>	result += (tmpch & 0xF);
1437		}
1438
1439		/*
1440	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1440	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1441		* i.e. they specifically use 0, I am going to return 1 instead
1442		* as a return value of non-zero is used to flag it as a temporary kline
1443		*/
1444		if (result == 0)
1445		result = 1;
1446
1447	<	/*
1447	>	/*
1448		* If the incoming time is in seconds convert it to minutes for the purpose
1449		* of this calculation
1450		*/
1451		if (!minutes)
1452	<	result = result / (time_t)60;
1452	>	result = result / 60;
1453
1454		if (result > MAX_TDKLINE_TIME)
1455		result = MAX_TDKLINE_TIME;
1456
1457	<	result = result * (time_t)60;  /* turn it into seconds */
1457	>	result = result * 60;  /* turn it into seconds */
1458
1459		return result;
1460		}
1461
1462	+	/* valid_wild_card_simple()
1463	+	*
1464	+	* inputs       - data to check for sufficient non-wildcard characters
1465	+	* outputs      - 1 if valid, else 0
1466	+	* side effects - none
1467	+	*/
1468	+	int
1469	+	valid_wild_card_simple(const char *data)
1470	+	{
1471	+	const unsigned char *p = (const unsigned char *)data;
1472	+	unsigned char tmpch = '\0';
1473	+	unsigned int nonwild = 0;
1474	+
1475	+	while ((tmpch = *p++))
1476	+	{
1477	+	if (tmpch == '\\' && *p)
1478	+	{
1479	+	++p;
1480	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1481	+	return 1;
1482	+	}
1483	+	else if (!IsMWildChar(tmpch))
1484	+	{
1485	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1486	+	return 1;
1487	+	}
1488	+	}
1489	+
1490	+	return 0;
1491	+	}
1492	+
1493		/* valid_wild_card()
1494		*
1495		* input        - pointer to client
#	Line 2039 | Line 1501 | valid_tkline(const char *p, int minutes)
1501		int
1502		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1503		{
1504	<	char *p;
1505	<	char tmpch;
2044	<	int nonwild = 0;
1504	>	unsigned char tmpch = '\0';
1505	>	unsigned int nonwild = 0;
1506		va_list args;
1507
1508		/*
#	Line 2060 | Line 1521 | valid_wild_card(struct Client *source_p,
1521
1522		while (count--)
1523		{
1524	<	p = va_arg(args, char *);
1524	>	const unsigned char *p = va_arg(args, const unsigned char *);
1525		if (p == NULL)
1526		continue;
1527
#	Line 2072 | Line 1533 | valid_wild_card(struct Client *source_p,
1533		* If we find enough non-wild characters, we can
1534		* break - no point in searching further.
1535		*/
1536	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1536	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1537	>	{
1538	>	va_end(args);
1539		return 1;
1540	+	}
1541		}
1542		}
1543		}
1544
1545		if (warn)
1546	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1547	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1546	>	sendto_one_notice(source_p, &me,
1547	>	":Please include at least %u non-wildcard characters with the mask",
1548	>	ConfigGeneral.min_nonwildcard);
1549	>	va_end(args);
1550		return 0;
1551		}
1552
#	Line 2094 | Line 1560 | valid_wild_card(struct Client *source_p,
1560		*              - parse_flags bit map of things to test
1561		*              - pointer to user or string to parse into
1562		*              - pointer to host or NULL to parse into if non NULL
1563	<	*              - pointer to optional tkline time or NULL
1563	>	*              - pointer to optional tkline time or NULL
1564		*              - pointer to target_server to parse into if non NULL
1565		*              - pointer to reason to parse into
1566		*
#	Line 2116 | Line 1582 | valid_wild_card(struct Client *source_p,
1582		*/
1583		int
1584		parse_aline(const char *cmd, struct Client *source_p,
1585	<	int parc, char **parv,
1586	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1587	<	char **target_server, char **reason)
1585	>	int parc, char **parv,
1586	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1587	>	char **target_server, char **reason)
1588		{
1589		int found_tkline_time=0;
1590	<	static char def_reason[] = "No Reason";
1590	>	static char def_reason[] = CONF_NOREASON;
1591		static char user[USERLEN*4+1];
1592		static char host[HOSTLEN*4+1];
1593
#	Line 2139 | Line 1605 | parse_aline(const char *cmd, struct Clie
1605		*tkline_time = found_tkline_time;
1606		else
1607		{
1608	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
2143	<	me.name, source_p->name, cmd);
1608	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1609		return -1;
1610		}
1611		}
1612
1613		if (parc == 0)
1614		{
1615	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
2151	<	me.name, source_p->name, cmd);
1615	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1616		return -1;
1617		}
1618
#	Line 2162 | Line 1626 | parse_aline(const char *cmd, struct Clie
1626		*up_p = user;
1627		*h_p = host;
1628		}
1629	<
1629	>
1630		parc--;
1631		parv++;
1632
#	Line 2175 | Line 1639 | parse_aline(const char *cmd, struct Clie
1639
1640		if (target_server == NULL)
1641		{
1642	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1643	<	me.name, source_p->name, cmd);
2180	<	return -1;
1642	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1643	>	return -1;
1644		}
1645
1646		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1647		{
1648	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
2186	<	me.name, source_p->name, "remoteban");
1648	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1649		return -1;
1650		}
1651
1652		if (parc == 0 || EmptyString(*parv))
1653		{
1654	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1655	<	me.name, source_p->name, cmd);
2194	<	return -1;
1654	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1655	>	return -1;
1656		}
1657
1658		*target_server = *parv;
#	Line 2204 | Line 1665 | parse_aline(const char *cmd, struct Clie
1665		* caller probably NULL'd it first, but no harm to do it again -db
1666		*/
1667		if (target_server != NULL)
1668	<	*target_server = NULL;
1668	>	*target_server = NULL;
1669		}
1670		}
1671
#	Line 2212 | Line 1673 | parse_aline(const char *cmd, struct Clie
1673		{
1674		if (strchr(user, '!') != NULL)
1675		{
1676	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
2216	<	me.name, source_p->name);
1676	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1677		return -1;
1678		}
1679
#	Line 2230 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		{
1691		*reason = *parv;
1692		if (!valid_comment(source_p, *reason, 1))
1693	<	return -1;
1693	>	return -1;
1694		}
1695		else
1696		*reason = def_reason;
#	Line 2269 | Line 1729 | find_user_host(struct Client *source_p,
1729		{
1730		*(hostp++) = '\0';                       /* short and squat */
1731		if (*user_host_or_nick)
1732	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1732	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1733		else
1734	<	strcpy(luser, "*");
1734	>	strcpy(luser, "*");
1735	>
1736		if (*hostp)
1737	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1737	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1738		else
1739	<	strcpy(lhost, "*");
1739	>	strcpy(lhost, "*");
1740		}
1741		else
1742		{
1743		luser[0] = '*';             /* no @ found, assume its *@somehost */
1744	<	luser[1] = '\0';
1744	>	luser[1] = '\0';
1745		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1746		}
1747	<
1747	>
1748		return 1;
1749		}
1750		else
1751		{
1752		/* Try to find user@host mask from nick */
1753		/* Okay to use source_p as the first param, because source_p == client_p */
1754	<	if ((target_p =
1755	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
1756	<	return 0;
1754	>	if ((target_p =
1755	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1756	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1757
1758		if (IsExemptKline(target_p))
1759		{
1760	<	if (!IsServer(source_p))
1761	<	sendto_one(source_p,
2301	<	":%s NOTICE %s :%s is E-lined",
2302	<	me.name, source_p->name, target_p->name);
1760	>	if (IsClient(source_p))
1761	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1762		return 0;
1763		}
1764
#	Line 2312 | Line 1771 | find_user_host(struct Client *source_p,
1771		if (target_p->username[0] == '~')
1772		luser[0] = '*';
1773
1774	<	if (target_p->sockhost[0] == '\0' ||
2316	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
1774	>	if (!strcmp(target_p->sockhost, "0"))
1775		strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1776		else
1777		strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
#	Line 2360 | Line 1818 | match_conf_password(const char *password
1818		else
1819		encr = password;
1820
1821	<	return !strcmp(encr, conf->passwd);
1821	>	return encr && !strcmp(encr, conf->passwd);
1822		}
1823
1824		/*
#	Line 2368 | Line 1826 | match_conf_password(const char *password
1826		*
1827		* inputs       - client sending the cluster
1828		*              - command name "KLINE" "XLINE" etc.
1829	<	*              - capab -- CAP_KLN etc. from s_serv.h
1829	>	*              - capab -- CAP_KLN etc. from server.h
1830		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1831		*              - pattern and args to send along
1832		* output       - none
#	Line 2380 | Line 1838 | cluster_a_line(struct Client *source_p,
1838		int capab, int cluster_type, const char *pattern, ...)
1839		{
1840		va_list args;
1841	<	char buffer[IRCD_BUFSIZE];
1841	>	char buffer[IRCD_BUFSIZE] = "";
1842		const dlink_node *ptr = NULL;
1843
1844		va_start(args, pattern);
#	Line 2393 | Line 1851 | cluster_a_line(struct Client *source_p,
1851
1852		if (conf->flags & cluster_type)
1853		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1854	<	"%s %s %s", command, conf->name, buffer);
1854	>	"%s %s %s", command, conf->name, buffer);
1855		}
1856		}
1857
#	Line 2441 | Line 1899 | split_nuh(struct split_nuh_item *const i
1899		{
1900		*p = '\0';
1901
1902	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1902	>	if (iptr->nickptr && *iptr->nuhmask)
1903		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1904
1905	<	if ((q = strchr(++p, '@'))) {
1905	>	if ((q = strchr(++p, '@')))
1906	>	{
1907		*q++ = '\0';
1908
1909	<	if (*p != '\0')
1909	>	if (*p)
1910		strlcpy(iptr->userptr, p, iptr->usersize);
1911
1912	<	if (*q != '\0')
1912	>	if (*q)
1913		strlcpy(iptr->hostptr, q, iptr->hostsize);
1914		}
1915		else
1916		{
1917	<	if (*p != '\0')
1917	>	if (*p)
1918		strlcpy(iptr->userptr, p, iptr->usersize);
1919		}
1920		}
#	Line 2467 | Line 1926 | split_nuh(struct split_nuh_item *const i
1926		/* if found a @ */
1927		*p++ = '\0';
1928
1929	<	if (*iptr->nuhmask != '\0')
1929	>	if (*iptr->nuhmask)
1930		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1931
1932	<	if (*p != '\0')
1932	>	if (*p)
1933		strlcpy(iptr->hostptr, p, iptr->hostsize);
1934		}
1935		else

Diff Legend

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