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

Diff Legend

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