ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 201 by adx, Tue Nov 1 11:41:52 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 2196 by michael, Tue Jun 4 18:30:12 2013 UTC

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

Diff Legend

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