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 891 by michael, Thu Nov 1 13:44:50 2007 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 2852 by michael, Sat Jan 18 16:30:48 2014 UTC

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

Diff Legend

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