ViewVC Help

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

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

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

Comparing:
ircd-hybrid/src/s_conf.c (property svn:keywords), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC

#	Line 1 | Line 1
1	<	"Id Revision"
1	>	Id Revision

Diff Legend

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