ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 936 by db, Mon Apr 13 04:27:47 2009 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 3215 by michael, Tue Mar 25 19:23:15 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
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 "tools.h"
28	<	#include "s_conf.h"
30	>	#include "conf.h"
31		#include "s_serv.h"
32		#include "resv.h"
33		#include "channel.h"
34		#include "client.h"
33	–	#include "common.h"
35		#include "event.h"
35	–	#include "hash.h"
36		#include "hook.h"
37		#include "irc_string.h"
38	–	#include "sprintf_irc.h"
38		#include "s_bsd.h"
40	–	#include "irc_getaddrinfo.h"
39		#include "ircd.h"
42	–	#include "list.h"
40		#include "listener.h"
41		#include "hostmask.h"
42		#include "modules.h"
43		#include "numeric.h"
44		#include "fdlist.h"
45	<	#include "s_log.h"
45	>	#include "log.h"
46		#include "send.h"
47		#include "s_gline.h"
51	–	#include "fileio.h"
48		#include "memory.h"
49	+	#include "mempool.h"
50		#include "irc_res.h"
51		#include "userhost.h"
52		#include "s_user.h"
53		#include "channel_mode.h"
54	+	#include "parse.h"
55	+	#include "s_misc.h"
56	+	#include "conf_db.h"
57	+	#include "conf_class.h"
58	+	#include "motd.h"
59	+
60
61	<	struct Callback *client_check_cb = NULL;
61	>	struct config_channel_entry ConfigChannel;
62		struct config_server_hide ConfigServerHide;
63	+	struct config_file_entry ConfigFileEntry;
64	+	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
65	+	struct server_info ServerInfo;
66	+	struct admin_info AdminInfo;
67
68		/* general conf items link list root, other than k lines etc. */
69	+	dlink_list service_items = { NULL, NULL, 0 };
70		dlink_list server_items  = { NULL, NULL, 0 };
71		dlink_list cluster_items = { NULL, NULL, 0 };
64	–	dlink_list hub_items     = { NULL, NULL, 0 };
65	–	dlink_list leaf_items    = { NULL, NULL, 0 };
72		dlink_list oconf_items   = { NULL, NULL, 0 };
73		dlink_list uconf_items   = { NULL, NULL, 0 };
74		dlink_list xconf_items   = { NULL, NULL, 0 };
69	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
70	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
75		dlink_list nresv_items   = { NULL, NULL, 0 };
76	<	dlink_list class_items   = { NULL, NULL, 0 };
73	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
74	<
75	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
76	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
79	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
80	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
81	<	dlink_list temporary_resv = { NULL, NULL, 0 };
76	>	dlink_list cresv_items = { NULL, NULL, 0 };
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
86	–	extern char yytext[];
81		extern int yyparse(); /* defined in y.tab.c */
82	<	int ypass = 1; /* used by yyparse()      */
82	>
83	>	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
84
85		/* internally defined functions */
86	<	static void lookup_confhost(struct ConfItem *);
92	<	static void set_default_conf(void);
93	<	static void validate_conf(void);
94	<	static void read_conf(FBFILE *);
86	>	static void read_conf(FILE *);
87		static void clear_out_old_conf(void);
96	–	static void flush_deleted_I_P(void);
88		static void expire_tklines(dlink_list *);
89		static void garbage_collect_ip_entries(void);
90		static int hash_ip(struct irc_ssaddr *);
91	<	static int verify_access(struct Client *, const char *);
92	<	static int attach_iline(struct Client *, struct ConfItem *);
91	>	static int verify_access(struct Client *);
92	>	static int attach_iline(struct Client *, struct MaskItem *);
93		static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
94	<	static void parse_conf_file(int, int);
104	<	static dlink_list *map_to_list(ConfType);
105	<	static struct AccessItem *find_regexp_kline(const char *[]);
94	>	static dlink_list *map_to_list(enum maskitem_type);
95		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
96
108	–	/*
109	–	* bit_len
110	–	*/
111	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
112	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
113	–	static void destroy_cidr_class(struct ClassItem *);
114	–
115	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
116	–
117	–	FBFILE *conf_fbfile_in = NULL;
118	–
119	–	/* address of default class conf */
120	–	static struct ConfItem *class_default;
97
98		/* usually, with hash tables, you use a prime number...
99		* but in this case I am dealing with ip addresses,
#	Line 128 | Line 104 | static struct ConfItem *class_default;
104		struct ip_entry
105		{
106		struct irc_ssaddr ip;
107	<	int count;
107	>	unsigned int count;
108		time_t last_attempt;
109		struct ip_entry *next;
110		};
111
112		static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
113	<	static BlockHeap *ip_entry_heap = NULL;
113	>	static mp_pool_t *ip_entry_pool = NULL;
114		static int ip_entries_count = 0;
115
116
141	–	inline void *
142	–	map_to_conf(struct ConfItem *aconf)
143	–	{
144	–	void *conf;
145	–	conf = (void *)((unsigned long)aconf +
146	–	(unsigned long)sizeof(struct ConfItem));
147	–	return(conf);
148	–	}
149	–
150	–	inline struct ConfItem *
151	–	unmap_conf_item(void *aconf)
152	–	{
153	–	struct ConfItem *conf;
154	–
155	–	conf = (struct ConfItem *)((unsigned long)aconf -
156	–	(unsigned long)sizeof(struct ConfItem));
157	–	return(conf);
158	–	}
159	–
117		/* conf_dns_callback()
118		*
119	<	* inputs       - pointer to struct AccessItem
119	>	* inputs       - pointer to struct MaskItem
120		*              - pointer to DNSReply reply
121		* output       - none
122		* side effects - called when resolver query finishes
#	Line 168 | Line 125 | unmap_conf_item(void *aconf)
125		* if successful save hp in the conf item it was called with
126		*/
127		static void
128	<	conf_dns_callback(void *vptr, struct DNSReply *reply)
128	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
129		{
130	<	struct AccessItem *aconf = (struct AccessItem *)vptr;
174	<	struct ConfItem *conf;
130	>	struct MaskItem *conf = vptr;
131
132	<	MyFree(aconf->dns_query);
177	<	aconf->dns_query = NULL;
132	>	conf->dns_pending = 0;
133
134	<	if (reply != NULL)
135	<	memcpy(&aconf->ipnum, &reply->addr, sizeof(reply->addr));
136	<	else {
137	<	ilog(L_NOTICE, "Host not found: %s, ignoring connect{} block",
183	<	aconf->host);
184	<	conf = unmap_conf_item(aconf);
185	<	sendto_realops_flags(UMODE_ALL, L_ALL,
186	<	"Ignoring connect{} block for %s - host not found",
187	<	conf->name);
188	<	delete_conf_item(conf);
189	<	}
134	>	if (addr != NULL)
135	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
136	>	else
137	>	conf->dns_failed = 1;
138		}
139
140		/* conf_dns_lookup()
#	Line 196 | Line 144 | conf_dns_callback(void *vptr, struct DNS
144		* allocate a dns_query and start ns lookup.
145		*/
146		static void
147	<	conf_dns_lookup(struct AccessItem *aconf)
147	>	conf_dns_lookup(struct MaskItem *conf)
148		{
149	<	if (aconf->dns_query == NULL)
149	>	if (!conf->dns_pending)
150		{
151	<	aconf->dns_query = MyMalloc(sizeof(struct DNSQuery));
152	<	aconf->dns_query->ptr = aconf;
205	<	aconf->dns_query->callback = conf_dns_callback;
206	<	gethost_byname(aconf->host, aconf->dns_query);
151	>	conf->dns_pending = 1;
152	>	gethost_byname(conf_dns_callback, conf, conf->host);
153		}
154		}
155
156	<	/* make_conf_item()
157	<	*
212	<	* inputs       - type of item
213	<	* output       - pointer to new conf entry
214	<	* side effects - none
215	<	*/
216	<	struct ConfItem *
217	<	make_conf_item(ConfType type)
156	>	struct MaskItem *
157	>	conf_make(enum maskitem_type type)
158		{
159	<	struct ConfItem *conf = NULL;
160	<	struct AccessItem *aconf = NULL;
221	<	struct ClassItem *aclass = NULL;
222	<	int status = 0;
223	<
224	<	switch (type)
225	<	{
226	<	case DLINE_TYPE:
227	<	case EXEMPTDLINE_TYPE:
228	<	case GLINE_TYPE:
229	<	case KLINE_TYPE:
230	<	case CLIENT_TYPE:
231	<	case OPER_TYPE:
232	<	case SERVER_TYPE:
233	<	conf = MyMalloc(sizeof(struct ConfItem) +
234	<	sizeof(struct AccessItem));
235	<	aconf = map_to_conf(conf);
236	<	aconf->aftype = AF_INET;
159	>	struct MaskItem *conf = MyMalloc(sizeof(*conf));
160	>	dlink_list *list = NULL;
161
162	<	/* Yes, sigh. switch on type again */
163	<	switch (type)
164	<	{
241	<	case EXEMPTDLINE_TYPE:
242	<	status = CONF_EXEMPTDLINE;
243	<	break;
244	<
245	<	case DLINE_TYPE:
246	<	status = CONF_DLINE;
247	<	break;
248	<
249	<	case KLINE_TYPE:
250	<	status = CONF_KLINE;
251	<	break;
252	<
253	<	case GLINE_TYPE:
254	<	status = CONF_GLINE;
255	<	break;
256	<
257	<	case CLIENT_TYPE:
258	<	status = CONF_CLIENT;
259	<	break;
260	<
261	<	case OPER_TYPE:
262	<	status = CONF_OPERATOR;
263	<	dlinkAdd(conf, &conf->node, &oconf_items);
264	<	break;
265	<
266	<	case SERVER_TYPE:
267	<	status = CONF_SERVER;
268	<	dlinkAdd(conf, &conf->node, &server_items);
269	<	break;
270	<
271	<	default:
272	<	break;
273	<	}
274	<	aconf->status = status;
275	<	break;
276	<
277	<	case LEAF_TYPE:
278	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
279	<	sizeof(struct MatchItem));
280	<	dlinkAdd(conf, &conf->node, &leaf_items);
281	<	break;
282	<
283	<	case HUB_TYPE:
284	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
285	<	sizeof(struct MatchItem));
286	<	dlinkAdd(conf, &conf->node, &hub_items);
287	<	break;
288	<
289	<	case ULINE_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct MatchItem));
292	<	dlinkAdd(conf, &conf->node, &uconf_items);
293	<	break;
294	<
295	<	case GDENY_TYPE:
296	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
297	<	sizeof(struct AccessItem));
298	<	dlinkAdd(conf, &conf->node, &gdeny_items);
299	<	break;
300	<
301	<	case XLINE_TYPE:
302	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
303	<	sizeof(struct MatchItem));
304	<	dlinkAdd(conf, &conf->node, &xconf_items);
305	<	break;
306	<
307	<	case RXLINE_TYPE:
308	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
309	<	sizeof(struct MatchItem));
310	<	dlinkAdd(conf, &conf->node, &rxconf_items);
311	<	break;
312	<
313	<	case RKLINE_TYPE:
314	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
315	<	sizeof(struct AccessItem));
316	<	aconf = map_to_conf(conf);
317	<	aconf->status = CONF_KLINE;
318	<	dlinkAdd(conf, &conf->node, &rkconf_items);
319	<	break;
320	<
321	<	case CLUSTER_TYPE:
322	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
323	<	dlinkAdd(conf, &conf->node, &cluster_items);
324	<	break;
325	<
326	<	case CRESV_TYPE:
327	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
328	<	sizeof(struct ResvChannel));
329	<	break;
330	<
331	<	case NRESV_TYPE:
332	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
333	<	sizeof(struct MatchItem));
334	<	dlinkAdd(conf, &conf->node, &nresv_items);
335	<	break;
336	<
337	<	case CLASS_TYPE:
338	<	conf = MyMalloc(sizeof(struct ConfItem) +
339	<	sizeof(struct ClassItem));
340	<	dlinkAdd(conf, &conf->node, &class_items);
341	<
342	<	aclass = map_to_conf(conf);
343	<	aclass->active = 1;
344	<	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
345	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
346	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
347	<	MaxSendq(aclass) = DEFAULT_SENDQ;
348	<
349	<	break;
350	<
351	<	default:
352	<	conf = NULL;
353	<	break;
354	<	}
355	<
356	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
357	<	conf->type = type;
162	>	conf->type   = type;
163	>	conf->active = 1;
164	>	conf->aftype = AF_INET;
165
166	+	if ((list = map_to_list(type)))
167	+	dlinkAdd(conf, &conf->node, list);
168		return conf;
169		}
170
171		void
172	<	delete_conf_item(struct ConfItem *conf)
172	>	conf_free(struct MaskItem *conf)
173		{
174	<	dlink_node *m = NULL;
175	<	struct MatchItem *match_item;
176	<	struct AccessItem *aconf;
177	<	ConfType type = conf->type;
174	>	dlink_node *ptr = NULL, *ptr_next = NULL;
175	>	dlink_list *list = NULL;
176	>
177	>	if (conf->node.next)
178	>	if ((list = map_to_list(conf->type)))
179	>	dlinkDelete(&conf->node, list);
180
181		MyFree(conf->name);
371	–	conf->name = NULL;
182
183	<	switch(type)
184	<	{
185	<	case DLINE_TYPE:
186	<	case EXEMPTDLINE_TYPE:
187	<	case GLINE_TYPE:
188	<	case KLINE_TYPE:
189	<	case CLIENT_TYPE:
190	<	case OPER_TYPE:
191	<	case SERVER_TYPE:
192	<	aconf = map_to_conf(conf);
193	<
194	<	if (aconf->dns_query != NULL)
195	<	{
196	<	delete_resolver_queries(aconf->dns_query);
197	<	MyFree(aconf->dns_query);
388	<	}
389	<	if (aconf->passwd != NULL)
390	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
391	<	if (aconf->spasswd != NULL)
392	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
393	<	aconf->class_ptr = NULL;
394	<
395	<	MyFree(aconf->passwd);
396	<	MyFree(aconf->spasswd);
397	<	MyFree(aconf->reason);
398	<	MyFree(aconf->oper_reason);
399	<	MyFree(aconf->user);
400	<	MyFree(aconf->host);
401	<	MyFree(aconf->fakename);
183	>	if (conf->dns_pending)
184	>	delete_resolver_queries(conf);
185	>	if (conf->passwd != NULL)
186	>	memset(conf->passwd, 0, strlen(conf->passwd));
187	>	if (conf->spasswd != NULL)
188	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
189	>
190	>	conf->class = NULL;
191	>
192	>	MyFree(conf->passwd);
193	>	MyFree(conf->spasswd);
194	>	MyFree(conf->reason);
195	>	MyFree(conf->certfp);
196	>	MyFree(conf->user);
197	>	MyFree(conf->host);
198		#ifdef HAVE_LIBCRYPTO
199	<	if (aconf->rsa_public_key)
404	<	RSA_free(aconf->rsa_public_key);
405	<	MyFree(aconf->rsa_public_key_file);
406	<	#endif
407	<
408	<	/* Yes, sigh. switch on type again */
409	<	switch(type)
410	<	{
411	<	case EXEMPTDLINE_TYPE:
412	<	case DLINE_TYPE:
413	<	case GLINE_TYPE:
414	<	case KLINE_TYPE:
415	<	case CLIENT_TYPE:
416	<	MyFree(conf);
417	<	break;
418	<
419	<	case OPER_TYPE:
420	<	aconf = map_to_conf(conf);
421	<	if (!IsConfIllegal(aconf))
422	<	dlinkDelete(&conf->node, &oconf_items);
423	<	MyFree(conf);
424	<	break;
425	<
426	<	case SERVER_TYPE:
427	<	aconf = map_to_conf(conf);
428	<	if (!IsConfIllegal(aconf))
429	<	dlinkDelete(&conf->node, &server_items);
430	<	MyFree(conf);
431	<	break;
432	<
433	<	default:
434	<	break;
435	<	}
436	<	break;
437	<
438	<	case HUB_TYPE:
439	<	match_item = map_to_conf(conf);
440	<	MyFree(match_item->user);
441	<	MyFree(match_item->host);
442	<	MyFree(match_item->reason);
443	<	MyFree(match_item->oper_reason);
444	<	/* If marked illegal, its already been pulled off of the hub_items list */
445	<	if (!match_item->illegal)
446	<	dlinkDelete(&conf->node, &hub_items);
447	<	MyFree(conf);
448	<	break;
449	<
450	<	case LEAF_TYPE:
451	<	match_item = map_to_conf(conf);
452	<	MyFree(match_item->user);
453	<	MyFree(match_item->host);
454	<	MyFree(match_item->reason);
455	<	MyFree(match_item->oper_reason);
456	<	/* If marked illegal, its already been pulled off of the leaf_items list */
457	<	if (!match_item->illegal)
458	<	dlinkDelete(&conf->node, &leaf_items);
459	<	MyFree(conf);
460	<	break;
461	<
462	<	case ULINE_TYPE:
463	<	match_item = map_to_conf(conf);
464	<	MyFree(match_item->user);
465	<	MyFree(match_item->host);
466	<	MyFree(match_item->reason);
467	<	MyFree(match_item->oper_reason);
468	<	dlinkDelete(&conf->node, &uconf_items);
469	<	MyFree(conf);
470	<	break;
471	<
472	<	case XLINE_TYPE:
473	<	match_item = map_to_conf(conf);
474	<	MyFree(match_item->user);
475	<	MyFree(match_item->host);
476	<	MyFree(match_item->reason);
477	<	MyFree(match_item->oper_reason);
478	<	dlinkDelete(&conf->node, &xconf_items);
479	<	MyFree(conf);
480	<	break;
481	<
482	<	case RKLINE_TYPE:
483	<	aconf = map_to_conf(conf);
484	<	MyFree(aconf->regexuser);
485	<	MyFree(aconf->regexhost);
486	<	MyFree(aconf->user);
487	<	MyFree(aconf->host);
488	<	MyFree(aconf->reason);
489	<	MyFree(aconf->oper_reason);
490	<	dlinkDelete(&conf->node, &rkconf_items);
491	<	MyFree(conf);
492	<	break;
493	<
494	<	case RXLINE_TYPE:
495	<	MyFree(conf->regexpname);
496	<	match_item = map_to_conf(conf);
497	<	MyFree(match_item->user);
498	<	MyFree(match_item->host);
499	<	MyFree(match_item->reason);
500	<	MyFree(match_item->oper_reason);
501	<	dlinkDelete(&conf->node, &rxconf_items);
502	<	MyFree(conf);
503	<	break;
504	<
505	<	case NRESV_TYPE:
506	<	match_item = map_to_conf(conf);
507	<	MyFree(match_item->user);
508	<	MyFree(match_item->host);
509	<	MyFree(match_item->reason);
510	<	MyFree(match_item->oper_reason);
511	<	dlinkDelete(&conf->node, &nresv_items);
512	<
513	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
514	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
515	<	free_dlink_node(m);
516	<
517	<	MyFree(conf);
518	<	break;
519	<
520	<	case GDENY_TYPE:
521	<	aconf = map_to_conf(conf);
522	<	MyFree(aconf->user);
523	<	MyFree(aconf->host);
524	<	dlinkDelete(&conf->node, &gdeny_items);
525	<	MyFree(conf);
526	<	break;
527	<
528	<	case CLUSTER_TYPE:
529	<	dlinkDelete(&conf->node, &cluster_items);
530	<	MyFree(conf);
531	<	break;
532	<
533	<	case CRESV_TYPE:
534	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
535	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
536	<	free_dlink_node(m);
537	<
538	<	MyFree(conf);
539	<	break;
199	>	MyFree(conf->cipher_list);
200
201	<	case CLASS_TYPE:
202	<	dlinkDelete(&conf->node, &class_items);
203	<	MyFree(conf);
204	<	break;
205	<
206	<	default:
207	<	break;
201	>	if (conf->rsa_public_key)
202	>	RSA_free(conf->rsa_public_key);
203	>	#endif
204	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
205	>	{
206	>	MyFree(ptr->data);
207	>	dlinkDelete(ptr, &conf->hub_list);
208	>	free_dlink_node(ptr);
209		}
549	–	}
550	–
551	–	/* free_access_item()
552	–	*
553	–	* inputs       - pointer to conf to free
554	–	* output       - none
555	–	* side effects - crucial password fields are zeroed, conf is freed
556	–	*/
557	–	void
558	–	free_access_item(struct AccessItem *aconf)
559	–	{
560	–	struct ConfItem *conf;
210
211	<	if (aconf == NULL)
563	<	return;
564	<	conf = unmap_conf_item(aconf);
565	<	delete_conf_item(conf);
566	<	}
567	<
568	<	static const unsigned int shared_bit_table[] =
569	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
570	<
571	<	/* report_confitem_types()
572	<	*
573	<	* inputs       - pointer to client requesting confitem report
574	<	*              - ConfType to report
575	<	* output       - none
576	<	* side effects -
577	<	*/
578	<	void
579	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
580	<	{
581	<	dlink_node *ptr = NULL;
582	<	struct ConfItem *conf = NULL;
583	<	struct AccessItem *aconf = NULL;
584	<	struct MatchItem *matchitem = NULL;
585	<	struct ClassItem *classitem = NULL;
586	<	char buf[12];
587	<	char *p = NULL;
588	<	const char *pfx = NULL;
589	<
590	<	switch (type)
211	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
212		{
213	<	case GDENY_TYPE:
214	<	DLINK_FOREACH(ptr, gdeny_items.head)
215	<	{
216	<	conf = ptr->data;
596	<	aconf = map_to_conf(conf);
597	<
598	<	p = buf;
599	<
600	<	if (aconf->flags & GDENY_BLOCK)
601	<	*p++ = 'B';
602	<	else
603	<	*p++ = 'b';
604	<
605	<	if (aconf->flags & GDENY_REJECT)
606	<	*p++ = 'R';
607	<	else
608	<	*p++ = 'r';
609	<
610	<	*p = '\0';
611	<
612	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
613	<	me.name, RPL_STATSDEBUG, source_p->name,
614	<	aconf->user, aconf->host, conf->name, buf);
615	<	}
616	<	break;
617	<
618	<	case XLINE_TYPE:
619	<	DLINK_FOREACH(ptr, xconf_items.head)
620	<	{
621	<	conf = ptr->data;
622	<	matchitem = map_to_conf(conf);
623	<
624	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
625	<	me.name, source_p->name,
626	<	matchitem->hold ? "x": "X", matchitem->count,
627	<	conf->name, matchitem->reason);
628	<	}
629	<	break;
630	<
631	<	case RXLINE_TYPE:
632	<	DLINK_FOREACH(ptr, rxconf_items.head)
633	<	{
634	<	conf = ptr->data;
635	<	matchitem = map_to_conf(conf);
636	<
637	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
638	<	me.name, source_p->name,
639	<	matchitem->hold ? "xR": "XR", matchitem->count,
640	<	conf->name, matchitem->reason);
641	<	}
642	<	break;
643	<
644	<	case RKLINE_TYPE:
645	<	pfx = temp ? "kR" : "KR";
646	<
647	<	DLINK_FOREACH(ptr, rkconf_items.head)
648	<	{
649	<	aconf = map_to_conf((conf = ptr->data));
650	<
651	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
652	<	continue;
653	<
654	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
655	<	source_p->name, pfx, aconf->host, aconf->user,
656	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
657	<	}
658	<	break;
659	<
660	<	case ULINE_TYPE:
661	<	DLINK_FOREACH(ptr, uconf_items.head)
662	<	{
663	<	conf = ptr->data;
664	<	matchitem = map_to_conf(conf);
665	<
666	<	p = buf;
667	<
668	<	/* some of these are redundant for the sake of
669	<	* consistency with cluster{} flags
670	<	*/
671	<	*p++ = 'c';
672	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
673	<
674	<	sendto_one(source_p, form_str(RPL_STATSULINE),
675	<	me.name, source_p->name, conf->name,
676	<	matchitem->user?matchitem->user: "*",
677	<	matchitem->host?matchitem->host: "*", buf);
678	<	}
679	<
680	<	DLINK_FOREACH(ptr, cluster_items.head)
681	<	{
682	<	conf = ptr->data;
683	<
684	<	p = buf;
685	<
686	<	*p++ = 'C';
687	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
688	<
689	<	sendto_one(source_p, form_str(RPL_STATSULINE),
690	<	me.name, source_p->name, conf->name,
691	<	"*", "*", buf);
692	<	}
693	<
694	<	break;
695	<
696	<	case OPER_TYPE:
697	<	DLINK_FOREACH(ptr, oconf_items.head)
698	<	{
699	<	conf = ptr->data;
700	<	aconf = map_to_conf(conf);
701	<
702	<	/* Don't allow non opers to see oper privs */
703	<	if (IsOper(source_p))
704	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
705	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
706	<	conf->name, oper_privs_as_string(aconf->port),
707	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
708	<	else
709	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
710	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
711	<	conf->name, "0",
712	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
713	<	}
714	<	break;
715	<
716	<	case CLASS_TYPE:
717	<	DLINK_FOREACH(ptr, class_items.head)
718	<	{
719	<	conf = ptr->data;
720	<	classitem = map_to_conf(conf);
721	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
722	<	me.name, source_p->name, 'Y',
723	<	conf->name, PingFreq(classitem),
724	<	ConFreq(classitem),
725	<	MaxTotal(classitem), MaxSendq(classitem),
726	<	CurrUserCount(classitem),
727	<	classitem->active ? "active" : "disabled");
728	<	}
729	<	break;
730	<
731	<	case CONF_TYPE:
732	<	case CLIENT_TYPE:
733	<	break;
734	<
735	<	case SERVER_TYPE:
736	<	DLINK_FOREACH(ptr, server_items.head)
737	<	{
738	<	p = buf;
739	<
740	<	conf = ptr->data;
741	<	aconf = map_to_conf(conf);
742	<
743	<	buf[0] = '\0';
744	<
745	<	if (IsConfAllowAutoConn(aconf))
746	<	*p++ = 'A';
747	<	if (IsConfCryptLink(aconf))
748	<	*p++ = 'C';
749	<	if (aconf->fakename)
750	<	*p++ = 'M';
751	<	if (IsConfTopicBurst(aconf))
752	<	*p++ = 'T';
753	<	if (IsConfCompressed(aconf))
754	<	*p++ = 'Z';
755	<	if (buf[0] == '\0')
756	<	*p++ = '*';
757	<
758	<	*p = '\0';
759	<
760	<	/*
761	<	* Allow admins to see actual ips unless hide_server_ips is enabled
762	<	*/
763	<	if (!ConfigServerHide.hide_server_ips && IsAdmin(source_p))
764	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
765	<	me.name, source_p->name, 'C', aconf->host,
766	<	buf, conf->name, aconf->port,
767	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
768	<	else
769	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
770	<	me.name, source_p->name, 'C',
771	<	"*@127.0.0.1", buf, conf->name, aconf->port,
772	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
773	<	}
774	<	break;
775	<
776	<	case HUB_TYPE:
777	<	DLINK_FOREACH(ptr, hub_items.head)
778	<	{
779	<	conf = ptr->data;
780	<	matchitem = map_to_conf(conf);
781	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
782	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
783	<	}
784	<	break;
213	>	MyFree(ptr->data);
214	>	dlinkDelete(ptr, &conf->leaf_list);
215	>	free_dlink_node(ptr);
216	>	}
217
218	<	case LEAF_TYPE:
219	<	DLINK_FOREACH(ptr, leaf_items.head)
220	<	{
789	<	conf = ptr->data;
790	<	matchitem = map_to_conf(conf);
791	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
792	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
793	<	}
794	<	break;
218	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
219	>	{
220	>	struct exempt *exptr = ptr->data;
221
222	<	case GLINE_TYPE:
223	<	case KLINE_TYPE:
224	<	case DLINE_TYPE:
225	<	case EXEMPTDLINE_TYPE:
226	<	case CRESV_TYPE:
801	<	case NRESV_TYPE:
802	<	case CLUSTER_TYPE:
803	<	break;
222	>	dlinkDelete(ptr, &conf->exempt_list);
223	>	MyFree(exptr->name);
224	>	MyFree(exptr->user);
225	>	MyFree(exptr->host);
226	>	MyFree(exptr);
227		}
228	+
229	+	MyFree(conf);
230		}
231
232		/* check_client()
#	Line 817 | Line 242 | report_confitem_types(struct Client *sou
242		*                Look for conf lines which have the same
243		*                status as the flags passed.
244		*/
245	<	static void *
246	<	check_client(va_list args)
245	>	int
246	>	check_client(struct Client *source_p)
247		{
823	–	struct Client *source_p = va_arg(args, struct Client *);
824	–	const char *username = va_arg(args, const char *);
248		int i;
249	<
250	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
251	<	if ((i = verify_access(source_p, username)))
829	<	ilog(L_INFO, "Access denied: %s[%s]",
249	>
250	>	if ((i = verify_access(source_p)))
251	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
252		source_p->name, source_p->sockhost);
253
254		switch (i)
255		{
256		case TOO_MANY:
257	<	sendto_realops_flags(UMODE_FULL, L_ALL,
257	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
258		"Too many on IP for %s (%s).",
259	<	get_client_name(source_p, SHOW_IP),
260	<	source_p->sockhost);
261	<	ilog(L_INFO,"Too many connections on IP from %s.",
262	<	get_client_name(source_p, SHOW_IP));
259	>	get_client_name(source_p, SHOW_IP),
260	>	source_p->sockhost);
261	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
262	>	get_client_name(source_p, SHOW_IP));
263		++ServerStats.is_ref;
264	<	exit_client(source_p, &me, "No more connections allowed on that IP");
264	>	exit_client(source_p, "No more connections allowed on that IP");
265		break;
266
267		case I_LINE_FULL:
268	<	sendto_realops_flags(UMODE_FULL, L_ALL,
269	<	"I-line is full for %s (%s).",
270	<	get_client_name(source_p, SHOW_IP),
271	<	source_p->sockhost);
272	<	ilog(L_INFO,"Too many connections from %s.",
273	<	get_client_name(source_p, SHOW_IP));
268	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
269	>	"auth{} block is full for %s (%s).",
270	>	get_client_name(source_p, SHOW_IP),
271	>	source_p->sockhost);
272	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
273	>	get_client_name(source_p, SHOW_IP));
274		++ServerStats.is_ref;
275	<	exit_client(source_p, &me,
854	<	"No more connections allowed in your connection class");
275	>	exit_client(source_p, "No more connections allowed in your connection class");
276		break;
277
278		case NOT_AUTHORIZED:
279		++ServerStats.is_ref;
280		/* jdc - lists server name & port connections are on */
281		/*       a purely cosmetical change */
282	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
283	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
284	<	get_client_name(source_p, SHOW_IP),
285	<	source_p->sockhost,
286	<	source_p->localClient->listener->name,
287	<	source_p->localClient->listener->port);
288	<	ilog(L_INFO,
289	<	"Unauthorized client connection from %s on [%s/%u].",
290	<	get_client_name(source_p, SHOW_IP),
291	<	source_p->localClient->listener->name,
292	<	source_p->localClient->listener->port);
293	<
294	<	/* XXX It is prolematical whether it is better to use the
874	<	* capture reject code here or rely on the connecting too fast code.
875	<	* - Dianora
876	<	*/
877	<	if (REJECT_HOLD_TIME > 0)
878	<	{
879	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
880	<	me.name, source_p->name);
881	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
882	<	SetCaptured(source_p);
883	<	}
884	<	else
885	<	exit_client(source_p, &me, "You are not authorized to use this server");
282	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
283	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
284	>	get_client_name(source_p, SHOW_IP),
285	>	source_p->sockhost,
286	>	source_p->localClient->listener->name,
287	>	source_p->localClient->listener->port);
288	>	ilog(LOG_TYPE_IRCD,
289	>	"Unauthorized client connection from %s on [%s/%u].",
290	>	get_client_name(source_p, SHOW_IP),
291	>	source_p->localClient->listener->name,
292	>	source_p->localClient->listener->port);
293	>
294	>	exit_client(source_p, "You are not authorized to use this server");
295		break;
296
297		case BANNED_CLIENT:
298	<	/*
890	<	* Don't exit them immediately, play with them a bit.
891	<	* - Dianora
892	<	*/
893	<	if (REJECT_HOLD_TIME > 0)
894	<	{
895	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
896	<	SetCaptured(source_p);
897	<	}
898	<	else
899	<	exit_client(source_p, &me, "Banned");
298	>	exit_client(source_p, "Banned");
299		++ServerStats.is_ref;
300		break;
301
#	Line 905 | Line 304 | check_client(va_list args)
304		break;
305		}
306
307	<	return (i < 0 ? NULL : source_p);
307	>	return (i < 0 ? 0 : 1);
308		}
309
310		/* verify_access()
311		*
312		* inputs       - pointer to client to verify
914	–	*              - pointer to proposed username
313		* output       - 0 if success -'ve if not
314		* side effect  - find the first (best) I line to attach.
315		*/
316		static int
317	<	verify_access(struct Client *client_p, const char *username)
317	>	verify_access(struct Client *client_p)
318		{
319	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
320	<	struct ConfItem *conf = NULL;
923	<	char non_ident[USERLEN + 1] = { '~', '\0' };
924	<	const char *uhi[3];
319	>	struct MaskItem *conf = NULL;
320	>	char non_ident[USERLEN + 1] = "~";
321
322		if (IsGotId(client_p))
323		{
324	<	aconf = find_address_conf(client_p->host, client_p->username,
325	<	&client_p->localClient->ip,
326	<	client_p->localClient->aftype,
324	>	conf = find_address_conf(client_p->host, client_p->username,
325	>	&client_p->localClient->ip,
326	>	client_p->localClient->aftype,
327		client_p->localClient->passwd);
328		}
329		else
330		{
331	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
332	<	aconf = find_address_conf(client_p->host,non_ident,
333	<	&client_p->localClient->ip,
334	<	client_p->localClient->aftype,
335	<	client_p->localClient->passwd);
331	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
332	>	conf = find_address_conf(client_p->host,non_ident,
333	>	&client_p->localClient->ip,
334	>	client_p->localClient->aftype,
335	>	client_p->localClient->passwd);
336		}
337
338	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
943	<	uhi[1] = client_p->host;
944	<	uhi[2] = client_p->sockhost;
945	<
946	<	rkconf = find_regexp_kline(uhi);
947	<
948	<	if (aconf != NULL)
338	>	if (conf)
339		{
340	<	if (IsConfClient(aconf) && !rkconf)
340	>	if (IsConfClient(conf))
341		{
342	<	conf = unmap_conf_item(aconf);
953	<
954	<	if (IsConfRedir(aconf))
342	>	if (IsConfRedir(conf))
343		{
344	<	sendto_one(client_p, form_str(RPL_REDIR),
345	<	me.name, client_p->name,
346	<	conf->name ? conf->name : "",
347	<	aconf->port);
960	<	return(NOT_AUTHORIZED);
344	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
345	>	conf->name ? conf->name : "",
346	>	conf->port);
347	>	return NOT_AUTHORIZED;
348		}
349
350	<	if (IsConfDoIdentd(aconf))
351	<	SetNeedId(client_p);
350	>	if (IsConfDoIdentd(conf))
351	>	SetNeedId(client_p);
352
353		/* Thanks for spoof idea amm */
354	<	if (IsConfDoSpoofIp(aconf))
354	>	if (IsConfDoSpoofIp(conf))
355		{
356	<	conf = unmap_conf_item(aconf);
357	<
358	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
972	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
356	>	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
357	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
358	>	"%s spoofing: %s as %s",
359		client_p->name, client_p->host, conf->name);
360		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
361	<	SetIPSpoof(client_p);
361	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
362		}
363
364	<	return(attach_iline(client_p, conf));
364	>	return attach_iline(client_p, conf);
365		}
366	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
366	>	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
367		{
368	<	/* XXX */
369	<	aconf = rkconf ? rkconf : aconf;
370	<	if (IsConfGline(aconf))
371	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
986	<	client_p->name);
987	<	if (ConfigFileEntry.kline_with_reason)
988	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
989	<	me.name, client_p->name, aconf->reason);
990	<	return(BANNED_CLIENT);
368	>	if (IsConfGline(conf))
369	>	sendto_one_notice(client_p, &me, ":*** G-lined");
370	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
371	>	return BANNED_CLIENT;
372		}
373		}
374
375	<	return(NOT_AUTHORIZED);
375	>	return NOT_AUTHORIZED;
376		}
377
378		/* attach_iline()
#	Line 1002 | Line 383 | verify_access(struct Client *client_p, c
383		* side effects - do actual attach
384		*/
385		static int
386	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
386	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
387		{
388	<	struct AccessItem *aconf;
1008	<	struct ClassItem *aclass;
388	>	struct ClassItem *class = NULL;
389		struct ip_entry *ip_found;
390		int a_limit_reached = 0;
391	<	int local = 0, global = 0, ident = 0;
391	>	unsigned int local = 0, global = 0, ident = 0;
392	>
393	>	assert(conf->class);
394
395		ip_found = find_or_add_ip(&client_p->localClient->ip);
396		ip_found->count++;
397		SetIpHash(client_p);
398
399	<	aconf = map_to_conf(conf);
1018	<	if (aconf->class_ptr == NULL)
1019	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1020	<
1021	<	aclass = map_to_conf(aconf->class_ptr);
399	>	class = conf->class;
400
401		count_user_host(client_p->username, client_p->host,
402		&global, &local, &ident);
#	Line 1027 | Line 405 | attach_iline(struct Client *client_p, st
405		* setting a_limit_reached if any limit is reached.
406		* - Dianora
407		*/
408	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
408	>	if (class->max_total != 0 && class->ref_count >= class->max_total)
409		a_limit_reached = 1;
410	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
410	>	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
411		a_limit_reached = 1;
412	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
412	>	else if (class->max_local != 0 && local >= class->max_local)
413		a_limit_reached = 1;
414	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
414	>	else if (class->max_global != 0 && global >= class->max_global)
415		a_limit_reached = 1;
416	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
416	>	else if (class->max_ident != 0 && ident >= class->max_ident &&
417		client_p->username[0] != '~')
418		a_limit_reached = 1;
419
420		if (a_limit_reached)
421		{
422	<	if (!IsConfExemptLimits(aconf))
422	>	if (!IsConfExemptLimits(conf))
423		return TOO_MANY;   /* Already at maximum allowed */
424
425	<	sendto_one(client_p,
426	<	":%s NOTICE %s :*** Your connection class is full, "
1049	<	"but you have exceed_limit = yes;", me.name, client_p->name);
425	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
426	>	"but you have exceed_limit = yes;");
427		}
428
429		return attach_conf(client_p, conf);
#	Line 1062 | Line 439 | attach_iline(struct Client *client_p, st
439		void
440		init_ip_hash_table(void)
441		{
442	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1066	<	2 * hard_fdlimit);
442	>	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
443		memset(ip_hash_table, 0, sizeof(ip_hash_table));
444		}
445
#	Line 1112 | Line 488 | find_or_add_ip(struct irc_ssaddr *ip_in)
488		if (ip_entries_count >= 2 * hard_fdlimit)
489		garbage_collect_ip_entries();
490
491	<	newptr = BlockHeapAlloc(ip_entry_heap);
491	>	newptr = mp_pool_get(ip_entry_pool);
492	>	memset(newptr, 0, sizeof(*newptr));
493		ip_entries_count++;
494		memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
495
#	Line 1163 | Line 540 | remove_one_ip(struct irc_ssaddr *ip_in)
540		if (ptr->count > 0)
541		ptr->count--;
542		if (ptr->count == 0 &&
543	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
543	>	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
544		{
545		if (last_ptr != NULL)
546	<	last_ptr->next = ptr->next;
546	>	last_ptr->next = ptr->next;
547		else
548	<	ip_hash_table[hash_index] = ptr->next;
548	>	ip_hash_table[hash_index] = ptr->next;
549
550	<	BlockHeapFree(ip_entry_heap, ptr);
550	>	mp_pool_release(ptr);
551		ip_entries_count--;
552		return;
553		}
#	Line 1191 | Line 568 | hash_ip(struct irc_ssaddr *addr)
568		{
569		struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
570		int hash;
571	<	u_int32_t ip;
571	>	uint32_t ip;
572
573		ip   = ntohl(v4->sin_addr.s_addr);
574		hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
#	Line 1202 | Line 579 | hash_ip(struct irc_ssaddr *addr)
579		{
580		int hash;
581		struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
582	<	u_int32_t *ip = (u_int32_t *)&v6->sin6_addr.s6_addr;
582	>	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
583
584		hash  = ip[0] ^ ip[3];
585	<	hash ^= hash >> 16;
586	<	hash ^= hash >> 8;
585	>	hash ^= hash >> 16;
586	>	hash ^= hash >> 8;
587		hash  = hash & (IP_HASH_SIZE - 1);
588		return hash;
589		}
#	Line 1217 | Line 594 | hash_ip(struct irc_ssaddr *addr)
594
595		/* count_ip_hash()
596		*
597	<	* inputs        - pointer to counter of number of ips hashed
597	>	* inputs        - pointer to counter of number of ips hashed
598		*               - pointer to memory used for ip hash
599		* output        - returned via pointers input
600		* side effects  - NONE
#	Line 1226 | Line 603 | hash_ip(struct irc_ssaddr *addr)
603		* used in the hash.
604		*/
605		void
606	<	count_ip_hash(int *number_ips_stored, unsigned long *mem_ips_stored)
606	>	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
607		{
608		struct ip_entry *ptr;
609		int i;
#	Line 1273 | Line 650 | garbage_collect_ip_entries(void)
650		last_ptr->next = ptr->next;
651		else
652		ip_hash_table[i] = ptr->next;
653	<	BlockHeapFree(ip_entry_heap, ptr);
653	>	mp_pool_release(ptr);
654		ip_entries_count--;
655		}
656		else
#	Line 1290 | Line 667 | garbage_collect_ip_entries(void)
667		* side effects - Disassociate configuration from the client.
668		*                Also removes a class from the list if marked for deleting.
669		*/
670	<	int
671	<	detach_conf(struct Client *client_p, ConfType type)
670	>	void
671	>	detach_conf(struct Client *client_p, enum maskitem_type type)
672		{
673	<	dlink_node *ptr, *next_ptr;
1297	<	struct ConfItem *conf;
1298	<	struct ClassItem *aclass;
1299	<	struct AccessItem *aconf;
1300	<	struct ConfItem *aclass_conf;
1301	<	struct MatchItem *match_item;
673	>	dlink_node *ptr = NULL, *next_ptr = NULL;
674
675		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
676		{
677	<	conf = ptr->data;
1306	<
1307	<	if (type == CONF_TYPE || conf->type == type)
1308	<	{
1309	<	dlinkDelete(ptr, &client_p->localClient->confs);
1310	<	free_dlink_node(ptr);
1311	<
1312	<	switch (conf->type)
1313	<	{
1314	<	case CLIENT_TYPE:
1315	<	case OPER_TYPE:
1316	<	case SERVER_TYPE:
1317	<	aconf = map_to_conf(conf);
1318	<
1319	<	assert(aconf->clients > 0);
677	>	struct MaskItem *conf = ptr->data;
678
679	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
680	<	{
681	<	aclass = map_to_conf(aclass_conf);
1324	<
1325	<	assert(aclass->curr_user_count > 0);
1326	<
1327	<	if (conf->type == CLIENT_TYPE)
1328	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1329	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1330	<	delete_conf_item(aclass_conf);
1331	<	}
679	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
680	>	assert(conf->ref_count > 0);
681	>	assert(conf->class->ref_count > 0);
682
683	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
684	<	delete_conf_item(conf);
683	>	if (!(conf->type & type))
684	>	continue;
685
686	<	break;
686	>	dlinkDelete(ptr, &client_p->localClient->confs);
687	>	free_dlink_node(ptr);
688
689	<	case LEAF_TYPE:
690	<	case HUB_TYPE:
1340	<	match_item = map_to_conf(conf);
1341	<	if (match_item->ref_count == 0 && match_item->illegal)
1342	<	delete_conf_item(conf);
1343	<	break;
1344	<	default:
1345	<	break;
1346	<	}
689	>	if (conf->type == CONF_CLIENT)
690	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
691
692	<	if (type != CONF_TYPE)
693	<	return 0;
692	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
693	>	{
694	>	class_free(conf->class);
695	>	conf->class = NULL;
696		}
1351	–	}
697
698	<	return -1;
698	>	if (--conf->ref_count == 0 && conf->active == 0)
699	>	conf_free(conf);
700	>	}
701		}
702
703		/* attach_conf()
#	Line 1364 | Line 711 | detach_conf(struct Client *client_p, Con
711		*                attachment if there was an old one...
712		*/
713		int
714	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
714	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
715		{
716		if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
717		return 1;
718
719	<	if (conf->type == CLIENT_TYPE ||
720	<	conf->type == SERVER_TYPE ||
721	<	conf->type == OPER_TYPE)
722	<	{
1376	<	struct AccessItem *aconf = map_to_conf(conf);
1377	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1378	<
1379	<	if (IsConfIllegal(aconf))
1380	<	return NOT_AUTHORIZED;
719	>	if (conf->type == CONF_CLIENT)
720	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
721	>	&client_p->localClient->ip, conf->class))
722	>	return TOO_MANY;    /* Already at maximum allowed */
723
724	<	if (conf->type == CLIENT_TYPE)
725	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1384	<	&client_p->localClient->ip, aclass))
1385	<	return TOO_MANY;    /* Already at maximum allowed */
1386	<
1387	<	CurrUserCount(aclass)++;
1388	<	aconf->clients++;
1389	<	}
1390	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1391	<	{
1392	<	struct MatchItem *match_item = map_to_conf(conf);
1393	<	match_item->ref_count++;
1394	<	}
724	>	conf->class->ref_count++;
725	>	conf->ref_count++;
726
727		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
728
#	Line 1411 | Line 742 | attach_connect_block(struct Client *clie
742		const char *host)
743		{
744		dlink_node *ptr;
745	<	struct ConfItem *conf;
1415	<	struct AccessItem *aconf;
745	>	struct MaskItem *conf = NULL;
746
747		assert(client_p != NULL);
748		assert(host != NULL);
#	Line 1423 | Line 753 | attach_connect_block(struct Client *clie
753		DLINK_FOREACH(ptr, server_items.head)
754		{
755		conf = ptr->data;
1426	–	aconf = map_to_conf(conf);
756
757	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
757	>	if (match(conf->name, name) || match(conf->host, host))
758		continue;
759
760		attach_conf(client_p, conf);
#	Line 1435 | Line 764 | attach_connect_block(struct Client *clie
764		return 0;
765		}
766
1438	–	/* find_conf_exact()
1439	–	*
1440	–	* inputs       - type of ConfItem
1441	–	*              - pointer to name to find
1442	–	*              - pointer to username to find
1443	–	*              - pointer to host to find
1444	–	* output       - NULL or pointer to conf found
1445	–	* side effects - find a conf entry which matches the hostname
1446	–	*                and has the same name.
1447	–	*/
1448	–	struct ConfItem *
1449	–	find_conf_exact(ConfType type, const char *name, const char *user,
1450	–	const char *host)
1451	–	{
1452	–	dlink_node *ptr;
1453	–	dlink_list *list_p;
1454	–	struct ConfItem *conf = NULL;
1455	–	struct AccessItem *aconf;
1456	–
1457	–	/* Only valid for OPER_TYPE and ...? */
1458	–	list_p = map_to_list(type);
1459	–
1460	–	DLINK_FOREACH(ptr, (*list_p).head)
1461	–	{
1462	–	conf = ptr->data;
1463	–
1464	–	if (conf->name == NULL)
1465	–	continue;
1466	–	aconf = map_to_conf(conf);
1467	–	if (aconf->host == NULL)
1468	–	continue;
1469	–	if (irccmp(conf->name, name) != 0)
1470	–	continue;
1471	–
1472	–	/*
1473	–	** Accept if the *real* hostname (usually sockethost)
1474	–	** socket host) matches *either* host or name field
1475	–	** of the configuration.
1476	–	*/
1477	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1478	–	continue;
1479	–	if (type == OPER_TYPE)
1480	–	{
1481	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1482	–
1483	–	if (aconf->clients >= MaxTotal(aclass))
1484	–	continue;
1485	–	}
1486	–
1487	–	return conf;
1488	–	}
1489	–
1490	–	return NULL;
1491	–	}
1492	–
767		/* find_conf_name()
768		*
769		* inputs       - pointer to conf link list to search
#	Line 1499 | Line 773 | find_conf_exact(ConfType type, const cha
773		* side effects - find a conf entry which matches the name
774		*                and has the given mask.
775		*/
776	<	struct ConfItem *
777	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
776	>	struct MaskItem *
777	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
778		{
779		dlink_node *ptr;
780	<	struct ConfItem* conf;
780	>	struct MaskItem* conf;
781
782		DLINK_FOREACH(ptr, list->head)
783		{
784		conf = ptr->data;
785	<
785	>
786		if (conf->type == type)
787		{
788		if (conf->name && (irccmp(conf->name, name) == 0 ||
789	<	match(conf->name, name)))
789	>	!match(conf->name, name)))
790		return conf;
791		}
792		}
#	Line 1527 | Line 801 | find_conf_name(dlink_list *list, const c
801		* side effects - none
802		*/
803		static dlink_list *
804	<	map_to_list(ConfType type)
804	>	map_to_list(enum maskitem_type type)
805		{
806		switch(type)
807		{
808	<	case RXLINE_TYPE:
1535	<	return(&rxconf_items);
1536	<	break;
1537	<	case XLINE_TYPE:
808	>	case CONF_XLINE:
809		return(&xconf_items);
810		break;
811	<	case ULINE_TYPE:
811	>	case CONF_ULINE:
812		return(&uconf_items);
813		break;
814	<	case NRESV_TYPE:
814	>	case CONF_NRESV:
815		return(&nresv_items);
816		break;
817	<	case OPER_TYPE:
817	>	case CONF_CRESV:
818	>	return(&cresv_items);
819	>	case CONF_OPER:
820		return(&oconf_items);
821		break;
822	<	case CLASS_TYPE:
1550	<	return(&class_items);
1551	<	break;
1552	<	case SERVER_TYPE:
822	>	case CONF_SERVER:
823		return(&server_items);
824		break;
825	<	case CLUSTER_TYPE:
825	>	case CONF_SERVICE:
826	>	return(&service_items);
827	>	break;
828	>	case CONF_CLUSTER:
829		return(&cluster_items);
830		break;
1558	–	case CONF_TYPE:
1559	–	case GLINE_TYPE:
1560	–	case KLINE_TYPE:
1561	–	case DLINE_TYPE:
1562	–	case CRESV_TYPE:
831		default:
832		return NULL;
833		}
#	Line 1571 | Line 839 | map_to_list(ConfType type)
839		*              - pointer to name string to find
840		*              - pointer to user
841		*              - pointer to host
842	<	*              - optional action to match on as well
843	<	* output       - NULL or pointer to found struct MatchItem
842	>	*              - optional flags to match on as well
843	>	* output       - NULL or pointer to found struct MaskItem
844		* side effects - looks for a match on name field
845		*/
846	<	struct ConfItem *
847	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
848	<	const char *host, int action)
846	>	struct MaskItem *
847	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
848	>	const char *host, unsigned int flags)
849		{
850		dlink_node *ptr=NULL;
851	<	struct ConfItem *conf=NULL;
1584	<	struct AccessItem *aconf=NULL;
1585	<	struct MatchItem *match_item=NULL;
851	>	struct MaskItem *conf=NULL;
852		dlink_list *list_p = map_to_list(type);
853
854		switch (type)
855		{
856	<	case RXLINE_TYPE:
857	<	DLINK_FOREACH(ptr, list_p->head)
858	<	{
859	<	conf = ptr->data;
1594	<	assert(conf->regexpname);
856	>	case CONF_SERVICE:
857	>	DLINK_FOREACH(ptr, list_p->head)
858	>	{
859	>	conf = ptr->data;
860
861	<	if (!ircd_pcre_exec(conf->regexpname, name))
862	<	return conf;
863	<	}
864	<	break;
861	>	if (EmptyString(conf->name))
862	>	continue;
863	>	if ((name != NULL) && !irccmp(name, conf->name))
864	>	return conf;
865	>	}
866	>	break;
867
868	<	case XLINE_TYPE:
869	<	case ULINE_TYPE:
870	<	case NRESV_TYPE:
868	>	case CONF_XLINE:
869	>	case CONF_ULINE:
870	>	case CONF_NRESV:
871	>	case CONF_CRESV:
872		DLINK_FOREACH(ptr, list_p->head)
873		{
874		conf = ptr->data;
875
1608	–	match_item = map_to_conf(conf);
876		if (EmptyString(conf->name))
877	<	continue;
878	<	if ((name != NULL) && match_esc(conf->name, name))
877	>	continue;
878	>	if ((name != NULL) && !match(conf->name, name))
879		{
880	<	if ((user == NULL && (host == NULL)))
881	<	return conf;
882	<	if ((match_item->action & action) != action)
880	>	if ((user == NULL && (host == NULL)))
881	>	return conf;
882	>	if ((conf->flags & flags) != flags)
883		continue;
884	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
885	<	return conf;
886	<	if (match(match_item->user, user) && match(match_item->host, host))
887	<	return conf;
884	>	if (EmptyString(conf->user) || EmptyString(conf->host))
885	>	return conf;
886	>	if (!match(conf->user, user) && !match(conf->host, host))
887	>	return conf;
888		}
889		}
890		break;
891
892	<	case SERVER_TYPE:
892	>	case CONF_SERVER:
893		DLINK_FOREACH(ptr, list_p->head)
894		{
895		conf = ptr->data;
1629	–	aconf = map_to_conf(conf);
896
897	<	if ((name != NULL) && match_esc(name, conf->name))
897	>	if ((name != NULL) && !match(name, conf->name))
898		return conf;
899	<	else if ((host != NULL) && match_esc(host, aconf->host))
899	>	else if ((host != NULL) && !match(host, conf->host))
900		return conf;
901		}
902		break;
903	<
903	>
904		default:
905		break;
906		}
#	Line 1647 | Line 913 | find_matching_name_conf(ConfType type, c
913		*              - pointer to name string to find
914		*              - pointer to user
915		*              - pointer to host
916	<	* output       - NULL or pointer to found struct MatchItem
916	>	* output       - NULL or pointer to found struct MaskItem
917		* side effects - looks for an exact match on name field
918		*/
919	<	struct ConfItem *
920	<	find_exact_name_conf(ConfType type, const char *name,
919	>	struct MaskItem *
920	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
921		const char *user, const char *host)
922		{
923		dlink_node *ptr = NULL;
924	<	struct AccessItem *aconf;
925	<	struct ConfItem *conf;
1660	<	struct MatchItem *match_item;
1661	<	dlink_list *list_p;
1662	<
1663	<	list_p = map_to_list(type);
924	>	struct MaskItem *conf;
925	>	dlink_list *list_p = map_to_list(type);
926
927		switch(type)
928		{
929	<	case RXLINE_TYPE:
930	<	case XLINE_TYPE:
931	<	case ULINE_TYPE:
932	<	case NRESV_TYPE:
929	>	case CONF_XLINE:
930	>	case CONF_ULINE:
931	>	case CONF_NRESV:
932	>	case CONF_CRESV:
933
934		DLINK_FOREACH(ptr, list_p->head)
935		{
936		conf = ptr->data;
937	<	match_item = (struct MatchItem *)map_to_conf(conf);
937	>
938		if (EmptyString(conf->name))
939	<	continue;
940	<
939	>	continue;
940	>
941		if (irccmp(conf->name, name) == 0)
942		{
943	<	if ((user == NULL && (host == NULL)))
944	<	return (conf);
945	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
946	<	return (conf);
947	<	if (match(match_item->user, user) && match(match_item->host, host))
948	<	return (conf);
943	>	if ((user == NULL && (host == NULL)))
944	>	return conf;
945	>	if (EmptyString(conf->user) || EmptyString(conf->host))
946	>	return conf;
947	>	if (!match(conf->user, user) && !match(conf->host, host))
948	>	return conf;
949		}
950		}
951		break;
952
953	<	case OPER_TYPE:
953	>	case CONF_OPER:
954		DLINK_FOREACH(ptr, list_p->head)
955		{
956		conf = ptr->data;
957	<	aconf = (struct AccessItem *)map_to_conf(conf);
957	>
958		if (EmptyString(conf->name))
959	<	continue;
960	<
961	<	if (irccmp(conf->name, name) == 0)
959	>	continue;
960	>
961	>	if (!irccmp(conf->name, name))
962		{
963	<	if ((user == NULL && (host == NULL)))
964	<	return (conf);
965	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
966	<	return (conf);
967	<	if (match(aconf->user, user) && match(aconf->host, host))
968	<	return (conf);
963	>	if (!who)
964	>	return conf;
965	>	if (EmptyString(conf->user) || EmptyString(conf->host))
966	>	return NULL;
967	>	if (!match(conf->user, who->username))
968	>	{
969	>	switch (conf->htype)
970	>	{
971	>	case HM_HOST:
972	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
973	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
974	>	return conf;
975	>	break;
976	>	case HM_IPV4:
977	>	if (who->localClient->aftype == AF_INET)
978	>	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
979	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
980	>	return conf;
981	>	break;
982	>	#ifdef IPV6
983	>	case HM_IPV6:
984	>	if (who->localClient->aftype == AF_INET6)
985	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
986	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
987	>	return conf;
988	>	break;
989	>	#endif
990	>	default:
991	>	assert(0);
992	>	}
993	>	}
994		}
995		}
996	+
997		break;
998
999	<	case SERVER_TYPE:
999	>	case CONF_SERVER:
1000		DLINK_FOREACH(ptr, list_p->head)
1001		{
1002		conf = ptr->data;
1003	<	aconf = (struct AccessItem *)map_to_conf(conf);
1003	>
1004		if (EmptyString(conf->name))
1005	<	continue;
1006	<
1005	>	continue;
1006	>
1007		if (name == NULL)
1008		{
1009	<	if (EmptyString(aconf->host))
1010	<	continue;
1011	<	if (irccmp(aconf->host, host) == 0)
1012	<	return(conf);
1009	>	if (EmptyString(conf->host))
1010	>	continue;
1011	>	if (irccmp(conf->host, host) == 0)
1012	>	return conf;
1013		}
1014		else if (irccmp(conf->name, name) == 0)
1015	<	{
1728	<	return (conf);
1729	<	}
1015	>	return conf;
1016		}
1731	–	break;
1017
1733	–	case CLASS_TYPE:
1734	–	DLINK_FOREACH(ptr, list_p->head)
1735	–	{
1736	–	conf = ptr->data;
1737	–	if (EmptyString(conf->name))
1738	–	continue;
1739	–
1740	–	if (irccmp(conf->name, name) == 0)
1741	–	return (conf);
1742	–	}
1018		break;
1019
1020		default:
1021		break;
1022		}
1023	<	return(NULL);
1023	>
1024	>	return NULL;
1025		}
1026
1027		/* rehash()
#	Line 1758 | Line 1034 | int
1034		rehash(int sig)
1035		{
1036		if (sig != 0)
1037	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1038	<	"Got signal SIGHUP, reloading ircd.conf file");
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038	>	"Got signal SIGHUP, reloading configuration file(s)");
1039
1764	–	#ifndef _WIN32
1040		restart_resolver();
1041	<	#endif
1041	>
1042		/* don't close listeners until we know we can go ahead with the rehash */
1043
1044		/* Check to see if we magically got(or lost) IPv6 support */
#	Line 1774 | Line 1049 | rehash(int sig)
1049		if (ServerInfo.description != NULL)
1050		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1051
1777	–	#ifndef STATIC_MODULES
1052		load_conf_modules();
1779	–	#endif
1780	–
1781	–	flush_deleted_I_P();
1053
1054		rehashed_klines = 1;
1055
1056	<	if (ConfigLoggingEntry.use_logging)
1786	<	reopen_log(logFileName);
1787	<
1788	<	return(0);
1056	>	return 0;
1057		}
1058
1059		/* set_default_conf()
#	Line 1803 | Line 1071 | set_default_conf(void)
1071		/* verify init_class() ran, this should be an unnecessary check
1072		* but its not much work.
1073		*/
1074	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
1074	>	assert(class_default == class_get_list()->tail->data);
1075
1076		#ifdef HAVE_LIBCRYPTO
1077		ServerInfo.rsa_private_key = NULL;
#	Line 1813 | Line 1081 | set_default_conf(void)
1081		/* ServerInfo.name is not rehashable */
1082		/* ServerInfo.name = ServerInfo.name; */
1083		ServerInfo.description = NULL;
1084	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1085	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1084	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1085	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1086
1087		memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1088		ServerInfo.specific_ipv4_vhost = 0;
#	Line 1822 | Line 1090 | set_default_conf(void)
1090		ServerInfo.specific_ipv6_vhost = 0;
1091
1092		ServerInfo.max_clients = MAXCLIENTS_MAX;
1093	<	/* Don't reset hub, as that will break lazylinks */
1094	<	/* ServerInfo.hub = NO; */
1093	>	ServerInfo.max_nick_length = 9;
1094	>	ServerInfo.max_topic_length = 80;
1095	>
1096	>	ServerInfo.hub = 0;
1097		ServerInfo.dns_host.sin_addr.s_addr = 0;
1098		ServerInfo.dns_host.sin_port = 0;
1099		AdminInfo.name = NULL;
1100		AdminInfo.email = NULL;
1101		AdminInfo.description = NULL;
1102
1103	<	set_log_level(L_NOTICE);
1103	>	log_del_all();
1104	>
1105		ConfigLoggingEntry.use_logging = 1;
1106	<	ConfigLoggingEntry.operlog[0] = '\0';
1107	<	ConfigLoggingEntry.userlog[0] = '\0';
1837	<	ConfigLoggingEntry.klinelog[0] = '\0';
1838	<	ConfigLoggingEntry.glinelog[0] = '\0';
1839	<	ConfigLoggingEntry.killlog[0] = '\0';
1840	<	ConfigLoggingEntry.operspylog[0] = '\0';
1841	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1842	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
1843	<
1844	<	ConfigChannel.disable_fake_channels = NO;
1845	<	ConfigChannel.restrict_channels = NO;
1846	<	ConfigChannel.disable_local_channels = NO;
1847	<	ConfigChannel.use_invex = YES;
1848	<	ConfigChannel.use_except = YES;
1849	<	ConfigChannel.use_knock = YES;
1106	>
1107	>	ConfigChannel.disable_fake_channels = 0;
1108		ConfigChannel.knock_delay = 300;
1109		ConfigChannel.knock_delay_channel = 60;
1110	<	ConfigChannel.max_chans_per_user = 15;
1111	<	ConfigChannel.quiet_on_ban = YES;
1110	>	ConfigChannel.max_chans_per_user = 25;
1111	>	ConfigChannel.max_chans_per_oper = 50;
1112		ConfigChannel.max_bans = 25;
1113		ConfigChannel.default_split_user_count = 0;
1114		ConfigChannel.default_split_server_count = 0;
1115	<	ConfigChannel.no_join_on_split = NO;
1116	<	ConfigChannel.no_create_on_split = NO;
1859	<	ConfigChannel.burst_topicwho = YES;
1115	>	ConfigChannel.no_join_on_split = 0;
1116	>	ConfigChannel.no_create_on_split = 0;
1117
1118	<	ConfigServerHide.flatten_links = NO;
1118	>	ConfigServerHide.flatten_links = 0;
1119		ConfigServerHide.links_delay = 300;
1120	<	ConfigServerHide.hidden = NO;
1121	<	ConfigServerHide.disable_hidden = NO;
1122	<	ConfigServerHide.hide_servers = NO;
1123	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
1124	<	ConfigServerHide.hide_server_ips = NO;
1120	>	ConfigServerHide.hidden = 0;
1121	>	ConfigServerHide.hide_servers = 0;
1122	>	ConfigServerHide.hide_services = 0;
1123	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
1124	>	ConfigServerHide.hide_server_ips = 0;
1125	>	ConfigServerHide.disable_remote_commands = 0;
1126
1127	<
1127	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1128		ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
1129	+	ConfigFileEntry.cycle_on_host_change = 1;
1130	+	ConfigFileEntry.glines = 0;
1131	+	ConfigFileEntry.gline_time = 12 * 3600;
1132	+	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
1133		ConfigFileEntry.gline_min_cidr = 16;
1134		ConfigFileEntry.gline_min_cidr6 = 48;
1135	<	ConfigFileEntry.invisible_on_connect = YES;
1136	<	ConfigFileEntry.burst_away = NO;
1137	<	ConfigFileEntry.use_whois_actually = YES;
1138	<	ConfigFileEntry.tkline_expire_notices = YES;
1139	<	ConfigFileEntry.hide_spoof_ips = YES;
1878	<	ConfigFileEntry.ignore_bogus_ts = NO;
1879	<	ConfigFileEntry.disable_auth = NO;
1880	<	ConfigFileEntry.disable_remote = NO;
1135	>	ConfigFileEntry.invisible_on_connect = 1;
1136	>	ConfigFileEntry.tkline_expire_notices = 1;
1137	>	ConfigFileEntry.hide_spoof_ips = 1;
1138	>	ConfigFileEntry.ignore_bogus_ts = 0;
1139	>	ConfigFileEntry.disable_auth = 0;
1140		ConfigFileEntry.kill_chase_time_limit = 90;
1141	<	ConfigFileEntry.default_floodcount = 8; /* XXX */
1142	<	ConfigFileEntry.failed_oper_notice = YES;
1143	<	ConfigFileEntry.dots_in_ident = 0;      /* XXX */
1885	<	ConfigFileEntry.dot_in_ip6_addr = YES;
1141	>	ConfigFileEntry.default_floodcount = 8;
1142	>	ConfigFileEntry.failed_oper_notice = 1;
1143	>	ConfigFileEntry.dots_in_ident = 0;
1144		ConfigFileEntry.min_nonwildcard = 4;
1145		ConfigFileEntry.min_nonwildcard_simple = 3;
1146		ConfigFileEntry.max_accept = 20;
1147	<	ConfigFileEntry.anti_nick_flood = NO;   /* XXX */
1147	>	ConfigFileEntry.anti_nick_flood = 0;
1148		ConfigFileEntry.max_nick_time = 20;
1149		ConfigFileEntry.max_nick_changes = 5;
1150	<	ConfigFileEntry.anti_spam_exit_message_time = 0;  /* XXX */
1150	>	ConfigFileEntry.anti_spam_exit_message_time = 0;
1151		ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1152	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;  /* XXX */
1153	<	ConfigFileEntry.kline_with_reason = YES;
1154	<	ConfigFileEntry.kline_reason = NULL;
1897	<	ConfigFileEntry.warn_no_nline = YES;
1898	<	ConfigFileEntry.stats_o_oper_only = NO; /* XXX */
1152	>	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1153	>	ConfigFileEntry.warn_no_nline = 1;
1154	>	ConfigFileEntry.stats_o_oper_only = 0;
1155		ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
1156		ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
1157	<	ConfigFileEntry.stats_P_oper_only = NO;
1157	>	ConfigFileEntry.stats_P_oper_only = 0;
1158	>	ConfigFileEntry.stats_u_oper_only = 0;
1159		ConfigFileEntry.caller_id_wait = 60;
1160	<	ConfigFileEntry.opers_bypass_callerid = NO;
1160	>	ConfigFileEntry.opers_bypass_callerid = 0;
1161		ConfigFileEntry.pace_wait = 10;
1162		ConfigFileEntry.pace_wait_simple = 1;
1163	<	ConfigFileEntry.short_motd = NO;
1164	<	ConfigFileEntry.ping_cookie = NO;
1165	<	ConfigFileEntry.no_oper_flood = NO;     /* XXX */
1166	<	ConfigFileEntry.true_no_oper_flood = NO;  /* XXX */
1167	<	ConfigFileEntry.oper_pass_resv = YES;
1911	<	ConfigFileEntry.glines = NO;            /* XXX */
1912	<	ConfigFileEntry.gline_time = 12 * 3600; /* XXX */
1913	<	ConfigFileEntry.idletime = 0;
1163	>	ConfigFileEntry.short_motd = 0;
1164	>	ConfigFileEntry.ping_cookie = 0;
1165	>	ConfigFileEntry.no_oper_flood = 0;
1166	>	ConfigFileEntry.true_no_oper_flood = 0;
1167	>	ConfigFileEntry.oper_pass_resv = 1;
1168		ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1169	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1916	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;  /* XXX */
1169	>	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1170		ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1171	<	UMODE_OPERWALL | UMODE_WALLOP;        /* XXX */
1172	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1920	<	#ifdef HAVE_LIBCRYPTO
1921	<	/* jdc -- This is our default value for a cipher.  According to the
1922	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1923	<	*        under all circumstances if cryptlinks are enabled.  So,
1924	<	*        this will be our default.
1925	<	*
1926	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1927	<	*              This should be moved into a find_cipher() routine.
1928	<	*/
1929	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1930	<	#endif
1931	<	ConfigFileEntry.use_egd = NO;
1171	>	UMODE_OPERWALL | UMODE_WALLOP;
1172	>	ConfigFileEntry.use_egd = 0;
1173		ConfigFileEntry.egdpool_path = NULL;
1933	–	#ifdef HAVE_LIBZ
1934	–	ConfigFileEntry.compression_level = 0;
1935	–	#endif
1174		ConfigFileEntry.throttle_time = 10;
1175		}
1176
1939	–	/* read_conf()
1940	–	*
1941	–	* inputs       - file descriptor pointing to config file to use
1942	–	* output       - None
1943	–	* side effects - Read configuration file.
1944	–	*/
1945	–	static void
1946	–	read_conf(FBFILE *file)
1947	–	{
1948	–	lineno = 0;
1949	–
1950	–	set_default_conf(); /* Set default values prior to conf parsing */
1951	–	ypass = 1;
1952	–	yyparse();          /* pick up the classes first */
1953	–
1954	–	fbrewind(file);
1955	–
1956	–	ypass = 2;
1957	–	yyparse();          /* Load the values from the conf */
1958	–	validate_conf();    /* Check to make sure some values are still okay. */
1959	–	/* Some global values are also loaded here. */
1960	–	check_class();      /* Make sure classes are valid */
1961	–	}
1962	–
1177		static void
1178		validate_conf(void)
1179		{
#	Line 1969 | Line 1183 | validate_conf(void)
1183		if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1184		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1185
1972	–	if (ConfigFileEntry.servlink_path == NULL)
1973	–	DupString(ConfigFileEntry.servlink_path, SLPATH);
1974	–
1186		if (ServerInfo.network_name == NULL)
1187	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1187	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1188
1189		if (ServerInfo.network_desc == NULL)
1190	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1190	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1191
1192	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1193	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1983	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1192	>	if (ConfigFileEntry.service_name == NULL)
1193	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1194
1195		ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
1196		}
1197
1198	<	/* lookup_confhost()
1198	>	/* read_conf()
1199		*
1200	<	* start DNS lookups of all hostnames in the conf
1201	<	* line and convert an IP addresses in a.b.c.d number for to IP#s.
1200	>	* inputs       - file descriptor pointing to config file to use
1201	>	* output       - None
1202	>	* side effects - Read configuration file.
1203		*/
1204		static void
1205	<	lookup_confhost(struct ConfItem *conf)
1205	>	read_conf(FILE *file)
1206		{
1207	<	struct AccessItem *aconf;
1208	<	struct addrinfo hints, *res;
1207	>	lineno = 0;
1208	>
1209	>	set_default_conf(); /* Set default values prior to conf parsing */
1210	>	conf_parser_ctx.pass = 1;
1211	>	yyparse();          /* pick up the classes first */
1212
1213	<	aconf = map_to_conf(conf);
1213	>	rewind(file);
1214
1215	<	if (EmptyString(aconf->host) ||
1216	<	EmptyString(aconf->user))
1217	<	{
1218	<	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
1219	<	aconf->host, conf->name);
1220	<	return;
2007	<	}
1215	>	conf_parser_ctx.pass = 2;
1216	>	yyparse();          /* Load the values from the conf */
1217	>	validate_conf();    /* Check to make sure some values are still okay. */
1218	>	/* Some global values are also loaded here. */
1219	>	class_delete_marked();      /* Make sure classes are valid */
1220	>	}
1221
1222	<	if (strchr(aconf->host, '*') ||
1223	<	strchr(aconf->host, '?'))
1224	<	return;
1222	>	/* lookup_confhost()
1223	>	*
1224	>	* start DNS lookups of all hostnames in the conf
1225	>	* line and convert an IP addresses in a.b.c.d number for to IP#s.
1226	>	*/
1227	>	void
1228	>	lookup_confhost(struct MaskItem *conf)
1229	>	{
1230	>	struct addrinfo hints, *res;
1231
1232		/* Do name lookup now on hostnames given and store the
1233		* ip numbers in conf structure.
#	Line 2021 | Line 1240 | lookup_confhost(struct ConfItem *conf)
1240		/* Get us ready for a bind() and don't bother doing dns lookup */
1241		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1242
1243	<	if (irc_getaddrinfo(aconf->host, NULL, &hints, &res))
1243	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
1244		{
1245	<	conf_dns_lookup(aconf);
1245	>	conf_dns_lookup(conf);
1246		return;
1247		}
1248
1249		assert(res != NULL);
1250
1251	<	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
1252	<	aconf->ipnum.ss_len = res->ai_addrlen;
1253	<	aconf->ipnum.ss.ss_family = res->ai_family;
1254	<	irc_freeaddrinfo(res);
1251	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1252	>	conf->addr.ss_len = res->ai_addrlen;
1253	>	conf->addr.ss.ss_family = res->ai_family;
1254	>
1255	>	freeaddrinfo(res);
1256		}
1257
1258		/* conf_connect_allowed()
#	Line 2046 | Line 1266 | int
1266		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1267		{
1268		struct ip_entry *ip_found;
1269	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1269	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1270
1271		/* DLINE exempt also gets you out of static limits/pacing... */
1272	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1272	>	if (conf && (conf->type == CONF_EXEMPT))
1273		return 0;
1274
1275	<	if (aconf != NULL)
1275	>	if (conf != NULL)
1276		return BANNED_CLIENT;
1277
1278		ip_found = find_or_add_ip(addr);
#	Line 2068 | Line 1288 | conf_connect_allowed(struct irc_ssaddr *
1288		return 0;
1289		}
1290
2071	–	static struct AccessItem *
2072	–	find_regexp_kline(const char *uhi[])
2073	–	{
2074	–	const dlink_node *ptr = NULL;
2075	–
2076	–	DLINK_FOREACH(ptr, rkconf_items.head)
2077	–	{
2078	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2079	–
2080	–	assert(aptr->regexuser);
2081	–	assert(aptr->regexhost);
2082	–
2083	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2084	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2085	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2086	–	return aptr;
2087	–	}
2088	–
2089	–	return NULL;
2090	–	}
2091	–
2092	–	/* find_kill()
2093	–	*
2094	–	* inputs       - pointer to client structure
2095	–	* output       - pointer to struct AccessItem if found
2096	–	* side effects - See if this user is klined already,
2097	–	*                and if so, return struct AccessItem pointer
2098	–	*/
2099	–	struct AccessItem *
2100	–	find_kill(struct Client *client_p)
2101	–	{
2102	–	struct AccessItem *aconf = NULL;
2103	–	const char *uhi[3];
2104	–
2105	–	uhi[0] = client_p->username;
2106	–	uhi[1] = client_p->host;
2107	–	uhi[2] = client_p->sockhost;
2108	–
2109	–	assert(client_p != NULL);
2110	–
2111	–	aconf = find_kline_conf(client_p->host, client_p->username,
2112	–	&client_p->localClient->ip,
2113	–	client_p->localClient->aftype);
2114	–	if (aconf == NULL)
2115	–	aconf = find_regexp_kline(uhi);
2116	–
2117	–	if (aconf && (aconf->status & CONF_KLINE))
2118	–	return aconf;
2119	–
2120	–	return NULL;
2121	–	}
2122	–
2123	–	struct AccessItem *
2124	–	find_gline(struct Client *client_p)
2125	–	{
2126	–	struct AccessItem *aconf;
2127	–
2128	–	assert(client_p != NULL);
2129	–
2130	–	aconf = find_gline_conf(client_p->host, client_p->username,
2131	–	&client_p->localClient->ip,
2132	–	client_p->localClient->aftype);
2133	–
2134	–	if (aconf && (aconf->status & CONF_GLINE))
2135	–	return aconf;
2136	–
2137	–	return NULL;
2138	–	}
2139	–
2140	–	/* add_temp_line()
2141	–	*
2142	–	* inputs        - pointer to struct ConfItem
2143	–	* output        - none
2144	–	* Side effects  - links in given struct ConfItem into
2145	–	*                 temporary *line link list
2146	–	*/
2147	–	void
2148	–	add_temp_line(struct ConfItem *conf)
2149	–	{
2150	–	struct AccessItem *aconf;
2151	–
2152	–	if (conf->type == DLINE_TYPE)
2153	–	{
2154	–	aconf = map_to_conf(conf);
2155	–	SetConfTemporary(aconf);
2156	–	dlinkAdd(conf, &conf->node, &temporary_dlines);
2157	–	MyFree(aconf->user);
2158	–	aconf->user = NULL;
2159	–	add_conf_by_address(CONF_DLINE, aconf);
2160	–	}
2161	–	else if (conf->type == KLINE_TYPE)
2162	–	{
2163	–	aconf = map_to_conf(conf);
2164	–	SetConfTemporary(aconf);
2165	–	dlinkAdd(conf, &conf->node, &temporary_klines);
2166	–	add_conf_by_address(CONF_KILL, aconf);
2167	–	}
2168	–	else if (conf->type == GLINE_TYPE)
2169	–	{
2170	–	aconf = map_to_conf(conf);
2171	–	SetConfTemporary(aconf);
2172	–	dlinkAdd(conf, &conf->node, &temporary_glines);
2173	–	add_conf_by_address(CONF_GLINE, aconf);
2174	–	}
2175	–	else if (conf->type == XLINE_TYPE)
2176	–	{
2177	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2178	–	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2179	–	}
2180	–	else if (conf->type == RXLINE_TYPE)
2181	–	{
2182	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2183	–	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2184	–	}
2185	–	else if (conf->type == RKLINE_TYPE)
2186	–	{
2187	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2188	–	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2189	–	}
2190	–	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2191	–	{
2192	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2193	–	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2194	–	}
2195	–	}
2196	–
1291		/* cleanup_tklines()
1292		*
1293		* inputs       - NONE
#	Line 2204 | Line 1298 | add_temp_line(struct ConfItem *conf)
1298		void
1299		cleanup_tklines(void *notused)
1300		{
1301	<	expire_tklines(&temporary_glines);
1302	<	expire_tklines(&temporary_klines);
1303	<	expire_tklines(&temporary_dlines);
1304	<	expire_tklines(&temporary_xlines);
2211	<	expire_tklines(&temporary_rxlines);
2212	<	expire_tklines(&temporary_rklines);
2213	<	expire_tklines(&temporary_resv);
1301	>	hostmask_expire_temporary();
1302	>	expire_tklines(&xconf_items);
1303	>	expire_tklines(&nresv_items);
1304	>	expire_tklines(&cresv_items);
1305		}
1306
1307		/* expire_tklines()
#	Line 2224 | Line 1315 | expire_tklines(dlink_list *tklist)
1315		{
1316		dlink_node *ptr;
1317		dlink_node *next_ptr;
1318	<	struct ConfItem *conf;
2228	<	struct MatchItem *xconf;
2229	<	struct MatchItem *nconf;
2230	<	struct AccessItem *aconf;
2231	<	struct ResvChannel *cconf;
1318	>	struct MaskItem *conf;
1319
1320		DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1321		{
1322		conf = ptr->data;
2236	–	if (conf->type == GLINE_TYPE ||
2237	–	conf->type == KLINE_TYPE ||
2238	–	conf->type == DLINE_TYPE)
2239	–	{
2240	–	aconf = (struct AccessItem *)map_to_conf(conf);
2241	–	if (aconf->hold <= CurrentTime)
2242	–	{
2243	–	/* XXX - Do we want GLINE expiry notices?? */
2244	–	/* Alert opers that a TKline expired - Hwy */
2245	–	if (ConfigFileEntry.tkline_expire_notices)
2246	–	{
2247	–	if (aconf->status & CONF_KILL)
2248	–	{
2249	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2250	–	"Temporary K-line for [%s@%s] expired",
2251	–	(aconf->user) ? aconf->user : "*",
2252	–	(aconf->host) ? aconf->host : "*");
2253	–	}
2254	–	else if (conf->type == DLINE_TYPE)
2255	–	{
2256	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2257	–	"Temporary D-line for [%s] expired",
2258	–	(aconf->host) ? aconf->host : "*");
2259	–	}
2260	–	}
1323
1324	<	dlinkDelete(ptr, tklist);
1325	<	delete_one_address_conf(aconf->host, aconf);
1326	<	}
1327	<	}
2266	<	else if (conf->type == XLINE_TYPE ||
2267	<	conf->type == RXLINE_TYPE)
2268	<	{
2269	<	xconf = (struct MatchItem *)map_to_conf(conf);
2270	<	if (xconf->hold <= CurrentTime)
2271	<	{
2272	<	if (ConfigFileEntry.tkline_expire_notices)
2273	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2274	<	"Temporary X-line for [%s] %sexpired", conf->name,
2275	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2276	<	dlinkDelete(ptr, tklist);
2277	<	free_dlink_node(ptr);
2278	<	delete_conf_item(conf);
2279	<	}
2280	<	}
2281	<	else if (conf->type == RKLINE_TYPE)
1324	>	if (!conf->until || conf->until > CurrentTime)
1325	>	continue;
1326	>
1327	>	if (conf->type == CONF_XLINE)
1328		{
1329	<	aconf = map_to_conf(conf);
1330	<	if (aconf->hold <= CurrentTime)
1331	<	{
1332	<	if (ConfigFileEntry.tkline_expire_notices)
2287	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2288	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2289	<	(aconf->user) ? aconf->user : "*",
2290	<	(aconf->host) ? aconf->host : "*");
2291	<	dlinkDelete(ptr, tklist);
2292	<	free_dlink_node(ptr);
2293	<	delete_conf_item(conf);
2294	<	}
1329	>	if (ConfigFileEntry.tkline_expire_notices)
1330	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1331	>	"Temporary X-line for [%s] expired", conf->name);
1332	>	conf_free(conf);
1333		}
1334	<	else if (conf->type == NRESV_TYPE)
1334	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1335		{
1336	<	nconf = (struct MatchItem *)map_to_conf(conf);
1337	<	if (nconf->hold <= CurrentTime)
2300	<	{
2301	<	if (ConfigFileEntry.tkline_expire_notices)
2302	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1336	>	if (ConfigFileEntry.tkline_expire_notices)
1337	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1338		"Temporary RESV for [%s] expired", conf->name);
1339	<	dlinkDelete(ptr, tklist);
2305	<	free_dlink_node(ptr);
2306	<	delete_conf_item(conf);
2307	<	}
2308	<	}
2309	<	else if (conf->type == CRESV_TYPE)
2310	<	{
2311	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2312	<	if (cconf->hold <= CurrentTime)
2313	<	{
2314	<	if (ConfigFileEntry.tkline_expire_notices)
2315	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2316	<	"Temporary RESV for [%s] expired", cconf->name);
2317	<	delete_channel_resv(cconf);
2318	<	}
1339	>	conf_free(conf);
1340		}
1341		}
1342		}
#	Line 2328 | Line 1349 | expire_tklines(dlink_list *tklist)
1349		*/
1350		static const struct oper_privs
1351		{
1352	<	const unsigned int oprivs;
2332	<	const unsigned int hidden;
1352	>	const unsigned int flag;
1353		const unsigned char c;
1354		} flag_list[] = {
1355	<	{ OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
1356	<	{ OPER_FLAG_REMOTEBAN,   0,                       'B' },
1357	<	{ OPER_FLAG_DIE,         0,                       'D' },
1358	<	{ OPER_FLAG_GLINE,       0,                       'G' },
1359	<	{ OPER_FLAG_REHASH,      0,                       'H' },
1360	<	{ OPER_FLAG_K,           0,                       'K' },
1361	<	{ OPER_FLAG_OPERWALL,    0,                       'L' },
1362	<	{ OPER_FLAG_N,           0,                       'N' },
1363	<	{ OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
1364	<	{ OPER_FLAG_REMOTE,      0,                       'R' },
1365	<	{ OPER_FLAG_OPER_SPY,    0,                       'S' },
1366	<	{ OPER_FLAG_UNKLINE,     0,                       'U' },
1367	<	{ OPER_FLAG_X,           0,                       'X' },
1368	<	{ 0, 0, '\0' }
1355	>	{ OPER_FLAG_ADMIN,          'A' },
1356	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1357	>	{ OPER_FLAG_DIE,            'D' },
1358	>	{ OPER_FLAG_GLINE,          'G' },
1359	>	{ OPER_FLAG_REHASH,         'H' },
1360	>	{ OPER_FLAG_K,              'K' },
1361	>	{ OPER_FLAG_OPERWALL,       'L' },
1362	>	{ OPER_FLAG_KILL,           'N' },
1363	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1364	>	{ OPER_FLAG_CONNECT,        'P' },
1365	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1366	>	{ OPER_FLAG_SQUIT,          'R' },
1367	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1368	>	{ OPER_FLAG_UNKLINE,        'U' },
1369	>	{ OPER_FLAG_XLINE,          'X' },
1370	>	{ 0, '\0' }
1371		};
1372
1373		char *
1374		oper_privs_as_string(const unsigned int port)
1375		{
1376	<	static char privs_out[16];
1376	>	static char privs_out[IRCD_BUFSIZE];
1377		char *privs_ptr = privs_out;
1378	<	unsigned int i = 0;
1378	>	const struct oper_privs *opriv = flag_list;
1379
1380	<	for (; flag_list[i].oprivs; ++i)
1380	>	for (; opriv->flag; ++opriv)
1381		{
1382	<	if ((port & flag_list[i].oprivs) &&
1383	<	(port & flag_list[i].hidden) == 0)
2362	<	*privs_ptr++ = flag_list[i].c;
1382	>	if (port & opriv->flag)
1383	>	*privs_ptr++ = opriv->c;
1384		else
1385	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1385	>	*privs_ptr++ = ToLower(opriv->c);
1386		}
1387
1388		*privs_ptr = '\0';
#	Line 2375 | Line 1396 | oper_privs_as_string(const unsigned int
1396		*         "oper" is server name for remote opers
1397		* Side effects: None.
1398		*/
1399	<	char *
1399	>	const char *
1400		get_oper_name(const struct Client *client_p)
1401		{
1402	<	dlink_node *cnode;
2382	<	struct ConfItem *conf;
2383	<	struct AccessItem *aconf;
2384	<
1402	>	const dlink_node *cnode = NULL;
1403		/* +5 for !,@,{,} and null */
1404	<	static char buffer[NICKLEN+USERLEN+HOSTLEN+HOSTLEN+5];
1404	>	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1405
1406		if (MyConnect(client_p))
1407		{
1408	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1408	>	if ((cnode = client_p->localClient->confs.head))
1409		{
1410	<	conf = cnode->data;
2393	<	aconf = map_to_conf(conf);
1410	>	const struct MaskItem *conf = cnode->data;
1411
1412	<	if (IsConfOperator(aconf))
1412	>	if (IsConfOperator(conf))
1413		{
1414	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
1415	<	client_p->username, client_p->host,
1416	<	conf->name);
2400	<	return buffer;
1414	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1415	>	client_p->username, client_p->host, conf->name);
1416	>	return buffer;
1417		}
1418		}
1419
1420	<	/* Probably should assert here for now. If there is an oper out there
1420	>	/* Probably should assert here for now. If there is an oper out there
1421		* with no oper{} conf attached, it would be good for us to know...
1422		*/
1423		assert(0); /* Oper without oper conf! */
1424		}
1425
1426	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
1427	<	client_p->username, client_p->host, client_p->servptr->name);
1426	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1427	>	client_p->username, client_p->host, client_p->servptr->name);
1428		return buffer;
1429		}
1430
#	Line 2422 | Line 1438 | void
1438		read_conf_files(int cold)
1439		{
1440		const char *filename;
1441	<	char chanmodes[32];
1442	<	char chanlimit[32];
1441	>	char chanmodes[IRCD_BUFSIZE];
1442	>	char chanlimit[IRCD_BUFSIZE];
1443
1444	<	filename = get_conf_name(CONF_TYPE);
1444	>	conf_parser_ctx.boot = cold;
1445	>	filename = ConfigFileEntry.configfile;
1446
1447		/* We need to know the initial filename for the yyerror() to report
1448		FIXME: The full path is in conffilenamebuf first time since we
1449		dont know anything else
1450
1451	<	- Gozem 2002-07-21
1451	>	- Gozem 2002-07-21
1452		*/
1453		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1454
1455	<	if ((conf_fbfile_in = fbopen(filename, "r")) == NULL)
1455	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1456		{
1457		if (cold)
1458		{
1459	<	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
1459	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1460		filename, strerror(errno));
1461		exit(-1);
1462		}
1463		else
1464		{
1465	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1466	<	"Unable to read configuration file '%s': %s",
1467	<	filename, strerror(errno));
1465	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1466	>	"Unable to read configuration file '%s': %s",
1467	>	filename, strerror(errno));
1468		return;
1469		}
1470		}
#	Line 2455 | Line 1472 | read_conf_files(int cold)
1472		if (!cold)
1473		clear_out_old_conf();
1474
1475	<	read_conf(conf_fbfile_in);
1476	<	fbclose(conf_fbfile_in);
1475	>	read_conf(conf_parser_ctx.conf_file);
1476	>	fclose(conf_parser_ctx.conf_file);
1477	>
1478	>	log_reopen_all();
1479
1480	+	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1481		add_isupport("NETWORK", ServerInfo.network_name, -1);
1482	<	ircsprintf(chanmodes, "b%s%s:%d", ConfigChannel.use_except ? "e" : "",
1483	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
1482	>
1483	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1484		add_isupport("MAXLIST", chanmodes, -1);
1485		add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1486	<	if (ConfigChannel.disable_local_channels)
1487	<	add_isupport("CHANTYPES", "#", -1);
1488	<	else
1489	<	add_isupport("CHANTYPES", "#&", -1);
2470	<	ircsprintf(chanlimit, "%s:%d", ConfigChannel.disable_local_channels ? "#" : "#&",
2471	<	ConfigChannel.max_chans_per_user);
1486	>	add_isupport("CHANTYPES", "#", -1);
1487	>
1488	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1489	>	ConfigChannel.max_chans_per_user);
1490		add_isupport("CHANLIMIT", chanlimit, -1);
1491	<	ircsprintf(chanmodes, "%s%s%s", ConfigChannel.use_except ? "e" : "",
2474	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnpst");
1491	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1492		add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1493	<	if (ConfigChannel.use_except)
2477	<	add_isupport("EXCEPTS", "e", -1);
2478	<	if (ConfigChannel.use_invex)
2479	<	add_isupport("INVEX", "I", -1);
1493	>	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1494		add_isupport("CHANMODES", chanmodes, -1);
1495
1496		/*
#	Line 2484 | Line 1498 | read_conf_files(int cold)
1498		* on strlen(form_str(RPL_ISUPPORT))
1499		*/
1500		rebuild_isupport_message_line();
2487	–
2488	–	parse_conf_file(KLINE_TYPE, cold);
2489	–	parse_conf_file(RKLINE_TYPE, cold);
2490	–	parse_conf_file(DLINE_TYPE, cold);
2491	–	parse_conf_file(XLINE_TYPE, cold);
2492	–	parse_conf_file(RXLINE_TYPE, cold);
2493	–	parse_conf_file(NRESV_TYPE, cold);
2494	–	parse_conf_file(CRESV_TYPE, cold);
2495	–	}
2496	–
2497	–	/* parse_conf_file()
2498	–	*
2499	–	* inputs       - type of conf file to parse
2500	–	* output       - none
2501	–	* side effects - conf file for givenconf type is opened and read then parsed
2502	–	*/
2503	–	static void
2504	–	parse_conf_file(int type, int cold)
2505	–	{
2506	–	FBFILE *file = NULL;
2507	–	const char *filename = get_conf_name(type);
2508	–
2509	–	if ((file = fbopen(filename, "r")) == NULL)
2510	–	{
2511	–	if (cold)
2512	–	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2513	–	filename, strerror(errno));
2514	–	else
2515	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2516	–	"Unable to read configuration file '%s': %s",
2517	–	filename, strerror(errno));
2518	–	}
2519	–	else
2520	–	{
2521	–	parse_csv_file(file, type);
2522	–	fbclose(file);
2523	–	}
1501		}
1502
1503		/* clear_out_old_conf()
#	Line 2533 | Line 1510 | static void
1510		clear_out_old_conf(void)
1511		{
1512		dlink_node *ptr = NULL, *next_ptr = NULL;
1513	<	struct ConfItem *conf;
2537	<	struct AccessItem *aconf;
2538	<	struct ClassItem *cltmp;
2539	<	struct MatchItem *match_item;
1513	>	struct MaskItem *conf;
1514		dlink_list *free_items [] = {
1515	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1516	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1517	<	&nresv_items, &cluster_items,  &gdeny_items, NULL
1515	>	&server_items,   &oconf_items,
1516	>	&uconf_items,   &xconf_items,
1517	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1518		};
1519
1520		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2548 | Line 1522 | clear_out_old_conf(void)
1522		/* We only need to free anything allocated by yyparse() here.
1523		* Resetting structs, etc, is taken care of by set_default_conf().
1524		*/
1525	<
1525	>
1526		for (; *iterator != NULL; iterator++)
1527		{
1528		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1529		{
1530		conf = ptr->data;
2557	–	/* XXX This is less than pretty */
2558	–	if (conf->type == SERVER_TYPE)
2559	–	{
2560	–	aconf = map_to_conf(conf);
1531
1532	<	if (aconf->clients != 0)
2563	<	{
2564	<	SetConfIllegal(aconf);
2565	<	dlinkDelete(&conf->node, &server_items);
2566	<	}
2567	<	else
2568	<	{
2569	<	delete_conf_item(conf);
2570	<	}
2571	<	}
2572	<	else if (conf->type == OPER_TYPE)
2573	<	{
2574	<	aconf = map_to_conf(conf);
1532	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1533
1534	<	if (aconf->clients != 0)
1535	<	{
2578	<	SetConfIllegal(aconf);
2579	<	dlinkDelete(&conf->node, &oconf_items);
2580	<	}
2581	<	else
2582	<	{
2583	<	delete_conf_item(conf);
2584	<	}
2585	<	}
2586	<	else if (conf->type == CLIENT_TYPE)
1534	>	/* XXX This is less than pretty */
1535	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1536		{
1537	<	aconf = map_to_conf(conf);
1538	<
2590	<	if (aconf->clients != 0)
2591	<	{
2592	<	SetConfIllegal(aconf);
2593	<	}
2594	<	else
2595	<	{
2596	<	delete_conf_item(conf);
2597	<	}
1537	>	if (!conf->ref_count)
1538	>	conf_free(conf);
1539		}
1540	<	else if (conf->type == XLINE_TYPE  ||
2600	<	conf->type == RXLINE_TYPE ||
2601	<	conf->type == RKLINE_TYPE)
1540	>	else if (conf->type == CONF_XLINE)
1541		{
1542	<	/* temporary (r)xlines are also on
1543	<	* the (r)xconf items list */
2605	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2606	<	continue;
2607	<
2608	<	delete_conf_item(conf);
1542	>	if (!conf->until)
1543	>	conf_free(conf);
1544		}
1545		else
1546	<	{
2612	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2613	<	{
2614	<	match_item = map_to_conf(conf);
2615	<	if (match_item->ref_count <= 0)
2616	<	delete_conf_item(conf);
2617	<	else
2618	<	{
2619	<	match_item->illegal = 1;
2620	<	dlinkDelete(&conf->node, *iterator);
2621	<	}
2622	<	}
2623	<	else
2624	<	delete_conf_item(conf);
2625	<	}
1546	>	conf_free(conf);
1547		}
1548		}
1549
1550	+	motd_clear();
1551	+
1552		/*
1553		* don't delete the class table, rather mark all entries
1554	<	* for deletion. The table is cleaned up by check_class. - avalon
1554	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1555		*/
1556	<	DLINK_FOREACH(ptr, class_items.head)
2634	<	{
2635	<	cltmp = map_to_conf(ptr->data);
2636	<
2637	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2638	<	cltmp->active = 0;
2639	<	}
1556	>	class_mark_for_deletion();
1557
1558		clear_out_address_conf();
1559
1560		/* clean out module paths */
2644	–	#ifndef STATIC_MODULES
1561		mod_clear_paths();
2646	–	#endif
1562
1563		/* clean out ServerInfo */
1564		MyFree(ServerInfo.description);
#	Line 2663 | Line 1578 | clear_out_old_conf(void)
1578
1579		MyFree(ServerInfo.rsa_private_key_file);
1580		ServerInfo.rsa_private_key_file = NULL;
2666	–	#endif
1581
1582	<	/* clean out old resvs from the conf */
1583	<	clear_conf_resv();
1582	>	if (ServerInfo.server_ctx)
1583	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1584	>	SSL_OP_NO_SSLv3|
1585	>	SSL_OP_NO_TLSv1);
1586	>	if (ServerInfo.client_ctx)
1587	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1588	>	SSL_OP_NO_SSLv3|
1589	>	SSL_OP_NO_TLSv1);
1590	>	#endif
1591
1592		/* clean out AdminInfo */
1593		MyFree(AdminInfo.name);
#	Line 2676 | Line 1597 | clear_out_old_conf(void)
1597		MyFree(AdminInfo.description);
1598		AdminInfo.description = NULL;
1599
2679	–	/* operator{} and class{} blocks are freed above */
1600		/* clean out listeners */
1601		close_listeners();
1602
2683	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2684	–	* exempt{} and gecos{} blocks are freed above too
2685	–	*/
2686	–
1603		/* clean out general */
1604	<	MyFree(ConfigFileEntry.servlink_path);
1605	<	ConfigFileEntry.servlink_path = NULL;
2690	<	#ifdef HAVE_LIBCRYPTO
2691	<	ConfigFileEntry.default_cipher_preference = NULL;
2692	<	#endif /* HAVE_LIBCRYPTO */
2693	<	delete_isupport("INVEX");
2694	<	delete_isupport("EXCEPTS");
2695	<	}
2696	<
2697	<	/* flush_deleted_I_P()
2698	<	*
2699	<	* inputs       - none
2700	<	* output       - none
2701	<	* side effects - This function removes I/P conf items
2702	<	*/
2703	<	static void
2704	<	flush_deleted_I_P(void)
2705	<	{
2706	<	dlink_node *ptr;
2707	<	dlink_node *next_ptr;
2708	<	struct ConfItem *conf;
2709	<	struct AccessItem *aconf;
2710	<	dlink_list * free_items [] = {
2711	<	&server_items, &oconf_items, NULL
2712	<	};
2713	<	dlink_list ** iterator = free_items; /* C is dumb */
2714	<
2715	<	/* flush out deleted I and P lines
2716	<	* although still in use.
2717	<	*/
2718	<	for (; *iterator != NULL; iterator++)
2719	<	{
2720	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2721	<	{
2722	<	conf = ptr->data;
2723	<	aconf = (struct AccessItem *)map_to_conf(conf);
2724	<
2725	<	if (IsConfIllegal(aconf))
2726	<	{
2727	<	dlinkDelete(ptr, *iterator);
2728	<
2729	<	if (aconf->clients == 0)
2730	<	delete_conf_item(conf);
2731	<	}
2732	<	}
2733	<	}
2734	<	}
2735	<
2736	<	/* get_conf_name()
2737	<	*
2738	<	* inputs       - type of conf file to return name of file for
2739	<	* output       - pointer to filename for type of conf
2740	<	* side effects - none
2741	<	*/
2742	<	const char *
2743	<	get_conf_name(ConfType type)
2744	<	{
2745	<	switch (type)
2746	<	{
2747	<	case CONF_TYPE:
2748	<	return ConfigFileEntry.configfile;
2749	<	break;
2750	<	case KLINE_TYPE:
2751	<	return ConfigFileEntry.klinefile;
2752	<	break;
2753	<	case RKLINE_TYPE:
2754	<	return ConfigFileEntry.rklinefile;
2755	<	break;
2756	<	case DLINE_TYPE:
2757	<	return ConfigFileEntry.dlinefile;
2758	<	break;
2759	<	case XLINE_TYPE:
2760	<	return ConfigFileEntry.xlinefile;
2761	<	break;
2762	<	case RXLINE_TYPE:
2763	<	return ConfigFileEntry.rxlinefile;
2764	<	break;
2765	<	case CRESV_TYPE:
2766	<	return ConfigFileEntry.cresvfile;
2767	<	break;
2768	<	case NRESV_TYPE:
2769	<	return ConfigFileEntry.nresvfile;
2770	<	break;
2771	<	case GLINE_TYPE:
2772	<	return ConfigFileEntry.glinefile;
2773	<	break;
2774	<
2775	<	default:
2776	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2777	<	only with the above values, this will cause us to core
2778	<	at some point if this happens so we know where it was */
2779	<	}
2780	<	}
2781	<
2782	<	#define BAD_PING (-1)
2783	<
2784	<	/* get_conf_ping()
2785	<	*
2786	<	* inputs       - pointer to struct AccessItem
2787	<	*              - pointer to a variable that receives ping warning time
2788	<	* output       - ping frequency
2789	<	* side effects - NONE
2790	<	*/
2791	<	static int
2792	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2793	<	{
2794	<	struct ClassItem *aclass;
2795	<	struct AccessItem *aconf;
2796	<
2797	<	if (conf != NULL)
2798	<	{
2799	<	aconf = (struct AccessItem *)map_to_conf(conf);
2800	<	if (aconf->class_ptr != NULL)
2801	<	{
2802	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2803	<	*pingwarn = PingWarning(aclass);
2804	<	return PingFreq(aclass);
2805	<	}
2806	<	}
2807	<
2808	<	return BAD_PING;
2809	<	}
2810	<
2811	<	/* get_client_class()
2812	<	*
2813	<	* inputs       - pointer to client struct
2814	<	* output       - pointer to name of class
2815	<	* side effects - NONE
2816	<	*/
2817	<	const char *
2818	<	get_client_class(struct Client *target_p)
2819	<	{
2820	<	dlink_node *ptr;
2821	<	struct ConfItem *conf;
2822	<	struct AccessItem *aconf;
2823	<
2824	<	if (target_p != NULL && !IsMe(target_p) &&
2825	<	target_p->localClient->confs.head != NULL)
2826	<	{
2827	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2828	<	{
2829	<	conf = ptr->data;
2830	<
2831	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2832	<	conf->type == OPER_TYPE)
2833	<	{
2834	<	aconf = (struct AccessItem *) map_to_conf(conf);
2835	<	if (aconf->class_ptr != NULL)
2836	<	return aconf->class_ptr->name;
2837	<	}
2838	<	}
2839	<	}
2840	<
2841	<	return "default";
2842	<	}
2843	<
2844	<	/* get_client_ping()
2845	<	*
2846	<	* inputs       - pointer to client struct
2847	<	*              - pointer to a variable that receives ping warning time
2848	<	* output       - ping frequency
2849	<	* side effects - NONE
2850	<	*/
2851	<	int
2852	<	get_client_ping(struct Client *target_p, int *pingwarn)
2853	<	{
2854	<	int ping;
2855	<	struct ConfItem *conf;
2856	<	dlink_node *nlink;
2857	<
2858	<	if (target_p->localClient->confs.head != NULL)
2859	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2860	<	{
2861	<	conf = nlink->data;
2862	<
2863	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2864	<	(conf->type == OPER_TYPE))
2865	<	{
2866	<	ping = get_conf_ping(conf, pingwarn);
2867	<	if (ping > 0)
2868	<	return ping;
2869	<	}
2870	<	}
2871	<
2872	<	*pingwarn = 0;
2873	<	return DEFAULT_PINGFREQUENCY;
2874	<	}
2875	<
2876	<	/* find_class()
2877	<	*
2878	<	* inputs       - string name of class
2879	<	* output       - corresponding Class pointer
2880	<	* side effects - NONE
2881	<	*/
2882	<	struct ConfItem *
2883	<	find_class(const char *classname)
2884	<	{
2885	<	struct ConfItem *conf;
2886	<
2887	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2888	<	return conf;
2889	<
2890	<	return class_default;
2891	<	}
2892	<
2893	<	/* check_class()
2894	<	*
2895	<	* inputs       - NONE
2896	<	* output       - NONE
2897	<	* side effects -
2898	<	*/
2899	<	void
2900	<	check_class(void)
2901	<	{
2902	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2903	<
2904	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2905	<	{
2906	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2907	<
2908	<	if (!aclass->active && !CurrUserCount(aclass))
2909	<	{
2910	<	destroy_cidr_class(aclass);
2911	<	delete_conf_item(ptr->data);
2912	<	}
2913	<	}
2914	<	}
2915	<
2916	<	/* init_class()
2917	<	*
2918	<	* inputs       - NONE
2919	<	* output       - NONE
2920	<	* side effects -
2921	<	*/
2922	<	void
2923	<	init_class(void)
2924	<	{
2925	<	struct ClassItem *aclass;
2926	<
2927	<	class_default = make_conf_item(CLASS_TYPE);
2928	<
2929	<	aclass = map_to_conf(class_default);
2930	<	aclass->active = 1;
2931	<	DupString(class_default->name, "default");
2932	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2933	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2934	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2935	<	MaxSendq(aclass) = DEFAULT_SENDQ;
2936	<
2937	<	client_check_cb = register_callback("check_client", check_client);
2938	<	}
2939	<
2940	<	/* get_sendq()
2941	<	*
2942	<	* inputs       - pointer to client
2943	<	* output       - sendq for this client as found from its class
2944	<	* side effects - NONE
2945	<	*/
2946	<	unsigned long
2947	<	get_sendq(struct Client *client_p)
2948	<	{
2949	<	unsigned long sendq = DEFAULT_SENDQ;
2950	<	dlink_node *ptr;
2951	<	struct ConfItem *conf;
2952	<	struct ConfItem *class_conf;
2953	<	struct ClassItem *aclass;
2954	<	struct AccessItem *aconf;
2955	<
2956	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
2957	<	{
2958	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2959	<	{
2960	<	conf = ptr->data;
2961	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2962	<	|| (conf->type == CLIENT_TYPE))
2963	<	{
2964	<	aconf = (struct AccessItem *)map_to_conf(conf);
2965	<	if ((class_conf = aconf->class_ptr) == NULL)
2966	<	continue;
2967	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2968	<	sendq = MaxSendq(aclass);
2969	<	return sendq;
2970	<	}
2971	<	}
2972	<	}
2973	<	/* XXX return a default?
2974	<	* if here, then there wasn't an attached conf with a sendq
2975	<	* that is very bad -Dianora
2976	<	*/
2977	<	return DEFAULT_SENDQ;
1604	>	MyFree(ConfigFileEntry.service_name);
1605	>	ConfigFileEntry.service_name = NULL;
1606		}
1607
1608		/* conf_add_class_to_conf()
1609		*
1610		* inputs       - pointer to config item
1611		* output       - NONE
1612	<	* side effects - Add a class pointer to a conf
1612	>	* side effects - Add a class pointer to a conf
1613		*/
1614		void
1615	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1615	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1616		{
1617	<	struct AccessItem *aconf = map_to_conf(conf);
2990	<	struct ClassItem *class = NULL;
2991	<
2992	<	if (class_name == NULL)
1617	>	if (class_name == NULL)
1618		{
1619	<	aconf->class_ptr = class_default;
1619	>	conf->class = class_default;
1620
1621	<	if (conf->type == CLIENT_TYPE)
1622	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1623	<	"Warning *** Defaulting to default class for %s@%s",
1624	<	aconf->user, aconf->host);
1621	>	if (conf->type == CONF_CLIENT)
1622	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1623	>	"Warning *** Defaulting to default class for %s@%s",
1624	>	conf->user, conf->host);
1625		else
1626	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1627	<	"Warning *** Defaulting to default class for %s",
1628	<	conf->name);
1626	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1627	>	"Warning *** Defaulting to default class for %s",
1628	>	conf->name);
1629		}
1630		else
1631	<	aconf->class_ptr = find_class(class_name);
3007	<
3008	<	if (aconf->class_ptr)
3009	<	class = map_to_conf(aconf->class_ptr);
1631	>	conf->class = class_find(class_name, 1);
1632
1633	<	if (aconf->class_ptr == NULL || !class->active)
1633	>	if (conf->class == NULL)
1634		{
1635	<	if (conf->type == CLIENT_TYPE)
1636	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1637	<	"Warning *** Defaulting to default class for %s@%s",
1638	<	aconf->user, aconf->host);
1635	>	if (conf->type == CONF_CLIENT)
1636	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1637	>	"Warning *** Defaulting to default class for %s@%s",
1638	>	conf->user, conf->host);
1639		else
1640	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1641	<	"Warning *** Defaulting to default class for %s",
1642	<	conf->name);
1643	<	aconf->class_ptr = class_default;
3022	<	}
3023	<	}
3024	<
3025	<	/* conf_add_server()
3026	<	*
3027	<	* inputs       - pointer to config item
3028	<	*              - pointer to link count already on this conf
3029	<	* output       - NONE
3030	<	* side effects - Add a connect block
3031	<	*/
3032	<	int
3033	<	conf_add_server(struct ConfItem *conf, const char *class_name)
3034	<	{
3035	<	struct AccessItem *aconf;
3036	<	struct split_nuh_item nuh;
3037	<	char conf_user[USERLEN + 1];
3038	<	char conf_host[HOSTLEN + 1];
3039	<
3040	<	aconf = map_to_conf(conf);
3041	<
3042	<	conf_add_class_to_conf(conf, class_name);
3043	<
3044	<	if (!aconf->host || !conf->name)
3045	<	{
3046	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3047	<	ilog(L_WARN, "Bad connect block");
3048	<	return -1;
3049	<	}
3050	<
3051	<	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
3052	<	{
3053	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3054	<	conf->name);
3055	<	ilog(L_WARN, "Bad connect block, host %s", conf->name);
3056	<	return -1;
3057	<	}
3058	<
3059	<	nuh.nuhmask  = aconf->host;
3060	<	nuh.nickptr  = NULL;
3061	<	nuh.userptr  = conf_user;
3062	<	nuh.hostptr  = conf_host;
3063	<
3064	<	nuh.nicksize = 0;
3065	<	nuh.usersize = sizeof(conf_user);
3066	<	nuh.hostsize = sizeof(conf_host);
3067	<
3068	<	split_nuh(&nuh);
3069	<
3070	<	MyFree(aconf->host);
3071	<	aconf->host = NULL;
3072	<
3073	<	DupString(aconf->user, conf_user); /* somehow username checking for servers
3074	<	got lost in H6/7, will have to be re-added */
3075	<	DupString(aconf->host, conf_host);
3076	<
3077	<	lookup_confhost(conf);
3078	<
3079	<	return 0;
3080	<	}
3081	<
3082	<	/* conf_add_d_conf()
3083	<	*
3084	<	* inputs       - pointer to config item
3085	<	* output       - NONE
3086	<	* side effects - Add a d/D line
3087	<	*/
3088	<	void
3089	<	conf_add_d_conf(struct AccessItem *aconf)
3090	<	{
3091	<	if (aconf->host == NULL)
3092	<	return;
3093	<
3094	<	aconf->user = NULL;
3095	<
3096	<	/* XXX - Should 'd' ever be in the old conf? For new conf we don't
3097	<	*       need this anyway, so I will disable it for now... -A1kmm
3098	<	*/
3099	<	if (parse_netmask(aconf->host, NULL, NULL) == HM_HOST)
3100	<	{
3101	<	ilog(L_WARN, "Invalid Dline %s ignored", aconf->host);
3102	<	free_access_item(aconf);
3103	<	}
3104	<	else
3105	<	{
3106	<	/* XXX ensure user is NULL */
3107	<	MyFree(aconf->user);
3108	<	aconf->user = NULL;
3109	<	add_conf_by_address(CONF_DLINE, aconf);
1640	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1641	>	"Warning *** Defaulting to default class for %s",
1642	>	conf->name);
1643	>	conf->class = class_default;
1644		}
1645		}
1646
#	Line 3121 | Line 1655 | yyerror(const char *msg)
1655		{
1656		char newlinebuf[IRCD_BUFSIZE];
1657
1658	<	if (ypass != 1)
1658	>	if (conf_parser_ctx.pass != 1)
1659		return;
1660
1661		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1662	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1662	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1663	>	"\"%s\", line %u: %s: %s",
1664		conffilebuf, lineno + 1, msg, newlinebuf);
1665	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1665	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1666		conffilebuf, lineno + 1, msg, newlinebuf);
1667		}
1668
1669	<	int
1670	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1669	>	void
1670	>	conf_error_report(const char *msg)
1671		{
1672	<	if (fbgets(lbuf, max_size, fb) == NULL)
3138	<	return 0;
3139	<
3140	<	return strlen(lbuf);
3141	<	}
1672	>	char newlinebuf[IRCD_BUFSIZE];
1673
1674	<	int
1675	<	conf_yy_fatal_error(const char *msg)
1676	<	{
1677	<	return 0;
1674	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1675	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1676	>	"\"%s\", line %u: %s: %s",
1677	>	conffilebuf, lineno + 1, msg, newlinebuf);
1678	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1679	>	conffilebuf, lineno + 1, msg, newlinebuf);
1680		}
1681
1682		/*
1683		* valid_tkline()
1684	<	*
1684	>	*
1685		* inputs       - pointer to ascii string to check
1686		*              - whether the specified time is in seconds or minutes
1687		* output       - -1 not enough parameters
#	Line 3157 | Line 1690 | conf_yy_fatal_error(const char *msg)
1690		* Originally written by Dianora (Diane, db@db.net)
1691		*/
1692		time_t
1693	<	valid_tkline(char *p, int minutes)
1693	>	valid_tkline(const char *data, const int minutes)
1694		{
1695	+	const unsigned char *p = (const unsigned char *)data;
1696	+	unsigned char tmpch = '\0';
1697		time_t result = 0;
1698
1699	<	while (*p)
1699	>	while ((tmpch = *p++))
1700		{
1701	<	if (IsDigit(*p))
3167	<	{
3168	<	result *= 10;
3169	<	result += ((*p) & 0xF);
3170	<	p++;
3171	<	}
3172	<	else
1701	>	if (!IsDigit(tmpch))
1702		return 0;
1703	+
1704	+	result *= 10;
1705	+	result += (tmpch & 0xF);
1706		}
1707
1708	<	/* in the degenerate case where oper does a /quote kline 0 user@host :reason
1708	>	/*
1709	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1710		* i.e. they specifically use 0, I am going to return 1 instead
1711		* as a return value of non-zero is used to flag it as a temporary kline
1712		*/
3180	–
1713		if (result == 0)
1714		result = 1;
1715
1716	<	/*
1716	>	/*
1717		* If the incoming time is in seconds convert it to minutes for the purpose
1718		* of this calculation
1719		*/
1720		if (!minutes)
1721	<	result = result / (time_t)60;
1721	>	result = result / 60;
1722
1723		if (result > MAX_TDKLINE_TIME)
1724		result = MAX_TDKLINE_TIME;
1725
1726	<	result = result * (time_t)60;  /* turn it into seconds */
1726	>	result = result * 60;  /* turn it into seconds */
1727
1728		return result;
1729		}
1730
1731	+	/* valid_wild_card_simple()
1732	+	*
1733	+	* inputs       - data to check for sufficient non-wildcard characters
1734	+	* outputs      - 1 if valid, else 0
1735	+	* side effects - none
1736	+	*/
1737	+	int
1738	+	valid_wild_card_simple(const char *data)
1739	+	{
1740	+	const unsigned char *p = (const unsigned char *)data;
1741	+	unsigned char tmpch = '\0';
1742	+	int nonwild = 0;
1743	+
1744	+	while ((tmpch = *p++))
1745	+	{
1746	+	if (tmpch == '\\')
1747	+	{
1748	+	++p;
1749	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1750	+	return 1;
1751	+	}
1752	+	else if (!IsMWildChar(tmpch))
1753	+	{
1754	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1755	+	return 1;
1756	+	}
1757	+	}
1758	+
1759	+	return 0;
1760	+	}
1761	+
1762		/* valid_wild_card()
1763		*
1764		* input        - pointer to client
#	Line 3207 | Line 1770 | valid_tkline(char *p, int minutes)
1770		int
1771		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1772		{
3210	–	char *p;
1773		char tmpch;
1774		int nonwild = 0;
1775		va_list args;
#	Line 3228 | Line 1790 | valid_wild_card(struct Client *source_p,
1790
1791		while (count--)
1792		{
1793	<	p = va_arg(args, char *);
1793	>	const char *p = va_arg(args, const char *);
1794		if (p == NULL)
1795		continue;
1796
#	Line 3241 | Line 1803 | valid_wild_card(struct Client *source_p,
1803		* break - no point in searching further.
1804		*/
1805		if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1806	+	{
1807	+	va_end(args);
1808		return 1;
1809	+	}
1810		}
1811		}
1812		}
1813
1814		if (warn)
1815	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1816	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1815	>	sendto_one_notice(source_p, &me,
1816	>	":Please include at least %d non-wildcard characters with the mask",
1817	>	ConfigFileEntry.min_nonwildcard);
1818	>	va_end(args);
1819		return 0;
1820		}
1821
#	Line 3262 | Line 1829 | valid_wild_card(struct Client *source_p,
1829		*              - parse_flags bit map of things to test
1830		*              - pointer to user or string to parse into
1831		*              - pointer to host or NULL to parse into if non NULL
1832	<	*              - pointer to optional tkline time or NULL
1832	>	*              - pointer to optional tkline time or NULL
1833		*              - pointer to target_server to parse into if non NULL
1834		*              - pointer to reason to parse into
1835		*
#	Line 3284 | Line 1851 | valid_wild_card(struct Client *source_p,
1851		*/
1852		int
1853		parse_aline(const char *cmd, struct Client *source_p,
1854	<	int parc, char **parv,
1855	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1856	<	char **target_server, char **reason)
1854	>	int parc, char **parv,
1855	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1856	>	char **target_server, char **reason)
1857		{
1858		int found_tkline_time=0;
1859		static char def_reason[] = "No Reason";
#	Line 3307 | Line 1874 | parse_aline(const char *cmd, struct Clie
1874		*tkline_time = found_tkline_time;
1875		else
1876		{
1877	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3311	<	me.name, source_p->name, cmd);
1877	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1878		return -1;
1879		}
1880		}
1881
1882		if (parc == 0)
1883		{
1884	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3319	<	me.name, source_p->name, cmd);
1884	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1885		return -1;
1886		}
1887
#	Line 3330 | Line 1895 | parse_aline(const char *cmd, struct Clie
1895		*up_p = user;
1896		*h_p = host;
1897		}
1898	<
1898	>
1899		parc--;
1900		parv++;
1901
#	Line 3343 | Line 1908 | parse_aline(const char *cmd, struct Clie
1908
1909		if (target_server == NULL)
1910		{
1911	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1912	<	me.name, source_p->name, cmd);
3348	<	return -1;
1911	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1912	>	return -1;
1913		}
1914
1915	<	if (!IsOperRemoteBan(source_p))
1915	>	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1916		{
1917	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3354	<	me.name, source_p->name, "remoteban");
1917	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1918		return -1;
1919		}
1920
1921		if (parc == 0 || EmptyString(*parv))
1922		{
1923	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1924	<	me.name, source_p->name, cmd);
3362	<	return -1;
1923	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1924	>	return -1;
1925		}
1926
1927		*target_server = *parv;
#	Line 3372 | Line 1934 | parse_aline(const char *cmd, struct Clie
1934		* caller probably NULL'd it first, but no harm to do it again -db
1935		*/
1936		if (target_server != NULL)
1937	<	*target_server = NULL;
1937	>	*target_server = NULL;
1938		}
1939		}
1940
#	Line 3380 | Line 1942 | parse_aline(const char *cmd, struct Clie
1942		{
1943		if (strchr(user, '!') != NULL)
1944		{
1945	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3384	<	me.name, source_p->name);
1945	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1946		return -1;
1947		}
1948
1949	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 2, *up_p, *h_p))
1949	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1950		return -1;
1951		}
1952		else
1953	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 1, *up_p))
1953	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1954		return -1;
1955
1956		if (reason != NULL)
#	Line 3397 | Line 1958 | parse_aline(const char *cmd, struct Clie
1958		if (parc != 0 && !EmptyString(*parv))
1959		{
1960		*reason = *parv;
1961	<	if (!valid_comment(source_p, *reason, YES))
1962	<	return -1;
1961	>	if (!valid_comment(source_p, *reason, 1))
1962	>	return -1;
1963		}
1964		else
1965		*reason = def_reason;
#	Line 3437 | Line 1998 | find_user_host(struct Client *source_p,
1998		{
1999		*(hostp++) = '\0';                       /* short and squat */
2000		if (*user_host_or_nick)
2001	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2001	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2002		else
2003	<	strcpy(luser, "*");
2003	>	strcpy(luser, "*");
2004	>
2005		if (*hostp)
2006	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2006	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2007		else
2008	<	strcpy(lhost, "*");
2008	>	strcpy(lhost, "*");
2009		}
2010		else
2011		{
2012		luser[0] = '*';             /* no @ found, assume its *@somehost */
2013	<	luser[1] = '\0';
2013	>	luser[1] = '\0';
2014		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2015		}
2016	<
2016	>
2017		return 1;
2018		}
2019	<	else if (!(flags & NOUSERLOOKUP))
2019	>	else
2020		{
2021		/* Try to find user@host mask from nick */
2022		/* Okay to use source_p as the first param, because source_p == client_p */
2023	<	if ((target_p =
2024	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2023	>	if ((target_p =
2024	>	find_chasing(source_p, user_host_or_nick)) == NULL)
2025		return 0;
2026
2027		if (IsExemptKline(target_p))
2028		{
2029		if (!IsServer(source_p))
2030	<	sendto_one(source_p,
3469	<	":%s NOTICE %s :%s is E-lined",
3470	<	me.name, source_p->name, target_p->name);
2030	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2031		return 0;
2032		}
2033
#	Line 3502 | Line 2062 | find_user_host(struct Client *source_p,
2062		int
2063		valid_comment(struct Client *source_p, char *comment, int warn)
2064		{
3505	–	if (strchr(comment, '"'))
3506	–	{
3507	–	if (warn)
3508	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3509	–	me.name, source_p->name);
3510	–	return 0;
3511	–	}
3512	–
2065		if (strlen(comment) > REASONLEN)
2066		comment[REASONLEN-1] = '\0';
2067
#	Line 3524 | Line 2076 | valid_comment(struct Client *source_p, c
2076		* side effects - none
2077		*/
2078		int
2079	<	match_conf_password(const char *password, const struct AccessItem *aconf)
2079	>	match_conf_password(const char *password, const struct MaskItem *conf)
2080		{
2081		const char *encr = NULL;
2082
2083	<	if (password == NULL || aconf->passwd == NULL)
2083	>	if (EmptyString(password) || EmptyString(conf->passwd))
2084		return 0;
2085
2086	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
2087	<	{
3536	<	/* use first two chars of the password they send in as salt */
3537	<	/* If the password in the conf is MD5, and ircd is linked
3538	<	* to scrypt on FreeBSD, or the standard crypt library on
3539	<	* glibc Linux, then this code will work fine on generating
3540	<	* the proper encrypted hash for comparison.
3541	<	*/
3542	<	if (*aconf->passwd)
3543	<	encr = crypt(password, aconf->passwd);
3544	<	else
3545	<	encr = "";
3546	<	}
2086	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
2087	>	encr = crypt(password, conf->passwd);
2088		else
2089		encr = password;
2090
2091	<	return !strcmp(encr, aconf->passwd);
2091	>	return !strcmp(encr, conf->passwd);
2092		}
2093
2094		/*
#	Line 3556 | Line 2097 | match_conf_password(const char *password
2097		* inputs       - client sending the cluster
2098		*              - command name "KLINE" "XLINE" etc.
2099		*              - capab -- CAP_KLN etc. from s_serv.h
2100	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
2100	>	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2101		*              - pattern and args to send along
2102		* output       - none
2103		* side effects - Take source_p send the pattern with args given
#	Line 3576 | Line 2117 | cluster_a_line(struct Client *source_p,
2117
2118		DLINK_FOREACH(ptr, cluster_items.head)
2119		{
2120	<	const struct ConfItem *conf = ptr->data;
2120	>	const struct MaskItem *conf = ptr->data;
2121
2122		if (conf->flags & cluster_type)
2123		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2124	<	"%s %s %s", command, conf->name, buffer);
2124	>	"%s %s %s", command, conf->name, buffer);
2125		}
2126		}
2127
#	Line 3631 | Line 2172 | split_nuh(struct split_nuh_item *const i
2172		if (iptr->nickptr && *iptr->nuhmask != '\0')
2173		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
2174
2175	<	if ((q = strchr(++p, '@'))) {
2175	>	if ((q = strchr(++p, '@')))
2176	>	{
2177		*q++ = '\0';
2178
2179		if (*p != '\0')
#	Line 3670 | Line 2212 | split_nuh(struct split_nuh_item *const i
2212		}
2213		}
2214		}
3673	–
3674	–	/*
3675	–	* flags_to_ascii
3676	–	*
3677	–	* inputs       - flags is a bitmask
3678	–	*              - pointer to table of ascii letters corresponding
3679	–	*                to each bit
3680	–	*              - flag 1 for convert ToLower if bit missing
3681	–	*                0 if ignore.
3682	–	* output       - none
3683	–	* side effects - string pointed to by p has bitmap chars written to it
3684	–	*/
3685	–	static void
3686	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3687	–	int lowerit)
3688	–	{
3689	–	unsigned int mask = 1;
3690	–	int i = 0;
3691	–
3692	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3693	–	{
3694	–	if (flags & mask)
3695	–	*p++ = bit_table[i];
3696	–	else if (lowerit)
3697	–	*p++ = ToLower(bit_table[i]);
3698	–	}
3699	–	*p = '\0';
3700	–	}
3701	–
3702	–	/*
3703	–	* cidr_limit_reached
3704	–	*
3705	–	* inputs       - int flag allowing over_rule of limits
3706	–	*              - pointer to the ip to be added
3707	–	*              - pointer to the class
3708	–	* output       - non zero if limit reached
3709	–	*                0 if limit not reached
3710	–	* side effects -
3711	–	*/
3712	–	static int
3713	–	cidr_limit_reached(int over_rule,
3714	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3715	–	{
3716	–	dlink_node *ptr = NULL;
3717	–	struct CidrItem *cidr;
3718	–
3719	–	if (NumberPerCidr(aclass) <= 0)
3720	–	return 0;
3721	–
3722	–	if (ip->ss.ss_family == AF_INET)
3723	–	{
3724	–	if (CidrBitlenIPV4(aclass) <= 0)
3725	–	return 0;
3726	–
3727	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3728	–	{
3729	–	cidr = ptr->data;
3730	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3731	–	{
3732	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3733	–	return -1;
3734	–	cidr->number_on_this_cidr++;
3735	–	return 0;
3736	–	}
3737	–	}
3738	–	cidr = MyMalloc(sizeof(struct CidrItem));
3739	–	cidr->number_on_this_cidr = 1;
3740	–	cidr->mask = *ip;
3741	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3742	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3743	–	}
3744	–	#ifdef IPV6
3745	–	else if (CidrBitlenIPV6(aclass) > 0)
3746	–	{
3747	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3748	–	{
3749	–	cidr = ptr->data;
3750	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3751	–	{
3752	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3753	–	return -1;
3754	–	cidr->number_on_this_cidr++;
3755	–	return 0;
3756	–	}
3757	–	}
3758	–	cidr = MyMalloc(sizeof(struct CidrItem));
3759	–	cidr->number_on_this_cidr = 1;
3760	–	cidr->mask = *ip;
3761	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3762	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3763	–	}
3764	–	#endif
3765	–	return 0;
3766	–	}
3767	–
3768	–	/*
3769	–	* remove_from_cidr_check
3770	–	*
3771	–	* inputs       - pointer to the ip to be removed
3772	–	*              - pointer to the class
3773	–	* output       - NONE
3774	–	* side effects -
3775	–	*/
3776	–	static void
3777	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3778	–	{
3779	–	dlink_node *ptr = NULL;
3780	–	dlink_node *next_ptr = NULL;
3781	–	struct CidrItem *cidr;
3782	–
3783	–	if (NumberPerCidr(aclass) == 0)
3784	–	return;
3785	–
3786	–	if (ip->ss.ss_family == AF_INET)
3787	–	{
3788	–	if (CidrBitlenIPV4(aclass) <= 0)
3789	–	return;
3790	–
3791	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3792	–	{
3793	–	cidr = ptr->data;
3794	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3795	–	{
3796	–	cidr->number_on_this_cidr--;
3797	–	if (cidr->number_on_this_cidr == 0)
3798	–	{
3799	–	dlinkDelete(ptr, &aclass->list_ipv4);
3800	–	MyFree(cidr);
3801	–	return;
3802	–	}
3803	–	}
3804	–	}
3805	–	}
3806	–	#ifdef IPV6
3807	–	else if (CidrBitlenIPV6(aclass) > 0)
3808	–	{
3809	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3810	–	{
3811	–	cidr = ptr->data;
3812	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3813	–	{
3814	–	cidr->number_on_this_cidr--;
3815	–	if (cidr->number_on_this_cidr == 0)
3816	–	{
3817	–	dlinkDelete(ptr, &aclass->list_ipv6);
3818	–	MyFree(cidr);
3819	–	return;
3820	–	}
3821	–	}
3822	–	}
3823	–	}
3824	–	#endif
3825	–	}
3826	–
3827	–	static void
3828	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3829	–	dlink_list *old_list, dlink_list *new_list, int changed)
3830	–	{
3831	–	dlink_node *ptr;
3832	–	struct Client *client_p;
3833	–	struct ConfItem *conf;
3834	–	struct AccessItem *aconf;
3835	–
3836	–	if (!changed)
3837	–	{
3838	–	*new_list = *old_list;
3839	–	old_list->head = old_list->tail = NULL;
3840	–	old_list->length = 0;
3841	–	return;
3842	–	}
3843	–
3844	–	DLINK_FOREACH(ptr, local_client_list.head)
3845	–	{
3846	–	client_p = ptr->data;
3847	–	if (client_p->localClient->aftype != aftype)
3848	–	continue;
3849	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3850	–	continue;
3851	–
3852	–	conf = client_p->localClient->confs.tail->data;
3853	–	if (conf->type == CLIENT_TYPE)
3854	–	{
3855	–	aconf = map_to_conf(conf);
3856	–	if (aconf->class_ptr == oldcl)
3857	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3858	–	}
3859	–	}
3860	–	}
3861	–
3862	–	/*
3863	–	* rebuild_cidr_class
3864	–	*
3865	–	* inputs       - pointer to old conf
3866	–	*              - pointer to new_class
3867	–	* output       - none
3868	–	* side effects - rebuilds the class link list of cidr blocks
3869	–	*/
3870	–	void
3871	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3872	–	{
3873	–	struct ClassItem *old_class = map_to_conf(conf);
3874	–
3875	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3876	–	{
3877	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3878	–	rebuild_cidr_list(AF_INET, conf, new_class,
3879	–	&old_class->list_ipv4, &new_class->list_ipv4,
3880	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3881	–
3882	–	#ifdef IPV6
3883	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3884	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3885	–	&old_class->list_ipv6, &new_class->list_ipv6,
3886	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3887	–	#endif
3888	–	}
3889	–
3890	–	destroy_cidr_class(old_class);
3891	–	}
3892	–
3893	–	/*
3894	–	* destroy_cidr_list
3895	–	*
3896	–	* inputs       - pointer to class dlink list of cidr blocks
3897	–	* output       - none
3898	–	* side effects - completely destroys the class link list of cidr blocks
3899	–	*/
3900	–	static void
3901	–	destroy_cidr_list(dlink_list *list)
3902	–	{
3903	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3904	–
3905	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3906	–	{
3907	–	dlinkDelete(ptr, list);
3908	–	MyFree(ptr->data);
3909	–	}
3910	–	}
3911	–
3912	–	/*
3913	–	* destroy_cidr_class
3914	–	*
3915	–	* inputs       - pointer to class
3916	–	* output       - none
3917	–	* side effects - completely destroys the class link list of cidr blocks
3918	–	*/
3919	–	static void
3920	–	destroy_cidr_class(struct ClassItem *aclass)
3921	–	{
3922	–	destroy_cidr_list(&aclass->list_ipv4);
3923	–	destroy_cidr_list(&aclass->list_ipv6);
3924	–	}

Diff Legend

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