ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf.c (file contents), Revision 1353 by michael, Sun Apr 15 18:35:55 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 2852 by michael, Sat Jan 18 16:30:48 2014 UTC

#	Line 25 | Line 25
25		#include "stdinc.h"
26		#include "list.h"
27		#include "ircd_defs.h"
28	–	#include "balloc.h"
28		#include "conf.h"
29		#include "s_serv.h"
30		#include "resv.h"
31		#include "channel.h"
32		#include "client.h"
33		#include "event.h"
35	–	#include "hash.h"
34		#include "hook.h"
35		#include "irc_string.h"
38	–	#include "sprintf_irc.h"
36		#include "s_bsd.h"
37		#include "ircd.h"
38		#include "listener.h"
#	Line 47 | Line 44
44		#include "send.h"
45		#include "s_gline.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
57	–	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 };
64	–	dlink_list hub_items     = { NULL, NULL, 0 };
65	–	dlink_list leaf_items    = { NULL, NULL, 0 };
64		dlink_list oconf_items   = { NULL, NULL, 0 };
65		dlink_list uconf_items   = { NULL, NULL, 0 };
66		dlink_list xconf_items   = { NULL, NULL, 0 };
69	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
70	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
67		dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list class_items   = { NULL, NULL, 0 };
73	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
74	<
75	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
76	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
79	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
80	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
81	<	dlink_list temporary_resv = { NULL, NULL, 0 };
68	>	dlink_list cresv_items = { NULL, NULL, 0 };
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
86	–	extern char yytext[];
73		extern int yyparse(); /* defined in y.tab.c */
74
75		struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
76
77		/* internally defined functions */
92	–	static void lookup_confhost(struct ConfItem *);
93	–	static void set_default_conf(void);
94	–	static void validate_conf(void);
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	–	/* address of default class conf */
119	–	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 127 | 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
140	–	void *
141	–	map_to_conf(struct ConfItem *aconf)
142	–	{
143	–	void *conf;
144	–	conf = (void *)((uintptr_t)aconf +
145	–	(uintptr_t)sizeof(struct ConfItem));
146	–	return(conf);
147	–	}
148	–
149	–	struct ConfItem *
150	–	unmap_conf_item(void *aconf)
151	–	{
152	–	struct ConfItem *conf;
153	–
154	–	conf = (struct ConfItem *)((uintptr_t)aconf -
155	–	(uintptr_t)sizeof(struct ConfItem));
156	–	return(conf);
157	–	}
158	–
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 119 | unmap_conf_item(void *aconf)
119		static void
120		conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
121		{
122	<	struct AccessItem *aconf = vptr;
122	>	struct MaskItem *conf = vptr;
123
124	<	aconf->dns_pending = 0;
124	>	conf->dns_pending = 0;
125
126		if (addr != NULL)
127	<	memcpy(&aconf->ipnum, addr, sizeof(aconf->ipnum));
127	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
128		else
129	<	aconf->dns_failed = 1;
129	>	conf->dns_failed = 1;
130		}
131
132		/* conf_dns_lookup()
#	Line 186 | Line 136 | conf_dns_callback(void *vptr, const stru
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_pending)
141	>	if (!conf->dns_pending)
142		{
143	<	aconf->dns_pending = 1;
144	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
143	>	conf->dns_pending = 1;
144	>	gethost_byname(conf_dns_callback, conf, conf->host);
145		}
146		}
147
148	<	/* make_conf_item()
149	<	*
200	<	* inputs       - type of item
201	<	* output       - pointer to new conf entry
202	<	* side effects - none
203	<	*/
204	<	struct ConfItem *
205	<	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;
209	<	struct ClassItem *aclass = NULL;
210	<	int status = 0;
211	<
212	<	switch (type)
213	<	{
214	<	case DLINE_TYPE:
215	<	case EXEMPTDLINE_TYPE:
216	<	case GLINE_TYPE:
217	<	case KLINE_TYPE:
218	<	case CLIENT_TYPE:
219	<	case OPER_TYPE:
220	<	case SERVER_TYPE:
221	<	conf = MyMalloc(sizeof(struct ConfItem) +
222	<	sizeof(struct AccessItem));
223	<	aconf = map_to_conf(conf);
224	<	aconf->aftype = AF_INET;
225	<
226	<	/* Yes, sigh. switch on type again */
227	<	switch (type)
228	<	{
229	<	case EXEMPTDLINE_TYPE:
230	<	status = CONF_EXEMPTDLINE;
231	<	break;
232	<
233	<	case DLINE_TYPE:
234	<	status = CONF_DLINE;
235	<	break;
236	<
237	<	case KLINE_TYPE:
238	<	status = CONF_KLINE;
239	<	break;
240	<
241	<	case GLINE_TYPE:
242	<	status = CONF_GLINE;
243	<	break;
244	<
245	<	case CLIENT_TYPE:
246	<	status = CONF_CLIENT;
247	<	break;
248	<
249	<	case OPER_TYPE:
250	<	status = CONF_OPERATOR;
251	<	dlinkAdd(conf, &conf->node, &oconf_items);
252	<	break;
253	<
254	<	case SERVER_TYPE:
255	<	status = CONF_SERVER;
256	<	dlinkAdd(conf, &conf->node, &server_items);
257	<	break;
258	<
259	<	default:
260	<	break;
261	<	}
262	<	aconf->status = status;
263	<	break;
264	<
265	<	case LEAF_TYPE:
266	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
267	<	sizeof(struct MatchItem));
268	<	dlinkAdd(conf, &conf->node, &leaf_items);
269	<	break;
270	<
271	<	case HUB_TYPE:
272	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
273	<	sizeof(struct MatchItem));
274	<	dlinkAdd(conf, &conf->node, &hub_items);
275	<	break;
276	<
277	<	case ULINE_TYPE:
278	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
279	<	sizeof(struct MatchItem));
280	<	dlinkAdd(conf, &conf->node, &uconf_items);
281	<	break;
282	<
283	<	case GDENY_TYPE:
284	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
285	<	sizeof(struct AccessItem));
286	<	dlinkAdd(conf, &conf->node, &gdeny_items);
287	<	break;
288	<
289	<	case XLINE_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct MatchItem));
292	<	dlinkAdd(conf, &conf->node, &xconf_items);
293	<	break;
294	<	#ifdef HAVE_LIBPCRE
295	<	case RXLINE_TYPE:
296	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
297	<	sizeof(struct MatchItem));
298	<	dlinkAdd(conf, &conf->node, &rxconf_items);
299	<	break;
300	<
301	<	case RKLINE_TYPE:
302	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
303	<	sizeof(struct AccessItem));
304	<	aconf = map_to_conf(conf);
305	<	aconf->status = CONF_KLINE;
306	<	dlinkAdd(conf, &conf->node, &rkconf_items);
307	<	break;
308	<	#endif
309	<	case CLUSTER_TYPE:
310	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
311	<	dlinkAdd(conf, &conf->node, &cluster_items);
312	<	break;
151	>	struct MaskItem *conf = MyMalloc(sizeof(*conf));
152	>	dlink_list *list = NULL;
153
154	<	case CRESV_TYPE:
155	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
156	<	sizeof(struct ResvChannel));
317	<	break;
318	<
319	<	case NRESV_TYPE:
320	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
321	<	sizeof(struct MatchItem));
322	<	dlinkAdd(conf, &conf->node, &nresv_items);
323	<	break;
324	<
325	<	case SERVICE_TYPE:
326	<	status = CONF_SERVICE;
327	<	conf = MyMalloc(sizeof(struct ConfItem));
328	<	dlinkAdd(conf, &conf->node, &service_items);
329	<	break;
330	<
331	<	case CLASS_TYPE:
332	<	conf = MyMalloc(sizeof(struct ConfItem) +
333	<	sizeof(struct ClassItem));
334	<	dlinkAdd(conf, &conf->node, &class_items);
335	<
336	<	aclass = map_to_conf(conf);
337	<	aclass->active = 1;
338	<	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
339	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
340	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
341	<	MaxSendq(aclass) = DEFAULT_SENDQ;
342	<
343	<	break;
344	<
345	<	default:
346	<	conf = NULL;
347	<	break;
348	<	}
349	<
350	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
351	<	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);
365	–	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_pending)
187	<	delete_resolver_queries(aconf);
188	<	if (aconf->passwd != NULL)
189	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
382	<	if (aconf->spasswd != NULL)
383	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
384	<	aconf->class_ptr = NULL;
385	<
386	<	MyFree(aconf->passwd);
387	<	MyFree(aconf->spasswd);
388	<	MyFree(aconf->reason);
389	<	MyFree(aconf->oper_reason);
390	<	MyFree(aconf->user);
391	<	MyFree(aconf->host);
392	<	MyFree(aconf->cipher_list);
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)
395	<	RSA_free(aconf->rsa_public_key);
396	<	MyFree(aconf->rsa_public_key_file);
397	<	#endif
398	<
399	<	/* Yes, sigh. switch on type again */
400	<	switch(type)
401	<	{
402	<	case EXEMPTDLINE_TYPE:
403	<	case DLINE_TYPE:
404	<	case GLINE_TYPE:
405	<	case KLINE_TYPE:
406	<	case CLIENT_TYPE:
407	<	MyFree(conf);
408	<	break;
409	<
410	<	case OPER_TYPE:
411	<	aconf = map_to_conf(conf);
412	<	if (!IsConfIllegal(aconf))
413	<	dlinkDelete(&conf->node, &oconf_items);
414	<	MyFree(conf);
415	<	break;
416	<
417	<	case SERVER_TYPE:
418	<	aconf = map_to_conf(conf);
419	<	if (!IsConfIllegal(aconf))
420	<	dlinkDelete(&conf->node, &server_items);
421	<	MyFree(conf);
422	<	break;
423	<
424	<	default:
425	<	break;
426	<	}
427	<	break;
428	<
429	<	case HUB_TYPE:
430	<	match_item = map_to_conf(conf);
431	<	MyFree(match_item->user);
432	<	MyFree(match_item->host);
433	<	MyFree(match_item->reason);
434	<	MyFree(match_item->oper_reason);
435	<	/* If marked illegal, its already been pulled off of the hub_items list */
436	<	if (!match_item->illegal)
437	<	dlinkDelete(&conf->node, &hub_items);
438	<	MyFree(conf);
439	<	break;
191	>	MyFree(conf->cipher_list);
192
193	<	case LEAF_TYPE:
194	<	match_item = map_to_conf(conf);
443	<	MyFree(match_item->user);
444	<	MyFree(match_item->host);
445	<	MyFree(match_item->reason);
446	<	MyFree(match_item->oper_reason);
447	<	/* If marked illegal, its already been pulled off of the leaf_items list */
448	<	if (!match_item->illegal)
449	<	dlinkDelete(&conf->node, &leaf_items);
450	<	MyFree(conf);
451	<	break;
452	<
453	<	case ULINE_TYPE:
454	<	match_item = map_to_conf(conf);
455	<	MyFree(match_item->user);
456	<	MyFree(match_item->host);
457	<	MyFree(match_item->reason);
458	<	MyFree(match_item->oper_reason);
459	<	dlinkDelete(&conf->node, &uconf_items);
460	<	MyFree(conf);
461	<	break;
462	<
463	<	case XLINE_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, &xconf_items);
470	<	MyFree(conf);
471	<	break;
472	<	#ifdef HAVE_LIBPCRE
473	<	case RKLINE_TYPE:
474	<	aconf = map_to_conf(conf);
475	<	MyFree(aconf->regexuser);
476	<	MyFree(aconf->regexhost);
477	<	MyFree(aconf->user);
478	<	MyFree(aconf->host);
479	<	MyFree(aconf->reason);
480	<	MyFree(aconf->oper_reason);
481	<	dlinkDelete(&conf->node, &rkconf_items);
482	<	MyFree(conf);
483	<	break;
484	<
485	<	case RXLINE_TYPE:
486	<	MyFree(conf->regexpname);
487	<	match_item = map_to_conf(conf);
488	<	MyFree(match_item->user);
489	<	MyFree(match_item->host);
490	<	MyFree(match_item->reason);
491	<	MyFree(match_item->oper_reason);
492	<	dlinkDelete(&conf->node, &rxconf_items);
493	<	MyFree(conf);
494	<	break;
193	>	if (conf->rsa_public_key)
194	>	RSA_free(conf->rsa_public_key);
195		#endif
196	<	case NRESV_TYPE:
197	<	match_item = map_to_conf(conf);
198	<	MyFree(match_item->user);
199	<	MyFree(match_item->host);
200	<	MyFree(match_item->reason);
501	<	MyFree(match_item->oper_reason);
502	<	dlinkDelete(&conf->node, &nresv_items);
503	<
504	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
505	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
506	<	free_dlink_node(m);
507	<
508	<	MyFree(conf);
509	<	break;
510	<
511	<	case GDENY_TYPE:
512	<	aconf = map_to_conf(conf);
513	<	MyFree(aconf->user);
514	<	MyFree(aconf->host);
515	<	dlinkDelete(&conf->node, &gdeny_items);
516	<	MyFree(conf);
517	<	break;
518	<
519	<	case CLUSTER_TYPE:
520	<	dlinkDelete(&conf->node, &cluster_items);
521	<	MyFree(conf);
522	<	break;
523	<
524	<	case CRESV_TYPE:
525	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
526	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
527	<	free_dlink_node(m);
528	<
529	<	MyFree(conf);
530	<	break;
531	<
532	<	case CLASS_TYPE:
533	<	dlinkDelete(&conf->node, &class_items);
534	<	MyFree(conf);
535	<	break;
536	<
537	<	case SERVICE_TYPE:
538	<	dlinkDelete(&conf->node, &service_items);
539	<	MyFree(conf);
540	<	break;
541	<
542	<	default:
543	<	break;
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		}
545	–	}
546	–
547	–	/* free_access_item()
548	–	*
549	–	* inputs       - pointer to conf to free
550	–	* output       - none
551	–	* side effects - crucial password fields are zeroed, conf is freed
552	–	*/
553	–	void
554	–	free_access_item(struct AccessItem *aconf)
555	–	{
556	–	struct ConfItem *conf;
557	–
558	–	if (aconf == NULL)
559	–	return;
560	–	conf = unmap_conf_item(aconf);
561	–	delete_conf_item(conf);
562	–	}
563	–
564	–	static const unsigned int shared_bit_table[] =
565	–	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
202
203	<	/* report_confitem_types()
568	<	*
569	<	* inputs       - pointer to client requesting confitem report
570	<	*              - ConfType to report
571	<	* output       - none
572	<	* side effects -
573	<	*/
574	<	void
575	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
576	<	{
577	<	dlink_node *ptr = NULL;
578	<	struct ConfItem *conf = NULL;
579	<	struct AccessItem *aconf = NULL;
580	<	struct MatchItem *matchitem = NULL;
581	<	struct ClassItem *classitem = NULL;
582	<	char buf[12];
583	<	char *p = NULL;
584	<	const char *pfx = NULL;
585	<
586	<	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;
592	<	aconf = map_to_conf(conf);
593	<
594	<	p = buf;
595	<
596	<	if (aconf->flags & GDENY_BLOCK)
597	<	*p++ = 'B';
598	<	else
599	<	*p++ = 'b';
600	<
601	<	if (aconf->flags & GDENY_REJECT)
602	<	*p++ = 'R';
603	<	else
604	<	*p++ = 'r';
605	<
606	<	*p = '\0';
607	<
608	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
609	<	me.name, RPL_STATSDEBUG, source_p->name,
610	<	aconf->user, aconf->host, conf->name, buf);
611	<	}
612	<	break;
613	<
614	<	case XLINE_TYPE:
615	<	DLINK_FOREACH(ptr, xconf_items.head)
616	<	{
617	<	conf = ptr->data;
618	<	matchitem = map_to_conf(conf);
619	<
620	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
621	<	me.name, source_p->name,
622	<	matchitem->hold ? "x": "X", matchitem->count,
623	<	conf->name, matchitem->reason);
624	<	}
625	<	break;
626	<
627	<	#ifdef HAVE_LIBPCRE
628	<	case RXLINE_TYPE:
629	<	DLINK_FOREACH(ptr, rxconf_items.head)
630	<	{
631	<	conf = ptr->data;
632	<	matchitem = map_to_conf(conf);
633	<
634	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
635	<	me.name, source_p->name,
636	<	matchitem->hold ? "xR": "XR", matchitem->count,
637	<	conf->name, matchitem->reason);
638	<	}
639	<	break;
640	<
641	<	case RKLINE_TYPE:
642	<	pfx = temp ? "kR" : "KR";
643	<
644	<	DLINK_FOREACH(ptr, rkconf_items.head)
645	<	{
646	<	aconf = map_to_conf((conf = ptr->data));
647	<
648	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
649	<	continue;
650	<
651	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
652	<	source_p->name, pfx, aconf->host, aconf->user,
653	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
654	<	}
655	<	break;
656	<	#endif
657	<
658	<	case ULINE_TYPE:
659	<	DLINK_FOREACH(ptr, uconf_items.head)
660	<	{
661	<	conf = ptr->data;
662	<	matchitem = map_to_conf(conf);
663	<
664	<	p = buf;
665	<
666	<	/* some of these are redundant for the sake of
667	<	* consistency with cluster{} flags
668	<	*/
669	<	*p++ = 'c';
670	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
671	<
672	<	sendto_one(source_p, form_str(RPL_STATSULINE),
673	<	me.name, source_p->name, conf->name,
674	<	matchitem->user?matchitem->user: "*",
675	<	matchitem->host?matchitem->host: "*", buf);
676	<	}
677	<
678	<	DLINK_FOREACH(ptr, cluster_items.head)
679	<	{
680	<	conf = ptr->data;
681	<
682	<	p = buf;
683	<
684	<	*p++ = 'C';
685	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
686	<
687	<	sendto_one(source_p, form_str(RPL_STATSULINE),
688	<	me.name, source_p->name, conf->name,
689	<	"*", "*", buf);
690	<	}
691	<
692	<	break;
693	<
694	<	case OPER_TYPE:
695	<	DLINK_FOREACH(ptr, oconf_items.head)
696	<	{
697	<	conf = ptr->data;
698	<	aconf = map_to_conf(conf);
699	<
700	<	/* Don't allow non opers to see oper privs */
701	<	if (HasUMode(source_p, UMODE_OPER))
702	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
703	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
704	<	conf->name, oper_privs_as_string(aconf->port),
705	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
706	<	else
707	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
708	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
709	<	conf->name, "0",
710	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
711	<	}
712	<	break;
713	<
714	<	case CLASS_TYPE:
715	<	DLINK_FOREACH(ptr, class_items.head)
716	<	{
717	<	conf = ptr->data;
718	<	classitem = map_to_conf(conf);
719	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
720	<	me.name, source_p->name, 'Y',
721	<	conf->name, PingFreq(classitem),
722	<	ConFreq(classitem),
723	<	MaxTotal(classitem), MaxSendq(classitem),
724	<	CurrUserCount(classitem),
725	<	classitem->active ? "active" : "disabled");
726	<	}
727	<	break;
728	<
729	<	case CONF_TYPE:
730	<	case CLIENT_TYPE:
731	<	break;
732	<
733	<	case SERVICE_TYPE:
734	<	DLINK_FOREACH(ptr, service_items.head)
735	<	{
736	<	conf = ptr->data;
737	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
738	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
739	<	}
740	<	break;
741	<
742	<	case SERVER_TYPE:
743	<	DLINK_FOREACH(ptr, server_items.head)
744	<	{
745	<	p = buf;
746	<
747	<	conf = ptr->data;
748	<	aconf = map_to_conf(conf);
749	<
750	<	buf[0] = '\0';
751	<
752	<	if (IsConfAllowAutoConn(aconf))
753	<	*p++ = 'A';
754	<	if (IsConfSSL(aconf))
755	<	*p++ = 'S';
756	<	if (IsConfTopicBurst(aconf))
757	<	*p++ = 'T';
758	<	if (buf[0] == '\0')
759	<	*p++ = '*';
760	<
761	<	*p = '\0';
762	<
763	<	/*
764	<	* Allow admins to see actual ips unless hide_server_ips is enabled
765	<	*/
766	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
767	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
768	<	me.name, source_p->name, 'C', aconf->host,
769	<	buf, conf->name, aconf->port,
770	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
771	<	else
772	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
773	<	me.name, source_p->name, 'C',
774	<	"*@127.0.0.1", buf, conf->name, aconf->port,
775	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
776	<	}
777	<	break;
778	<
779	<	case HUB_TYPE:
780	<	DLINK_FOREACH(ptr, hub_items.head)
781	<	{
782	<	conf = ptr->data;
783	<	matchitem = map_to_conf(conf);
784	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
785	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
786	<	}
787	<	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	<	{
792	<	conf = ptr->data;
793	<	matchitem = map_to_conf(conf);
794	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
795	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
796	<	}
797	<	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:
804	<	case NRESV_TYPE:
805	<	case CLUSTER_TYPE:
806	<	default:
807	<	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 821 | 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		{
827	–	struct Client *source_p = va_arg(args, struct Client *);
828	–	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 */
832	<	if ((i = verify_access(source_p, username)))
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);
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));
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);
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));
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;
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);
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	<	/* XXX It is prolematical whether it is better to use the
878	<	* capture reject code here or rely on the connecting too fast code.
879	<	* - Dianora
880	<	*/
881	<	if (REJECT_HOLD_TIME > 0)
882	<	{
883	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
884	<	me.name, source_p->name);
885	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
886	<	SetCaptured(source_p);
887	<	}
888	<	else
889	<	exit_client(source_p, &me, "You are not authorized to use this server");
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	<	/*
894	<	* Don't exit them immediately, play with them a bit.
895	<	* - Dianora
896	<	*/
897	<	if (REJECT_HOLD_TIME > 0)
898	<	{
899	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
900	<	SetCaptured(source_p);
901	<	}
902	<	else
903	<	exit_client(source_p, &me, "Banned");
291	>	exit_client(source_p, &me, "Banned");
292		++ServerStats.is_ref;
293		break;
294
#	Line 909 | 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
918	–	*              - 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;
926	<	struct ConfItem *conf = NULL;
312	>	struct MaskItem *conf = NULL;
313		char non_ident[USERLEN + 1] = { '~', '\0' };
928	–	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;
947	<	uhi[1] = client_p->host;
948	<	uhi[2] = client_p->sockhost;
949	<
950	<	rkconf = find_regexp_kline(uhi);
951	<
952	<	if (aconf != NULL)
331	>	if (conf != NULL)
332		{
333	<	if (IsConfClient(aconf) && !rkconf)
333	>	if (IsConfClient(conf))
334		{
335	<	conf = unmap_conf_item(aconf);
957	<
958	<	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))
976	<	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 */
987	<	aconf = rkconf ? rkconf : aconf;
988	<	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);
994	<	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 1006 | 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;
1012	<	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);
1022	<	if (aconf->class_ptr == NULL)
1023	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1024	<
1025	<	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 1031 | 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 1066 | 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),
1070	<	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 1116 | 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 1167 | 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 1277 | 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 1294 | 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;
1301	<	struct ConfItem *conf;
1302	<	struct ClassItem *aclass;
1303	<	struct AccessItem *aconf;
1304	<	struct ConfItem *aclass_conf;
1305	<	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;
1310	<
1311	<	if (type == CONF_TYPE || conf->type == type)
1312	<	{
1313	<	dlinkDelete(ptr, &client_p->localClient->confs);
1314	<	free_dlink_node(ptr);
1315	<
1316	<	switch (conf->type)
1317	<	{
1318	<	case CLIENT_TYPE:
1319	<	case OPER_TYPE:
1320	<	case SERVER_TYPE:
1321	<	aconf = map_to_conf(conf);
1322	<
1323	<	assert(aconf->clients > 0);
1324	<
1325	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1326	<	{
1327	<	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);
1333	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1334	<	delete_conf_item(aclass_conf);
1335	<	}
680	>	if (!(conf->type & type))
681	>	continue;
682
683	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
684	<	delete_conf_item(conf);
683	>	dlinkDelete(ptr, &client_p->localClient->confs);
684	>	free_dlink_node(ptr);
685
686	<	break;
686	>	if (conf->type == CONF_CLIENT)
687	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
688
689	<	case LEAF_TYPE:
690	<	case HUB_TYPE:
691	<	match_item = map_to_conf(conf);
692	<	if (match_item->ref_count == 0 && match_item->illegal)
1346	<	delete_conf_item(conf);
1347	<	break;
1348	<	default:
1349	<	break;
1350	<	}
1351	<
1352	<	if (type != CONF_TYPE)
1353	<	return 0;
689	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
690	>	{
691	>	class_free(conf->class);
692	>	conf->class = NULL;
693		}
1355	–	}
694
695	<	return -1;
695	>	if (--conf->ref_count == 0 && conf->active == 0)
696	>	conf_free(conf);
697	>	}
698		}
699
700		/* attach_conf()
#	Line 1368 | 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	<	{
1380	<	struct AccessItem *aconf = map_to_conf(conf);
1381	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1382	<
1383	<	if (IsConfIllegal(aconf))
1384	<	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),
1388	<	&client_p->localClient->ip, aclass))
1389	<	return TOO_MANY;    /* Already at maximum allowed */
1390	<
1391	<	CurrUserCount(aclass)++;
1392	<	aconf->clients++;
1393	<	}
1394	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1395	<	{
1396	<	struct MatchItem *match_item = map_to_conf(conf);
1397	<	match_item->ref_count++;
1398	<	}
721	>	conf->class->ref_count++;
722	>	conf->ref_count++;
723
724		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
725
#	Line 1415 | Line 739 | attach_connect_block(struct Client *clie
739		const char *host)
740		{
741		dlink_node *ptr;
742	<	struct ConfItem *conf;
1419	<	struct AccessItem *aconf;
742	>	struct MaskItem *conf = NULL;
743
744		assert(client_p != NULL);
745		assert(host != NULL);
#	Line 1427 | Line 750 | attach_connect_block(struct Client *clie
750		DLINK_FOREACH(ptr, server_items.head)
751		{
752		conf = ptr->data;
1430	–	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 1439 | Line 761 | attach_connect_block(struct Client *clie
761		return 0;
762		}
763
1442	–	/* find_conf_exact()
1443	–	*
1444	–	* inputs       - type of ConfItem
1445	–	*              - pointer to name to find
1446	–	*              - pointer to username to find
1447	–	*              - pointer to host to find
1448	–	* output       - NULL or pointer to conf found
1449	–	* side effects - find a conf entry which matches the hostname
1450	–	*                and has the same name.
1451	–	*/
1452	–	struct ConfItem *
1453	–	find_conf_exact(ConfType type, const char *name, const char *user,
1454	–	const char *host)
1455	–	{
1456	–	dlink_node *ptr;
1457	–	dlink_list *list_p;
1458	–	struct ConfItem *conf = NULL;
1459	–	struct AccessItem *aconf;
1460	–
1461	–	/* Only valid for OPER_TYPE and ...? */
1462	–	list_p = map_to_list(type);
1463	–
1464	–	DLINK_FOREACH(ptr, (*list_p).head)
1465	–	{
1466	–	conf = ptr->data;
1467	–
1468	–	if (conf->name == NULL)
1469	–	continue;
1470	–	aconf = map_to_conf(conf);
1471	–	if (aconf->host == NULL)
1472	–	continue;
1473	–	if (irccmp(conf->name, name) != 0)
1474	–	continue;
1475	–
1476	–	/*
1477	–	** Accept if the *real* hostname (usually sockethost)
1478	–	** socket host) matches *either* host or name field
1479	–	** of the configuration.
1480	–	*/
1481	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1482	–	continue;
1483	–	if (type == OPER_TYPE)
1484	–	{
1485	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1486	–
1487	–	if (aconf->clients >= MaxTotal(aclass))
1488	–	continue;
1489	–	}
1490	–
1491	–	return conf;
1492	–	}
1493	–
1494	–	return NULL;
1495	–	}
1496	–
764		/* find_conf_name()
765		*
766		* inputs       - pointer to conf link list to search
#	Line 1503 | 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 1516 | 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 1531 | 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:
1539	<	return(&rxconf_items);
1540	<	break;
1541	<	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:
1554	<	return(&class_items);
1555	<	break;
1556	<	case SERVER_TYPE:
819	>	case CONF_SERVER:
820		return(&server_items);
821		break;
822	<	case SERVICE_TYPE:
822	>	case CONF_SERVICE:
823		return(&service_items);
824		break;
825	<	case CLUSTER_TYPE:
825	>	case CONF_CLUSTER:
826		return(&cluster_items);
827		break;
1565	–	case CONF_TYPE:
1566	–	case GLINE_TYPE:
1567	–	case KLINE_TYPE:
1568	–	case DLINE_TYPE:
1569	–	case CRESV_TYPE:
828		default:
829		return NULL;
830		}
#	Line 1578 | 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;
1591	<	struct AccessItem *aconf=NULL;
1592	<	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	<	#ifdef HAVE_LIBPCRE
1598	<	case RXLINE_TYPE:
1599	<	DLINK_FOREACH(ptr, list_p->head)
1600	<	{
1601	<	conf = ptr->data;
1602	<	assert(conf->regexpname);
1603	<
1604	<	if (!ircd_pcre_exec(conf->regexpname, name))
1605	<	return conf;
1606	<	}
1607	<	break;
1608	<	#endif
1609	<	case SERVICE_TYPE:
853	>	case CONF_SERVICE:
854		DLINK_FOREACH(ptr, list_p->head)
855		{
856		conf = ptr->data;
#	Line 1618 | Line 862 | find_matching_name_conf(ConfType type, c
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
1628	–	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;
1649	–	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 1667 | 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 struct Client *who, 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;
1680	<	struct MatchItem *match_item;
1681	<	dlink_list *list_p;
1682	<
1683	<	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;
1715	–	aconf = map_to_conf(conf);
954
955		if (EmptyString(conf->name))
956		continue;
#	Line 1721 | Line 959 | find_exact_name_conf(ConfType type, cons
959		{
960		if (!who)
961		return conf;
962	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
963	<	return conf;
964	<	if (match(aconf->user, who->username))
962	>	if (EmptyString(conf->user) || EmptyString(conf->host))
963	>	return NULL;
964	>	if (!match(conf->user, who->username))
965		{
966	<	switch (aconf->type)
966	>	switch (conf->htype)
967		{
968		case HM_HOST:
969	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
970	<	return conf;
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, &aconf->ipnum, aconf->bits))
976	<	return conf;
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, &aconf->ipnum, aconf->bits))
983	<	return conf;
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:
#	Line 1752 | Line 993 | find_exact_name_conf(ConfType type, cons
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	<	{
1772	<	return (conf);
1773	<	}
1012	>	return conf;
1013		}
1775	–	break;
1014
1777	–	case CLASS_TYPE:
1778	–	DLINK_FOREACH(ptr, list_p->head)
1779	–	{
1780	–	conf = ptr->data;
1781	–	if (EmptyString(conf->name))
1782	–	continue;
1783	–
1784	–	if (irccmp(conf->name, name) == 0)
1785	–	return (conf);
1786	–	}
1015		break;
1016
1017		default:
1018		break;
1019		}
1020	<	return(NULL);
1020	>
1021	>	return NULL;
1022		}
1023
1024		/* rehash()
#	Line 1802 | 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
1037		restart_resolver();
1038
#	Line 1819 | Line 1048 | rehash(int sig)
1048
1049		load_conf_modules();
1050
1822	–	flush_deleted_I_P();
1823	–
1051		rehashed_klines = 1;
1825	–	/* XXX */
1826	–	if (ConfigLoggingEntry.use_logging)
1827	–	log_close_all();
1052
1053	<	return(0);
1053	>	return 0;
1054		}
1055
1056		/* set_default_conf()
#	Line 1844 | 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 1854 | 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 1863 | Line 1087 | set_default_conf(void)
1087		ServerInfo.specific_ipv6_vhost = 0;
1088
1089		ServerInfo.max_clients = MAXCLIENTS_MAX;
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;
#	Line 1871 | Line 1097 | set_default_conf(void)
1097		AdminInfo.email = NULL;
1098		AdminInfo.description = NULL;
1099
1100	<	log_close_all();
1100	>	log_del_all();
1101
1102		ConfigLoggingEntry.use_logging = 1;
1103
1104		ConfigChannel.disable_fake_channels = 0;
1879	–	ConfigChannel.restrict_channels = 0;
1880	–	ConfigChannel.disable_local_channels = 0;
1881	–	ConfigChannel.use_invex = 1;
1882	–	ConfigChannel.use_except = 1;
1883	–	ConfigChannel.use_knock = 1;
1105		ConfigChannel.knock_delay = 300;
1106		ConfigChannel.knock_delay_channel = 60;
1107	<	ConfigChannel.max_chans_per_user = 15;
1108	<	ConfigChannel.quiet_on_ban = 1;
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 = 0;
1113		ConfigChannel.no_create_on_split = 0;
1893	–	ConfigChannel.burst_topicwho = 1;
1114
1115		ConfigServerHide.flatten_links = 0;
1116		ConfigServerHide.links_delay = 300;
1117		ConfigServerHide.hidden = 0;
1898	–	ConfigServerHide.disable_hidden = 0;
1118		ConfigServerHide.hide_servers = 0;
1119	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
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	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
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 = 1;
1909	–	ConfigFileEntry.burst_away = 0;
1910	–	ConfigFileEntry.use_whois_actually = 1;
1134		ConfigFileEntry.tkline_expire_notices = 1;
1135		ConfigFileEntry.hide_spoof_ips = 1;
1136		ConfigFileEntry.ignore_bogus_ts = 0;
1137		ConfigFileEntry.disable_auth = 0;
1915	–	ConfigFileEntry.disable_remote = 0;
1138		ConfigFileEntry.kill_chase_time_limit = 90;
1139		ConfigFileEntry.default_floodcount = 8;
1140		ConfigFileEntry.failed_oper_notice = 1;
#	Line 1926 | Line 1148 | set_default_conf(void)
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;
1929	–	ConfigFileEntry.kline_with_reason = 1;
1930	–	ConfigFileEntry.kline_reason = NULL;
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 = 0;
1156	+	ConfigFileEntry.stats_u_oper_only = 0;
1157		ConfigFileEntry.caller_id_wait = 60;
1158		ConfigFileEntry.opers_bypass_callerid = 0;
1159		ConfigFileEntry.pace_wait = 10;
#	Line 1942 | Line 1163 | set_default_conf(void)
1163		ConfigFileEntry.no_oper_flood = 0;
1164		ConfigFileEntry.true_no_oper_flood = 0;
1165		ConfigFileEntry.oper_pass_resv = 1;
1945	–	ConfigFileEntry.glines = 0;
1946	–	ConfigFileEntry.gline_time = 12 * 3600;
1166		ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1948	–	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1167		ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1168		ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1169		UMODE_OPERWALL | UMODE_WALLOP;
#	Line 1954 | Line 1172 | set_default_conf(void)
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 1967 | Line 1206 | read_conf(FILE *file)
1206
1207		set_default_conf(); /* Set default values prior to conf parsing */
1208		conf_parser_ctx.pass = 1;
1209	<	yyparse();          /* pick up the classes first */
1209	>	yyparse();          /* pick up the classes first */
1210
1211		rewind(file);
1212
#	Line 1975 | Line 1214 | read_conf(FILE *file)
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 */
1979	<	}
1980	<
1981	<	static void
1982	<	validate_conf(void)
1983	<	{
1984	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1985	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1986	<
1987	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1988	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1989	<
1990	<	if (ServerInfo.network_name == NULL)
1991	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1992	<
1993	<	if (ServerInfo.network_desc == NULL)
1994	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1995	<
1996	<	if (ConfigFileEntry.service_name == NULL)
1997	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1998	<
1999	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
2000	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2001	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
2002	<
2003	<	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 2008 | 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		{
2014	–	struct AccessItem *aconf;
1228		struct addrinfo hints, *res;
1229
2017	–	aconf = map_to_conf(conf);
2018	–
2019	–	if (EmptyString(aconf->host) ||
2020	–	EmptyString(aconf->user))
2021	–	{
2022	–	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
2023	–	aconf->host, conf->name);
2024	–	return;
2025	–	}
2026	–
2027	–	if (strchr(aconf->host, '*') ||
2028	–	strchr(aconf->host, '?'))
2029	–	return;
2030	–
1230		/* Do name lookup now on hostnames given and store the
1231		* ip numbers in conf structure.
1232		*/
#	Line 2039 | 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 (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;
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
#	Line 2064 | 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 2086 | Line 1286 | conf_connect_allowed(struct irc_ssaddr *
1286		return 0;
1287		}
1288
2089	–	static struct AccessItem *
2090	–	find_regexp_kline(const char *uhi[])
2091	–	{
2092	–	#ifdef HAVE_LIBPCRE
2093	–	const dlink_node *ptr = NULL;
2094	–
2095	–	DLINK_FOREACH(ptr, rkconf_items.head)
2096	–	{
2097	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2098	–
2099	–	assert(aptr->regexuser);
2100	–	assert(aptr->regexhost);
2101	–
2102	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2103	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2104	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2105	–	return aptr;
2106	–	}
2107	–	#endif
2108	–	return NULL;
2109	–	}
2110	–
2111	–	/* find_kill()
2112	–	*
2113	–	* inputs       - pointer to client structure
2114	–	* output       - pointer to struct AccessItem if found
2115	–	* side effects - See if this user is klined already,
2116	–	*                and if so, return struct AccessItem pointer
2117	–	*/
2118	–	struct AccessItem *
2119	–	find_kill(struct Client *client_p)
2120	–	{
2121	–	struct AccessItem *aconf = NULL;
2122	–	const char *uhi[3];
2123	–
2124	–	uhi[0] = client_p->username;
2125	–	uhi[1] = client_p->host;
2126	–	uhi[2] = client_p->sockhost;
2127	–
2128	–	assert(client_p != NULL);
2129	–
2130	–	aconf = find_kline_conf(client_p->host, client_p->username,
2131	–	&client_p->localClient->ip,
2132	–	client_p->localClient->aftype);
2133	–	if (aconf == NULL)
2134	–	aconf = find_regexp_kline(uhi);
2135	–
2136	–	if (aconf && (aconf->status & CONF_KLINE))
2137	–	return aconf;
2138	–
2139	–	return NULL;
2140	–	}
2141	–
2142	–	struct AccessItem *
2143	–	find_gline(struct Client *client_p)
2144	–	{
2145	–	struct AccessItem *aconf;
2146	–
2147	–	assert(client_p != NULL);
2148	–
2149	–	aconf = find_gline_conf(client_p->host, client_p->username,
2150	–	&client_p->localClient->ip,
2151	–	client_p->localClient->aftype);
2152	–
2153	–	if (aconf && (aconf->status & CONF_GLINE))
2154	–	return aconf;
2155	–
2156	–	return NULL;
2157	–	}
2158	–
2159	–	/* add_temp_line()
2160	–	*
2161	–	* inputs        - pointer to struct ConfItem
2162	–	* output        - none
2163	–	* Side effects  - links in given struct ConfItem into
2164	–	*                 temporary *line link list
2165	–	*/
2166	–	void
2167	–	add_temp_line(struct ConfItem *conf)
2168	–	{
2169	–	struct AccessItem *aconf;
2170	–
2171	–	if (conf->type == DLINE_TYPE)
2172	–	{
2173	–	aconf = map_to_conf(conf);
2174	–	SetConfTemporary(aconf);
2175	–	dlinkAdd(conf, &conf->node, &temporary_dlines);
2176	–	MyFree(aconf->user);
2177	–	aconf->user = NULL;
2178	–	add_conf_by_address(CONF_DLINE, aconf);
2179	–	}
2180	–	else if (conf->type == KLINE_TYPE)
2181	–	{
2182	–	aconf = map_to_conf(conf);
2183	–	SetConfTemporary(aconf);
2184	–	dlinkAdd(conf, &conf->node, &temporary_klines);
2185	–	add_conf_by_address(CONF_KILL, aconf);
2186	–	}
2187	–	else if (conf->type == GLINE_TYPE)
2188	–	{
2189	–	aconf = map_to_conf(conf);
2190	–	SetConfTemporary(aconf);
2191	–	dlinkAdd(conf, &conf->node, &temporary_glines);
2192	–	add_conf_by_address(CONF_GLINE, aconf);
2193	–	}
2194	–	else if (conf->type == XLINE_TYPE)
2195	–	{
2196	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2197	–	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2198	–	}
2199	–	else if (conf->type == RXLINE_TYPE)
2200	–	{
2201	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2202	–	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2203	–	}
2204	–	else if (conf->type == RKLINE_TYPE)
2205	–	{
2206	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2207	–	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2208	–	}
2209	–	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2210	–	{
2211	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2212	–	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2213	–	}
2214	–	}
2215	–
1289		/* cleanup_tklines()
1290		*
1291		* inputs       - NONE
#	Line 2223 | 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);
2230	<	expire_tklines(&temporary_rxlines);
2231	<	expire_tklines(&temporary_rklines);
2232	<	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 2243 | Line 1313 | expire_tklines(dlink_list *tklist)
1313		{
1314		dlink_node *ptr;
1315		dlink_node *next_ptr;
1316	<	struct ConfItem *conf;
2247	<	struct MatchItem *xconf;
2248	<	struct MatchItem *nconf;
2249	<	struct AccessItem *aconf;
2250	<	struct ResvChannel *cconf;
1316	>	struct MaskItem *conf;
1317
1318		DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1319		{
1320		conf = ptr->data;
2255	–	if (conf->type == GLINE_TYPE ||
2256	–	conf->type == KLINE_TYPE ||
2257	–	conf->type == DLINE_TYPE)
2258	–	{
2259	–	aconf = (struct AccessItem *)map_to_conf(conf);
2260	–	if (aconf->hold <= CurrentTime)
2261	–	{
2262	–	/* XXX - Do we want GLINE expiry notices?? */
2263	–	/* Alert opers that a TKline expired - Hwy */
2264	–	if (ConfigFileEntry.tkline_expire_notices)
2265	–	{
2266	–	if (aconf->status & CONF_KILL)
2267	–	{
2268	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2269	–	"Temporary K-line for [%s@%s] expired",
2270	–	(aconf->user) ? aconf->user : "*",
2271	–	(aconf->host) ? aconf->host : "*");
2272	–	}
2273	–	else if (conf->type == DLINE_TYPE)
2274	–	{
2275	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2276	–	"Temporary D-line for [%s] expired",
2277	–	(aconf->host) ? aconf->host : "*");
2278	–	}
2279	–	}
1321
1322	<	dlinkDelete(ptr, tklist);
1323	<	delete_one_address_conf(aconf->host, aconf);
1324	<	}
1325	<	}
2285	<	else if (conf->type == XLINE_TYPE ||
2286	<	conf->type == RXLINE_TYPE)
2287	<	{
2288	<	xconf = (struct MatchItem *)map_to_conf(conf);
2289	<	if (xconf->hold <= CurrentTime)
2290	<	{
2291	<	if (ConfigFileEntry.tkline_expire_notices)
2292	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2293	<	"Temporary X-line for [%s] %sexpired", conf->name,
2294	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2295	<	dlinkDelete(ptr, tklist);
2296	<	free_dlink_node(ptr);
2297	<	delete_conf_item(conf);
2298	<	}
2299	<	}
2300	<	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)
2306	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2307	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2308	<	(aconf->user) ? aconf->user : "*",
2309	<	(aconf->host) ? aconf->host : "*");
2310	<	dlinkDelete(ptr, tklist);
2311	<	free_dlink_node(ptr);
2312	<	delete_conf_item(conf);
2313	<	}
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)
2319	<	{
2320	<	if (ConfigFileEntry.tkline_expire_notices)
2321	<	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);
2324	<	free_dlink_node(ptr);
2325	<	delete_conf_item(conf);
2326	<	}
2327	<	}
2328	<	else if (conf->type == CRESV_TYPE)
2329	<	{
2330	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2331	<	if (cconf->hold <= CurrentTime)
2332	<	{
2333	<	if (ConfigFileEntry.tkline_expire_notices)
2334	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2335	<	"Temporary RESV for [%s] expired", cconf->name);
2336	<	delete_channel_resv(cconf);
2337	<	}
1337	>	conf_free(conf);
1338		}
1339		}
1340		}
#	Line 2347 | Line 1347 | expire_tklines(dlink_list *tklist)
1347		*/
1348		static const struct oper_privs
1349		{
1350	<	const unsigned int oprivs;
1350	>	const unsigned int flag;
1351		const unsigned char c;
1352		} flag_list[] = {
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_N,           'N' },
1361	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1362	<	{ OPER_FLAG_REMOTE,      'R' },
1363	<	{ OPER_FLAG_OPER_SPY,    'S' },
1364	<	{ OPER_FLAG_UNKLINE,     'U' },
1365	<	{ OPER_FLAG_X,           'X' },
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	<	*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 2392 | 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;
2399	<	struct ConfItem *conf;
2400	<	struct AccessItem *aconf;
2401	<
1400	>	dlink_node *cnode = NULL;
1401		/* +5 for !,@,{,} and null */
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;
2410	<	aconf = map_to_conf(conf);
1408	>	struct MaskItem *conf = cnode->data;
1409
1410	<	if (IsConfOperator(aconf))
1410	>	if (IsConfOperator(conf))
1411		{
1412	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1412	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1413		client_p->username, client_p->host, conf->name);
1414	<	return buffer;
1414	>	return buffer;
1415		}
1416		}
1417
#	Line 2424 | Line 1422 | get_oper_name(const struct Client *clien
1422		}
1423
1424		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1425	<	client_p->username, client_p->host, client_p->servptr->name);
1425	>	client_p->username, client_p->host, client_p->servptr->name);
1426		return buffer;
1427		}
1428
#	Line 2438 | 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		conf_parser_ctx.boot = cold;
1443	<	filename = get_conf_name(CONF_TYPE);
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 2462 | Line 1460 | read_conf_files(int cold)
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 2475 | Line 1473 | read_conf_files(int cold)
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	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
1481	<	ConfigChannel.use_except ? "e" : "",
2481	<	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	+	add_isupport("CHANTYPES", "#", -1);
1485
1486	<	if (ConfigChannel.disable_local_channels)
1487	<	add_isupport("CHANTYPES", "#", -1);
2487	<	else
2488	<	add_isupport("CHANTYPES", "#&", -1);
2489	<
2490	<	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2491	<	ConfigChannel.disable_local_channels ? "#" : "#&",
2492	<	ConfigChannel.max_chans_per_user);
1486	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1487	>	ConfigChannel.max_chans_per_user);
1488		add_isupport("CHANLIMIT", chanlimit, -1);
1489	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2495	<	ConfigChannel.use_except ? "e" : "",
2496	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
1489	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1490		add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1491	<
2499	<	if (ConfigChannel.use_except)
2500	<	add_isupport("EXCEPTS", "e", -1);
2501	<	if (ConfigChannel.use_invex)
2502	<	add_isupport("INVEX", "I", -1);
1491	>	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1492		add_isupport("CHANMODES", chanmodes, -1);
1493
1494		/*
#	Line 2507 | Line 1496 | read_conf_files(int cold)
1496		* on strlen(form_str(RPL_ISUPPORT))
1497		*/
1498		rebuild_isupport_message_line();
2510	–
2511	–	#ifdef HAVE_LIBPCRE
2512	–	parse_conf_file(RKLINE_TYPE, cold);
2513	–	parse_conf_file(RXLINE_TYPE, cold);
2514	–	#endif
2515	–	parse_conf_file(KLINE_TYPE, cold);
2516	–	parse_conf_file(DLINE_TYPE, cold);
2517	–	parse_conf_file(XLINE_TYPE, cold);
2518	–	parse_conf_file(NRESV_TYPE, cold);
2519	–	parse_conf_file(CRESV_TYPE, cold);
2520	–	}
2521	–
2522	–	/* parse_conf_file()
2523	–	*
2524	–	* inputs       - type of conf file to parse
2525	–	* output       - none
2526	–	* side effects - conf file for givenconf type is opened and read then parsed
2527	–	*/
2528	–	static void
2529	–	parse_conf_file(int type, int cold)
2530	–	{
2531	–	FILE *file = NULL;
2532	–	const char *filename = get_conf_name(type);
2533	–
2534	–	if ((file = fopen(filename, "r")) == NULL)
2535	–	{
2536	–	if (cold)
2537	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2538	–	filename, strerror(errno));
2539	–	else
2540	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2541	–	"Unable to read configuration file '%s': %s",
2542	–	filename, strerror(errno));
2543	–	}
2544	–	else
2545	–	{
2546	–	parse_csv_file(file, type);
2547	–	fclose(file);
2548	–	}
1499		}
1500
1501		/* clear_out_old_conf()
#	Line 2558 | Line 1508 | static void
1508		clear_out_old_conf(void)
1509		{
1510		dlink_node *ptr = NULL, *next_ptr = NULL;
1511	<	struct ConfItem *conf;
2562	<	struct AccessItem *aconf;
2563	<	struct ClassItem *cltmp;
2564	<	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, &service_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 2579 | Line 1526 | clear_out_old_conf(void)
1526		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1527		{
1528		conf = ptr->data;
2582	–	/* XXX This is less than pretty */
2583	–	if (conf->type == SERVER_TYPE)
2584	–	{
2585	–	aconf = map_to_conf(conf);
1529
1530	<	if (aconf->clients != 0)
2588	<	{
2589	<	SetConfIllegal(aconf);
2590	<	dlinkDelete(&conf->node, &server_items);
2591	<	}
2592	<	else
2593	<	{
2594	<	delete_conf_item(conf);
2595	<	}
2596	<	}
2597	<	else if (conf->type == OPER_TYPE)
2598	<	{
2599	<	aconf = map_to_conf(conf);
1530	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1531
1532	<	if (aconf->clients != 0)
1533	<	{
2603	<	SetConfIllegal(aconf);
2604	<	dlinkDelete(&conf->node, &oconf_items);
2605	<	}
2606	<	else
2607	<	{
2608	<	delete_conf_item(conf);
2609	<	}
2610	<	}
2611	<	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	<
2615	<	if (aconf->clients != 0)
2616	<	{
2617	<	SetConfIllegal(aconf);
2618	<	}
2619	<	else
2620	<	{
2621	<	delete_conf_item(conf);
2622	<	}
1535	>	if (!conf->ref_count)
1536	>	conf_free(conf);
1537		}
1538	<	else if (conf->type == XLINE_TYPE  ||
2625	<	conf->type == RXLINE_TYPE ||
2626	<	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 */
2630	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2631	<	continue;
2632	<
2633	<	delete_conf_item(conf);
1540	>	if (!conf->until)
1541	>	conf_free(conf);
1542		}
1543		else
1544	<	{
2637	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2638	<	{
2639	<	match_item = map_to_conf(conf);
2640	<	if (match_item->ref_count <= 0)
2641	<	delete_conf_item(conf);
2642	<	else
2643	<	{
2644	<	match_item->illegal = 1;
2645	<	dlinkDelete(&conf->node, *iterator);
2646	<	}
2647	<	}
2648	<	else
2649	<	delete_conf_item(conf);
2650	<	}
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)
2659	<	{
2660	<	cltmp = map_to_conf(ptr->data);
2661	<
2662	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2663	<	cltmp->active = 0;
2664	<	}
1554	>	class_mark_for_deletion();
1555
1556		clear_out_address_conf();
1557
#	Line 2697 | Line 1587 | clear_out_old_conf(void)
1587		SSL_OP_NO_TLSv1);
1588		#endif
1589
2700	–	/* clean out old resvs from the conf */
2701	–	clear_conf_resv();
2702	–
1590		/* clean out AdminInfo */
1591		MyFree(AdminInfo.name);
1592		AdminInfo.name = NULL;
#	Line 2708 | Line 1595 | clear_out_old_conf(void)
1595		MyFree(AdminInfo.description);
1596		AdminInfo.description = NULL;
1597
2711	–	/* operator{} and class{} blocks are freed above */
1598		/* clean out listeners */
1599		close_listeners();
1600
2715	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2716	–	* exempt{} and gecos{} blocks are freed above too
2717	–	*/
2718	–
1601		/* clean out general */
1602		MyFree(ConfigFileEntry.service_name);
1603		ConfigFileEntry.service_name = NULL;
2722	–
2723	–	delete_isupport("INVEX");
2724	–	delete_isupport("EXCEPTS");
2725	–	}
2726	–
2727	–	/* flush_deleted_I_P()
2728	–	*
2729	–	* inputs       - none
2730	–	* output       - none
2731	–	* side effects - This function removes I/P conf items
2732	–	*/
2733	–	static void
2734	–	flush_deleted_I_P(void)
2735	–	{
2736	–	dlink_node *ptr;
2737	–	dlink_node *next_ptr;
2738	–	struct ConfItem *conf;
2739	–	struct AccessItem *aconf;
2740	–	dlink_list * free_items [] = {
2741	–	&server_items, &oconf_items, NULL
2742	–	};
2743	–	dlink_list ** iterator = free_items; /* C is dumb */
2744	–
2745	–	/* flush out deleted I and P lines
2746	–	* although still in use.
2747	–	*/
2748	–	for (; *iterator != NULL; iterator++)
2749	–	{
2750	–	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2751	–	{
2752	–	conf = ptr->data;
2753	–	aconf = (struct AccessItem *)map_to_conf(conf);
2754	–
2755	–	if (IsConfIllegal(aconf))
2756	–	{
2757	–	dlinkDelete(ptr, *iterator);
2758	–
2759	–	if (aconf->clients == 0)
2760	–	delete_conf_item(conf);
2761	–	}
2762	–	}
2763	–	}
2764	–	}
2765	–
2766	–	/* get_conf_name()
2767	–	*
2768	–	* inputs       - type of conf file to return name of file for
2769	–	* output       - pointer to filename for type of conf
2770	–	* side effects - none
2771	–	*/
2772	–	const char *
2773	–	get_conf_name(ConfType type)
2774	–	{
2775	–	switch (type)
2776	–	{
2777	–	case CONF_TYPE:
2778	–	return ConfigFileEntry.configfile;
2779	–	break;
2780	–	case KLINE_TYPE:
2781	–	return ConfigFileEntry.klinefile;
2782	–	break;
2783	–	case RKLINE_TYPE:
2784	–	return ConfigFileEntry.rklinefile;
2785	–	break;
2786	–	case DLINE_TYPE:
2787	–	return ConfigFileEntry.dlinefile;
2788	–	break;
2789	–	case XLINE_TYPE:
2790	–	return ConfigFileEntry.xlinefile;
2791	–	break;
2792	–	case RXLINE_TYPE:
2793	–	return ConfigFileEntry.rxlinefile;
2794	–	break;
2795	–	case CRESV_TYPE:
2796	–	return ConfigFileEntry.cresvfile;
2797	–	break;
2798	–	case NRESV_TYPE:
2799	–	return ConfigFileEntry.nresvfile;
2800	–	break;
2801	–	case GLINE_TYPE:
2802	–	return ConfigFileEntry.glinefile;
2803	–	break;
2804	–
2805	–	default:
2806	–	return NULL;  /* This should NEVER HAPPEN since we call this function
2807	–	only with the above values, this will cause us to core
2808	–	at some point if this happens so we know where it was */
2809	–	}
2810	–	}
2811	–
2812	–	#define BAD_PING (-1)
2813	–
2814	–	/* get_conf_ping()
2815	–	*
2816	–	* inputs       - pointer to struct AccessItem
2817	–	*              - pointer to a variable that receives ping warning time
2818	–	* output       - ping frequency
2819	–	* side effects - NONE
2820	–	*/
2821	–	static int
2822	–	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2823	–	{
2824	–	struct ClassItem *aclass;
2825	–	struct AccessItem *aconf;
2826	–
2827	–	if (conf != NULL)
2828	–	{
2829	–	aconf = (struct AccessItem *)map_to_conf(conf);
2830	–	if (aconf->class_ptr != NULL)
2831	–	{
2832	–	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2833	–	*pingwarn = PingWarning(aclass);
2834	–	return PingFreq(aclass);
2835	–	}
2836	–	}
2837	–
2838	–	return BAD_PING;
2839	–	}
2840	–
2841	–	/* get_client_class()
2842	–	*
2843	–	* inputs       - pointer to client struct
2844	–	* output       - pointer to name of class
2845	–	* side effects - NONE
2846	–	*/
2847	–	const char *
2848	–	get_client_class(struct Client *target_p)
2849	–	{
2850	–	dlink_node *ptr;
2851	–	struct ConfItem *conf;
2852	–	struct AccessItem *aconf;
2853	–
2854	–	if (target_p != NULL && !IsMe(target_p) &&
2855	–	target_p->localClient->confs.head != NULL)
2856	–	{
2857	–	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2858	–	{
2859	–	conf = ptr->data;
2860	–
2861	–	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2862	–	conf->type == OPER_TYPE)
2863	–	{
2864	–	aconf = (struct AccessItem *) map_to_conf(conf);
2865	–	if (aconf->class_ptr != NULL)
2866	–	return aconf->class_ptr->name;
2867	–	}
2868	–	}
2869	–	}
2870	–
2871	–	return "default";
2872	–	}
2873	–
2874	–	/* get_client_ping()
2875	–	*
2876	–	* inputs       - pointer to client struct
2877	–	*              - pointer to a variable that receives ping warning time
2878	–	* output       - ping frequency
2879	–	* side effects - NONE
2880	–	*/
2881	–	int
2882	–	get_client_ping(struct Client *target_p, int *pingwarn)
2883	–	{
2884	–	int ping;
2885	–	struct ConfItem *conf;
2886	–	dlink_node *nlink;
2887	–
2888	–	if (target_p->localClient->confs.head != NULL)
2889	–	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2890	–	{
2891	–	conf = nlink->data;
2892	–
2893	–	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2894	–	(conf->type == OPER_TYPE))
2895	–	{
2896	–	ping = get_conf_ping(conf, pingwarn);
2897	–	if (ping > 0)
2898	–	return ping;
2899	–	}
2900	–	}
2901	–
2902	–	*pingwarn = 0;
2903	–	return DEFAULT_PINGFREQUENCY;
2904	–	}
2905	–
2906	–	/* find_class()
2907	–	*
2908	–	* inputs       - string name of class
2909	–	* output       - corresponding Class pointer
2910	–	* side effects - NONE
2911	–	*/
2912	–	struct ConfItem *
2913	–	find_class(const char *classname)
2914	–	{
2915	–	struct ConfItem *conf;
2916	–
2917	–	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2918	–	return conf;
2919	–
2920	–	return class_default;
2921	–	}
2922	–
2923	–	/* check_class()
2924	–	*
2925	–	* inputs       - NONE
2926	–	* output       - NONE
2927	–	* side effects -
2928	–	*/
2929	–	void
2930	–	check_class(void)
2931	–	{
2932	–	dlink_node *ptr = NULL, *next_ptr = NULL;
2933	–
2934	–	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2935	–	{
2936	–	struct ClassItem *aclass = map_to_conf(ptr->data);
2937	–
2938	–	if (!aclass->active && !CurrUserCount(aclass))
2939	–	{
2940	–	destroy_cidr_class(aclass);
2941	–	delete_conf_item(ptr->data);
2942	–	}
2943	–	}
2944	–	}
2945	–
2946	–	/* init_class()
2947	–	*
2948	–	* inputs       - NONE
2949	–	* output       - NONE
2950	–	* side effects -
2951	–	*/
2952	–	void
2953	–	init_class(void)
2954	–	{
2955	–	struct ClassItem *aclass;
2956	–
2957	–	class_default = make_conf_item(CLASS_TYPE);
2958	–
2959	–	aclass = map_to_conf(class_default);
2960	–	aclass->active = 1;
2961	–	DupString(class_default->name, "default");
2962	–	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2963	–	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2964	–	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2965	–	MaxSendq(aclass) = DEFAULT_SENDQ;
2966	–
2967	–	client_check_cb = register_callback("check_client", check_client);
2968	–	}
2969	–
2970	–	/* get_sendq()
2971	–	*
2972	–	* inputs       - pointer to client
2973	–	* output       - sendq for this client as found from its class
2974	–	* side effects - NONE
2975	–	*/
2976	–	unsigned int
2977	–	get_sendq(struct Client *client_p)
2978	–	{
2979	–	unsigned int sendq = DEFAULT_SENDQ;
2980	–	dlink_node *ptr;
2981	–	struct ConfItem *conf;
2982	–	struct ConfItem *class_conf;
2983	–	struct ClassItem *aclass;
2984	–	struct AccessItem *aconf;
2985	–
2986	–	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
2987	–	{
2988	–	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2989	–	{
2990	–	conf = ptr->data;
2991	–	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2992	–	|| (conf->type == CLIENT_TYPE))
2993	–	{
2994	–	aconf = (struct AccessItem *)map_to_conf(conf);
2995	–	if ((class_conf = aconf->class_ptr) == NULL)
2996	–	continue;
2997	–	aclass = (struct ClassItem *)map_to_conf(class_conf);
2998	–	sendq = MaxSendq(aclass);
2999	–	return sendq;
3000	–	}
3001	–	}
3002	–	}
3003	–	/* XXX return a default?
3004	–	* if here, then there wasn't an attached conf with a sendq
3005	–	* that is very bad -Dianora
3006	–	*/
3007	–	return DEFAULT_SENDQ;
1604		}
1605
1606		/* conf_add_class_to_conf()
#	Line 3014 | 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		{
3019	–	struct AccessItem *aconf = map_to_conf(conf);
3020	–	struct ClassItem *class = NULL;
3021	–
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);
3037	<
3038	<	if (aconf->class_ptr)
3039	<	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;
3052	<	}
3053	<	}
3054	<
3055	<	/* conf_add_server()
3056	<	*
3057	<	* inputs       - pointer to config item
3058	<	*              - pointer to link count already on this conf
3059	<	* output       - NONE
3060	<	* side effects - Add a connect block
3061	<	*/
3062	<	int
3063	<	conf_add_server(struct ConfItem *conf, const char *class_name)
3064	<	{
3065	<	struct AccessItem *aconf;
3066	<	struct split_nuh_item nuh;
3067	<	char conf_user[USERLEN + 1];
3068	<	char conf_host[HOSTLEN + 1];
3069	<
3070	<	aconf = map_to_conf(conf);
3071	<
3072	<	conf_add_class_to_conf(conf, class_name);
3073	<
3074	<	if (!aconf->host || !conf->name)
3075	<	{
3076	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3077	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
3078	<	return -1;
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		}
3080	–
3081	–	if (EmptyString(aconf->passwd))
3082	–	{
3083	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3084	–	conf->name);
3085	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
3086	–	return -1;
3087	–	}
3088	–
3089	–	nuh.nuhmask  = aconf->host;
3090	–	nuh.nickptr  = NULL;
3091	–	nuh.userptr  = conf_user;
3092	–	nuh.hostptr  = conf_host;
3093	–
3094	–	nuh.nicksize = 0;
3095	–	nuh.usersize = sizeof(conf_user);
3096	–	nuh.hostsize = sizeof(conf_host);
3097	–
3098	–	split_nuh(&nuh);
3099	–
3100	–	MyFree(aconf->host);
3101	–	aconf->host = NULL;
3102	–
3103	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3104	–	got lost in H6/7, will have to be re-added */
3105	–	DupString(aconf->host, conf_host);
3106	–
3107	–	lookup_confhost(conf);
3108	–
3109	–	return 0;
1643		}
1644
1645		/* yyerror()
#	Line 3124 | Line 1657 | yyerror(const char *msg)
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(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1664	>	conffilebuf, lineno + 1, msg, newlinebuf);
1665	>	}
1666	>
1667	>	void
1668	>	conf_error_report(const char *msg)
1669	>	{
1670	>	char newlinebuf[IRCD_BUFSIZE];
1671	>
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);
#	Line 3141 | Line 1688 | yyerror(const char *msg)
1688		* Originally written by Dianora (Diane, db@db.net)
1689		*/
1690		time_t
1691	<	valid_tkline(const 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	<	for (; *p; ++p)
1697	>	while ((tmpch = *p++))
1698		{
1699	<	if (!IsDigit(*p))
1699	>	if (!IsDigit(tmpch))
1700		return 0;
1701
1702		result *= 10;
1703	<	result += ((*p) & 0xF);
1703	>	result += (tmpch & 0xF);
1704		}
1705
1706		/*
#	Line 3167 | Line 1716 | valid_tkline(const 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 3188 | Line 1768 | valid_tkline(const char *p, int minutes)
1768		int
1769		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1770		{
3191	–	char *p;
1771		char tmpch;
1772		int nonwild = 0;
1773		va_list args;
#	Line 3209 | 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 3222 | 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 3230 | 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 3265 | Line 1848 | valid_wild_card(struct Client *source_p,
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 3289 | 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 3324 | 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 (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
#	Line 3338 | 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 3353 | 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 3379 | Line 1962 | parse_aline(const char *cmd, struct Clie
1962		{
1963		*reason = *parv;
1964		if (!valid_comment(source_p, *reason, 1))
1965	<	return -1;
1965	>	return -1;
1966		}
1967		else
1968		*reason = def_reason;
#	Line 3418 | 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 3483 | Line 2067 | find_user_host(struct Client *source_p,
2067		int
2068		valid_comment(struct Client *source_p, char *comment, int warn)
2069		{
3486	–	if (strchr(comment, '"'))
3487	–	{
3488	–	if (warn)
3489	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3490	–	me.name, source_p->name);
3491	–	return 0;
3492	–	}
3493	–
2070		if (strlen(comment) > REASONLEN)
2071		comment[REASONLEN-1] = '\0';
2072
#	Line 3505 | 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	<	{
3517	<	/* use first two chars of the password they send in as salt */
3518	<	/* If the password in the conf is MD5, and ircd is linked
3519	<	* to scrypt on FreeBSD, or the standard crypt library on
3520	<	* glibc Linux, then this code will work fine on generating
3521	<	* the proper encrypted hash for comparison.
3522	<	*/
3523	<	if (*aconf->passwd)
3524	<	encr = crypt(password, aconf->passwd);
3525	<	else
3526	<	encr = "";
3527	<	}
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 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 3612 | 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 3651 | Line 2217 | split_nuh(struct split_nuh_item *const i
2217		}
2218		}
2219		}
3654	–
3655	–	/*
3656	–	* flags_to_ascii
3657	–	*
3658	–	* inputs       - flags is a bitmask
3659	–	*              - pointer to table of ascii letters corresponding
3660	–	*                to each bit
3661	–	*              - flag 1 for convert ToLower if bit missing
3662	–	*                0 if ignore.
3663	–	* output       - none
3664	–	* side effects - string pointed to by p has bitmap chars written to it
3665	–	*/
3666	–	static void
3667	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3668	–	int lowerit)
3669	–	{
3670	–	unsigned int mask = 1;
3671	–	int i = 0;
3672	–
3673	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3674	–	{
3675	–	if (flags & mask)
3676	–	*p++ = bit_table[i];
3677	–	else if (lowerit)
3678	–	*p++ = ToLower(bit_table[i]);
3679	–	}
3680	–	*p = '\0';
3681	–	}
3682	–
3683	–	/*
3684	–	* cidr_limit_reached
3685	–	*
3686	–	* inputs       - int flag allowing over_rule of limits
3687	–	*              - pointer to the ip to be added
3688	–	*              - pointer to the class
3689	–	* output       - non zero if limit reached
3690	–	*                0 if limit not reached
3691	–	* side effects -
3692	–	*/
3693	–	static int
3694	–	cidr_limit_reached(int over_rule,
3695	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3696	–	{
3697	–	dlink_node *ptr = NULL;
3698	–	struct CidrItem *cidr;
3699	–
3700	–	if (NumberPerCidr(aclass) <= 0)
3701	–	return 0;
3702	–
3703	–	if (ip->ss.ss_family == AF_INET)
3704	–	{
3705	–	if (CidrBitlenIPV4(aclass) <= 0)
3706	–	return 0;
3707	–
3708	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3709	–	{
3710	–	cidr = ptr->data;
3711	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3712	–	{
3713	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3714	–	return -1;
3715	–	cidr->number_on_this_cidr++;
3716	–	return 0;
3717	–	}
3718	–	}
3719	–	cidr = MyMalloc(sizeof(struct CidrItem));
3720	–	cidr->number_on_this_cidr = 1;
3721	–	cidr->mask = *ip;
3722	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3723	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3724	–	}
3725	–	#ifdef IPV6
3726	–	else if (CidrBitlenIPV6(aclass) > 0)
3727	–	{
3728	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3729	–	{
3730	–	cidr = ptr->data;
3731	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(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, CidrBitlenIPV6(aclass));
3743	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3744	–	}
3745	–	#endif
3746	–	return 0;
3747	–	}
3748	–
3749	–	/*
3750	–	* remove_from_cidr_check
3751	–	*
3752	–	* inputs       - pointer to the ip to be removed
3753	–	*              - pointer to the class
3754	–	* output       - NONE
3755	–	* side effects -
3756	–	*/
3757	–	static void
3758	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3759	–	{
3760	–	dlink_node *ptr = NULL;
3761	–	dlink_node *next_ptr = NULL;
3762	–	struct CidrItem *cidr;
3763	–
3764	–	if (NumberPerCidr(aclass) == 0)
3765	–	return;
3766	–
3767	–	if (ip->ss.ss_family == AF_INET)
3768	–	{
3769	–	if (CidrBitlenIPV4(aclass) <= 0)
3770	–	return;
3771	–
3772	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3773	–	{
3774	–	cidr = ptr->data;
3775	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3776	–	{
3777	–	cidr->number_on_this_cidr--;
3778	–	if (cidr->number_on_this_cidr == 0)
3779	–	{
3780	–	dlinkDelete(ptr, &aclass->list_ipv4);
3781	–	MyFree(cidr);
3782	–	return;
3783	–	}
3784	–	}
3785	–	}
3786	–	}
3787	–	#ifdef IPV6
3788	–	else if (CidrBitlenIPV6(aclass) > 0)
3789	–	{
3790	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3791	–	{
3792	–	cidr = ptr->data;
3793	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3794	–	{
3795	–	cidr->number_on_this_cidr--;
3796	–	if (cidr->number_on_this_cidr == 0)
3797	–	{
3798	–	dlinkDelete(ptr, &aclass->list_ipv6);
3799	–	MyFree(cidr);
3800	–	return;
3801	–	}
3802	–	}
3803	–	}
3804	–	}
3805	–	#endif
3806	–	}
3807	–
3808	–	static void
3809	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3810	–	dlink_list *old_list, dlink_list *new_list, int changed)
3811	–	{
3812	–	dlink_node *ptr;
3813	–	struct Client *client_p;
3814	–	struct ConfItem *conf;
3815	–	struct AccessItem *aconf;
3816	–
3817	–	if (!changed)
3818	–	{
3819	–	*new_list = *old_list;
3820	–	old_list->head = old_list->tail = NULL;
3821	–	old_list->length = 0;
3822	–	return;
3823	–	}
3824	–
3825	–	DLINK_FOREACH(ptr, local_client_list.head)
3826	–	{
3827	–	client_p = ptr->data;
3828	–	if (client_p->localClient->aftype != aftype)
3829	–	continue;
3830	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3831	–	continue;
3832	–
3833	–	conf = client_p->localClient->confs.tail->data;
3834	–	if (conf->type == CLIENT_TYPE)
3835	–	{
3836	–	aconf = map_to_conf(conf);
3837	–	if (aconf->class_ptr == oldcl)
3838	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3839	–	}
3840	–	}
3841	–	}
3842	–
3843	–	/*
3844	–	* rebuild_cidr_class
3845	–	*
3846	–	* inputs       - pointer to old conf
3847	–	*              - pointer to new_class
3848	–	* output       - none
3849	–	* side effects - rebuilds the class link list of cidr blocks
3850	–	*/
3851	–	void
3852	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3853	–	{
3854	–	struct ClassItem *old_class = map_to_conf(conf);
3855	–
3856	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3857	–	{
3858	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3859	–	rebuild_cidr_list(AF_INET, conf, new_class,
3860	–	&old_class->list_ipv4, &new_class->list_ipv4,
3861	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3862	–
3863	–	#ifdef IPV6
3864	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3865	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3866	–	&old_class->list_ipv6, &new_class->list_ipv6,
3867	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3868	–	#endif
3869	–	}
3870	–
3871	–	destroy_cidr_class(old_class);
3872	–	}
3873	–
3874	–	/*
3875	–	* destroy_cidr_list
3876	–	*
3877	–	* inputs       - pointer to class dlink list of cidr blocks
3878	–	* output       - none
3879	–	* side effects - completely destroys the class link list of cidr blocks
3880	–	*/
3881	–	static void
3882	–	destroy_cidr_list(dlink_list *list)
3883	–	{
3884	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3885	–
3886	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3887	–	{
3888	–	dlinkDelete(ptr, list);
3889	–	MyFree(ptr->data);
3890	–	}
3891	–	}
3892	–
3893	–	/*
3894	–	* destroy_cidr_class
3895	–	*
3896	–	* inputs       - pointer to class
3897	–	* output       - none
3898	–	* side effects - completely destroys the class link list of cidr blocks
3899	–	*/
3900	–	static void
3901	–	destroy_cidr_class(struct ClassItem *aclass)
3902	–	{
3903	–	destroy_cidr_list(&aclass->list_ipv4);
3904	–	destroy_cidr_list(&aclass->list_ipv6);
3905	–	}

Diff Legend

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