ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 34 by lusky, Sun Oct 2 21:05:51 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 4343 by michael, Sat Aug 2 16:58:33 2014 UTC

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

Diff Legend

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