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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines