ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 967 by michael, Sun Aug 2 18:05:28 2009 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 4744 by michael, Thu Oct 16 11:46:19 2014 UTC

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

Diff Legend

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