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 815 by michael, Sun Sep 10 17:35:18 2006 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 4162 by michael, Thu Jul 3 19:39:31 2014 UTC

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

Diff Legend

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