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 948 by michael, Tue Jul 21 17:34:06 2009 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 3737 by michael, Sun Jun 1 16:11:02 2014 UTC

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

Diff Legend

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