ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf.c (file contents), Revision 1393 by michael, Wed May 2 19:17:37 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 6354 by michael, Fri Aug 14 17:53:44 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
35	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 43 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
46	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58	>	#include "isupport.h"
59
55	–	struct Callback *client_check_cb = NULL;
56	–	struct config_server_hide ConfigServerHide;
60
61	<	/* general conf items link list root, other than k lines etc. */
62	<	dlink_list service_items = { NULL, NULL, 0 };
63	<	dlink_list server_items  = { NULL, NULL, 0 };
64	<	dlink_list cluster_items = { NULL, NULL, 0 };
65	<	dlink_list oconf_items   = { NULL, NULL, 0 };
66	<	dlink_list uconf_items   = { NULL, NULL, 0 };
67	<	dlink_list xconf_items   = { NULL, NULL, 0 };
65	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
66	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list class_items   = { NULL, NULL, 0 };
69	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
61	>	struct config_channel_entry ConfigChannel;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
70	<	dlink_list temporary_resv = { NULL, NULL, 0 };
69	>	/* general conf items link list root, other than k lines etc. */
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list oconf_items;
74	>	dlink_list uconf_items;
75	>	dlink_list xconf_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
79	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
80	–
81	–	/* internally defined functions */
82	–	static void read_conf(FILE *);
83	–	static void clear_out_old_conf(void);
84	–	static void flush_deleted_I_P(void);
85	–	static void expire_tklines(dlink_list *);
86	–	static void garbage_collect_ip_entries(void);
87	–	static int hash_ip(struct irc_ssaddr *);
88	–	static int verify_access(struct Client *, const char *);
89	–	static int attach_iline(struct Client *, struct ConfItem *);
90	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
91	–	static void parse_conf_file(int, int);
92	–	static dlink_list *map_to_list(ConfType);
93	–	static struct AccessItem *find_regexp_kline(const char *[]);
94	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
95	–
96	–	/*
97	–	* bit_len
98	–	*/
99	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
100	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
101	–	static void destroy_cidr_class(struct ClassItem *);
102	–
103	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
104	–
105	–	/* address of default class conf */
106	–	static struct ConfItem *class_default;
107	–
108	–	/* usually, with hash tables, you use a prime number...
109	–	* but in this case I am dealing with ip addresses,
110	–	* not ascii strings.
111	–	*/
112	–	#define IP_HASH_SIZE 0x1000
113	–
114	–	struct ip_entry
115	–	{
116	–	struct irc_ssaddr ip;
117	–	int count;
118	–	time_t last_attempt;
119	–	struct ip_entry *next;
120	–	};
121	–
122	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
123	–	static BlockHeap *ip_entry_heap = NULL;
124	–	static int ip_entries_count = 0;
125	–
126	–
127	–	void *
128	–	map_to_conf(struct ConfItem *aconf)
129	–	{
130	–	void *conf;
131	–	conf = (void *)((uintptr_t)aconf +
132	–	(uintptr_t)sizeof(struct ConfItem));
133	–	return(conf);
134	–	}
135	–
136	–	struct ConfItem *
137	–	unmap_conf_item(void *aconf)
138	–	{
139	–	struct ConfItem *conf;
140	–
141	–	conf = (struct ConfItem *)((uintptr_t)aconf -
142	–	(uintptr_t)sizeof(struct ConfItem));
143	–	return(conf);
144	–	}
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 154 | 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, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct AccessItem *aconf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100	<	aconf->dns_pending = 0;
100	>	conf->dns_pending = 0;
101
102	<	if (addr != NULL)
103	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
102	>	if (addr)
103	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105	<	aconf->dns_failed = 1;
105	>	conf->dns_failed = 1;
106		}
107
108		/* conf_dns_lookup()
#	Line 173 | Line 112 | conf_dns_callback(void *vptr, const stru
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_pending)
118	<	{
119	<	aconf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
121	<	}
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126		}
127
128	<	/* make_conf_item()
128	>	/* map_to_list()
129		*
130	<	* inputs       - type of item
131	<	* output       - pointer to new conf entry
132	<	* side effects - none
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133		*/
134	<	struct ConfItem *
135	<	make_conf_item(ConfType type)
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136		{
194	–	struct ConfItem *conf = NULL;
195	–	struct AccessItem *aconf = NULL;
196	–	struct ClassItem *aclass = NULL;
197	–	int status = 0;
198	–
137		switch (type)
138		{
139	<	case DLINE_TYPE:
140	<	case EXEMPTDLINE_TYPE:
203	<	case GLINE_TYPE:
204	<	case KLINE_TYPE:
205	<	case CLIENT_TYPE:
206	<	case OPER_TYPE:
207	<	case SERVER_TYPE:
208	<	conf = MyMalloc(sizeof(struct ConfItem) +
209	<	sizeof(struct AccessItem));
210	<	aconf = map_to_conf(conf);
211	<	aconf->aftype = AF_INET;
212	<
213	<	/* Yes, sigh. switch on type again */
214	<	switch (type)
215	<	{
216	<	case EXEMPTDLINE_TYPE:
217	<	status = CONF_EXEMPTDLINE;
139	>	case CONF_XLINE:
140	>	return &xconf_items;
141		break;
142	<
143	<	case DLINE_TYPE:
221	<	status = CONF_DLINE;
142	>	case CONF_ULINE:
143	>	return &uconf_items;
144		break;
145	<
146	<	case KLINE_TYPE:
225	<	status = CONF_KLINE;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147		break;
148	<
149	<	case GLINE_TYPE:
229	<	status = CONF_GLINE;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150		break;
151	<
152	<	case CLIENT_TYPE:
233	<	status = CONF_CLIENT;
151	>	case CONF_OPER:
152	>	return &oconf_items;
153		break;
154	<
155	<	case OPER_TYPE:
237	<	status = CONF_OPERATOR;
238	<	dlinkAdd(conf, &conf->node, &oconf_items);
154	>	case CONF_SERVER:
155	>	return &server_items;
156		break;
157	<
158	<	case SERVER_TYPE:
242	<	status = CONF_SERVER;
243	<	dlinkAdd(conf, &conf->node, &server_items);
157	>	case CONF_SERVICE:
158	>	return &service_items;
159		break;
160	<
161	<	default:
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162		break;
248	–	}
249	–	aconf->status = status;
250	–	break;
251	–
252	–	case ULINE_TYPE:
253	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
254	–	sizeof(struct MatchItem));
255	–	dlinkAdd(conf, &conf->node, &uconf_items);
256	–	break;
257	–
258	–	case GDENY_TYPE:
259	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
260	–	sizeof(struct AccessItem));
261	–	dlinkAdd(conf, &conf->node, &gdeny_items);
262	–	break;
263	–
264	–	case XLINE_TYPE:
265	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
266	–	sizeof(struct MatchItem));
267	–	dlinkAdd(conf, &conf->node, &xconf_items);
268	–	break;
269	–	#ifdef HAVE_LIBPCRE
270	–	case RXLINE_TYPE:
271	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
272	–	sizeof(struct MatchItem));
273	–	dlinkAdd(conf, &conf->node, &rxconf_items);
274	–	break;
275	–
276	–	case RKLINE_TYPE:
277	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
278	–	sizeof(struct AccessItem));
279	–	aconf = map_to_conf(conf);
280	–	aconf->status = CONF_KLINE;
281	–	dlinkAdd(conf, &conf->node, &rkconf_items);
282	–	break;
283	–	#endif
284	–	case CLUSTER_TYPE:
285	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
286	–	dlinkAdd(conf, &conf->node, &cluster_items);
287	–	break;
288	–
289	–	case CRESV_TYPE:
290	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	–	sizeof(struct ResvChannel));
292	–	break;
293	–
294	–	case NRESV_TYPE:
295	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
296	–	sizeof(struct MatchItem));
297	–	dlinkAdd(conf, &conf->node, &nresv_items);
298	–	break;
299	–
300	–	case SERVICE_TYPE:
301	–	status = CONF_SERVICE;
302	–	conf = MyMalloc(sizeof(struct ConfItem));
303	–	dlinkAdd(conf, &conf->node, &service_items);
304	–	break;
305	–
306	–	case CLASS_TYPE:
307	–	conf = MyMalloc(sizeof(struct ConfItem) +
308	–	sizeof(struct ClassItem));
309	–	dlinkAdd(conf, &conf->node, &class_items);
310	–
311	–	aclass = map_to_conf(conf);
312	–	aclass->active = 1;
313	–	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
314	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
315	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
316	–	aclass->max_sendq = DEFAULT_SENDQ;
317	–
318	–	break;
319	–
320	–	default:
321	–	conf = NULL;
322	–	break;
323	–	}
324	–
325	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
326	–	conf->type = type;
327	–
328	–	return conf;
329	–	}
330	–
331	–	void
332	–	delete_conf_item(struct ConfItem *conf)
333	–	{
334	–	dlink_node *m = NULL, *m_next = NULL;
335	–	struct MatchItem *match_item;
336	–	struct AccessItem *aconf;
337	–	ConfType type = conf->type;
338	–
339	–	MyFree(conf->name);
340	–	conf->name = NULL;
341	–
342	–	switch(type)
343	–	{
344	–	case DLINE_TYPE:
345	–	case EXEMPTDLINE_TYPE:
346	–	case GLINE_TYPE:
347	–	case KLINE_TYPE:
348	–	case CLIENT_TYPE:
349	–	case OPER_TYPE:
350	–	case SERVER_TYPE:
351	–	aconf = map_to_conf(conf);
352	–
353	–	if (aconf->dns_pending)
354	–	delete_resolver_queries(aconf);
355	–	if (aconf->passwd != NULL)
356	–	memset(aconf->passwd, 0, strlen(aconf->passwd));
357	–	if (aconf->spasswd != NULL)
358	–	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
359	–	aconf->class_ptr = NULL;
360	–
361	–	MyFree(aconf->passwd);
362	–	MyFree(aconf->spasswd);
363	–	MyFree(aconf->reason);
364	–	MyFree(aconf->oper_reason);
365	–	MyFree(aconf->user);
366	–	MyFree(aconf->host);
367	–	MyFree(aconf->cipher_list);
368	–	#ifdef HAVE_LIBCRYPTO
369	–	if (aconf->rsa_public_key)
370	–	RSA_free(aconf->rsa_public_key);
371	–	MyFree(aconf->rsa_public_key_file);
372	–	#endif
373	–
374	–	/* Yes, sigh. switch on type again */
375	–	switch(type)
376	–	{
377	–	case EXEMPTDLINE_TYPE:
378	–	case DLINE_TYPE:
379	–	case GLINE_TYPE:
380	–	case KLINE_TYPE:
381	–	case CLIENT_TYPE:
382	–	MyFree(conf);
383	–	break;
384	–
385	–	case OPER_TYPE:
386	–	aconf = map_to_conf(conf);
387	–	if (!IsConfIllegal(aconf))
388	–	dlinkDelete(&conf->node, &oconf_items);
389	–	MyFree(conf);
390	–	break;
391	–
392	–	case SERVER_TYPE:
393	–	aconf = map_to_conf(conf);
394	–
395	–	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
396	–	{
397	–	MyFree(m->data);
398	–	free_dlink_node(m);
399	–	}
400	–
401	–	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
402	–	{
403	–	MyFree(m->data);
404	–	free_dlink_node(m);
405	–	}
406	–
407	–	if (!IsConfIllegal(aconf))
408	–	dlinkDelete(&conf->node, &server_items);
409	–	MyFree(conf);
410	–	break;
411	–
163		default:
164	<	break;
414	<	}
415	<	break;
416	<
417	<	case ULINE_TYPE:
418	<	match_item = map_to_conf(conf);
419	<	MyFree(match_item->user);
420	<	MyFree(match_item->host);
421	<	MyFree(match_item->reason);
422	<	MyFree(match_item->oper_reason);
423	<	dlinkDelete(&conf->node, &uconf_items);
424	<	MyFree(conf);
425	<	break;
426	<
427	<	case XLINE_TYPE:
428	<	match_item = map_to_conf(conf);
429	<	MyFree(match_item->user);
430	<	MyFree(match_item->host);
431	<	MyFree(match_item->reason);
432	<	MyFree(match_item->oper_reason);
433	<	dlinkDelete(&conf->node, &xconf_items);
434	<	MyFree(conf);
435	<	break;
436	<	#ifdef HAVE_LIBPCRE
437	<	case RKLINE_TYPE:
438	<	aconf = map_to_conf(conf);
439	<	MyFree(aconf->regexuser);
440	<	MyFree(aconf->regexhost);
441	<	MyFree(aconf->user);
442	<	MyFree(aconf->host);
443	<	MyFree(aconf->reason);
444	<	MyFree(aconf->oper_reason);
445	<	dlinkDelete(&conf->node, &rkconf_items);
446	<	MyFree(conf);
447	<	break;
448	<
449	<	case RXLINE_TYPE:
450	<	MyFree(conf->regexpname);
451	<	match_item = map_to_conf(conf);
452	<	MyFree(match_item->user);
453	<	MyFree(match_item->host);
454	<	MyFree(match_item->reason);
455	<	MyFree(match_item->oper_reason);
456	<	dlinkDelete(&conf->node, &rxconf_items);
457	<	MyFree(conf);
458	<	break;
459	<	#endif
460	<	case NRESV_TYPE:
461	<	match_item = map_to_conf(conf);
462	<	MyFree(match_item->user);
463	<	MyFree(match_item->host);
464	<	MyFree(match_item->reason);
465	<	MyFree(match_item->oper_reason);
466	<	dlinkDelete(&conf->node, &nresv_items);
467	<
468	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
469	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
470	<	free_dlink_node(m);
471	<
472	<	MyFree(conf);
473	<	break;
474	<
475	<	case GDENY_TYPE:
476	<	aconf = map_to_conf(conf);
477	<	MyFree(aconf->user);
478	<	MyFree(aconf->host);
479	<	dlinkDelete(&conf->node, &gdeny_items);
480	<	MyFree(conf);
481	<	break;
482	<
483	<	case CLUSTER_TYPE:
484	<	dlinkDelete(&conf->node, &cluster_items);
485	<	MyFree(conf);
486	<	break;
487	<
488	<	case CRESV_TYPE:
489	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
490	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
491	<	free_dlink_node(m);
492	<
493	<	MyFree(conf);
494	<	break;
495	<
496	<	case CLASS_TYPE:
497	<	dlinkDelete(&conf->node, &class_items);
498	<	MyFree(conf);
499	<	break;
500	<
501	<	case SERVICE_TYPE:
502	<	dlinkDelete(&conf->node, &service_items);
503	<	MyFree(conf);
504	<	break;
505	<
506	<	default:
507	<	break;
164	>	return NULL;
165		}
166		}
167
168	<	/* free_access_item()
169	<	*
513	<	* inputs       - pointer to conf to free
514	<	* output       - none
515	<	* side effects - crucial password fields are zeroed, conf is freed
516	<	*/
517	<	void
518	<	free_access_item(struct AccessItem *aconf)
168	>	struct MaskItem *
169	>	conf_make(enum maskitem_type type)
170		{
171	<	struct ConfItem *conf;
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172	>	dlink_list *list = NULL;
173
174	<	if (aconf == NULL)
175	<	return;
176	<	conf = unmap_conf_item(aconf);
525	<	delete_conf_item(conf);
526	<	}
174	>	conf->type   = type;
175	>	conf->active = 1;
176	>	conf->aftype = AF_INET;
177
178	<	static const unsigned int shared_bit_table[] =
179	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
178	>	if ((list = map_to_list(type)))
179	>	dlinkAdd(conf, &conf->node, list);
180	>	return conf;
181	>	}
182
531	–	/* report_confitem_types()
532	–	*
533	–	* inputs       - pointer to client requesting confitem report
534	–	*              - ConfType to report
535	–	* output       - none
536	–	* side effects -
537	–	*/
183		void
184	<	report_confitem_types(struct Client *source_p, ConfType type)
184	>	conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL, *dptr = NULL;
187	<	struct ConfItem *conf = NULL;
543	<	struct AccessItem *aconf = NULL;
544	<	struct MatchItem *matchitem = NULL;
545	<	struct ClassItem *classitem = NULL;
546	<	char buf[12];
547	<	char *p = NULL;
548	<
549	<	switch (type)
550	<	{
551	<	case GDENY_TYPE:
552	<	DLINK_FOREACH(ptr, gdeny_items.head)
553	<	{
554	<	conf = ptr->data;
555	<	aconf = map_to_conf(conf);
186	>	dlink_node *node = NULL, *node_next = NULL;
187	>	dlink_list *list = NULL;
188
189	<	p = buf;
190	<
559	<	if (aconf->flags & GDENY_BLOCK)
560	<	*p++ = 'B';
561	<	else
562	<	*p++ = 'b';
563	<
564	<	if (aconf->flags & GDENY_REJECT)
565	<	*p++ = 'R';
566	<	else
567	<	*p++ = 'r';
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192	<	*p = '\0';
570	<
571	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
572	<	me.name, RPL_STATSDEBUG, source_p->name,
573	<	aconf->user, aconf->host, conf->name, buf);
574	<	}
575	<	break;
576	<
577	<	case XLINE_TYPE:
578	<	DLINK_FOREACH(ptr, xconf_items.head)
579	<	{
580	<	conf = ptr->data;
581	<	matchitem = map_to_conf(conf);
582	<
583	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
584	<	me.name, source_p->name,
585	<	matchitem->hold ? "x": "X", matchitem->count,
586	<	conf->name, matchitem->reason);
587	<	}
588	<	break;
589	<
590	<	#ifdef HAVE_LIBPCRE
591	<	case RXLINE_TYPE:
592	<	DLINK_FOREACH(ptr, rxconf_items.head)
593	<	{
594	<	conf = ptr->data;
595	<	matchitem = map_to_conf(conf);
596	<
597	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
598	<	me.name, source_p->name,
599	<	"XR", matchitem->count,
600	<	conf->name, matchitem->reason);
601	<	}
602	<	break;
192	>	MyFree(conf->name);
193
194	<	case RKLINE_TYPE:
195	<	DLINK_FOREACH(ptr, rkconf_items.head)
196	<	{
197	<	aconf = map_to_conf((conf = ptr->data));
194	>	if (conf->dns_pending)
195	>	delete_resolver_queries(conf);
196	>	if (conf->passwd)
197	>	memset(conf->passwd, 0, strlen(conf->passwd));
198	>	if (conf->spasswd)
199	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
200	>
201	>	conf->class = NULL;
202	>
203	>	MyFree(conf->passwd);
204	>	MyFree(conf->spasswd);
205	>	MyFree(conf->reason);
206	>	MyFree(conf->certfp);
207	>	MyFree(conf->whois);
208	>	MyFree(conf->user);
209	>	MyFree(conf->host);
210	>	#ifdef HAVE_LIBCRYPTO
211	>	MyFree(conf->cipher_list);
212
213	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
214	<	source_p->name, "KR", aconf->host, aconf->user,
611	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
612	<	}
613	<	break;
213	>	if (conf->rsa_public_key)
214	>	RSA_free(conf->rsa_public_key);
215		#endif
216	<
616	<	case ULINE_TYPE:
617	<	DLINK_FOREACH(ptr, uconf_items.head)
618	<	{
619	<	conf = ptr->data;
620	<	matchitem = map_to_conf(conf);
621	<
622	<	p = buf;
623	<
624	<	/* some of these are redundant for the sake of
625	<	* consistency with cluster{} flags
626	<	*/
627	<	*p++ = 'c';
628	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
629	<
630	<	sendto_one(source_p, form_str(RPL_STATSULINE),
631	<	me.name, source_p->name, conf->name,
632	<	matchitem->user?matchitem->user: "*",
633	<	matchitem->host?matchitem->host: "*", buf);
634	<	}
635	<
636	<	DLINK_FOREACH(ptr, cluster_items.head)
637	<	{
638	<	conf = ptr->data;
639	<
640	<	p = buf;
641	<
642	<	*p++ = 'C';
643	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
644	<
645	<	sendto_one(source_p, form_str(RPL_STATSULINE),
646	<	me.name, source_p->name, conf->name,
647	<	"*", "*", buf);
648	<	}
649	<
650	<	break;
651	<
652	<	case OPER_TYPE:
653	<	DLINK_FOREACH(ptr, oconf_items.head)
654	<	{
655	<	conf = ptr->data;
656	<	aconf = map_to_conf(conf);
657	<
658	<	/* Don't allow non opers to see oper privs */
659	<	if (HasUMode(source_p, UMODE_OPER))
660	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
661	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
662	<	conf->name, oper_privs_as_string(aconf->port),
663	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
664	<	else
665	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
666	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
667	<	conf->name, "0",
668	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
669	<	}
670	<	break;
671	<
672	<	case CLASS_TYPE:
673	<	DLINK_FOREACH(ptr, class_items.head)
674	<	{
675	<	conf = ptr->data;
676	<	classitem = map_to_conf(conf);
677	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
678	<	me.name, source_p->name, 'Y',
679	<	conf->name, classitem->ping_freq,
680	<	classitem->con_freq,
681	<	classitem->max_total, classitem->max_sendq,
682	<	classitem->curr_user_count,
683	<	classitem->active ? "active" : "disabled");
684	<	}
685	<	break;
686	<
687	<	case CONF_TYPE:
688	<	case CLIENT_TYPE:
689	<	break;
690	<
691	<	case SERVICE_TYPE:
692	<	DLINK_FOREACH(ptr, service_items.head)
693	<	{
694	<	conf = ptr->data;
695	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
696	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
697	<	}
698	<	break;
699	<
700	<	case SERVER_TYPE:
701	<	DLINK_FOREACH(ptr, server_items.head)
702	<	{
703	<	p = buf;
704	<
705	<	conf = ptr->data;
706	<	aconf = map_to_conf(conf);
707	<
708	<	buf[0] = '\0';
709	<
710	<	if (IsConfAllowAutoConn(aconf))
711	<	*p++ = 'A';
712	<	if (IsConfSSL(aconf))
713	<	*p++ = 'S';
714	<	if (IsConfTopicBurst(aconf))
715	<	*p++ = 'T';
716	<	if (buf[0] == '\0')
717	<	*p++ = '*';
718	<
719	<	*p = '\0';
720	<
721	<	/*
722	<	* Allow admins to see actual ips unless hide_server_ips is enabled
723	<	*/
724	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
725	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
726	<	me.name, source_p->name, 'C', aconf->host,
727	<	buf, conf->name, aconf->port,
728	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
729	<	else
730	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
731	<	me.name, source_p->name, 'C',
732	<	"*@127.0.0.1", buf, conf->name, aconf->port,
733	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
734	<	}
735	<	break;
736	<
737	<	case HUB_TYPE:
738	<	DLINK_FOREACH(ptr, server_items.head)
739	<	{
740	<	conf = ptr->data;
741	<	aconf = map_to_conf(conf);
742	<
743	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
744	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
745	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
746	<	}
747	<	break;
748	<
749	<	case LEAF_TYPE:
750	<	DLINK_FOREACH(ptr, server_items.head)
751	<	{
752	<	conf = ptr->data;
753	<	aconf = map_to_conf(conf);
754	<
755	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
756	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
757	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
758	<	}
759	<	break;
760	<
761	<	case GLINE_TYPE:
762	<	case KLINE_TYPE:
763	<	case DLINE_TYPE:
764	<	case EXEMPTDLINE_TYPE:
765	<	case CRESV_TYPE:
766	<	case NRESV_TYPE:
767	<	case CLUSTER_TYPE:
768	<	default:
769	<	break;
770	<	}
771	<	}
772	<
773	<	/* check_client()
774	<	*
775	<	* inputs       - pointer to client
776	<	* output       - 0 = Success
777	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
778	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
779	<	*                I_LINE_FULL       (-3) = I-line is full
780	<	*                TOO_MANY          (-4) = Too many connections from hostname
781	<	*                BANNED_CLIENT     (-5) = K-lined
782	<	* side effects - Ordinary client access check.
783	<	*                Look for conf lines which have the same
784	<	*                status as the flags passed.
785	<	*/
786	<	static void *
787	<	check_client(va_list args)
788	<	{
789	<	struct Client *source_p = va_arg(args, struct Client *);
790	<	const char *username = va_arg(args, const char *);
791	<	int i;
792	<
793	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
794	<	if ((i = verify_access(source_p, username)))
795	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
796	<	source_p->name, source_p->sockhost);
797	<
798	<	switch (i)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	case TOO_MANY:
219	<	sendto_realops_flags(UMODE_FULL, L_ALL,
220	<	"Too many on IP for %s (%s).",
803	<	get_client_name(source_p, SHOW_IP),
804	<	source_p->sockhost);
805	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
806	<	get_client_name(source_p, SHOW_IP));
807	<	++ServerStats.is_ref;
808	<	exit_client(source_p, &me, "No more connections allowed on that IP");
809	<	break;
810	<
811	<	case I_LINE_FULL:
812	<	sendto_realops_flags(UMODE_FULL, L_ALL,
813	<	"I-line is full for %s (%s).",
814	<	get_client_name(source_p, SHOW_IP),
815	<	source_p->sockhost);
816	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
817	<	get_client_name(source_p, SHOW_IP));
818	<	++ServerStats.is_ref;
819	<	exit_client(source_p, &me,
820	<	"No more connections allowed in your connection class");
821	<	break;
822	<
823	<	case NOT_AUTHORIZED:
824	<	++ServerStats.is_ref;
825	<	/* jdc - lists server name & port connections are on */
826	<	/*       a purely cosmetical change */
827	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
828	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
829	<	get_client_name(source_p, SHOW_IP),
830	<	source_p->sockhost,
831	<	source_p->localClient->listener->name,
832	<	source_p->localClient->listener->port);
833	<	ilog(LOG_TYPE_IRCD,
834	<	"Unauthorized client connection from %s on [%s/%u].",
835	<	get_client_name(source_p, SHOW_IP),
836	<	source_p->localClient->listener->name,
837	<	source_p->localClient->listener->port);
838	<
839	<	/* XXX It is prolematical whether it is better to use the
840	<	* capture reject code here or rely on the connecting too fast code.
841	<	* - Dianora
842	<	*/
843	<	if (REJECT_HOLD_TIME > 0)
844	<	{
845	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
846	<	me.name, source_p->name);
847	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
848	<	SetCaptured(source_p);
849	<	}
850	<	else
851	<	exit_client(source_p, &me, "You are not authorized to use this server");
852	<	break;
853	<
854	<	case BANNED_CLIENT:
855	<	/*
856	<	* Don't exit them immediately, play with them a bit.
857	<	* - Dianora
858	<	*/
859	<	if (REJECT_HOLD_TIME > 0)
860	<	{
861	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
862	<	SetCaptured(source_p);
863	<	}
864	<	else
865	<	exit_client(source_p, &me, "Banned");
866	<	++ServerStats.is_ref;
867	<	break;
868	<
869	<	case 0:
870	<	default:
871	<	break;
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	return (i < 0 ? NULL : source_p);
875	<	}
876	<
877	<	/* verify_access()
878	<	*
879	<	* inputs       - pointer to client to verify
880	<	*              - pointer to proposed username
881	<	* output       - 0 if success -'ve if not
882	<	* side effect  - find the first (best) I line to attach.
883	<	*/
884	<	static int
885	<	verify_access(struct Client *client_p, const char *username)
886	<	{
887	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
888	<	struct ConfItem *conf = NULL;
889	<	char non_ident[USERLEN + 1] = { '~', '\0' };
890	<	const char *uhi[3];
891	<
892	<	if (IsGotId(client_p))
893	<	{
894	<	aconf = find_address_conf(client_p->host, client_p->username,
895	<	&client_p->localClient->ip,
896	<	client_p->localClient->aftype,
897	<	client_p->localClient->passwd);
898	<	}
899	<	else
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
226	<	aconf = find_address_conf(client_p->host,non_ident,
227	<	&client_p->localClient->ip,
904	<	client_p->localClient->aftype,
905	<	client_p->localClient->passwd);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
909	<	uhi[1] = client_p->host;
910	<	uhi[2] = client_p->sockhost;
911	<
912	<	rkconf = find_regexp_kline(uhi);
913	<
914	<	if (aconf != NULL)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	if (IsConfClient(aconf) && !rkconf)
917	<	{
918	<	conf = unmap_conf_item(aconf);
919	<
920	<	if (IsConfRedir(aconf))
921	<	{
922	<	sendto_one(client_p, form_str(RPL_REDIR),
923	<	me.name, client_p->name,
924	<	conf->name ? conf->name : "",
925	<	aconf->port);
926	<	return(NOT_AUTHORIZED);
927	<	}
928	<
929	<	if (IsConfDoIdentd(aconf))
930	<	SetNeedId(client_p);
232	>	struct exempt *exptr = node->data;
233
234	<	/* Thanks for spoof idea amm */
235	<	if (IsConfDoSpoofIp(aconf))
236	<	{
237	<	conf = unmap_conf_item(aconf);
238	<
937	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
939	<	client_p->name, client_p->host, conf->name);
940	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
941	<	SetIPSpoof(client_p);
942	<	}
943	<
944	<	return(attach_iline(client_p, conf));
945	<	}
946	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
947	<	{
948	<	/* XXX */
949	<	aconf = rkconf ? rkconf : aconf;
950	<	if (IsConfGline(aconf))
951	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
952	<	client_p->name);
953	<	if (ConfigFileEntry.kline_with_reason)
954	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
955	<	me.name, client_p->name, aconf->reason);
956	<	return(BANNED_CLIENT);
957	<	}
234	>	dlinkDelete(node, &conf->exempt_list);
235	>	MyFree(exptr->name);
236	>	MyFree(exptr->user);
237	>	MyFree(exptr->host);
238	>	MyFree(exptr);
239		}
240
241	<	return(NOT_AUTHORIZED);
241	>	MyFree(conf);
242		}
243
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
252	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct AccessItem *aconf;
974	<	struct ClassItem *aclass;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257	<	int local = 0, global = 0, ident = 0;
257	>	unsigned int local = 0, global = 0, ident = 0;
258
259	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
982	<
983	<	aconf = map_to_conf(conf);
984	<	if (aconf->class_ptr == NULL)
985	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
986	<
987	<	aclass = map_to_conf(aconf->class_ptr);
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263		count_user_host(client_p->username, client_p->host,
264		&global, &local, &ident);
#	Line 993 | Line 267 | attach_iline(struct Client *client_p, st
267		* setting a_limit_reached if any limit is reached.
268		* - Dianora
269		*/
270	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
270	>	if (class->max_total && class->ref_count >= class->max_total)
271		a_limit_reached = 1;
272	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
272	>	else if (class->max_perip && ip_found->count > class->max_perip)
273		a_limit_reached = 1;
274	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
274	>	else if (class->max_local && local >= class->max_local)
275		a_limit_reached = 1;
276	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
276	>	else if (class->max_global && global >= class->max_global)
277		a_limit_reached = 1;
278	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
278	>	else if (class->max_ident && ident >= class->max_ident &&
279		client_p->username[0] != '~')
280		a_limit_reached = 1;
281
282		if (a_limit_reached)
283		{
284	<	if (!IsConfExemptLimits(aconf))
284	>	if (!IsConfExemptLimits(conf))
285		return TOO_MANY;   /* Already at maximum allowed */
286
287	<	sendto_one(client_p,
288	<	":%s NOTICE %s :*** Your connection class is full, "
1015	<	"but you have exceed_limit = yes;", me.name, client_p->name);
287	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	>	"but you have exceed_limit = yes;");
289		}
290
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* init_ip_hash_table()
1022	<	*
1023	<	* inputs               - NONE
1024	<	* output               - NONE
1025	<	* side effects         - allocate memory for ip_entry(s)
1026	<	*                      - clear the ip hash table
1027	<	*/
1028	<	void
1029	<	init_ip_hash_table(void)
1030	<	{
1031	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1032	<	2 * hard_fdlimit);
1033	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1034	<	}
1035	<
1036	<	/* find_or_add_ip()
1037	<	*
1038	<	* inputs       - pointer to struct irc_ssaddr
1039	<	* output       - pointer to a struct ip_entry
1040	<	* side effects -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	struct ip_entry *ptr, *newptr;
1049	<	int hash_index = hash_ip(ip_in), res;
1050	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1051	<	#ifdef IPV6
1052	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1053	<	#endif
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	if (ip_in->ss.ss_family == AF_INET6)
1061	<	{
1062	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1063	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1064	<	}
1065	<	else
1066	<	#endif
1067	<	{
1068	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1069	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1070	<	}
1071	<	if (res == 0)
1072	<	{
1073	<	/* Found entry already in hash, return it. */
1074	<	return ptr;
1075	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
318	<
319	<	newptr = BlockHeapAlloc(ip_entry_heap);
320	<	ip_entries_count++;
321	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	newptr->next = ip_hash_table[hash_index];
324	<	ip_hash_table[hash_index] = newptr;
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	return newptr;
1089	<	}
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	/* remove_one_ip()
1092	<	*
1093	<	* inputs        - unsigned long IP address value
1094	<	* output        - NONE
1095	<	* side effects  - The ip address given, is looked up in ip hash table
1096	<	*                 and number of ip#'s for that ip decremented.
1097	<	*                 If ip # count reaches 0 and has expired,
1098	<	*                 the struct ip_entry is returned to the ip_entry_heap
1099	<	*/
1100	<	void
1101	<	remove_one_ip(struct irc_ssaddr *ip_in)
1102	<	{
1103	<	struct ip_entry *ptr;
1104	<	struct ip_entry *last_ptr = NULL;
1105	<	int hash_index = hash_ip(ip_in), res;
1106	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1107	<	#ifdef IPV6
1108	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1109	<	#endif
1110	<
1111	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#ifdef IPV6
1114	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1115	<	continue;
1116	<	if (ip_in->ss.ss_family == AF_INET6)
1117	<	{
1118	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1119	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1120	<	}
1121	<	else
1122	<	#endif
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
1129	<	if (ptr->count > 0)
1130	<	ptr->count--;
1131	<	if (ptr->count == 0 &&
1132	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
1137	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	BlockHeapFree(ip_entry_heap, ptr);
1140	<	ip_entries_count--;
1141	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
1143	–	last_ptr = ptr;
1144	–	}
1145	–	}
346
347	<	/* hash_ip()
1148	<	*
1149	<	* input        - pointer to an irc_inaddr
1150	<	* output       - integer value used as index into hash table
1151	<	* side effects - hopefully, none
1152	<	*/
1153	<	static int
1154	<	hash_ip(struct irc_ssaddr *addr)
1155	<	{
1156	<	if (addr->ss.ss_family == AF_INET)
1157	<	{
1158	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1159	<	int hash;
1160	<	uint32_t ip;
1161	<
1162	<	ip   = ntohl(v4->sin_addr.s_addr);
1163	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1164	<	return hash;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#ifdef IPV6
350	<	else
351	<	{
1169	<	int hash;
1170	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1171	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1172	<
1173	<	hash  = ip[0] ^ ip[3];
1174	<	hash ^= hash >> 16;
1175	<	hash ^= hash >> 8;
1176	<	hash  = hash & (IP_HASH_SIZE - 1);
1177	<	return hash;
1178	<	}
1179	<	#else
1180	<	return 0;
1181	<	#endif
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* count_ip_hash()
1185	<	*
1186	<	* inputs        - pointer to counter of number of ips hashed
1187	<	*               - pointer to memory used for ip hash
1188	<	* output        - returned via pointers input
1189	<	* side effects  - NONE
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
1197	–	struct ip_entry *ptr;
370		int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (i = 0; i < IP_HASH_SIZE; i++)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
1223	<	struct ip_entry *last_ptr;
1224	<	struct ip_entry *next_ptr;
1225	<	int i;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (i = 0; i < IP_HASH_SIZE; i++)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	BlockHeapFree(ip_entry_heap, ptr);
1243	<	ip_entries_count--;
1244	<	}
1245	<	else
1246	<	last_ptr = ptr;
1247	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 1256 | Line 436 | garbage_collect_ip_entries(void)
436		* side effects - Disassociate configuration from the client.
437		*                Also removes a class from the list if marked for deleting.
438		*/
439	<	int
440	<	detach_conf(struct Client *client_p, ConfType type)
439	>	void
440	>	detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr, *next_ptr;
1263	<	struct ConfItem *conf;
1264	<	struct ClassItem *aclass;
1265	<	struct AccessItem *aconf;
1266	<	struct ConfItem *aclass_conf;
1267	<	struct MatchItem *match_item;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	conf = ptr->data;
1272	<
1273	<	if (type == CONF_TYPE || conf->type == type)
1274	<	{
1275	<	dlinkDelete(ptr, &client_p->localClient->confs);
1276	<	free_dlink_node(ptr);
1277	<
1278	<	switch (conf->type)
1279	<	{
1280	<	case CLIENT_TYPE:
1281	<	case OPER_TYPE:
1282	<	case SERVER_TYPE:
1283	<	aconf = map_to_conf(conf);
446	>	struct MaskItem *conf = node->data;
447
448	<	assert(aconf->clients > 0);
448	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449	>	assert(conf->ref_count > 0);
450	>	assert(conf->class->ref_count > 0);
451
452	<	if ((aclass_conf = aconf->class_ptr) != NULL)
453	<	{
1289	<	aclass = map_to_conf(aclass_conf);
1290	<
1291	<	assert(aclass->curr_user_count > 0);
1292	<
1293	<	if (conf->type == CLIENT_TYPE)
1294	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1295	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1296	<	delete_conf_item(aclass_conf);
1297	<	}
452	>	if (!(conf->type & type))
453	>	continue;
454
455	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
456	<	delete_conf_item(conf);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458	<	break;
459	<	default:
1304	<	break;
1305	<	}
458	>	if (conf->type == CONF_CLIENT)
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461	<	if (type != CONF_TYPE)
462	<	return 0;
461	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
462	>	{
463	>	class_free(conf->class);
464	>	conf->class = NULL;
465		}
1310	–	}
466
467	<	return -1;
467	>	if (--conf->ref_count == 0 && conf->active == 0)
468	>	conf_free(conf);
469	>	}
470		}
471
472		/* attach_conf()
#	Line 1323 | Line 480 | detach_conf(struct Client *client_p, Con
480		*                attachment if there was an old one...
481		*/
482		int
483	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
483	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488	<	if (conf->type == CLIENT_TYPE ||
489	<	conf->type == SERVER_TYPE ||
490	<	conf->type == OPER_TYPE)
491	<	{
1335	<	struct AccessItem *aconf = map_to_conf(conf);
1336	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1337	<
1338	<	if (IsConfIllegal(aconf))
1339	<	return NOT_AUTHORIZED;
1340	<
1341	<	if (conf->type == CLIENT_TYPE)
1342	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1343	<	&client_p->localClient->ip, aclass))
1344	<	return TOO_MANY;    /* Already at maximum allowed */
488	>	if (conf->type == CONF_CLIENT)
489	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
490	>	&client_p->connection->ip, conf->class))
491	>	return TOO_MANY;    /* Already at maximum allowed */
492
493	<	aclass->curr_user_count++;
494	<	aconf->clients++;
1348	<	}
493	>	conf->class->ref_count++;
494	>	conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 1364 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
1368	<	struct ConfItem *conf;
1369	<	struct AccessItem *aconf;
513	>	dlink_node *node = NULL;
514
515	<	assert(client_p != NULL);
1372	<	assert(host != NULL);
515	>	assert(host);
516
517	<	if (client_p == NULL || host == NULL)
1375	<	return 0;
1376	<
1377	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
1380	<	aconf = map_to_conf(conf);
519	>	struct MaskItem *conf = node->data;
520
521	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
521	>	if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
529		}
530
1392	–	/* find_conf_exact()
1393	–	*
1394	–	* inputs       - type of ConfItem
1395	–	*              - pointer to name to find
1396	–	*              - pointer to username to find
1397	–	*              - pointer to host to find
1398	–	* output       - NULL or pointer to conf found
1399	–	* side effects - find a conf entry which matches the hostname
1400	–	*                and has the same name.
1401	–	*/
1402	–	struct ConfItem *
1403	–	find_conf_exact(ConfType type, const char *name, const char *user,
1404	–	const char *host)
1405	–	{
1406	–	dlink_node *ptr;
1407	–	dlink_list *list_p;
1408	–	struct ConfItem *conf = NULL;
1409	–	struct AccessItem *aconf;
1410	–
1411	–	/* Only valid for OPER_TYPE and ...? */
1412	–	list_p = map_to_list(type);
1413	–
1414	–	DLINK_FOREACH(ptr, (*list_p).head)
1415	–	{
1416	–	conf = ptr->data;
1417	–
1418	–	if (conf->name == NULL)
1419	–	continue;
1420	–	aconf = map_to_conf(conf);
1421	–	if (aconf->host == NULL)
1422	–	continue;
1423	–	if (irccmp(conf->name, name) != 0)
1424	–	continue;
1425	–
1426	–	/*
1427	–	** Accept if the *real* hostname (usually sockethost)
1428	–	** socket host) matches *either* host or name field
1429	–	** of the configuration.
1430	–	*/
1431	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1432	–	continue;
1433	–	if (type == OPER_TYPE)
1434	–	{
1435	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1436	–
1437	–	if (aconf->clients >= aclass->max_total)
1438	–	continue;
1439	–	}
1440	–
1441	–	return conf;
1442	–	}
1443	–
1444	–	return NULL;
1445	–	}
1446	–
531		/* find_conf_name()
532		*
533		* inputs       - pointer to conf link list to search
#	Line 1453 | Line 537 | find_conf_exact(ConfType type, const cha
537		* side effects - find a conf entry which matches the name
538		*                and has the given mask.
539		*/
540	<	struct ConfItem *
541	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
540	>	struct MaskItem *
541	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
1460	<	struct ConfItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
548	<
547	>	struct MaskItem *conf = node->data;
548	>
549		if (conf->type == type)
550		{
551	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
552	<	match(conf->name, name)))
1470	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
1477	–	/* map_to_list()
1478	–	*
1479	–	* inputs       - ConfType conf
1480	–	* output       - pointer to dlink_list to use
1481	–	* side effects - none
1482	–	*/
1483	–	static dlink_list *
1484	–	map_to_list(ConfType type)
1485	–	{
1486	–	switch(type)
1487	–	{
1488	–	case RXLINE_TYPE:
1489	–	return(&rxconf_items);
1490	–	break;
1491	–	case XLINE_TYPE:
1492	–	return(&xconf_items);
1493	–	break;
1494	–	case ULINE_TYPE:
1495	–	return(&uconf_items);
1496	–	break;
1497	–	case NRESV_TYPE:
1498	–	return(&nresv_items);
1499	–	break;
1500	–	case OPER_TYPE:
1501	–	return(&oconf_items);
1502	–	break;
1503	–	case CLASS_TYPE:
1504	–	return(&class_items);
1505	–	break;
1506	–	case SERVER_TYPE:
1507	–	return(&server_items);
1508	–	break;
1509	–	case SERVICE_TYPE:
1510	–	return(&service_items);
1511	–	break;
1512	–	case CLUSTER_TYPE:
1513	–	return(&cluster_items);
1514	–	break;
1515	–	case CONF_TYPE:
1516	–	case GLINE_TYPE:
1517	–	case KLINE_TYPE:
1518	–	case DLINE_TYPE:
1519	–	case CRESV_TYPE:
1520	–	default:
1521	–	return NULL;
1522	–	}
1523	–	}
1524	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
562		*              - pointer to name string to find
563		*              - pointer to user
564		*              - pointer to host
565	<	*              - optional action to match on as well
566	<	* output       - NULL or pointer to found struct MatchItem
565	>	*              - optional flags to match on as well
566	>	* output       - NULL or pointer to found struct MaskItem
567		* side effects - looks for a match on name field
568		*/
569	<	struct ConfItem *
570	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
571	<	const char *host, int action)
572	<	{
573	<	dlink_node *ptr=NULL;
574	<	struct ConfItem *conf=NULL;
575	<	struct AccessItem *aconf=NULL;
1542	<	struct MatchItem *match_item=NULL;
1543	<	dlink_list *list_p = map_to_list(type);
569	>	struct MaskItem *
570	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571	>	const char *host, unsigned int flags)
572	>	{
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579	<	#ifdef HAVE_LIBPCRE
580	<	case RXLINE_TYPE:
1549	<	DLINK_FOREACH(ptr, list_p->head)
1550	<	{
1551	<	conf = ptr->data;
1552	<	assert(conf->regexpname);
1553	<
1554	<	if (!ircd_pcre_exec(conf->regexpname, name))
1555	<	return conf;
1556	<	}
1557	<	break;
1558	<	#endif
1559	<	case SERVICE_TYPE:
1560	<	DLINK_FOREACH(ptr, list_p->head)
579	>	case CONF_SERVICE:
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
590
591	<	case XLINE_TYPE:
592	<	case ULINE_TYPE:
593	<	case NRESV_TYPE:
594	<	DLINK_FOREACH(ptr, list_p->head)
591	>	case CONF_XLINE:
592	>	case CONF_ULINE:
593	>	case CONF_NRESV:
594	>	case CONF_CRESV:
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
1578	–	match_item = map_to_conf(conf);
599		if (EmptyString(conf->name))
600	<	continue;
601	<	if ((name != NULL) && match_esc(conf->name, name))
600	>	continue;
601	>	if (name && !match(conf->name, name))
602		{
603	<	if ((user == NULL && (host == NULL)))
604	<	return conf;
605	<	if ((match_item->action & action) != action)
603	>	if ((user == NULL && (host == NULL)))
604	>	return conf;
605	>	if ((conf->flags & flags) != flags)
606		continue;
607	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
608	<	return conf;
609	<	if (match(match_item->user, user) && match(match_item->host, host))
610	<	return conf;
607	>	if (EmptyString(conf->user) || EmptyString(conf->host))
608	>	return conf;
609	>	if (!match(conf->user, user) && !match(conf->host, host))
610	>	return conf;
611		}
612		}
613		break;
614
615	<	case SERVER_TYPE:
616	<	DLINK_FOREACH(ptr, list_p->head)
615	>	case CONF_SERVER:
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
1599	<	aconf = map_to_conf(conf);
618	>	conf = node->data;
619
620	<	if ((name != NULL) && match_esc(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && match_esc(host, aconf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
626	<
626	>
627		default:
628		break;
629		}
#	Line 1617 | Line 636 | find_matching_name_conf(ConfType type, c
636		*              - pointer to name string to find
637		*              - pointer to user
638		*              - pointer to host
639	<	* output       - NULL or pointer to found struct MatchItem
639	>	* output       - NULL or pointer to found struct MaskItem
640		* side effects - looks for an exact match on name field
641		*/
642	<	struct ConfItem *
643	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
642	>	struct MaskItem *
643	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct AccessItem *aconf;
648	<	struct ConfItem *conf;
1630	<	struct MatchItem *match_item;
1631	<	dlink_list *list_p;
1632	<
1633	<	list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
652	<	case RXLINE_TYPE:
653	<	case XLINE_TYPE:
654	<	case ULINE_TYPE:
655	<	case NRESV_TYPE:
652	>	case CONF_XLINE:
653	>	case CONF_ULINE:
654	>	case CONF_NRESV:
655	>	case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
660	<	match_item = (struct MatchItem *)map_to_conf(conf);
659	>	conf = node->data;
660	>
661		if (EmptyString(conf->name))
662	<	continue;
663	<
662	>	continue;
663	>
664		if (irccmp(conf->name, name) == 0)
665		{
666	<	if ((user == NULL && (host == NULL)))
667	<	return (conf);
668	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
669	<	return (conf);
670	<	if (match(match_item->user, user) && match(match_item->host, host))
671	<	return (conf);
666	>	if ((user == NULL && (host == NULL)))
667	>	return conf;
668	>	if (EmptyString(conf->user) || EmptyString(conf->host))
669	>	return conf;
670	>	if (!match(conf->user, user) && !match(conf->host, host))
671	>	return conf;
672		}
673		}
674		break;
675
676	<	case OPER_TYPE:
677	<	DLINK_FOREACH(ptr, list_p->head)
676	>	case CONF_OPER:
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
1665	<	aconf = map_to_conf(conf);
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 1671 | Line 685 | find_exact_name_conf(ConfType type, cons
685		{
686		if (!who)
687		return conf;
688	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
689	<	return conf;
690	<	if (match(aconf->user, who->username))
688	>	if (EmptyString(conf->user) || EmptyString(conf->host))
689	>	return NULL;
690	>	if (!match(conf->user, who->username))
691		{
692	<	switch (aconf->type)
692	>	switch (conf->htype)
693		{
694		case HM_HOST:
695	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
696	<	return conf;
695	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
696	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
697	>	return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
702	<	return conf;
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703	>	return conf;
704		break;
1689	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
708	<	return conf;
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709	>	return conf;
710		break;
1695	–	#endif
711		default:
712		assert(0);
713		}
#	Line 1702 | Line 717 | find_exact_name_conf(ConfType type, cons
717
718		break;
719
720	<	case SERVER_TYPE:
721	<	DLINK_FOREACH(ptr, list_p->head)
720	>	case CONF_SERVER:
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
724	<	aconf = (struct AccessItem *)map_to_conf(conf);
723	>	conf = node->data;
724	>
725		if (EmptyString(conf->name))
726	<	continue;
727	<
726	>	continue;
727	>
728		if (name == NULL)
729		{
730	<	if (EmptyString(aconf->host))
731	<	continue;
732	<	if (irccmp(aconf->host, host) == 0)
733	<	return(conf);
730	>	if (EmptyString(conf->host))
731	>	continue;
732	>	if (irccmp(conf->host, host) == 0)
733	>	return conf;
734		}
735		else if (irccmp(conf->name, name) == 0)
736	<	{
1722	<	return (conf);
1723	<	}
736	>	return conf;
737		}
1725	–	break;
738
1727	–	case CLASS_TYPE:
1728	–	DLINK_FOREACH(ptr, list_p->head)
1729	–	{
1730	–	conf = ptr->data;
1731	–	if (EmptyString(conf->name))
1732	–	continue;
1733	–
1734	–	if (irccmp(conf->name, name) == 0)
1735	–	return (conf);
1736	–	}
739		break;
740
741		default:
742		break;
743		}
1742	–	return(NULL);
1743	–	}
1744	–
1745	–	/* rehash()
1746	–	*
1747	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1748	–	* as a result of an operator issuing this command, else assume it has been
1749	–	* called as a result of the server receiving a HUP signal.
1750	–	*/
1751	–	int
1752	–	rehash(int sig)
1753	–	{
1754	–	if (sig != 0)
1755	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1756	–	"Got signal SIGHUP, reloading ircd.conf file");
1757	–
1758	–	restart_resolver();
744
745	<	/* don't close listeners until we know we can go ahead with the rehash */
1761	<
1762	<	/* Check to see if we magically got(or lost) IPv6 support */
1763	<	check_can_use_v6();
1764	<
1765	<	read_conf_files(0);
1766	<
1767	<	if (ServerInfo.description != NULL)
1768	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1769	<
1770	<	load_conf_modules();
1771	<
1772	<	flush_deleted_I_P();
1773	<
1774	<	rehashed_klines = 1;
1775	<	/* XXX */
1776	<	if (ConfigLoggingEntry.use_logging)
1777	<	log_close_all();
1778	<
1779	<	return(0);
745	>	return NULL;
746		}
747
748		/* set_default_conf()
#	Line 1794 | Line 760 | set_default_conf(void)
760		/* verify init_class() ran, this should be an unnecessary check
761		* but its not much work.
762		*/
763	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
763	>	assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778	>	#endif
779	>
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	>	ConfigServerInfo.rsa_private_key = NULL;
783	>	ConfigServerInfo.rsa_private_key_file = NULL;
784		#endif
785
786	<	/* ServerInfo.name is not rehashable */
787	<	/* ServerInfo.name = ServerInfo.name; */
788	<	ServerInfo.description = NULL;
789	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
790	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
791	<
792	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
793	<	ServerInfo.specific_ipv4_vhost = 0;
794	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
795	<	ServerInfo.specific_ipv6_vhost = 0;
796	<
797	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
798	<
799	<	ServerInfo.hub = 0;
800	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
801	<	ServerInfo.dns_host.sin_port = 0;
802	<	AdminInfo.name = NULL;
803	<	AdminInfo.email = NULL;
804	<	AdminInfo.description = NULL;
786	>	/* ConfigServerInfo.name is not rehashable */
787	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
788	>	ConfigServerInfo.description = NULL;
789	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
790	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
791	>
792	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
793	>	ConfigServerInfo.specific_ipv4_vhost = 0;
794	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
795	>	ConfigServerInfo.specific_ipv6_vhost = 0;
796	>
797	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
798	>	ConfigServerInfo.max_nick_length = 9;
799	>	ConfigServerInfo.max_topic_length = 80;
800	>	ConfigServerInfo.hub = 0;
801	>
802	>	ConfigAdminInfo.name = NULL;
803	>	ConfigAdminInfo.email = NULL;
804	>	ConfigAdminInfo.description = NULL;
805
806	<	log_close_all();
806	>	log_del_all();
807
808	<	ConfigLoggingEntry.use_logging = 1;
808	>	ConfigLog.use_logging = 1;
809
810		ConfigChannel.disable_fake_channels = 0;
811	<	ConfigChannel.restrict_channels = 0;
812	<	ConfigChannel.disable_local_channels = 0;
813	<	ConfigChannel.use_invex = 1;
814	<	ConfigChannel.use_except = 1;
1833	<	ConfigChannel.use_knock = 1;
1834	<	ConfigChannel.knock_delay = 300;
811	>	ConfigChannel.invite_client_count = 10;
812	>	ConfigChannel.invite_client_time = 300;
813	>	ConfigChannel.knock_client_count = 1;
814	>	ConfigChannel.knock_client_time = 300;
815		ConfigChannel.knock_delay_channel = 60;
816	<	ConfigChannel.max_chans_per_user = 15;
1837	<	ConfigChannel.quiet_on_ban = 1;
816	>	ConfigChannel.max_channels = 25;
817		ConfigChannel.max_bans = 25;
818	+	ConfigChannel.default_join_flood_count = 18;
819	+	ConfigChannel.default_join_flood_time = 6;
820		ConfigChannel.default_split_user_count = 0;
821		ConfigChannel.default_split_server_count = 0;
822		ConfigChannel.no_join_on_split = 0;
823		ConfigChannel.no_create_on_split = 0;
1843	–	ConfigChannel.burst_topicwho = 1;
824
825		ConfigServerHide.flatten_links = 0;
826		ConfigServerHide.links_delay = 300;
827		ConfigServerHide.hidden = 0;
1848	–	ConfigServerHide.disable_hidden = 0;
828		ConfigServerHide.hide_servers = 0;
829	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
829	>	ConfigServerHide.hide_services = 0;
830	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
831		ConfigServerHide.hide_server_ips = 0;
832	+	ConfigServerHide.disable_remote_commands = 0;
833
834	<
835	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
836	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
837	<	ConfigFileEntry.gline_min_cidr = 16;
838	<	ConfigFileEntry.gline_min_cidr6 = 48;
839	<	ConfigFileEntry.invisible_on_connect = 1;
840	<	ConfigFileEntry.burst_away = 0;
841	<	ConfigFileEntry.use_whois_actually = 1;
842	<	ConfigFileEntry.tkline_expire_notices = 1;
843	<	ConfigFileEntry.hide_spoof_ips = 1;
844	<	ConfigFileEntry.ignore_bogus_ts = 0;
845	<	ConfigFileEntry.disable_auth = 0;
846	<	ConfigFileEntry.disable_remote = 0;
847	<	ConfigFileEntry.kill_chase_time_limit = 90;
848	<	ConfigFileEntry.default_floodcount = 8;
849	<	ConfigFileEntry.failed_oper_notice = 1;
850	<	ConfigFileEntry.dots_in_ident = 0;
851	<	ConfigFileEntry.min_nonwildcard = 4;
852	<	ConfigFileEntry.min_nonwildcard_simple = 3;
853	<	ConfigFileEntry.max_accept = 20;
854	<	ConfigFileEntry.anti_nick_flood = 0;
855	<	ConfigFileEntry.max_nick_time = 20;
856	<	ConfigFileEntry.max_nick_changes = 5;
857	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
858	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
859	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
860	<	ConfigFileEntry.kline_with_reason = 1;
861	<	ConfigFileEntry.kline_reason = NULL;
862	<	ConfigFileEntry.warn_no_nline = 1;
863	<	ConfigFileEntry.stats_o_oper_only = 0;
864	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
865	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
866	<	ConfigFileEntry.stats_P_oper_only = 0;
867	<	ConfigFileEntry.caller_id_wait = 60;
868	<	ConfigFileEntry.opers_bypass_callerid = 0;
869	<	ConfigFileEntry.pace_wait = 10;
870	<	ConfigFileEntry.pace_wait_simple = 1;
871	<	ConfigFileEntry.short_motd = 0;
872	<	ConfigFileEntry.ping_cookie = 0;
873	<	ConfigFileEntry.no_oper_flood = 0;
874	<	ConfigFileEntry.true_no_oper_flood = 0;
875	<	ConfigFileEntry.oper_pass_resv = 1;
876	<	ConfigFileEntry.glines = 0;
877	<	ConfigFileEntry.gline_time = 12 * 3600;
878	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
879	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
880	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
881	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1901	<	UMODE_OPERWALL | UMODE_WALLOP;
1902	<	ConfigFileEntry.use_egd = 0;
1903	<	ConfigFileEntry.egdpool_path = NULL;
1904	<	ConfigFileEntry.throttle_time = 10;
834	>	ConfigGeneral.away_count = 2;
835	>	ConfigGeneral.away_time = 10;
836	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
837	>	ConfigGeneral.cycle_on_host_change = 1;
838	>	ConfigGeneral.dline_min_cidr = 16;
839	>	ConfigGeneral.dline_min_cidr6 = 48;
840	>	ConfigGeneral.kline_min_cidr = 16;
841	>	ConfigGeneral.kline_min_cidr6 = 48;
842	>	ConfigGeneral.invisible_on_connect = 1;
843	>	ConfigGeneral.tkline_expire_notices = 1;
844	>	ConfigGeneral.ignore_bogus_ts = 0;
845	>	ConfigGeneral.disable_auth = 0;
846	>	ConfigGeneral.kill_chase_time_limit = 90;
847	>	ConfigGeneral.default_floodcount = 8;
848	>	ConfigGeneral.failed_oper_notice = 1;
849	>	ConfigGeneral.dots_in_ident = 0;
850	>	ConfigGeneral.min_nonwildcard = 4;
851	>	ConfigGeneral.min_nonwildcard_simple = 3;
852	>	ConfigGeneral.max_accept = 20;
853	>	ConfigGeneral.anti_nick_flood = 0;
854	>	ConfigGeneral.max_nick_time = 20;
855	>	ConfigGeneral.max_nick_changes = 5;
856	>	ConfigGeneral.anti_spam_exit_message_time = 0;
857	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
858	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
859	>	ConfigGeneral.warn_no_connect_block = 1;
860	>	ConfigGeneral.stats_e_disabled = 0;
861	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
862	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
863	>	ConfigGeneral.stats_o_oper_only = 1;
864	>	ConfigGeneral.stats_m_oper_only = 1;
865	>	ConfigGeneral.stats_P_oper_only = 0;
866	>	ConfigGeneral.stats_u_oper_only = 0;
867	>	ConfigGeneral.caller_id_wait = 60;
868	>	ConfigGeneral.opers_bypass_callerid = 0;
869	>	ConfigGeneral.pace_wait = 10;
870	>	ConfigGeneral.pace_wait_simple = 1;
871	>	ConfigGeneral.short_motd = 0;
872	>	ConfigGeneral.ping_cookie = 0;
873	>	ConfigGeneral.no_oper_flood = 0;
874	>	ConfigGeneral.oper_pass_resv = 1;
875	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
876	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
877	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
878	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
879	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
880	>	ConfigGeneral.throttle_count = 1;
881	>	ConfigGeneral.throttle_time = 1;
882		}
883
884		static void
885		validate_conf(void)
886		{
887	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
888	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
887	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
888	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
889
890	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
891	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
890	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
891	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
892
893	<	if (ServerInfo.network_name == NULL)
894	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
893	>	if (EmptyString(ConfigServerInfo.network_name))
894	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
895
896	<	if (ServerInfo.network_desc == NULL)
897	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
896	>	if (EmptyString(ConfigServerInfo.network_desc))
897	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
898
899	<	if (ConfigFileEntry.service_name == NULL)
1923	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1924	<
1925	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1926	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1927	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1928	<
1929	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
899	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
900		}
901
902	<	/* read_conf()
902	>	/* read_conf()
903		*
904		* inputs       - file descriptor pointing to config file to use
905		* output       - None
#	Line 1940 | Line 910 | read_conf(FILE *file)
910		{
911		lineno = 0;
912
913	<	set_default_conf(); /* Set default values prior to conf parsing */
913	>	set_default_conf();  /* Set default values prior to conf parsing */
914		conf_parser_ctx.pass = 1;
915	<	yyparse();          /* pick up the classes first */
915	>	yyparse();  /* Pick up the classes first */
916
917		rewind(file);
918
919		conf_parser_ctx.pass = 2;
920	<	yyparse();          /* Load the values from the conf */
921	<	validate_conf();    /* Check to make sure some values are still okay. */
922	<	/* Some global values are also loaded here. */
923	<	check_class();      /* Make sure classes are valid */
920	>	yyparse();  /* Load the values from the conf */
921	>	validate_conf();  /* Check to make sure some values are still okay. */
922	>	/* Some global values are also loaded here. */
923	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
924	>	}
925	>
926	>	/* conf_rehash()
927	>	*
928	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
929	>	* as a result of an operator issuing this command, else assume it has been
930	>	* called as a result of the server receiving a HUP signal.
931	>	*/
932	>	void
933	>	conf_rehash(int sig)
934	>	{
935	>	if (sig)
936	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
937	>	"Got signal SIGHUP, reloading configuration file(s)");
938	>
939	>	restart_resolver();
940	>
941	>	/* don't close listeners until we know we can go ahead with the rehash */
942	>
943	>	read_conf_files(0);
944	>
945	>	load_conf_modules();
946	>	check_conf_klines();
947		}
948
949		/* lookup_confhost()
#	Line 1958 | Line 951 | read_conf(FILE *file)
951		* start DNS lookups of all hostnames in the conf
952		* line and convert an IP addresses in a.b.c.d number for to IP#s.
953		*/
954	<	static void
955	<	lookup_confhost(struct ConfItem *conf)
954	>	void
955	>	lookup_confhost(struct MaskItem *conf)
956		{
1964	–	struct AccessItem *aconf;
957		struct addrinfo hints, *res;
958
959	<	aconf = map_to_conf(conf);
960	<
1969	<	if (EmptyString(aconf->host) ||
1970	<	EmptyString(aconf->user))
1971	<	{
1972	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1973	<	aconf->host, conf->name);
1974	<	return;
1975	<	}
1976	<
1977	<	if (strchr(aconf->host, '*') ||
1978	<	strchr(aconf->host, '?'))
1979	<	return;
1980	<
1981	<	/* Do name lookup now on hostnames given and store the
959	>	/*
960	>	* Do name lookup now on hostnames given and store the
961		* ip numbers in conf structure.
962		*/
963		memset(&hints, 0, sizeof(hints));
#	Line 1989 | Line 968 | lookup_confhost(struct ConfItem *conf)
968		/* Get us ready for a bind() and don't bother doing dns lookup */
969		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
970
971	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
971	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
972		{
973	<	conf_dns_lookup(aconf);
973	>	conf_dns_lookup(conf);
974		return;
975		}
976
977	<	assert(res != NULL);
977	>	assert(res);
978	>
979	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
980	>	conf->addr.ss_len = res->ai_addrlen;
981	>	conf->addr.ss.ss_family = res->ai_family;
982
2000	–	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
2001	–	aconf->addr.ss_len = res->ai_addrlen;
2002	–	aconf->addr.ss.ss_family = res->ai_family;
983		freeaddrinfo(res);
984		}
985
#	Line 2013 | Line 993 | lookup_confhost(struct ConfItem *conf)
993		int
994		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
995		{
996	<	struct ip_entry *ip_found;
997	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
996	>	struct ip_entry *ip_found = NULL;
997	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
998
999		/* DLINE exempt also gets you out of static limits/pacing... */
1000	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1000	>	if (conf && (conf->type == CONF_EXEMPT))
1001		return 0;
1002
1003	<	if (aconf != NULL)
1003	>	if (conf)
1004		return BANNED_CLIENT;
1005
1006	<	ip_found = find_or_add_ip(addr);
1006	>	ip_found = ipcache_find_or_add_address(addr);
1007
1008	<	if ((CurrentTime - ip_found->last_attempt) <
2029	<	ConfigFileEntry.throttle_time)
1008	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1009		{
1010	<	ip_found->last_attempt = CurrentTime;
1011	<	return TOO_FAST;
1010	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1011	>	return TOO_FAST;
1012	>
1013	>	++ip_found->connection_count;
1014		}
1015	+	else
1016	+	ip_found->connection_count = 1;
1017
1018		ip_found->last_attempt = CurrentTime;
1019		return 0;
1020		}
1021
1022	<	static struct AccessItem *
2040	<	find_regexp_kline(const char *uhi[])
2041	<	{
2042	<	#ifdef HAVE_LIBPCRE
2043	<	const dlink_node *ptr = NULL;
2044	<
2045	<	DLINK_FOREACH(ptr, rkconf_items.head)
2046	<	{
2047	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2048	<
2049	<	assert(aptr->regexuser);
2050	<	assert(aptr->regexhost);
2051	<
2052	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2053	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2054	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2055	<	return aptr;
2056	<	}
2057	<	#endif
2058	<	return NULL;
2059	<	}
2060	<
2061	<	/* find_kill()
1022	>	/* expire_tklines()
1023		*
1024	<	* inputs       - pointer to client structure
1025	<	* output       - pointer to struct AccessItem if found
1026	<	* side effects - See if this user is klined already,
2066	<	*                and if so, return struct AccessItem pointer
1024	>	* inputs       - tkline list pointer
1025	>	* output       - NONE
1026	>	* side effects - expire tklines
1027		*/
1028	<	struct AccessItem *
1029	<	find_kill(struct Client *client_p)
2070	<	{
2071	<	struct AccessItem *aconf = NULL;
2072	<	const char *uhi[3];
2073	<
2074	<	uhi[0] = client_p->username;
2075	<	uhi[1] = client_p->host;
2076	<	uhi[2] = client_p->sockhost;
2077	<
2078	<	assert(client_p != NULL);
2079	<
2080	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2081	<	CONF_KLINE, client_p->localClient->aftype,
2082	<	client_p->username, NULL, 1);
2083	<	if (aconf == NULL)
2084	<	aconf = find_regexp_kline(uhi);
2085	<
2086	<	return aconf;
2087	<	}
2088	<
2089	<	struct AccessItem *
2090	<	find_gline(struct Client *client_p)
1028	>	static void
1029	>	expire_tklines(dlink_list *list)
1030		{
1031	<	struct AccessItem *aconf;
1031	>	dlink_node *node = NULL, *node_next = NULL;
1032
1033	<	assert(client_p != NULL);
1033	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1034	>	{
1035	>	struct MaskItem *conf = node->data;
1036
1037	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1038	<	CONF_GLINE, client_p->localClient->aftype,
2098	<	client_p->username, NULL, 1);
2099	<	return aconf;
2100	<	}
1037	>	if (!conf->until || conf->until > CurrentTime)
1038	>	continue;
1039
1040	<	/* add_temp_line()
1041	<	*
1042	<	* inputs        - pointer to struct ConfItem
1043	<	* output        - none
2106	<	* Side effects  - links in given struct ConfItem into
2107	<	*                 temporary *line link list
2108	<	*/
2109	<	void
2110	<	add_temp_line(struct ConfItem *conf)
2111	<	{
2112	<	if (conf->type == XLINE_TYPE)
2113	<	{
2114	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2115	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2116	<	}
2117	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2118	<	{
2119	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2120	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1040	>	if (ConfigGeneral.tkline_expire_notices)
1041	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1042	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1043	>	conf_free(conf);
1044		}
1045		}
1046
#	Line 2129 | Line 1052 | add_temp_line(struct ConfItem *conf)
1052		*                This is an event started off in ircd.c
1053		*/
1054		void
1055	<	cleanup_tklines(void *notused)
1055	>	cleanup_tklines(void *unused)
1056		{
1057		hostmask_expire_temporary();
1058	<	expire_tklines(&temporary_xlines);
1059	<	expire_tklines(&temporary_resv);
1060	<	}
2138	<
2139	<	/* expire_tklines()
2140	<	*
2141	<	* inputs       - tkline list pointer
2142	<	* output       - NONE
2143	<	* side effects - expire tklines
2144	<	*/
2145	<	static void
2146	<	expire_tklines(dlink_list *tklist)
2147	<	{
2148	<	dlink_node *ptr;
2149	<	dlink_node *next_ptr;
2150	<	struct ConfItem *conf;
2151	<	struct MatchItem *xconf;
2152	<	struct MatchItem *nconf;
2153	<	struct ResvChannel *cconf;
2154	<
2155	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2156	<	{
2157	<	conf = ptr->data;
2158	<
2159	<	if (conf->type == XLINE_TYPE)
2160	<	{
2161	<	xconf = (struct MatchItem *)map_to_conf(conf);
2162	<	if (xconf->hold <= CurrentTime)
2163	<	{
2164	<	if (ConfigFileEntry.tkline_expire_notices)
2165	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2166	<	"Temporary X-line for [%s] sexpired", conf->name);
2167	<	dlinkDelete(ptr, tklist);
2168	<	free_dlink_node(ptr);
2169	<	delete_conf_item(conf);
2170	<	}
2171	<	}
2172	<	else if (conf->type == NRESV_TYPE)
2173	<	{
2174	<	nconf = (struct MatchItem *)map_to_conf(conf);
2175	<	if (nconf->hold <= CurrentTime)
2176	<	{
2177	<	if (ConfigFileEntry.tkline_expire_notices)
2178	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2179	<	"Temporary RESV for [%s] expired", conf->name);
2180	<	dlinkDelete(ptr, tklist);
2181	<	free_dlink_node(ptr);
2182	<	delete_conf_item(conf);
2183	<	}
2184	<	}
2185	<	else if (conf->type == CRESV_TYPE)
2186	<	{
2187	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2188	<	if (cconf->hold <= CurrentTime)
2189	<	{
2190	<	if (ConfigFileEntry.tkline_expire_notices)
2191	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2192	<	"Temporary RESV for [%s] expired", cconf->name);
2193	<	delete_channel_resv(cconf);
2194	<	}
2195	<	}
2196	<	}
1058	>	expire_tklines(&xconf_items);
1059	>	expire_tklines(&nresv_items);
1060	>	expire_tklines(&cresv_items);
1061		}
1062
1063		/* oper_privs_as_string()
#	Line 2204 | Line 1068 | expire_tklines(dlink_list *tklist)
1068		*/
1069		static const struct oper_privs
1070		{
1071	<	const unsigned int oprivs;
1071	>	const unsigned int flag;
1072		const unsigned char c;
1073		} flag_list[] = {
1074	<	{ OPER_FLAG_ADMIN,       'A' },
1075	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1076	<	{ OPER_FLAG_DIE,         'D' },
1077	<	{ OPER_FLAG_GLINE,       'G' },
1078	<	{ OPER_FLAG_REHASH,      'H' },
1079	<	{ OPER_FLAG_K,           'K' },
1080	<	{ OPER_FLAG_OPERWALL,    'L' },
1081	<	{ OPER_FLAG_N,           'N' },
1082	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1083	<	{ OPER_FLAG_REMOTE,      'R' },
1084	<	{ OPER_FLAG_OPER_SPY,    'S' },
1085	<	{ OPER_FLAG_UNKLINE,     'U' },
1086	<	{ OPER_FLAG_X,           'X' },
1074	>	{ OPER_FLAG_ADMIN,          'A' },
1075	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1076	>	{ OPER_FLAG_DIE,            'D' },
1077	>	{ OPER_FLAG_REHASH,         'H' },
1078	>	{ OPER_FLAG_KLINE,          'K' },
1079	>	{ OPER_FLAG_KILL,           'N' },
1080	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1081	>	{ OPER_FLAG_CONNECT,        'P' },
1082	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1083	>	{ OPER_FLAG_SQUIT,          'R' },
1084	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1085	>	{ OPER_FLAG_UNKLINE,        'U' },
1086	>	{ OPER_FLAG_XLINE,          'X' },
1087		{ 0, '\0' }
1088		};
1089
1090	<	char *
1090	>	const char *
1091		oper_privs_as_string(const unsigned int port)
1092		{
1093	<	static char privs_out[16];
1093	>	static char privs_out[IRCD_BUFSIZE];
1094		char *privs_ptr = privs_out;
2231	–	unsigned int i = 0;
1095
1096	<	for (; flag_list[i].oprivs; ++i)
1096	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1097		{
1098	<	if (port & flag_list[i].oprivs)
1099	<	*privs_ptr++ = flag_list[i].c;
1098	>	if (port & opriv->flag)
1099	>	*privs_ptr++ = opriv->c;
1100		else
1101	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1101	>	*privs_ptr++ = ToLower(opriv->c);
1102		}
1103
1104		*privs_ptr = '\0';
#	Line 2244 | Line 1107 | oper_privs_as_string(const unsigned int
1107		}
1108
1109		/*
1110	<	* Input: A client to find the active oper{} name for.
1110	>	* Input: A client to find the active operator {} name for.
1111		* Output: The nick!user@host{oper} of the oper.
1112		*         "oper" is server name for remote opers
1113		* Side effects: None.
#	Line 2252 | Line 1115 | oper_privs_as_string(const unsigned int
1115		const char *
1116		get_oper_name(const struct Client *client_p)
1117		{
1118	<	dlink_node *cnode = NULL;
1119	<	/* +5 for !,@,{,} and null */
1120	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1118	>	static char buffer[IRCD_BUFSIZE];
1119	>
1120	>	if (IsServer(client_p))
1121	>	return client_p->name;
1122
1123		if (MyConnect(client_p))
1124		{
1125	<	if ((cnode = client_p->localClient->confs.head))
1125	>	const dlink_node *const node = client_p->connection->confs.head;
1126	>
1127	>	if (node)
1128		{
1129	<	struct ConfItem *conf = cnode->data;
2264	<	const struct AccessItem *aconf = map_to_conf(conf);
1129	>	const struct MaskItem *const conf = node->data;
1130
1131	<	if (IsConfOperator(aconf))
1131	>	if (conf->type == CONF_OPER)
1132		{
1133	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1133	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1134		client_p->username, client_p->host, conf->name);
1135	<	return buffer;
1135	>	return buffer;
1136		}
1137		}
1138
1139	<	/* Probably should assert here for now. If there is an oper out there
1140	<	* with no oper{} conf attached, it would be good for us to know...
1139	>	/*
1140	>	* Probably should assert here for now. If there is an oper out there
1141	>	* with no operator {} conf attached, it would be good for us to know...
1142		*/
1143	<	assert(0); /* Oper without oper conf! */
1143	>	assert(0);  /* Oper without oper conf! */
1144		}
1145
1146		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1147	<	client_p->username, client_p->host, client_p->servptr->name);
1147	>	client_p->username, client_p->host, client_p->servptr->name);
1148		return buffer;
1149		}
1150
2285	–	/* read_conf_files()
2286	–	*
2287	–	* inputs       - cold start YES or NO
2288	–	* output       - none
2289	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2290	–	*/
2291	–	void
2292	–	read_conf_files(int cold)
2293	–	{
2294	–	const char *filename;
2295	–	char chanmodes[32];
2296	–	char chanlimit[32];
2297	–
2298	–	conf_parser_ctx.boot = cold;
2299	–	filename = get_conf_name(CONF_TYPE);
2300	–
2301	–	/* We need to know the initial filename for the yyerror() to report
2302	–	FIXME: The full path is in conffilenamebuf first time since we
2303	–	dont know anything else
2304	–
2305	–	- Gozem 2002-07-21
2306	–	*/
2307	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2308	–
2309	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
2310	–	{
2311	–	if (cold)
2312	–	{
2313	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2314	–	filename, strerror(errno));
2315	–	exit(-1);
2316	–	}
2317	–	else
2318	–	{
2319	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2320	–	"Unable to read configuration file '%s': %s",
2321	–	filename, strerror(errno));
2322	–	return;
2323	–	}
2324	–	}
2325	–
2326	–	if (!cold)
2327	–	clear_out_old_conf();
2328	–
2329	–	read_conf(conf_parser_ctx.conf_file);
2330	–	fclose(conf_parser_ctx.conf_file);
2331	–
2332	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2333	–	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2334	–	ConfigChannel.use_except ? "e" : "",
2335	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2336	–	add_isupport("MAXLIST", chanmodes, -1);
2337	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2338	–
2339	–	if (ConfigChannel.disable_local_channels)
2340	–	add_isupport("CHANTYPES", "#", -1);
2341	–	else
2342	–	add_isupport("CHANTYPES", "#&", -1);
2343	–
2344	–	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2345	–	ConfigChannel.disable_local_channels ? "#" : "#&",
2346	–	ConfigChannel.max_chans_per_user);
2347	–	add_isupport("CHANLIMIT", chanlimit, -1);
2348	–	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2349	–	ConfigChannel.use_except ? "e" : "",
2350	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2351	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2352	–
2353	–	if (ConfigChannel.use_except)
2354	–	add_isupport("EXCEPTS", "e", -1);
2355	–	if (ConfigChannel.use_invex)
2356	–	add_isupport("INVEX", "I", -1);
2357	–	add_isupport("CHANMODES", chanmodes, -1);
2358	–
2359	–	/*
2360	–	* message_locale may have changed.  rebuild isupport since it relies
2361	–	* on strlen(form_str(RPL_ISUPPORT))
2362	–	*/
2363	–	rebuild_isupport_message_line();
2364	–
2365	–	#ifdef HAVE_LIBPCRE
2366	–	parse_conf_file(RKLINE_TYPE, cold);
2367	–	parse_conf_file(RXLINE_TYPE, cold);
2368	–	#endif
2369	–	parse_conf_file(KLINE_TYPE, cold);
2370	–	parse_conf_file(DLINE_TYPE, cold);
2371	–	parse_conf_file(XLINE_TYPE, cold);
2372	–	parse_conf_file(NRESV_TYPE, cold);
2373	–	parse_conf_file(CRESV_TYPE, cold);
2374	–	}
2375	–
2376	–	/* parse_conf_file()
2377	–	*
2378	–	* inputs       - type of conf file to parse
2379	–	* output       - none
2380	–	* side effects - conf file for givenconf type is opened and read then parsed
2381	–	*/
2382	–	static void
2383	–	parse_conf_file(int type, int cold)
2384	–	{
2385	–	FILE *file = NULL;
2386	–	const char *filename = get_conf_name(type);
2387	–
2388	–	if ((file = fopen(filename, "r")) == NULL)
2389	–	{
2390	–	if (cold)
2391	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2392	–	filename, strerror(errno));
2393	–	else
2394	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2395	–	"Unable to read configuration file '%s': %s",
2396	–	filename, strerror(errno));
2397	–	}
2398	–	else
2399	–	{
2400	–	parse_csv_file(file, type);
2401	–	fclose(file);
2402	–	}
2403	–	}
2404	–
1151		/* clear_out_old_conf()
1152		*
1153		* inputs       - none
#	Line 2411 | Line 1157 | parse_conf_file(int type, int cold)
1157		static void
1158		clear_out_old_conf(void)
1159		{
1160	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2415	<	struct ConfItem *conf;
2416	<	struct AccessItem *aconf;
2417	<	struct ClassItem *cltmp;
2418	<	struct MatchItem *match_item;
1160	>	dlink_node *node = NULL, *node_next = NULL;
1161		dlink_list *free_items [] = {
1162		&server_items,   &oconf_items,
1163	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1164	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1163	>	&uconf_items,   &xconf_items,
1164	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1165		};
1166
1167		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2427 | Line 1169 | clear_out_old_conf(void)
1169		/* We only need to free anything allocated by yyparse() here.
1170		* Resetting structs, etc, is taken care of by set_default_conf().
1171		*/
1172	<
1173	<	for (; *iterator != NULL; iterator++)
1172	>
1173	>	for (; *iterator; iterator++)
1174		{
1175	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1175	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1176		{
1177	<	conf = ptr->data;
2436	<	/* XXX This is less than pretty */
2437	<	if (conf->type == SERVER_TYPE)
2438	<	{
2439	<	aconf = map_to_conf(conf);
1177	>	struct MaskItem *conf = node->data;
1178
1179	<	if (aconf->clients != 0)
2442	<	{
2443	<	SetConfIllegal(aconf);
2444	<	dlinkDelete(&conf->node, &server_items);
2445	<	}
2446	<	else
2447	<	{
2448	<	delete_conf_item(conf);
2449	<	}
2450	<	}
2451	<	else if (conf->type == OPER_TYPE)
2452	<	{
2453	<	aconf = map_to_conf(conf);
1179	>	conf->active = 0;
1180
1181	<	if (aconf->clients != 0)
2456	<	{
2457	<	SetConfIllegal(aconf);
2458	<	dlinkDelete(&conf->node, &oconf_items);
2459	<	}
2460	<	else
2461	<	{
2462	<	delete_conf_item(conf);
2463	<	}
2464	<	}
2465	<	else if (conf->type == XLINE_TYPE  ||
2466	<	conf->type == RXLINE_TYPE ||
2467	<	conf->type == RKLINE_TYPE)
1181	>	if (!IsConfDatabase(conf))
1182		{
1183	<	/* temporary (r)xlines are also on
2470	<	* the (r)xconf items list */
2471	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2472	<	continue;
1183	>	dlinkDelete(&conf->node, *iterator);
1184
1185	<	delete_conf_item(conf);
1186	<	}
2476	<	else
2477	<	{
2478	<	delete_conf_item(conf);
1185	>	if (!conf->ref_count)
1186	>	conf_free(conf);
1187		}
1188		}
1189		}
1190
1191	+	motd_clear();
1192	+
1193		/*
1194	<	* don't delete the class table, rather mark all entries
1195	<	* for deletion. The table is cleaned up by check_class. - avalon
1194	>	* Don't delete the class table, rather mark all entries for deletion.
1195	>	* The table is cleaned up by class_delete_marked. - avalon
1196		*/
1197	<	DLINK_FOREACH(ptr, class_items.head)
2488	<	{
2489	<	cltmp = map_to_conf(ptr->data);
2490	<
2491	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2492	<	cltmp->active = 0;
2493	<	}
1197	>	class_mark_for_deletion();
1198
1199		clear_out_address_conf();
1200
1201	<	/* clean out module paths */
1201	>	/* Clean out module paths */
1202		mod_clear_paths();
1203
1204	<	/* clean out ServerInfo */
1205	<	MyFree(ServerInfo.description);
1206	<	ServerInfo.description = NULL;
1207	<	MyFree(ServerInfo.network_name);
1208	<	ServerInfo.network_name = NULL;
1209	<	MyFree(ServerInfo.network_desc);
1210	<	ServerInfo.network_desc = NULL;
1211	<	MyFree(ConfigFileEntry.egdpool_path);
1212	<	ConfigFileEntry.egdpool_path = NULL;
1204	>	pseudo_clear();
1205	>
1206	>	/* Clean out ConfigServerInfo */
1207	>	MyFree(ConfigServerInfo.description);
1208	>	ConfigServerInfo.description = NULL;
1209	>	MyFree(ConfigServerInfo.network_name);
1210	>	ConfigServerInfo.network_name = NULL;
1211	>	MyFree(ConfigServerInfo.network_desc);
1212	>	ConfigServerInfo.network_desc = NULL;
1213		#ifdef HAVE_LIBCRYPTO
1214	<	if (ServerInfo.rsa_private_key != NULL)
1214	>	if (ConfigServerInfo.rsa_private_key)
1215		{
1216	<	RSA_free(ServerInfo.rsa_private_key);
1217	<	ServerInfo.rsa_private_key = NULL;
1216	>	RSA_free(ConfigServerInfo.rsa_private_key);
1217	>	ConfigServerInfo.rsa_private_key = NULL;
1218		}
1219
1220	<	MyFree(ServerInfo.rsa_private_key_file);
1221	<	ServerInfo.rsa_private_key_file = NULL;
2518	<
2519	<	if (ServerInfo.server_ctx)
2520	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2521	<	SSL_OP_NO_SSLv3|
2522	<	SSL_OP_NO_TLSv1);
2523	<	if (ServerInfo.client_ctx)
2524	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2525	<	SSL_OP_NO_SSLv3|
2526	<	SSL_OP_NO_TLSv1);
1220	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1221	>	ConfigServerInfo.rsa_private_key_file = NULL;
1222		#endif
1223
1224	<	/* clean out old resvs from the conf */
1225	<	clear_conf_resv();
1224	>	/* Clean out ConfigAdminInfo */
1225	>	MyFree(ConfigAdminInfo.name);
1226	>	ConfigAdminInfo.name = NULL;
1227	>	MyFree(ConfigAdminInfo.email);
1228	>	ConfigAdminInfo.email = NULL;
1229	>	MyFree(ConfigAdminInfo.description);
1230	>	ConfigAdminInfo.description = NULL;
1231
1232	<	/* clean out AdminInfo */
2533	<	MyFree(AdminInfo.name);
2534	<	AdminInfo.name = NULL;
2535	<	MyFree(AdminInfo.email);
2536	<	AdminInfo.email = NULL;
2537	<	MyFree(AdminInfo.description);
2538	<	AdminInfo.description = NULL;
2539	<
2540	<	/* operator{} and class{} blocks are freed above */
2541	<	/* clean out listeners */
1232	>	/* Clean out listeners */
1233		close_listeners();
2543	–
2544	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2545	–	* exempt{} and gecos{} blocks are freed above too
2546	–	*/
2547	–
2548	–	/* clean out general */
2549	–	MyFree(ConfigFileEntry.service_name);
2550	–	ConfigFileEntry.service_name = NULL;
2551	–
2552	–	delete_isupport("INVEX");
2553	–	delete_isupport("EXCEPTS");
1234		}
1235
1236	<	/* flush_deleted_I_P()
1236	>	/* read_conf_files()
1237		*
1238	<	* inputs       - none
1238	>	* inputs       - cold start YES or NO
1239		* output       - none
1240	<	* side effects - This function removes I/P conf items
2561	<	*/
2562	<	static void
2563	<	flush_deleted_I_P(void)
2564	<	{
2565	<	dlink_node *ptr;
2566	<	dlink_node *next_ptr;
2567	<	struct ConfItem *conf;
2568	<	struct AccessItem *aconf;
2569	<	dlink_list * free_items [] = {
2570	<	&server_items, &oconf_items, NULL
2571	<	};
2572	<	dlink_list ** iterator = free_items; /* C is dumb */
2573	<
2574	<	/* flush out deleted I and P lines
2575	<	* although still in use.
2576	<	*/
2577	<	for (; *iterator != NULL; iterator++)
2578	<	{
2579	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2580	<	{
2581	<	conf = ptr->data;
2582	<	aconf = (struct AccessItem *)map_to_conf(conf);
2583	<
2584	<	if (IsConfIllegal(aconf))
2585	<	{
2586	<	dlinkDelete(ptr, *iterator);
2587	<
2588	<	if (aconf->clients == 0)
2589	<	delete_conf_item(conf);
2590	<	}
2591	<	}
2592	<	}
2593	<	}
2594	<
2595	<	/* get_conf_name()
2596	<	*
2597	<	* inputs       - type of conf file to return name of file for
2598	<	* output       - pointer to filename for type of conf
2599	<	* side effects - none
1240	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1241		*/
1242	<	const char *
1243	<	get_conf_name(ConfType type)
1242	>	void
1243	>	read_conf_files(int cold)
1244		{
1245	<	switch (type)
1246	<	{
1247	<	case CONF_TYPE:
2607	<	return ConfigFileEntry.configfile;
2608	<	break;
2609	<	case KLINE_TYPE:
2610	<	return ConfigFileEntry.klinefile;
2611	<	break;
2612	<	case RKLINE_TYPE:
2613	<	return ConfigFileEntry.rklinefile;
2614	<	break;
2615	<	case DLINE_TYPE:
2616	<	return ConfigFileEntry.dlinefile;
2617	<	break;
2618	<	case XLINE_TYPE:
2619	<	return ConfigFileEntry.xlinefile;
2620	<	break;
2621	<	case RXLINE_TYPE:
2622	<	return ConfigFileEntry.rxlinefile;
2623	<	break;
2624	<	case CRESV_TYPE:
2625	<	return ConfigFileEntry.cresvfile;
2626	<	break;
2627	<	case NRESV_TYPE:
2628	<	return ConfigFileEntry.nresvfile;
2629	<	break;
2630	<	case GLINE_TYPE:
2631	<	return ConfigFileEntry.glinefile;
2632	<	break;
1245	>	const char *filename = NULL;
1246	>	char chanmodes[IRCD_BUFSIZE] = "";
1247	>	char chanlimit[IRCD_BUFSIZE] = "";
1248
1249	<	default:
1250	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2636	<	only with the above values, this will cause us to core
2637	<	at some point if this happens so we know where it was */
2638	<	}
2639	<	}
1249	>	conf_parser_ctx.boot = cold;
1250	>	filename = ConfigGeneral.configfile;
1251
1252	<	#define BAD_PING (-1)
1252	>	/* We need to know the initial filename for the yyerror() to report
1253	>	FIXME: The full path is in conffilenamebuf first time since we
1254	>	don't know anything else
1255
1256	<	/* get_conf_ping()
1257	<	*
1258	<	* inputs       - pointer to struct AccessItem
2646	<	*              - pointer to a variable that receives ping warning time
2647	<	* output       - ping frequency
2648	<	* side effects - NONE
2649	<	*/
2650	<	static int
2651	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2652	<	{
2653	<	struct ClassItem *aclass;
2654	<	struct AccessItem *aconf;
1256	>	- Gozem 2002-07-21
1257	>	*/
1258	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1259
1260	<	if (conf != NULL)
1260	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1261		{
1262	<	aconf = (struct AccessItem *)map_to_conf(conf);
2659	<	if (aconf->class_ptr != NULL)
1262	>	if (cold)
1263		{
1264	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1265	<	*pingwarn = aclass->ping_warning;
1266	<	return aclass->ping_freq;
1264	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1265	>	filename, strerror(errno));
1266	>	exit(-1);
1267		}
1268	<	}
2666	<
2667	<	return BAD_PING;
2668	<	}
2669	<
2670	<	/* get_client_class()
2671	<	*
2672	<	* inputs       - pointer to client struct
2673	<	* output       - pointer to name of class
2674	<	* side effects - NONE
2675	<	*/
2676	<	const char *
2677	<	get_client_class(struct Client *target_p)
2678	<	{
2679	<	dlink_node *cnode = NULL;
2680	<	struct AccessItem *aconf = NULL;
2681	<
2682	<	assert(!IsMe(target_p));
2683	<
2684	<	if ((cnode = target_p->localClient->confs.head))
2685	<	{
2686	<	struct ConfItem *conf = cnode->data;
2687	<
2688	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2689	<	(conf->type == OPER_TYPE));
2690	<
2691	<	aconf = map_to_conf(conf);
2692	<	if (aconf->class_ptr != NULL)
2693	<	return aconf->class_ptr->name;
2694	<	}
2695	<
2696	<	return "default";
2697	<	}
2698	<
2699	<	/* get_client_ping()
2700	<	*
2701	<	* inputs       - pointer to client struct
2702	<	*              - pointer to a variable that receives ping warning time
2703	<	* output       - ping frequency
2704	<	* side effects - NONE
2705	<	*/
2706	<	int
2707	<	get_client_ping(struct Client *target_p, int *pingwarn)
2708	<	{
2709	<	int ping = 0;
2710	<	dlink_node *cnode = NULL;
2711	<
2712	<	if ((cnode = target_p->localClient->confs.head))
2713	<	{
2714	<	struct ConfItem *conf = cnode->data;
2715	<
2716	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2717	<	(conf->type == OPER_TYPE));
2718	<
2719	<	ping = get_conf_ping(conf, pingwarn);
2720	<	if (ping > 0)
2721	<	return ping;
2722	<	}
2723	<
2724	<	*pingwarn = 0;
2725	<	return DEFAULT_PINGFREQUENCY;
2726	<	}
2727	<
2728	<	/* find_class()
2729	<	*
2730	<	* inputs       - string name of class
2731	<	* output       - corresponding Class pointer
2732	<	* side effects - NONE
2733	<	*/
2734	<	struct ConfItem *
2735	<	find_class(const char *classname)
2736	<	{
2737	<	struct ConfItem *conf;
2738	<
2739	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2740	<	return conf;
2741	<
2742	<	return class_default;
2743	<	}
2744	<
2745	<	/* check_class()
2746	<	*
2747	<	* inputs       - NONE
2748	<	* output       - NONE
2749	<	* side effects -
2750	<	*/
2751	<	void
2752	<	check_class(void)
2753	<	{
2754	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2755	<
2756	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2757	<	{
2758	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2759	<
2760	<	if (!aclass->active && !aclass->curr_user_count)
1268	>	else
1269		{
1270	<	destroy_cidr_class(aclass);
1271	<	delete_conf_item(ptr->data);
1270	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1271	>	"Unable to read configuration file '%s': %s",
1272	>	filename, strerror(errno));
1273	>	return;
1274		}
1275		}
2766	–	}
1276
1277	<	/* init_class()
1278	<	*
2770	<	* inputs       - NONE
2771	<	* output       - NONE
2772	<	* side effects -
2773	<	*/
2774	<	void
2775	<	init_class(void)
2776	<	{
2777	<	struct ClassItem *aclass;
2778	<
2779	<	class_default = make_conf_item(CLASS_TYPE);
2780	<
2781	<	aclass = map_to_conf(class_default);
2782	<	aclass->active = 1;
2783	<	DupString(class_default->name, "default");
2784	<	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2785	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2786	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2787	<	aclass->max_sendq = DEFAULT_SENDQ;
2788	<
2789	<	client_check_cb = register_callback("check_client", check_client);
2790	<	}
2791	<
2792	<	/* get_sendq()
2793	<	*
2794	<	* inputs       - pointer to client
2795	<	* output       - sendq for this client as found from its class
2796	<	* side effects - NONE
2797	<	*/
2798	<	unsigned int
2799	<	get_sendq(struct Client *client_p)
2800	<	{
2801	<	unsigned int sendq = DEFAULT_SENDQ;
2802	<	dlink_node *cnode;
2803	<	struct ConfItem *class_conf;
2804	<	struct ClassItem *aclass;
2805	<	struct AccessItem *aconf;
2806	<
2807	<	assert(!IsMe(client_p));
2808	<
2809	<	if ((cnode = client_p->localClient->confs.head))
2810	<	{
2811	<	struct ConfItem *conf = cnode->data;
1277	>	if (!cold)
1278	>	clear_out_old_conf();
1279
1280	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
1281	<	(conf->type == OPER_TYPE));
1280	>	read_conf(conf_parser_ctx.conf_file);
1281	>	fclose(conf_parser_ctx.conf_file);
1282
1283	<	aconf = map_to_conf(conf);
1283	>	log_reopen_all();
1284
1285	<	if ((class_conf = aconf->class_ptr) == NULL)
1286	<	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
1285	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1286	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1287
1288	<	aclass = map_to_conf(class_conf);
1289	<	sendq = aclass->max_sendq;
1290	<	return sendq;
1291	<	}
1288	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1289	>	isupport_add("MAXLIST", chanmodes, -1);
1290	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1291	>	isupport_add("CHANTYPES", "#", -1);
1292	>
1293	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1294	>	ConfigChannel.max_channels);
1295	>	isupport_add("CHANLIMIT", chanlimit, -1);
1296	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1297	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1298	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1299	>	isupport_add("CHANMODES", chanmodes, -1);
1300
1301	<	/* XXX return a default?
1302	<	* if here, then there wasn't an attached conf with a sendq
1303	<	* that is very bad -Dianora
1301	>	/*
1302	>	* message_locale may have changed.  rebuild isupport since it relies
1303	>	* on strlen(form_str(RPL_ISUPPORT))
1304		*/
1305	<	return DEFAULT_SENDQ;
1305	>	isupport_rebuild();
1306		}
1307
1308		/* conf_add_class_to_conf()
1309		*
1310		* inputs       - pointer to config item
1311		* output       - NONE
1312	<	* side effects - Add a class pointer to a conf
1312	>	* side effects - Add a class pointer to a conf
1313		*/
1314		void
1315	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1315	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1316		{
1317	<	struct AccessItem *aconf = map_to_conf(conf);
2843	<	struct ClassItem *class = NULL;
2844	<
2845	<	if (class_name == NULL)
1317	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1318		{
1319	<	aconf->class_ptr = class_default;
2848	<
2849	<	if (conf->type == CLIENT_TYPE)
2850	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2851	<	"Warning *** Defaulting to default class for %s@%s",
2852	<	aconf->user, aconf->host);
2853	<	else
2854	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2855	<	"Warning *** Defaulting to default class for %s",
2856	<	conf->name);
2857	<	}
2858	<	else
2859	<	aconf->class_ptr = find_class(class_name);
2860	<
2861	<	if (aconf->class_ptr)
2862	<	class = map_to_conf(aconf->class_ptr);
1319	>	conf->class = class_default;
1320
1321	<	if (aconf->class_ptr == NULL || !class->active)
1322	<	{
1323	<	if (conf->type == CLIENT_TYPE)
1324	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2868	<	"Warning *** Defaulting to default class for %s@%s",
2869	<	aconf->user, aconf->host);
1321	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1322	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1323	>	"Warning *** Defaulting to default class for %s@%s",
1324	>	conf->user, conf->host);
1325		else
1326	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1327	<	"Warning *** Defaulting to default class for %s",
1328	<	conf->name);
2874	<	aconf->class_ptr = class_default;
2875	<	}
2876	<	}
2877	<
2878	<	/* conf_add_server()
2879	<	*
2880	<	* inputs       - pointer to config item
2881	<	*              - pointer to link count already on this conf
2882	<	* output       - NONE
2883	<	* side effects - Add a connect block
2884	<	*/
2885	<	int
2886	<	conf_add_server(struct ConfItem *conf, const char *class_name)
2887	<	{
2888	<	struct AccessItem *aconf = map_to_conf(conf);
2889	<
2890	<	conf_add_class_to_conf(conf, class_name);
2891	<
2892	<	if (!aconf->host || !conf->name)
2893	<	{
2894	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
2895	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
2896	<	return -1;
1326	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1327	>	"Warning *** Defaulting to default class for %s",
1328	>	conf->name);
1329		}
2898	–
2899	–	if (EmptyString(aconf->passwd))
2900	–	{
2901	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
2902	–	conf->name);
2903	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2904	–	return -1;
2905	–	}
2906	–
2907	–	lookup_confhost(conf);
2908	–
2909	–	return 0;
1330		}
1331
1332		/* yyerror()
#	Line 2924 | Line 1344 | yyerror(const char *msg)
1344		return;
1345
1346		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1347	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1347	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1348	>	"\"%s\", line %u: %s: %s",
1349	>	conffilebuf, lineno + 1, msg, newlinebuf);
1350	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1351	>	conffilebuf, lineno + 1, msg, newlinebuf);
1352	>	}
1353	>
1354	>	void
1355	>	conf_error_report(const char *msg)
1356	>	{
1357	>	char newlinebuf[IRCD_BUFSIZE];
1358	>
1359	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1360	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1361	>	"\"%s\", line %u: %s: %s",
1362		conffilebuf, lineno + 1, msg, newlinebuf);
1363		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1364		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2932 | Line 1366 | yyerror(const char *msg)
1366
1367		/*
1368		* valid_tkline()
1369	<	*
1369	>	*
1370		* inputs       - pointer to ascii string to check
1371		*              - whether the specified time is in seconds or minutes
1372		* output       - -1 not enough parameters
#	Line 2941 | Line 1375 | yyerror(const char *msg)
1375		* Originally written by Dianora (Diane, db@db.net)
1376		*/
1377		time_t
1378	<	valid_tkline(const char *p, int minutes)
1378	>	valid_tkline(const char *data, const int minutes)
1379		{
1380	+	const unsigned char *p = (const unsigned char *)data;
1381	+	unsigned char tmpch = '\0';
1382		time_t result = 0;
1383
1384	<	for (; *p; ++p)
1384	>	while ((tmpch = *p++))
1385		{
1386	<	if (!IsDigit(*p))
1386	>	if (!IsDigit(tmpch))
1387		return 0;
1388
1389		result *= 10;
1390	<	result += ((*p) & 0xF);
1390	>	result += (tmpch & 0xF);
1391		}
1392
1393		/*
1394	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	<	* i.e. they specifically use 0, I am going to return 1 instead
1396	<	* as a return value of non-zero is used to flag it as a temporary kline
1394	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1396	>	* value of non-zero is used to flag it as a temporary kline
1397		*/
1398		if (result == 0)
1399		result = 1;
1400
1401	<	/*
1401	>	/*
1402		* If the incoming time is in seconds convert it to minutes for the purpose
1403		* of this calculation
1404		*/
1405		if (!minutes)
1406	<	result = result / (time_t)60;
1406	>	result = result / 60;
1407
1408		if (result > MAX_TDKLINE_TIME)
1409		result = MAX_TDKLINE_TIME;
1410
1411	<	result = result * (time_t)60;  /* turn it into seconds */
1411	>	result = result * 60;  /* Turn it into seconds */
1412
1413		return result;
1414		}
1415
1416	+	/* valid_wild_card_simple()
1417	+	*
1418	+	* inputs       - data to check for sufficient non-wildcard characters
1419	+	* outputs      - 1 if valid, else 0
1420	+	* side effects - none
1421	+	*/
1422	+	int
1423	+	valid_wild_card_simple(const char *data)
1424	+	{
1425	+	const unsigned char *p = (const unsigned char *)data;
1426	+	unsigned char tmpch = '\0';
1427	+	unsigned int nonwild = 0, wild = 0;
1428	+
1429	+	while ((tmpch = *p++))
1430	+	{
1431	+	if (tmpch == '\\' && *p)
1432	+	{
1433	+	++p;
1434	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1435	+	return 1;
1436	+	}
1437	+	else if (!IsMWildChar(tmpch))
1438	+	{
1439	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1440	+	return 1;
1441	+	}
1442	+	else
1443	+	++wild;
1444	+	}
1445	+
1446	+	return !wild;
1447	+	}
1448	+
1449		/* valid_wild_card()
1450		*
1451		* input        - pointer to client
#	Line 2986 | Line 1455 | valid_tkline(const char *p, int minutes)
1455		* side effects - NOTICE is given to source_p if warn is 1
1456		*/
1457		int
1458	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1458	>	valid_wild_card(struct Client *source_p, int count, ...)
1459		{
1460	<	char *p;
1461	<	char tmpch;
2993	<	int nonwild = 0;
1460	>	unsigned char tmpch = '\0';
1461	>	unsigned int nonwild = 0;
1462		va_list args;
1463
1464		/*
#	Line 3009 | Line 1477 | valid_wild_card(struct Client *source_p,
1477
1478		while (count--)
1479		{
1480	<	p = va_arg(args, char *);
1480	>	const unsigned char *p = va_arg(args, const unsigned char *);
1481		if (p == NULL)
1482		continue;
1483
#	Line 3021 | Line 1489 | valid_wild_card(struct Client *source_p,
1489		* If we find enough non-wild characters, we can
1490		* break - no point in searching further.
1491		*/
1492	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1492	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1493	>	{
1494	>	va_end(args);
1495		return 1;
1496	+	}
1497		}
1498		}
1499		}
1500
1501	<	if (warn)
1502	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1503	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1501	>	if (IsClient(source_p))
1502	>	sendto_one_notice(source_p, &me,
1503	>	":Please include at least %u non-wildcard characters with the mask",
1504	>	ConfigGeneral.min_nonwildcard);
1505	>	va_end(args);
1506	>	return 0;
1507	>	}
1508	>
1509	>	/* find_user_host()
1510	>	*
1511	>	* inputs       - pointer to client placing kline
1512	>	*              - pointer to user_host_or_nick
1513	>	*              - pointer to user buffer
1514	>	*              - pointer to host buffer
1515	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1516	>	* side effects -
1517	>	*/
1518	>	static int
1519	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1520	>	char *luser, char *lhost)
1521	>	{
1522	>	struct Client *target_p = NULL;
1523	>	char *hostp = NULL;
1524	>
1525	>	if (lhost == NULL)
1526	>	{
1527	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1528	>	return 1;
1529	>	}
1530	>
1531	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1532	>	{
1533	>	/* Explicit user@host mask given */
1534	>	if (hostp)                            /* I'm a little user@host */
1535	>	{
1536	>	*(hostp++) = '\0';                       /* short and squat */
1537	>
1538	>	if (*user_host_or_nick)
1539	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1540	>	else
1541	>	strcpy(luser, "*");
1542	>
1543	>	if (*hostp)
1544	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1545	>	else
1546	>	strcpy(lhost, "*");
1547	>	}
1548	>	else
1549	>	{
1550	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1551	>	luser[1] = '\0';
1552	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1553	>	}
1554	>
1555	>	return 1;
1556	>	}
1557	>	else
1558	>	{
1559	>	/* Try to find user@host mask from nick */
1560	>	/* Okay to use source_p as the first param, because source_p == client_p */
1561	>	if ((target_p =
1562	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1563	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1564	>
1565	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1566	>	{
1567	>	if (IsClient(source_p))
1568	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1569	>	return 0;
1570	>	}
1571	>
1572	>	/*
1573	>	* Turn the "user" bit into "*user", blow away '~'
1574	>	* if found in original user name (non-idented)
1575	>	*/
1576	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1577	>
1578	>	if (target_p->username[0] == '~')
1579	>	luser[0] = '*';
1580	>
1581	>	if (!strcmp(target_p->sockhost, "0"))
1582	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1583	>	else
1584	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1585	>	return 1;
1586	>	}
1587	>
1588		return 0;
1589		}
1590
#	Line 3043 | Line 1598 | valid_wild_card(struct Client *source_p,
1598		*              - parse_flags bit map of things to test
1599		*              - pointer to user or string to parse into
1600		*              - pointer to host or NULL to parse into if non NULL
1601	<	*              - pointer to optional tkline time or NULL
1601	>	*              - pointer to optional tkline time or NULL
1602		*              - pointer to target_server to parse into if non NULL
1603		*              - pointer to reason to parse into
1604		*
1605	<	* output       - 1 if valid, -1 if not valid
1605	>	* output       - 1 if valid, 0 if not valid
1606		* side effects - A generalised k/d/x etc. line parser,
1607		*               "ALINE [time] user@host|string [ON] target :reason"
1608		*                will parse returning a parsed user, host if
#	Line 3065 | Line 1620 | valid_wild_card(struct Client *source_p,
1620		*/
1621		int
1622		parse_aline(const char *cmd, struct Client *source_p,
1623	<	int parc, char **parv,
1624	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1625	<	char **target_server, char **reason)
1623	>	int parc, char **parv,
1624	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1625	>	char **target_server, char **reason)
1626		{
1627		int found_tkline_time=0;
1628	<	static char def_reason[] = "No Reason";
1628	>	static char default_reason[] = CONF_NOREASON;
1629		static char user[USERLEN*4+1];
1630		static char host[HOSTLEN*4+1];
1631
#	Line 3079 | Line 1634 | parse_aline(const char *cmd, struct Clie
1634
1635		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1636
1637	<	if (found_tkline_time != 0)
1637	>	if (found_tkline_time)
1638		{
1639		parv++;
1640		parc--;
1641
1642	<	if (tkline_time != NULL)
1642	>	if (tkline_time)
1643		*tkline_time = found_tkline_time;
1644		else
1645		{
1646	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1647	<	me.name, source_p->name, cmd);
3093	<	return -1;
1646	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1647	>	return 0;
1648		}
1649		}
1650
1651		if (parc == 0)
1652		{
1653	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1654	<	me.name, source_p->name, cmd);
3101	<	return -1;
1653	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1654	>	return 0;
1655		}
1656
1657		if (h_p == NULL)
1658		*up_p = *parv;
1659		else
1660		{
1661	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1662	<	return -1;
1661	>	if (find_user_host(source_p, *parv, user, host) == 0)
1662	>	return 0;
1663
1664		*up_p = user;
1665		*h_p = host;
1666		}
1667	<
1667	>
1668		parc--;
1669		parv++;
1670
1671	<	if (parc != 0)
1671	>	if (parc)
1672		{
1673		if (irccmp(*parv, "ON") == 0)
1674		{
1675		parc--;
1676		parv++;
1677
3125	–	if (target_server == NULL)
3126	–	{
3127	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
3128	–	me.name, source_p->name, cmd);
3129	–	return -1;
3130	–	}
3131	–
1678		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1679		{
1680	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1681	<	me.name, source_p->name, "remoteban");
3136	<	return -1;
1680	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1681	>	return 0;
1682		}
1683
1684		if (parc == 0 || EmptyString(*parv))
1685		{
1686	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1687	<	me.name, source_p->name, cmd);
3143	<	return -1;
1686	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1687	>	return 0;
1688		}
1689
1690		*target_server = *parv;
#	Line 3152 | Line 1696 | parse_aline(const char *cmd, struct Clie
1696		/* Make sure target_server *is* NULL if no ON server found
1697		* caller probably NULL'd it first, but no harm to do it again -db
1698		*/
1699	<	if (target_server != NULL)
1700	<	*target_server = NULL;
1699	>	if (target_server)
1700	>	*target_server = NULL;
1701		}
1702		}
1703
1704	<	if (h_p != NULL)
1704	>	if (h_p)
1705		{
1706	<	if (strchr(user, '!') != NULL)
1706	>	if (strchr(user, '!'))
1707		{
1708	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1709	<	me.name, source_p->name);
3166	<	return -1;
1708	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1709	>	return 0;
1710		}
1711
1712	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1713	<	return -1;
1712	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1713	>	return 0;
1714		}
1715		else
1716	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1717	<	return -1;
1716	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1717	>	return 0;
1718
1719	<	if (reason != NULL)
1719	>	if (reason)
1720		{
1721	<	if (parc != 0 && !EmptyString(*parv))
3179	<	{
1721	>	if (parc && !EmptyString(*parv))
1722		*reason = *parv;
3181	–	if (!valid_comment(source_p, *reason, 1))
3182	–	return -1;
3183	–	}
3184	–	else
3185	–	*reason = def_reason;
3186	–	}
3187	–
3188	–	return 1;
3189	–	}
3190	–
3191	–	/* find_user_host()
3192	–	*
3193	–	* inputs       - pointer to client placing kline
3194	–	*              - pointer to user_host_or_nick
3195	–	*              - pointer to user buffer
3196	–	*              - pointer to host buffer
3197	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3198	–	* side effects -
3199	–	*/
3200	–	static int
3201	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3202	–	char *luser, char *lhost, unsigned int flags)
3203	–	{
3204	–	struct Client *target_p = NULL;
3205	–	char *hostp = NULL;
3206	–
3207	–	if (lhost == NULL)
3208	–	{
3209	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3210	–	return 1;
3211	–	}
3212	–
3213	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3214	–	{
3215	–	/* Explicit user@host mask given */
3216	–
3217	–	if (hostp != NULL)                            /* I'm a little user@host */
3218	–	{
3219	–	*(hostp++) = '\0';                       /* short and squat */
3220	–	if (*user_host_or_nick)
3221	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3222	–	else
3223	–	strcpy(luser, "*");
3224	–	if (*hostp)
3225	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3226	–	else
3227	–	strcpy(lhost, "*");
3228	–	}
3229	–	else
3230	–	{
3231	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3232	–	luser[1] = '\0';
3233	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3234	–	}
3235	–
3236	–	return 1;
3237	–	}
3238	–	else if (!(flags & NOUSERLOOKUP))
3239	–	{
3240	–	/* Try to find user@host mask from nick */
3241	–	/* Okay to use source_p as the first param, because source_p == client_p */
3242	–	if ((target_p =
3243	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3244	–	return 0;
3245	–
3246	–	if (IsExemptKline(target_p))
3247	–	{
3248	–	if (!IsServer(source_p))
3249	–	sendto_one(source_p,
3250	–	":%s NOTICE %s :%s is E-lined",
3251	–	me.name, source_p->name, target_p->name);
3252	–	return 0;
3253	–	}
3254	–
3255	–	/*
3256	–	* turn the "user" bit into "*user", blow away '~'
3257	–	* if found in original user name (non-idented)
3258	–	*/
3259	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3260	–
3261	–	if (target_p->username[0] == '~')
3262	–	luser[0] = '*';
3263	–
3264	–	if (target_p->sockhost[0] == '\0' ||
3265	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3266	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1723		else
1724	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3269	<	return 1;
1724	>	*reason = default_reason;
1725		}
1726
3272	–	return 0;
3273	–	}
3274	–
3275	–	/* valid_comment()
3276	–	*
3277	–	* inputs       - pointer to client
3278	–	*              - pointer to comment
3279	–	* output       - 0 if no valid comment,
3280	–	*              - 1 if valid
3281	–	* side effects - truncates reason where necessary
3282	–	*/
3283	–	int
3284	–	valid_comment(struct Client *source_p, char *comment, int warn)
3285	–	{
3286	–	if (strchr(comment, '"'))
3287	–	{
3288	–	if (warn)
3289	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3290	–	me.name, source_p->name);
3291	–	return 0;
3292	–	}
3293	–
3294	–	if (strlen(comment) > REASONLEN)
3295	–	comment[REASONLEN-1] = '\0';
3296	–
1727		return 1;
1728		}
1729
#	Line 3305 | Line 1735 | valid_comment(struct Client *source_p, c
1735		* side effects - none
1736		*/
1737		int
1738	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1738	>	match_conf_password(const char *password, const struct MaskItem *conf)
1739		{
1740		const char *encr = NULL;
1741
1742	<	if (EmptyString(password) || EmptyString(aconf->passwd))
1742	>	if (EmptyString(password) || EmptyString(conf->passwd))
1743		return 0;
1744
1745	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1746	<	encr = crypt(password, aconf->passwd);
1745	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1746	>	encr = crypt(password, conf->passwd);
1747		else
1748		encr = password;
1749
1750	<	return !strcmp(encr, aconf->passwd);
1750	>	return encr && !strcmp(encr, conf->passwd);
1751		}
1752
1753		/*
#	Line 3325 | Line 1755 | match_conf_password(const char *password
1755		*
1756		* inputs       - client sending the cluster
1757		*              - command name "KLINE" "XLINE" etc.
1758	<	*              - capab -- CAP_KLN etc. from s_serv.h
1758	>	*              - capab -- CAPAB_KLN etc. from server.h
1759		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1760		*              - pattern and args to send along
1761		* output       - none
#	Line 3333 | Line 1763 | match_conf_password(const char *password
1763		*                along to all servers that match capab and cluster type
1764		*/
1765		void
1766	<	cluster_a_line(struct Client *source_p, const char *command,
1767	<	int capab, int cluster_type, const char *pattern, ...)
1766	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1767	>	unsigned int cluster_type, const char *pattern, ...)
1768		{
1769		va_list args;
1770	<	char buffer[IRCD_BUFSIZE];
1771	<	const dlink_node *ptr = NULL;
1770	>	char buffer[IRCD_BUFSIZE] = "";
1771	>	const dlink_node *node = NULL;
1772
1773		va_start(args, pattern);
1774		vsnprintf(buffer, sizeof(buffer), pattern, args);
1775		va_end(args);
1776
1777	<	DLINK_FOREACH(ptr, cluster_items.head)
1777	>	DLINK_FOREACH(node, cluster_items.head)
1778		{
1779	<	const struct ConfItem *conf = ptr->data;
1779	>	const struct MaskItem *conf = node->data;
1780
1781		if (conf->flags & cluster_type)
1782	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1783	<	"%s %s %s", command, conf->name, buffer);
1782	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1783	>	"%s %s %s", command, conf->name, buffer);
1784		}
1785		}
1786
#	Line 3389 | Line 1819 | split_nuh(struct split_nuh_item *const i
1819
1820		if (iptr->nickptr)
1821		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1822	+
1823		if (iptr->userptr)
1824		strlcpy(iptr->userptr, "*", iptr->usersize);
1825	+
1826		if (iptr->hostptr)
1827		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1828
#	Line 3398 | Line 1830 | split_nuh(struct split_nuh_item *const i
1830		{
1831		*p = '\0';
1832
1833	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1833	>	if (iptr->nickptr && *iptr->nuhmask)
1834		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1835
1836	<	if ((q = strchr(++p, '@'))) {
1836	>	if ((q = strchr(++p, '@')))
1837	>	{
1838		*q++ = '\0';
1839
1840	<	if (*p != '\0')
1840	>	if (*p)
1841		strlcpy(iptr->userptr, p, iptr->usersize);
1842
1843	<	if (*q != '\0')
1843	>	if (*q)
1844		strlcpy(iptr->hostptr, q, iptr->hostsize);
1845		}
1846		else
1847		{
1848	<	if (*p != '\0')
1848	>	if (*p)
1849		strlcpy(iptr->userptr, p, iptr->usersize);
1850		}
1851		}
#	Line 3424 | Line 1857 | split_nuh(struct split_nuh_item *const i
1857		/* if found a @ */
1858		*p++ = '\0';
1859
1860	<	if (*iptr->nuhmask != '\0')
1860	>	if (*iptr->nuhmask)
1861		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1862
1863	<	if (*p != '\0')
1863	>	if (*p)
1864		strlcpy(iptr->hostptr, p, iptr->hostsize);
1865		}
1866		else
1867		{
1868	<	/* no @ found */
1868	>	/* No @ found */
1869		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1870		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1871		else
#	Line 3440 | Line 1873 | split_nuh(struct split_nuh_item *const i
1873		}
1874		}
1875		}
3443	–
3444	–	/*
3445	–	* flags_to_ascii
3446	–	*
3447	–	* inputs       - flags is a bitmask
3448	–	*              - pointer to table of ascii letters corresponding
3449	–	*                to each bit
3450	–	*              - flag 1 for convert ToLower if bit missing
3451	–	*                0 if ignore.
3452	–	* output       - none
3453	–	* side effects - string pointed to by p has bitmap chars written to it
3454	–	*/
3455	–	static void
3456	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3457	–	int lowerit)
3458	–	{
3459	–	unsigned int mask = 1;
3460	–	int i = 0;
3461	–
3462	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3463	–	{
3464	–	if (flags & mask)
3465	–	*p++ = bit_table[i];
3466	–	else if (lowerit)
3467	–	*p++ = ToLower(bit_table[i]);
3468	–	}
3469	–	*p = '\0';
3470	–	}
3471	–
3472	–	/*
3473	–	* cidr_limit_reached
3474	–	*
3475	–	* inputs       - int flag allowing over_rule of limits
3476	–	*              - pointer to the ip to be added
3477	–	*              - pointer to the class
3478	–	* output       - non zero if limit reached
3479	–	*                0 if limit not reached
3480	–	* side effects -
3481	–	*/
3482	–	static int
3483	–	cidr_limit_reached(int over_rule,
3484	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3485	–	{
3486	–	dlink_node *ptr = NULL;
3487	–	struct CidrItem *cidr;
3488	–
3489	–	if (aclass->number_per_cidr <= 0)
3490	–	return 0;
3491	–
3492	–	if (ip->ss.ss_family == AF_INET)
3493	–	{
3494	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3495	–	return 0;
3496	–
3497	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3498	–	{
3499	–	cidr = ptr->data;
3500	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3501	–	{
3502	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3503	–	return -1;
3504	–	cidr->number_on_this_cidr++;
3505	–	return 0;
3506	–	}
3507	–	}
3508	–	cidr = MyMalloc(sizeof(struct CidrItem));
3509	–	cidr->number_on_this_cidr = 1;
3510	–	cidr->mask = *ip;
3511	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3512	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3513	–	}
3514	–	#ifdef IPV6
3515	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3516	–	{
3517	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3518	–	{
3519	–	cidr = ptr->data;
3520	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3521	–	{
3522	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3523	–	return -1;
3524	–	cidr->number_on_this_cidr++;
3525	–	return 0;
3526	–	}
3527	–	}
3528	–	cidr = MyMalloc(sizeof(struct CidrItem));
3529	–	cidr->number_on_this_cidr = 1;
3530	–	cidr->mask = *ip;
3531	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3532	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3533	–	}
3534	–	#endif
3535	–	return 0;
3536	–	}
3537	–
3538	–	/*
3539	–	* remove_from_cidr_check
3540	–	*
3541	–	* inputs       - pointer to the ip to be removed
3542	–	*              - pointer to the class
3543	–	* output       - NONE
3544	–	* side effects -
3545	–	*/
3546	–	static void
3547	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3548	–	{
3549	–	dlink_node *ptr = NULL;
3550	–	dlink_node *next_ptr = NULL;
3551	–	struct CidrItem *cidr;
3552	–
3553	–	if (aclass->number_per_cidr == 0)
3554	–	return;
3555	–
3556	–	if (ip->ss.ss_family == AF_INET)
3557	–	{
3558	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3559	–	return;
3560	–
3561	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3562	–	{
3563	–	cidr = ptr->data;
3564	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3565	–	{
3566	–	cidr->number_on_this_cidr--;
3567	–	if (cidr->number_on_this_cidr == 0)
3568	–	{
3569	–	dlinkDelete(ptr, &aclass->list_ipv4);
3570	–	MyFree(cidr);
3571	–	return;
3572	–	}
3573	–	}
3574	–	}
3575	–	}
3576	–	#ifdef IPV6
3577	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3578	–	{
3579	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3580	–	{
3581	–	cidr = ptr->data;
3582	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3583	–	{
3584	–	cidr->number_on_this_cidr--;
3585	–	if (cidr->number_on_this_cidr == 0)
3586	–	{
3587	–	dlinkDelete(ptr, &aclass->list_ipv6);
3588	–	MyFree(cidr);
3589	–	return;
3590	–	}
3591	–	}
3592	–	}
3593	–	}
3594	–	#endif
3595	–	}
3596	–
3597	–	static void
3598	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3599	–	dlink_list *old_list, dlink_list *new_list, int changed)
3600	–	{
3601	–	dlink_node *ptr;
3602	–	struct Client *client_p;
3603	–	struct ConfItem *conf;
3604	–	struct AccessItem *aconf;
3605	–
3606	–	if (!changed)
3607	–	{
3608	–	*new_list = *old_list;
3609	–	old_list->head = old_list->tail = NULL;
3610	–	old_list->length = 0;
3611	–	return;
3612	–	}
3613	–
3614	–	DLINK_FOREACH(ptr, local_client_list.head)
3615	–	{
3616	–	client_p = ptr->data;
3617	–	if (client_p->localClient->aftype != aftype)
3618	–	continue;
3619	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3620	–	continue;
3621	–
3622	–	conf = client_p->localClient->confs.tail->data;
3623	–	if (conf->type == CLIENT_TYPE)
3624	–	{
3625	–	aconf = map_to_conf(conf);
3626	–	if (aconf->class_ptr == oldcl)
3627	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3628	–	}
3629	–	}
3630	–	}
3631	–
3632	–	/*
3633	–	* rebuild_cidr_class
3634	–	*
3635	–	* inputs       - pointer to old conf
3636	–	*              - pointer to new_class
3637	–	* output       - none
3638	–	* side effects - rebuilds the class link list of cidr blocks
3639	–	*/
3640	–	void
3641	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3642	–	{
3643	–	struct ClassItem *old_class = map_to_conf(conf);
3644	–
3645	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3646	–	{
3647	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3648	–	rebuild_cidr_list(AF_INET, conf, new_class,
3649	–	&old_class->list_ipv4, &new_class->list_ipv4,
3650	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3651	–
3652	–	#ifdef IPV6
3653	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3654	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3655	–	&old_class->list_ipv6, &new_class->list_ipv6,
3656	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3657	–	#endif
3658	–	}
3659	–
3660	–	destroy_cidr_class(old_class);
3661	–	}
3662	–
3663	–	/*
3664	–	* destroy_cidr_list
3665	–	*
3666	–	* inputs       - pointer to class dlink list of cidr blocks
3667	–	* output       - none
3668	–	* side effects - completely destroys the class link list of cidr blocks
3669	–	*/
3670	–	static void
3671	–	destroy_cidr_list(dlink_list *list)
3672	–	{
3673	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3674	–
3675	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3676	–	{
3677	–	dlinkDelete(ptr, list);
3678	–	MyFree(ptr->data);
3679	–	}
3680	–	}
3681	–
3682	–	/*
3683	–	* destroy_cidr_class
3684	–	*
3685	–	* inputs       - pointer to class
3686	–	* output       - none
3687	–	* side effects - completely destroys the class link list of cidr blocks
3688	–	*/
3689	–	static void
3690	–	destroy_cidr_class(struct ClassItem *aclass)
3691	–	{
3692	–	destroy_cidr_list(&aclass->list_ipv4);
3693	–	destroy_cidr_list(&aclass->list_ipv6);
3694	–	}

Diff Legend

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