ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf.c (file contents), Revision 1536 by michael, Tue Sep 25 19:15:50 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 5039 by michael, Sat Dec 13 16:08:37 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
35	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 43 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
46	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58
55	–	struct Callback *client_check_cb = NULL;
56	–	struct config_server_hide ConfigServerHide;
59
60		/* general conf items link list root, other than k lines etc. */
61	<	dlink_list service_items = { NULL, NULL, 0 };
62	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list oconf_items   = { NULL, NULL, 0 };
65	<	dlink_list uconf_items   = { NULL, NULL, 0 };
66	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
68	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list class_items   = { NULL, NULL, 0 };
69	<
70	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
71	<	dlink_list temporary_resv = { NULL, NULL, 0 };
61	>	dlink_list service_items;
62	>	dlink_list server_items;
63	>	dlink_list cluster_items;
64	>	dlink_list oconf_items;
65	>	dlink_list uconf_items;
66	>	dlink_list xconf_items;
67	>	dlink_list nresv_items;
68	>	dlink_list cresv_items;
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
73		extern int yyparse(); /* defined in y.tab.c */
74
78	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
79	–
80	–	/* internally defined functions */
81	–	static void read_conf(FILE *);
82	–	static void clear_out_old_conf(void);
83	–	static void flush_deleted_I_P(void);
84	–	static void expire_tklines(dlink_list *);
85	–	static void garbage_collect_ip_entries(void);
86	–	static int hash_ip(struct irc_ssaddr *);
87	–	static int verify_access(struct Client *, const char *);
88	–	static int attach_iline(struct Client *, struct ConfItem *);
89	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
90	–	static void parse_conf_file(int, int);
91	–	static dlink_list *map_to_list(ConfType);
92	–	static struct AccessItem *find_regexp_kline(const char *[]);
93	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
94	–
95	–	/*
96	–	* bit_len
97	–	*/
98	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
99	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
100	–	static void destroy_cidr_class(struct ClassItem *);
101	–
102	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
103	–
104	–	/* address of default class conf */
105	–	static struct ConfItem *class_default;
106	–
107	–	/* usually, with hash tables, you use a prime number...
108	–	* but in this case I am dealing with ip addresses,
109	–	* not ascii strings.
110	–	*/
111	–	#define IP_HASH_SIZE 0x1000
112	–
113	–	struct ip_entry
114	–	{
115	–	struct irc_ssaddr ip;
116	–	int count;
117	–	time_t last_attempt;
118	–	struct ip_entry *next;
119	–	};
120	–
121	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
122	–	static BlockHeap *ip_entry_heap = NULL;
123	–	static int ip_entries_count = 0;
124	–
125	–
126	–	void *
127	–	map_to_conf(struct ConfItem *aconf)
128	–	{
129	–	void *conf;
130	–	conf = (void *)((uintptr_t)aconf +
131	–	(uintptr_t)sizeof(struct ConfItem));
132	–	return(conf);
133	–	}
134	–
135	–	struct ConfItem *
136	–	unmap_conf_item(void *aconf)
137	–	{
138	–	struct ConfItem *conf;
139	–
140	–	conf = (struct ConfItem *)((uintptr_t)aconf -
141	–	(uintptr_t)sizeof(struct ConfItem));
142	–	return(conf);
143	–	}
75
76		/* conf_dns_callback()
77		*
78	<	* inputs       - pointer to struct AccessItem
78	>	* inputs       - pointer to struct MaskItem
79		*              - pointer to DNSReply reply
80		* output       - none
81		* side effects - called when resolver query finishes
#	Line 153 | Line 84 | unmap_conf_item(void *aconf)
84		* if successful save hp in the conf item it was called with
85		*/
86		static void
87	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
87	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
88		{
89	<	struct AccessItem *aconf = vptr;
89	>	struct MaskItem *const conf = vptr;
90
91	<	aconf->dns_pending = 0;
91	>	conf->dns_pending = 0;
92
93	<	if (addr != NULL)
94	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
93	>	if (addr)
94	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
95		else
96	<	aconf->dns_failed = 1;
96	>	conf->dns_failed = 1;
97		}
98
99		/* conf_dns_lookup()
#	Line 172 | Line 103 | conf_dns_callback(void *vptr, const stru
103		* allocate a dns_query and start ns lookup.
104		*/
105		static void
106	<	conf_dns_lookup(struct AccessItem *aconf)
106	>	conf_dns_lookup(struct MaskItem *conf)
107		{
108	<	if (!aconf->dns_pending)
109	<	{
110	<	aconf->dns_pending = 1;
111	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
112	<	}
108	>	if (conf->dns_pending)
109	>	return;
110	>
111	>	conf->dns_pending = 1;
112	>
113	>	if (conf->aftype == AF_INET)
114	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
115	>	else
116	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
117		}
118
119	<	/* make_conf_item()
119	>	/* map_to_list()
120		*
121	<	* inputs       - type of item
122	<	* output       - pointer to new conf entry
123	<	* side effects - none
121	>	* inputs       - ConfType conf
122	>	* output       - pointer to dlink_list to use
123	>	* side effects - none
124		*/
125	<	struct ConfItem *
126	<	make_conf_item(ConfType type)
125	>	static dlink_list *
126	>	map_to_list(enum maskitem_type type)
127		{
193	–	struct ConfItem *conf = NULL;
194	–	struct AccessItem *aconf = NULL;
195	–	struct ClassItem *aclass = NULL;
196	–	int status = 0;
197	–
128		switch (type)
129		{
130	<	case DLINE_TYPE:
131	<	case EXEMPTDLINE_TYPE:
202	<	case GLINE_TYPE:
203	<	case KLINE_TYPE:
204	<	case CLIENT_TYPE:
205	<	case OPER_TYPE:
206	<	case SERVER_TYPE:
207	<	conf = MyMalloc(sizeof(struct ConfItem) +
208	<	sizeof(struct AccessItem));
209	<	aconf = map_to_conf(conf);
210	<	aconf->aftype = AF_INET;
211	<
212	<	/* Yes, sigh. switch on type again */
213	<	switch (type)
214	<	{
215	<	case EXEMPTDLINE_TYPE:
216	<	status = CONF_EXEMPTDLINE;
130	>	case CONF_XLINE:
131	>	return &xconf_items;
132		break;
133	<
134	<	case DLINE_TYPE:
220	<	status = CONF_DLINE;
133	>	case CONF_ULINE:
134	>	return &uconf_items;
135		break;
136	<
137	<	case KLINE_TYPE:
224	<	status = CONF_KLINE;
136	>	case CONF_NRESV:
137	>	return &nresv_items;
138		break;
139	<
140	<	case GLINE_TYPE:
228	<	status = CONF_GLINE;
139	>	case CONF_CRESV:
140	>	return &cresv_items;
141		break;
142	<
143	<	case CLIENT_TYPE:
232	<	status = CONF_CLIENT;
142	>	case CONF_OPER:
143	>	return &oconf_items;
144		break;
145	<
146	<	case OPER_TYPE:
236	<	status = CONF_OPERATOR;
237	<	dlinkAdd(conf, &conf->node, &oconf_items);
145	>	case CONF_SERVER:
146	>	return &server_items;
147		break;
148	<
149	<	case SERVER_TYPE:
241	<	status = CONF_SERVER;
242	<	dlinkAdd(conf, &conf->node, &server_items);
148	>	case CONF_SERVICE:
149	>	return &service_items;
150		break;
151	<
152	<	default:
151	>	case CONF_CLUSTER:
152	>	return &cluster_items;
153		break;
247	–	}
248	–	aconf->status = status;
249	–	break;
250	–
251	–	case ULINE_TYPE:
252	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
253	–	sizeof(struct MatchItem));
254	–	dlinkAdd(conf, &conf->node, &uconf_items);
255	–	break;
256	–
257	–	case XLINE_TYPE:
258	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
259	–	sizeof(struct MatchItem));
260	–	dlinkAdd(conf, &conf->node, &xconf_items);
261	–	break;
262	–	#ifdef HAVE_LIBPCRE
263	–	case RXLINE_TYPE:
264	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
265	–	sizeof(struct MatchItem));
266	–	dlinkAdd(conf, &conf->node, &rxconf_items);
267	–	break;
268	–
269	–	case RKLINE_TYPE:
270	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
271	–	sizeof(struct AccessItem));
272	–	aconf = map_to_conf(conf);
273	–	aconf->status = CONF_KLINE;
274	–	dlinkAdd(conf, &conf->node, &rkconf_items);
275	–	break;
276	–	#endif
277	–	case CLUSTER_TYPE:
278	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
279	–	dlinkAdd(conf, &conf->node, &cluster_items);
280	–	break;
281	–
282	–	case CRESV_TYPE:
283	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
284	–	sizeof(struct ResvChannel));
285	–	break;
286	–
287	–	case NRESV_TYPE:
288	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
289	–	sizeof(struct MatchItem));
290	–	dlinkAdd(conf, &conf->node, &nresv_items);
291	–	break;
292	–
293	–	case SERVICE_TYPE:
294	–	status = CONF_SERVICE;
295	–	conf = MyMalloc(sizeof(struct ConfItem));
296	–	dlinkAdd(conf, &conf->node, &service_items);
297	–	break;
298	–
299	–	case CLASS_TYPE:
300	–	conf = MyMalloc(sizeof(struct ConfItem) +
301	–	sizeof(struct ClassItem));
302	–	dlinkAdd(conf, &conf->node, &class_items);
303	–
304	–	aclass = map_to_conf(conf);
305	–	aclass->active = 1;
306	–	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
307	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
308	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
309	–	aclass->max_sendq = DEFAULT_SENDQ;
310	–	aclass->max_recvq = DEFAULT_RECVQ;
311	–
312	–	break;
313	–
314	–	default:
315	–	conf = NULL;
316	–	break;
317	–	}
318	–
319	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
320	–	conf->type = type;
321	–
322	–	return conf;
323	–	}
324	–
325	–	void
326	–	delete_conf_item(struct ConfItem *conf)
327	–	{
328	–	dlink_node *m = NULL, *m_next = NULL;
329	–	struct MatchItem *match_item;
330	–	struct AccessItem *aconf;
331	–	ConfType type = conf->type;
332	–
333	–	MyFree(conf->name);
334	–	conf->name = NULL;
335	–
336	–	switch(type)
337	–	{
338	–	case DLINE_TYPE:
339	–	case EXEMPTDLINE_TYPE:
340	–	case GLINE_TYPE:
341	–	case KLINE_TYPE:
342	–	case CLIENT_TYPE:
343	–	case OPER_TYPE:
344	–	case SERVER_TYPE:
345	–	aconf = map_to_conf(conf);
346	–
347	–	if (aconf->dns_pending)
348	–	delete_resolver_queries(aconf);
349	–	if (aconf->passwd != NULL)
350	–	memset(aconf->passwd, 0, strlen(aconf->passwd));
351	–	if (aconf->spasswd != NULL)
352	–	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
353	–	aconf->class_ptr = NULL;
354	–
355	–	MyFree(aconf->passwd);
356	–	MyFree(aconf->spasswd);
357	–	MyFree(aconf->reason);
358	–	MyFree(aconf->oper_reason);
359	–	MyFree(aconf->user);
360	–	MyFree(aconf->host);
361	–	#ifdef HAVE_LIBCRYPTO
362	–	MyFree(aconf->cipher_list);
363	–
364	–	if (aconf->rsa_public_key)
365	–	RSA_free(aconf->rsa_public_key);
366	–	MyFree(aconf->rsa_public_key_file);
367	–	#endif
368	–
369	–	/* Yes, sigh. switch on type again */
370	–	switch(type)
371	–	{
372	–	case EXEMPTDLINE_TYPE:
373	–	case DLINE_TYPE:
374	–	case GLINE_TYPE:
375	–	case KLINE_TYPE:
376	–	case CLIENT_TYPE:
377	–	MyFree(conf);
378	–	break;
379	–
380	–	case OPER_TYPE:
381	–	aconf = map_to_conf(conf);
382	–	if (!IsConfIllegal(aconf))
383	–	dlinkDelete(&conf->node, &oconf_items);
384	–	MyFree(conf);
385	–	break;
386	–
387	–	case SERVER_TYPE:
388	–	aconf = map_to_conf(conf);
389	–
390	–	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
391	–	{
392	–	MyFree(m->data);
393	–	free_dlink_node(m);
394	–	}
395	–
396	–	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
397	–	{
398	–	MyFree(m->data);
399	–	free_dlink_node(m);
400	–	}
401	–
402	–	if (!IsConfIllegal(aconf))
403	–	dlinkDelete(&conf->node, &server_items);
404	–	MyFree(conf);
405	–	break;
406	–
154		default:
155	<	break;
409	<	}
410	<	break;
411	<
412	<	case ULINE_TYPE:
413	<	match_item = map_to_conf(conf);
414	<	MyFree(match_item->user);
415	<	MyFree(match_item->host);
416	<	MyFree(match_item->reason);
417	<	MyFree(match_item->oper_reason);
418	<	dlinkDelete(&conf->node, &uconf_items);
419	<	MyFree(conf);
420	<	break;
421	<
422	<	case XLINE_TYPE:
423	<	match_item = map_to_conf(conf);
424	<	MyFree(match_item->user);
425	<	MyFree(match_item->host);
426	<	MyFree(match_item->reason);
427	<	MyFree(match_item->oper_reason);
428	<	dlinkDelete(&conf->node, &xconf_items);
429	<	MyFree(conf);
430	<	break;
431	<	#ifdef HAVE_LIBPCRE
432	<	case RKLINE_TYPE:
433	<	aconf = map_to_conf(conf);
434	<	MyFree(aconf->regexuser);
435	<	MyFree(aconf->regexhost);
436	<	MyFree(aconf->user);
437	<	MyFree(aconf->host);
438	<	MyFree(aconf->reason);
439	<	MyFree(aconf->oper_reason);
440	<	dlinkDelete(&conf->node, &rkconf_items);
441	<	MyFree(conf);
442	<	break;
443	<
444	<	case RXLINE_TYPE:
445	<	MyFree(conf->regexpname);
446	<	match_item = map_to_conf(conf);
447	<	MyFree(match_item->user);
448	<	MyFree(match_item->host);
449	<	MyFree(match_item->reason);
450	<	MyFree(match_item->oper_reason);
451	<	dlinkDelete(&conf->node, &rxconf_items);
452	<	MyFree(conf);
453	<	break;
454	<	#endif
455	<	case NRESV_TYPE:
456	<	match_item = map_to_conf(conf);
457	<	MyFree(match_item->user);
458	<	MyFree(match_item->host);
459	<	MyFree(match_item->reason);
460	<	MyFree(match_item->oper_reason);
461	<	dlinkDelete(&conf->node, &nresv_items);
462	<
463	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
464	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
465	<	free_dlink_node(m);
466	<
467	<	MyFree(conf);
468	<	break;
469	<
470	<	case CLUSTER_TYPE:
471	<	dlinkDelete(&conf->node, &cluster_items);
472	<	MyFree(conf);
473	<	break;
474	<
475	<	case CRESV_TYPE:
476	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
477	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
478	<	free_dlink_node(m);
479	<
480	<	MyFree(conf);
481	<	break;
482	<
483	<	case CLASS_TYPE:
484	<	dlinkDelete(&conf->node, &class_items);
485	<	MyFree(conf);
486	<	break;
487	<
488	<	case SERVICE_TYPE:
489	<	dlinkDelete(&conf->node, &service_items);
490	<	MyFree(conf);
491	<	break;
492	<
493	<	default:
494	<	break;
155	>	return NULL;
156		}
157		}
158
159	<	/* free_access_item()
160	<	*
500	<	* inputs       - pointer to conf to free
501	<	* output       - none
502	<	* side effects - crucial password fields are zeroed, conf is freed
503	<	*/
504	<	void
505	<	free_access_item(struct AccessItem *aconf)
159	>	struct MaskItem *
160	>	conf_make(enum maskitem_type type)
161		{
162	<	struct ConfItem *conf;
162	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
163	>	dlink_list *list = NULL;
164
165	<	if (aconf == NULL)
166	<	return;
167	<	conf = unmap_conf_item(aconf);
512	<	delete_conf_item(conf);
513	<	}
165	>	conf->type   = type;
166	>	conf->active = 1;
167	>	conf->aftype = AF_INET;
168
169	<	static const unsigned int shared_bit_table[] =
170	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
169	>	if ((list = map_to_list(type)))
170	>	dlinkAdd(conf, &conf->node, list);
171	>	return conf;
172	>	}
173
518	–	/* report_confitem_types()
519	–	*
520	–	* inputs       - pointer to client requesting confitem report
521	–	*              - ConfType to report
522	–	* output       - none
523	–	* side effects -
524	–	*/
174		void
175	<	report_confitem_types(struct Client *source_p, ConfType type)
175	>	conf_free(struct MaskItem *conf)
176		{
177	<	dlink_node *ptr = NULL, *dptr = NULL;
178	<	struct ConfItem *conf = NULL;
530	<	struct AccessItem *aconf = NULL;
531	<	struct MatchItem *matchitem = NULL;
532	<	struct ClassItem *classitem = NULL;
533	<	char buf[12];
534	<	char *p = NULL;
535	<
536	<	switch (type)
537	<	{
538	<	case XLINE_TYPE:
539	<	DLINK_FOREACH(ptr, xconf_items.head)
540	<	{
541	<	conf = ptr->data;
542	<	matchitem = map_to_conf(conf);
177	>	dlink_node *node = NULL, *node_next = NULL;
178	>	dlink_list *list = NULL;
179
180	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
181	<	me.name, source_p->name,
546	<	matchitem->hold ? "x": "X", matchitem->count,
547	<	conf->name, matchitem->reason);
548	<	}
549	<	break;
180	>	if ((list = map_to_list(conf->type)))
181	>	dlinkFindDelete(list, conf);
182
183	<	#ifdef HAVE_LIBPCRE
552	<	case RXLINE_TYPE:
553	<	DLINK_FOREACH(ptr, rxconf_items.head)
554	<	{
555	<	conf = ptr->data;
556	<	matchitem = map_to_conf(conf);
557	<
558	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
559	<	me.name, source_p->name,
560	<	"XR", matchitem->count,
561	<	conf->name, matchitem->reason);
562	<	}
563	<	break;
183	>	MyFree(conf->name);
184
185	<	case RKLINE_TYPE:
186	<	DLINK_FOREACH(ptr, rkconf_items.head)
187	<	{
188	<	aconf = map_to_conf((conf = ptr->data));
185	>	if (conf->dns_pending)
186	>	delete_resolver_queries(conf);
187	>	if (conf->passwd)
188	>	memset(conf->passwd, 0, strlen(conf->passwd));
189	>	if (conf->spasswd)
190	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
191	>
192	>	conf->class = NULL;
193	>
194	>	MyFree(conf->passwd);
195	>	MyFree(conf->spasswd);
196	>	MyFree(conf->reason);
197	>	MyFree(conf->certfp);
198	>	MyFree(conf->user);
199	>	MyFree(conf->host);
200	>	#ifdef HAVE_LIBCRYPTO
201	>	MyFree(conf->cipher_list);
202
203	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
204	<	source_p->name, "KR", aconf->host, aconf->user,
572	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
573	<	}
574	<	break;
203	>	if (conf->rsa_public_key)
204	>	RSA_free(conf->rsa_public_key);
205		#endif
206	<
577	<	case ULINE_TYPE:
578	<	DLINK_FOREACH(ptr, uconf_items.head)
579	<	{
580	<	conf = ptr->data;
581	<	matchitem = map_to_conf(conf);
582	<
583	<	p = buf;
584	<
585	<	/* some of these are redundant for the sake of
586	<	* consistency with cluster{} flags
587	<	*/
588	<	*p++ = 'c';
589	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
590	<
591	<	sendto_one(source_p, form_str(RPL_STATSULINE),
592	<	me.name, source_p->name, conf->name,
593	<	matchitem->user?matchitem->user: "*",
594	<	matchitem->host?matchitem->host: "*", buf);
595	<	}
596	<
597	<	DLINK_FOREACH(ptr, cluster_items.head)
598	<	{
599	<	conf = ptr->data;
600	<
601	<	p = buf;
602	<
603	<	*p++ = 'C';
604	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
605	<
606	<	sendto_one(source_p, form_str(RPL_STATSULINE),
607	<	me.name, source_p->name, conf->name,
608	<	"*", "*", buf);
609	<	}
610	<
611	<	break;
612	<
613	<	case OPER_TYPE:
614	<	DLINK_FOREACH(ptr, oconf_items.head)
615	<	{
616	<	conf = ptr->data;
617	<	aconf = map_to_conf(conf);
618	<
619	<	/* Don't allow non opers to see oper privs */
620	<	if (HasUMode(source_p, UMODE_OPER))
621	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
622	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
623	<	conf->name, oper_privs_as_string(aconf->port),
624	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
625	<	else
626	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
627	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
628	<	conf->name, "0",
629	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
630	<	}
631	<	break;
632	<
633	<	case CLASS_TYPE:
634	<	DLINK_FOREACH(ptr, class_items.head)
635	<	{
636	<	conf = ptr->data;
637	<	classitem = map_to_conf(conf);
638	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
639	<	me.name, source_p->name, 'Y',
640	<	conf->name, classitem->ping_freq,
641	<	classitem->con_freq,
642	<	classitem->max_total, classitem->max_sendq,
643	<	classitem->max_recvq,
644	<	classitem->curr_user_count,
645	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv4,
646	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv6,
647	<	classitem->active ? "active" : "disabled");
648	<	}
649	<	break;
650	<
651	<	case CONF_TYPE:
652	<	case CLIENT_TYPE:
653	<	break;
654	<
655	<	case SERVICE_TYPE:
656	<	DLINK_FOREACH(ptr, service_items.head)
657	<	{
658	<	conf = ptr->data;
659	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
660	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
661	<	}
662	<	break;
663	<
664	<	case SERVER_TYPE:
665	<	DLINK_FOREACH(ptr, server_items.head)
666	<	{
667	<	p = buf;
668	<
669	<	conf = ptr->data;
670	<	aconf = map_to_conf(conf);
671	<
672	<	buf[0] = '\0';
673	<
674	<	if (IsConfAllowAutoConn(aconf))
675	<	*p++ = 'A';
676	<	if (IsConfSSL(aconf))
677	<	*p++ = 'S';
678	<	if (buf[0] == '\0')
679	<	*p++ = '*';
680	<
681	<	*p = '\0';
682	<
683	<	/*
684	<	* Allow admins to see actual ips unless hide_server_ips is enabled
685	<	*/
686	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
687	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
688	<	me.name, source_p->name, 'C', aconf->host,
689	<	buf, conf->name, aconf->port,
690	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
691	<	else
692	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
693	<	me.name, source_p->name, 'C',
694	<	"*@127.0.0.1", buf, conf->name, aconf->port,
695	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
696	<	}
697	<	break;
698	<
699	<	case HUB_TYPE:
700	<	DLINK_FOREACH(ptr, server_items.head)
701	<	{
702	<	conf = ptr->data;
703	<	aconf = map_to_conf(conf);
704	<
705	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
706	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
707	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
708	<	}
709	<	break;
710	<
711	<	case LEAF_TYPE:
712	<	DLINK_FOREACH(ptr, server_items.head)
713	<	{
714	<	conf = ptr->data;
715	<	aconf = map_to_conf(conf);
716	<
717	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
718	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
719	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
720	<	}
721	<	break;
722	<
723	<	case GLINE_TYPE:
724	<	case KLINE_TYPE:
725	<	case DLINE_TYPE:
726	<	case EXEMPTDLINE_TYPE:
727	<	case CRESV_TYPE:
728	<	case NRESV_TYPE:
729	<	case CLUSTER_TYPE:
730	<	default:
731	<	break;
732	<	}
733	<	}
734	<
735	<	/* check_client()
736	<	*
737	<	* inputs       - pointer to client
738	<	* output       - 0 = Success
739	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
740	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
741	<	*                I_LINE_FULL       (-3) = I-line is full
742	<	*                TOO_MANY          (-4) = Too many connections from hostname
743	<	*                BANNED_CLIENT     (-5) = K-lined
744	<	* side effects - Ordinary client access check.
745	<	*                Look for conf lines which have the same
746	<	*                status as the flags passed.
747	<	*/
748	<	static void *
749	<	check_client(va_list args)
750	<	{
751	<	struct Client *source_p = va_arg(args, struct Client *);
752	<	const char *username = va_arg(args, const char *);
753	<	int i;
754	<
755	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
756	<	if ((i = verify_access(source_p, username)))
757	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
758	<	source_p->name, source_p->sockhost);
759	<
760	<	switch (i)
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207		{
208	<	case TOO_MANY:
209	<	sendto_realops_flags(UMODE_FULL, L_ALL,
210	<	"Too many on IP for %s (%s).",
765	<	get_client_name(source_p, SHOW_IP),
766	<	source_p->sockhost);
767	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
768	<	get_client_name(source_p, SHOW_IP));
769	<	++ServerStats.is_ref;
770	<	exit_client(source_p, &me, "No more connections allowed on that IP");
771	<	break;
772	<
773	<	case I_LINE_FULL:
774	<	sendto_realops_flags(UMODE_FULL, L_ALL,
775	<	"I-line is full for %s (%s).",
776	<	get_client_name(source_p, SHOW_IP),
777	<	source_p->sockhost);
778	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
779	<	get_client_name(source_p, SHOW_IP));
780	<	++ServerStats.is_ref;
781	<	exit_client(source_p, &me,
782	<	"No more connections allowed in your connection class");
783	<	break;
784	<
785	<	case NOT_AUTHORIZED:
786	<	++ServerStats.is_ref;
787	<	/* jdc - lists server name & port connections are on */
788	<	/*       a purely cosmetical change */
789	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
790	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
791	<	get_client_name(source_p, SHOW_IP),
792	<	source_p->sockhost,
793	<	source_p->localClient->listener->name,
794	<	source_p->localClient->listener->port);
795	<	ilog(LOG_TYPE_IRCD,
796	<	"Unauthorized client connection from %s on [%s/%u].",
797	<	get_client_name(source_p, SHOW_IP),
798	<	source_p->localClient->listener->name,
799	<	source_p->localClient->listener->port);
800	<
801	<	/* XXX It is prolematical whether it is better to use the
802	<	* capture reject code here or rely on the connecting too fast code.
803	<	* - Dianora
804	<	*/
805	<	if (REJECT_HOLD_TIME > 0)
806	<	{
807	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
808	<	me.name, source_p->name);
809	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
810	<	SetCaptured(source_p);
811	<	}
812	<	else
813	<	exit_client(source_p, &me, "You are not authorized to use this server");
814	<	break;
815	<
816	<	case BANNED_CLIENT:
817	<	/*
818	<	* Don't exit them immediately, play with them a bit.
819	<	* - Dianora
820	<	*/
821	<	if (REJECT_HOLD_TIME > 0)
822	<	{
823	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
824	<	SetCaptured(source_p);
825	<	}
826	<	else
827	<	exit_client(source_p, &me, "Banned");
828	<	++ServerStats.is_ref;
829	<	break;
830	<
831	<	case 0:
832	<	default:
833	<	break;
208	>	MyFree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211		}
212
213	<	return (i < 0 ? NULL : source_p);
837	<	}
838	<
839	<	/* verify_access()
840	<	*
841	<	* inputs       - pointer to client to verify
842	<	*              - pointer to proposed username
843	<	* output       - 0 if success -'ve if not
844	<	* side effect  - find the first (best) I line to attach.
845	<	*/
846	<	static int
847	<	verify_access(struct Client *client_p, const char *username)
848	<	{
849	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
850	<	struct ConfItem *conf = NULL;
851	<	char non_ident[USERLEN + 1] = { '~', '\0' };
852	<	const char *uhi[3];
853	<
854	<	if (IsGotId(client_p))
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	aconf = find_address_conf(client_p->host, client_p->username,
216	<	&client_p->localClient->ip,
217	<	client_p->localClient->aftype,
859	<	client_p->localClient->passwd);
215	>	MyFree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
861	–	else
862	–	{
863	–	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
864	–	aconf = find_address_conf(client_p->host,non_ident,
865	–	&client_p->localClient->ip,
866	–	client_p->localClient->aftype,
867	–	client_p->localClient->passwd);
868	–	}
869	–
870	–	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
871	–	uhi[1] = client_p->host;
872	–	uhi[2] = client_p->sockhost;
873	–
874	–	rkconf = find_regexp_kline(uhi);
219
220	<	if (aconf != NULL)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	if (IsConfClient(aconf) && !rkconf)
879	<	{
880	<	conf = unmap_conf_item(aconf);
881	<
882	<	if (IsConfRedir(aconf))
883	<	{
884	<	sendto_one(client_p, form_str(RPL_REDIR),
885	<	me.name, client_p->name,
886	<	conf->name ? conf->name : "",
887	<	aconf->port);
888	<	return(NOT_AUTHORIZED);
889	<	}
890	<
891	<	if (IsConfDoIdentd(aconf))
892	<	SetNeedId(client_p);
893	<
894	<	/* Thanks for spoof idea amm */
895	<	if (IsConfDoSpoofIp(aconf))
896	<	{
897	<	conf = unmap_conf_item(aconf);
898	<
899	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
900	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
901	<	client_p->name, client_p->host, conf->name);
902	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
903	<	SetIPSpoof(client_p);
904	<	}
222	>	struct exempt *exptr = node->data;
223
224	<	return(attach_iline(client_p, conf));
225	<	}
226	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
227	<	{
228	<	/* XXX */
911	<	aconf = rkconf ? rkconf : aconf;
912	<	if (IsConfGline(aconf))
913	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
914	<	client_p->name);
915	<	if (ConfigFileEntry.kline_with_reason)
916	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
917	<	me.name, client_p->name, aconf->reason);
918	<	return(BANNED_CLIENT);
919	<	}
224	>	dlinkDelete(node, &conf->exempt_list);
225	>	MyFree(exptr->name);
226	>	MyFree(exptr->user);
227	>	MyFree(exptr->host);
228	>	MyFree(exptr);
229		}
230
231	<	return(NOT_AUTHORIZED);
231	>	MyFree(conf);
232		}
233
234		/* attach_iline()
235		*
236	<	* inputs       - client pointer
237	<	*              - conf pointer
238	<	* output       -
239	<	* side effects - do actual attach
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240		*/
241		static int
242	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
242	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
243		{
244	<	struct AccessItem *aconf;
936	<	struct ClassItem *aclass;
244	>	const struct ClassItem *const class = conf->class;
245		struct ip_entry *ip_found;
246		int a_limit_reached = 0;
247	<	int local = 0, global = 0, ident = 0;
247	>	unsigned int local = 0, global = 0, ident = 0;
248
249	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250		ip_found->count++;
251	<	SetIpHash(client_p);
944	<
945	<	aconf = map_to_conf(conf);
946	<	if (aconf->class_ptr == NULL)
947	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
948	<
949	<	aclass = map_to_conf(aconf->class_ptr);
251	>	AddFlag(client_p, FLAGS_IPHASH);
252
253		count_user_host(client_p->username, client_p->host,
254		&global, &local, &ident);
#	Line 955 | Line 257 | attach_iline(struct Client *client_p, st
257		* setting a_limit_reached if any limit is reached.
258		* - Dianora
259		*/
260	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
260	>	if (class->max_total && class->ref_count >= class->max_total)
261		a_limit_reached = 1;
262	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263		a_limit_reached = 1;
264	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
264	>	else if (class->max_local && local >= class->max_local)
265		a_limit_reached = 1;
266	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
266	>	else if (class->max_global && global >= class->max_global)
267		a_limit_reached = 1;
268	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
268	>	else if (class->max_ident && ident >= class->max_ident &&
269		client_p->username[0] != '~')
270		a_limit_reached = 1;
271
272		if (a_limit_reached)
273		{
274	<	if (!IsConfExemptLimits(aconf))
274	>	if (!IsConfExemptLimits(conf))
275		return TOO_MANY;   /* Already at maximum allowed */
276
277	<	sendto_one(client_p,
278	<	":%s NOTICE %s :*** Your connection class is full, "
977	<	"but you have exceed_limit = yes;", me.name, client_p->name);
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281		return attach_conf(client_p, conf);
282		}
283
284	<	/* init_ip_hash_table()
984	<	*
985	<	* inputs               - NONE
986	<	* output               - NONE
987	<	* side effects         - allocate memory for ip_entry(s)
988	<	*                      - clear the ip hash table
989	<	*/
990	<	void
991	<	init_ip_hash_table(void)
992	<	{
993	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
994	<	2 * hard_fdlimit);
995	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
996	<	}
997	<
998	<	/* find_or_add_ip()
999	<	*
1000	<	* inputs       - pointer to struct irc_ssaddr
1001	<	* output       - pointer to a struct ip_entry
1002	<	* side effects -
284	>	/* verify_access()
285		*
286	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
287	<	* count set to 0.
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289		*/
290	<	static struct ip_entry *
291	<	find_or_add_ip(struct irc_ssaddr *ip_in)
290	>	static int
291	>	verify_access(struct Client *client_p)
292		{
293	<	struct ip_entry *ptr, *newptr;
294	<	int hash_index = hash_ip(ip_in), res;
1012	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1013	<	#ifdef IPV6
1014	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1015	<	#endif
293	>	struct MaskItem *conf = NULL;
294	>	char non_ident[USERLEN + 1] = "~";
295
296	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
296	>	if (IsGotId(client_p))
297		{
298	<	#ifdef IPV6
299	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
300	<	continue;
301	<	if (ip_in->ss.ss_family == AF_INET6)
302	<	{
303	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
304	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
305	<	}
306	<	else
307	<	#endif
308	<	{
309	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1031	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1032	<	}
1033	<	if (res == 0)
1034	<	{
1035	<	/* Found entry already in hash, return it. */
1036	<	return ptr;
1037	<	}
298	>	conf = find_address_conf(client_p->host, client_p->username,
299	>	&client_p->connection->ip,
300	>	client_p->connection->aftype,
301	>	client_p->connection->password);
302	>	}
303	>	else
304	>	{
305	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
306	>	conf = find_address_conf(client_p->host, non_ident,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311
312	<	if (ip_entries_count >= 2 * hard_fdlimit)
313	<	garbage_collect_ip_entries();
314	<
315	<	newptr = BlockHeapAlloc(ip_entry_heap);
316	<	ip_entries_count++;
317	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
318	<
319	<	newptr->next = ip_hash_table[hash_index];
320	<	ip_hash_table[hash_index] = newptr;
312	>	if (conf)
313	>	{
314	>	if (IsConfClient(conf))
315	>	{
316	>	if (IsConfRedir(conf))
317	>	{
318	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
319	>	conf->name ? conf->name : "",
320	>	conf->port);
321	>	return NOT_AUTHORIZED;
322	>	}
323
324	<	return newptr;
325	<	}
324	>	/* Thanks for spoof idea amm */
325	>	if (IsConfDoSpoofIp(conf))
326	>	{
327	>	if (IsConfSpoofNotice(conf))
328	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329	>	client_p->name, client_p->host, conf->name);
330
331	<	/* remove_one_ip()
332	<	*
1055	<	* inputs        - unsigned long IP address value
1056	<	* output        - NONE
1057	<	* side effects  - The ip address given, is looked up in ip hash table
1058	<	*                 and number of ip#'s for that ip decremented.
1059	<	*                 If ip # count reaches 0 and has expired,
1060	<	*                 the struct ip_entry is returned to the ip_entry_heap
1061	<	*/
1062	<	void
1063	<	remove_one_ip(struct irc_ssaddr *ip_in)
1064	<	{
1065	<	struct ip_entry *ptr;
1066	<	struct ip_entry *last_ptr = NULL;
1067	<	int hash_index = hash_ip(ip_in), res;
1068	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1069	<	#ifdef IPV6
1070	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1071	<	#endif
331	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332	>	}
333
334	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1074	<	{
1075	<	#ifdef IPV6
1076	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1077	<	continue;
1078	<	if (ip_in->ss.ss_family == AF_INET6)
1079	<	{
1080	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1081	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1082	<	}
1083	<	else
1084	<	#endif
1085	<	{
1086	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1087	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
334	>	return attach_iline(client_p, conf);
335		}
336	<	if (res)
1090	<	continue;
1091	<	if (ptr->count > 0)
1092	<	ptr->count--;
1093	<	if (ptr->count == 0 &&
1094	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
336	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337		{
338	<	if (last_ptr != NULL)
339	<	last_ptr->next = ptr->next;
1098	<	else
1099	<	ip_hash_table[hash_index] = ptr->next;
338	>	if (IsConfGline(conf))
339	>	sendto_one_notice(client_p, &me, ":*** G-lined");
340
341	<	BlockHeapFree(ip_entry_heap, ptr);
342	<	ip_entries_count--;
1103	<	return;
341	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342	>	return BANNED_CLIENT;
343		}
1105	–	last_ptr = ptr;
344		}
1107	–	}
1108	–
1109	–	/* hash_ip()
1110	–	*
1111	–	* input        - pointer to an irc_inaddr
1112	–	* output       - integer value used as index into hash table
1113	–	* side effects - hopefully, none
1114	–	*/
1115	–	static int
1116	–	hash_ip(struct irc_ssaddr *addr)
1117	–	{
1118	–	if (addr->ss.ss_family == AF_INET)
1119	–	{
1120	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1121	–	int hash;
1122	–	uint32_t ip;
345
346	<	ip   = ntohl(v4->sin_addr.s_addr);
1125	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1126	<	return hash;
1127	<	}
1128	<	#ifdef IPV6
1129	<	else
1130	<	{
1131	<	int hash;
1132	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1133	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1134	<
1135	<	hash  = ip[0] ^ ip[3];
1136	<	hash ^= hash >> 16;
1137	<	hash ^= hash >> 8;
1138	<	hash  = hash & (IP_HASH_SIZE - 1);
1139	<	return hash;
1140	<	}
1141	<	#else
1142	<	return 0;
1143	<	#endif
346	>	return NOT_AUTHORIZED;
347		}
348
349	<	/* count_ip_hash()
1147	<	*
1148	<	* inputs        - pointer to counter of number of ips hashed
1149	<	*               - pointer to memory used for ip hash
1150	<	* output        - returned via pointers input
1151	<	* side effects  - NONE
349	>	/* check_client()
350		*
351	<	* number of hashed ip #'s is counted up, plus the amount of memory
352	<	* used in the hash.
351	>	* inputs       - pointer to client
352	>	* output       - 0 = Success
353	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
354	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
355	>	*                I_LINE_FULL       (-3) = I-line is full
356	>	*                TOO_MANY          (-4) = Too many connections from hostname
357	>	*                BANNED_CLIENT     (-5) = K-lined
358	>	* side effects - Ordinary client access check.
359	>	*                Look for conf lines which have the same
360	>	*                status as the flags passed.
361		*/
362	<	void
363	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
362	>	int
363	>	check_client(struct Client *source_p)
364		{
1159	–	struct ip_entry *ptr;
365		int i;
366
367	<	*number_ips_stored = 0;
368	<	*mem_ips_stored    = 0;
367	>	if ((i = verify_access(source_p)))
368	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
369	>	source_p->name, source_p->sockhost);
370
371	<	for (i = 0; i < IP_HASH_SIZE; i++)
371	>	switch (i)
372		{
373	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
374	<	{
375	<	*number_ips_stored += 1;
376	<	*mem_ips_stored += sizeof(struct ip_entry);
377	<	}
378	<	}
379	<	}
373	>	case TOO_MANY:
374	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
375	>	"Too many on IP for %s (%s).",
376	>	get_client_name(source_p, SHOW_IP),
377	>	source_p->sockhost);
378	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
379	>	get_client_name(source_p, SHOW_IP));
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "No more connections allowed on that IP");
382	>	break;
383
384	<	/* garbage_collect_ip_entries()
385	<	*
386	<	* input        - NONE
387	<	* output       - NONE
388	<	* side effects - free up all ip entries with no connections
389	<	*/
390	<	static void
391	<	garbage_collect_ip_entries(void)
392	<	{
393	<	struct ip_entry *ptr;
1185	<	struct ip_entry *last_ptr;
1186	<	struct ip_entry *next_ptr;
1187	<	int i;
384	>	case I_LINE_FULL:
385	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
386	>	"auth {} block is full for %s (%s).",
387	>	get_client_name(source_p, SHOW_IP),
388	>	source_p->sockhost);
389	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
390	>	get_client_name(source_p, SHOW_IP));
391	>	++ServerStats.is_ref;
392	>	exit_client(source_p, "No more connections allowed in your connection class");
393	>	break;
394
395	<	for (i = 0; i < IP_HASH_SIZE; i++)
396	<	{
397	<	last_ptr = NULL;
395	>	case NOT_AUTHORIZED:
396	>	/* jdc - lists server name & port connections are on */
397	>	/*       a purely cosmetical change */
398	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
399	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
400	>	get_client_name(source_p, SHOW_IP),
401	>	source_p->sockhost,
402	>	source_p->connection->listener->name,
403	>	source_p->connection->listener->port);
404	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->connection->listener->name,
407	>	source_p->connection->listener->port);
408
409	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
410	<	{
411	<	next_ptr = ptr->next;
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "You are not authorized to use this server");
411	>	break;
412
413	<	if (ptr->count == 0 &&
414	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
415	<	{
416	<	if (last_ptr != NULL)
417	<	last_ptr->next = ptr->next;
418	<	else
419	<	ip_hash_table[i] = ptr->next;
420	<	BlockHeapFree(ip_entry_heap, ptr);
1205	<	ip_entries_count--;
1206	<	}
1207	<	else
1208	<	last_ptr = ptr;
1209	<	}
413	>	case BANNED_CLIENT:
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "Banned");
416	>	break;
417	>
418	>	case 0:
419	>	default:
420	>	break;
421		}
422	+
423	+	return !(i < 0);
424		}
425
426		/* detach_conf()
#	Line 1218 | Line 431 | garbage_collect_ip_entries(void)
431		* side effects - Disassociate configuration from the client.
432		*                Also removes a class from the list if marked for deleting.
433		*/
434	<	int
435	<	detach_conf(struct Client *client_p, ConfType type)
434	>	void
435	>	detach_conf(struct Client *client_p, enum maskitem_type type)
436		{
437	<	dlink_node *ptr, *next_ptr;
1225	<	struct ConfItem *conf;
1226	<	struct ClassItem *aclass;
1227	<	struct AccessItem *aconf;
1228	<	struct ConfItem *aclass_conf;
437	>	dlink_node *node = NULL, *node_next = NULL;
438
439	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
439	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
440		{
441	<	conf = ptr->data;
1233	<
1234	<	if (type == CONF_TYPE || conf->type == type)
1235	<	{
1236	<	dlinkDelete(ptr, &client_p->localClient->confs);
1237	<	free_dlink_node(ptr);
1238	<
1239	<	switch (conf->type)
1240	<	{
1241	<	case CLIENT_TYPE:
1242	<	case OPER_TYPE:
1243	<	case SERVER_TYPE:
1244	<	aconf = map_to_conf(conf);
441	>	struct MaskItem *conf = node->data;
442
443	<	assert(aconf->clients > 0);
444	<
445	<	if ((aclass_conf = aconf->class_ptr) != NULL)
1249	<	{
1250	<	aclass = map_to_conf(aclass_conf);
443	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
444	>	assert(conf->ref_count > 0);
445	>	assert(conf->class->ref_count > 0);
446
447	<	assert(aclass->curr_user_count > 0);
448	<
1254	<	if (conf->type == CLIENT_TYPE)
1255	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1256	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1257	<	delete_conf_item(aclass_conf);
1258	<	}
447	>	if (!(conf->type & type))
448	>	continue;
449
450	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
451	<	delete_conf_item(conf);
450	>	dlinkDelete(node, &client_p->connection->confs);
451	>	free_dlink_node(node);
452
453	<	break;
454	<	default:
1265	<	break;
1266	<	}
453	>	if (conf->type == CONF_CLIENT)
454	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
455
456	<	if (type != CONF_TYPE)
457	<	return 0;
456	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
457	>	{
458	>	class_free(conf->class);
459	>	conf->class = NULL;
460		}
1271	–	}
461
462	<	return -1;
462	>	if (--conf->ref_count == 0 && conf->active == 0)
463	>	conf_free(conf);
464	>	}
465		}
466
467		/* attach_conf()
#	Line 1284 | Line 475 | detach_conf(struct Client *client_p, Con
475		*                attachment if there was an old one...
476		*/
477		int
478	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
478	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
479		{
480	<	struct AccessItem *aconf = map_to_conf(conf);
1290	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1291	<
1292	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
480	>	if (dlinkFind(&client_p->connection->confs, conf))
481		return 1;
482
483	<	if (IsConfIllegal(aconf)) /* TBV: can't happen */
484	<	return NOT_AUTHORIZED;
485	<
1298	<	if (conf->type == CLIENT_TYPE)
1299	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1300	<	&client_p->localClient->ip, aclass))
483	>	if (conf->type == CONF_CLIENT)
484	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
485	>	&client_p->connection->ip, conf->class))
486		return TOO_MANY;    /* Already at maximum allowed */
487
488	<	aclass->curr_user_count++;
489	<	aconf->clients++;
488	>	conf->class->ref_count++;
489	>	conf->ref_count++;
490
491	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
491	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
492
493		return 0;
494		}
#	Line 1320 | Line 505 | int
505		attach_connect_block(struct Client *client_p, const char *name,
506		const char *host)
507		{
508	<	dlink_node *ptr;
1324	<	struct ConfItem *conf;
1325	<	struct AccessItem *aconf;
508	>	dlink_node *node = NULL;
509
510	<	assert(client_p != NULL);
1328	<	assert(host != NULL);
510	>	assert(host);
511
512	<	if (client_p == NULL || host == NULL)
1331	<	return 0;
1332	<
1333	<	DLINK_FOREACH(ptr, server_items.head)
512	>	DLINK_FOREACH(node, server_items.head)
513		{
514	<	conf = ptr->data;
1336	<	aconf = map_to_conf(conf);
514	>	struct MaskItem *conf = node->data;
515
516	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
516	>	if (match(conf->name, name) || match(conf->host, host))
517		continue;
518
519		attach_conf(client_p, conf);
#	Line 1345 | Line 523 | attach_connect_block(struct Client *clie
523		return 0;
524		}
525
1348	–	/* find_conf_exact()
1349	–	*
1350	–	* inputs       - type of ConfItem
1351	–	*              - pointer to name to find
1352	–	*              - pointer to username to find
1353	–	*              - pointer to host to find
1354	–	* output       - NULL or pointer to conf found
1355	–	* side effects - find a conf entry which matches the hostname
1356	–	*                and has the same name.
1357	–	*/
1358	–	struct ConfItem *
1359	–	find_conf_exact(ConfType type, const char *name, const char *user,
1360	–	const char *host)
1361	–	{
1362	–	dlink_node *ptr;
1363	–	dlink_list *list_p;
1364	–	struct ConfItem *conf = NULL;
1365	–	struct AccessItem *aconf;
1366	–
1367	–	/* Only valid for OPER_TYPE and ...? */
1368	–	list_p = map_to_list(type);
1369	–
1370	–	DLINK_FOREACH(ptr, (*list_p).head)
1371	–	{
1372	–	conf = ptr->data;
1373	–
1374	–	if (conf->name == NULL)
1375	–	continue;
1376	–	aconf = map_to_conf(conf);
1377	–	if (aconf->host == NULL)
1378	–	continue;
1379	–	if (irccmp(conf->name, name) != 0)
1380	–	continue;
1381	–
1382	–	/*
1383	–	** Accept if the *real* hostname (usually sockethost)
1384	–	** socket host) matches *either* host or name field
1385	–	** of the configuration.
1386	–	*/
1387	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1388	–	continue;
1389	–	if (type == OPER_TYPE)
1390	–	{
1391	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1392	–
1393	–	if (aconf->clients >= aclass->max_total)
1394	–	continue;
1395	–	}
1396	–
1397	–	return conf;
1398	–	}
1399	–
1400	–	return NULL;
1401	–	}
1402	–
526		/* find_conf_name()
527		*
528		* inputs       - pointer to conf link list to search
#	Line 1409 | Line 532 | find_conf_exact(ConfType type, const cha
532		* side effects - find a conf entry which matches the name
533		*                and has the given mask.
534		*/
535	<	struct ConfItem *
536	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
535	>	struct MaskItem *
536	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
537		{
538	<	dlink_node *ptr;
1416	<	struct ConfItem* conf;
538	>	dlink_node *node = NULL;
539
540	<	DLINK_FOREACH(ptr, list->head)
540	>	DLINK_FOREACH(node, list->head)
541		{
542	<	conf = ptr->data;
543	<
542	>	struct MaskItem *conf = node->data;
543	>
544		if (conf->type == type)
545		{
546	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
547	<	match(conf->name, name)))
1426	<	return conf;
546	>	if (conf->name && !irccmp(conf->name, name))
547	>	return conf;
548		}
549		}
550
551		return NULL;
552		}
553
1433	–	/* map_to_list()
1434	–	*
1435	–	* inputs       - ConfType conf
1436	–	* output       - pointer to dlink_list to use
1437	–	* side effects - none
1438	–	*/
1439	–	static dlink_list *
1440	–	map_to_list(ConfType type)
1441	–	{
1442	–	switch(type)
1443	–	{
1444	–	case RXLINE_TYPE:
1445	–	return(&rxconf_items);
1446	–	break;
1447	–	case XLINE_TYPE:
1448	–	return(&xconf_items);
1449	–	break;
1450	–	case ULINE_TYPE:
1451	–	return(&uconf_items);
1452	–	break;
1453	–	case NRESV_TYPE:
1454	–	return(&nresv_items);
1455	–	break;
1456	–	case OPER_TYPE:
1457	–	return(&oconf_items);
1458	–	break;
1459	–	case CLASS_TYPE:
1460	–	return(&class_items);
1461	–	break;
1462	–	case SERVER_TYPE:
1463	–	return(&server_items);
1464	–	break;
1465	–	case SERVICE_TYPE:
1466	–	return(&service_items);
1467	–	break;
1468	–	case CLUSTER_TYPE:
1469	–	return(&cluster_items);
1470	–	break;
1471	–	case CONF_TYPE:
1472	–	case GLINE_TYPE:
1473	–	case KLINE_TYPE:
1474	–	case DLINE_TYPE:
1475	–	case CRESV_TYPE:
1476	–	default:
1477	–	return NULL;
1478	–	}
1479	–	}
1480	–
554		/* find_matching_name_conf()
555		*
556		* inputs       - type of link list to look in
557		*              - pointer to name string to find
558		*              - pointer to user
559		*              - pointer to host
560	<	*              - optional action to match on as well
561	<	* output       - NULL or pointer to found struct MatchItem
560	>	*              - optional flags to match on as well
561	>	* output       - NULL or pointer to found struct MaskItem
562		* side effects - looks for a match on name field
563		*/
564	<	struct ConfItem *
565	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
566	<	const char *host, int action)
567	<	{
568	<	dlink_node *ptr=NULL;
569	<	struct ConfItem *conf=NULL;
570	<	struct AccessItem *aconf=NULL;
1498	<	struct MatchItem *match_item=NULL;
1499	<	dlink_list *list_p = map_to_list(type);
564	>	struct MaskItem *
565	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
566	>	const char *host, unsigned int flags)
567	>	{
568	>	dlink_node *node = NULL;
569	>	dlink_list *list = map_to_list(type);
570	>	struct MaskItem *conf = NULL;
571
572		switch (type)
573		{
574	<	#ifdef HAVE_LIBPCRE
575	<	case RXLINE_TYPE:
1505	<	DLINK_FOREACH(ptr, list_p->head)
1506	<	{
1507	<	conf = ptr->data;
1508	<	assert(conf->regexpname);
1509	<
1510	<	if (!ircd_pcre_exec(conf->regexpname, name))
1511	<	return conf;
1512	<	}
1513	<	break;
1514	<	#endif
1515	<	case SERVICE_TYPE:
1516	<	DLINK_FOREACH(ptr, list_p->head)
574	>	case CONF_SERVICE:
575	>	DLINK_FOREACH(node, list->head)
576		{
577	<	conf = ptr->data;
577	>	conf = node->data;
578
579		if (EmptyString(conf->name))
580		continue;
581	<	if ((name != NULL) && !irccmp(name, conf->name))
581	>	if (name && !irccmp(name, conf->name))
582		return conf;
583		}
584		break;
585
586	<	case XLINE_TYPE:
587	<	case ULINE_TYPE:
588	<	case NRESV_TYPE:
589	<	DLINK_FOREACH(ptr, list_p->head)
586	>	case CONF_XLINE:
587	>	case CONF_ULINE:
588	>	case CONF_NRESV:
589	>	case CONF_CRESV:
590	>	DLINK_FOREACH(node, list->head)
591		{
592	<	conf = ptr->data;
592	>	conf = node->data;
593
1534	–	match_item = map_to_conf(conf);
594		if (EmptyString(conf->name))
595	<	continue;
596	<	if ((name != NULL) && match_esc(conf->name, name))
595	>	continue;
596	>	if (name && !match(conf->name, name))
597		{
598	<	if ((user == NULL && (host == NULL)))
599	<	return conf;
600	<	if ((match_item->action & action) != action)
598	>	if ((user == NULL && (host == NULL)))
599	>	return conf;
600	>	if ((conf->flags & flags) != flags)
601		continue;
602	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
603	<	return conf;
604	<	if (match(match_item->user, user) && match(match_item->host, host))
605	<	return conf;
602	>	if (EmptyString(conf->user) || EmptyString(conf->host))
603	>	return conf;
604	>	if (!match(conf->user, user) && !match(conf->host, host))
605	>	return conf;
606		}
607		}
608		break;
609
610	<	case SERVER_TYPE:
611	<	DLINK_FOREACH(ptr, list_p->head)
610	>	case CONF_SERVER:
611	>	DLINK_FOREACH(node, list->head)
612		{
613	<	conf = ptr->data;
1555	<	aconf = map_to_conf(conf);
613	>	conf = node->data;
614
615	<	if ((name != NULL) && match_esc(name, conf->name))
615	>	if (name && !match(name, conf->name))
616		return conf;
617	<	else if ((host != NULL) && match_esc(host, aconf->host))
617	>	if (host && !match(host, conf->host))
618		return conf;
619		}
620		break;
621	<
621	>
622		default:
623		break;
624		}
#	Line 1573 | Line 631 | find_matching_name_conf(ConfType type, c
631		*              - pointer to name string to find
632		*              - pointer to user
633		*              - pointer to host
634	<	* output       - NULL or pointer to found struct MatchItem
634	>	* output       - NULL or pointer to found struct MaskItem
635		* side effects - looks for an exact match on name field
636		*/
637	<	struct ConfItem *
638	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
637	>	struct MaskItem *
638	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
639		const char *user, const char *host)
640		{
641	<	dlink_node *ptr = NULL;
642	<	struct AccessItem *aconf;
643	<	struct ConfItem *conf;
1586	<	struct MatchItem *match_item;
1587	<	dlink_list *list_p;
1588	<
1589	<	list_p = map_to_list(type);
641	>	dlink_node *node = NULL;
642	>	dlink_list *list = map_to_list(type);
643	>	struct MaskItem *conf = NULL;
644
645		switch(type)
646		{
647	<	case RXLINE_TYPE:
648	<	case XLINE_TYPE:
649	<	case ULINE_TYPE:
650	<	case NRESV_TYPE:
647	>	case CONF_XLINE:
648	>	case CONF_ULINE:
649	>	case CONF_NRESV:
650	>	case CONF_CRESV:
651
652	<	DLINK_FOREACH(ptr, list_p->head)
652	>	DLINK_FOREACH(node, list->head)
653		{
654	<	conf = ptr->data;
655	<	match_item = (struct MatchItem *)map_to_conf(conf);
654	>	conf = node->data;
655	>
656		if (EmptyString(conf->name))
657	<	continue;
658	<
657	>	continue;
658	>
659		if (irccmp(conf->name, name) == 0)
660		{
661	<	if ((user == NULL && (host == NULL)))
662	<	return (conf);
663	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
664	<	return (conf);
665	<	if (match(match_item->user, user) && match(match_item->host, host))
666	<	return (conf);
661	>	if ((user == NULL && (host == NULL)))
662	>	return conf;
663	>	if (EmptyString(conf->user) || EmptyString(conf->host))
664	>	return conf;
665	>	if (!match(conf->user, user) && !match(conf->host, host))
666	>	return conf;
667		}
668		}
669		break;
670
671	<	case OPER_TYPE:
672	<	DLINK_FOREACH(ptr, list_p->head)
671	>	case CONF_OPER:
672	>	DLINK_FOREACH(node, list->head)
673		{
674	<	conf = ptr->data;
1621	<	aconf = map_to_conf(conf);
674	>	conf = node->data;
675
676		if (EmptyString(conf->name))
677		continue;
#	Line 1627 | Line 680 | find_exact_name_conf(ConfType type, cons
680		{
681		if (!who)
682		return conf;
683	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
684	<	return conf;
685	<	if (match(aconf->user, who->username))
683	>	if (EmptyString(conf->user) || EmptyString(conf->host))
684	>	return NULL;
685	>	if (!match(conf->user, who->username))
686		{
687	<	switch (aconf->type)
687	>	switch (conf->htype)
688		{
689		case HM_HOST:
690	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
691	<	return conf;
690	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
691	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
692	>	return conf;
693		break;
694		case HM_IPV4:
695	<	if (who->localClient->aftype == AF_INET)
696	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
697	<	return conf;
695	>	if (who->connection->aftype == AF_INET)
696	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
697	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
698	>	return conf;
699		break;
1645	–	#ifdef IPV6
700		case HM_IPV6:
701	<	if (who->localClient->aftype == AF_INET6)
702	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
703	<	return conf;
701	>	if (who->connection->aftype == AF_INET6)
702	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
703	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
704	>	return conf;
705		break;
1651	–	#endif
706		default:
707		assert(0);
708		}
#	Line 1658 | Line 712 | find_exact_name_conf(ConfType type, cons
712
713		break;
714
715	<	case SERVER_TYPE:
716	<	DLINK_FOREACH(ptr, list_p->head)
715	>	case CONF_SERVER:
716	>	DLINK_FOREACH(node, list->head)
717		{
718	<	conf = ptr->data;
719	<	aconf = (struct AccessItem *)map_to_conf(conf);
718	>	conf = node->data;
719	>
720		if (EmptyString(conf->name))
721	<	continue;
722	<
721	>	continue;
722	>
723		if (name == NULL)
724		{
725	<	if (EmptyString(aconf->host))
726	<	continue;
727	<	if (irccmp(aconf->host, host) == 0)
728	<	return(conf);
725	>	if (EmptyString(conf->host))
726	>	continue;
727	>	if (irccmp(conf->host, host) == 0)
728	>	return conf;
729		}
730		else if (irccmp(conf->name, name) == 0)
731	<	{
1678	<	return (conf);
1679	<	}
731	>	return conf;
732		}
1681	–	break;
733
1683	–	case CLASS_TYPE:
1684	–	DLINK_FOREACH(ptr, list_p->head)
1685	–	{
1686	–	conf = ptr->data;
1687	–	if (EmptyString(conf->name))
1688	–	continue;
1689	–
1690	–	if (irccmp(conf->name, name) == 0)
1691	–	return (conf);
1692	–	}
734		break;
735
736		default:
737		break;
738		}
1698	–	return(NULL);
1699	–	}
1700	–
1701	–	/* rehash()
1702	–	*
1703	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1704	–	* as a result of an operator issuing this command, else assume it has been
1705	–	* called as a result of the server receiving a HUP signal.
1706	–	*/
1707	–	int
1708	–	rehash(int sig)
1709	–	{
1710	–	if (sig != 0)
1711	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1712	–	"Got signal SIGHUP, reloading ircd.conf file");
1713	–
1714	–	restart_resolver();
1715	–
1716	–	/* don't close listeners until we know we can go ahead with the rehash */
1717	–
1718	–	/* Check to see if we magically got(or lost) IPv6 support */
1719	–	check_can_use_v6();
1720	–
1721	–	read_conf_files(0);
1722	–
1723	–	if (ServerInfo.description != NULL)
1724	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1725	–
1726	–	load_conf_modules();
1727	–
1728	–	flush_deleted_I_P();
1729	–
1730	–	rehashed_klines = 1;
1731	–	/* XXX */
1732	–	if (ConfigLoggingEntry.use_logging)
1733	–	log_close_all();
739
740	<	return(0);
740	>	return NULL;
741		}
742
743		/* set_default_conf()
#	Line 1750 | Line 755 | set_default_conf(void)
755		/* verify init_class() ran, this should be an unnecessary check
756		* but its not much work.
757		*/
758	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
758	>	assert(class_default == class_get_list()->tail->data);
759
760		#ifdef HAVE_LIBCRYPTO
761	<	ServerInfo.rsa_private_key = NULL;
762	<	ServerInfo.rsa_private_key_file = NULL;
761	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
762	>	{
763	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
764	>
765	>	if (key)
766	>	{
767	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
768	>	EC_KEY_free(key);
769	>	}
770	>	}
771	>
772	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
773		#endif
774
775	<	/* ServerInfo.name is not rehashable */
776	<	/* ServerInfo.name = ServerInfo.name; */
777	<	ServerInfo.description = NULL;
778	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
779	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
780	<
781	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
782	<	ServerInfo.specific_ipv4_vhost = 0;
783	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
784	<	ServerInfo.specific_ipv6_vhost = 0;
785	<
786	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
787	<
788	<	ServerInfo.hub = 0;
789	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
790	<	ServerInfo.dns_host.sin_port = 0;
791	<	AdminInfo.name = NULL;
792	<	AdminInfo.email = NULL;
793	<	AdminInfo.description = NULL;
775	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
776	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
777	>	ConfigServerInfo.rsa_private_key = NULL;
778	>	ConfigServerInfo.rsa_private_key_file = NULL;
779	>	#endif
780	>
781	>	/* ConfigServerInfo.name is not rehashable */
782	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
783	>	ConfigServerInfo.description = NULL;
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796	>
797	>	ConfigAdminInfo.name = NULL;
798	>	ConfigAdminInfo.email = NULL;
799	>	ConfigAdminInfo.description = NULL;
800
801	<	log_close_all();
801	>	log_del_all();
802
803	<	ConfigLoggingEntry.use_logging = 1;
803	>	ConfigLog.use_logging = 1;
804
805		ConfigChannel.disable_fake_channels = 0;
806	<	ConfigChannel.restrict_channels = 0;
807	<	ConfigChannel.knock_delay = 300;
806	>	ConfigChannel.invite_client_count = 10;
807	>	ConfigChannel.invite_client_time = 300;
808	>	ConfigChannel.knock_client_count = 1;
809	>	ConfigChannel.knock_client_time = 300;
810		ConfigChannel.knock_delay_channel = 60;
811	<	ConfigChannel.max_chans_per_user = 25;
1789	<	ConfigChannel.max_chans_per_oper = 50;
1790	<	ConfigChannel.quiet_on_ban = 1;
811	>	ConfigChannel.max_channels = 25;
812		ConfigChannel.max_bans = 25;
813		ConfigChannel.default_split_user_count = 0;
814		ConfigChannel.default_split_server_count = 0;
#	Line 1798 | Line 819 | set_default_conf(void)
819		ConfigServerHide.links_delay = 300;
820		ConfigServerHide.hidden = 0;
821		ConfigServerHide.hide_servers = 0;
822	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
822	>	ConfigServerHide.hide_services = 0;
823	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
824		ConfigServerHide.hide_server_ips = 0;
825	+	ConfigServerHide.disable_remote_commands = 0;
826
827	<
828	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
829	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
830	<	ConfigFileEntry.glines = 0;
831	<	ConfigFileEntry.gline_time = 12 * 3600;
832	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
833	<	ConfigFileEntry.gline_min_cidr = 16;
834	<	ConfigFileEntry.gline_min_cidr6 = 48;
835	<	ConfigFileEntry.invisible_on_connect = 1;
836	<	ConfigFileEntry.use_whois_actually = 1;
837	<	ConfigFileEntry.tkline_expire_notices = 1;
838	<	ConfigFileEntry.hide_spoof_ips = 1;
839	<	ConfigFileEntry.ignore_bogus_ts = 0;
840	<	ConfigFileEntry.disable_auth = 0;
841	<	ConfigFileEntry.disable_remote = 0;
842	<	ConfigFileEntry.kill_chase_time_limit = 90;
843	<	ConfigFileEntry.default_floodcount = 8;
844	<	ConfigFileEntry.failed_oper_notice = 1;
845	<	ConfigFileEntry.dots_in_ident = 0;
846	<	ConfigFileEntry.min_nonwildcard = 4;
847	<	ConfigFileEntry.min_nonwildcard_simple = 3;
848	<	ConfigFileEntry.max_accept = 20;
849	<	ConfigFileEntry.anti_nick_flood = 0;
850	<	ConfigFileEntry.max_nick_time = 20;
851	<	ConfigFileEntry.max_nick_changes = 5;
852	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
853	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
854	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
855	<	ConfigFileEntry.kline_with_reason = 1;
856	<	ConfigFileEntry.kline_reason = NULL;
857	<	ConfigFileEntry.warn_no_nline = 1;
858	<	ConfigFileEntry.stats_o_oper_only = 0;
859	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
860	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
861	<	ConfigFileEntry.stats_P_oper_only = 0;
862	<	ConfigFileEntry.caller_id_wait = 60;
863	<	ConfigFileEntry.opers_bypass_callerid = 0;
864	<	ConfigFileEntry.pace_wait = 10;
865	<	ConfigFileEntry.pace_wait_simple = 1;
866	<	ConfigFileEntry.short_motd = 0;
867	<	ConfigFileEntry.ping_cookie = 0;
868	<	ConfigFileEntry.no_oper_flood = 0;
869	<	ConfigFileEntry.true_no_oper_flood = 0;
870	<	ConfigFileEntry.oper_pass_resv = 1;
871	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
872	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
873	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1851	<	UMODE_OPERWALL | UMODE_WALLOP;
1852	<	ConfigFileEntry.use_egd = 0;
1853	<	ConfigFileEntry.egdpool_path = NULL;
1854	<	ConfigFileEntry.throttle_time = 10;
827	>	ConfigGeneral.away_count = 2;
828	>	ConfigGeneral.away_time = 10;
829	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
830	>	ConfigGeneral.cycle_on_host_change = 1;
831	>	ConfigGeneral.glines = 0;
832	>	ConfigGeneral.gline_time = 12 * 3600;
833	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
834	>	ConfigGeneral.gline_min_cidr = 16;
835	>	ConfigGeneral.gline_min_cidr6 = 48;
836	>	ConfigGeneral.invisible_on_connect = 1;
837	>	ConfigGeneral.tkline_expire_notices = 1;
838	>	ConfigGeneral.ignore_bogus_ts = 0;
839	>	ConfigGeneral.disable_auth = 0;
840	>	ConfigGeneral.kill_chase_time_limit = 90;
841	>	ConfigGeneral.default_floodcount = 8;
842	>	ConfigGeneral.failed_oper_notice = 1;
843	>	ConfigGeneral.dots_in_ident = 0;
844	>	ConfigGeneral.min_nonwildcard = 4;
845	>	ConfigGeneral.min_nonwildcard_simple = 3;
846	>	ConfigGeneral.max_accept = 20;
847	>	ConfigGeneral.anti_nick_flood = 0;
848	>	ConfigGeneral.max_nick_time = 20;
849	>	ConfigGeneral.max_nick_changes = 5;
850	>	ConfigGeneral.anti_spam_exit_message_time = 0;
851	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
852	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
853	>	ConfigGeneral.warn_no_connect_block = 1;
854	>	ConfigGeneral.stats_e_disabled = 0;
855	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
856	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
857	>	ConfigGeneral.stats_o_oper_only = 1;
858	>	ConfigGeneral.stats_m_oper_only = 1;
859	>	ConfigGeneral.stats_P_oper_only = 0;
860	>	ConfigGeneral.stats_u_oper_only = 0;
861	>	ConfigGeneral.caller_id_wait = 60;
862	>	ConfigGeneral.opers_bypass_callerid = 0;
863	>	ConfigGeneral.pace_wait = 10;
864	>	ConfigGeneral.pace_wait_simple = 1;
865	>	ConfigGeneral.short_motd = 0;
866	>	ConfigGeneral.ping_cookie = 0;
867	>	ConfigGeneral.no_oper_flood = 0;
868	>	ConfigGeneral.oper_pass_resv = 1;
869	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
870	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
871	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
872	>	ConfigGeneral.throttle_count = 1;
873	>	ConfigGeneral.throttle_time = 1;
874		}
875
876		static void
877		validate_conf(void)
878		{
879	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
880	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1862	<
1863	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1864	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
879	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
880	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
881
882	<	if (ServerInfo.network_name == NULL)
883	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
882	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
883	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
884
885	<	if (ServerInfo.network_desc == NULL)
886	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
885	>	if (EmptyString(ConfigServerInfo.network_name))
886	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
887
888	<	if (ConfigFileEntry.service_name == NULL)
889	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
888	>	if (EmptyString(ConfigServerInfo.network_desc))
889	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
890
891	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
891	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
892		}
893
894	<	/* read_conf()
894	>	/* read_conf()
895		*
896		* inputs       - file descriptor pointing to config file to use
897		* output       - None
#	Line 1886 | Line 902 | read_conf(FILE *file)
902		{
903		lineno = 0;
904
905	<	set_default_conf(); /* Set default values prior to conf parsing */
905	>	set_default_conf();  /* Set default values prior to conf parsing */
906		conf_parser_ctx.pass = 1;
907	<	yyparse();          /* pick up the classes first */
907	>	yyparse();  /* Pick up the classes first */
908
909		rewind(file);
910
911		conf_parser_ctx.pass = 2;
912	<	yyparse();          /* Load the values from the conf */
913	<	validate_conf();    /* Check to make sure some values are still okay. */
914	<	/* Some global values are also loaded here. */
915	<	check_class();      /* Make sure classes are valid */
912	>	yyparse();  /* Load the values from the conf */
913	>	validate_conf();  /* Check to make sure some values are still okay. */
914	>	/* Some global values are also loaded here. */
915	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
916	>	}
917	>
918	>	/* conf_rehash()
919	>	*
920	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
921	>	* as a result of an operator issuing this command, else assume it has been
922	>	* called as a result of the server receiving a HUP signal.
923	>	*/
924	>	int
925	>	conf_rehash(int sig)
926	>	{
927	>	if (sig)
928	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
929	>	"Got signal SIGHUP, reloading configuration file(s)");
930	>
931	>	restart_resolver();
932	>
933	>	/* don't close listeners until we know we can go ahead with the rehash */
934	>
935	>	read_conf_files(0);
936	>
937	>	load_conf_modules();
938	>	check_conf_klines();
939	>
940	>	return 0;
941		}
942
943		/* lookup_confhost()
#	Line 1904 | Line 945 | read_conf(FILE *file)
945		* start DNS lookups of all hostnames in the conf
946		* line and convert an IP addresses in a.b.c.d number for to IP#s.
947		*/
948	<	static void
949	<	lookup_confhost(struct ConfItem *conf)
948	>	void
949	>	lookup_confhost(struct MaskItem *conf)
950		{
1910	–	struct AccessItem *aconf;
951		struct addrinfo hints, *res;
952
953	<	aconf = map_to_conf(conf);
954	<
1915	<	if (has_wildcards(aconf->host))
1916	<	{
1917	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1918	<	aconf->host, conf->name);
1919	<	return;
1920	<	}
1921	<
1922	<	/* Do name lookup now on hostnames given and store the
953	>	/*
954	>	* Do name lookup now on hostnames given and store the
955		* ip numbers in conf structure.
956		*/
957		memset(&hints, 0, sizeof(hints));
#	Line 1930 | Line 962 | lookup_confhost(struct ConfItem *conf)
962		/* Get us ready for a bind() and don't bother doing dns lookup */
963		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
964
965	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
965	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
966		{
967	<	conf_dns_lookup(aconf);
967	>	conf_dns_lookup(conf);
968		return;
969		}
970
971	<	assert(res != NULL);
971	>	assert(res);
972	>
973	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
974	>	conf->addr.ss_len = res->ai_addrlen;
975	>	conf->addr.ss.ss_family = res->ai_family;
976
1941	–	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1942	–	aconf->addr.ss_len = res->ai_addrlen;
1943	–	aconf->addr.ss.ss_family = res->ai_family;
977		freeaddrinfo(res);
978		}
979
#	Line 1954 | Line 987 | lookup_confhost(struct ConfItem *conf)
987		int
988		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
989		{
990	<	struct ip_entry *ip_found;
991	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
990	>	struct ip_entry *ip_found = NULL;
991	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
992
993		/* DLINE exempt also gets you out of static limits/pacing... */
994	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
994	>	if (conf && (conf->type == CONF_EXEMPT))
995		return 0;
996
997	<	if (aconf != NULL)
997	>	if (conf)
998		return BANNED_CLIENT;
999
1000	<	ip_found = find_or_add_ip(addr);
1000	>	ip_found = ipcache_find_or_add_address(addr);
1001
1002	<	if ((CurrentTime - ip_found->last_attempt) <
1970	<	ConfigFileEntry.throttle_time)
1002	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1003		{
1004	<	ip_found->last_attempt = CurrentTime;
1005	<	return TOO_FAST;
1004	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1005	>	return TOO_FAST;
1006	>
1007	>	++ip_found->connection_count;
1008		}
1009	+	else
1010	+	ip_found->connection_count = 1;
1011
1012		ip_found->last_attempt = CurrentTime;
1013		return 0;
1014		}
1015
1016	<	static struct AccessItem *
1981	<	find_regexp_kline(const char *uhi[])
1982	<	{
1983	<	#ifdef HAVE_LIBPCRE
1984	<	const dlink_node *ptr = NULL;
1985	<
1986	<	DLINK_FOREACH(ptr, rkconf_items.head)
1987	<	{
1988	<	struct AccessItem *aptr = map_to_conf(ptr->data);
1989	<
1990	<	assert(aptr->regexuser);
1991	<	assert(aptr->regexhost);
1992	<
1993	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1994	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1995	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1996	<	return aptr;
1997	<	}
1998	<	#endif
1999	<	return NULL;
2000	<	}
2001	<
2002	<	/* find_kill()
1016	>	/* expire_tklines()
1017		*
1018	<	* inputs       - pointer to client structure
1019	<	* output       - pointer to struct AccessItem if found
1020	<	* side effects - See if this user is klined already,
2007	<	*                and if so, return struct AccessItem pointer
1018	>	* inputs       - tkline list pointer
1019	>	* output       - NONE
1020	>	* side effects - expire tklines
1021		*/
1022	<	struct AccessItem *
1023	<	find_kill(struct Client *client_p)
2011	<	{
2012	<	struct AccessItem *aconf = NULL;
2013	<	const char *uhi[3];
2014	<
2015	<	uhi[0] = client_p->username;
2016	<	uhi[1] = client_p->host;
2017	<	uhi[2] = client_p->sockhost;
2018	<
2019	<	assert(client_p != NULL);
2020	<
2021	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2022	<	CONF_KLINE, client_p->localClient->aftype,
2023	<	client_p->username, NULL, 1);
2024	<	if (aconf == NULL)
2025	<	aconf = find_regexp_kline(uhi);
2026	<
2027	<	return aconf;
2028	<	}
2029	<
2030	<	struct AccessItem *
2031	<	find_gline(struct Client *client_p)
1022	>	static void
1023	>	expire_tklines(dlink_list *list)
1024		{
1025	<	struct AccessItem *aconf;
1025	>	dlink_node *node = NULL, *node_next = NULL;
1026
1027	<	assert(client_p != NULL);
1027	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1028	>	{
1029	>	struct MaskItem *conf = node->data;
1030
1031	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1032	<	CONF_GLINE, client_p->localClient->aftype,
2039	<	client_p->username, NULL, 1);
2040	<	return aconf;
2041	<	}
1031	>	if (!conf->until || conf->until > CurrentTime)
1032	>	continue;
1033
1034	<	/* add_temp_line()
1035	<	*
1036	<	* inputs        - pointer to struct ConfItem
1037	<	* output        - none
1038	<	* Side effects  - links in given struct ConfItem into
1039	<	*                 temporary *line link list
1040	<	*/
1041	<	void
1042	<	add_temp_line(struct ConfItem *conf)
1043	<	{
1044	<	if (conf->type == XLINE_TYPE)
1045	<	{
1046	<	conf->flags |= CONF_FLAGS_TEMPORARY;
1047	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2057	<	}
2058	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2059	<	{
2060	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2061	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1034	>	if (conf->type == CONF_XLINE)
1035	>	{
1036	>	if (ConfigGeneral.tkline_expire_notices)
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038	>	"Temporary X-line for [%s] expired", conf->name);
1039	>	conf_free(conf);
1040	>	}
1041	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1042	>	{
1043	>	if (ConfigGeneral.tkline_expire_notices)
1044	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1045	>	"Temporary RESV for [%s] expired", conf->name);
1046	>	conf_free(conf);
1047	>	}
1048		}
1049		}
1050
#	Line 2070 | Line 1056 | add_temp_line(struct ConfItem *conf)
1056		*                This is an event started off in ircd.c
1057		*/
1058		void
1059	<	cleanup_tklines(void *notused)
1059	>	cleanup_tklines(void *unused)
1060		{
1061		hostmask_expire_temporary();
1062	<	expire_tklines(&temporary_xlines);
1063	<	expire_tklines(&temporary_resv);
1064	<	}
2079	<
2080	<	/* expire_tklines()
2081	<	*
2082	<	* inputs       - tkline list pointer
2083	<	* output       - NONE
2084	<	* side effects - expire tklines
2085	<	*/
2086	<	static void
2087	<	expire_tklines(dlink_list *tklist)
2088	<	{
2089	<	dlink_node *ptr;
2090	<	dlink_node *next_ptr;
2091	<	struct ConfItem *conf;
2092	<	struct MatchItem *xconf;
2093	<	struct MatchItem *nconf;
2094	<	struct ResvChannel *cconf;
2095	<
2096	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2097	<	{
2098	<	conf = ptr->data;
2099	<
2100	<	if (conf->type == XLINE_TYPE)
2101	<	{
2102	<	xconf = (struct MatchItem *)map_to_conf(conf);
2103	<	if (xconf->hold <= CurrentTime)
2104	<	{
2105	<	if (ConfigFileEntry.tkline_expire_notices)
2106	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2107	<	"Temporary X-line for [%s] sexpired", conf->name);
2108	<	dlinkDelete(ptr, tklist);
2109	<	free_dlink_node(ptr);
2110	<	delete_conf_item(conf);
2111	<	}
2112	<	}
2113	<	else if (conf->type == NRESV_TYPE)
2114	<	{
2115	<	nconf = (struct MatchItem *)map_to_conf(conf);
2116	<	if (nconf->hold <= CurrentTime)
2117	<	{
2118	<	if (ConfigFileEntry.tkline_expire_notices)
2119	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2120	<	"Temporary RESV for [%s] expired", conf->name);
2121	<	dlinkDelete(ptr, tklist);
2122	<	free_dlink_node(ptr);
2123	<	delete_conf_item(conf);
2124	<	}
2125	<	}
2126	<	else if (conf->type == CRESV_TYPE)
2127	<	{
2128	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2129	<	if (cconf->hold <= CurrentTime)
2130	<	{
2131	<	if (ConfigFileEntry.tkline_expire_notices)
2132	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2133	<	"Temporary RESV for [%s] expired", cconf->name);
2134	<	delete_channel_resv(cconf);
2135	<	}
2136	<	}
2137	<	}
1062	>	expire_tklines(&xconf_items);
1063	>	expire_tklines(&nresv_items);
1064	>	expire_tklines(&cresv_items);
1065		}
1066
1067		/* oper_privs_as_string()
#	Line 2145 | Line 1072 | expire_tklines(dlink_list *tklist)
1072		*/
1073		static const struct oper_privs
1074		{
1075	<	const unsigned int oprivs;
1075	>	const unsigned int flag;
1076		const unsigned char c;
1077		} flag_list[] = {
1078	<	{ OPER_FLAG_ADMIN,       'A' },
1079	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1080	<	{ OPER_FLAG_DIE,         'D' },
1081	<	{ OPER_FLAG_GLINE,       'G' },
1082	<	{ OPER_FLAG_REHASH,      'H' },
1083	<	{ OPER_FLAG_K,           'K' },
1084	<	{ OPER_FLAG_OPERWALL,    'L' },
1085	<	{ OPER_FLAG_N,           'N' },
1086	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1087	<	{ OPER_FLAG_REMOTE,      'R' },
1088	<	{ OPER_FLAG_OPER_SPY,    'S' },
1089	<	{ OPER_FLAG_UNKLINE,     'U' },
1090	<	{ OPER_FLAG_X,           'X' },
1078	>	{ OPER_FLAG_ADMIN,          'A' },
1079	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1080	>	{ OPER_FLAG_DIE,            'D' },
1081	>	{ OPER_FLAG_GLINE,          'G' },
1082	>	{ OPER_FLAG_REHASH,         'H' },
1083	>	{ OPER_FLAG_KLINE,          'K' },
1084	>	{ OPER_FLAG_KILL,           'N' },
1085	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1086	>	{ OPER_FLAG_CONNECT,        'P' },
1087	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1088	>	{ OPER_FLAG_SQUIT,          'R' },
1089	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1090	>	{ OPER_FLAG_UNKLINE,        'U' },
1091	>	{ OPER_FLAG_XLINE,          'X' },
1092		{ 0, '\0' }
1093		};
1094
1095		char *
1096		oper_privs_as_string(const unsigned int port)
1097		{
1098	<	static char privs_out[16];
1098	>	static char privs_out[IRCD_BUFSIZE];
1099		char *privs_ptr = privs_out;
2172	–	unsigned int i = 0;
1100
1101	<	for (; flag_list[i].oprivs; ++i)
1101	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1102		{
1103	<	if (port & flag_list[i].oprivs)
1104	<	*privs_ptr++ = flag_list[i].c;
1103	>	if (port & opriv->flag)
1104	>	*privs_ptr++ = opriv->c;
1105		else
1106	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1106	>	*privs_ptr++ = ToLower(opriv->c);
1107		}
1108
1109		*privs_ptr = '\0';
#	Line 2185 | Line 1112 | oper_privs_as_string(const unsigned int
1112		}
1113
1114		/*
1115	<	* Input: A client to find the active oper{} name for.
1115	>	* Input: A client to find the active operator {} name for.
1116		* Output: The nick!user@host{oper} of the oper.
1117		*         "oper" is server name for remote opers
1118		* Side effects: None.
#	Line 2193 | Line 1120 | oper_privs_as_string(const unsigned int
1120		const char *
1121		get_oper_name(const struct Client *client_p)
1122		{
2196	–	dlink_node *cnode = NULL;
1123		/* +5 for !,@,{,} and null */
1124		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1125
1126	+	if (IsServer(client_p))
1127	+	return client_p->name;
1128	+
1129		if (MyConnect(client_p))
1130		{
1131	<	if ((cnode = client_p->localClient->confs.head))
1131	>	const dlink_node *const node = client_p->connection->confs.head;
1132	>
1133	>	if (node)
1134		{
1135	<	struct ConfItem *conf = cnode->data;
2205	<	const struct AccessItem *aconf = map_to_conf(conf);
1135	>	const struct MaskItem *const conf = node->data;
1136
1137	<	if (IsConfOperator(aconf))
1137	>	if (conf->type == CONF_OPER)
1138		{
1139	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1139	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1140		client_p->username, client_p->host, conf->name);
1141	<	return buffer;
1141	>	return buffer;
1142		}
1143		}
1144
1145	<	/* Probably should assert here for now. If there is an oper out there
1146	<	* with no oper{} conf attached, it would be good for us to know...
1145	>	/*
1146	>	* Probably should assert here for now. If there is an oper out there
1147	>	* with no operator {} conf attached, it would be good for us to know...
1148		*/
1149	<	assert(0); /* Oper without oper conf! */
1149	>	assert(0);  /* Oper without oper conf! */
1150		}
1151
1152		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1153	<	client_p->username, client_p->host, client_p->servptr->name);
1153	>	client_p->username, client_p->host, client_p->servptr->name);
1154		return buffer;
1155		}
1156
2226	–	/* read_conf_files()
2227	–	*
2228	–	* inputs       - cold start YES or NO
2229	–	* output       - none
2230	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2231	–	*/
2232	–	void
2233	–	read_conf_files(int cold)
2234	–	{
2235	–	const char *filename;
2236	–	char chanmodes[32];
2237	–	char chanlimit[32];
2238	–
2239	–	conf_parser_ctx.boot = cold;
2240	–	filename = get_conf_name(CONF_TYPE);
2241	–
2242	–	/* We need to know the initial filename for the yyerror() to report
2243	–	FIXME: The full path is in conffilenamebuf first time since we
2244	–	dont know anything else
2245	–
2246	–	- Gozem 2002-07-21
2247	–	*/
2248	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2249	–
2250	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
2251	–	{
2252	–	if (cold)
2253	–	{
2254	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2255	–	filename, strerror(errno));
2256	–	exit(-1);
2257	–	}
2258	–	else
2259	–	{
2260	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2261	–	"Unable to read configuration file '%s': %s",
2262	–	filename, strerror(errno));
2263	–	return;
2264	–	}
2265	–	}
2266	–
2267	–	if (!cold)
2268	–	clear_out_old_conf();
2269	–
2270	–	read_conf(conf_parser_ctx.conf_file);
2271	–	fclose(conf_parser_ctx.conf_file);
2272	–
2273	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2274	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d",
2275	–	ConfigChannel.max_bans);
2276	–	add_isupport("MAXLIST", chanmodes, -1);
2277	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2278	–
2279	–	add_isupport("CHANTYPES", "#", -1);
2280	–
2281	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
2282	–	ConfigChannel.max_chans_per_user);
2283	–	add_isupport("CHANLIMIT", chanlimit, -1);
2284	–	snprintf(chanmodes, sizeof(chanmodes), "%s",
2285	–	"beI,k,l,imnprstORS");
2286	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2287	–
2288	–	add_isupport("EXCEPTS", "e", -1);
2289	–	add_isupport("INVEX", "I", -1);
2290	–	add_isupport("CHANMODES", chanmodes, -1);
2291	–
2292	–	/*
2293	–	* message_locale may have changed.  rebuild isupport since it relies
2294	–	* on strlen(form_str(RPL_ISUPPORT))
2295	–	*/
2296	–	rebuild_isupport_message_line();
2297	–
2298	–	parse_conf_file(KLINE_TYPE, cold);
2299	–	parse_conf_file(DLINE_TYPE, cold);
2300	–	parse_conf_file(XLINE_TYPE, cold);
2301	–	parse_conf_file(NRESV_TYPE, cold);
2302	–	parse_conf_file(CRESV_TYPE, cold);
2303	–	}
2304	–
2305	–	/* parse_conf_file()
2306	–	*
2307	–	* inputs       - type of conf file to parse
2308	–	* output       - none
2309	–	* side effects - conf file for givenconf type is opened and read then parsed
2310	–	*/
2311	–	static void
2312	–	parse_conf_file(int type, int cold)
2313	–	{
2314	–	FILE *file = NULL;
2315	–	const char *filename = get_conf_name(type);
2316	–
2317	–	if ((file = fopen(filename, "r")) == NULL)
2318	–	{
2319	–	if (cold)
2320	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2321	–	filename, strerror(errno));
2322	–	else
2323	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2324	–	"Unable to read configuration file '%s': %s",
2325	–	filename, strerror(errno));
2326	–	}
2327	–	else
2328	–	{
2329	–	parse_csv_file(file, type);
2330	–	fclose(file);
2331	–	}
2332	–	}
2333	–
1157		/* clear_out_old_conf()
1158		*
1159		* inputs       - none
#	Line 2340 | Line 1163 | parse_conf_file(int type, int cold)
1163		static void
1164		clear_out_old_conf(void)
1165		{
1166	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2344	<	struct ConfItem *conf;
2345	<	struct AccessItem *aconf;
2346	<	struct ClassItem *cltmp;
1166	>	dlink_node *node = NULL, *node_next = NULL;
1167		dlink_list *free_items [] = {
1168		&server_items,   &oconf_items,
1169	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1170	<	&nresv_items, &cluster_items,  &service_items, NULL
1169	>	&uconf_items,   &xconf_items,
1170	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1171		};
1172
1173		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2355 | Line 1175 | clear_out_old_conf(void)
1175		/* We only need to free anything allocated by yyparse() here.
1176		* Resetting structs, etc, is taken care of by set_default_conf().
1177		*/
1178	<
1179	<	for (; *iterator != NULL; iterator++)
1178	>
1179	>	for (; *iterator; iterator++)
1180		{
1181	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1181	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1182		{
1183	<	conf = ptr->data;
2364	<	/* XXX This is less than pretty */
2365	<	if (conf->type == SERVER_TYPE)
2366	<	{
2367	<	aconf = map_to_conf(conf);
1183	>	struct MaskItem *conf = node->data;
1184
1185	<	if (aconf->clients != 0)
1186	<	{
2371	<	SetConfIllegal(aconf);
2372	<	dlinkDelete(&conf->node, &server_items);
2373	<	}
2374	<	else
2375	<	{
2376	<	delete_conf_item(conf);
2377	<	}
2378	<	}
2379	<	else if (conf->type == OPER_TYPE)
2380	<	{
2381	<	aconf = map_to_conf(conf);
1185	>	conf->active = 0;
1186	>	dlinkDelete(&conf->node, *iterator);
1187
1188	<	if (aconf->clients != 0)
1189	<	{
2385	<	SetConfIllegal(aconf);
2386	<	dlinkDelete(&conf->node, &oconf_items);
2387	<	}
2388	<	else
2389	<	{
2390	<	delete_conf_item(conf);
2391	<	}
2392	<	}
2393	<	else if (conf->type == XLINE_TYPE  ||
2394	<	conf->type == RXLINE_TYPE ||
2395	<	conf->type == RKLINE_TYPE)
1188	>	/* XXX This is less than pretty */
1189	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1190		{
1191	<	/* temporary (r)xlines are also on
1192	<	* the (r)xconf items list */
2399	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2400	<	continue;
2401	<
2402	<	delete_conf_item(conf);
1191	>	if (!conf->ref_count)
1192	>	conf_free(conf);
1193		}
1194	<	else
1194	>	else if (conf->type == CONF_XLINE)
1195		{
1196	<	delete_conf_item(conf);
1196	>	if (!conf->until)
1197	>	conf_free(conf);
1198		}
1199	+	else
1200	+	conf_free(conf);
1201		}
1202		}
1203
1204	+	motd_clear();
1205	+
1206		/*
1207		* don't delete the class table, rather mark all entries
1208	<	* for deletion. The table is cleaned up by check_class. - avalon
1208	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1209		*/
1210	<	DLINK_FOREACH(ptr, class_items.head)
2416	<	{
2417	<	cltmp = map_to_conf(ptr->data);
2418	<
2419	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2420	<	cltmp->active = 0;
2421	<	}
1210	>	class_mark_for_deletion();
1211
1212		clear_out_address_conf();
1213
1214		/* clean out module paths */
1215		mod_clear_paths();
1216
1217	<	/* clean out ServerInfo */
1218	<	MyFree(ServerInfo.description);
1219	<	ServerInfo.description = NULL;
1220	<	MyFree(ServerInfo.network_name);
1221	<	ServerInfo.network_name = NULL;
1222	<	MyFree(ServerInfo.network_desc);
1223	<	ServerInfo.network_desc = NULL;
1224	<	MyFree(ConfigFileEntry.egdpool_path);
1225	<	ConfigFileEntry.egdpool_path = NULL;
1217	>	pseudo_clear();
1218	>
1219	>	/* clean out ConfigServerInfo */
1220	>	MyFree(ConfigServerInfo.description);
1221	>	ConfigServerInfo.description = NULL;
1222	>	MyFree(ConfigServerInfo.network_name);
1223	>	ConfigServerInfo.network_name = NULL;
1224	>	MyFree(ConfigServerInfo.network_desc);
1225	>	ConfigServerInfo.network_desc = NULL;
1226		#ifdef HAVE_LIBCRYPTO
1227	<	if (ServerInfo.rsa_private_key != NULL)
1227	>	if (ConfigServerInfo.rsa_private_key)
1228		{
1229	<	RSA_free(ServerInfo.rsa_private_key);
1230	<	ServerInfo.rsa_private_key = NULL;
1229	>	RSA_free(ConfigServerInfo.rsa_private_key);
1230	>	ConfigServerInfo.rsa_private_key = NULL;
1231		}
1232
1233	<	MyFree(ServerInfo.rsa_private_key_file);
1234	<	ServerInfo.rsa_private_key_file = NULL;
2446	<
2447	<	if (ServerInfo.server_ctx)
2448	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2449	<	SSL_OP_NO_SSLv3|
2450	<	SSL_OP_NO_TLSv1);
2451	<	if (ServerInfo.client_ctx)
2452	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2453	<	SSL_OP_NO_SSLv3|
2454	<	SSL_OP_NO_TLSv1);
1233	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1234	>	ConfigServerInfo.rsa_private_key_file = NULL;
1235		#endif
1236
1237	<	/* clean out old resvs from the conf */
1238	<	clear_conf_resv();
1239	<
1240	<	/* clean out AdminInfo */
1241	<	MyFree(AdminInfo.name);
1242	<	AdminInfo.name = NULL;
1243	<	MyFree(AdminInfo.email);
2464	<	AdminInfo.email = NULL;
2465	<	MyFree(AdminInfo.description);
2466	<	AdminInfo.description = NULL;
1237	>	/* clean out ConfigAdminInfo */
1238	>	MyFree(ConfigAdminInfo.name);
1239	>	ConfigAdminInfo.name = NULL;
1240	>	MyFree(ConfigAdminInfo.email);
1241	>	ConfigAdminInfo.email = NULL;
1242	>	MyFree(ConfigAdminInfo.description);
1243	>	ConfigAdminInfo.description = NULL;
1244
2468	–	/* operator{} and class{} blocks are freed above */
1245		/* clean out listeners */
1246		close_listeners();
2471	–
2472	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2473	–	* exempt{} and gecos{} blocks are freed above too
2474	–	*/
2475	–
2476	–	/* clean out general */
2477	–	MyFree(ConfigFileEntry.service_name);
2478	–	ConfigFileEntry.service_name = NULL;
2479	–
2480	–	delete_isupport("INVEX");
2481	–	delete_isupport("EXCEPTS");
1247		}
1248
1249	<	/* flush_deleted_I_P()
1249	>	/* read_conf_files()
1250		*
1251	<	* inputs       - none
1251	>	* inputs       - cold start YES or NO
1252		* output       - none
1253	<	* side effects - This function removes I/P conf items
1253	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1254		*/
1255	<	static void
1256	<	flush_deleted_I_P(void)
1255	>	void
1256	>	read_conf_files(int cold)
1257		{
1258	<	dlink_node *ptr;
1259	<	dlink_node *next_ptr;
1260	<	struct ConfItem *conf;
2496	<	struct AccessItem *aconf;
2497	<	dlink_list * free_items [] = {
2498	<	&server_items, &oconf_items, NULL
2499	<	};
2500	<	dlink_list ** iterator = free_items; /* C is dumb */
1258	>	const char *filename = NULL;
1259	>	char chanmodes[IRCD_BUFSIZE] = "";
1260	>	char chanlimit[IRCD_BUFSIZE] = "";
1261
1262	<	/* flush out deleted I and P lines
1263	<	* although still in use.
2504	<	*/
2505	<	for (; *iterator != NULL; iterator++)
2506	<	{
2507	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2508	<	{
2509	<	conf = ptr->data;
2510	<	aconf = (struct AccessItem *)map_to_conf(conf);
2511	<
2512	<	if (IsConfIllegal(aconf))
2513	<	{
2514	<	dlinkDelete(ptr, *iterator);
2515	<
2516	<	if (aconf->clients == 0)
2517	<	delete_conf_item(conf);
2518	<	}
2519	<	}
2520	<	}
2521	<	}
2522	<
2523	<	/* get_conf_name()
2524	<	*
2525	<	* inputs       - type of conf file to return name of file for
2526	<	* output       - pointer to filename for type of conf
2527	<	* side effects - none
2528	<	*/
2529	<	const char *
2530	<	get_conf_name(ConfType type)
2531	<	{
2532	<	switch (type)
2533	<	{
2534	<	case CONF_TYPE:
2535	<	return ConfigFileEntry.configfile;
2536	<	break;
2537	<	case KLINE_TYPE:
2538	<	return ConfigFileEntry.klinefile;
2539	<	break;
2540	<	case DLINE_TYPE:
2541	<	return ConfigFileEntry.dlinefile;
2542	<	break;
2543	<	case XLINE_TYPE:
2544	<	return ConfigFileEntry.xlinefile;
2545	<	break;
2546	<	case CRESV_TYPE:
2547	<	return ConfigFileEntry.cresvfile;
2548	<	break;
2549	<	case NRESV_TYPE:
2550	<	return ConfigFileEntry.nresvfile;
2551	<	break;
2552	<	default:
2553	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2554	<	only with the above values, this will cause us to core
2555	<	at some point if this happens so we know where it was */
2556	<	}
2557	<	}
1262	>	conf_parser_ctx.boot = cold;
1263	>	filename = ConfigGeneral.configfile;
1264
1265	<	#define BAD_PING (-1)
1265	>	/* We need to know the initial filename for the yyerror() to report
1266	>	FIXME: The full path is in conffilenamebuf first time since we
1267	>	don't know anything else
1268
1269	<	/* get_conf_ping()
1270	<	*
1271	<	* inputs       - pointer to struct AccessItem
2564	<	*              - pointer to a variable that receives ping warning time
2565	<	* output       - ping frequency
2566	<	* side effects - NONE
2567	<	*/
2568	<	static int
2569	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2570	<	{
2571	<	struct ClassItem *aclass;
2572	<	struct AccessItem *aconf;
1269	>	- Gozem 2002-07-21
1270	>	*/
1271	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1272
1273	<	if (conf != NULL)
1273	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1274		{
1275	<	aconf = (struct AccessItem *)map_to_conf(conf);
2577	<	if (aconf->class_ptr != NULL)
1275	>	if (cold)
1276		{
1277	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1278	<	*pingwarn = aclass->ping_warning;
1279	<	return aclass->ping_freq;
1277	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1278	>	filename, strerror(errno));
1279	>	exit(-1);
1280		}
1281	<	}
2584	<
2585	<	return BAD_PING;
2586	<	}
2587	<
2588	<	/* get_client_class()
2589	<	*
2590	<	* inputs       - pointer to client struct
2591	<	* output       - pointer to name of class
2592	<	* side effects - NONE
2593	<	*/
2594	<	const char *
2595	<	get_client_class(struct Client *target_p)
2596	<	{
2597	<	dlink_node *cnode = NULL;
2598	<	struct AccessItem *aconf = NULL;
2599	<
2600	<	assert(!IsMe(target_p));
2601	<
2602	<	if ((cnode = target_p->localClient->confs.head))
2603	<	{
2604	<	struct ConfItem *conf = cnode->data;
2605	<
2606	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2607	<	(conf->type == OPER_TYPE));
2608	<
2609	<	aconf = map_to_conf(conf);
2610	<	if (aconf->class_ptr != NULL)
2611	<	return aconf->class_ptr->name;
2612	<	}
2613	<
2614	<	return "default";
2615	<	}
2616	<
2617	<	/* get_client_ping()
2618	<	*
2619	<	* inputs       - pointer to client struct
2620	<	*              - pointer to a variable that receives ping warning time
2621	<	* output       - ping frequency
2622	<	* side effects - NONE
2623	<	*/
2624	<	int
2625	<	get_client_ping(struct Client *target_p, int *pingwarn)
2626	<	{
2627	<	int ping = 0;
2628	<	dlink_node *cnode = NULL;
2629	<
2630	<	if ((cnode = target_p->localClient->confs.head))
2631	<	{
2632	<	struct ConfItem *conf = cnode->data;
2633	<
2634	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2635	<	(conf->type == OPER_TYPE));
2636	<
2637	<	ping = get_conf_ping(conf, pingwarn);
2638	<	if (ping > 0)
2639	<	return ping;
2640	<	}
2641	<
2642	<	*pingwarn = 0;
2643	<	return DEFAULT_PINGFREQUENCY;
2644	<	}
2645	<
2646	<	/* find_class()
2647	<	*
2648	<	* inputs       - string name of class
2649	<	* output       - corresponding Class pointer
2650	<	* side effects - NONE
2651	<	*/
2652	<	struct ConfItem *
2653	<	find_class(const char *classname)
2654	<	{
2655	<	struct ConfItem *conf;
2656	<
2657	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2658	<	return conf;
2659	<
2660	<	return class_default;
2661	<	}
2662	<
2663	<	/* check_class()
2664	<	*
2665	<	* inputs       - NONE
2666	<	* output       - NONE
2667	<	* side effects -
2668	<	*/
2669	<	void
2670	<	check_class(void)
2671	<	{
2672	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2673	<
2674	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2675	<	{
2676	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2677	<
2678	<	if (!aclass->active && !aclass->curr_user_count)
1281	>	else
1282		{
1283	<	destroy_cidr_class(aclass);
1284	<	delete_conf_item(ptr->data);
1283	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1284	>	"Unable to read configuration file '%s': %s",
1285	>	filename, strerror(errno));
1286	>	return;
1287		}
1288		}
2684	–	}
2685	–
2686	–	/* init_class()
2687	–	*
2688	–	* inputs       - NONE
2689	–	* output       - NONE
2690	–	* side effects -
2691	–	*/
2692	–	void
2693	–	init_class(void)
2694	–	{
2695	–	struct ClassItem *aclass;
2696	–
2697	–	class_default = make_conf_item(CLASS_TYPE);
2698	–
2699	–	aclass = map_to_conf(class_default);
2700	–	aclass->active = 1;
2701	–	DupString(class_default->name, "default");
2702	–	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2703	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2704	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2705	–	aclass->max_sendq = DEFAULT_SENDQ;
2706	–	aclass->max_recvq = DEFAULT_RECVQ;
2707	–
2708	–	client_check_cb = register_callback("check_client", check_client);
2709	–	}
2710	–
2711	–	/* get_sendq()
2712	–	*
2713	–	* inputs       - pointer to client
2714	–	* output       - sendq for this client as found from its class
2715	–	* side effects - NONE
2716	–	*/
2717	–	unsigned int
2718	–	get_sendq(struct Client *client_p)
2719	–	{
2720	–	unsigned int sendq = DEFAULT_SENDQ;
2721	–	dlink_node *cnode;
2722	–	struct ConfItem *class_conf;
2723	–	struct ClassItem *aclass;
2724	–	struct AccessItem *aconf;
2725	–
2726	–	assert(!IsMe(client_p));
2727	–
2728	–	if ((cnode = client_p->localClient->confs.head))
2729	–	{
2730	–	struct ConfItem *conf = cnode->data;
2731	–
2732	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2733	–	(conf->type == OPER_TYPE));
2734	–
2735	–	aconf = map_to_conf(conf);
2736	–
2737	–	if ((class_conf = aconf->class_ptr) == NULL)
2738	–	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
2739	–
2740	–	aclass = map_to_conf(class_conf);
2741	–	sendq = aclass->max_sendq;
2742	–	return sendq;
2743	–	}
1289
1290	<	/* XXX return a default?
1291	<	* if here, then there wasn't an attached conf with a sendq
2747	<	* that is very bad -Dianora
2748	<	*/
2749	<	return DEFAULT_SENDQ;
2750	<	}
2751	<
2752	<	unsigned int
2753	<	get_recvq(struct Client *client_p)
2754	<	{
2755	<	unsigned int recvq = DEFAULT_RECVQ;
2756	<	dlink_node *cnode;
2757	<	struct ConfItem *class_conf;
2758	<	struct ClassItem *aclass;
2759	<	struct AccessItem *aconf;
2760	<
2761	<	assert(!IsMe(client_p));
1290	>	if (!cold)
1291	>	clear_out_old_conf();
1292
1293	<	if ((cnode = client_p->localClient->confs.head))
1294	<	{
2765	<	struct ConfItem *conf = cnode->data;
1293	>	read_conf(conf_parser_ctx.conf_file);
1294	>	fclose(conf_parser_ctx.conf_file);
1295
1296	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2768	<	(conf->type == OPER_TYPE));
1296	>	log_reopen_all();
1297
1298	<	aconf = map_to_conf(conf);
1298	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1299	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1300
1301	<	if ((class_conf = aconf->class_ptr) == NULL)
1302	<	return DEFAULT_RECVQ; /* TBV: shouldn't be possible at all */
1301	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1302	>	add_isupport("MAXLIST", chanmodes, -1);
1303	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1304	>	add_isupport("CHANTYPES", "#", -1);
1305
1306	<	aclass = map_to_conf(class_conf);
1307	<	recvq = aclass->max_recvq;
1308	<	return recvq;
1309	<	}
1306	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1307	>	ConfigChannel.max_channels);
1308	>	add_isupport("CHANLIMIT", chanlimit, -1);
1309	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1310	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1311	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1312	>	add_isupport("CHANMODES", chanmodes, -1);
1313
1314	<	/* XXX return a default?
1315	<	* if here, then there wasn't an attached conf with a recvq
1316	<	* that is very bad -Dianora
1314	>	/*
1315	>	* message_locale may have changed.  rebuild isupport since it relies
1316	>	* on strlen(form_str(RPL_ISUPPORT))
1317		*/
1318	<	return DEFAULT_RECVQ;
1318	>	rebuild_isupport_message_line();
1319		}
1320
1321		/* conf_add_class_to_conf()
1322		*
1323		* inputs       - pointer to config item
1324		* output       - NONE
1325	<	* side effects - Add a class pointer to a conf
1325	>	* side effects - Add a class pointer to a conf
1326		*/
1327		void
1328	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1328	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1329		{
1330	<	struct AccessItem *aconf = map_to_conf(conf);
2797	<	struct ClassItem *class = NULL;
2798	<
2799	<	if (class_name == NULL)
1330	>	if (class_name == NULL)
1331		{
1332	<	aconf->class_ptr = class_default;
1332	>	conf->class = class_default;
1333
1334	<	if (conf->type == CLIENT_TYPE)
1335	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1336	<	"Warning *** Defaulting to default class for %s@%s",
1337	<	aconf->user, aconf->host);
1334	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1335	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1336	>	"Warning *** Defaulting to default class for %s@%s",
1337	>	conf->user, conf->host);
1338		else
1339	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1340	<	"Warning *** Defaulting to default class for %s",
1341	<	conf->name);
1339	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1340	>	"Warning *** Defaulting to default class for %s",
1341	>	conf->name);
1342		}
1343		else
1344	<	aconf->class_ptr = find_class(class_name);
1344	>	conf->class = class_find(class_name, 1);
1345
1346	<	if (aconf->class_ptr)
2816	<	class = map_to_conf(aconf->class_ptr);
2817	<
2818	<	if (aconf->class_ptr == NULL || !class->active)
1346	>	if (conf->class == NULL)
1347		{
1348	<	if (conf->type == CLIENT_TYPE)
1349	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1350	<	"Warning *** Defaulting to default class for %s@%s",
1351	<	aconf->user, aconf->host);
1348	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1349	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1350	>	"Warning *** Defaulting to default class for %s@%s",
1351	>	conf->user, conf->host);
1352		else
1353	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1354	<	"Warning *** Defaulting to default class for %s",
1355	<	conf->name);
1356	<	aconf->class_ptr = class_default;
2829	<	}
2830	<	}
2831	<
2832	<	/* conf_add_server()
2833	<	*
2834	<	* inputs       - pointer to config item
2835	<	*              - pointer to link count already on this conf
2836	<	* output       - NONE
2837	<	* side effects - Add a connect block
2838	<	*/
2839	<	int
2840	<	conf_add_server(struct ConfItem *conf, const char *class_name)
2841	<	{
2842	<	struct AccessItem *aconf = map_to_conf(conf);
2843	<
2844	<	conf_add_class_to_conf(conf, class_name);
2845	<
2846	<	if (!aconf->host || !conf->name)
2847	<	{
2848	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
2849	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
2850	<	return -1;
2851	<	}
2852	<
2853	<	if (EmptyString(aconf->passwd))
2854	<	{
2855	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
2856	<	conf->name);
2857	<	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2858	<	return -1;
1353	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1354	>	"Warning *** Defaulting to default class for %s",
1355	>	conf->name);
1356	>	conf->class = class_default;
1357		}
2860	–
2861	–	lookup_confhost(conf);
2862	–
2863	–	return 0;
1358		}
1359
1360		/* yyerror()
#	Line 2878 | Line 1372 | yyerror(const char *msg)
1372		return;
1373
1374		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1375	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1375	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1376	>	"\"%s\", line %u: %s: %s",
1377	>	conffilebuf, lineno + 1, msg, newlinebuf);
1378	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1379	>	conffilebuf, lineno + 1, msg, newlinebuf);
1380	>	}
1381	>
1382	>	void
1383	>	conf_error_report(const char *msg)
1384	>	{
1385	>	char newlinebuf[IRCD_BUFSIZE];
1386	>
1387	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1388	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1389	>	"\"%s\", line %u: %s: %s",
1390		conffilebuf, lineno + 1, msg, newlinebuf);
1391		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1392		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2886 | Line 1394 | yyerror(const char *msg)
1394
1395		/*
1396		* valid_tkline()
1397	<	*
1397	>	*
1398		* inputs       - pointer to ascii string to check
1399		*              - whether the specified time is in seconds or minutes
1400		* output       - -1 not enough parameters
#	Line 2895 | Line 1403 | yyerror(const char *msg)
1403		* Originally written by Dianora (Diane, db@db.net)
1404		*/
1405		time_t
1406	<	valid_tkline(const char *p, int minutes)
1406	>	valid_tkline(const char *data, const int minutes)
1407		{
1408	+	const unsigned char *p = (const unsigned char *)data;
1409	+	unsigned char tmpch = '\0';
1410		time_t result = 0;
1411
1412	<	for (; *p; ++p)
1412	>	while ((tmpch = *p++))
1413		{
1414	<	if (!IsDigit(*p))
1414	>	if (!IsDigit(tmpch))
1415		return 0;
1416
1417		result *= 10;
1418	<	result += ((*p) & 0xF);
1418	>	result += (tmpch & 0xF);
1419		}
1420
1421		/*
1422	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1422	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1423		* i.e. they specifically use 0, I am going to return 1 instead
1424		* as a return value of non-zero is used to flag it as a temporary kline
1425		*/
1426		if (result == 0)
1427		result = 1;
1428
1429	<	/*
1429	>	/*
1430		* If the incoming time is in seconds convert it to minutes for the purpose
1431		* of this calculation
1432		*/
1433		if (!minutes)
1434	<	result = result / (time_t)60;
1434	>	result = result / 60;
1435
1436		if (result > MAX_TDKLINE_TIME)
1437		result = MAX_TDKLINE_TIME;
1438
1439	<	result = result * (time_t)60;  /* turn it into seconds */
1439	>	result = result * 60;  /* turn it into seconds */
1440
1441		return result;
1442		}
1443
1444	+	/* valid_wild_card_simple()
1445	+	*
1446	+	* inputs       - data to check for sufficient non-wildcard characters
1447	+	* outputs      - 1 if valid, else 0
1448	+	* side effects - none
1449	+	*/
1450	+	int
1451	+	valid_wild_card_simple(const char *data)
1452	+	{
1453	+	const unsigned char *p = (const unsigned char *)data;
1454	+	unsigned char tmpch = '\0';
1455	+	unsigned int nonwild = 0;
1456	+
1457	+	while ((tmpch = *p++))
1458	+	{
1459	+	if (tmpch == '\\' && *p)
1460	+	{
1461	+	++p;
1462	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1463	+	return 1;
1464	+	}
1465	+	else if (!IsMWildChar(tmpch))
1466	+	{
1467	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1468	+	return 1;
1469	+	}
1470	+	}
1471	+
1472	+	return 0;
1473	+	}
1474	+
1475		/* valid_wild_card()
1476		*
1477		* input        - pointer to client
#	Line 2942 | Line 1483 | valid_tkline(const char *p, int minutes)
1483		int
1484		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1485		{
1486	<	char *p;
1487	<	char tmpch;
2947	<	int nonwild = 0;
1486	>	unsigned char tmpch = '\0';
1487	>	unsigned int nonwild = 0;
1488		va_list args;
1489
1490		/*
#	Line 2963 | Line 1503 | valid_wild_card(struct Client *source_p,
1503
1504		while (count--)
1505		{
1506	<	p = va_arg(args, char *);
1506	>	const unsigned char *p = va_arg(args, const unsigned char *);
1507		if (p == NULL)
1508		continue;
1509
#	Line 2975 | Line 1515 | valid_wild_card(struct Client *source_p,
1515		* If we find enough non-wild characters, we can
1516		* break - no point in searching further.
1517		*/
1518	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1518	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1519	>	{
1520	>	va_end(args);
1521		return 1;
1522	+	}
1523		}
1524		}
1525		}
1526
1527		if (warn)
1528	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1529	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1528	>	sendto_one_notice(source_p, &me,
1529	>	":Please include at least %u non-wildcard characters with the mask",
1530	>	ConfigGeneral.min_nonwildcard);
1531	>	va_end(args);
1532	>	return 0;
1533	>	}
1534	>
1535	>	/* find_user_host()
1536	>	*
1537	>	* inputs       - pointer to client placing kline
1538	>	*              - pointer to user_host_or_nick
1539	>	*              - pointer to user buffer
1540	>	*              - pointer to host buffer
1541	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1542	>	* side effects -
1543	>	*/
1544	>	static int
1545	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1546	>	char *luser, char *lhost, unsigned int flags)
1547	>	{
1548	>	struct Client *target_p = NULL;
1549	>	char *hostp = NULL;
1550	>
1551	>	if (lhost == NULL)
1552	>	{
1553	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1554	>	return 1;
1555	>	}
1556	>
1557	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1558	>	{
1559	>	/* Explicit user@host mask given */
1560	>	if (hostp)                            /* I'm a little user@host */
1561	>	{
1562	>	*(hostp++) = '\0';                       /* short and squat */
1563	>
1564	>	if (*user_host_or_nick)
1565	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1566	>	else
1567	>	strcpy(luser, "*");
1568	>
1569	>	if (*hostp)
1570	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1571	>	else
1572	>	strcpy(lhost, "*");
1573	>	}
1574	>	else
1575	>	{
1576	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1577	>	luser[1] = '\0';
1578	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1579	>	}
1580	>
1581	>	return 1;
1582	>	}
1583	>	else
1584	>	{
1585	>	/* Try to find user@host mask from nick */
1586	>	/* Okay to use source_p as the first param, because source_p == client_p */
1587	>	if ((target_p =
1588	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1589	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1590	>
1591	>	if (IsExemptKline(target_p))
1592	>	{
1593	>	if (IsClient(source_p))
1594	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1595	>	return 0;
1596	>	}
1597	>
1598	>	/*
1599	>	* turn the "user" bit into "*user", blow away '~'
1600	>	* if found in original user name (non-idented)
1601	>	*/
1602	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1603	>
1604	>	if (target_p->username[0] == '~')
1605	>	luser[0] = '*';
1606	>
1607	>	if (!strcmp(target_p->sockhost, "0"))
1608	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1609	>	else
1610	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1611	>	return 1;
1612	>	}
1613	>
1614		return 0;
1615		}
1616
#	Line 2997 | Line 1624 | valid_wild_card(struct Client *source_p,
1624		*              - parse_flags bit map of things to test
1625		*              - pointer to user or string to parse into
1626		*              - pointer to host or NULL to parse into if non NULL
1627	<	*              - pointer to optional tkline time or NULL
1627	>	*              - pointer to optional tkline time or NULL
1628		*              - pointer to target_server to parse into if non NULL
1629		*              - pointer to reason to parse into
1630		*
#	Line 3019 | Line 1646 | valid_wild_card(struct Client *source_p,
1646		*/
1647		int
1648		parse_aline(const char *cmd, struct Client *source_p,
1649	<	int parc, char **parv,
1650	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1651	<	char **target_server, char **reason)
1649	>	int parc, char **parv,
1650	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1651	>	char **target_server, char **reason)
1652		{
1653		int found_tkline_time=0;
1654	<	static char def_reason[] = "No Reason";
1654	>	static char def_reason[] = CONF_NOREASON;
1655		static char user[USERLEN*4+1];
1656		static char host[HOSTLEN*4+1];
1657
#	Line 3033 | Line 1660 | parse_aline(const char *cmd, struct Clie
1660
1661		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1662
1663	<	if (found_tkline_time != 0)
1663	>	if (found_tkline_time)
1664		{
1665		parv++;
1666		parc--;
1667
1668	<	if (tkline_time != NULL)
1668	>	if (tkline_time)
1669		*tkline_time = found_tkline_time;
1670		else
1671		{
1672	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3046	<	me.name, source_p->name, cmd);
1672	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1673		return -1;
1674		}
1675		}
1676
1677		if (parc == 0)
1678		{
1679	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3054	<	me.name, source_p->name, cmd);
1679	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1680		return -1;
1681		}
1682
#	Line 3065 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		*up_p = user;
1691		*h_p = host;
1692		}
1693	<
1693	>
1694		parc--;
1695		parv++;
1696
1697	<	if (parc != 0)
1697	>	if (parc)
1698		{
1699		if (irccmp(*parv, "ON") == 0)
1700		{
#	Line 3078 | Line 1703 | parse_aline(const char *cmd, struct Clie
1703
1704		if (target_server == NULL)
1705		{
1706	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1707	<	me.name, source_p->name, cmd);
3083	<	return -1;
1706	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1707	>	return -1;
1708		}
1709
1710		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1711		{
1712	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3089	<	me.name, source_p->name, "remoteban");
1712	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1713		return -1;
1714		}
1715
1716		if (parc == 0 || EmptyString(*parv))
1717		{
1718	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1719	<	me.name, source_p->name, cmd);
3097	<	return -1;
1718	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1719	>	return -1;
1720		}
1721
1722		*target_server = *parv;
#	Line 3106 | Line 1728 | parse_aline(const char *cmd, struct Clie
1728		/* Make sure target_server *is* NULL if no ON server found
1729		* caller probably NULL'd it first, but no harm to do it again -db
1730		*/
1731	<	if (target_server != NULL)
1732	<	*target_server = NULL;
1731	>	if (target_server)
1732	>	*target_server = NULL;
1733		}
1734		}
1735
1736	<	if (h_p != NULL)
1736	>	if (h_p)
1737		{
1738	<	if (strchr(user, '!') != NULL)
1738	>	if (strchr(user, '!'))
1739		{
1740	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3119	<	me.name, source_p->name);
1740	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1741		return -1;
1742		}
1743
#	Line 3127 | Line 1748 | parse_aline(const char *cmd, struct Clie
1748		if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1749		return -1;
1750
1751	<	if (reason != NULL)
1751	>	if (reason)
1752		{
1753	<	if (parc != 0 && !EmptyString(*parv))
1753	>	if (parc && !EmptyString(*parv))
1754		{
1755		*reason = *parv;
1756	+
1757		if (!valid_comment(source_p, *reason, 1))
1758	<	return -1;
1758	>	return -1;
1759		}
1760		else
1761		*reason = def_reason;
#	Line 3142 | Line 1764 | parse_aline(const char *cmd, struct Clie
1764		return 1;
1765		}
1766
3145	–	/* find_user_host()
3146	–	*
3147	–	* inputs       - pointer to client placing kline
3148	–	*              - pointer to user_host_or_nick
3149	–	*              - pointer to user buffer
3150	–	*              - pointer to host buffer
3151	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3152	–	* side effects -
3153	–	*/
3154	–	static int
3155	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3156	–	char *luser, char *lhost, unsigned int flags)
3157	–	{
3158	–	struct Client *target_p = NULL;
3159	–	char *hostp = NULL;
3160	–
3161	–	if (lhost == NULL)
3162	–	{
3163	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3164	–	return 1;
3165	–	}
3166	–
3167	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3168	–	{
3169	–	/* Explicit user@host mask given */
3170	–
3171	–	if (hostp != NULL)                            /* I'm a little user@host */
3172	–	{
3173	–	*(hostp++) = '\0';                       /* short and squat */
3174	–	if (*user_host_or_nick)
3175	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3176	–	else
3177	–	strcpy(luser, "*");
3178	–	if (*hostp)
3179	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3180	–	else
3181	–	strcpy(lhost, "*");
3182	–	}
3183	–	else
3184	–	{
3185	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3186	–	luser[1] = '\0';
3187	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3188	–	}
3189	–
3190	–	return 1;
3191	–	}
3192	–	else
3193	–	{
3194	–	/* Try to find user@host mask from nick */
3195	–	/* Okay to use source_p as the first param, because source_p == client_p */
3196	–	if ((target_p =
3197	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3198	–	return 0;
3199	–
3200	–	if (IsExemptKline(target_p))
3201	–	{
3202	–	if (!IsServer(source_p))
3203	–	sendto_one(source_p,
3204	–	":%s NOTICE %s :%s is E-lined",
3205	–	me.name, source_p->name, target_p->name);
3206	–	return 0;
3207	–	}
3208	–
3209	–	/*
3210	–	* turn the "user" bit into "*user", blow away '~'
3211	–	* if found in original user name (non-idented)
3212	–	*/
3213	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3214	–
3215	–	if (target_p->username[0] == '~')
3216	–	luser[0] = '*';
3217	–
3218	–	if (target_p->sockhost[0] == '\0' ||
3219	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3220	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3221	–	else
3222	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3223	–	return 1;
3224	–	}
3225	–
3226	–	return 0;
3227	–	}
3228	–
1767		/* valid_comment()
1768		*
1769		* inputs       - pointer to client
#	Line 3237 | Line 1775 | find_user_host(struct Client *source_p,
1775		int
1776		valid_comment(struct Client *source_p, char *comment, int warn)
1777		{
3240	–	if (strchr(comment, '"'))
3241	–	{
3242	–	if (warn)
3243	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3244	–	me.name, source_p->name);
3245	–	return 0;
3246	–	}
3247	–
1778		if (strlen(comment) > REASONLEN)
1779		comment[REASONLEN-1] = '\0';
1780
#	Line 3259 | Line 1789 | valid_comment(struct Client *source_p, c
1789		* side effects - none
1790		*/
1791		int
1792	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1792	>	match_conf_password(const char *password, const struct MaskItem *conf)
1793		{
1794		const char *encr = NULL;
1795
1796	<	if (EmptyString(password) || EmptyString(aconf->passwd))
1796	>	if (EmptyString(password) || EmptyString(conf->passwd))
1797		return 0;
1798
1799	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1800	<	encr = crypt(password, aconf->passwd);
1799	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1800	>	encr = crypt(password, conf->passwd);
1801		else
1802		encr = password;
1803
1804	<	return !strcmp(encr, aconf->passwd);
1804	>	return encr && !strcmp(encr, conf->passwd);
1805		}
1806
1807		/*
#	Line 3279 | Line 1809 | match_conf_password(const char *password
1809		*
1810		* inputs       - client sending the cluster
1811		*              - command name "KLINE" "XLINE" etc.
1812	<	*              - capab -- CAP_KLN etc. from s_serv.h
1812	>	*              - capab -- CAP_KLN etc. from server.h
1813		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1814		*              - pattern and args to send along
1815		* output       - none
#	Line 3291 | Line 1821 | cluster_a_line(struct Client *source_p,
1821		int capab, int cluster_type, const char *pattern, ...)
1822		{
1823		va_list args;
1824	<	char buffer[IRCD_BUFSIZE];
1825	<	const dlink_node *ptr = NULL;
1824	>	char buffer[IRCD_BUFSIZE] = "";
1825	>	const dlink_node *node = NULL;
1826
1827		va_start(args, pattern);
1828		vsnprintf(buffer, sizeof(buffer), pattern, args);
1829		va_end(args);
1830
1831	<	DLINK_FOREACH(ptr, cluster_items.head)
1831	>	DLINK_FOREACH(node, cluster_items.head)
1832		{
1833	<	const struct ConfItem *conf = ptr->data;
1833	>	const struct MaskItem *conf = node->data;
1834
1835		if (conf->flags & cluster_type)
1836		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1837	<	"%s %s %s", command, conf->name, buffer);
1837	>	"%s %s %s", command, conf->name, buffer);
1838		}
1839		}
1840
#	Line 3343 | Line 1873 | split_nuh(struct split_nuh_item *const i
1873
1874		if (iptr->nickptr)
1875		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1876	+
1877		if (iptr->userptr)
1878		strlcpy(iptr->userptr, "*", iptr->usersize);
1879	+
1880		if (iptr->hostptr)
1881		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1882
#	Line 3352 | Line 1884 | split_nuh(struct split_nuh_item *const i
1884		{
1885		*p = '\0';
1886
1887	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1887	>	if (iptr->nickptr && *iptr->nuhmask)
1888		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1889
1890	<	if ((q = strchr(++p, '@'))) {
1890	>	if ((q = strchr(++p, '@')))
1891	>	{
1892		*q++ = '\0';
1893
1894	<	if (*p != '\0')
1894	>	if (*p)
1895		strlcpy(iptr->userptr, p, iptr->usersize);
1896
1897	<	if (*q != '\0')
1897	>	if (*q)
1898		strlcpy(iptr->hostptr, q, iptr->hostsize);
1899		}
1900		else
1901		{
1902	<	if (*p != '\0')
1902	>	if (*p)
1903		strlcpy(iptr->userptr, p, iptr->usersize);
1904		}
1905		}
#	Line 3378 | Line 1911 | split_nuh(struct split_nuh_item *const i
1911		/* if found a @ */
1912		*p++ = '\0';
1913
1914	<	if (*iptr->nuhmask != '\0')
1914	>	if (*iptr->nuhmask)
1915		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1916
1917	<	if (*p != '\0')
1917	>	if (*p)
1918		strlcpy(iptr->hostptr, p, iptr->hostsize);
1919		}
1920		else
#	Line 3394 | Line 1927 | split_nuh(struct split_nuh_item *const i
1927		}
1928		}
1929		}
3397	–
3398	–	/*
3399	–	* flags_to_ascii
3400	–	*
3401	–	* inputs       - flags is a bitmask
3402	–	*              - pointer to table of ascii letters corresponding
3403	–	*                to each bit
3404	–	*              - flag 1 for convert ToLower if bit missing
3405	–	*                0 if ignore.
3406	–	* output       - none
3407	–	* side effects - string pointed to by p has bitmap chars written to it
3408	–	*/
3409	–	static void
3410	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3411	–	int lowerit)
3412	–	{
3413	–	unsigned int mask = 1;
3414	–	int i = 0;
3415	–
3416	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3417	–	{
3418	–	if (flags & mask)
3419	–	*p++ = bit_table[i];
3420	–	else if (lowerit)
3421	–	*p++ = ToLower(bit_table[i]);
3422	–	}
3423	–	*p = '\0';
3424	–	}
3425	–
3426	–	/*
3427	–	* cidr_limit_reached
3428	–	*
3429	–	* inputs       - int flag allowing over_rule of limits
3430	–	*              - pointer to the ip to be added
3431	–	*              - pointer to the class
3432	–	* output       - non zero if limit reached
3433	–	*                0 if limit not reached
3434	–	* side effects -
3435	–	*/
3436	–	static int
3437	–	cidr_limit_reached(int over_rule,
3438	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3439	–	{
3440	–	dlink_node *ptr = NULL;
3441	–	struct CidrItem *cidr;
3442	–
3443	–	if (aclass->number_per_cidr <= 0)
3444	–	return 0;
3445	–
3446	–	if (ip->ss.ss_family == AF_INET)
3447	–	{
3448	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3449	–	return 0;
3450	–
3451	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3452	–	{
3453	–	cidr = ptr->data;
3454	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3455	–	{
3456	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3457	–	return -1;
3458	–	cidr->number_on_this_cidr++;
3459	–	return 0;
3460	–	}
3461	–	}
3462	–	cidr = MyMalloc(sizeof(struct CidrItem));
3463	–	cidr->number_on_this_cidr = 1;
3464	–	cidr->mask = *ip;
3465	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3466	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3467	–	}
3468	–	#ifdef IPV6
3469	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3470	–	{
3471	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3472	–	{
3473	–	cidr = ptr->data;
3474	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3475	–	{
3476	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3477	–	return -1;
3478	–	cidr->number_on_this_cidr++;
3479	–	return 0;
3480	–	}
3481	–	}
3482	–	cidr = MyMalloc(sizeof(struct CidrItem));
3483	–	cidr->number_on_this_cidr = 1;
3484	–	cidr->mask = *ip;
3485	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3486	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3487	–	}
3488	–	#endif
3489	–	return 0;
3490	–	}
3491	–
3492	–	/*
3493	–	* remove_from_cidr_check
3494	–	*
3495	–	* inputs       - pointer to the ip to be removed
3496	–	*              - pointer to the class
3497	–	* output       - NONE
3498	–	* side effects -
3499	–	*/
3500	–	static void
3501	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3502	–	{
3503	–	dlink_node *ptr = NULL;
3504	–	dlink_node *next_ptr = NULL;
3505	–	struct CidrItem *cidr;
3506	–
3507	–	if (aclass->number_per_cidr == 0)
3508	–	return;
3509	–
3510	–	if (ip->ss.ss_family == AF_INET)
3511	–	{
3512	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3513	–	return;
3514	–
3515	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3516	–	{
3517	–	cidr = ptr->data;
3518	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3519	–	{
3520	–	cidr->number_on_this_cidr--;
3521	–	if (cidr->number_on_this_cidr == 0)
3522	–	{
3523	–	dlinkDelete(ptr, &aclass->list_ipv4);
3524	–	MyFree(cidr);
3525	–	return;
3526	–	}
3527	–	}
3528	–	}
3529	–	}
3530	–	#ifdef IPV6
3531	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3532	–	{
3533	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3534	–	{
3535	–	cidr = ptr->data;
3536	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3537	–	{
3538	–	cidr->number_on_this_cidr--;
3539	–	if (cidr->number_on_this_cidr == 0)
3540	–	{
3541	–	dlinkDelete(ptr, &aclass->list_ipv6);
3542	–	MyFree(cidr);
3543	–	return;
3544	–	}
3545	–	}
3546	–	}
3547	–	}
3548	–	#endif
3549	–	}
3550	–
3551	–	static void
3552	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3553	–	dlink_list *old_list, dlink_list *new_list, int changed)
3554	–	{
3555	–	dlink_node *ptr;
3556	–	struct Client *client_p;
3557	–	struct ConfItem *conf;
3558	–	struct AccessItem *aconf;
3559	–
3560	–	if (!changed)
3561	–	{
3562	–	*new_list = *old_list;
3563	–	old_list->head = old_list->tail = NULL;
3564	–	old_list->length = 0;
3565	–	return;
3566	–	}
3567	–
3568	–	DLINK_FOREACH(ptr, local_client_list.head)
3569	–	{
3570	–	client_p = ptr->data;
3571	–	if (client_p->localClient->aftype != aftype)
3572	–	continue;
3573	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3574	–	continue;
3575	–
3576	–	conf = client_p->localClient->confs.tail->data;
3577	–	if (conf->type == CLIENT_TYPE)
3578	–	{
3579	–	aconf = map_to_conf(conf);
3580	–	if (aconf->class_ptr == oldcl)
3581	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3582	–	}
3583	–	}
3584	–	}
3585	–
3586	–	/*
3587	–	* rebuild_cidr_class
3588	–	*
3589	–	* inputs       - pointer to old conf
3590	–	*              - pointer to new_class
3591	–	* output       - none
3592	–	* side effects - rebuilds the class link list of cidr blocks
3593	–	*/
3594	–	void
3595	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3596	–	{
3597	–	struct ClassItem *old_class = map_to_conf(conf);
3598	–
3599	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3600	–	{
3601	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3602	–	rebuild_cidr_list(AF_INET, conf, new_class,
3603	–	&old_class->list_ipv4, &new_class->list_ipv4,
3604	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3605	–
3606	–	#ifdef IPV6
3607	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3608	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3609	–	&old_class->list_ipv6, &new_class->list_ipv6,
3610	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3611	–	#endif
3612	–	}
3613	–
3614	–	destroy_cidr_class(old_class);
3615	–	}
3616	–
3617	–	/*
3618	–	* destroy_cidr_list
3619	–	*
3620	–	* inputs       - pointer to class dlink list of cidr blocks
3621	–	* output       - none
3622	–	* side effects - completely destroys the class link list of cidr blocks
3623	–	*/
3624	–	static void
3625	–	destroy_cidr_list(dlink_list *list)
3626	–	{
3627	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3628	–
3629	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3630	–	{
3631	–	dlinkDelete(ptr, list);
3632	–	MyFree(ptr->data);
3633	–	}
3634	–	}
3635	–
3636	–	/*
3637	–	* destroy_cidr_class
3638	–	*
3639	–	* inputs       - pointer to class
3640	–	* output       - none
3641	–	* side effects - completely destroys the class link list of cidr blocks
3642	–	*/
3643	–	static void
3644	–	destroy_cidr_class(struct ClassItem *aclass)
3645	–	{
3646	–	destroy_cidr_list(&aclass->list_ipv4);
3647	–	destroy_cidr_list(&aclass->list_ipv6);
3648	–	}

Diff Legend

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