ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_conf.c (file contents), Revision 1243 by michael, Fri Sep 30 10:47:53 2011 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 9638 by michael, Tue Sep 29 12:49:07 2020 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-2020 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	<	#include "balloc.h"
31	<	#include "s_conf.h"
32	<	#include "s_serv.h"
33	<	#include "resv.h"
30	>	#include "parse.h"
31	>	#include "conf.h"
32	>	#include "conf_cluster.h"
33	>	#include "conf_gecos.h"
34	>	#include "conf_pseudo.h"
35	>	#include "conf_resv.h"
36	>	#include "conf_service.h"
37	>	#include "conf_shared.h"
38	>	#include "server.h"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
35	–	#include "hash.h"
36	–	#include "hook.h"
42		#include "irc_string.h"
38	–	#include "sprintf_irc.h"
43		#include "s_bsd.h"
44		#include "ircd.h"
45		#include "listener.h"
#	Line 43 | Line 47
47		#include "modules.h"
48		#include "numeric.h"
49		#include "fdlist.h"
50	<	#include "s_log.h"
50	>	#include "log.h"
51		#include "send.h"
48	–	#include "s_gline.h"
49	–	#include "fileio.h"
52		#include "memory.h"
53	<	#include "irc_res.h"
54	<	#include "userhost.h"
53	<	#include "s_user.h"
53	>	#include "res.h"
54	>	#include "user.h"
55		#include "channel_mode.h"
56	<	#include "parse.h"
57	<	#include "s_misc.h"
58	<
59	<	struct Callback *client_check_cb = NULL;
60	<	struct config_server_hide ConfigServerHide;
56	>	#include "misc.h"
57	>	#include "conf_db.h"
58	>	#include "conf_class.h"
59	>	#include "motd.h"
60	>	#include "ipcache.h"
61	>	#include "isupport.h"
62	>	#include "whowas.h"
63	>
64	>
65	>	struct config_channel_entry ConfigChannel;
66	>	struct config_serverhide_entry ConfigServerHide;
67	>	struct config_general_entry ConfigGeneral;
68	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
69	>	struct config_serverinfo_entry ConfigServerInfo;
70	>	struct config_admin_entry ConfigAdminInfo;
71	>	struct conf_parser_context conf_parser_ctx;
72
73		/* general conf items link list root, other than k lines etc. */
74	<	dlink_list service_items = { NULL, NULL, 0 };
75	<	dlink_list server_items  = { NULL, NULL, 0 };
64	<	dlink_list cluster_items = { NULL, NULL, 0 };
65	<	dlink_list hub_items     = { NULL, NULL, 0 };
66	<	dlink_list leaf_items    = { NULL, NULL, 0 };
67	<	dlink_list oconf_items   = { NULL, NULL, 0 };
68	<	dlink_list uconf_items   = { NULL, NULL, 0 };
69	<	dlink_list xconf_items   = { NULL, NULL, 0 };
70	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
71	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
72	<	dlink_list nresv_items   = { NULL, NULL, 0 };
73	<	dlink_list class_items   = { NULL, NULL, 0 };
74	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
75	<
76	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
79	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
80	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
81	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
82	<	dlink_list temporary_resv = { NULL, NULL, 0 };
74	>	dlink_list connect_items;
75	>	dlink_list operator_items;
76
77		extern unsigned int lineno;
78		extern char linebuf[];
79		extern char conffilebuf[IRCD_BUFSIZE];
87	–	extern char yytext[];
80		extern int yyparse(); /* defined in y.tab.c */
81
90	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
91	–
92	–	/* internally defined functions */
93	–	static void lookup_confhost(struct ConfItem *);
94	–	static void set_default_conf(void);
95	–	static void validate_conf(void);
96	–	static void read_conf(FBFILE *);
97	–	static void clear_out_old_conf(void);
98	–	static void flush_deleted_I_P(void);
99	–	static void expire_tklines(dlink_list *);
100	–	static void garbage_collect_ip_entries(void);
101	–	static int hash_ip(struct irc_ssaddr *);
102	–	static int verify_access(struct Client *, const char *);
103	–	static int attach_iline(struct Client *, struct ConfItem *);
104	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
105	–	static void parse_conf_file(int, int);
106	–	static dlink_list *map_to_list(ConfType);
107	–	static struct AccessItem *find_regexp_kline(const char *[]);
108	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
109	–
110	–	/*
111	–	* bit_len
112	–	*/
113	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
114	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
115	–	static void destroy_cidr_class(struct ClassItem *);
116	–
117	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
118	–
119	–	/* address of default class conf */
120	–	static struct ConfItem *class_default;
121	–
122	–	/* usually, with hash tables, you use a prime number...
123	–	* but in this case I am dealing with ip addresses,
124	–	* not ascii strings.
125	–	*/
126	–	#define IP_HASH_SIZE 0x1000
127	–
128	–	struct ip_entry
129	–	{
130	–	struct irc_ssaddr ip;
131	–	int count;
132	–	time_t last_attempt;
133	–	struct ip_entry *next;
134	–	};
135	–
136	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
137	–	static BlockHeap *ip_entry_heap = NULL;
138	–	static int ip_entries_count = 0;
139	–
140	–
141	–	void *
142	–	map_to_conf(struct ConfItem *aconf)
143	–	{
144	–	void *conf;
145	–	conf = (void *)((uintptr_t)aconf +
146	–	(uintptr_t)sizeof(struct ConfItem));
147	–	return(conf);
148	–	}
149	–
150	–	struct ConfItem *
151	–	unmap_conf_item(void *aconf)
152	–	{
153	–	struct ConfItem *conf;
154	–
155	–	conf = (struct ConfItem *)((uintptr_t)aconf -
156	–	(uintptr_t)sizeof(struct ConfItem));
157	–	return(conf);
158	–	}
82
83		/* conf_dns_callback()
84		*
85	<	* inputs       - pointer to struct AccessItem
85	>	* inputs       - pointer to struct MaskItem
86		*              - pointer to DNSReply reply
87		* output       - none
88		* side effects - called when resolver query finishes
#	Line 168 | Line 91 | unmap_conf_item(void *aconf)
91		* if successful save hp in the conf item it was called with
92		*/
93		static void
94	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
94	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
95		{
96	<	struct AccessItem *aconf = vptr;
96	>	struct MaskItem *const conf = vptr;
97
98	<	aconf->dns_pending = 0;
98	>	conf->dns_pending = false;
99
100	<	if (addr != NULL)
101	<	memcpy(&aconf->ipnum, addr, sizeof(aconf->ipnum));
100	>	if (addr)
101	>	*conf->addr = *addr;
102		else
103	<	aconf->dns_failed = 1;
103	>	conf->dns_failed = true;
104		}
105
106	<	/* conf_dns_lookup()
106	>	/* conf_resolve_host()
107		*
108	<	* do a nameserver lookup of the conf host
109	<	* if the conf entry is currently doing a ns lookup do nothing, otherwise
187	<	* allocate a dns_query and start ns lookup.
108	>	* start DNS lookups of all hostnames in the conf
109	>	* line and convert an IP addresses in a.b.c.d number for to IP#s.
110		*/
111	<	static void
112	<	conf_dns_lookup(struct AccessItem *aconf)
111	>	void
112	>	conf_dns_lookup(struct MaskItem *conf)
113		{
114	<	if (!aconf->dns_pending)
193	<	{
194	<	aconf->dns_pending = 1;
195	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
196	<	}
197	<	}
114	>	struct addrinfo hints, *res;
115
116	<	/* make_conf_item()
117	<	*
118	<	* inputs       - type of item
119	<	* output       - pointer to new conf entry
120	<	* side effects - none
204	<	*/
205	<	struct ConfItem *
206	<	make_conf_item(ConfType type)
207	<	{
208	<	struct ConfItem *conf = NULL;
209	<	struct AccessItem *aconf = NULL;
210	<	struct ClassItem *aclass = NULL;
211	<	int status = 0;
116	>	/*
117	>	* Do name lookup now on hostnames given and store the
118	>	* ip numbers in conf structure.
119	>	*/
120	>	memset(&hints, 0, sizeof(hints));
121
122	<	switch (type)
122	>	hints.ai_family = AF_UNSPEC;
123	>	hints.ai_socktype = SOCK_STREAM;
124	>
125	>	/* Get us ready for a bind() and don't bother doing dns lookup */
126	>	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
127	>
128	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
129		{
130	<	case DLINE_TYPE:
131	<	case EXEMPTDLINE_TYPE:
132	<	case GLINE_TYPE:
133	<	case KLINE_TYPE:
134	<	case CLIENT_TYPE:
135	<	case OPER_TYPE:
221	<	case SERVER_TYPE:
222	<	conf = MyMalloc(sizeof(struct ConfItem) +
223	<	sizeof(struct AccessItem));
224	<	aconf = map_to_conf(conf);
225	<	aconf->aftype = AF_INET;
130	>	/*
131	>	* By this point conf->host possibly is not a numerical network address. Do a nameserver
132	>	* lookup of the conf host. If the conf entry is currently doing a ns lookup do nothing.
133	>	*/
134	>	if (conf->dns_pending == true)
135	>	return;
136
137	<	/* Yes, sigh. switch on type again */
228	<	switch (type)
229	<	{
230	<	case EXEMPTDLINE_TYPE:
231	<	status = CONF_EXEMPTDLINE;
232	<	break;
137	>	conf->dns_pending = true;
138
139	<	case DLINE_TYPE:
140	<	status = CONF_DLINE;
141	<	break;
139	>	if (conf->aftype == AF_INET)
140	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
141	>	else
142	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
143	>	return;
144	>	}
145
146	<	case KLINE_TYPE:
239	<	status = CONF_KLINE;
240	<	break;
146	>	assert(res);
147
148	<	case GLINE_TYPE:
149	<	status = CONF_GLINE;
244	<	break;
148	>	memcpy(conf->addr, res->ai_addr, res->ai_addrlen);
149	>	conf->addr->ss_len = res->ai_addrlen;
150
151	<	case CLIENT_TYPE:
152	<	status = CONF_CLIENT;
248	<	break;
151	>	freeaddrinfo(res);
152	>	}
153
154	<	case OPER_TYPE:
155	<	status = CONF_OPERATOR;
156	<	dlinkAdd(conf, &conf->node, &oconf_items);
154	>	/* map_to_list()
155	>	*
156	>	* inputs       - ConfType conf
157	>	* output       - pointer to dlink_list to use
158	>	* side effects - none
159	>	*/
160	>	static dlink_list *
161	>	map_to_list(enum maskitem_type type)
162	>	{
163	>	switch (type)
164	>	{
165	>	case CONF_OPER:
166	>	return &operator_items;
167		break;
168	<
169	<	case SERVER_TYPE:
256	<	status = CONF_SERVER;
257	<	dlinkAdd(conf, &conf->node, &server_items);
168	>	case CONF_SERVER:
169	>	return &connect_items;
170		break;
259	–
171		default:
172	<	break;
262	<	}
263	<	aconf->status = status;
264	<	break;
265	<
266	<	case LEAF_TYPE:
267	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
268	<	sizeof(struct MatchItem));
269	<	dlinkAdd(conf, &conf->node, &leaf_items);
270	<	break;
271	<
272	<	case HUB_TYPE:
273	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
274	<	sizeof(struct MatchItem));
275	<	dlinkAdd(conf, &conf->node, &hub_items);
276	<	break;
277	<
278	<	case ULINE_TYPE:
279	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
280	<	sizeof(struct MatchItem));
281	<	dlinkAdd(conf, &conf->node, &uconf_items);
282	<	break;
283	<
284	<	case GDENY_TYPE:
285	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
286	<	sizeof(struct AccessItem));
287	<	dlinkAdd(conf, &conf->node, &gdeny_items);
288	<	break;
289	<
290	<	case XLINE_TYPE:
291	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
292	<	sizeof(struct MatchItem));
293	<	dlinkAdd(conf, &conf->node, &xconf_items);
294	<	break;
295	<	#ifdef HAVE_LIBPCRE
296	<	case RXLINE_TYPE:
297	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
298	<	sizeof(struct MatchItem));
299	<	dlinkAdd(conf, &conf->node, &rxconf_items);
300	<	break;
301	<
302	<	case RKLINE_TYPE:
303	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
304	<	sizeof(struct AccessItem));
305	<	aconf = map_to_conf(conf);
306	<	aconf->status = CONF_KLINE;
307	<	dlinkAdd(conf, &conf->node, &rkconf_items);
308	<	break;
309	<	#endif
310	<	case CLUSTER_TYPE:
311	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
312	<	dlinkAdd(conf, &conf->node, &cluster_items);
313	<	break;
314	<
315	<	case CRESV_TYPE:
316	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
317	<	sizeof(struct ResvChannel));
318	<	break;
319	<
320	<	case NRESV_TYPE:
321	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
322	<	sizeof(struct MatchItem));
323	<	dlinkAdd(conf, &conf->node, &nresv_items);
324	<	break;
325	<
326	<	case SERVICE_TYPE:
327	<	status = CONF_SERVICE;
328	<	conf = MyMalloc(sizeof(struct ConfItem));
329	<	dlinkAdd(conf, &conf->node, &service_items);
330	<	break;
331	<
332	<	case CLASS_TYPE:
333	<	conf = MyMalloc(sizeof(struct ConfItem) +
334	<	sizeof(struct ClassItem));
335	<	dlinkAdd(conf, &conf->node, &class_items);
336	<
337	<	aclass = map_to_conf(conf);
338	<	aclass->active = 1;
339	<	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
340	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
341	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
342	<	MaxSendq(aclass) = DEFAULT_SENDQ;
343	<
344	<	break;
345	<
346	<	default:
347	<	conf = NULL;
348	<	break;
172	>	return NULL;
173		}
174	+	}
175
176	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
177	<	conf->type = type;
176	>	struct MaskItem *
177	>	conf_make(enum maskitem_type type)
178	>	{
179	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
180	>	dlink_list *list = NULL;
181	>
182	>	conf->type   = type;
183	>	conf->active = true;
184	>	conf->aftype = AF_INET;
185
186	+	if ((list = map_to_list(type)))
187	+	dlinkAdd(conf, &conf->node, list);
188		return conf;
189		}
190
191		void
192	<	delete_conf_item(struct ConfItem *conf)
192	>	conf_free(struct MaskItem *conf)
193		{
194	<	dlink_node *m = NULL;
195	<	struct MatchItem *match_item;
362	<	struct AccessItem *aconf;
363	<	ConfType type = conf->type;
364	<
365	<	MyFree(conf->name);
366	<	conf->name = NULL;
367	<
368	<	switch(type)
369	<	{
370	<	case DLINE_TYPE:
371	<	case EXEMPTDLINE_TYPE:
372	<	case GLINE_TYPE:
373	<	case KLINE_TYPE:
374	<	case CLIENT_TYPE:
375	<	case OPER_TYPE:
376	<	case SERVER_TYPE:
377	<	aconf = map_to_conf(conf);
378	<
379	<	if (aconf->dns_pending)
380	<	delete_resolver_queries(aconf);
381	<	if (aconf->passwd != NULL)
382	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
383	<	if (aconf->spasswd != NULL)
384	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
385	<	aconf->class_ptr = NULL;
386	<
387	<	MyFree(aconf->passwd);
388	<	MyFree(aconf->spasswd);
389	<	MyFree(aconf->reason);
390	<	MyFree(aconf->oper_reason);
391	<	MyFree(aconf->user);
392	<	MyFree(aconf->host);
393	<	#ifdef HAVE_LIBCRYPTO
394	<	if (aconf->rsa_public_key)
395	<	RSA_free(aconf->rsa_public_key);
396	<	MyFree(aconf->rsa_public_key_file);
397	<	#endif
194	>	dlink_node *node = NULL, *node_next = NULL;
195	>	dlink_list *list = NULL;
196
197	<	/* Yes, sigh. switch on type again */
198	<	switch(type)
401	<	{
402	<	case EXEMPTDLINE_TYPE:
403	<	case DLINE_TYPE:
404	<	case GLINE_TYPE:
405	<	case KLINE_TYPE:
406	<	case CLIENT_TYPE:
407	<	MyFree(conf);
408	<	break;
197	>	if ((list = map_to_list(conf->type)))
198	>	dlinkFindDelete(list, conf);
199
200	<	case OPER_TYPE:
411	<	aconf = map_to_conf(conf);
412	<	if (!IsConfIllegal(aconf))
413	<	dlinkDelete(&conf->node, &oconf_items);
414	<	MyFree(conf);
415	<	break;
200	>	xfree(conf->name);
201
202	<	case SERVER_TYPE:
203	<	aconf = map_to_conf(conf);
204	<	if (!IsConfIllegal(aconf))
205	<	dlinkDelete(&conf->node, &server_items);
206	<	MyFree(conf);
207	<	break;
202	>	if (conf->dns_pending == true)
203	>	delete_resolver_queries(conf);
204	>	if (conf->passwd)
205	>	memset(conf->passwd, 0, strlen(conf->passwd));
206	>	if (conf->spasswd)
207	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
208
209	<	default:
425	<	break;
426	<	}
427	<	break;
209	>	conf->class = NULL;
210
211	<	case HUB_TYPE:
212	<	match_item = map_to_conf(conf);
213	<	MyFree(match_item->user);
214	<	MyFree(match_item->host);
215	<	MyFree(match_item->reason);
216	<	MyFree(match_item->oper_reason);
217	<	/* If marked illegal, its already been pulled off of the hub_items list */
218	<	if (!match_item->illegal)
219	<	dlinkDelete(&conf->node, &hub_items);
220	<	MyFree(conf);
439	<	break;
440	<
441	<	case LEAF_TYPE:
442	<	match_item = map_to_conf(conf);
443	<	MyFree(match_item->user);
444	<	MyFree(match_item->host);
445	<	MyFree(match_item->reason);
446	<	MyFree(match_item->oper_reason);
447	<	/* If marked illegal, its already been pulled off of the leaf_items list */
448	<	if (!match_item->illegal)
449	<	dlinkDelete(&conf->node, &leaf_items);
450	<	MyFree(conf);
451	<	break;
452	<
453	<	case ULINE_TYPE:
454	<	match_item = map_to_conf(conf);
455	<	MyFree(match_item->user);
456	<	MyFree(match_item->host);
457	<	MyFree(match_item->reason);
458	<	MyFree(match_item->oper_reason);
459	<	dlinkDelete(&conf->node, &uconf_items);
460	<	MyFree(conf);
461	<	break;
462	<
463	<	case XLINE_TYPE:
464	<	match_item = map_to_conf(conf);
465	<	MyFree(match_item->user);
466	<	MyFree(match_item->host);
467	<	MyFree(match_item->reason);
468	<	MyFree(match_item->oper_reason);
469	<	dlinkDelete(&conf->node, &xconf_items);
470	<	MyFree(conf);
471	<	break;
472	<	#ifdef HAVE_LIBPCRE
473	<	case RKLINE_TYPE:
474	<	aconf = map_to_conf(conf);
475	<	MyFree(aconf->regexuser);
476	<	MyFree(aconf->regexhost);
477	<	MyFree(aconf->user);
478	<	MyFree(aconf->host);
479	<	MyFree(aconf->reason);
480	<	MyFree(aconf->oper_reason);
481	<	dlinkDelete(&conf->node, &rkconf_items);
482	<	MyFree(conf);
483	<	break;
484	<
485	<	case RXLINE_TYPE:
486	<	MyFree(conf->regexpname);
487	<	match_item = map_to_conf(conf);
488	<	MyFree(match_item->user);
489	<	MyFree(match_item->host);
490	<	MyFree(match_item->reason);
491	<	MyFree(match_item->oper_reason);
492	<	dlinkDelete(&conf->node, &rxconf_items);
493	<	MyFree(conf);
494	<	break;
495	<	#endif
496	<	case NRESV_TYPE:
497	<	match_item = map_to_conf(conf);
498	<	MyFree(match_item->user);
499	<	MyFree(match_item->host);
500	<	MyFree(match_item->reason);
501	<	MyFree(match_item->oper_reason);
502	<	dlinkDelete(&conf->node, &nresv_items);
503	<
504	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
505	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
506	<	free_dlink_node(m);
507	<
508	<	MyFree(conf);
509	<	break;
510	<
511	<	case GDENY_TYPE:
512	<	aconf = map_to_conf(conf);
513	<	MyFree(aconf->user);
514	<	MyFree(aconf->host);
515	<	dlinkDelete(&conf->node, &gdeny_items);
516	<	MyFree(conf);
517	<	break;
518	<
519	<	case CLUSTER_TYPE:
520	<	dlinkDelete(&conf->node, &cluster_items);
521	<	MyFree(conf);
522	<	break;
523	<
524	<	case CRESV_TYPE:
525	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
526	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
527	<	free_dlink_node(m);
528	<
529	<	MyFree(conf);
530	<	break;
531	<
532	<	case CLASS_TYPE:
533	<	dlinkDelete(&conf->node, &class_items);
534	<	MyFree(conf);
535	<	break;
536	<
537	<	case SERVICE_TYPE:
538	<	dlinkDelete(&conf->node, &service_items);
539	<	MyFree(conf);
540	<	break;
211	>	xfree(conf->passwd);
212	>	xfree(conf->spasswd);
213	>	xfree(conf->reason);
214	>	xfree(conf->certfp);
215	>	xfree(conf->whois);
216	>	xfree(conf->user);
217	>	xfree(conf->host);
218	>	xfree(conf->addr);
219	>	xfree(conf->bind);
220	>	xfree(conf->cipher_list);
221
222	<	default:
223	<	break;
222	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
223	>	{
224	>	xfree(node->data);
225	>	dlinkDelete(node, &conf->hub_list);
226	>	free_dlink_node(node);
227		}
545	–	}
228
229	<	/* free_access_item()
230	<	*
231	<	* inputs       - pointer to conf to free
232	<	* output       - none
233	<	* side effects - crucial password fields are zeroed, conf is freed
234	<	*/
553	<	void
554	<	free_access_item(struct AccessItem *aconf)
555	<	{
556	<	struct ConfItem *conf;
229	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
230	>	{
231	>	xfree(node->data);
232	>	dlinkDelete(node, &conf->leaf_list);
233	>	free_dlink_node(node);
234	>	}
235
236	<	if (aconf == NULL)
559	<	return;
560	<	conf = unmap_conf_item(aconf);
561	<	delete_conf_item(conf);
236	>	xfree(conf);
237		}
238
239	<	static const unsigned int shared_bit_table[] =
565	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
566	<
567	<	/* report_confitem_types()
239	>	/* attach_iline()
240		*
241	<	* inputs       - pointer to client requesting confitem report
242	<	*              - ConfType to report
243	<	* output       - none
244	<	* side effects -
241	>	* inputs       - client pointer
242	>	*              - conf pointer
243	>	* output       -
244	>	* side effects - do actual attach
245		*/
246	<	void
247	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
246	>	static int
247	>	attach_iline(struct Client *client, struct MaskItem *conf)
248		{
249	<	dlink_node *ptr = NULL;
250	<	struct ConfItem *conf = NULL;
579	<	struct AccessItem *aconf = NULL;
580	<	struct MatchItem *matchitem = NULL;
581	<	struct ClassItem *classitem = NULL;
582	<	char buf[12];
583	<	char *p = NULL;
584	<	const char *pfx = NULL;
249	>	const struct ClassItem *const class = conf->class;
250	>	bool a_limit_reached = false;
251
252	<	switch (type)
253	<	{
254	<	case GDENY_TYPE:
255	<	DLINK_FOREACH(ptr, gdeny_items.head)
256	<	{
257	<	conf = ptr->data;
258	<	aconf = map_to_conf(conf);
259	<
260	<	p = buf;
261	<
262	<	if (aconf->flags & GDENY_BLOCK)
597	<	*p++ = 'B';
598	<	else
599	<	*p++ = 'b';
600	<
601	<	if (aconf->flags & GDENY_REJECT)
602	<	*p++ = 'R';
603	<	else
604	<	*p++ = 'r';
605	<
606	<	*p = '\0';
607	<
608	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
609	<	me.name, RPL_STATSDEBUG, source_p->name,
610	<	aconf->user, aconf->host, conf->name, buf);
611	<	}
612	<	break;
613	<
614	<	case XLINE_TYPE:
615	<	DLINK_FOREACH(ptr, xconf_items.head)
616	<	{
617	<	conf = ptr->data;
618	<	matchitem = map_to_conf(conf);
619	<
620	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
621	<	me.name, source_p->name,
622	<	matchitem->hold ? "x": "X", matchitem->count,
623	<	conf->name, matchitem->reason);
624	<	}
625	<	break;
626	<
627	<	#ifdef HAVE_LIBPCRE
628	<	case RXLINE_TYPE:
629	<	DLINK_FOREACH(ptr, rxconf_items.head)
630	<	{
631	<	conf = ptr->data;
632	<	matchitem = map_to_conf(conf);
633	<
634	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
635	<	me.name, source_p->name,
636	<	matchitem->hold ? "xR": "XR", matchitem->count,
637	<	conf->name, matchitem->reason);
638	<	}
639	<	break;
640	<
641	<	case RKLINE_TYPE:
642	<	pfx = temp ? "kR" : "KR";
643	<
644	<	DLINK_FOREACH(ptr, rkconf_items.head)
645	<	{
646	<	aconf = map_to_conf((conf = ptr->data));
647	<
648	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
649	<	continue;
252	>	struct ip_entry *ipcache = ipcache_record_find_or_add(&client->ip);
253	>	++ipcache->count_local;
254	>	AddFlag(client, FLAGS_IPHASH);
255	>
256	>	if (class->max_total && class->ref_count >= class->max_total)
257	>	a_limit_reached = true;
258	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
259	>	a_limit_reached = true;
260	>	else if (class->max_perip_global &&
261	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
262	>	a_limit_reached = true;
263
264	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
265	<	source_p->name, pfx, aconf->host, aconf->user,
266	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
267	<	}
655	<	break;
656	<	#endif
657	<
658	<	case ULINE_TYPE:
659	<	DLINK_FOREACH(ptr, uconf_items.head)
660	<	{
661	<	conf = ptr->data;
662	<	matchitem = map_to_conf(conf);
663	<
664	<	p = buf;
665	<
666	<	/* some of these are redundant for the sake of
667	<	* consistency with cluster{} flags
668	<	*/
669	<	*p++ = 'c';
670	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
671	<
672	<	sendto_one(source_p, form_str(RPL_STATSULINE),
673	<	me.name, source_p->name, conf->name,
674	<	matchitem->user?matchitem->user: "*",
675	<	matchitem->host?matchitem->host: "*", buf);
676	<	}
677	<
678	<	DLINK_FOREACH(ptr, cluster_items.head)
679	<	{
680	<	conf = ptr->data;
681	<
682	<	p = buf;
683	<
684	<	*p++ = 'C';
685	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
686	<
687	<	sendto_one(source_p, form_str(RPL_STATSULINE),
688	<	me.name, source_p->name, conf->name,
689	<	"*", "*", buf);
690	<	}
264	>	if (a_limit_reached == true)
265	>	{
266	>	if (!IsConfExemptLimits(conf))
267	>	return TOO_MANY;   /* Already at maximum allowed */
268
269	<	break;
269	>	sendto_one_notice(client, &me, ":*** Your connection class is full, "
270	>	"but you have exceed_limit = yes;");
271	>	}
272
273	<	case OPER_TYPE:
274	<	DLINK_FOREACH(ptr, oconf_items.head)
696	<	{
697	<	conf = ptr->data;
698	<	aconf = map_to_conf(conf);
273	>	return conf_attach(client, conf);
274	>	}
275
276	<	/* Don't allow non opers to see oper privs */
277	<	if (HasUMode(source_p, UMODE_OPER))
278	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
279	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
280	<	conf->name, oper_privs_as_string(aconf->port),
281	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
282	<	else
283	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
284	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
285	<	conf->name, "0",
710	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
711	<	}
712	<	break;
276	>	/* verify_access()
277	>	*
278	>	* inputs       - pointer to client to verify
279	>	* output       - 0 if success -'ve if not
280	>	* side effect  - find the first (best) I line to attach.
281	>	*/
282	>	static int
283	>	verify_access(struct Client *client)
284	>	{
285	>	struct MaskItem *conf;
286
287	<	case CLASS_TYPE:
288	<	DLINK_FOREACH(ptr, class_items.head)
289	<	{
290	<	conf = ptr->data;
291	<	classitem = map_to_conf(conf);
292	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
720	<	me.name, source_p->name, 'Y',
721	<	conf->name, PingFreq(classitem),
722	<	ConFreq(classitem),
723	<	MaxTotal(classitem), MaxSendq(classitem),
724	<	CurrUserCount(classitem),
725	<	classitem->active ? "active" : "disabled");
726	<	}
727	<	break;
287	>	if (HasFlag(client, FLAGS_GOTID))
288	>	conf = find_address_conf(client->host, client->username, &client->ip,
289	>	client->connection->password);
290	>	else
291	>	{
292	>	char non_ident[USERLEN + 1] = "~";
293
294	<	case CONF_TYPE:
295	<	case CLIENT_TYPE:
296	<	break;
294	>	strlcpy(non_ident + 1, client->username, sizeof(non_ident) - 1);
295	>	conf = find_address_conf(client->host, non_ident, &client->ip,
296	>	client->connection->password);
297	>	}
298
299	<	case SERVICE_TYPE:
300	<	DLINK_FOREACH(ptr, service_items.head)
735	<	{
736	<	conf = ptr->data;
737	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
738	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
739	<	}
740	<	break;
299	>	if (conf == NULL)
300	>	return NOT_AUTHORIZED;
301
302	<	case SERVER_TYPE:
743	<	DLINK_FOREACH(ptr, server_items.head)
744	<	{
745	<	p = buf;
302	>	assert(IsConfClient(conf) || IsConfKill(conf));
303
304	<	conf = ptr->data;
305	<	aconf = map_to_conf(conf);
304	>	if (IsConfKill(conf))
305	>	{
306	>	sendto_one_notice(client, &me, ":*** Banned: %s", conf->reason);
307	>	return BANNED_CLIENT;
308	>	}
309
310	<	buf[0] = '\0';
310	>	if (IsConfRedir(conf))
311	>	{
312	>	sendto_one_numeric(client, &me, RPL_REDIR,
313	>	conf->name ? conf->name : "",
314	>	conf->port);
315	>	return NOT_AUTHORIZED;
316	>	}
317
318	<	if (IsConfAllowAutoConn(aconf))
319	<	*p++ = 'A';
754	<	if (IsConfCryptLink(aconf))
755	<	*p++ = 'C';
756	<	if (IsConfTopicBurst(aconf))
757	<	*p++ = 'T';
758	<	if (IsConfCompressed(aconf))
759	<	*p++ = 'Z';
760	<	if (buf[0] == '\0')
761	<	*p++ = '*';
762	<
763	<	*p = '\0';
764	<
765	<	/*
766	<	* Allow admins to see actual ips unless hide_server_ips is enabled
767	<	*/
768	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
769	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
770	<	me.name, source_p->name, 'C', aconf->host,
771	<	buf, conf->name, aconf->port,
772	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
773	<	else
774	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
775	<	me.name, source_p->name, 'C',
776	<	"*@127.0.0.1", buf, conf->name, aconf->port,
777	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
778	<	}
779	<	break;
318	>	/* Preserve x->host in x->realhost before it gets overwritten. */
319	>	strlcpy(client->realhost, client->host, sizeof(client->realhost));
320
321	<	case HUB_TYPE:
322	<	DLINK_FOREACH(ptr, hub_items.head)
783	<	{
784	<	conf = ptr->data;
785	<	matchitem = map_to_conf(conf);
786	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
787	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
788	<	}
789	<	break;
321	>	if (IsConfDoSpoofIp(conf))
322	>	strlcpy(client->host, conf->name, sizeof(client->host));
323
324	<	case LEAF_TYPE:
792	<	DLINK_FOREACH(ptr, leaf_items.head)
793	<	{
794	<	conf = ptr->data;
795	<	matchitem = map_to_conf(conf);
796	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
797	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
798	<	}
799	<	break;
800	<
801	<	case GLINE_TYPE:
802	<	case KLINE_TYPE:
803	<	case DLINE_TYPE:
804	<	case EXEMPTDLINE_TYPE:
805	<	case CRESV_TYPE:
806	<	case NRESV_TYPE:
807	<	case CLUSTER_TYPE:
808	<	default:
809	<	break;
810	<	}
324	>	return attach_iline(client, conf);
325		}
326
327		/* check_client()
#	Line 823 | Line 337 | report_confitem_types(struct Client *sou
337		*                Look for conf lines which have the same
338		*                status as the flags passed.
339		*/
340	<	static void *
341	<	check_client(va_list args)
340	>	bool
341	>	conf_check_client(struct Client *client)
342		{
829	–	struct Client *source_p = va_arg(args, struct Client *);
830	–	const char *username = va_arg(args, const char *);
343		int i;
344	<
345	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
346	<	if ((i = verify_access(source_p, username)))
347	<	ilog(L_INFO, "Access denied: %s[%s]",
836	<	source_p->name, source_p->sockhost);
344	>
345	>	if ((i = verify_access(client)))
346	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
347	>	client->name, client->sockhost);
348
349		switch (i)
350		{
351		case TOO_MANY:
352	<	sendto_realops_flags(UMODE_FULL, L_ALL,
352	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
353		"Too many on IP for %s (%s).",
354	<	get_client_name(source_p, SHOW_IP),
355	<	source_p->sockhost);
356	<	ilog(L_INFO,"Too many connections on IP from %s.",
357	<	get_client_name(source_p, SHOW_IP));
354	>	client_get_name(client, SHOW_IP),
355	>	client->sockhost);
356	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
357	>	client_get_name(client, SHOW_IP));
358		++ServerStats.is_ref;
359	<	exit_client(source_p, &me, "No more connections allowed on that IP");
359	>	exit_client(client, "No more connections allowed on that IP");
360		break;
361
362		case I_LINE_FULL:
363	<	sendto_realops_flags(UMODE_FULL, L_ALL,
364	<	"I-line is full for %s (%s).",
365	<	get_client_name(source_p, SHOW_IP),
366	<	source_p->sockhost);
367	<	ilog(L_INFO,"Too many connections from %s.",
368	<	get_client_name(source_p, SHOW_IP));
363	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
364	>	"auth {} block is full for %s (%s).",
365	>	client_get_name(client, SHOW_IP),
366	>	client->sockhost);
367	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
368	>	client_get_name(client, SHOW_IP));
369		++ServerStats.is_ref;
370	<	exit_client(source_p, &me,
860	<	"No more connections allowed in your connection class");
370	>	exit_client(client, "No more connections allowed in your connection class");
371		break;
372
373		case NOT_AUTHORIZED:
374	+	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
375	+	"Unauthorized client connection from %s.",
376	+	client_get_name(client, SHOW_IP));
377	+	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s.",
378	+	client_get_name(client, SHOW_IP));
379		++ServerStats.is_ref;
380	<	/* jdc - lists server name & port connections are on */
866	<	/*       a purely cosmetical change */
867	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
868	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
869	<	get_client_name(source_p, SHOW_IP),
870	<	source_p->sockhost,
871	<	source_p->localClient->listener->name,
872	<	source_p->localClient->listener->port);
873	<	ilog(L_INFO,
874	<	"Unauthorized client connection from %s on [%s/%u].",
875	<	get_client_name(source_p, SHOW_IP),
876	<	source_p->localClient->listener->name,
877	<	source_p->localClient->listener->port);
878	<
879	<	/* XXX It is prolematical whether it is better to use the
880	<	* capture reject code here or rely on the connecting too fast code.
881	<	* - Dianora
882	<	*/
883	<	if (REJECT_HOLD_TIME > 0)
884	<	{
885	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
886	<	me.name, source_p->name);
887	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
888	<	SetCaptured(source_p);
889	<	}
890	<	else
891	<	exit_client(source_p, &me, "You are not authorized to use this server");
380	>	exit_client(client, "You are not authorized to use this server");
381		break;
382
383	<	case BANNED_CLIENT:
384	<	/*
385	<	* Don't exit them immediately, play with them a bit.
386	<	* - Dianora
898	<	*/
899	<	if (REJECT_HOLD_TIME > 0)
900	<	{
901	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
902	<	SetCaptured(source_p);
903	<	}
904	<	else
905	<	exit_client(source_p, &me, "Banned");
906	<	++ServerStats.is_ref;
907	<	break;
908	<
909	<	case 0:
910	<	default:
911	<	break;
912	<	}
913	<
914	<	return (i < 0 ? NULL : source_p);
915	<	}
916	<
917	<	/* verify_access()
918	<	*
919	<	* inputs       - pointer to client to verify
920	<	*              - pointer to proposed username
921	<	* output       - 0 if success -'ve if not
922	<	* side effect  - find the first (best) I line to attach.
923	<	*/
924	<	static int
925	<	verify_access(struct Client *client_p, const char *username)
926	<	{
927	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
928	<	struct ConfItem *conf = NULL;
929	<	char non_ident[USERLEN + 1] = { '~', '\0' };
930	<	const char *uhi[3];
931	<
932	<	if (IsGotId(client_p))
933	<	{
934	<	aconf = find_address_conf(client_p->host, client_p->username,
935	<	&client_p->localClient->ip,
936	<	client_p->localClient->aftype,
937	<	client_p->localClient->passwd);
938	<	}
939	<	else
940	<	{
941	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
942	<	aconf = find_address_conf(client_p->host,non_ident,
943	<	&client_p->localClient->ip,
944	<	client_p->localClient->aftype,
945	<	client_p->localClient->passwd);
946	<	}
947	<
948	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
949	<	uhi[1] = client_p->host;
950	<	uhi[2] = client_p->sockhost;
951	<
952	<	rkconf = find_regexp_kline(uhi);
953	<
954	<	if (aconf != NULL)
955	<	{
956	<	if (IsConfClient(aconf) && !rkconf)
957	<	{
958	<	conf = unmap_conf_item(aconf);
959	<
960	<	if (IsConfRedir(aconf))
961	<	{
962	<	sendto_one(client_p, form_str(RPL_REDIR),
963	<	me.name, client_p->name,
964	<	conf->name ? conf->name : "",
965	<	aconf->port);
966	<	return(NOT_AUTHORIZED);
967	<	}
968	<
969	<	if (IsConfDoIdentd(aconf))
970	<	SetNeedId(client_p);
971	<
972	<	/* Thanks for spoof idea amm */
973	<	if (IsConfDoSpoofIp(aconf))
974	<	{
975	<	conf = unmap_conf_item(aconf);
976	<
977	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
978	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
979	<	client_p->name, client_p->host, conf->name);
980	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
981	<	SetIPSpoof(client_p);
982	<	}
983	<
984	<	return(attach_iline(client_p, conf));
985	<	}
986	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
987	<	{
988	<	/* XXX */
989	<	aconf = rkconf ? rkconf : aconf;
990	<	if (IsConfGline(aconf))
991	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
992	<	client_p->name);
993	<	if (ConfigFileEntry.kline_with_reason)
994	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
995	<	me.name, client_p->name, aconf->reason);
996	<	return(BANNED_CLIENT);
997	<	}
998	<	}
999	<
1000	<	return(NOT_AUTHORIZED);
1001	<	}
1002	<
1003	<	/* attach_iline()
1004	<	*
1005	<	* inputs       - client pointer
1006	<	*              - conf pointer
1007	<	* output       -
1008	<	* side effects - do actual attach
1009	<	*/
1010	<	static int
1011	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
1012	<	{
1013	<	struct AccessItem *aconf;
1014	<	struct ClassItem *aclass;
1015	<	struct ip_entry *ip_found;
1016	<	int a_limit_reached = 0;
1017	<	int local = 0, global = 0, ident = 0;
1018	<
1019	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
1020	<	ip_found->count++;
1021	<	SetIpHash(client_p);
1022	<
1023	<	aconf = map_to_conf(conf);
1024	<	if (aconf->class_ptr == NULL)
1025	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1026	<
1027	<	aclass = map_to_conf(aconf->class_ptr);
1028	<
1029	<	count_user_host(client_p->username, client_p->host,
1030	<	&global, &local, &ident);
1031	<
1032	<	/* XXX blah. go down checking the various silly limits
1033	<	* setting a_limit_reached if any limit is reached.
1034	<	* - Dianora
1035	<	*/
1036	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
1037	<	a_limit_reached = 1;
1038	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
1039	<	a_limit_reached = 1;
1040	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
1041	<	a_limit_reached = 1;
1042	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
1043	<	a_limit_reached = 1;
1044	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
1045	<	client_p->username[0] != '~')
1046	<	a_limit_reached = 1;
1047	<
1048	<	if (a_limit_reached)
1049	<	{
1050	<	if (!IsConfExemptLimits(aconf))
1051	<	return TOO_MANY;   /* Already at maximum allowed */
383	>	case BANNED_CLIENT:
384	>	++ServerStats.is_ref;
385	>	exit_client(client, "Banned");
386	>	break;
387
388	<	sendto_one(client_p,
389	<	":%s NOTICE %s :*** Your connection class is full, "
390	<	"but you have exceed_limit = yes;", me.name, client_p->name);
388	>	case 0:
389	>	default:
390	>	break;
391		}
392
393	<	return attach_conf(client_p, conf);
393	>	if (i < 0)
394	>	return false;
395	>	return true;
396		}
397
398	<	/* init_ip_hash_table()
399	<	*
400	<	* inputs               - NONE
401	<	* output               - NONE
1065	<	* side effects         - allocate memory for ip_entry(s)
1066	<	*                      - clear the ip hash table
398	>	/*! \brief Disassociate configuration from the client. Also removes a class
399	>	*         from the list if marked for deleting.
400	>	* \param client Client to operate on
401	>	* \param type     Type of conf to detach
402		*/
403		void
404	<	init_ip_hash_table(void)
1070	<	{
1071	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1072	<	2 * hard_fdlimit);
1073	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1074	<	}
1075	<
1076	<	/* find_or_add_ip()
1077	<	*
1078	<	* inputs       - pointer to struct irc_ssaddr
1079	<	* output       - pointer to a struct ip_entry
1080	<	* side effects -
1081	<	*
1082	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
1083	<	* count set to 0.
1084	<	*/
1085	<	static struct ip_entry *
1086	<	find_or_add_ip(struct irc_ssaddr *ip_in)
404	>	conf_detach(struct Client *client, enum maskitem_type type)
405		{
406	<	struct ip_entry *ptr, *newptr;
1089	<	int hash_index = hash_ip(ip_in), res;
1090	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1091	<	#ifdef IPV6
1092	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1093	<	#endif
406	>	dlink_node *node, *node_next;
407
408	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
408	>	DLINK_FOREACH_SAFE(node, node_next, client->connection->confs.head)
409		{
410	<	#ifdef IPV6
1098	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1099	<	continue;
1100	<	if (ip_in->ss.ss_family == AF_INET6)
1101	<	{
1102	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1103	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1104	<	}
1105	<	else
1106	<	#endif
1107	<	{
1108	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1109	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1110	<	}
1111	<	if (res == 0)
1112	<	{
1113	<	/* Found entry already in hash, return it. */
1114	<	return ptr;
1115	<	}
1116	<	}
1117	<
1118	<	if (ip_entries_count >= 2 * hard_fdlimit)
1119	<	garbage_collect_ip_entries();
1120	<
1121	<	newptr = BlockHeapAlloc(ip_entry_heap);
1122	<	ip_entries_count++;
1123	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
1124	<
1125	<	newptr->next = ip_hash_table[hash_index];
1126	<	ip_hash_table[hash_index] = newptr;
410	>	struct MaskItem *conf = node->data;
411
412	<	return newptr;
413	<	}
414	<
1131	<	/* remove_one_ip()
1132	<	*
1133	<	* inputs        - unsigned long IP address value
1134	<	* output        - NONE
1135	<	* side effects  - The ip address given, is looked up in ip hash table
1136	<	*                 and number of ip#'s for that ip decremented.
1137	<	*                 If ip # count reaches 0 and has expired,
1138	<	*                 the struct ip_entry is returned to the ip_entry_heap
1139	<	*/
1140	<	void
1141	<	remove_one_ip(struct irc_ssaddr *ip_in)
1142	<	{
1143	<	struct ip_entry *ptr;
1144	<	struct ip_entry *last_ptr = NULL;
1145	<	int hash_index = hash_ip(ip_in), res;
1146	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1147	<	#ifdef IPV6
1148	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1149	<	#endif
412	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
413	>	assert(conf->ref_count > 0);
414	>	assert(conf->class->ref_count > 0);
415
416	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1152	<	{
1153	<	#ifdef IPV6
1154	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1155	<	continue;
1156	<	if (ip_in->ss.ss_family == AF_INET6)
1157	<	{
1158	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1159	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1160	<	}
1161	<	else
1162	<	#endif
1163	<	{
1164	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1165	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1166	<	}
1167	<	if (res)
416	>	if (!(conf->type & type))
417		continue;
1169	–	if (ptr->count > 0)
1170	–	ptr->count--;
1171	–	if (ptr->count == 0 &&
1172	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1173	–	{
1174	–	if (last_ptr != NULL)
1175	–	last_ptr->next = ptr->next;
1176	–	else
1177	–	ip_hash_table[hash_index] = ptr->next;
418
419	<	BlockHeapFree(ip_entry_heap, ptr);
420	<	ip_entries_count--;
1181	<	return;
1182	<	}
1183	<	last_ptr = ptr;
1184	<	}
1185	<	}
419	>	dlinkDelete(node, &client->connection->confs);
420	>	free_dlink_node(node);
421
422	<	/* hash_ip()
423	<	*
1189	<	* input        - pointer to an irc_inaddr
1190	<	* output       - integer value used as index into hash table
1191	<	* side effects - hopefully, none
1192	<	*/
1193	<	static int
1194	<	hash_ip(struct irc_ssaddr *addr)
1195	<	{
1196	<	if (addr->ss.ss_family == AF_INET)
1197	<	{
1198	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1199	<	int hash;
1200	<	uint32_t ip;
422	>	if (conf->type == CONF_CLIENT)
423	>	class_ip_limit_remove(conf->class, &client->ip);
424
425	<	ip   = ntohl(v4->sin_addr.s_addr);
1203	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1204	<	return hash;
1205	<	}
1206	<	#ifdef IPV6
1207	<	else
1208	<	{
1209	<	int hash;
1210	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1211	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1212	<
1213	<	hash  = ip[0] ^ ip[3];
1214	<	hash ^= hash >> 16;
1215	<	hash ^= hash >> 8;
1216	<	hash  = hash & (IP_HASH_SIZE - 1);
1217	<	return hash;
1218	<	}
1219	<	#else
1220	<	return 0;
1221	<	#endif
1222	<	}
1223	<
1224	<	/* count_ip_hash()
1225	<	*
1226	<	* inputs        - pointer to counter of number of ips hashed
1227	<	*               - pointer to memory used for ip hash
1228	<	* output        - returned via pointers input
1229	<	* side effects  - NONE
1230	<	*
1231	<	* number of hashed ip #'s is counted up, plus the amount of memory
1232	<	* used in the hash.
1233	<	*/
1234	<	void
1235	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
1236	<	{
1237	<	struct ip_entry *ptr;
1238	<	int i;
1239	<
1240	<	*number_ips_stored = 0;
1241	<	*mem_ips_stored    = 0;
1242	<
1243	<	for (i = 0; i < IP_HASH_SIZE; i++)
1244	<	{
1245	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
425	>	if (--conf->class->ref_count == 0 && conf->class->active == false)
426		{
427	<	*number_ips_stored += 1;
428	<	*mem_ips_stored += sizeof(struct ip_entry);
427	>	class_free(conf->class);
428	>	conf->class = NULL;
429		}
1250	–	}
1251	–	}
1252	–
1253	–	/* garbage_collect_ip_entries()
1254	–	*
1255	–	* input        - NONE
1256	–	* output       - NONE
1257	–	* side effects - free up all ip entries with no connections
1258	–	*/
1259	–	static void
1260	–	garbage_collect_ip_entries(void)
1261	–	{
1262	–	struct ip_entry *ptr;
1263	–	struct ip_entry *last_ptr;
1264	–	struct ip_entry *next_ptr;
1265	–	int i;
430
431	<	for (i = 0; i < IP_HASH_SIZE; i++)
432	<	{
1269	<	last_ptr = NULL;
1270	<
1271	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
1272	<	{
1273	<	next_ptr = ptr->next;
1274	<
1275	<	if (ptr->count == 0 &&
1276	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1277	<	{
1278	<	if (last_ptr != NULL)
1279	<	last_ptr->next = ptr->next;
1280	<	else
1281	<	ip_hash_table[i] = ptr->next;
1282	<	BlockHeapFree(ip_entry_heap, ptr);
1283	<	ip_entries_count--;
1284	<	}
1285	<	else
1286	<	last_ptr = ptr;
1287	<	}
431	>	if (--conf->ref_count == 0 && conf->active == false)
432	>	conf_free(conf);
433		}
434		}
435
436	<	/* detach_conf()
437	<	*
438	<	* inputs       - pointer to client to detach
439	<	*              - type of conf to detach
440	<	* output       - 0 for success, -1 for failure
1296	<	* side effects - Disassociate configuration from the client.
1297	<	*                Also removes a class from the list if marked for deleting.
1298	<	*/
1299	<	int
1300	<	detach_conf(struct Client *client_p, ConfType type)
1301	<	{
1302	<	dlink_node *ptr, *next_ptr;
1303	<	struct ConfItem *conf;
1304	<	struct ClassItem *aclass;
1305	<	struct AccessItem *aconf;
1306	<	struct ConfItem *aclass_conf;
1307	<	struct MatchItem *match_item;
1308	<
1309	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
1310	<	{
1311	<	conf = ptr->data;
1312	<
1313	<	if (type == CONF_TYPE || conf->type == type)
1314	<	{
1315	<	dlinkDelete(ptr, &client_p->localClient->confs);
1316	<	free_dlink_node(ptr);
1317	<
1318	<	switch (conf->type)
1319	<	{
1320	<	case CLIENT_TYPE:
1321	<	case OPER_TYPE:
1322	<	case SERVER_TYPE:
1323	<	aconf = map_to_conf(conf);
1324	<
1325	<	assert(aconf->clients > 0);
1326	<
1327	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1328	<	{
1329	<	aclass = map_to_conf(aclass_conf);
1330	<
1331	<	assert(aclass->curr_user_count > 0);
1332	<
1333	<	if (conf->type == CLIENT_TYPE)
1334	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1335	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1336	<	delete_conf_item(aclass_conf);
1337	<	}
1338	<
1339	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
1340	<	delete_conf_item(conf);
1341	<
1342	<	break;
1343	<
1344	<	case LEAF_TYPE:
1345	<	case HUB_TYPE:
1346	<	match_item = map_to_conf(conf);
1347	<	if (match_item->ref_count == 0 && match_item->illegal)
1348	<	delete_conf_item(conf);
1349	<	break;
1350	<	default:
1351	<	break;
1352	<	}
1353	<
1354	<	if (type != CONF_TYPE)
1355	<	return 0;
1356	<	}
1357	<	}
1358	<
1359	<	return -1;
1360	<	}
1361	<
1362	<	/* attach_conf()
1363	<	*
1364	<	* inputs       - client pointer
1365	<	*              - conf pointer
1366	<	* output       -
1367	<	* side effects - Associate a specific configuration entry to a *local*
1368	<	*                client (this is the one which used in accepting the
1369	<	*                connection). Note, that this automatically changes the
1370	<	*                attachment if there was an old one...
436	>	/*! \brief Associate a specific configuration entry to a *local* client (this
437	>	*         is the one which used in accepting the connection). Note, that this
438	>	*         automatically changes the attachment if there was an old one.
439	>	* \param client Client to attach the conf to
440	>	* \param conf Configuration record to attach
441		*/
442		int
443	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
443	>	conf_attach(struct Client *client, struct MaskItem *conf)
444		{
445	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
445	>	if (dlinkFind(&client->connection->confs, conf))
446		return 1;
447
448	<	if (conf->type == CLIENT_TYPE ||
449	<	conf->type == SERVER_TYPE ||
450	<	conf->type == OPER_TYPE)
1381	<	{
1382	<	struct AccessItem *aconf = map_to_conf(conf);
1383	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1384	<
1385	<	if (IsConfIllegal(aconf))
1386	<	return NOT_AUTHORIZED;
1387	<
1388	<	if (conf->type == CLIENT_TYPE)
1389	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1390	<	&client_p->localClient->ip, aclass))
1391	<	return TOO_MANY;    /* Already at maximum allowed */
1392	<
1393	<	CurrUserCount(aclass)++;
1394	<	aconf->clients++;
1395	<	}
1396	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1397	<	{
1398	<	struct MatchItem *match_item = map_to_conf(conf);
1399	<	match_item->ref_count++;
1400	<	}
1401	<
1402	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
448	>	if (conf->type == CONF_CLIENT)
449	>	if (class_ip_limit_add(conf->class, &client->ip, IsConfExemptLimits(conf)) == true)
450	>	return TOO_MANY;    /* Already at maximum allowed */
451
452	<	return 0;
453	<	}
452	>	conf->class->ref_count++;
453	>	conf->ref_count++;
454
455	<	/* attach_connect_block()
1408	<	*
1409	<	* inputs       - pointer to server to attach
1410	<	*              - name of server
1411	<	*              - hostname of server
1412	<	* output       - true (1) if both are found, otherwise return false (0)
1413	<	* side effects - find connect block and attach them to connecting client
1414	<	*/
1415	<	int
1416	<	attach_connect_block(struct Client *client_p, const char *name,
1417	<	const char *host)
1418	<	{
1419	<	dlink_node *ptr;
1420	<	struct ConfItem *conf;
1421	<	struct AccessItem *aconf;
1422	<
1423	<	assert(client_p != NULL);
1424	<	assert(host != NULL);
1425	<
1426	<	if (client_p == NULL || host == NULL)
1427	<	return 0;
1428	<
1429	<	DLINK_FOREACH(ptr, server_items.head)
1430	<	{
1431	<	conf = ptr->data;
1432	<	aconf = map_to_conf(conf);
1433	<
1434	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
1435	<	continue;
1436	<
1437	<	attach_conf(client_p, conf);
1438	<	return -1;
1439	<	}
455	>	dlinkAdd(conf, make_dlink_node(), &client->connection->confs);
456
457		return 0;
458		}
459
1444	–	/* find_conf_exact()
1445	–	*
1446	–	* inputs       - type of ConfItem
1447	–	*              - pointer to name to find
1448	–	*              - pointer to username to find
1449	–	*              - pointer to host to find
1450	–	* output       - NULL or pointer to conf found
1451	–	* side effects - find a conf entry which matches the hostname
1452	–	*                and has the same name.
1453	–	*/
1454	–	struct ConfItem *
1455	–	find_conf_exact(ConfType type, const char *name, const char *user,
1456	–	const char *host)
1457	–	{
1458	–	dlink_node *ptr;
1459	–	dlink_list *list_p;
1460	–	struct ConfItem *conf = NULL;
1461	–	struct AccessItem *aconf;
1462	–
1463	–	/* Only valid for OPER_TYPE and ...? */
1464	–	list_p = map_to_list(type);
1465	–
1466	–	DLINK_FOREACH(ptr, (*list_p).head)
1467	–	{
1468	–	conf = ptr->data;
1469	–
1470	–	if (conf->name == NULL)
1471	–	continue;
1472	–	aconf = map_to_conf(conf);
1473	–	if (aconf->host == NULL)
1474	–	continue;
1475	–	if (irccmp(conf->name, name) != 0)
1476	–	continue;
1477	–
1478	–	/*
1479	–	** Accept if the *real* hostname (usually sockethost)
1480	–	** socket host) matches *either* host or name field
1481	–	** of the configuration.
1482	–	*/
1483	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1484	–	continue;
1485	–	if (type == OPER_TYPE)
1486	–	{
1487	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1488	–
1489	–	if (aconf->clients >= MaxTotal(aclass))
1490	–	continue;
1491	–	}
1492	–
1493	–	return conf;
1494	–	}
1495	–
1496	–	return NULL;
1497	–	}
1498	–
460		/* find_conf_name()
461		*
462		* inputs       - pointer to conf link list to search
#	Line 1505 | Line 466 | find_conf_exact(ConfType type, const cha
466		* side effects - find a conf entry which matches the name
467		*                and has the given mask.
468		*/
469	<	struct ConfItem *
470	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
469	>	struct MaskItem *
470	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
471		{
472	<	dlink_node *ptr;
1512	<	struct ConfItem* conf;
472	>	dlink_node *node = NULL;
473
474	<	DLINK_FOREACH(ptr, list->head)
474	>	DLINK_FOREACH(node, list->head)
475		{
476	<	conf = ptr->data;
477	<
476	>	struct MaskItem *conf = node->data;
477	>
478		if (conf->type == type)
479		{
480	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
481	<	match(conf->name, name)))
1522	<	return conf;
480	>	if (conf->name && !irccmp(conf->name, name))
481	>	return conf;
482		}
483		}
484
485		return NULL;
486		}
487
488	<	/* map_to_list()
489	<	*
490	<	* inputs       - ConfType conf
1532	<	* output       - pointer to dlink_list to use
1533	<	* side effects - none
488	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
489	>	* \param name Name to match
490	>	* \param compare Pointer to function to be used for string matching
491		*/
492	<	static dlink_list *
493	<	map_to_list(ConfType type)
492	>	struct MaskItem *
493	>	connect_find(const char *name, int (*compare)(const char *, const char *))
494		{
495	<	switch(type)
1539	<	{
1540	<	case RXLINE_TYPE:
1541	<	return(&rxconf_items);
1542	<	break;
1543	<	case XLINE_TYPE:
1544	<	return(&xconf_items);
1545	<	break;
1546	<	case ULINE_TYPE:
1547	<	return(&uconf_items);
1548	<	break;
1549	<	case NRESV_TYPE:
1550	<	return(&nresv_items);
1551	<	break;
1552	<	case OPER_TYPE:
1553	<	return(&oconf_items);
1554	<	break;
1555	<	case CLASS_TYPE:
1556	<	return(&class_items);
1557	<	break;
1558	<	case SERVER_TYPE:
1559	<	return(&server_items);
1560	<	break;
1561	<	case SERVICE_TYPE:
1562	<	return(&service_items);
1563	<	break;
1564	<	case CLUSTER_TYPE:
1565	<	return(&cluster_items);
1566	<	break;
1567	<	case CONF_TYPE:
1568	<	case GLINE_TYPE:
1569	<	case KLINE_TYPE:
1570	<	case DLINE_TYPE:
1571	<	case CRESV_TYPE:
1572	<	default:
1573	<	return NULL;
1574	<	}
1575	<	}
1576	<
1577	<	/* find_matching_name_conf()
1578	<	*
1579	<	* inputs       - type of link list to look in
1580	<	*              - pointer to name string to find
1581	<	*              - pointer to user
1582	<	*              - pointer to host
1583	<	*              - optional action to match on as well
1584	<	* output       - NULL or pointer to found struct MatchItem
1585	<	* side effects - looks for a match on name field
1586	<	*/
1587	<	struct ConfItem *
1588	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
1589	<	const char *host, int action)
1590	<	{
1591	<	dlink_node *ptr=NULL;
1592	<	struct ConfItem *conf=NULL;
1593	<	struct AccessItem *aconf=NULL;
1594	<	struct MatchItem *match_item=NULL;
1595	<	dlink_list *list_p = map_to_list(type);
495	>	dlink_node *node;
496
497	<	switch (type)
497	>	DLINK_FOREACH(node, connect_items.head)
498		{
499	<	#ifdef HAVE_LIBPCRE
1600	<	case RXLINE_TYPE:
1601	<	DLINK_FOREACH(ptr, list_p->head)
1602	<	{
1603	<	conf = ptr->data;
1604	<	assert(conf->regexpname);
1605	<
1606	<	if (!ircd_pcre_exec(conf->regexpname, name))
1607	<	return conf;
1608	<	}
1609	<	break;
1610	<	#endif
1611	<	case SERVICE_TYPE:
1612	<	DLINK_FOREACH(ptr, list_p->head)
1613	<	{
1614	<	conf = ptr->data;
1615	<
1616	<	if (EmptyString(conf->name))
1617	<	continue;
1618	<	if ((name != NULL) && !irccmp(name, conf->name))
1619	<	return conf;
1620	<	}
1621	<	break;
1622	<
1623	<	case XLINE_TYPE:
1624	<	case ULINE_TYPE:
1625	<	case NRESV_TYPE:
1626	<	DLINK_FOREACH(ptr, list_p->head)
1627	<	{
1628	<	conf = ptr->data;
1629	<
1630	<	match_item = map_to_conf(conf);
1631	<	if (EmptyString(conf->name))
1632	<	continue;
1633	<	if ((name != NULL) && match_esc(conf->name, name))
1634	<	{
1635	<	if ((user == NULL && (host == NULL)))
1636	<	return conf;
1637	<	if ((match_item->action & action) != action)
1638	<	continue;
1639	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
1640	<	return conf;
1641	<	if (match(match_item->user, user) && match(match_item->host, host))
1642	<	return conf;
1643	<	}
1644	<	}
1645	<	break;
499	>	struct MaskItem *conf = node->data;
500
501	<	case SERVER_TYPE:
502	<	DLINK_FOREACH(ptr, list_p->head)
1649	<	{
1650	<	conf = ptr->data;
1651	<	aconf = map_to_conf(conf);
1652	<
1653	<	if ((name != NULL) && match_esc(name, conf->name))
1654	<	return conf;
1655	<	else if ((host != NULL) && match_esc(host, aconf->host))
1656	<	return conf;
1657	<	}
1658	<	break;
1659	<
1660	<	default:
1661	<	break;
501	>	if (compare(name, conf->name) == 0)
502	>	return conf;
503		}
504	+
505		return NULL;
506		}
507
#	Line 1669 | Line 511 | find_matching_name_conf(ConfType type, c
511		*              - pointer to name string to find
512		*              - pointer to user
513		*              - pointer to host
514	<	* output       - NULL or pointer to found struct MatchItem
514	>	* output       - NULL or pointer to found struct MaskItem
515		* side effects - looks for an exact match on name field
516		*/
517	<	struct ConfItem *
518	<	find_exact_name_conf(ConfType type, const char *name,
519	<	const char *user, const char *host)
520	<	{
1679	<	dlink_node *ptr = NULL;
1680	<	struct AccessItem *aconf;
1681	<	struct ConfItem *conf;
1682	<	struct MatchItem *match_item;
1683	<	dlink_list *list_p;
1684	<
1685	<	list_p = map_to_list(type);
1686	<
1687	<	switch(type)
1688	<	{
1689	<	case RXLINE_TYPE:
1690	<	case XLINE_TYPE:
1691	<	case ULINE_TYPE:
1692	<	case NRESV_TYPE:
517	>	struct MaskItem *
518	>	operator_find(const struct Client *client, const char *name)
519	>	{
520	>	dlink_node *node;
521
522	<	DLINK_FOREACH(ptr, list_p->head)
523	<	{
524	<	conf = ptr->data;
1697	<	match_item = (struct MatchItem *)map_to_conf(conf);
1698	<	if (EmptyString(conf->name))
1699	<	continue;
1700	<
1701	<	if (irccmp(conf->name, name) == 0)
1702	<	{
1703	<	if ((user == NULL && (host == NULL)))
1704	<	return (conf);
1705	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
1706	<	return (conf);
1707	<	if (match(match_item->user, user) && match(match_item->host, host))
1708	<	return (conf);
1709	<	}
1710	<	}
1711	<	break;
522	>	DLINK_FOREACH(node, operator_items.head)
523	>	{
524	>	struct MaskItem *conf = node->data;
525
526	<	case OPER_TYPE:
1714	<	DLINK_FOREACH(ptr, list_p->head)
526	>	if (irccmp(conf->name, name) == 0)
527		{
528	<	conf = ptr->data;
529	<	aconf = (struct AccessItem *)map_to_conf(conf);
1718	<	if (EmptyString(conf->name))
1719	<	continue;
1720	<
1721	<	if (irccmp(conf->name, name) == 0)
1722	<	{
1723	<	if ((user == NULL && (host == NULL)))
1724	<	return (conf);
1725	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
1726	<	return (conf);
1727	<	if (match(aconf->user, user) && match(aconf->host, host))
1728	<	return (conf);
1729	<	}
1730	<	}
1731	<	break;
528	>	if (client == NULL)
529	>	return conf;
530
531	<	case SERVER_TYPE:
532	<	DLINK_FOREACH(ptr, list_p->head)
533	<	{
534	<	conf = ptr->data;
535	<	aconf = (struct AccessItem *)map_to_conf(conf);
1738	<	if (EmptyString(conf->name))
1739	<	continue;
1740	<
1741	<	if (name == NULL)
1742	<	{
1743	<	if (EmptyString(aconf->host))
1744	<	continue;
1745	<	if (irccmp(aconf->host, host) == 0)
1746	<	return(conf);
1747	<	}
1748	<	else if (irccmp(conf->name, name) == 0)
531	>	if (conf->class->max_total &&
532	>	conf->class->max_total <= conf->class->ref_count)
533	>	continue;
534	>
535	>	if (match(conf->user, client->username) == 0)
536		{
537	<	return (conf);
537	>	switch (conf->htype)
538	>	{
539	>	case HM_HOST:
540	>	if (match(conf->host, client->realhost) == 0 ||
541	>	match(conf->host, client->sockhost) == 0 || match(conf->host, client->host) == 0)
542	>	return conf;
543	>	break;
544	>	case HM_IPV6:
545	>	case HM_IPV4:
546	>	if (address_compare(&client->ip, conf->addr, false, false, conf->bits) == true)
547	>	return conf;
548	>	break;
549	>	default:
550	>	assert(0);
551	>	}
552		}
553		}
1753	–	break;
1754	–
1755	–	case CLASS_TYPE:
1756	–	DLINK_FOREACH(ptr, list_p->head)
1757	–	{
1758	–	conf = ptr->data;
1759	–	if (EmptyString(conf->name))
1760	–	continue;
1761	–
1762	–	if (irccmp(conf->name, name) == 0)
1763	–	return (conf);
1764	–	}
1765	–	break;
1766	–
1767	–	default:
1768	–	break;
554		}
1770	–	return(NULL);
1771	–	}
1772	–
1773	–	/* rehash()
1774	–	*
1775	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1776	–	* as a result of an operator issuing this command, else assume it has been
1777	–	* called as a result of the server receiving a HUP signal.
1778	–	*/
1779	–	int
1780	–	rehash(int sig)
1781	–	{
1782	–	if (sig != 0)
1783	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1784	–	"Got signal SIGHUP, reloading ircd.conf file");
1785	–
1786	–	restart_resolver();
555
556	<	/* don't close listeners until we know we can go ahead with the rehash */
1789	<
1790	<	/* Check to see if we magically got(or lost) IPv6 support */
1791	<	check_can_use_v6();
1792	<
1793	<	read_conf_files(0);
1794	<
1795	<	if (ServerInfo.description != NULL)
1796	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1797	<
1798	<	load_conf_modules();
1799	<
1800	<	flush_deleted_I_P();
1801	<
1802	<	rehashed_klines = 1;
1803	<
1804	<	if (ConfigLoggingEntry.use_logging)
1805	<	reopen_log(logFileName);
1806	<
1807	<	return(0);
556	>	return NULL;
557		}
558
559	<	/* set_default_conf()
559	>	/* conf_set_defaults()
560		*
561		* inputs       - NONE
562		* output       - NONE
#	Line 1817 | Line 566 | rehash(int sig)
566		*                of values later, put them in validate_conf().
567		*/
568		static void
569	<	set_default_conf(void)
569	>	conf_set_defaults(void)
570		{
571	<	/* verify init_class() ran, this should be an unnecessary check
572	<	* but its not much work.
571	>	/*
572	>	* Verify init_class() ran, this should be an unnecessary check
573	>	* but it's not much work.
574		*/
575	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
575	>	assert(class_default == class_get_list()->tail->data);
576
577	<	#ifdef HAVE_LIBCRYPTO
578	<	ServerInfo.rsa_private_key = NULL;
579	<	ServerInfo.rsa_private_key_file = NULL;
580	<	#endif
581	<
582	<	/* ServerInfo.name is not rehashable */
1833	<	/* ServerInfo.name = ServerInfo.name; */
1834	<	ServerInfo.description = NULL;
1835	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1836	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1837	<
1838	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1839	<	ServerInfo.specific_ipv4_vhost = 0;
1840	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1841	<	ServerInfo.specific_ipv6_vhost = 0;
1842	<
1843	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1844	<
1845	<	ServerInfo.hub = 0;
1846	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1847	<	ServerInfo.dns_host.sin_port = 0;
1848	<	AdminInfo.name = NULL;
1849	<	AdminInfo.email = NULL;
1850	<	AdminInfo.description = NULL;
1851	<
1852	<	set_log_level(L_NOTICE);
1853	<	ConfigLoggingEntry.use_logging = 1;
1854	<	ConfigLoggingEntry.operlog[0] = '\0';
1855	<	ConfigLoggingEntry.userlog[0] = '\0';
1856	<	ConfigLoggingEntry.klinelog[0] = '\0';
1857	<	ConfigLoggingEntry.glinelog[0] = '\0';
1858	<	ConfigLoggingEntry.killlog[0] = '\0';
1859	<	ConfigLoggingEntry.operspylog[0] = '\0';
1860	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1861	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
577	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
578	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
579	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
580	>	ConfigServerInfo.max_nick_length = 9;
581	>	ConfigServerInfo.max_topic_length = 80;
582	>	ConfigServerInfo.hub = 0;
583
584	+	log_iterate(log_free);
585	+
586	+	ConfigLog.use_logging = 1;
587	+
588	+	ConfigChannel.enable_extbans = 0;
589		ConfigChannel.disable_fake_channels = 0;
590	<	ConfigChannel.restrict_channels = 0;
591	<	ConfigChannel.disable_local_channels = 0;
592	<	ConfigChannel.use_invex = 1;
593	<	ConfigChannel.use_except = 1;
594	<	ConfigChannel.use_knock = 1;
595	<	ConfigChannel.knock_delay = 300;
590	>	ConfigChannel.invite_client_count = 10;
591	>	ConfigChannel.invite_client_time = 300;
592	>	ConfigChannel.invite_delay_channel = 5;
593	>	ConfigChannel.invite_expire_time = 1800;
594	>	ConfigChannel.knock_client_count = 1;
595	>	ConfigChannel.knock_client_time = 300;
596		ConfigChannel.knock_delay_channel = 60;
597	<	ConfigChannel.max_chans_per_user = 15;
598	<	ConfigChannel.quiet_on_ban = 1;
599	<	ConfigChannel.max_bans = 25;
600	<	ConfigChannel.default_split_user_count = 0;
601	<	ConfigChannel.default_split_server_count = 0;
602	<	ConfigChannel.no_join_on_split = 0;
1877	<	ConfigChannel.no_create_on_split = 0;
1878	<	ConfigChannel.burst_topicwho = 1;
597	>	ConfigChannel.max_channels = 25;
598	>	ConfigChannel.max_invites = 20;
599	>	ConfigChannel.max_bans = 100;
600	>	ConfigChannel.max_bans_large = 500;
601	>	ConfigChannel.default_join_flood_count = 18;
602	>	ConfigChannel.default_join_flood_time = 6;
603
604		ConfigServerHide.flatten_links = 0;
605	<	ConfigServerHide.links_delay = 300;
605	>	ConfigServerHide.flatten_links_delay = 300;
606		ConfigServerHide.hidden = 0;
1883	–	ConfigServerHide.disable_hidden = 0;
607		ConfigServerHide.hide_servers = 0;
608	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
608	>	ConfigServerHide.hide_services = 0;
609	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
610		ConfigServerHide.hide_server_ips = 0;
611	+	ConfigServerHide.disable_remote_commands = 0;
612
613	<
614	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
615	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
616	<	ConfigFileEntry.gline_min_cidr = 16;
617	<	ConfigFileEntry.gline_min_cidr6 = 48;
618	<	ConfigFileEntry.invisible_on_connect = 1;
619	<	ConfigFileEntry.burst_away = 0;
620	<	ConfigFileEntry.use_whois_actually = 1;
621	<	ConfigFileEntry.tkline_expire_notices = 1;
622	<	ConfigFileEntry.hide_spoof_ips = 1;
623	<	ConfigFileEntry.ignore_bogus_ts = 0;
624	<	ConfigFileEntry.disable_auth = 0;
625	<	ConfigFileEntry.disable_remote = 0;
626	<	ConfigFileEntry.kill_chase_time_limit = 90;
627	<	ConfigFileEntry.default_floodcount = 8;
628	<	ConfigFileEntry.failed_oper_notice = 1;
629	<	ConfigFileEntry.dots_in_ident = 0;
630	<	ConfigFileEntry.min_nonwildcard = 4;
631	<	ConfigFileEntry.min_nonwildcard_simple = 3;
632	<	ConfigFileEntry.max_accept = 20;
633	<	ConfigFileEntry.anti_nick_flood = 0;
634	<	ConfigFileEntry.max_nick_time = 20;
635	<	ConfigFileEntry.max_nick_changes = 5;
636	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
637	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
638	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
639	<	ConfigFileEntry.kline_with_reason = 1;
640	<	ConfigFileEntry.kline_reason = NULL;
641	<	ConfigFileEntry.warn_no_nline = 1;
642	<	ConfigFileEntry.stats_o_oper_only = 0;
643	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
644	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
645	<	ConfigFileEntry.stats_P_oper_only = 0;
646	<	ConfigFileEntry.caller_id_wait = 60;
647	<	ConfigFileEntry.opers_bypass_callerid = 0;
648	<	ConfigFileEntry.pace_wait = 10;
649	<	ConfigFileEntry.pace_wait_simple = 1;
650	<	ConfigFileEntry.short_motd = 0;
651	<	ConfigFileEntry.ping_cookie = 0;
652	<	ConfigFileEntry.no_oper_flood = 0;
653	<	ConfigFileEntry.true_no_oper_flood = 0;
654	<	ConfigFileEntry.oper_pass_resv = 1;
655	<	ConfigFileEntry.glines = 0;
656	<	ConfigFileEntry.gline_time = 12 * 3600;
657	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
658	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
659	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1935	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1936	<	UMODE_OPERWALL | UMODE_WALLOP;
1937	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1938	<	#ifdef HAVE_LIBCRYPTO
1939	<	/* jdc -- This is our default value for a cipher.  According to the
1940	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1941	<	*        under all circumstances if cryptlinks are enabled.  So,
1942	<	*        this will be our default.
1943	<	*
1944	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1945	<	*              This should be moved into a find_cipher() routine.
1946	<	*/
1947	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1948	<	#endif
1949	<	ConfigFileEntry.use_egd = 0;
1950	<	ConfigFileEntry.egdpool_path = NULL;
1951	<	#ifdef HAVE_LIBZ
1952	<	ConfigFileEntry.compression_level = 0;
1953	<	#endif
1954	<	ConfigFileEntry.throttle_time = 10;
613	>	ConfigGeneral.away_count = 2;
614	>	ConfigGeneral.away_time = 10;
615	>	ConfigGeneral.max_watch = 50;
616	>	ConfigGeneral.whowas_history_length = 15000;
617	>	ConfigGeneral.cycle_on_host_change = 1;
618	>	ConfigGeneral.dline_min_cidr = 16;
619	>	ConfigGeneral.dline_min_cidr6 = 48;
620	>	ConfigGeneral.kline_min_cidr = 16;
621	>	ConfigGeneral.kline_min_cidr6 = 48;
622	>	ConfigGeneral.invisible_on_connect = 1;
623	>	ConfigGeneral.disable_auth = 0;
624	>	ConfigGeneral.kill_chase_time_limit = 90;
625	>	ConfigGeneral.default_floodcount = 8;
626	>	ConfigGeneral.default_floodtime = 1;
627	>	ConfigGeneral.failed_oper_notice = 1;
628	>	ConfigGeneral.dots_in_ident = 0;
629	>	ConfigGeneral.min_nonwildcard = 4;
630	>	ConfigGeneral.min_nonwildcard_simple = 3;
631	>	ConfigGeneral.max_accept = 50;
632	>	ConfigGeneral.anti_nick_flood = 0;
633	>	ConfigGeneral.max_nick_time = 20;
634	>	ConfigGeneral.max_nick_changes = 5;
635	>	ConfigGeneral.anti_spam_exit_message_time = 0;
636	>	ConfigGeneral.ts_warn_delta = 30;
637	>	ConfigGeneral.ts_max_delta = 600;
638	>	ConfigGeneral.warn_no_connect_block = 1;
639	>	ConfigGeneral.stats_e_disabled = 0;
640	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
641	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
642	>	ConfigGeneral.stats_o_oper_only = 1;
643	>	ConfigGeneral.stats_m_oper_only = 1;
644	>	ConfigGeneral.stats_P_oper_only = 0;
645	>	ConfigGeneral.stats_u_oper_only = 0;
646	>	ConfigGeneral.caller_id_wait = 60;
647	>	ConfigGeneral.opers_bypass_callerid = 1;
648	>	ConfigGeneral.pace_wait = 10;
649	>	ConfigGeneral.pace_wait_simple = 1;
650	>	ConfigGeneral.short_motd = 0;
651	>	ConfigGeneral.ping_cookie = 0;
652	>	ConfigGeneral.no_oper_flood = 0;
653	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
654	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
655	>	UMODE_EXTERNAL | UMODE_FLOOD | UMODE_NCHANGE |
656	>	UMODE_SPY | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
657	>	ConfigGeneral.oper_umodes = UMODE_FLOOD | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
658	>	ConfigGeneral.throttle_count = 1;
659	>	ConfigGeneral.throttle_time = 1;
660		}
661
662	<	/* read_conf()
662	>	static void
663	>	conf_validate(void)
664	>	{
665	>	if (EmptyString(ConfigServerInfo.network_name))
666	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
667	>
668	>	if (EmptyString(ConfigServerInfo.network_desc))
669	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
670	>	}
671	>
672	>	/* conf_read()
673		*
674		* inputs       - file descriptor pointing to config file to use
675		* output       - None
676		* side effects - Read configuration file.
677		*/
678		static void
679	<	read_conf(FBFILE *file)
679	>	conf_read(FILE *file)
680		{
681	<	lineno = 0;
681	>	lineno = 1;
682
683	<	set_default_conf(); /* Set default values prior to conf parsing */
683	>	conf_set_defaults();  /* Set default values prior to conf parsing */
684		conf_parser_ctx.pass = 1;
685	<	yyparse();          /* pick up the classes first */
685	>	yyparse();  /* Pick up the classes first */
686
687	<	fbrewind(file);
687	>	rewind(file);
688
689		conf_parser_ctx.pass = 2;
690	<	yyparse();          /* Load the values from the conf */
691	<	validate_conf();    /* Check to make sure some values are still okay. */
692	<	/* Some global values are also loaded here. */
693	<	check_class();      /* Make sure classes are valid */
690	>	yyparse();  /* Load the values from the conf */
691	>	conf_validate();  /* Check to make sure some values are still okay. */
692	>	/* Some global values are also loaded here. */
693	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
694	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
695		}
696
697	<	static void
1982	<	validate_conf(void)
1983	<	{
1984	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1985	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1986	<
1987	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1988	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1989	<
1990	<	if (ConfigFileEntry.servlink_path == NULL)
1991	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1992	<
1993	<	if (ServerInfo.network_name == NULL)
1994	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1995	<
1996	<	if (ServerInfo.network_desc == NULL)
1997	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1998	<
1999	<	if (ConfigFileEntry.service_name == NULL)
2000	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
2001	<
2002	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
2003	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2004	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
2005	<
2006	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
2007	<	}
2008	<
2009	<	/* lookup_confhost()
697	>	/* conf_rehash()
698		*
699	<	* start DNS lookups of all hostnames in the conf
700	<	* line and convert an IP addresses in a.b.c.d number for to IP#s.
699	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
700	>	* as a result of an operator issuing this command, else assume it has been
701	>	* called as a result of the server receiving a HUP signal.
702		*/
703	<	static void
704	<	lookup_confhost(struct ConfItem *conf)
703	>	void
704	>	conf_rehash(bool sig)
705		{
706	<	struct AccessItem *aconf;
2018	<	struct addrinfo hints, *res;
2019	<
2020	<	aconf = map_to_conf(conf);
2021	<
2022	<	if (EmptyString(aconf->host) ||
2023	<	EmptyString(aconf->user))
706	>	if (sig == true)
707		{
708	<	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
709	<	aconf->host, conf->name);
710	<	return;
708	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
709	>	"Got signal SIGHUP, reloading configuration file(s)");
710	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
711		}
712
713	<	if (strchr(aconf->host, '*') ||
2031	<	strchr(aconf->host, '?'))
2032	<	return;
2033	<
2034	<	/* Do name lookup now on hostnames given and store the
2035	<	* ip numbers in conf structure.
2036	<	*/
2037	<	memset(&hints, 0, sizeof(hints));
2038	<
2039	<	hints.ai_family   = AF_UNSPEC;
2040	<	hints.ai_socktype = SOCK_STREAM;
2041	<
2042	<	/* Get us ready for a bind() and don't bother doing dns lookup */
2043	<	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
713	>	restart_resolver();
714
715	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
2046	<	{
2047	<	conf_dns_lookup(aconf);
2048	<	return;
2049	<	}
715	>	/* don't close listeners until we know we can go ahead with the rehash */
716
717	<	assert(res != NULL);
717	>	conf_read_files(false);
718
719	<	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
720	<	aconf->ipnum.ss_len = res->ai_addrlen;
2055	<	aconf->ipnum.ss.ss_family = res->ai_family;
2056	<	freeaddrinfo(res);
719	>	load_conf_modules();
720	>	check_conf_klines();
721		}
722
723		/* conf_connect_allowed()
#	Line 2064 | Line 728 | lookup_confhost(struct ConfItem *conf)
728		* side effects - none
729		*/
730		int
731	<	conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
731	>	conf_connect_allowed(struct irc_ssaddr *addr)
732		{
733	<	struct ip_entry *ip_found;
2070	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
2071	<
2072	<	/* DLINE exempt also gets you out of static limits/pacing... */
2073	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
2074	<	return 0;
733	>	const struct MaskItem *conf = find_dline_conf(addr);
734
735	<	if (aconf != NULL)
2077	<	return BANNED_CLIENT;
2078	<
2079	<	ip_found = find_or_add_ip(addr);
2080	<
2081	<	if ((CurrentTime - ip_found->last_attempt) <
2082	<	ConfigFileEntry.throttle_time)
735	>	if (conf)
736		{
737	<	ip_found->last_attempt = CurrentTime;
738	<	return TOO_FAST;
737	>	/* DLINE exempt also gets you out of static limits/pacing... */
738	>	if (conf->type == CONF_EXEMPT)
739	>	return 0;
740	>	return BANNED_CLIENT;
741		}
742
743	<	ip_found->last_attempt = CurrentTime;
744	<	return 0;
2090	<	}
2091	<
2092	<	static struct AccessItem *
2093	<	find_regexp_kline(const char *uhi[])
2094	<	{
2095	<	#ifdef HAVE_LIBPCRE
2096	<	const dlink_node *ptr = NULL;
2097	<
2098	<	DLINK_FOREACH(ptr, rkconf_items.head)
743	>	struct ip_entry *ip_found = ipcache_record_find_or_add(addr);
744	>	if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
745		{
746	<	struct AccessItem *aptr = map_to_conf(ptr->data);
746	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
747	>	return TOO_FAST;
748
749	<	assert(aptr->regexuser);
2103	<	assert(aptr->regexhost);
2104	<
2105	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2106	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2107	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2108	<	return aptr;
749	>	++ip_found->connection_count;
750		}
751	<	#endif
752	<	return NULL;
2112	<	}
2113	<
2114	<	/* find_kill()
2115	<	*
2116	<	* inputs       - pointer to client structure
2117	<	* output       - pointer to struct AccessItem if found
2118	<	* side effects - See if this user is klined already,
2119	<	*                and if so, return struct AccessItem pointer
2120	<	*/
2121	<	struct AccessItem *
2122	<	find_kill(struct Client *client_p)
2123	<	{
2124	<	struct AccessItem *aconf = NULL;
2125	<	const char *uhi[3];
2126	<
2127	<	uhi[0] = client_p->username;
2128	<	uhi[1] = client_p->host;
2129	<	uhi[2] = client_p->sockhost;
2130	<
2131	<	assert(client_p != NULL);
2132	<
2133	<	aconf = find_kline_conf(client_p->host, client_p->username,
2134	<	&client_p->localClient->ip,
2135	<	client_p->localClient->aftype);
2136	<	if (aconf == NULL)
2137	<	aconf = find_regexp_kline(uhi);
2138	<
2139	<	if (aconf && (aconf->status & CONF_KLINE))
2140	<	return aconf;
2141	<
2142	<	return NULL;
2143	<	}
2144	<
2145	<	struct AccessItem *
2146	<	find_gline(struct Client *client_p)
2147	<	{
2148	<	struct AccessItem *aconf;
2149	<
2150	<	assert(client_p != NULL);
2151	<
2152	<	aconf = find_gline_conf(client_p->host, client_p->username,
2153	<	&client_p->localClient->ip,
2154	<	client_p->localClient->aftype);
2155	<
2156	<	if (aconf && (aconf->status & CONF_GLINE))
2157	<	return aconf;
2158	<
2159	<	return NULL;
2160	<	}
2161	<
2162	<	/* add_temp_line()
2163	<	*
2164	<	* inputs        - pointer to struct ConfItem
2165	<	* output        - none
2166	<	* Side effects  - links in given struct ConfItem into
2167	<	*                 temporary *line link list
2168	<	*/
2169	<	void
2170	<	add_temp_line(struct ConfItem *conf)
2171	<	{
2172	<	struct AccessItem *aconf;
751	>	else
752	>	ip_found->connection_count = 1;
753
754	<	if (conf->type == DLINE_TYPE)
755	<	{
2176	<	aconf = map_to_conf(conf);
2177	<	SetConfTemporary(aconf);
2178	<	dlinkAdd(conf, &conf->node, &temporary_dlines);
2179	<	MyFree(aconf->user);
2180	<	aconf->user = NULL;
2181	<	add_conf_by_address(CONF_DLINE, aconf);
2182	<	}
2183	<	else if (conf->type == KLINE_TYPE)
2184	<	{
2185	<	aconf = map_to_conf(conf);
2186	<	SetConfTemporary(aconf);
2187	<	dlinkAdd(conf, &conf->node, &temporary_klines);
2188	<	add_conf_by_address(CONF_KILL, aconf);
2189	<	}
2190	<	else if (conf->type == GLINE_TYPE)
2191	<	{
2192	<	aconf = map_to_conf(conf);
2193	<	SetConfTemporary(aconf);
2194	<	dlinkAdd(conf, &conf->node, &temporary_glines);
2195	<	add_conf_by_address(CONF_GLINE, aconf);
2196	<	}
2197	<	else if (conf->type == XLINE_TYPE)
2198	<	{
2199	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2200	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2201	<	}
2202	<	else if (conf->type == RXLINE_TYPE)
2203	<	{
2204	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2205	<	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2206	<	}
2207	<	else if (conf->type == RKLINE_TYPE)
2208	<	{
2209	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2210	<	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2211	<	}
2212	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2213	<	{
2214	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2215	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2216	<	}
754	>	ip_found->last_attempt = event_base->time.sec_monotonic;
755	>	return 0;
756		}
757
758		/* cleanup_tklines()
#	Line 2224 | Line 763 | add_temp_line(struct ConfItem *conf)
763		*                This is an event started off in ircd.c
764		*/
765		void
766	<	cleanup_tklines(void *notused)
766	>	cleanup_tklines(void *unused)
767		{
768	<	expire_tklines(&temporary_glines);
769	<	expire_tklines(&temporary_klines);
770	<	expire_tklines(&temporary_dlines);
2232	<	expire_tklines(&temporary_xlines);
2233	<	expire_tklines(&temporary_rxlines);
2234	<	expire_tklines(&temporary_rklines);
2235	<	expire_tklines(&temporary_resv);
2236	<	}
2237	<
2238	<	/* expire_tklines()
2239	<	*
2240	<	* inputs       - tkline list pointer
2241	<	* output       - NONE
2242	<	* side effects - expire tklines
2243	<	*/
2244	<	static void
2245	<	expire_tklines(dlink_list *tklist)
2246	<	{
2247	<	dlink_node *ptr;
2248	<	dlink_node *next_ptr;
2249	<	struct ConfItem *conf;
2250	<	struct MatchItem *xconf;
2251	<	struct MatchItem *nconf;
2252	<	struct AccessItem *aconf;
2253	<	struct ResvChannel *cconf;
2254	<
2255	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2256	<	{
2257	<	conf = ptr->data;
2258	<	if (conf->type == GLINE_TYPE ||
2259	<	conf->type == KLINE_TYPE ||
2260	<	conf->type == DLINE_TYPE)
2261	<	{
2262	<	aconf = (struct AccessItem *)map_to_conf(conf);
2263	<	if (aconf->hold <= CurrentTime)
2264	<	{
2265	<	/* XXX - Do we want GLINE expiry notices?? */
2266	<	/* Alert opers that a TKline expired - Hwy */
2267	<	if (ConfigFileEntry.tkline_expire_notices)
2268	<	{
2269	<	if (aconf->status & CONF_KILL)
2270	<	{
2271	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2272	<	"Temporary K-line for [%s@%s] expired",
2273	<	(aconf->user) ? aconf->user : "*",
2274	<	(aconf->host) ? aconf->host : "*");
2275	<	}
2276	<	else if (conf->type == DLINE_TYPE)
2277	<	{
2278	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2279	<	"Temporary D-line for [%s] expired",
2280	<	(aconf->host) ? aconf->host : "*");
2281	<	}
2282	<	}
2283	<
2284	<	dlinkDelete(ptr, tklist);
2285	<	delete_one_address_conf(aconf->host, aconf);
2286	<	}
2287	<	}
2288	<	else if (conf->type == XLINE_TYPE ||
2289	<	conf->type == RXLINE_TYPE)
2290	<	{
2291	<	xconf = (struct MatchItem *)map_to_conf(conf);
2292	<	if (xconf->hold <= CurrentTime)
2293	<	{
2294	<	if (ConfigFileEntry.tkline_expire_notices)
2295	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2296	<	"Temporary X-line for [%s] %sexpired", conf->name,
2297	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2298	<	dlinkDelete(ptr, tklist);
2299	<	free_dlink_node(ptr);
2300	<	delete_conf_item(conf);
2301	<	}
2302	<	}
2303	<	else if (conf->type == RKLINE_TYPE)
2304	<	{
2305	<	aconf = map_to_conf(conf);
2306	<	if (aconf->hold <= CurrentTime)
2307	<	{
2308	<	if (ConfigFileEntry.tkline_expire_notices)
2309	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2310	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2311	<	(aconf->user) ? aconf->user : "*",
2312	<	(aconf->host) ? aconf->host : "*");
2313	<	dlinkDelete(ptr, tklist);
2314	<	free_dlink_node(ptr);
2315	<	delete_conf_item(conf);
2316	<	}
2317	<	}
2318	<	else if (conf->type == NRESV_TYPE)
2319	<	{
2320	<	nconf = (struct MatchItem *)map_to_conf(conf);
2321	<	if (nconf->hold <= CurrentTime)
2322	<	{
2323	<	if (ConfigFileEntry.tkline_expire_notices)
2324	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2325	<	"Temporary RESV for [%s] expired", conf->name);
2326	<	dlinkDelete(ptr, tklist);
2327	<	free_dlink_node(ptr);
2328	<	delete_conf_item(conf);
2329	<	}
2330	<	}
2331	<	else if (conf->type == CRESV_TYPE)
2332	<	{
2333	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2334	<	if (cconf->hold <= CurrentTime)
2335	<	{
2336	<	if (ConfigFileEntry.tkline_expire_notices)
2337	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2338	<	"Temporary RESV for [%s] expired", cconf->name);
2339	<	delete_channel_resv(cconf);
2340	<	}
2341	<	}
2342	<	}
2343	<	}
2344	<
2345	<	/* oper_privs_as_string()
2346	<	*
2347	<	* inputs        - pointer to client_p
2348	<	* output        - pointer to static string showing oper privs
2349	<	* side effects  - return as string, the oper privs as derived from port
2350	<	*/
2351	<	static const struct oper_privs
2352	<	{
2353	<	const unsigned int oprivs;
2354	<	const unsigned int hidden;
2355	<	const unsigned char c;
2356	<	} flag_list[] = {
2357	<	{ OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
2358	<	{ OPER_FLAG_REMOTEBAN,   0,                       'B' },
2359	<	{ OPER_FLAG_DIE,         0,                       'D' },
2360	<	{ OPER_FLAG_GLINE,       0,                       'G' },
2361	<	{ OPER_FLAG_REHASH,      0,                       'H' },
2362	<	{ OPER_FLAG_K,           0,                       'K' },
2363	<	{ OPER_FLAG_OPERWALL,    0,                       'L' },
2364	<	{ OPER_FLAG_N,           0,                       'N' },
2365	<	{ OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
2366	<	{ OPER_FLAG_REMOTE,      0,                       'R' },
2367	<	{ OPER_FLAG_OPER_SPY,    0,                       'S' },
2368	<	{ OPER_FLAG_UNKLINE,     0,                       'U' },
2369	<	{ OPER_FLAG_X,           0,                       'X' },
2370	<	{ 0, 0, '\0' }
2371	<	};
2372	<
2373	<	char *
2374	<	oper_privs_as_string(const unsigned int port)
2375	<	{
2376	<	static char privs_out[16];
2377	<	char *privs_ptr = privs_out;
2378	<	unsigned int i = 0;
2379	<
2380	<	for (; flag_list[i].oprivs; ++i)
2381	<	{
2382	<	if ((port & flag_list[i].oprivs) &&
2383	<	(port & flag_list[i].hidden) == 0)
2384	<	*privs_ptr++ = flag_list[i].c;
2385	<	else
2386	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
2387	<	}
2388	<
2389	<	*privs_ptr = '\0';
2390	<
2391	<	return privs_out;
768	>	hostmask_expire_temporary();
769	>	gecos_expire();
770	>	resv_expire();
771		}
772
773		/*
774	<	* Input: A client to find the active oper{} name for.
774	>	* Input: A client to find the active operator {} name for.
775		* Output: The nick!user@host{oper} of the oper.
776		*         "oper" is server name for remote opers
777		* Side effects: None.
778		*/
779	<	char *
780	<	get_oper_name(const struct Client *client_p)
779	>	const char *
780	>	get_oper_name(const struct Client *client)
781		{
782	<	dlink_node *cnode;
2404	<	struct ConfItem *conf;
2405	<	struct AccessItem *aconf;
782	>	static char buffer[IRCD_BUFSIZE];
783
784	<	/* +5 for !,@,{,} and null */
785	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
784	>	if (IsServer(client))
785	>	return client->name;
786
787	<	if (MyConnect(client_p))
787	>	if (MyConnect(client))
788		{
789	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
789	>	const dlink_node *const node = client->connection->confs.head;
790	>
791	>	if (node)
792		{
793	<	conf = cnode->data;
2415	<	aconf = map_to_conf(conf);
793	>	const struct MaskItem *const conf = node->data;
794
795	<	if (IsConfOperator(aconf))
795	>	if (conf->type == CONF_OPER)
796		{
797	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
798	<	client_p->username, client_p->host, conf->name);
799	<	return buffer;
797	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
798	>	client->username, client->host, conf->name);
799	>	return buffer;
800		}
801		}
802
803	<	/* Probably should assert here for now. If there is an oper out there
804	<	* with no oper{} conf attached, it would be good for us to know...
803	>	/*
804	>	* Probably should assert here for now. If there is an oper out there
805	>	* with no operator {} conf attached, it would be good for us to know...
806		*/
807	<	assert(0); /* Oper without oper conf! */
807	>	assert(0);  /* Oper without oper conf! */
808		}
809
810	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
811	<	client_p->username, client_p->host, client_p->servptr->name);
810	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
811	>	client->username, client->host, client->servptr->name);
812		return buffer;
813		}
814
815	<	/* read_conf_files()
2437	<	*
2438	<	* inputs       - cold start YES or NO
2439	<	* output       - none
2440	<	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2441	<	*/
2442	<	void
2443	<	read_conf_files(int cold)
2444	<	{
2445	<	const char *filename;
2446	<	char chanmodes[32];
2447	<	char chanlimit[32];
2448	<
2449	<	conf_parser_ctx.boot = cold;
2450	<	filename = get_conf_name(CONF_TYPE);
2451	<
2452	<	/* We need to know the initial filename for the yyerror() to report
2453	<	FIXME: The full path is in conffilenamebuf first time since we
2454	<	dont know anything else
2455	<
2456	<	- Gozem 2002-07-21
2457	<	*/
2458	<	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2459	<
2460	<	if ((conf_parser_ctx.conf_file = fbopen(filename, "r")) == NULL)
2461	<	{
2462	<	if (cold)
2463	<	{
2464	<	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
2465	<	filename, strerror(errno));
2466	<	exit(-1);
2467	<	}
2468	<	else
2469	<	{
2470	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2471	<	"Unable to read configuration file '%s': %s",
2472	<	filename, strerror(errno));
2473	<	return;
2474	<	}
2475	<	}
2476	<
2477	<	if (!cold)
2478	<	clear_out_old_conf();
2479	<
2480	<	read_conf(conf_parser_ctx.conf_file);
2481	<	fbclose(conf_parser_ctx.conf_file);
2482	<
2483	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
2484	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2485	<	ConfigChannel.use_except ? "e" : "",
2486	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2487	<	add_isupport("MAXLIST", chanmodes, -1);
2488	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2489	<
2490	<	if (ConfigChannel.disable_local_channels)
2491	<	add_isupport("CHANTYPES", "#", -1);
2492	<	else
2493	<	add_isupport("CHANTYPES", "#&", -1);
2494	<
2495	<	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2496	<	ConfigChannel.disable_local_channels ? "#" : "#&",
2497	<	ConfigChannel.max_chans_per_user);
2498	<	add_isupport("CHANLIMIT", chanlimit, -1);
2499	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2500	<	ConfigChannel.use_except ? "e" : "",
2501	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2502	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2503	<
2504	<	if (ConfigChannel.use_except)
2505	<	add_isupport("EXCEPTS", "e", -1);
2506	<	if (ConfigChannel.use_invex)
2507	<	add_isupport("INVEX", "I", -1);
2508	<	add_isupport("CHANMODES", chanmodes, -1);
2509	<
2510	<	/*
2511	<	* message_locale may have changed.  rebuild isupport since it relies
2512	<	* on strlen(form_str(RPL_ISUPPORT))
2513	<	*/
2514	<	rebuild_isupport_message_line();
2515	<
2516	<	#ifdef HAVE_LIBPCRE
2517	<	parse_conf_file(RKLINE_TYPE, cold);
2518	<	parse_conf_file(RXLINE_TYPE, cold);
2519	<	#endif
2520	<	parse_conf_file(KLINE_TYPE, cold);
2521	<	parse_conf_file(DLINE_TYPE, cold);
2522	<	parse_conf_file(XLINE_TYPE, cold);
2523	<	parse_conf_file(NRESV_TYPE, cold);
2524	<	parse_conf_file(CRESV_TYPE, cold);
2525	<	}
2526	<
2527	<	/* parse_conf_file()
2528	<	*
2529	<	* inputs       - type of conf file to parse
2530	<	* output       - none
2531	<	* side effects - conf file for givenconf type is opened and read then parsed
2532	<	*/
2533	<	static void
2534	<	parse_conf_file(int type, int cold)
2535	<	{
2536	<	FBFILE *file = NULL;
2537	<	const char *filename = get_conf_name(type);
2538	<
2539	<	if ((file = fbopen(filename, "r")) == NULL)
2540	<	{
2541	<	if (cold)
2542	<	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2543	<	filename, strerror(errno));
2544	<	else
2545	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2546	<	"Unable to read configuration file '%s': %s",
2547	<	filename, strerror(errno));
2548	<	}
2549	<	else
2550	<	{
2551	<	parse_csv_file(file, type);
2552	<	fbclose(file);
2553	<	}
2554	<	}
2555	<
2556	<	/* clear_out_old_conf()
815	>	/* conf_clear()
816		*
817		* inputs       - none
818		* output       - none
819		* side effects - Clear out the old configuration
820		*/
821		static void
822	<	clear_out_old_conf(void)
822	>	conf_clear(void)
823		{
824	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2566	<	struct ConfItem *conf;
2567	<	struct AccessItem *aconf;
2568	<	struct ClassItem *cltmp;
2569	<	struct MatchItem *match_item;
824	>	dlink_node *node = NULL, *node_next = NULL;
825		dlink_list *free_items [] = {
826	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
2572	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
2573	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
826	>	&connect_items, &operator_items, NULL
827		};
828
829		dlink_list ** iterator = free_items; /* C is dumb */
830
831		/* We only need to free anything allocated by yyparse() here.
832	<	* Resetting structs, etc, is taken care of by set_default_conf().
832	>	* Resetting structs, etc, is taken care of by conf_set_defaults().
833		*/
834	<
835	<	for (; *iterator != NULL; iterator++)
834	>
835	>	for (; *iterator; iterator++)
836		{
837	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
837	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
838		{
839	<	conf = ptr->data;
2587	<	/* XXX This is less than pretty */
2588	<	if (conf->type == SERVER_TYPE)
2589	<	{
2590	<	aconf = map_to_conf(conf);
2591	<
2592	<	if (aconf->clients != 0)
2593	<	{
2594	<	SetConfIllegal(aconf);
2595	<	dlinkDelete(&conf->node, &server_items);
2596	<	}
2597	<	else
2598	<	{
2599	<	delete_conf_item(conf);
2600	<	}
2601	<	}
2602	<	else if (conf->type == OPER_TYPE)
2603	<	{
2604	<	aconf = map_to_conf(conf);
2605	<
2606	<	if (aconf->clients != 0)
2607	<	{
2608	<	SetConfIllegal(aconf);
2609	<	dlinkDelete(&conf->node, &oconf_items);
2610	<	}
2611	<	else
2612	<	{
2613	<	delete_conf_item(conf);
2614	<	}
2615	<	}
2616	<	else if (conf->type == CLIENT_TYPE)
2617	<	{
2618	<	aconf = map_to_conf(conf);
839	>	struct MaskItem *conf = node->data;
840
841	<	if (aconf->clients != 0)
842	<	{
2622	<	SetConfIllegal(aconf);
2623	<	}
2624	<	else
2625	<	{
2626	<	delete_conf_item(conf);
2627	<	}
2628	<	}
2629	<	else if (conf->type == XLINE_TYPE  ||
2630	<	conf->type == RXLINE_TYPE ||
2631	<	conf->type == RKLINE_TYPE)
2632	<	{
2633	<	/* temporary (r)xlines are also on
2634	<	* the (r)xconf items list */
2635	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2636	<	continue;
841	>	conf->active = false;
842	>	dlinkDelete(&conf->node, *iterator);
843
844	<	delete_conf_item(conf);
845	<	}
2640	<	else
2641	<	{
2642	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2643	<	{
2644	<	match_item = map_to_conf(conf);
2645	<	if (match_item->ref_count <= 0)
2646	<	delete_conf_item(conf);
2647	<	else
2648	<	{
2649	<	match_item->illegal = 1;
2650	<	dlinkDelete(&conf->node, *iterator);
2651	<	}
2652	<	}
2653	<	else
2654	<	delete_conf_item(conf);
2655	<	}
844	>	if (!conf->ref_count)
845	>	conf_free(conf);
846		}
847		}
848
849		/*
850	<	* don't delete the class table, rather mark all entries
851	<	* for deletion. The table is cleaned up by check_class. - avalon
850	>	* Don't delete the class table, rather mark all entries for deletion.
851	>	* The table is cleaned up by class_delete_marked. - avalon
852		*/
853	<	DLINK_FOREACH(ptr, class_items.head)
2664	<	{
2665	<	cltmp = map_to_conf(ptr->data);
2666	<
2667	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2668	<	cltmp->active = 0;
2669	<	}
853	>	class_mark_for_deletion();
854
855		clear_out_address_conf();
856
857	<	/* clean out module paths */
2674	<	mod_clear_paths();
857	>	modules_conf_clear();  /* Clear modules {} items */
858
859	<	/* clean out ServerInfo */
2677	<	MyFree(ServerInfo.description);
2678	<	ServerInfo.description = NULL;
2679	<	MyFree(ServerInfo.network_name);
2680	<	ServerInfo.network_name = NULL;
2681	<	MyFree(ServerInfo.network_desc);
2682	<	ServerInfo.network_desc = NULL;
2683	<	MyFree(ConfigFileEntry.egdpool_path);
2684	<	ConfigFileEntry.egdpool_path = NULL;
2685	<	#ifdef HAVE_LIBCRYPTO
2686	<	if (ServerInfo.rsa_private_key != NULL)
2687	<	{
2688	<	RSA_free(ServerInfo.rsa_private_key);
2689	<	ServerInfo.rsa_private_key = NULL;
2690	<	}
2691	<
2692	<	MyFree(ServerInfo.rsa_private_key_file);
2693	<	ServerInfo.rsa_private_key_file = NULL;
2694	<	#endif
2695	<
2696	<	/* clean out old resvs from the conf */
2697	<	clear_conf_resv();
2698	<
2699	<	/* clean out AdminInfo */
2700	<	MyFree(AdminInfo.name);
2701	<	AdminInfo.name = NULL;
2702	<	MyFree(AdminInfo.email);
2703	<	AdminInfo.email = NULL;
2704	<	MyFree(AdminInfo.description);
2705	<	AdminInfo.description = NULL;
2706	<
2707	<	/* operator{} and class{} blocks are freed above */
2708	<	/* clean out listeners */
2709	<	close_listeners();
859	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
860
861	<	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
862	<	* exempt{} and gecos{} blocks are freed above too
863	<	*/
861	>	cluster_clear();  /* Clear cluster {} items */
862	>
863	>	gecos_clear();  /* Clear gecos {} items */
864
865	<	/* clean out general */
866	<	MyFree(ConfigFileEntry.service_name);
867	<	ConfigFileEntry.service_name = NULL;
868	<
869	<	MyFree(ConfigFileEntry.servlink_path);
870	<	ConfigFileEntry.servlink_path = NULL;
871	<	#ifdef HAVE_LIBCRYPTO
872	<	ConfigFileEntry.default_cipher_preference = NULL;
873	<	#endif /* HAVE_LIBCRYPTO */
874	<	delete_isupport("INVEX");
875	<	delete_isupport("EXCEPTS");
865	>	resv_clear();  /* Clear resv {} items */
866	>
867	>	service_clear();  /* Clear service {} items */
868	>
869	>	shared_clear();  /* Clear shared {} items */
870	>
871	>	pseudo_clear();  /* Clear pseudo {} items */
872	>
873	>	/* Clean out ConfigServerInfo */
874	>	xfree(ConfigServerInfo.description);
875	>	ConfigServerInfo.description = NULL;
876	>	xfree(ConfigServerInfo.network_name);
877	>	ConfigServerInfo.network_name = NULL;
878	>	xfree(ConfigServerInfo.network_desc);
879	>	ConfigServerInfo.network_desc = NULL;
880	>	xfree(ConfigServerInfo.rsa_private_key_file);
881	>	ConfigServerInfo.rsa_private_key_file = NULL;
882	>	xfree(ConfigServerInfo.tls_certificate_file);
883	>	ConfigServerInfo.tls_certificate_file = NULL;
884	>	xfree(ConfigServerInfo.tls_dh_param_file);
885	>	ConfigServerInfo.tls_dh_param_file = NULL;
886	>	xfree(ConfigServerInfo.tls_supported_groups);
887	>	ConfigServerInfo.tls_supported_groups = NULL;
888	>	xfree(ConfigServerInfo.tls_cipher_list);
889	>	ConfigServerInfo.tls_cipher_list = NULL;
890	>	xfree(ConfigServerInfo.tls_cipher_suites);
891	>	ConfigServerInfo.tls_cipher_suites = NULL;
892	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
893	>	ConfigServerInfo.tls_message_digest_algorithm = NULL;
894	>
895	>	/* Clean out ConfigAdminInfo */
896	>	xfree(ConfigAdminInfo.name);
897	>	ConfigAdminInfo.name = NULL;
898	>	xfree(ConfigAdminInfo.email);
899	>	ConfigAdminInfo.email = NULL;
900	>	xfree(ConfigAdminInfo.description);
901	>	ConfigAdminInfo.description = NULL;
902	>
903	>	/* Clean out ConfigServerHide */
904	>	xfree(ConfigServerHide.flatten_links_file);
905	>	ConfigServerHide.flatten_links_file = NULL;
906	>	xfree(ConfigServerHide.hidden_name);
907	>	ConfigServerHide.hidden_name = NULL;
908	>
909	>	/* Clean out listeners */
910	>	listener_close_marked();
911		}
912
2728	–	/* flush_deleted_I_P()
2729	–	*
2730	–	* inputs       - none
2731	–	* output       - none
2732	–	* side effects - This function removes I/P conf items
2733	–	*/
913		static void
914	<	flush_deleted_I_P(void)
914	>	conf_handle_tls(bool cold)
915		{
916	<	dlink_node *ptr;
2738	<	dlink_node *next_ptr;
2739	<	struct ConfItem *conf;
2740	<	struct AccessItem *aconf;
2741	<	dlink_list * free_items [] = {
2742	<	&server_items, &oconf_items, NULL
2743	<	};
2744	<	dlink_list ** iterator = free_items; /* C is dumb */
2745	<
2746	<	/* flush out deleted I and P lines
2747	<	* although still in use.
2748	<	*/
2749	<	for (; *iterator != NULL; iterator++)
916	>	if (tls_new_credentials() == false)
917		{
918	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
918	>	if (cold == true)
919		{
920	<	conf = ptr->data;
921	<	aconf = (struct AccessItem *)map_to_conf(conf);
2755	<
2756	<	if (IsConfIllegal(aconf))
2757	<	{
2758	<	dlinkDelete(ptr, *iterator);
2759	<
2760	<	if (aconf->clients == 0)
2761	<	delete_conf_item(conf);
2762	<	}
920	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
921	>	exit(EXIT_FAILURE);
922		}
923	<	}
2765	<	}
2766	<
2767	<	/* get_conf_name()
2768	<	*
2769	<	* inputs       - type of conf file to return name of file for
2770	<	* output       - pointer to filename for type of conf
2771	<	* side effects - none
2772	<	*/
2773	<	const char *
2774	<	get_conf_name(ConfType type)
2775	<	{
2776	<	switch (type)
2777	<	{
2778	<	case CONF_TYPE:
2779	<	return ConfigFileEntry.configfile;
2780	<	break;
2781	<	case KLINE_TYPE:
2782	<	return ConfigFileEntry.klinefile;
2783	<	break;
2784	<	case RKLINE_TYPE:
2785	<	return ConfigFileEntry.rklinefile;
2786	<	break;
2787	<	case DLINE_TYPE:
2788	<	return ConfigFileEntry.dlinefile;
2789	<	break;
2790	<	case XLINE_TYPE:
2791	<	return ConfigFileEntry.xlinefile;
2792	<	break;
2793	<	case RXLINE_TYPE:
2794	<	return ConfigFileEntry.rxlinefile;
2795	<	break;
2796	<	case CRESV_TYPE:
2797	<	return ConfigFileEntry.cresvfile;
2798	<	break;
2799	<	case NRESV_TYPE:
2800	<	return ConfigFileEntry.nresvfile;
2801	<	break;
2802	<	case GLINE_TYPE:
2803	<	return ConfigFileEntry.glinefile;
2804	<	break;
2805	<
2806	<	default:
2807	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2808	<	only with the above values, this will cause us to core
2809	<	at some point if this happens so we know where it was */
2810	<	}
2811	<	}
2812	<
2813	<	#define BAD_PING (-1)
2814	<
2815	<	/* get_conf_ping()
2816	<	*
2817	<	* inputs       - pointer to struct AccessItem
2818	<	*              - pointer to a variable that receives ping warning time
2819	<	* output       - ping frequency
2820	<	* side effects - NONE
2821	<	*/
2822	<	static int
2823	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2824	<	{
2825	<	struct ClassItem *aclass;
2826	<	struct AccessItem *aconf;
2827	<
2828	<	if (conf != NULL)
2829	<	{
2830	<	aconf = (struct AccessItem *)map_to_conf(conf);
2831	<	if (aconf->class_ptr != NULL)
923	>	else
924		{
925	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
926	<	*pingwarn = PingWarning(aclass);
927	<	return PingFreq(aclass);
925	>	/* Failed to load new settings/certs, old ones remain active */
926	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
927	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
928		}
929		}
2838	–
2839	–	return BAD_PING;
930		}
931
932	<	/* get_client_class()
932	>	/* read_conf_files()
933		*
934	<	* inputs       - pointer to client struct
935	<	* output       - pointer to name of class
936	<	* side effects - NONE
934	>	* inputs       - cold start YES or NO
935	>	* output       - none
936	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
937		*/
938	<	const char *
939	<	get_client_class(struct Client *target_p)
938	>	void
939	>	conf_read_files(bool cold)
940		{
941	<	dlink_node *ptr;
2852	<	struct ConfItem *conf;
2853	<	struct AccessItem *aconf;
941	>	char buf[IRCD_BUFSIZE];
942
943	<	if (target_p != NULL && !IsMe(target_p) &&
944	<	target_p->localClient->confs.head != NULL)
943	>	conf_parser_ctx.boot = cold;
944	>	conf_parser_ctx.conf_file = fopen(ConfigGeneral.configfile, "r");
945	>
946	>	if (conf_parser_ctx.conf_file == NULL)
947		{
948	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
948	>	if (cold == true)
949		{
950	<	conf = ptr->data;
951	<
952	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2863	<	conf->type == OPER_TYPE)
2864	<	{
2865	<	aconf = (struct AccessItem *) map_to_conf(conf);
2866	<	if (aconf->class_ptr != NULL)
2867	<	return aconf->class_ptr->name;
2868	<	}
950	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
951	>	ConfigGeneral.configfile, strerror(errno));
952	>	exit(EXIT_FAILURE);
953		}
954	<	}
2871	<
2872	<	return "default";
2873	<	}
2874	<
2875	<	/* get_client_ping()
2876	<	*
2877	<	* inputs       - pointer to client struct
2878	<	*              - pointer to a variable that receives ping warning time
2879	<	* output       - ping frequency
2880	<	* side effects - NONE
2881	<	*/
2882	<	int
2883	<	get_client_ping(struct Client *target_p, int *pingwarn)
2884	<	{
2885	<	int ping;
2886	<	struct ConfItem *conf;
2887	<	dlink_node *nlink;
2888	<
2889	<	if (target_p->localClient->confs.head != NULL)
2890	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
954	>	else
955		{
956	<	conf = nlink->data;
957	<
958	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
959	<	(conf->type == OPER_TYPE))
2896	<	{
2897	<	ping = get_conf_ping(conf, pingwarn);
2898	<	if (ping > 0)
2899	<	return ping;
2900	<	}
956	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
957	>	"Unable to read configuration file '%s': %s",
958	>	ConfigGeneral.configfile, strerror(errno));
959	>	return;
960		}
961	+	}
962
963	<	*pingwarn = 0;
964	<	return DEFAULT_PINGFREQUENCY;
965	<	}
963	>	/*
964	>	* We need to know the initial filename for the yyerror() to report
965	>	*
966	>	*  FIXME: The full path is in conffilenamebuf first time since we
967	>	*          don't know anything else
968	>	*
969	>	*  - Gozem 2002-07-21
970	>	*/
971	>	strlcpy(conffilebuf, ConfigGeneral.configfile, sizeof(conffilebuf));
972
973	<	/* find_class()
974	<	*
2909	<	* inputs       - string name of class
2910	<	* output       - corresponding Class pointer
2911	<	* side effects - NONE
2912	<	*/
2913	<	struct ConfItem *
2914	<	find_class(const char *classname)
2915	<	{
2916	<	struct ConfItem *conf;
973	>	if (cold == false)
974	>	conf_clear();
975
976	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
977	<	return conf;
976	>	conf_read(conf_parser_ctx.conf_file);
977	>	fclose(conf_parser_ctx.conf_file);
978
979	<	return class_default;
980	<	}
979	>	log_iterate(log_reopen);
980	>	conf_handle_tls(cold);
981
982	<	/* check_class()
983	<	*
2926	<	* inputs       - NONE
2927	<	* output       - NONE
2928	<	* side effects -
2929	<	*/
2930	<	void
2931	<	check_class(void)
2932	<	{
2933	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2934	<
2935	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2936	<	{
2937	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2938	<
2939	<	if (!aclass->active && !CurrUserCount(aclass))
2940	<	{
2941	<	destroy_cidr_class(aclass);
2942	<	delete_conf_item(ptr->data);
2943	<	}
2944	<	}
2945	<	}
2946	<
2947	<	/* init_class()
2948	<	*
2949	<	* inputs       - NONE
2950	<	* output       - NONE
2951	<	* side effects -
2952	<	*/
2953	<	void
2954	<	init_class(void)
2955	<	{
2956	<	struct ClassItem *aclass;
982	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
983	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
984
985	<	class_default = make_conf_item(CLASS_TYPE);
985	>	snprintf(buf, sizeof(buf), "beI:%u", ConfigChannel.max_bans);
986	>	isupport_add("MAXLIST", buf, -1);
987
988	<	aclass = map_to_conf(class_default);
989	<	aclass->active = 1;
2962	<	DupString(class_default->name, "default");
2963	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2964	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2965	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2966	<	MaxSendq(aclass) = DEFAULT_SENDQ;
988	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
989	>	isupport_add("CHANTYPES", "#", -1);
990
991	<	client_check_cb = register_callback("check_client", check_client);
992	<	}
991	>	snprintf(buf, sizeof(buf), "#:%u", ConfigChannel.max_channels);
992	>	isupport_add("CHANLIMIT", buf, -1);
993
994	<	/* get_sendq()
995	<	*
2973	<	* inputs       - pointer to client
2974	<	* output       - sendq for this client as found from its class
2975	<	* side effects - NONE
2976	<	*/
2977	<	unsigned int
2978	<	get_sendq(struct Client *client_p)
2979	<	{
2980	<	unsigned int sendq = DEFAULT_SENDQ;
2981	<	dlink_node *ptr;
2982	<	struct ConfItem *conf;
2983	<	struct ConfItem *class_conf;
2984	<	struct ClassItem *aclass;
2985	<	struct AccessItem *aconf;
994	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
995	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
996
997	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
998	<	{
2989	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2990	<	{
2991	<	conf = ptr->data;
2992	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2993	<	|| (conf->type == CLIENT_TYPE))
2994	<	{
2995	<	aconf = (struct AccessItem *)map_to_conf(conf);
2996	<	if ((class_conf = aconf->class_ptr) == NULL)
2997	<	continue;
2998	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2999	<	sendq = MaxSendq(aclass);
3000	<	return sendq;
3001	<	}
3002	<	}
3003	<	}
3004	<	/* XXX return a default?
3005	<	* if here, then there wasn't an attached conf with a sendq
3006	<	* that is very bad -Dianora
3007	<	*/
3008	<	return DEFAULT_SENDQ;
997	>	snprintf(buf, sizeof(buf), "%s", "beI,k,l,cimnprstuCKLMNORST");
998	>	isupport_add("CHANMODES", buf, -1);
999		}
1000
1001		/* conf_add_class_to_conf()
1002		*
1003		* inputs       - pointer to config item
1004		* output       - NONE
1005	<	* side effects - Add a class pointer to a conf
1005	>	* side effects - Add a class pointer to a conf
1006		*/
1007		void
1008	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1008	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1009		{
1010	<	struct AccessItem *aconf = map_to_conf(conf);
3021	<	struct ClassItem *class = NULL;
3022	<
3023	<	if (class_name == NULL)
1010	>	if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1011		{
1012	<	aconf->class_ptr = class_default;
3026	<
3027	<	if (conf->type == CLIENT_TYPE)
3028	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3029	<	"Warning *** Defaulting to default class for %s@%s",
3030	<	aconf->user, aconf->host);
3031	<	else
3032	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3033	<	"Warning *** Defaulting to default class for %s",
3034	<	conf->name);
3035	<	}
3036	<	else
3037	<	aconf->class_ptr = find_class(class_name);
1012	>	conf->class = class_default;
1013
1014	<	if (aconf->class_ptr)
1015	<	class = map_to_conf(aconf->class_ptr);
1016	<
1017	<	if (aconf->class_ptr == NULL || !class->active)
3043	<	{
3044	<	if (conf->type == CLIENT_TYPE)
3045	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3046	<	"Warning *** Defaulting to default class for %s@%s",
3047	<	aconf->user, aconf->host);
1014	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1015	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1016	>	"Warning *** Defaulting to default class for %s@%s",
1017	>	conf->user, conf->host);
1018		else
1019	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1020	<	"Warning *** Defaulting to default class for %s",
1021	<	conf->name);
3052	<	aconf->class_ptr = class_default;
1019	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1020	>	"Warning *** Defaulting to default class for %s",
1021	>	conf->name);
1022		}
1023		}
1024
3056	–	/* conf_add_server()
3057	–	*
3058	–	* inputs       - pointer to config item
3059	–	*              - pointer to link count already on this conf
3060	–	* output       - NONE
3061	–	* side effects - Add a connect block
3062	–	*/
3063	–	int
3064	–	conf_add_server(struct ConfItem *conf, const char *class_name)
3065	–	{
3066	–	struct AccessItem *aconf;
3067	–	struct split_nuh_item nuh;
3068	–	char conf_user[USERLEN + 1];
3069	–	char conf_host[HOSTLEN + 1];
3070	–
3071	–	aconf = map_to_conf(conf);
3072	–
3073	–	conf_add_class_to_conf(conf, class_name);
3074	–
3075	–	if (!aconf->host || !conf->name)
3076	–	{
3077	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3078	–	ilog(L_WARN, "Bad connect block");
3079	–	return -1;
3080	–	}
3081	–
3082	–	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
3083	–	{
3084	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3085	–	conf->name);
3086	–	ilog(L_WARN, "Bad connect block, host %s", conf->name);
3087	–	return -1;
3088	–	}
3089	–
3090	–	nuh.nuhmask  = aconf->host;
3091	–	nuh.nickptr  = NULL;
3092	–	nuh.userptr  = conf_user;
3093	–	nuh.hostptr  = conf_host;
3094	–
3095	–	nuh.nicksize = 0;
3096	–	nuh.usersize = sizeof(conf_user);
3097	–	nuh.hostsize = sizeof(conf_host);
3098	–
3099	–	split_nuh(&nuh);
3100	–
3101	–	MyFree(aconf->host);
3102	–	aconf->host = NULL;
3103	–
3104	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3105	–	got lost in H6/7, will have to be re-added */
3106	–	DupString(aconf->host, conf_host);
3107	–
3108	–	lookup_confhost(conf);
3109	–
3110	–	return 0;
3111	–	}
3112	–
1025		/* yyerror()
1026		*
1027		* inputs       - message from parser
#	Line 3119 | Line 1031 | conf_add_server(struct ConfItem *conf, c
1031		void
1032		yyerror(const char *msg)
1033		{
3122	–	char newlinebuf[IRCD_BUFSIZE];
3123	–
1034		if (conf_parser_ctx.pass != 1)
1035		return;
1036
1037	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1038	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1039	<	conffilebuf, lineno + 1, msg, newlinebuf);
1040	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1041	<	conffilebuf, lineno + 1, msg, newlinebuf);
1042	<	}
3133	<
3134	<	int
3135	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
3136	<	{
3137	<	if (fbgets(lbuf, max_size, fb) == NULL)
3138	<	return 0;
3139	<
3140	<	return strlen(lbuf);
1037	>	const char *p = stripws(linebuf);
1038	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1039	>	"\"%s\", line %u: %s: %s",
1040	>	conffilebuf, lineno, msg, p);
1041	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1042	>	conffilebuf, lineno, msg, p);
1043		}
1044
1045	<	int
1046	<	conf_yy_fatal_error(const char *msg)
1045	>	void
1046	>	conf_error_report(const char *msg)
1047		{
1048	<	return 0;
1048	>	const char *p = stripws(linebuf);
1049	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1050	>	"\"%s\", line %u: %s: %s",
1051	>	conffilebuf, lineno, msg, p);
1052	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1053	>	conffilebuf, lineno, msg, p);
1054		}
1055
1056		/*
1057		* valid_tkline()
1058	<	*
1058	>	*
1059		* inputs       - pointer to ascii string to check
1060		*              - whether the specified time is in seconds or minutes
1061		* output       - -1 not enough parameters
#	Line 3156 | Line 1063 | conf_yy_fatal_error(const char *msg)
1063		* side effects - none
1064		* Originally written by Dianora (Diane, db@db.net)
1065		*/
1066	<	time_t
1067	<	valid_tkline(const char *p, int minutes)
1066	>	uintmax_t
1067	>	valid_tkline(const char *data, const int minutes)
1068		{
1069	<	time_t result = 0;
1069	>	const unsigned char *p = (const unsigned char *)data;
1070	>	unsigned char tmpch = '\0';
1071	>	uintmax_t result = 0;
1072
1073	<	for (; *p; ++p)
1073	>	while ((tmpch = *p++))
1074		{
1075	<	if (!IsDigit(*p))
1075	>	if (!IsDigit(tmpch))
1076		return 0;
1077
1078		result *= 10;
1079	<	result += ((*p) & 0xF);
1079	>	result += (tmpch & 0xF);
1080		}
1081
1082		/*
1083	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1084	<	* i.e. they specifically use 0, I am going to return 1 instead
1085	<	* as a return value of non-zero is used to flag it as a temporary kline
1083	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1084	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1085	>	* value of non-zero is used to flag it as a temporary kline
1086		*/
1087		if (result == 0)
1088		result = 1;
1089
1090	<	/*
1090	>	/*
1091		* If the incoming time is in seconds convert it to minutes for the purpose
1092		* of this calculation
1093		*/
1094	<	if (!minutes)
1095	<	result = result / (time_t)60;
1094	>	if (minutes == 0)
1095	>	result = result / 60;
1096
1097		if (result > MAX_TDKLINE_TIME)
1098		result = MAX_TDKLINE_TIME;
1099
1100	<	result = result * (time_t)60;  /* turn it into seconds */
1100	>	result = result * 60;  /* Turn it into seconds */
1101
1102		return result;
1103		}
1104
1105	+	/* valid_wild_card_simple()
1106	+	*
1107	+	* inputs       - data to check for sufficient non-wildcard characters
1108	+	* outputs      - 1 if valid, else 0
1109	+	* side effects - none
1110	+	*/
1111	+	bool
1112	+	valid_wild_card_simple(const char *data)
1113	+	{
1114	+	const unsigned char *p = (const unsigned char *)data;
1115	+	unsigned char tmpch = '\0';
1116	+	unsigned int nonwild = 0, wild = 0;
1117	+
1118	+	while ((tmpch = *p++))
1119	+	{
1120	+	if (tmpch == '\\' && *p)
1121	+	{
1122	+	++p;
1123	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1124	+	return true;
1125	+	}
1126	+	else if (!IsMWildChar(tmpch))
1127	+	{
1128	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1129	+	return true;
1130	+	}
1131	+	else
1132	+	++wild;
1133	+	}
1134	+
1135	+	return wild == 0;
1136	+	}
1137	+
1138		/* valid_wild_card()
1139		*
1140		* input        - pointer to client
1141		*              - int flag, 0 for no warning oper 1 for warning oper
1142		*              - count of following varargs to check
1143		* output       - 0 if not valid, 1 if valid
1144	<	* side effects - NOTICE is given to source_p if warn is 1
1144	>	* side effects - NOTICE is given to client if warn is 1
1145		*/
1146	<	int
1147	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1146	>	bool
1147	>	valid_wild_card(int count, ...)
1148		{
1149	<	char *p;
1150	<	char tmpch;
3209	<	int nonwild = 0;
1149	>	unsigned char tmpch = '\0';
1150	>	unsigned int nonwild = 0;
1151		va_list args;
1152
1153		/*
#	Line 3225 | Line 1166 | valid_wild_card(struct Client *source_p,
1166
1167		while (count--)
1168		{
1169	<	p = va_arg(args, char *);
1169	>	const unsigned char *p = va_arg(args, const unsigned char *);
1170		if (p == NULL)
1171		continue;
1172
#	Line 3237 | Line 1178 | valid_wild_card(struct Client *source_p,
1178		* If we find enough non-wild characters, we can
1179		* break - no point in searching further.
1180		*/
1181	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1182	<	return 1;
1181	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1182	>	{
1183	>	va_end(args);
1184	>	return true;
1185	>	}
1186		}
1187		}
1188		}
1189
1190	<	if (warn)
1191	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
3248	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
3249	<	return 0;
1190	>	va_end(args);
1191	>	return false;
1192		}
1193
1194		/* XXX should this go into a separate file ? -Dianora */
#	Line 3259 | Line 1201 | valid_wild_card(struct Client *source_p,
1201		*              - parse_flags bit map of things to test
1202		*              - pointer to user or string to parse into
1203		*              - pointer to host or NULL to parse into if non NULL
1204	<	*              - pointer to optional tkline time or NULL
1204	>	*              - pointer to optional tkline time or NULL
1205		*              - pointer to target_server to parse into if non NULL
1206		*              - pointer to reason to parse into
1207		*
1208	<	* output       - 1 if valid, -1 if not valid
1208	>	* output       - 1 if valid, 0 if not valid
1209		* side effects - A generalised k/d/x etc. line parser,
1210		*               "ALINE [time] user@host|string [ON] target :reason"
1211		*                will parse returning a parsed user, host if
#	Line 3279 | Line 1221 | valid_wild_card(struct Client *source_p,
1221		*
1222		* - Dianora
1223		*/
1224	<	int
1225	<	parse_aline(const char *cmd, struct Client *source_p,
3284	<	int parc, char **parv,
3285	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
3286	<	char **target_server, char **reason)
1224	>	bool
1225	>	parse_aline(const char *cmd, struct Client *client, int parc, char **parv, struct aline_ctx *aline)
1226		{
1227	<	int found_tkline_time=0;
1228	<	static char def_reason[] = "No Reason";
1229	<	static char user[USERLEN*4+1];
3291	<	static char host[HOSTLEN*4+1];
3292	<
3293	<	parv++;
3294	<	parc--;
1227	>	static char default_reason[] = CONF_NOREASON;
1228	>	static char user[USERLEN * 2 + 1];
1229	>	static char host[HOSTLEN * 2 + 1];
1230
1231	<	found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1231	>	++parv;
1232	>	--parc;
1233
1234	<	if (found_tkline_time != 0)
1234	>	if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1235		{
1236	<	parv++;
1237	<	parc--;
3302	<
3303	<	if (tkline_time != NULL)
3304	<	*tkline_time = found_tkline_time;
3305	<	else
3306	<	{
3307	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3308	<	me.name, source_p->name, cmd);
3309	<	return -1;
3310	<	}
1236	>	++parv;
1237	>	--parc;
1238		}
1239
1240		if (parc == 0)
1241		{
1242	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1243	<	me.name, source_p->name, cmd);
3317	<	return -1;
1242	>	sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1243	>	return false;
1244		}
1245
1246	<	if (h_p == NULL)
1247	<	*up_p = *parv;
1246	>	if (aline->simple_mask == true)
1247	>	{
1248	>	aline->mask = *parv;
1249	>	aline->user = NULL;
1250	>	aline->host = NULL;
1251	>	}
1252		else
1253		{
1254	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
3325	<	return -1;
1254	>	struct split_nuh_item nuh;
1255
1256	<	*up_p = user;
1257	<	*h_p = host;
1256	>	nuh.nuhmask  = *parv;
1257	>	nuh.nickptr  = NULL;
1258	>	nuh.userptr  = user;
1259	>	nuh.hostptr  = host;
1260	>
1261	>	nuh.nicksize = 0;
1262	>	nuh.usersize = sizeof(user);
1263	>	nuh.hostsize = sizeof(host);
1264	>
1265	>	split_nuh(&nuh);
1266	>
1267	>	aline->mask = NULL;
1268	>	aline->user = user;
1269	>	aline->host = host;
1270		}
3330	–
3331	–	parc--;
3332	–	parv++;
1271
1272	<	if (parc != 0)
1272	>	++parv;
1273	>	--parc;
1274	>
1275	>	if (parc)
1276		{
1277		if (irccmp(*parv, "ON") == 0)
1278		{
1279	<	parc--;
1280	<	parv++;
1279	>	++parv;
1280	>	--parc;
1281
1282	<	if (target_server == NULL)
1282	>	if (!HasOFlag(client, OPER_FLAG_REMOTEBAN))
1283		{
1284	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1285	<	me.name, source_p->name, cmd);
3345	<	return -1;
3346	<	}
3347	<
3348	<	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
3349	<	{
3350	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3351	<	me.name, source_p->name, "remoteban");
3352	<	return -1;
1284	>	sendto_one_numeric(client, &me, ERR_NOPRIVS, "remoteban");
1285	>	return false;
1286		}
1287
1288		if (parc == 0 || EmptyString(*parv))
1289		{
1290	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1291	<	me.name, source_p->name, cmd);
3359	<	return -1;
1290	>	sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1291	>	return false;
1292		}
1293
1294	<	*target_server = *parv;
1295	<	parc--;
1296	<	parv++;
1294	>	aline->server = *parv;
1295	>	++parv;
1296	>	--parc;
1297		}
1298		else
1299	<	{
3368	<	/* Make sure target_server *is* NULL if no ON server found
3369	<	* caller probably NULL'd it first, but no harm to do it again -db
3370	<	*/
3371	<	if (target_server != NULL)
3372	<	*target_server = NULL;
3373	<	}
1299	>	aline->server = NULL;
1300		}
1301
1302	<	if (h_p != NULL)
1302	>	if (aline->add == true)
1303		{
1304	<	if (strchr(user, '!') != NULL)
1305	<	{
3380	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3381	<	me.name, source_p->name);
3382	<	return -1;
3383	<	}
3384	<
3385	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
3386	<	return -1;
3387	<	}
3388	<	else
3389	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
3390	<	return -1;
3391	<
3392	<	if (reason != NULL)
3393	<	{
3394	<	if (parc != 0 && !EmptyString(*parv))
3395	<	{
3396	<	*reason = *parv;
3397	<	if (!valid_comment(source_p, *reason, 1))
3398	<	return -1;
3399	<	}
1304	>	if (parc == 0 || EmptyString(*parv))
1305	>	aline->reason = default_reason;
1306		else
1307	<	*reason = def_reason;
3402	<	}
3403	<
3404	<	return 1;
3405	<	}
3406	<
3407	<	/* find_user_host()
3408	<	*
3409	<	* inputs       - pointer to client placing kline
3410	<	*              - pointer to user_host_or_nick
3411	<	*              - pointer to user buffer
3412	<	*              - pointer to host buffer
3413	<	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3414	<	* side effects -
3415	<	*/
3416	<	static int
3417	<	find_user_host(struct Client *source_p, char *user_host_or_nick,
3418	<	char *luser, char *lhost, unsigned int flags)
3419	<	{
3420	<	struct Client *target_p = NULL;
3421	<	char *hostp = NULL;
3422	<
3423	<	if (lhost == NULL)
3424	<	{
3425	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3426	<	return 1;
3427	<	}
3428	<
3429	<	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3430	<	{
3431	<	/* Explicit user@host mask given */
3432	<
3433	<	if (hostp != NULL)                            /* I'm a little user@host */
3434	<	{
3435	<	*(hostp++) = '\0';                       /* short and squat */
3436	<	if (*user_host_or_nick)
3437	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3438	<	else
3439	<	strcpy(luser, "*");
3440	<	if (*hostp)
3441	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3442	<	else
3443	<	strcpy(lhost, "*");
3444	<	}
3445	<	else
3446	<	{
3447	<	luser[0] = '*';             /* no @ found, assume its *@somehost */
3448	<	luser[1] = '\0';
3449	<	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3450	<	}
3451	<
3452	<	return 1;
3453	<	}
3454	<	else if (!(flags & NOUSERLOOKUP))
3455	<	{
3456	<	/* Try to find user@host mask from nick */
3457	<	/* Okay to use source_p as the first param, because source_p == client_p */
3458	<	if ((target_p =
3459	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3460	<	return 0;
3461	<
3462	<	if (IsExemptKline(target_p))
3463	<	{
3464	<	if (!IsServer(source_p))
3465	<	sendto_one(source_p,
3466	<	":%s NOTICE %s :%s is E-lined",
3467	<	me.name, source_p->name, target_p->name);
3468	<	return 0;
3469	<	}
3470	<
3471	<	/*
3472	<	* turn the "user" bit into "*user", blow away '~'
3473	<	* if found in original user name (non-idented)
3474	<	*/
3475	<	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3476	<
3477	<	if (target_p->username[0] == '~')
3478	<	luser[0] = '*';
3479	<
3480	<	if (target_p->sockhost[0] == '\0' ||
3481	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3482	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3483	<	else
3484	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3485	<	return 1;
3486	<	}
3487	<
3488	<	return 0;
3489	<	}
3490	<
3491	<	/* valid_comment()
3492	<	*
3493	<	* inputs       - pointer to client
3494	<	*              - pointer to comment
3495	<	* output       - 0 if no valid comment,
3496	<	*              - 1 if valid
3497	<	* side effects - truncates reason where necessary
3498	<	*/
3499	<	int
3500	<	valid_comment(struct Client *source_p, char *comment, int warn)
3501	<	{
3502	<	if (strchr(comment, '"'))
3503	<	{
3504	<	if (warn)
3505	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3506	<	me.name, source_p->name);
3507	<	return 0;
1307	>	aline->reason = *parv;
1308		}
1309
1310	<	if (strlen(comment) > REASONLEN)
3511	<	comment[REASONLEN-1] = '\0';
3512	<
3513	<	return 1;
1310	>	return true;
1311		}
1312
1313		/* match_conf_password()
#	Line 3520 | Line 1317 | valid_comment(struct Client *source_p, c
1317		* output       - 1 or 0 if match
1318		* side effects - none
1319		*/
1320	<	int
1321	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1320	>	bool
1321	>	match_conf_password(const char *password, const struct MaskItem *conf)
1322		{
1323		const char *encr = NULL;
1324
1325	<	if (password == NULL || aconf->passwd == NULL)
1326	<	return 0;
1325	>	if (EmptyString(password) || EmptyString(conf->passwd))
1326	>	return false;
1327
1328	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1329	<	{
3533	<	/* use first two chars of the password they send in as salt */
3534	<	/* If the password in the conf is MD5, and ircd is linked
3535	<	* to scrypt on FreeBSD, or the standard crypt library on
3536	<	* glibc Linux, then this code will work fine on generating
3537	<	* the proper encrypted hash for comparison.
3538	<	*/
3539	<	if (*aconf->passwd)
3540	<	encr = crypt(password, aconf->passwd);
3541	<	else
3542	<	encr = "";
3543	<	}
1328	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1329	>	encr = crypt(password, conf->passwd);
1330		else
1331		encr = password;
1332
1333	<	return !strcmp(encr, aconf->passwd);
3548	<	}
3549	<
3550	<	/*
3551	<	* cluster_a_line
3552	<	*
3553	<	* inputs       - client sending the cluster
3554	<	*              - command name "KLINE" "XLINE" etc.
3555	<	*              - capab -- CAP_KLN etc. from s_serv.h
3556	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
3557	<	*              - pattern and args to send along
3558	<	* output       - none
3559	<	* side effects - Take source_p send the pattern with args given
3560	<	*                along to all servers that match capab and cluster type
3561	<	*/
3562	<	void
3563	<	cluster_a_line(struct Client *source_p, const char *command,
3564	<	int capab, int cluster_type, const char *pattern, ...)
3565	<	{
3566	<	va_list args;
3567	<	char buffer[IRCD_BUFSIZE];
3568	<	const dlink_node *ptr = NULL;
3569	<
3570	<	va_start(args, pattern);
3571	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
3572	<	va_end(args);
3573	<
3574	<	DLINK_FOREACH(ptr, cluster_items.head)
3575	<	{
3576	<	const struct ConfItem *conf = ptr->data;
3577	<
3578	<	if (conf->flags & cluster_type)
3579	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
3580	<	"%s %s %s", command, conf->name, buffer);
3581	<	}
1333	>	return encr && strcmp(encr, conf->passwd) == 0;
1334		}
1335
1336		/*
#	Line 3616 | Line 1368 | split_nuh(struct split_nuh_item *const i
1368
1369		if (iptr->nickptr)
1370		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1371	+
1372		if (iptr->userptr)
1373		strlcpy(iptr->userptr, "*", iptr->usersize);
1374	+
1375		if (iptr->hostptr)
1376		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1377
#	Line 3625 | Line 1379 | split_nuh(struct split_nuh_item *const i
1379		{
1380		*p = '\0';
1381
1382	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1382	>	if (iptr->nickptr && *iptr->nuhmask)
1383		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1384
1385	<	if ((q = strchr(++p, '@'))) {
1385	>	if ((q = strchr(++p, '@')))
1386	>	{
1387		*q++ = '\0';
1388
1389	<	if (*p != '\0')
1389	>	if (*p)
1390		strlcpy(iptr->userptr, p, iptr->usersize);
1391
1392	<	if (*q != '\0')
1392	>	if (*q)
1393		strlcpy(iptr->hostptr, q, iptr->hostsize);
1394		}
1395		else
1396		{
1397	<	if (*p != '\0')
1397	>	if (*p)
1398		strlcpy(iptr->userptr, p, iptr->usersize);
1399		}
1400		}
#	Line 3651 | Line 1406 | split_nuh(struct split_nuh_item *const i
1406		/* if found a @ */
1407		*p++ = '\0';
1408
1409	<	if (*iptr->nuhmask != '\0')
1409	>	if (*iptr->nuhmask)
1410		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1411
1412	<	if (*p != '\0')
1412	>	if (*p)
1413		strlcpy(iptr->hostptr, p, iptr->hostsize);
1414		}
1415		else
1416		{
1417	<	/* no @ found */
1418	<	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1417	>	/* No @ found */
1418	>	if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1419		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1420		else
1421		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1422		}
1423		}
1424		}
3670	–
3671	–	/*
3672	–	* flags_to_ascii
3673	–	*
3674	–	* inputs       - flags is a bitmask
3675	–	*              - pointer to table of ascii letters corresponding
3676	–	*                to each bit
3677	–	*              - flag 1 for convert ToLower if bit missing
3678	–	*                0 if ignore.
3679	–	* output       - none
3680	–	* side effects - string pointed to by p has bitmap chars written to it
3681	–	*/
3682	–	static void
3683	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3684	–	int lowerit)
3685	–	{
3686	–	unsigned int mask = 1;
3687	–	int i = 0;
3688	–
3689	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3690	–	{
3691	–	if (flags & mask)
3692	–	*p++ = bit_table[i];
3693	–	else if (lowerit)
3694	–	*p++ = ToLower(bit_table[i]);
3695	–	}
3696	–	*p = '\0';
3697	–	}
3698	–
3699	–	/*
3700	–	* cidr_limit_reached
3701	–	*
3702	–	* inputs       - int flag allowing over_rule of limits
3703	–	*              - pointer to the ip to be added
3704	–	*              - pointer to the class
3705	–	* output       - non zero if limit reached
3706	–	*                0 if limit not reached
3707	–	* side effects -
3708	–	*/
3709	–	static int
3710	–	cidr_limit_reached(int over_rule,
3711	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3712	–	{
3713	–	dlink_node *ptr = NULL;
3714	–	struct CidrItem *cidr;
3715	–
3716	–	if (NumberPerCidr(aclass) <= 0)
3717	–	return 0;
3718	–
3719	–	if (ip->ss.ss_family == AF_INET)
3720	–	{
3721	–	if (CidrBitlenIPV4(aclass) <= 0)
3722	–	return 0;
3723	–
3724	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3725	–	{
3726	–	cidr = ptr->data;
3727	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3728	–	{
3729	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3730	–	return -1;
3731	–	cidr->number_on_this_cidr++;
3732	–	return 0;
3733	–	}
3734	–	}
3735	–	cidr = MyMalloc(sizeof(struct CidrItem));
3736	–	cidr->number_on_this_cidr = 1;
3737	–	cidr->mask = *ip;
3738	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3739	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3740	–	}
3741	–	#ifdef IPV6
3742	–	else if (CidrBitlenIPV6(aclass) > 0)
3743	–	{
3744	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3745	–	{
3746	–	cidr = ptr->data;
3747	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3748	–	{
3749	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3750	–	return -1;
3751	–	cidr->number_on_this_cidr++;
3752	–	return 0;
3753	–	}
3754	–	}
3755	–	cidr = MyMalloc(sizeof(struct CidrItem));
3756	–	cidr->number_on_this_cidr = 1;
3757	–	cidr->mask = *ip;
3758	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3759	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3760	–	}
3761	–	#endif
3762	–	return 0;
3763	–	}
3764	–
3765	–	/*
3766	–	* remove_from_cidr_check
3767	–	*
3768	–	* inputs       - pointer to the ip to be removed
3769	–	*              - pointer to the class
3770	–	* output       - NONE
3771	–	* side effects -
3772	–	*/
3773	–	static void
3774	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3775	–	{
3776	–	dlink_node *ptr = NULL;
3777	–	dlink_node *next_ptr = NULL;
3778	–	struct CidrItem *cidr;
3779	–
3780	–	if (NumberPerCidr(aclass) == 0)
3781	–	return;
3782	–
3783	–	if (ip->ss.ss_family == AF_INET)
3784	–	{
3785	–	if (CidrBitlenIPV4(aclass) <= 0)
3786	–	return;
3787	–
3788	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3789	–	{
3790	–	cidr = ptr->data;
3791	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3792	–	{
3793	–	cidr->number_on_this_cidr--;
3794	–	if (cidr->number_on_this_cidr == 0)
3795	–	{
3796	–	dlinkDelete(ptr, &aclass->list_ipv4);
3797	–	MyFree(cidr);
3798	–	return;
3799	–	}
3800	–	}
3801	–	}
3802	–	}
3803	–	#ifdef IPV6
3804	–	else if (CidrBitlenIPV6(aclass) > 0)
3805	–	{
3806	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3807	–	{
3808	–	cidr = ptr->data;
3809	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3810	–	{
3811	–	cidr->number_on_this_cidr--;
3812	–	if (cidr->number_on_this_cidr == 0)
3813	–	{
3814	–	dlinkDelete(ptr, &aclass->list_ipv6);
3815	–	MyFree(cidr);
3816	–	return;
3817	–	}
3818	–	}
3819	–	}
3820	–	}
3821	–	#endif
3822	–	}
3823	–
3824	–	static void
3825	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3826	–	dlink_list *old_list, dlink_list *new_list, int changed)
3827	–	{
3828	–	dlink_node *ptr;
3829	–	struct Client *client_p;
3830	–	struct ConfItem *conf;
3831	–	struct AccessItem *aconf;
3832	–
3833	–	if (!changed)
3834	–	{
3835	–	*new_list = *old_list;
3836	–	old_list->head = old_list->tail = NULL;
3837	–	old_list->length = 0;
3838	–	return;
3839	–	}
3840	–
3841	–	DLINK_FOREACH(ptr, local_client_list.head)
3842	–	{
3843	–	client_p = ptr->data;
3844	–	if (client_p->localClient->aftype != aftype)
3845	–	continue;
3846	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3847	–	continue;
3848	–
3849	–	conf = client_p->localClient->confs.tail->data;
3850	–	if (conf->type == CLIENT_TYPE)
3851	–	{
3852	–	aconf = map_to_conf(conf);
3853	–	if (aconf->class_ptr == oldcl)
3854	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3855	–	}
3856	–	}
3857	–	}
3858	–
3859	–	/*
3860	–	* rebuild_cidr_class
3861	–	*
3862	–	* inputs       - pointer to old conf
3863	–	*              - pointer to new_class
3864	–	* output       - none
3865	–	* side effects - rebuilds the class link list of cidr blocks
3866	–	*/
3867	–	void
3868	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3869	–	{
3870	–	struct ClassItem *old_class = map_to_conf(conf);
3871	–
3872	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3873	–	{
3874	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3875	–	rebuild_cidr_list(AF_INET, conf, new_class,
3876	–	&old_class->list_ipv4, &new_class->list_ipv4,
3877	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3878	–
3879	–	#ifdef IPV6
3880	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3881	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3882	–	&old_class->list_ipv6, &new_class->list_ipv6,
3883	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3884	–	#endif
3885	–	}
3886	–
3887	–	destroy_cidr_class(old_class);
3888	–	}
3889	–
3890	–	/*
3891	–	* destroy_cidr_list
3892	–	*
3893	–	* inputs       - pointer to class dlink list of cidr blocks
3894	–	* output       - none
3895	–	* side effects - completely destroys the class link list of cidr blocks
3896	–	*/
3897	–	static void
3898	–	destroy_cidr_list(dlink_list *list)
3899	–	{
3900	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3901	–
3902	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3903	–	{
3904	–	dlinkDelete(ptr, list);
3905	–	MyFree(ptr->data);
3906	–	}
3907	–	}
3908	–
3909	–	/*
3910	–	* destroy_cidr_class
3911	–	*
3912	–	* inputs       - pointer to class
3913	–	* output       - none
3914	–	* side effects - completely destroys the class link list of cidr blocks
3915	–	*/
3916	–	static void
3917	–	destroy_cidr_class(struct ClassItem *aclass)
3918	–	{
3919	–	destroy_cidr_list(&aclass->list_ipv4);
3920	–	destroy_cidr_list(&aclass->list_ipv6);
3921	–	}

Comparing:
ircd-hybrid-8/src/s_conf.c (property svn:keywords), Revision 1243 by michael, Fri Sep 30 10:47:53 2011 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines