ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_conf.c (file contents), Revision 1119 by michael, Fri Jan 7 22:01:47 2011 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 6956 by michael, Thu Dec 17 10:54:07 2015 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-2015 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"
30	>	#include "conf.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
34	–	#include "common.h"
36		#include "event.h"
36	–	#include "hash.h"
37	–	#include "hook.h"
37		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
38		#include "s_bsd.h"
41	–	#include "irc_getaddrinfo.h"
39		#include "ircd.h"
40		#include "listener.h"
41		#include "hostmask.h"
42		#include "modules.h"
43		#include "numeric.h"
44		#include "fdlist.h"
45	<	#include "s_log.h"
45	>	#include "log.h"
46		#include "send.h"
50	–	#include "s_gline.h"
51	–	#include "fileio.h"
47		#include "memory.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52	<
53	<	struct Callback *client_check_cb = NULL;
54	<	struct config_server_hide ConfigServerHide;
52	>	#include "parse.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58	>	#include "isupport.h"
59	>
60	>
61	>	struct config_channel_entry ConfigChannel;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list server_items  = { NULL, NULL, 0 };
71	<	dlink_list cluster_items = { NULL, NULL, 0 };
72	<	dlink_list hub_items     = { NULL, NULL, 0 };
73	<	dlink_list leaf_items    = { NULL, NULL, 0 };
74	<	dlink_list oconf_items   = { NULL, NULL, 0 };
75	<	dlink_list uconf_items   = { NULL, NULL, 0 };
76	<	dlink_list xconf_items   = { NULL, NULL, 0 };
77	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
70	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
71	<	dlink_list nresv_items   = { NULL, NULL, 0 };
72	<	dlink_list class_items   = { NULL, NULL, 0 };
73	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
74	<
75	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
76	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
79	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
80	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
81	<	dlink_list temporary_resv = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
86	–	extern char yytext[];
82		extern int yyparse(); /* defined in y.tab.c */
83
89	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
90	–
91	–	/* internally defined functions */
92	–	static void lookup_confhost(struct ConfItem *);
93	–	static void set_default_conf(void);
94	–	static void validate_conf(void);
95	–	static void read_conf(FBFILE *);
96	–	static void clear_out_old_conf(void);
97	–	static void flush_deleted_I_P(void);
98	–	static void expire_tklines(dlink_list *);
99	–	static void garbage_collect_ip_entries(void);
100	–	static int hash_ip(struct irc_ssaddr *);
101	–	static int verify_access(struct Client *, const char *);
102	–	static int attach_iline(struct Client *, struct ConfItem *);
103	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
104	–	static void parse_conf_file(int, int);
105	–	static dlink_list *map_to_list(ConfType);
106	–	static struct AccessItem *find_regexp_kline(const char *[]);
107	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
108	–
109	–	/*
110	–	* bit_len
111	–	*/
112	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
113	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
114	–	static void destroy_cidr_class(struct ClassItem *);
115	–
116	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
117	–
118	–	/* address of default class conf */
119	–	static struct ConfItem *class_default;
120	–
121	–	/* usually, with hash tables, you use a prime number...
122	–	* but in this case I am dealing with ip addresses,
123	–	* not ascii strings.
124	–	*/
125	–	#define IP_HASH_SIZE 0x1000
126	–
127	–	struct ip_entry
128	–	{
129	–	struct irc_ssaddr ip;
130	–	int count;
131	–	time_t last_attempt;
132	–	struct ip_entry *next;
133	–	};
134	–
135	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
136	–	static BlockHeap *ip_entry_heap = NULL;
137	–	static int ip_entries_count = 0;
138	–
139	–
140	–	void *
141	–	map_to_conf(struct ConfItem *aconf)
142	–	{
143	–	void *conf;
144	–	conf = (void *)((uintptr_t)aconf +
145	–	(uintptr_t)sizeof(struct ConfItem));
146	–	return(conf);
147	–	}
148	–
149	–	struct ConfItem *
150	–	unmap_conf_item(void *aconf)
151	–	{
152	–	struct ConfItem *conf;
153	–
154	–	conf = (struct ConfItem *)((uintptr_t)aconf -
155	–	(uintptr_t)sizeof(struct ConfItem));
156	–	return(conf);
157	–	}
84
85		/* conf_dns_callback()
86		*
87	<	* inputs       - pointer to struct AccessItem
87	>	* inputs       - pointer to struct MaskItem
88		*              - pointer to DNSReply reply
89		* output       - none
90		* side effects - called when resolver query finishes
#	Line 167 | Line 93 | unmap_conf_item(void *aconf)
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct AccessItem *aconf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100	<	aconf->dns_pending = 0;
100	>	conf->dns_pending = 0;
101
102	<	if (addr != NULL)
103	<	memcpy(&aconf->ipnum, addr, sizeof(aconf->ipnum));
102	>	if (addr)
103	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105	<	aconf->dns_failed = 1;
105	>	conf->dns_failed = 1;
106		}
107
108		/* conf_dns_lookup()
#	Line 186 | Line 112 | conf_dns_callback(void *vptr, const stru
112		* allocate a dns_query and start ns lookup.
113		*/
114		static void
115	<	conf_dns_lookup(struct AccessItem *aconf)
115	>	conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!aconf->dns_pending)
118	<	{
119	<	aconf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
121	<	}
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126		}
127
128	<	/* make_conf_item()
128	>	/* map_to_list()
129		*
130	<	* inputs       - type of item
131	<	* output       - pointer to new conf entry
132	<	* side effects - none
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133		*/
134	<	struct ConfItem *
135	<	make_conf_item(ConfType type)
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136		{
207	–	struct ConfItem *conf = NULL;
208	–	struct AccessItem *aconf = NULL;
209	–	struct ClassItem *aclass = NULL;
210	–	int status = 0;
211	–
137		switch (type)
138		{
139	<	case DLINE_TYPE:
140	<	case EXEMPTDLINE_TYPE:
216	<	case GLINE_TYPE:
217	<	case KLINE_TYPE:
218	<	case CLIENT_TYPE:
219	<	case OPER_TYPE:
220	<	case SERVER_TYPE:
221	<	conf = MyMalloc(sizeof(struct ConfItem) +
222	<	sizeof(struct AccessItem));
223	<	aconf = map_to_conf(conf);
224	<	aconf->aftype = AF_INET;
225	<
226	<	/* Yes, sigh. switch on type again */
227	<	switch (type)
228	<	{
229	<	case EXEMPTDLINE_TYPE:
230	<	status = CONF_EXEMPTDLINE;
139	>	case CONF_XLINE:
140	>	return &gecos_items;
141		break;
142	<
143	<	case DLINE_TYPE:
234	<	status = CONF_DLINE;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144		break;
145	<
146	<	case KLINE_TYPE:
238	<	status = CONF_KLINE;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147		break;
148	<
149	<	case GLINE_TYPE:
242	<	status = CONF_GLINE;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150		break;
151	<
152	<	case CLIENT_TYPE:
246	<	status = CONF_CLIENT;
151	>	case CONF_OPER:
152	>	return &operator_items;
153		break;
154	<
155	<	case OPER_TYPE:
250	<	status = CONF_OPERATOR;
251	<	dlinkAdd(conf, &conf->node, &oconf_items);
154	>	case CONF_SERVER:
155	>	return &server_items;
156		break;
157	<
158	<	case SERVER_TYPE:
255	<	status = CONF_SERVER;
256	<	dlinkAdd(conf, &conf->node, &server_items);
157	>	case CONF_SERVICE:
158	>	return &service_items;
159		break;
160	<
161	<	default:
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162		break;
261	–	}
262	–	aconf->status = status;
263	–	break;
264	–
265	–	case LEAF_TYPE:
266	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
267	–	sizeof(struct MatchItem));
268	–	dlinkAdd(conf, &conf->node, &leaf_items);
269	–	break;
270	–
271	–	case HUB_TYPE:
272	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
273	–	sizeof(struct MatchItem));
274	–	dlinkAdd(conf, &conf->node, &hub_items);
275	–	break;
276	–
277	–	case ULINE_TYPE:
278	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
279	–	sizeof(struct MatchItem));
280	–	dlinkAdd(conf, &conf->node, &uconf_items);
281	–	break;
282	–
283	–	case GDENY_TYPE:
284	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
285	–	sizeof(struct AccessItem));
286	–	dlinkAdd(conf, &conf->node, &gdeny_items);
287	–	break;
288	–
289	–	case XLINE_TYPE:
290	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	–	sizeof(struct MatchItem));
292	–	dlinkAdd(conf, &conf->node, &xconf_items);
293	–	break;
294	–	#ifdef HAVE_LIBPCRE
295	–	case RXLINE_TYPE:
296	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
297	–	sizeof(struct MatchItem));
298	–	dlinkAdd(conf, &conf->node, &rxconf_items);
299	–	break;
300	–
301	–	case RKLINE_TYPE:
302	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
303	–	sizeof(struct AccessItem));
304	–	aconf = map_to_conf(conf);
305	–	aconf->status = CONF_KLINE;
306	–	dlinkAdd(conf, &conf->node, &rkconf_items);
307	–	break;
308	–	#endif
309	–	case CLUSTER_TYPE:
310	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
311	–	dlinkAdd(conf, &conf->node, &cluster_items);
312	–	break;
313	–
314	–	case CRESV_TYPE:
315	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
316	–	sizeof(struct ResvChannel));
317	–	break;
318	–
319	–	case NRESV_TYPE:
320	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
321	–	sizeof(struct MatchItem));
322	–	dlinkAdd(conf, &conf->node, &nresv_items);
323	–	break;
324	–
325	–	case CLASS_TYPE:
326	–	conf = MyMalloc(sizeof(struct ConfItem) +
327	–	sizeof(struct ClassItem));
328	–	dlinkAdd(conf, &conf->node, &class_items);
329	–
330	–	aclass = map_to_conf(conf);
331	–	aclass->active = 1;
332	–	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
333	–	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
334	–	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
335	–	MaxSendq(aclass) = DEFAULT_SENDQ;
336	–
337	–	break;
338	–
339	–	default:
340	–	conf = NULL;
341	–	break;
342	–	}
343	–
344	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
345	–	conf->type = type;
346	–
347	–	return conf;
348	–	}
349	–
350	–	void
351	–	delete_conf_item(struct ConfItem *conf)
352	–	{
353	–	dlink_node *m = NULL;
354	–	struct MatchItem *match_item;
355	–	struct AccessItem *aconf;
356	–	ConfType type = conf->type;
357	–
358	–	MyFree(conf->name);
359	–	conf->name = NULL;
360	–
361	–	switch(type)
362	–	{
363	–	case DLINE_TYPE:
364	–	case EXEMPTDLINE_TYPE:
365	–	case GLINE_TYPE:
366	–	case KLINE_TYPE:
367	–	case CLIENT_TYPE:
368	–	case OPER_TYPE:
369	–	case SERVER_TYPE:
370	–	aconf = map_to_conf(conf);
371	–
372	–	if (aconf->dns_pending)
373	–	delete_resolver_queries(aconf);
374	–	if (aconf->passwd != NULL)
375	–	memset(aconf->passwd, 0, strlen(aconf->passwd));
376	–	if (aconf->spasswd != NULL)
377	–	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
378	–	aconf->class_ptr = NULL;
379	–
380	–	MyFree(aconf->passwd);
381	–	MyFree(aconf->spasswd);
382	–	MyFree(aconf->reason);
383	–	MyFree(aconf->oper_reason);
384	–	MyFree(aconf->user);
385	–	MyFree(aconf->host);
386	–	#ifdef HAVE_LIBCRYPTO
387	–	if (aconf->rsa_public_key)
388	–	RSA_free(aconf->rsa_public_key);
389	–	MyFree(aconf->rsa_public_key_file);
390	–	#endif
391	–
392	–	/* Yes, sigh. switch on type again */
393	–	switch(type)
394	–	{
395	–	case EXEMPTDLINE_TYPE:
396	–	case DLINE_TYPE:
397	–	case GLINE_TYPE:
398	–	case KLINE_TYPE:
399	–	case CLIENT_TYPE:
400	–	MyFree(conf);
401	–	break;
402	–
403	–	case OPER_TYPE:
404	–	aconf = map_to_conf(conf);
405	–	if (!IsConfIllegal(aconf))
406	–	dlinkDelete(&conf->node, &oconf_items);
407	–	MyFree(conf);
408	–	break;
409	–
410	–	case SERVER_TYPE:
411	–	aconf = map_to_conf(conf);
412	–	if (!IsConfIllegal(aconf))
413	–	dlinkDelete(&conf->node, &server_items);
414	–	MyFree(conf);
415	–	break;
416	–
163		default:
164	<	break;
419	<	}
420	<	break;
421	<
422	<	case HUB_TYPE:
423	<	match_item = map_to_conf(conf);
424	<	MyFree(match_item->user);
425	<	MyFree(match_item->host);
426	<	MyFree(match_item->reason);
427	<	MyFree(match_item->oper_reason);
428	<	/* If marked illegal, its already been pulled off of the hub_items list */
429	<	if (!match_item->illegal)
430	<	dlinkDelete(&conf->node, &hub_items);
431	<	MyFree(conf);
432	<	break;
433	<
434	<	case LEAF_TYPE:
435	<	match_item = map_to_conf(conf);
436	<	MyFree(match_item->user);
437	<	MyFree(match_item->host);
438	<	MyFree(match_item->reason);
439	<	MyFree(match_item->oper_reason);
440	<	/* If marked illegal, its already been pulled off of the leaf_items list */
441	<	if (!match_item->illegal)
442	<	dlinkDelete(&conf->node, &leaf_items);
443	<	MyFree(conf);
444	<	break;
445	<
446	<	case ULINE_TYPE:
447	<	match_item = map_to_conf(conf);
448	<	MyFree(match_item->user);
449	<	MyFree(match_item->host);
450	<	MyFree(match_item->reason);
451	<	MyFree(match_item->oper_reason);
452	<	dlinkDelete(&conf->node, &uconf_items);
453	<	MyFree(conf);
454	<	break;
455	<
456	<	case XLINE_TYPE:
457	<	match_item = map_to_conf(conf);
458	<	MyFree(match_item->user);
459	<	MyFree(match_item->host);
460	<	MyFree(match_item->reason);
461	<	MyFree(match_item->oper_reason);
462	<	dlinkDelete(&conf->node, &xconf_items);
463	<	MyFree(conf);
464	<	break;
465	<	#ifdef HAVE_LIBPCRE
466	<	case RKLINE_TYPE:
467	<	aconf = map_to_conf(conf);
468	<	MyFree(aconf->regexuser);
469	<	MyFree(aconf->regexhost);
470	<	MyFree(aconf->user);
471	<	MyFree(aconf->host);
472	<	MyFree(aconf->reason);
473	<	MyFree(aconf->oper_reason);
474	<	dlinkDelete(&conf->node, &rkconf_items);
475	<	MyFree(conf);
476	<	break;
477	<
478	<	case RXLINE_TYPE:
479	<	MyFree(conf->regexpname);
480	<	match_item = map_to_conf(conf);
481	<	MyFree(match_item->user);
482	<	MyFree(match_item->host);
483	<	MyFree(match_item->reason);
484	<	MyFree(match_item->oper_reason);
485	<	dlinkDelete(&conf->node, &rxconf_items);
486	<	MyFree(conf);
487	<	break;
488	<	#endif
489	<	case NRESV_TYPE:
490	<	match_item = map_to_conf(conf);
491	<	MyFree(match_item->user);
492	<	MyFree(match_item->host);
493	<	MyFree(match_item->reason);
494	<	MyFree(match_item->oper_reason);
495	<	dlinkDelete(&conf->node, &nresv_items);
496	<
497	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
498	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
499	<	free_dlink_node(m);
500	<
501	<	MyFree(conf);
502	<	break;
503	<
504	<	case GDENY_TYPE:
505	<	aconf = map_to_conf(conf);
506	<	MyFree(aconf->user);
507	<	MyFree(aconf->host);
508	<	dlinkDelete(&conf->node, &gdeny_items);
509	<	MyFree(conf);
510	<	break;
511	<
512	<	case CLUSTER_TYPE:
513	<	dlinkDelete(&conf->node, &cluster_items);
514	<	MyFree(conf);
515	<	break;
516	<
517	<	case CRESV_TYPE:
518	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
519	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
520	<	free_dlink_node(m);
521	<
522	<	MyFree(conf);
523	<	break;
524	<
525	<	case CLASS_TYPE:
526	<	dlinkDelete(&conf->node, &class_items);
527	<	MyFree(conf);
528	<	break;
529	<
530	<	default:
531	<	break;
164	>	return NULL;
165		}
166		}
167
168	<	/* free_access_item()
169	<	*
537	<	* inputs       - pointer to conf to free
538	<	* output       - none
539	<	* side effects - crucial password fields are zeroed, conf is freed
540	<	*/
541	<	void
542	<	free_access_item(struct AccessItem *aconf)
168	>	struct MaskItem *
169	>	conf_make(enum maskitem_type type)
170		{
171	<	struct ConfItem *conf;
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172	>	dlink_list *list = NULL;
173
174	<	if (aconf == NULL)
175	<	return;
176	<	conf = unmap_conf_item(aconf);
549	<	delete_conf_item(conf);
550	<	}
174	>	conf->type   = type;
175	>	conf->active = 1;
176	>	conf->aftype = AF_INET;
177
178	<	static const unsigned int shared_bit_table[] =
179	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
178	>	if ((list = map_to_list(type)))
179	>	dlinkAdd(conf, &conf->node, list);
180	>	return conf;
181	>	}
182
555	–	/* report_confitem_types()
556	–	*
557	–	* inputs       - pointer to client requesting confitem report
558	–	*              - ConfType to report
559	–	* output       - none
560	–	* side effects -
561	–	*/
183		void
184	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
184	>	conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL;
187	<	struct ConfItem *conf = NULL;
567	<	struct AccessItem *aconf = NULL;
568	<	struct MatchItem *matchitem = NULL;
569	<	struct ClassItem *classitem = NULL;
570	<	char buf[12];
571	<	char *p = NULL;
572	<	const char *pfx = NULL;
573	<
574	<	switch (type)
575	<	{
576	<	case GDENY_TYPE:
577	<	DLINK_FOREACH(ptr, gdeny_items.head)
578	<	{
579	<	conf = ptr->data;
580	<	aconf = map_to_conf(conf);
581	<
582	<	p = buf;
583	<
584	<	if (aconf->flags & GDENY_BLOCK)
585	<	*p++ = 'B';
586	<	else
587	<	*p++ = 'b';
588	<
589	<	if (aconf->flags & GDENY_REJECT)
590	<	*p++ = 'R';
591	<	else
592	<	*p++ = 'r';
186	>	dlink_node *node = NULL, *node_next = NULL;
187	>	dlink_list *list = NULL;
188
189	<	*p = '\0';
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
597	<	me.name, RPL_STATSDEBUG, source_p->name,
598	<	aconf->user, aconf->host, conf->name, buf);
599	<	}
600	<	break;
601	<
602	<	case XLINE_TYPE:
603	<	DLINK_FOREACH(ptr, xconf_items.head)
604	<	{
605	<	conf = ptr->data;
606	<	matchitem = map_to_conf(conf);
607	<
608	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
609	<	me.name, source_p->name,
610	<	matchitem->hold ? "x": "X", matchitem->count,
611	<	conf->name, matchitem->reason);
612	<	}
613	<	break;
614	<
615	<	#ifdef HAVE_LIBPCRE
616	<	case RXLINE_TYPE:
617	<	DLINK_FOREACH(ptr, rxconf_items.head)
618	<	{
619	<	conf = ptr->data;
620	<	matchitem = map_to_conf(conf);
621	<
622	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
623	<	me.name, source_p->name,
624	<	matchitem->hold ? "xR": "XR", matchitem->count,
625	<	conf->name, matchitem->reason);
626	<	}
627	<	break;
628	<
629	<	case RKLINE_TYPE:
630	<	pfx = temp ? "kR" : "KR";
631	<
632	<	DLINK_FOREACH(ptr, rkconf_items.head)
633	<	{
634	<	aconf = map_to_conf((conf = ptr->data));
192	>	MyFree(conf->name);
193
194	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
195	<	continue;
194	>	if (conf->dns_pending)
195	>	delete_resolver_queries(conf);
196	>	if (conf->passwd)
197	>	memset(conf->passwd, 0, strlen(conf->passwd));
198	>	if (conf->spasswd)
199	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
200	>
201	>	conf->class = NULL;
202	>
203	>	MyFree(conf->passwd);
204	>	MyFree(conf->spasswd);
205	>	MyFree(conf->reason);
206	>	MyFree(conf->certfp);
207	>	MyFree(conf->whois);
208	>	MyFree(conf->user);
209	>	MyFree(conf->host);
210	>	#ifdef HAVE_LIBCRYPTO
211	>	MyFree(conf->cipher_list);
212
213	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
214	<	source_p->name, pfx, aconf->host, aconf->user,
641	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
642	<	}
643	<	break;
213	>	if (conf->rsa_public_key)
214	>	RSA_free(conf->rsa_public_key);
215		#endif
216	<
646	<	case ULINE_TYPE:
647	<	DLINK_FOREACH(ptr, uconf_items.head)
648	<	{
649	<	conf = ptr->data;
650	<	matchitem = map_to_conf(conf);
651	<
652	<	p = buf;
653	<
654	<	/* some of these are redundant for the sake of
655	<	* consistency with cluster{} flags
656	<	*/
657	<	*p++ = 'c';
658	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
659	<
660	<	sendto_one(source_p, form_str(RPL_STATSULINE),
661	<	me.name, source_p->name, conf->name,
662	<	matchitem->user?matchitem->user: "*",
663	<	matchitem->host?matchitem->host: "*", buf);
664	<	}
665	<
666	<	DLINK_FOREACH(ptr, cluster_items.head)
667	<	{
668	<	conf = ptr->data;
669	<
670	<	p = buf;
671	<
672	<	*p++ = 'C';
673	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
674	<
675	<	sendto_one(source_p, form_str(RPL_STATSULINE),
676	<	me.name, source_p->name, conf->name,
677	<	"*", "*", buf);
678	<	}
679	<
680	<	break;
681	<
682	<	case OPER_TYPE:
683	<	DLINK_FOREACH(ptr, oconf_items.head)
684	<	{
685	<	conf = ptr->data;
686	<	aconf = map_to_conf(conf);
687	<
688	<	/* Don't allow non opers to see oper privs */
689	<	if (IsOper(source_p))
690	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
691	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
692	<	conf->name, oper_privs_as_string(aconf->port),
693	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
694	<	else
695	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
696	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
697	<	conf->name, "0",
698	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
699	<	}
700	<	break;
701	<
702	<	case CLASS_TYPE:
703	<	DLINK_FOREACH(ptr, class_items.head)
704	<	{
705	<	conf = ptr->data;
706	<	classitem = map_to_conf(conf);
707	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
708	<	me.name, source_p->name, 'Y',
709	<	conf->name, PingFreq(classitem),
710	<	ConFreq(classitem),
711	<	MaxTotal(classitem), MaxSendq(classitem),
712	<	CurrUserCount(classitem),
713	<	classitem->active ? "active" : "disabled");
714	<	}
715	<	break;
716	<
717	<	case CONF_TYPE:
718	<	case CLIENT_TYPE:
719	<	break;
720	<
721	<	case SERVER_TYPE:
722	<	DLINK_FOREACH(ptr, server_items.head)
723	<	{
724	<	p = buf;
725	<
726	<	conf = ptr->data;
727	<	aconf = map_to_conf(conf);
728	<
729	<	buf[0] = '\0';
730	<
731	<	if (IsConfAllowAutoConn(aconf))
732	<	*p++ = 'A';
733	<	if (IsConfCryptLink(aconf))
734	<	*p++ = 'C';
735	<	if (IsConfTopicBurst(aconf))
736	<	*p++ = 'T';
737	<	if (IsConfCompressed(aconf))
738	<	*p++ = 'Z';
739	<	if (buf[0] == '\0')
740	<	*p++ = '*';
741	<
742	<	*p = '\0';
743	<
744	<	/*
745	<	* Allow admins to see actual ips unless hide_server_ips is enabled
746	<	*/
747	<	if (!ConfigServerHide.hide_server_ips && IsAdmin(source_p))
748	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
749	<	me.name, source_p->name, 'C', aconf->host,
750	<	buf, conf->name, aconf->port,
751	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
752	<	else
753	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
754	<	me.name, source_p->name, 'C',
755	<	"*@127.0.0.1", buf, conf->name, aconf->port,
756	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
757	<	}
758	<	break;
759	<
760	<	case HUB_TYPE:
761	<	DLINK_FOREACH(ptr, hub_items.head)
762	<	{
763	<	conf = ptr->data;
764	<	matchitem = map_to_conf(conf);
765	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
766	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
767	<	}
768	<	break;
769	<
770	<	case LEAF_TYPE:
771	<	DLINK_FOREACH(ptr, leaf_items.head)
772	<	{
773	<	conf = ptr->data;
774	<	matchitem = map_to_conf(conf);
775	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
776	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
777	<	}
778	<	break;
779	<
780	<	case GLINE_TYPE:
781	<	case KLINE_TYPE:
782	<	case DLINE_TYPE:
783	<	case EXEMPTDLINE_TYPE:
784	<	case CRESV_TYPE:
785	<	case NRESV_TYPE:
786	<	case CLUSTER_TYPE:
787	<	default:
788	<	break;
789	<	}
790	<	}
791	<
792	<	/* check_client()
793	<	*
794	<	* inputs       - pointer to client
795	<	* output       - 0 = Success
796	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
797	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
798	<	*                I_LINE_FULL       (-3) = I-line is full
799	<	*                TOO_MANY          (-4) = Too many connections from hostname
800	<	*                BANNED_CLIENT     (-5) = K-lined
801	<	* side effects - Ordinary client access check.
802	<	*                Look for conf lines which have the same
803	<	*                status as the flags passed.
804	<	*/
805	<	static void *
806	<	check_client(va_list args)
807	<	{
808	<	struct Client *source_p = va_arg(args, struct Client *);
809	<	const char *username = va_arg(args, const char *);
810	<	int i;
811	<
812	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
813	<	if ((i = verify_access(source_p, username)))
814	<	ilog(L_INFO, "Access denied: %s[%s]",
815	<	source_p->name, source_p->sockhost);
816	<
817	<	switch (i)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	case TOO_MANY:
219	<	sendto_realops_flags(UMODE_FULL, L_ALL,
220	<	"Too many on IP for %s (%s).",
822	<	get_client_name(source_p, SHOW_IP),
823	<	source_p->sockhost);
824	<	ilog(L_INFO,"Too many connections on IP from %s.",
825	<	get_client_name(source_p, SHOW_IP));
826	<	++ServerStats.is_ref;
827	<	exit_client(source_p, &me, "No more connections allowed on that IP");
828	<	break;
829	<
830	<	case I_LINE_FULL:
831	<	sendto_realops_flags(UMODE_FULL, L_ALL,
832	<	"I-line is full for %s (%s).",
833	<	get_client_name(source_p, SHOW_IP),
834	<	source_p->sockhost);
835	<	ilog(L_INFO,"Too many connections from %s.",
836	<	get_client_name(source_p, SHOW_IP));
837	<	++ServerStats.is_ref;
838	<	exit_client(source_p, &me,
839	<	"No more connections allowed in your connection class");
840	<	break;
841	<
842	<	case NOT_AUTHORIZED:
843	<	++ServerStats.is_ref;
844	<	/* jdc - lists server name & port connections are on */
845	<	/*       a purely cosmetical change */
846	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
847	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
848	<	get_client_name(source_p, SHOW_IP),
849	<	source_p->sockhost,
850	<	source_p->localClient->listener->name,
851	<	source_p->localClient->listener->port);
852	<	ilog(L_INFO,
853	<	"Unauthorized client connection from %s on [%s/%u].",
854	<	get_client_name(source_p, SHOW_IP),
855	<	source_p->localClient->listener->name,
856	<	source_p->localClient->listener->port);
857	<
858	<	/* XXX It is prolematical whether it is better to use the
859	<	* capture reject code here or rely on the connecting too fast code.
860	<	* - Dianora
861	<	*/
862	<	if (REJECT_HOLD_TIME > 0)
863	<	{
864	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
865	<	me.name, source_p->name);
866	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
867	<	SetCaptured(source_p);
868	<	}
869	<	else
870	<	exit_client(source_p, &me, "You are not authorized to use this server");
871	<	break;
872	<
873	<	case BANNED_CLIENT:
874	<	/*
875	<	* Don't exit them immediately, play with them a bit.
876	<	* - Dianora
877	<	*/
878	<	if (REJECT_HOLD_TIME > 0)
879	<	{
880	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
881	<	SetCaptured(source_p);
882	<	}
883	<	else
884	<	exit_client(source_p, &me, "Banned");
885	<	++ServerStats.is_ref;
886	<	break;
887	<
888	<	case 0:
889	<	default:
890	<	break;
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	return (i < 0 ? NULL : source_p);
894	<	}
895	<
896	<	/* verify_access()
897	<	*
898	<	* inputs       - pointer to client to verify
899	<	*              - pointer to proposed username
900	<	* output       - 0 if success -'ve if not
901	<	* side effect  - find the first (best) I line to attach.
902	<	*/
903	<	static int
904	<	verify_access(struct Client *client_p, const char *username)
905	<	{
906	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
907	<	struct ConfItem *conf = NULL;
908	<	char non_ident[USERLEN + 1] = { '~', '\0' };
909	<	const char *uhi[3];
910	<
911	<	if (IsGotId(client_p))
912	<	{
913	<	aconf = find_address_conf(client_p->host, client_p->username,
914	<	&client_p->localClient->ip,
915	<	client_p->localClient->aftype,
916	<	client_p->localClient->passwd);
917	<	}
918	<	else
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
226	<	aconf = find_address_conf(client_p->host,non_ident,
227	<	&client_p->localClient->ip,
923	<	client_p->localClient->aftype,
924	<	client_p->localClient->passwd);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
928	<	uhi[1] = client_p->host;
929	<	uhi[2] = client_p->sockhost;
930	<
931	<	rkconf = find_regexp_kline(uhi);
932	<
933	<	if (aconf != NULL)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	if (IsConfClient(aconf) && !rkconf)
936	<	{
937	<	conf = unmap_conf_item(aconf);
938	<
939	<	if (IsConfRedir(aconf))
940	<	{
941	<	sendto_one(client_p, form_str(RPL_REDIR),
942	<	me.name, client_p->name,
943	<	conf->name ? conf->name : "",
944	<	aconf->port);
945	<	return(NOT_AUTHORIZED);
946	<	}
947	<
948	<	if (IsConfDoIdentd(aconf))
949	<	SetNeedId(client_p);
950	<
951	<	/* Thanks for spoof idea amm */
952	<	if (IsConfDoSpoofIp(aconf))
953	<	{
954	<	conf = unmap_conf_item(aconf);
232	>	struct exempt *exptr = node->data;
233
234	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
235	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
236	<	client_p->name, client_p->host, conf->name);
237	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
238	<	SetIPSpoof(client_p);
961	<	}
962	<
963	<	return(attach_iline(client_p, conf));
964	<	}
965	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
966	<	{
967	<	/* XXX */
968	<	aconf = rkconf ? rkconf : aconf;
969	<	if (IsConfGline(aconf))
970	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
971	<	client_p->name);
972	<	if (ConfigFileEntry.kline_with_reason)
973	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
974	<	me.name, client_p->name, aconf->reason);
975	<	return(BANNED_CLIENT);
976	<	}
234	>	dlinkDelete(node, &conf->exempt_list);
235	>	MyFree(exptr->name);
236	>	MyFree(exptr->user);
237	>	MyFree(exptr->host);
238	>	MyFree(exptr);
239		}
240
241	<	return(NOT_AUTHORIZED);
241	>	MyFree(conf);
242		}
243
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
252	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct AccessItem *aconf;
993	<	struct ClassItem *aclass;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257	<	int local = 0, global = 0, ident = 0;
257	>	unsigned int local = 0, global = 0, ident = 0;
258
259	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
1001	<
1002	<	aconf = map_to_conf(conf);
1003	<	if (aconf->class_ptr == NULL)
1004	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263	<	aclass = map_to_conf(aconf->class_ptr);
264	<
1008	<	count_user_host(client_p->username, client_p->host,
1009	<	&global, &local, &ident);
263	>	userhost_count(client_p->username, client_p->host,
264	>	&global, &local, &ident);
265
266		/* XXX blah. go down checking the various silly limits
267		* setting a_limit_reached if any limit is reached.
268		* - Dianora
269		*/
270	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
270	>	if (class->max_total && class->ref_count >= class->max_total)
271		a_limit_reached = 1;
272	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
272	>	else if (class->max_perip && ip_found->count > class->max_perip)
273		a_limit_reached = 1;
274	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
274	>	else if (class->max_local && local >= class->max_local)
275		a_limit_reached = 1;
276	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
276	>	else if (class->max_global && global >= class->max_global)
277		a_limit_reached = 1;
278	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
278	>	else if (class->max_ident && ident >= class->max_ident &&
279		client_p->username[0] != '~')
280		a_limit_reached = 1;
281
282		if (a_limit_reached)
283		{
284	<	if (!IsConfExemptLimits(aconf))
284	>	if (!IsConfExemptLimits(conf))
285		return TOO_MANY;   /* Already at maximum allowed */
286
287	<	sendto_one(client_p,
288	<	":%s NOTICE %s :*** Your connection class is full, "
1034	<	"but you have exceed_limit = yes;", me.name, client_p->name);
287	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	>	"but you have exceed_limit = yes;");
289		}
290
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* init_ip_hash_table()
1041	<	*
1042	<	* inputs               - NONE
1043	<	* output               - NONE
1044	<	* side effects         - allocate memory for ip_entry(s)
1045	<	*                      - clear the ip hash table
1046	<	*/
1047	<	void
1048	<	init_ip_hash_table(void)
1049	<	{
1050	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1051	<	2 * hard_fdlimit);
1052	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1053	<	}
1054	<
1055	<	/* find_or_add_ip()
1056	<	*
1057	<	* inputs       - pointer to struct irc_ssaddr
1058	<	* output       - pointer to a struct ip_entry
1059	<	* side effects -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	struct ip_entry *ptr, *newptr;
1068	<	int hash_index = hash_ip(ip_in), res;
1069	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1070	<	#ifdef IPV6
1071	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1072	<	#endif
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	if (ip_in->ss.ss_family == AF_INET6)
1080	<	{
1081	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1082	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1083	<	}
1084	<	else
1085	<	#endif
1086	<	{
1087	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1088	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1089	<	}
1090	<	if (res == 0)
1091	<	{
1092	<	/* Found entry already in hash, return it. */
1093	<	return ptr;
1094	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
318	<
319	<	newptr = BlockHeapAlloc(ip_entry_heap);
320	<	ip_entries_count++;
321	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	newptr->next = ip_hash_table[hash_index];
324	<	ip_hash_table[hash_index] = newptr;
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	return newptr;
1108	<	}
1109	<
1110	<	/* remove_one_ip()
1111	<	*
1112	<	* inputs        - unsigned long IP address value
1113	<	* output        - NONE
1114	<	* side effects  - The ip address given, is looked up in ip hash table
1115	<	*                 and number of ip#'s for that ip decremented.
1116	<	*                 If ip # count reaches 0 and has expired,
1117	<	*                 the struct ip_entry is returned to the ip_entry_heap
1118	<	*/
1119	<	void
1120	<	remove_one_ip(struct irc_ssaddr *ip_in)
1121	<	{
1122	<	struct ip_entry *ptr;
1123	<	struct ip_entry *last_ptr = NULL;
1124	<	int hash_index = hash_ip(ip_in), res;
1125	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1126	<	#ifdef IPV6
1127	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1128	<	#endif
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#ifdef IPV6
1133	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1134	<	continue;
1135	<	if (ip_in->ss.ss_family == AF_INET6)
1136	<	{
1137	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1138	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1139	<	}
1140	<	else
1141	<	#endif
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
1148	<	if (ptr->count > 0)
1149	<	ptr->count--;
1150	<	if (ptr->count == 0 &&
1151	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
1156	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	BlockHeapFree(ip_entry_heap, ptr);
1159	<	ip_entries_count--;
1160	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
1162	–	last_ptr = ptr;
1163	–	}
1164	–	}
1165	–
1166	–	/* hash_ip()
1167	–	*
1168	–	* input        - pointer to an irc_inaddr
1169	–	* output       - integer value used as index into hash table
1170	–	* side effects - hopefully, none
1171	–	*/
1172	–	static int
1173	–	hash_ip(struct irc_ssaddr *addr)
1174	–	{
1175	–	if (addr->ss.ss_family == AF_INET)
1176	–	{
1177	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1178	–	int hash;
1179	–	uint32_t ip;
346
347	<	ip   = ntohl(v4->sin_addr.s_addr);
1182	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1183	<	return hash;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#ifdef IPV6
350	<	else
351	<	{
1188	<	int hash;
1189	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1190	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1191	<
1192	<	hash  = ip[0] ^ ip[3];
1193	<	hash ^= hash >> 16;
1194	<	hash ^= hash >> 8;
1195	<	hash  = hash & (IP_HASH_SIZE - 1);
1196	<	return hash;
1197	<	}
1198	<	#else
1199	<	return 0;
1200	<	#endif
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* count_ip_hash()
1204	<	*
1205	<	* inputs        - pointer to counter of number of ips hashed
1206	<	*               - pointer to memory used for ip hash
1207	<	* output        - returned via pointers input
1208	<	* side effects  - NONE
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
1216	–	struct ip_entry *ptr;
370		int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (i = 0; i < IP_HASH_SIZE; i++)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
1242	<	struct ip_entry *last_ptr;
1243	<	struct ip_entry *next_ptr;
1244	<	int i;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (i = 0; i < IP_HASH_SIZE; i++)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	BlockHeapFree(ip_entry_heap, ptr);
1262	<	ip_entries_count--;
1263	<	}
1264	<	else
1265	<	last_ptr = ptr;
1266	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 1275 | Line 436 | garbage_collect_ip_entries(void)
436		* side effects - Disassociate configuration from the client.
437		*                Also removes a class from the list if marked for deleting.
438		*/
439	<	int
440	<	detach_conf(struct Client *client_p, ConfType type)
439	>	void
440	>	detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr, *next_ptr;
1282	<	struct ConfItem *conf;
1283	<	struct ClassItem *aclass;
1284	<	struct AccessItem *aconf;
1285	<	struct ConfItem *aclass_conf;
1286	<	struct MatchItem *match_item;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	conf = ptr->data;
1291	<
1292	<	if (type == CONF_TYPE || conf->type == type)
1293	<	{
1294	<	dlinkDelete(ptr, &client_p->localClient->confs);
1295	<	free_dlink_node(ptr);
1296	<
1297	<	switch (conf->type)
1298	<	{
1299	<	case CLIENT_TYPE:
1300	<	case OPER_TYPE:
1301	<	case SERVER_TYPE:
1302	<	aconf = map_to_conf(conf);
446	>	struct MaskItem *conf = node->data;
447
448	<	assert(aconf->clients > 0);
449	<
450	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1307	<	{
1308	<	aclass = map_to_conf(aclass_conf);
1309	<
1310	<	assert(aclass->curr_user_count > 0);
1311	<
1312	<	if (conf->type == CLIENT_TYPE)
1313	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1314	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1315	<	delete_conf_item(aclass_conf);
1316	<	}
448	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449	>	assert(conf->ref_count > 0);
450	>	assert(conf->class->ref_count > 0);
451
452	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
453	<	delete_conf_item(conf);
452	>	if (!(conf->type & type))
453	>	continue;
454
455	<	break;
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458	<	case LEAF_TYPE:
459	<	case HUB_TYPE:
1325	<	match_item = map_to_conf(conf);
1326	<	if (match_item->ref_count == 0 && match_item->illegal)
1327	<	delete_conf_item(conf);
1328	<	break;
1329	<	default:
1330	<	break;
1331	<	}
458	>	if (conf->type == CONF_CLIENT)
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461	<	if (type != CONF_TYPE)
462	<	return 0;
461	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
462	>	{
463	>	class_free(conf->class);
464	>	conf->class = NULL;
465		}
1336	–	}
466
467	<	return -1;
467	>	if (--conf->ref_count == 0 && conf->active == 0)
468	>	conf_free(conf);
469	>	}
470		}
471
472		/* attach_conf()
#	Line 1349 | Line 480 | detach_conf(struct Client *client_p, Con
480		*                attachment if there was an old one...
481		*/
482		int
483	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
483	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488	<	if (conf->type == CLIENT_TYPE ||
489	<	conf->type == SERVER_TYPE ||
490	<	conf->type == OPER_TYPE)
491	<	{
1361	<	struct AccessItem *aconf = map_to_conf(conf);
1362	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1363	<
1364	<	if (IsConfIllegal(aconf))
1365	<	return NOT_AUTHORIZED;
1366	<
1367	<	if (conf->type == CLIENT_TYPE)
1368	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1369	<	&client_p->localClient->ip, aclass))
1370	<	return TOO_MANY;    /* Already at maximum allowed */
488	>	if (conf->type == CONF_CLIENT)
489	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
490	>	&client_p->connection->ip, conf->class))
491	>	return TOO_MANY;    /* Already at maximum allowed */
492
493	<	CurrUserCount(aclass)++;
494	<	aconf->clients++;
1374	<	}
1375	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1376	<	{
1377	<	struct MatchItem *match_item = map_to_conf(conf);
1378	<	match_item->ref_count++;
1379	<	}
493	>	conf->class->ref_count++;
494	>	conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 1395 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
1399	<	struct ConfItem *conf;
1400	<	struct AccessItem *aconf;
1401	<
1402	<	assert(client_p != NULL);
1403	<	assert(host != NULL);
513	>	dlink_node *node = NULL;
514
515	<	if (client_p == NULL || host == NULL)
1406	<	return 0;
515	>	assert(host);
516
517	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
1411	<	aconf = map_to_conf(conf);
519	>	struct MaskItem *conf = node->data;
520
521	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
521	>	if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
529		}
530
1423	–	/* find_conf_exact()
1424	–	*
1425	–	* inputs       - type of ConfItem
1426	–	*              - pointer to name to find
1427	–	*              - pointer to username to find
1428	–	*              - pointer to host to find
1429	–	* output       - NULL or pointer to conf found
1430	–	* side effects - find a conf entry which matches the hostname
1431	–	*                and has the same name.
1432	–	*/
1433	–	struct ConfItem *
1434	–	find_conf_exact(ConfType type, const char *name, const char *user,
1435	–	const char *host)
1436	–	{
1437	–	dlink_node *ptr;
1438	–	dlink_list *list_p;
1439	–	struct ConfItem *conf = NULL;
1440	–	struct AccessItem *aconf;
1441	–
1442	–	/* Only valid for OPER_TYPE and ...? */
1443	–	list_p = map_to_list(type);
1444	–
1445	–	DLINK_FOREACH(ptr, (*list_p).head)
1446	–	{
1447	–	conf = ptr->data;
1448	–
1449	–	if (conf->name == NULL)
1450	–	continue;
1451	–	aconf = map_to_conf(conf);
1452	–	if (aconf->host == NULL)
1453	–	continue;
1454	–	if (irccmp(conf->name, name) != 0)
1455	–	continue;
1456	–
1457	–	/*
1458	–	** Accept if the *real* hostname (usually sockethost)
1459	–	** socket host) matches *either* host or name field
1460	–	** of the configuration.
1461	–	*/
1462	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1463	–	continue;
1464	–	if (type == OPER_TYPE)
1465	–	{
1466	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1467	–
1468	–	if (aconf->clients >= MaxTotal(aclass))
1469	–	continue;
1470	–	}
1471	–
1472	–	return conf;
1473	–	}
1474	–
1475	–	return NULL;
1476	–	}
1477	–
531		/* find_conf_name()
532		*
533		* inputs       - pointer to conf link list to search
#	Line 1484 | Line 537 | find_conf_exact(ConfType type, const cha
537		* side effects - find a conf entry which matches the name
538		*                and has the given mask.
539		*/
540	<	struct ConfItem *
541	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
540	>	struct MaskItem *
541	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
1491	<	struct ConfItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
548	<
547	>	struct MaskItem *conf = node->data;
548	>
549		if (conf->type == type)
550		{
551	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
552	<	match(conf->name, name)))
1501	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
1508	–	/* map_to_list()
1509	–	*
1510	–	* inputs       - ConfType conf
1511	–	* output       - pointer to dlink_list to use
1512	–	* side effects - none
1513	–	*/
1514	–	static dlink_list *
1515	–	map_to_list(ConfType type)
1516	–	{
1517	–	switch(type)
1518	–	{
1519	–	case RXLINE_TYPE:
1520	–	return(&rxconf_items);
1521	–	break;
1522	–	case XLINE_TYPE:
1523	–	return(&xconf_items);
1524	–	break;
1525	–	case ULINE_TYPE:
1526	–	return(&uconf_items);
1527	–	break;
1528	–	case NRESV_TYPE:
1529	–	return(&nresv_items);
1530	–	break;
1531	–	case OPER_TYPE:
1532	–	return(&oconf_items);
1533	–	break;
1534	–	case CLASS_TYPE:
1535	–	return(&class_items);
1536	–	break;
1537	–	case SERVER_TYPE:
1538	–	return(&server_items);
1539	–	break;
1540	–	case CLUSTER_TYPE:
1541	–	return(&cluster_items);
1542	–	break;
1543	–	case CONF_TYPE:
1544	–	case GLINE_TYPE:
1545	–	case KLINE_TYPE:
1546	–	case DLINE_TYPE:
1547	–	case CRESV_TYPE:
1548	–	default:
1549	–	return NULL;
1550	–	}
1551	–	}
1552	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
562		*              - pointer to name string to find
563		*              - pointer to user
564		*              - pointer to host
565	<	*              - optional action to match on as well
566	<	* output       - NULL or pointer to found struct MatchItem
565	>	*              - optional flags to match on as well
566	>	* output       - NULL or pointer to found struct MaskItem
567		* side effects - looks for a match on name field
568		*/
569	<	struct ConfItem *
570	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
571	<	const char *host, int action)
572	<	{
573	<	dlink_node *ptr=NULL;
574	<	struct ConfItem *conf=NULL;
575	<	struct AccessItem *aconf=NULL;
1570	<	struct MatchItem *match_item=NULL;
1571	<	dlink_list *list_p = map_to_list(type);
569	>	struct MaskItem *
570	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571	>	const char *host, unsigned int flags)
572	>	{
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579	<	#ifdef HAVE_LIBPCRE
580	<	case RXLINE_TYPE:
581	<	DLINK_FOREACH(ptr, list_p->head)
582	<	{
1579	<	conf = ptr->data;
1580	<	assert(conf->regexpname);
579	>	case CONF_SERVICE:
580	>	DLINK_FOREACH(node, list->head)
581	>	{
582	>	conf = node->data;
583
584	<	if (!ircd_pcre_exec(conf->regexpname, name))
585	<	return conf;
586	<	}
587	<	break;
588	<	#endif
589	<	case XLINE_TYPE:
590	<	case ULINE_TYPE:
591	<	case NRESV_TYPE:
592	<	DLINK_FOREACH(ptr, list_p->head)
584	>	if (EmptyString(conf->name))
585	>	continue;
586	>	if (name && !irccmp(name, conf->name))
587	>	return conf;
588	>	}
589	>	break;
590	>
591	>	case CONF_XLINE:
592	>	case CONF_SHARED:
593	>	case CONF_NRESV:
594	>	case CONF_CRESV:
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
1594	–	match_item = map_to_conf(conf);
599		if (EmptyString(conf->name))
600	<	continue;
601	<	if ((name != NULL) && match_esc(conf->name, name))
600	>	continue;
601	>	if (name && !match(conf->name, name))
602		{
603	<	if ((user == NULL && (host == NULL)))
604	<	return conf;
605	<	if ((match_item->action & action) != action)
603	>	if ((user == NULL && (host == NULL)))
604	>	return conf;
605	>	if ((conf->flags & flags) != flags)
606		continue;
607	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
608	<	return conf;
609	<	if (match(match_item->user, user) && match(match_item->host, host))
610	<	return conf;
607	>	if (EmptyString(conf->user) || EmptyString(conf->host))
608	>	return conf;
609	>	if (!match(conf->user, user) && !match(conf->host, host))
610	>	return conf;
611		}
612		}
613		break;
614
615	<	case SERVER_TYPE:
616	<	DLINK_FOREACH(ptr, list_p->head)
615	>	case CONF_SERVER:
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
1615	<	aconf = map_to_conf(conf);
618	>	conf = node->data;
619
620	<	if ((name != NULL) && match_esc(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && match_esc(host, aconf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
626	<
626	>
627		default:
628		break;
629		}
#	Line 1633 | Line 636 | find_matching_name_conf(ConfType type, c
636		*              - pointer to name string to find
637		*              - pointer to user
638		*              - pointer to host
639	<	* output       - NULL or pointer to found struct MatchItem
639	>	* output       - NULL or pointer to found struct MaskItem
640		* side effects - looks for an exact match on name field
641		*/
642	<	struct ConfItem *
643	<	find_exact_name_conf(ConfType type, const char *name,
642	>	struct MaskItem *
643	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct AccessItem *aconf;
648	<	struct ConfItem *conf;
1646	<	struct MatchItem *match_item;
1647	<	dlink_list *list_p;
1648	<
1649	<	list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
652	<	case RXLINE_TYPE:
653	<	case XLINE_TYPE:
654	<	case ULINE_TYPE:
655	<	case NRESV_TYPE:
652	>	case CONF_XLINE:
653	>	case CONF_SHARED:
654	>	case CONF_NRESV:
655	>	case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
660	<	match_item = (struct MatchItem *)map_to_conf(conf);
659	>	conf = node->data;
660	>
661		if (EmptyString(conf->name))
662	<	continue;
663	<
662	>	continue;
663	>
664		if (irccmp(conf->name, name) == 0)
665		{
666	<	if ((user == NULL && (host == NULL)))
667	<	return (conf);
668	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
669	<	return (conf);
670	<	if (match(match_item->user, user) && match(match_item->host, host))
671	<	return (conf);
666	>	if ((user == NULL && (host == NULL)))
667	>	return conf;
668	>	if (EmptyString(conf->user) || EmptyString(conf->host))
669	>	return conf;
670	>	if (!match(conf->user, user) && !match(conf->host, host))
671	>	return conf;
672		}
673		}
674		break;
675
676	<	case OPER_TYPE:
677	<	DLINK_FOREACH(ptr, list_p->head)
676	>	case CONF_OPER:
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
680	<	aconf = (struct AccessItem *)map_to_conf(conf);
679	>	conf = node->data;
680	>
681		if (EmptyString(conf->name))
682	<	continue;
683	<
684	<	if (irccmp(conf->name, name) == 0)
682	>	continue;
683	>
684	>	if (!irccmp(conf->name, name))
685		{
686	<	if ((user == NULL && (host == NULL)))
687	<	return (conf);
688	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
689	<	return (conf);
690	<	if (match(aconf->user, user) && match(aconf->host, host))
691	<	return (conf);
686	>	if (!who)
687	>	return conf;
688	>	if (EmptyString(conf->user) || EmptyString(conf->host))
689	>	return NULL;
690	>	if (!match(conf->user, who->username))
691	>	{
692	>	switch (conf->htype)
693	>	{
694	>	case HM_HOST:
695	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
696	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
697	>	return conf;
698	>	break;
699	>	case HM_IPV4:
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703	>	return conf;
704	>	break;
705	>	case HM_IPV6:
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709	>	return conf;
710	>	break;
711	>	default:
712	>	assert(0);
713	>	}
714	>	}
715		}
716		}
717	+
718		break;
719
720	<	case SERVER_TYPE:
721	<	DLINK_FOREACH(ptr, list_p->head)
720	>	case CONF_SERVER:
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
724	<	aconf = (struct AccessItem *)map_to_conf(conf);
723	>	conf = node->data;
724	>
725		if (EmptyString(conf->name))
726	<	continue;
727	<
726	>	continue;
727	>
728		if (name == NULL)
729		{
730	<	if (EmptyString(aconf->host))
731	<	continue;
732	<	if (irccmp(aconf->host, host) == 0)
733	<	return(conf);
730	>	if (EmptyString(conf->host))
731	>	continue;
732	>	if (irccmp(conf->host, host) == 0)
733	>	return conf;
734		}
735		else if (irccmp(conf->name, name) == 0)
736	<	{
1714	<	return (conf);
1715	<	}
736	>	return conf;
737		}
1717	–	break;
738
1719	–	case CLASS_TYPE:
1720	–	DLINK_FOREACH(ptr, list_p->head)
1721	–	{
1722	–	conf = ptr->data;
1723	–	if (EmptyString(conf->name))
1724	–	continue;
1725	–
1726	–	if (irccmp(conf->name, name) == 0)
1727	–	return (conf);
1728	–	}
739		break;
740
741		default:
742		break;
743		}
1734	–	return(NULL);
1735	–	}
1736	–
1737	–	/* rehash()
1738	–	*
1739	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1740	–	* as a result of an operator issuing this command, else assume it has been
1741	–	* called as a result of the server receiving a HUP signal.
1742	–	*/
1743	–	int
1744	–	rehash(int sig)
1745	–	{
1746	–	if (sig != 0)
1747	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1748	–	"Got signal SIGHUP, reloading ircd.conf file");
1749	–
1750	–	restart_resolver();
1751	–
1752	–	/* don't close listeners until we know we can go ahead with the rehash */
1753	–
1754	–	/* Check to see if we magically got(or lost) IPv6 support */
1755	–	check_can_use_v6();
1756	–
1757	–	read_conf_files(0);
1758	–
1759	–	if (ServerInfo.description != NULL)
1760	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1761	–
1762	–	#ifndef STATIC_MODULES
1763	–	load_conf_modules();
1764	–	#endif
744
745	<	flush_deleted_I_P();
1767	<
1768	<	rehashed_klines = 1;
1769	<
1770	<	if (ConfigLoggingEntry.use_logging)
1771	<	reopen_log(logFileName);
1772	<
1773	<	return(0);
745	>	return NULL;
746		}
747
748		/* set_default_conf()
#	Line 1788 | Line 760 | set_default_conf(void)
760		/* verify init_class() ran, this should be an unnecessary check
761		* but its not much work.
762		*/
763	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
763	>	assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778		#endif
779
780	<	/* ServerInfo.name is not rehashable */
781	<	/* ServerInfo.name = ServerInfo.name; */
782	<	ServerInfo.description = NULL;
783	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
784	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
785	<
786	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
787	<	ServerInfo.specific_ipv4_vhost = 0;
788	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
789	<	ServerInfo.specific_ipv6_vhost = 0;
790	<
791	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
792	<
793	<	ServerInfo.hub = 0;
794	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
795	<	ServerInfo.dns_host.sin_port = 0;
796	<	AdminInfo.name = NULL;
797	<	AdminInfo.email = NULL;
798	<	AdminInfo.description = NULL;
799	<
800	<	set_log_level(L_NOTICE);
801	<	ConfigLoggingEntry.use_logging = 1;
802	<	ConfigLoggingEntry.operlog[0] = '\0';
803	<	ConfigLoggingEntry.userlog[0] = '\0';
804	<	ConfigLoggingEntry.klinelog[0] = '\0';
805	<	ConfigLoggingEntry.glinelog[0] = '\0';
806	<	ConfigLoggingEntry.killlog[0] = '\0';
1825	<	ConfigLoggingEntry.operspylog[0] = '\0';
1826	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1827	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
1828	<
1829	<	ConfigChannel.disable_fake_channels = NO;
1830	<	ConfigChannel.restrict_channels = NO;
1831	<	ConfigChannel.disable_local_channels = NO;
1832	<	ConfigChannel.use_invex = YES;
1833	<	ConfigChannel.use_except = YES;
1834	<	ConfigChannel.use_knock = YES;
1835	<	ConfigChannel.knock_delay = 300;
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	>	#endif
783	>
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796	>
797	>	log_del_all();
798	>
799	>	ConfigLog.use_logging = 1;
800	>
801	>	ConfigChannel.disable_fake_channels = 0;
802	>	ConfigChannel.invite_client_count = 10;
803	>	ConfigChannel.invite_client_time = 300;
804	>	ConfigChannel.invite_delay_channel = 5;
805	>	ConfigChannel.knock_client_count = 1;
806	>	ConfigChannel.knock_client_time = 300;
807		ConfigChannel.knock_delay_channel = 60;
808	<	ConfigChannel.max_chans_per_user = 15;
1838	<	ConfigChannel.quiet_on_ban = YES;
808	>	ConfigChannel.max_channels = 25;
809		ConfigChannel.max_bans = 25;
810	<	ConfigChannel.default_split_user_count = 0;
811	<	ConfigChannel.default_split_server_count = 0;
812	<	ConfigChannel.no_join_on_split = NO;
813	<	ConfigChannel.no_create_on_split = NO;
814	<	ConfigChannel.burst_topicwho = YES;
815	<
816	<	ConfigServerHide.flatten_links = NO;
817	<	ConfigServerHide.links_delay = 300;
818	<	ConfigServerHide.hidden = NO;
819	<	ConfigServerHide.disable_hidden = NO;
820	<	ConfigServerHide.hide_servers = NO;
821	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
822	<	ConfigServerHide.hide_server_ips = NO;
823	<
824	<
825	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
826	<	ConfigFileEntry.gline_min_cidr = 16;
827	<	ConfigFileEntry.gline_min_cidr6 = 48;
828	<	ConfigFileEntry.invisible_on_connect = YES;
829	<	ConfigFileEntry.burst_away = NO;
830	<	ConfigFileEntry.use_whois_actually = YES;
831	<	ConfigFileEntry.tkline_expire_notices = YES;
832	<	ConfigFileEntry.hide_spoof_ips = YES;
833	<	ConfigFileEntry.ignore_bogus_ts = NO;
834	<	ConfigFileEntry.disable_auth = NO;
835	<	ConfigFileEntry.disable_remote = NO;
836	<	ConfigFileEntry.kill_chase_time_limit = 90;
837	<	ConfigFileEntry.default_floodcount = 8;
838	<	ConfigFileEntry.failed_oper_notice = YES;
839	<	ConfigFileEntry.dots_in_ident = 0;
840	<	ConfigFileEntry.min_nonwildcard = 4;
841	<	ConfigFileEntry.min_nonwildcard_simple = 3;
842	<	ConfigFileEntry.max_accept = 20;
843	<	ConfigFileEntry.anti_nick_flood = NO;
844	<	ConfigFileEntry.max_nick_time = 20;
845	<	ConfigFileEntry.max_nick_changes = 5;
846	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
847	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
848	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
849	<	ConfigFileEntry.kline_with_reason = YES;
850	<	ConfigFileEntry.kline_reason = NULL;
851	<	ConfigFileEntry.warn_no_nline = YES;
852	<	ConfigFileEntry.stats_o_oper_only = NO;
853	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
854	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
855	<	ConfigFileEntry.stats_P_oper_only = NO;
856	<	ConfigFileEntry.caller_id_wait = 60;
857	<	ConfigFileEntry.opers_bypass_callerid = NO;
858	<	ConfigFileEntry.pace_wait = 10;
859	<	ConfigFileEntry.pace_wait_simple = 1;
860	<	ConfigFileEntry.short_motd = NO;
861	<	ConfigFileEntry.ping_cookie = NO;
862	<	ConfigFileEntry.no_oper_flood = NO;
863	<	ConfigFileEntry.true_no_oper_flood = NO;
864	<	ConfigFileEntry.oper_pass_resv = YES;
865	<	ConfigFileEntry.glines = NO;
866	<	ConfigFileEntry.gline_time = 12 * 3600;
867	<	ConfigFileEntry.idletime = 0;
868	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1899	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1900	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1901	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1902	<	UMODE_OPERWALL | UMODE_WALLOP;
1903	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1904	<	#ifdef HAVE_LIBCRYPTO
1905	<	/* jdc -- This is our default value for a cipher.  According to the
1906	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1907	<	*        under all circumstances if cryptlinks are enabled.  So,
1908	<	*        this will be our default.
1909	<	*
1910	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1911	<	*              This should be moved into a find_cipher() routine.
1912	<	*/
1913	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1914	<	#endif
1915	<	ConfigFileEntry.use_egd = NO;
1916	<	ConfigFileEntry.egdpool_path = NULL;
1917	<	#ifdef HAVE_LIBZ
1918	<	ConfigFileEntry.compression_level = 0;
1919	<	#endif
1920	<	ConfigFileEntry.throttle_time = 10;
810	>	ConfigChannel.default_join_flood_count = 18;
811	>	ConfigChannel.default_join_flood_time = 6;
812	>
813	>	ConfigServerHide.flatten_links = 0;
814	>	ConfigServerHide.flatten_links_delay = 300;
815	>	ConfigServerHide.hidden = 0;
816	>	ConfigServerHide.hide_servers = 0;
817	>	ConfigServerHide.hide_services = 0;
818	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
819	>	ConfigServerHide.hide_server_ips = 0;
820	>	ConfigServerHide.disable_remote_commands = 0;
821	>
822	>	ConfigGeneral.away_count = 2;
823	>	ConfigGeneral.away_time = 10;
824	>	ConfigGeneral.max_watch = 50;
825	>	ConfigGeneral.cycle_on_host_change = 1;
826	>	ConfigGeneral.dline_min_cidr = 16;
827	>	ConfigGeneral.dline_min_cidr6 = 48;
828	>	ConfigGeneral.kline_min_cidr = 16;
829	>	ConfigGeneral.kline_min_cidr6 = 48;
830	>	ConfigGeneral.invisible_on_connect = 1;
831	>	ConfigGeneral.tkline_expire_notices = 1;
832	>	ConfigGeneral.ignore_bogus_ts = 0;
833	>	ConfigGeneral.disable_auth = 0;
834	>	ConfigGeneral.kill_chase_time_limit = 90;
835	>	ConfigGeneral.default_floodcount = 8;
836	>	ConfigGeneral.failed_oper_notice = 1;
837	>	ConfigGeneral.dots_in_ident = 0;
838	>	ConfigGeneral.min_nonwildcard = 4;
839	>	ConfigGeneral.min_nonwildcard_simple = 3;
840	>	ConfigGeneral.max_accept = 50;
841	>	ConfigGeneral.anti_nick_flood = 0;
842	>	ConfigGeneral.max_nick_time = 20;
843	>	ConfigGeneral.max_nick_changes = 5;
844	>	ConfigGeneral.anti_spam_exit_message_time = 0;
845	>	ConfigGeneral.ts_warn_delta = 30;
846	>	ConfigGeneral.ts_max_delta = 600;
847	>	ConfigGeneral.warn_no_connect_block = 1;
848	>	ConfigGeneral.stats_e_disabled = 0;
849	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
850	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
851	>	ConfigGeneral.stats_o_oper_only = 1;
852	>	ConfigGeneral.stats_m_oper_only = 1;
853	>	ConfigGeneral.stats_P_oper_only = 0;
854	>	ConfigGeneral.stats_u_oper_only = 0;
855	>	ConfigGeneral.caller_id_wait = 60;
856	>	ConfigGeneral.opers_bypass_callerid = 0;
857	>	ConfigGeneral.pace_wait = 10;
858	>	ConfigGeneral.pace_wait_simple = 1;
859	>	ConfigGeneral.short_motd = 0;
860	>	ConfigGeneral.ping_cookie = 0;
861	>	ConfigGeneral.no_oper_flood = 0;
862	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
863	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
864	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
865	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
866	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
867	>	ConfigGeneral.throttle_count = 1;
868	>	ConfigGeneral.throttle_time = 1;
869		}
870
871	<	/* read_conf()
871	>	static void
872	>	validate_conf(void)
873	>	{
874	>	if (EmptyString(ConfigServerInfo.network_name))
875	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
876	>
877	>	if (EmptyString(ConfigServerInfo.network_desc))
878	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
879	>	}
880	>
881	>	/* read_conf()
882		*
883		* inputs       - file descriptor pointing to config file to use
884		* output       - None
885		* side effects - Read configuration file.
886		*/
887		static void
888	<	read_conf(FBFILE *file)
888	>	read_conf(FILE *file)
889		{
890		lineno = 0;
891
892	<	set_default_conf(); /* Set default values prior to conf parsing */
892	>	set_default_conf();  /* Set default values prior to conf parsing */
893		conf_parser_ctx.pass = 1;
894	<	yyparse();          /* pick up the classes first */
894	>	yyparse();  /* Pick up the classes first */
895
896	<	fbrewind(file);
896	>	rewind(file);
897
898		conf_parser_ctx.pass = 2;
899	<	yyparse();          /* Load the values from the conf */
900	<	validate_conf();    /* Check to make sure some values are still okay. */
901	<	/* Some global values are also loaded here. */
902	<	check_class();      /* Make sure classes are valid */
899	>	yyparse();  /* Load the values from the conf */
900	>	validate_conf();  /* Check to make sure some values are still okay. */
901	>	/* Some global values are also loaded here. */
902	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
903		}
904
905	<	static void
906	<	validate_conf(void)
905	>	/* conf_rehash()
906	>	*
907	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
908	>	* as a result of an operator issuing this command, else assume it has been
909	>	* called as a result of the server receiving a HUP signal.
910	>	*/
911	>	void
912	>	conf_rehash(int sig)
913		{
914	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
915	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
916	<
1953	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1954	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1955	<
1956	<	if (ConfigFileEntry.servlink_path == NULL)
1957	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
914	>	if (sig)
915	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
916	>	"Got signal SIGHUP, reloading configuration file(s)");
917
918	<	if (ServerInfo.network_name == NULL)
1960	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
918	>	restart_resolver();
919
920	<	if (ServerInfo.network_desc == NULL)
1963	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
920	>	/* don't close listeners until we know we can go ahead with the rehash */
921
922	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1966	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1967	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
922	>	read_conf_files(0);
923
924	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
924	>	load_conf_modules();
925	>	check_conf_klines();
926		}
927
928		/* lookup_confhost()
#	Line 1974 | Line 930 | validate_conf(void)
930		* start DNS lookups of all hostnames in the conf
931		* line and convert an IP addresses in a.b.c.d number for to IP#s.
932		*/
933	<	static void
934	<	lookup_confhost(struct ConfItem *conf)
933	>	void
934	>	lookup_confhost(struct MaskItem *conf)
935		{
1980	–	struct AccessItem *aconf;
936		struct addrinfo hints, *res;
937
938	<	aconf = map_to_conf(conf);
939	<
1985	<	if (EmptyString(aconf->host) ||
1986	<	EmptyString(aconf->user))
1987	<	{
1988	<	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
1989	<	aconf->host, conf->name);
1990	<	return;
1991	<	}
1992	<
1993	<	if (strchr(aconf->host, '*') ||
1994	<	strchr(aconf->host, '?'))
1995	<	return;
1996	<
1997	<	/* Do name lookup now on hostnames given and store the
938	>	/*
939	>	* Do name lookup now on hostnames given and store the
940		* ip numbers in conf structure.
941		*/
942		memset(&hints, 0, sizeof(hints));
#	Line 2005 | Line 947 | lookup_confhost(struct ConfItem *conf)
947		/* Get us ready for a bind() and don't bother doing dns lookup */
948		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
949
950	<	if (irc_getaddrinfo(aconf->host, NULL, &hints, &res))
950	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
951		{
952	<	conf_dns_lookup(aconf);
952	>	conf_dns_lookup(conf);
953		return;
954		}
955
956	<	assert(res != NULL);
956	>	assert(res);
957
958	<	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
959	<	aconf->ipnum.ss_len = res->ai_addrlen;
960	<	aconf->ipnum.ss.ss_family = res->ai_family;
961	<	irc_freeaddrinfo(res);
958	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
959	>	conf->addr.ss_len = res->ai_addrlen;
960	>	conf->addr.ss.ss_family = res->ai_family;
961	>
962	>	freeaddrinfo(res);
963		}
964
965		/* conf_connect_allowed()
#	Line 2029 | Line 972 | lookup_confhost(struct ConfItem *conf)
972		int
973		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
974		{
975	<	struct ip_entry *ip_found;
976	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
975	>	struct ip_entry *ip_found = NULL;
976	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
977
978	<	/* DLINE exempt also gets you out of static limits/pacing... */
979	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
980	<	return 0;
981	<
982	<	if (aconf != NULL)
978	>	if (conf)
979	>	{
980	>	/* DLINE exempt also gets you out of static limits/pacing... */
981	>	if (conf->type == CONF_EXEMPT)
982	>	return 0;
983		return BANNED_CLIENT;
984	+	}
985
986	<	ip_found = find_or_add_ip(addr);
986	>	ip_found = ipcache_find_or_add_address(addr);
987
988	<	if ((CurrentTime - ip_found->last_attempt) <
2045	<	ConfigFileEntry.throttle_time)
988	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
989		{
990	<	ip_found->last_attempt = CurrentTime;
991	<	return TOO_FAST;
990	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
991	>	return TOO_FAST;
992	>
993	>	++ip_found->connection_count;
994		}
995	+	else
996	+	ip_found->connection_count = 1;
997
998		ip_found->last_attempt = CurrentTime;
999		return 0;
1000		}
1001
1002	<	static struct AccessItem *
2056	<	find_regexp_kline(const char *uhi[])
2057	<	{
2058	<	#ifdef HAVE_LIBPCRE
2059	<	const dlink_node *ptr = NULL;
2060	<
2061	<	DLINK_FOREACH(ptr, rkconf_items.head)
2062	<	{
2063	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2064	<
2065	<	assert(aptr->regexuser);
2066	<	assert(aptr->regexhost);
2067	<
2068	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2069	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2070	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2071	<	return aptr;
2072	<	}
2073	<	#endif
2074	<	return NULL;
2075	<	}
2076	<
2077	<	/* find_kill()
1002	>	/* expire_tklines()
1003		*
1004	<	* inputs       - pointer to client structure
1005	<	* output       - pointer to struct AccessItem if found
1006	<	* side effects - See if this user is klined already,
2082	<	*                and if so, return struct AccessItem pointer
1004	>	* inputs       - tkline list pointer
1005	>	* output       - NONE
1006	>	* side effects - expire tklines
1007		*/
1008	<	struct AccessItem *
1009	<	find_kill(struct Client *client_p)
2086	<	{
2087	<	struct AccessItem *aconf = NULL;
2088	<	const char *uhi[3];
2089	<
2090	<	uhi[0] = client_p->username;
2091	<	uhi[1] = client_p->host;
2092	<	uhi[2] = client_p->sockhost;
2093	<
2094	<	assert(client_p != NULL);
2095	<
2096	<	aconf = find_kline_conf(client_p->host, client_p->username,
2097	<	&client_p->localClient->ip,
2098	<	client_p->localClient->aftype);
2099	<	if (aconf == NULL)
2100	<	aconf = find_regexp_kline(uhi);
2101	<
2102	<	if (aconf && (aconf->status & CONF_KLINE))
2103	<	return aconf;
2104	<
2105	<	return NULL;
2106	<	}
2107	<
2108	<	struct AccessItem *
2109	<	find_gline(struct Client *client_p)
1008	>	static void
1009	>	expire_tklines(dlink_list *list)
1010		{
1011	<	struct AccessItem *aconf;
2112	<
2113	<	assert(client_p != NULL);
1011	>	dlink_node *node = NULL, *node_next = NULL;
1012
1013	<	aconf = find_gline_conf(client_p->host, client_p->username,
1014	<	&client_p->localClient->ip,
1015	<	client_p->localClient->aftype);
2118	<
2119	<	if (aconf && (aconf->status & CONF_GLINE))
2120	<	return aconf;
2121	<
2122	<	return NULL;
2123	<	}
1013	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1014	>	{
1015	>	struct MaskItem *conf = node->data;
1016
1017	<	/* add_temp_line()
1018	<	*
2127	<	* inputs        - pointer to struct ConfItem
2128	<	* output        - none
2129	<	* Side effects  - links in given struct ConfItem into
2130	<	*                 temporary *line link list
2131	<	*/
2132	<	void
2133	<	add_temp_line(struct ConfItem *conf)
2134	<	{
2135	<	struct AccessItem *aconf;
1017	>	if (!conf->until || conf->until > CurrentTime)
1018	>	continue;
1019
1020	<	if (conf->type == DLINE_TYPE)
1021	<	{
1022	<	aconf = map_to_conf(conf);
1023	<	SetConfTemporary(aconf);
2141	<	dlinkAdd(conf, &conf->node, &temporary_dlines);
2142	<	MyFree(aconf->user);
2143	<	aconf->user = NULL;
2144	<	add_conf_by_address(CONF_DLINE, aconf);
2145	<	}
2146	<	else if (conf->type == KLINE_TYPE)
2147	<	{
2148	<	aconf = map_to_conf(conf);
2149	<	SetConfTemporary(aconf);
2150	<	dlinkAdd(conf, &conf->node, &temporary_klines);
2151	<	add_conf_by_address(CONF_KILL, aconf);
2152	<	}
2153	<	else if (conf->type == GLINE_TYPE)
2154	<	{
2155	<	aconf = map_to_conf(conf);
2156	<	SetConfTemporary(aconf);
2157	<	dlinkAdd(conf, &conf->node, &temporary_glines);
2158	<	add_conf_by_address(CONF_GLINE, aconf);
2159	<	}
2160	<	else if (conf->type == XLINE_TYPE)
2161	<	{
2162	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2163	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2164	<	}
2165	<	else if (conf->type == RXLINE_TYPE)
2166	<	{
2167	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2168	<	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2169	<	}
2170	<	else if (conf->type == RKLINE_TYPE)
2171	<	{
2172	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2173	<	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2174	<	}
2175	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2176	<	{
2177	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2178	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1020	>	if (ConfigGeneral.tkline_expire_notices)
1021	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1022	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1023	>	conf_free(conf);
1024		}
1025		}
1026
#	Line 2187 | Line 1032 | add_temp_line(struct ConfItem *conf)
1032		*                This is an event started off in ircd.c
1033		*/
1034		void
1035	<	cleanup_tklines(void *notused)
1035	>	cleanup_tklines(void *unused)
1036		{
1037	<	expire_tklines(&temporary_glines);
1038	<	expire_tklines(&temporary_klines);
1039	<	expire_tklines(&temporary_dlines);
1040	<	expire_tklines(&temporary_xlines);
2196	<	expire_tklines(&temporary_rxlines);
2197	<	expire_tklines(&temporary_rklines);
2198	<	expire_tklines(&temporary_resv);
2199	<	}
2200	<
2201	<	/* expire_tklines()
2202	<	*
2203	<	* inputs       - tkline list pointer
2204	<	* output       - NONE
2205	<	* side effects - expire tklines
2206	<	*/
2207	<	static void
2208	<	expire_tklines(dlink_list *tklist)
2209	<	{
2210	<	dlink_node *ptr;
2211	<	dlink_node *next_ptr;
2212	<	struct ConfItem *conf;
2213	<	struct MatchItem *xconf;
2214	<	struct MatchItem *nconf;
2215	<	struct AccessItem *aconf;
2216	<	struct ResvChannel *cconf;
2217	<
2218	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2219	<	{
2220	<	conf = ptr->data;
2221	<	if (conf->type == GLINE_TYPE ||
2222	<	conf->type == KLINE_TYPE ||
2223	<	conf->type == DLINE_TYPE)
2224	<	{
2225	<	aconf = (struct AccessItem *)map_to_conf(conf);
2226	<	if (aconf->hold <= CurrentTime)
2227	<	{
2228	<	/* XXX - Do we want GLINE expiry notices?? */
2229	<	/* Alert opers that a TKline expired - Hwy */
2230	<	if (ConfigFileEntry.tkline_expire_notices)
2231	<	{
2232	<	if (aconf->status & CONF_KILL)
2233	<	{
2234	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2235	<	"Temporary K-line for [%s@%s] expired",
2236	<	(aconf->user) ? aconf->user : "*",
2237	<	(aconf->host) ? aconf->host : "*");
2238	<	}
2239	<	else if (conf->type == DLINE_TYPE)
2240	<	{
2241	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2242	<	"Temporary D-line for [%s] expired",
2243	<	(aconf->host) ? aconf->host : "*");
2244	<	}
2245	<	}
2246	<
2247	<	dlinkDelete(ptr, tklist);
2248	<	delete_one_address_conf(aconf->host, aconf);
2249	<	}
2250	<	}
2251	<	else if (conf->type == XLINE_TYPE ||
2252	<	conf->type == RXLINE_TYPE)
2253	<	{
2254	<	xconf = (struct MatchItem *)map_to_conf(conf);
2255	<	if (xconf->hold <= CurrentTime)
2256	<	{
2257	<	if (ConfigFileEntry.tkline_expire_notices)
2258	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2259	<	"Temporary X-line for [%s] %sexpired", conf->name,
2260	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2261	<	dlinkDelete(ptr, tklist);
2262	<	free_dlink_node(ptr);
2263	<	delete_conf_item(conf);
2264	<	}
2265	<	}
2266	<	else if (conf->type == RKLINE_TYPE)
2267	<	{
2268	<	aconf = map_to_conf(conf);
2269	<	if (aconf->hold <= CurrentTime)
2270	<	{
2271	<	if (ConfigFileEntry.tkline_expire_notices)
2272	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2273	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2274	<	(aconf->user) ? aconf->user : "*",
2275	<	(aconf->host) ? aconf->host : "*");
2276	<	dlinkDelete(ptr, tklist);
2277	<	free_dlink_node(ptr);
2278	<	delete_conf_item(conf);
2279	<	}
2280	<	}
2281	<	else if (conf->type == NRESV_TYPE)
2282	<	{
2283	<	nconf = (struct MatchItem *)map_to_conf(conf);
2284	<	if (nconf->hold <= CurrentTime)
2285	<	{
2286	<	if (ConfigFileEntry.tkline_expire_notices)
2287	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2288	<	"Temporary RESV for [%s] expired", conf->name);
2289	<	dlinkDelete(ptr, tklist);
2290	<	free_dlink_node(ptr);
2291	<	delete_conf_item(conf);
2292	<	}
2293	<	}
2294	<	else if (conf->type == CRESV_TYPE)
2295	<	{
2296	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2297	<	if (cconf->hold <= CurrentTime)
2298	<	{
2299	<	if (ConfigFileEntry.tkline_expire_notices)
2300	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2301	<	"Temporary RESV for [%s] expired", cconf->name);
2302	<	delete_channel_resv(cconf);
2303	<	}
2304	<	}
2305	<	}
1037	>	hostmask_expire_temporary();
1038	>	expire_tklines(&gecos_items);
1039	>	expire_tklines(&nresv_items);
1040	>	expire_tklines(&cresv_items);
1041		}
1042
1043		/* oper_privs_as_string()
#	Line 2313 | Line 1048 | expire_tklines(dlink_list *tklist)
1048		*/
1049		static const struct oper_privs
1050		{
1051	<	const unsigned int oprivs;
2317	<	const unsigned int hidden;
1051	>	const unsigned int flag;
1052		const unsigned char c;
1053		} flag_list[] = {
1054	<	{ OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
1055	<	{ OPER_FLAG_REMOTEBAN,   0,                       'B' },
1056	<	{ OPER_FLAG_DIE,         0,                       'D' },
1057	<	{ OPER_FLAG_GLINE,       0,                       'G' },
1058	<	{ OPER_FLAG_REHASH,      0,                       'H' },
1059	<	{ OPER_FLAG_K,           0,                       'K' },
1060	<	{ OPER_FLAG_OPERWALL,    0,                       'L' },
1061	<	{ OPER_FLAG_N,           0,                       'N' },
1062	<	{ OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
1063	<	{ OPER_FLAG_REMOTE,      0,                       'R' },
1064	<	{ OPER_FLAG_OPER_SPY,    0,                       'S' },
1065	<	{ OPER_FLAG_UNKLINE,     0,                       'U' },
1066	<	{ OPER_FLAG_X,           0,                       'X' },
1067	<	{ 0, 0, '\0' }
1054	>	{ OPER_FLAG_ADMIN,          'A' },
1055	>	{ OPER_FLAG_CLOSE,          'B' },
1056	>	{ OPER_FLAG_CONNECT,        'C' },
1057	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1058	>	{ OPER_FLAG_DIE,            'E' },
1059	>	{ OPER_FLAG_DLINE,          'F' },
1060	>	{ OPER_FLAG_GLOBOPS,        'G' },
1061	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1062	>	{ OPER_FLAG_KILL,           'I' },
1063	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1064	>	{ OPER_FLAG_KLINE,          'K' },
1065	>	{ OPER_FLAG_LOCOPS,         'L' },
1066	>	{ OPER_FLAG_MODULE,         'M' },
1067	>	{ OPER_FLAG_NICK_RESV,      'N' },
1068	>	{ OPER_FLAG_OPME,           'O' },
1069	>	{ OPER_FLAG_REHASH,         'P' },
1070	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1071	>	{ OPER_FLAG_RESTART,        'R' },
1072	>	{ OPER_FLAG_RESV,           'S' },
1073	>	{ OPER_FLAG_SET,            'T' },
1074	>	{ OPER_FLAG_SQUIT,          'U' },
1075	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1076	>	{ OPER_FLAG_UNDLINE,        'W' },
1077	>	{ OPER_FLAG_UNKLINE,        'X' },
1078	>	{ OPER_FLAG_UNRESV,         'Y' },
1079	>	{ OPER_FLAG_UNXLINE,        'Z' },
1080	>	{ OPER_FLAG_WALLOPS,        'a' },
1081	>	{ OPER_FLAG_XLINE,          'b' },
1082	>	{ 0, '\0' }
1083		};
1084
1085	<	char *
1085	>	const char *
1086		oper_privs_as_string(const unsigned int port)
1087		{
1088	<	static char privs_out[16];
1088	>	static char privs_out[IRCD_BUFSIZE];
1089		char *privs_ptr = privs_out;
2341	–	unsigned int i = 0;
1090
1091	<	for (; flag_list[i].oprivs; ++i)
1092	<	{
1093	<	if ((port & flag_list[i].oprivs) &&
1094	<	(port & flag_list[i].hidden) == 0)
1095	<	*privs_ptr++ = flag_list[i].c;
1096	<	else
2349	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
2350	<	}
1091	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1092	>	if (port & opriv->flag)
1093	>	*privs_ptr++ = opriv->c;
1094	>
1095	>	if (privs_ptr == privs_out)
1096	>	*privs_ptr++ = '0';
1097
1098		*privs_ptr = '\0';
1099
#	Line 2355 | Line 1101 | oper_privs_as_string(const unsigned int
1101		}
1102
1103		/*
1104	<	* Input: A client to find the active oper{} name for.
1104	>	* Input: A client to find the active operator {} name for.
1105		* Output: The nick!user@host{oper} of the oper.
1106		*         "oper" is server name for remote opers
1107		* Side effects: None.
1108		*/
1109	<	char *
1109	>	const char *
1110		get_oper_name(const struct Client *client_p)
1111		{
1112	<	dlink_node *cnode;
2367	<	struct ConfItem *conf;
2368	<	struct AccessItem *aconf;
1112	>	static char buffer[IRCD_BUFSIZE];
1113
1114	<	/* +5 for !,@,{,} and null */
1115	<	static char buffer[NICKLEN+USERLEN+HOSTLEN+HOSTLEN+5];
1114	>	if (IsServer(client_p))
1115	>	return client_p->name;
1116
1117		if (MyConnect(client_p))
1118		{
1119	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1119	>	const dlink_node *const node = client_p->connection->confs.head;
1120	>
1121	>	if (node)
1122		{
1123	<	conf = cnode->data;
2378	<	aconf = map_to_conf(conf);
1123	>	const struct MaskItem *const conf = node->data;
1124
1125	<	if (IsConfOperator(aconf))
1125	>	if (conf->type == CONF_OPER)
1126		{
1127	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
1128	<	client_p->username, client_p->host,
1129	<	conf->name);
2385	<	return buffer;
1127	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1128	>	client_p->username, client_p->host, conf->name);
1129	>	return buffer;
1130		}
1131		}
1132
1133	<	/* Probably should assert here for now. If there is an oper out there
1134	<	* with no oper{} conf attached, it would be good for us to know...
1133	>	/*
1134	>	* Probably should assert here for now. If there is an oper out there
1135	>	* with no operator {} conf attached, it would be good for us to know...
1136		*/
1137	<	assert(0); /* Oper without oper conf! */
1137	>	assert(0);  /* Oper without oper conf! */
1138		}
1139
1140	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
1141	<	client_p->username, client_p->host, client_p->servptr->name);
1140	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1141	>	client_p->username, client_p->host, client_p->servptr->name);
1142		return buffer;
1143		}
1144
2400	–	/* read_conf_files()
2401	–	*
2402	–	* inputs       - cold start YES or NO
2403	–	* output       - none
2404	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2405	–	*/
2406	–	void
2407	–	read_conf_files(int cold)
2408	–	{
2409	–	const char *filename;
2410	–	char chanmodes[32];
2411	–	char chanlimit[32];
2412	–
2413	–	conf_parser_ctx.boot = cold;
2414	–	filename = get_conf_name(CONF_TYPE);
2415	–
2416	–	/* We need to know the initial filename for the yyerror() to report
2417	–	FIXME: The full path is in conffilenamebuf first time since we
2418	–	dont know anything else
2419	–
2420	–	- Gozem 2002-07-21
2421	–	*/
2422	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2423	–
2424	–	if ((conf_parser_ctx.conf_file = fbopen(filename, "r")) == NULL)
2425	–	{
2426	–	if (cold)
2427	–	{
2428	–	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
2429	–	filename, strerror(errno));
2430	–	exit(-1);
2431	–	}
2432	–	else
2433	–	{
2434	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2435	–	"Unable to read configuration file '%s': %s",
2436	–	filename, strerror(errno));
2437	–	return;
2438	–	}
2439	–	}
2440	–
2441	–	if (!cold)
2442	–	clear_out_old_conf();
2443	–
2444	–	read_conf(conf_parser_ctx.conf_file);
2445	–	fbclose(conf_parser_ctx.conf_file);
2446	–
2447	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2448	–	ircsprintf(chanmodes, "b%s%s:%d", ConfigChannel.use_except ? "e" : "",
2449	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2450	–	add_isupport("MAXLIST", chanmodes, -1);
2451	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2452	–	if (ConfigChannel.disable_local_channels)
2453	–	add_isupport("CHANTYPES", "#", -1);
2454	–	else
2455	–	add_isupport("CHANTYPES", "#&", -1);
2456	–	ircsprintf(chanlimit, "%s:%d", ConfigChannel.disable_local_channels ? "#" : "#&",
2457	–	ConfigChannel.max_chans_per_user);
2458	–	add_isupport("CHANLIMIT", chanlimit, -1);
2459	–	ircsprintf(chanmodes, "%s%s%s", ConfigChannel.use_except ? "e" : "",
2460	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnpst");
2461	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2462	–	if (ConfigChannel.use_except)
2463	–	add_isupport("EXCEPTS", "e", -1);
2464	–	if (ConfigChannel.use_invex)
2465	–	add_isupport("INVEX", "I", -1);
2466	–	add_isupport("CHANMODES", chanmodes, -1);
2467	–
2468	–	/*
2469	–	* message_locale may have changed.  rebuild isupport since it relies
2470	–	* on strlen(form_str(RPL_ISUPPORT))
2471	–	*/
2472	–	rebuild_isupport_message_line();
2473	–
2474	–	#ifdef HAVE_LIBPCRE
2475	–	parse_conf_file(RKLINE_TYPE, cold);
2476	–	parse_conf_file(RXLINE_TYPE, cold);
2477	–	#endif
2478	–	parse_conf_file(KLINE_TYPE, cold);
2479	–	parse_conf_file(DLINE_TYPE, cold);
2480	–	parse_conf_file(XLINE_TYPE, cold);
2481	–	parse_conf_file(NRESV_TYPE, cold);
2482	–	parse_conf_file(CRESV_TYPE, cold);
2483	–	}
2484	–
2485	–	/* parse_conf_file()
2486	–	*
2487	–	* inputs       - type of conf file to parse
2488	–	* output       - none
2489	–	* side effects - conf file for givenconf type is opened and read then parsed
2490	–	*/
2491	–	static void
2492	–	parse_conf_file(int type, int cold)
2493	–	{
2494	–	FBFILE *file = NULL;
2495	–	const char *filename = get_conf_name(type);
2496	–
2497	–	if ((file = fbopen(filename, "r")) == NULL)
2498	–	{
2499	–	if (cold)
2500	–	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2501	–	filename, strerror(errno));
2502	–	else
2503	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2504	–	"Unable to read configuration file '%s': %s",
2505	–	filename, strerror(errno));
2506	–	}
2507	–	else
2508	–	{
2509	–	parse_csv_file(file, type);
2510	–	fbclose(file);
2511	–	}
2512	–	}
2513	–
1145		/* clear_out_old_conf()
1146		*
1147		* inputs       - none
#	Line 2520 | Line 1151 | parse_conf_file(int type, int cold)
1151		static void
1152		clear_out_old_conf(void)
1153		{
1154	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2524	<	struct ConfItem *conf;
2525	<	struct AccessItem *aconf;
2526	<	struct ClassItem *cltmp;
2527	<	struct MatchItem *match_item;
1154	>	dlink_node *node = NULL, *node_next = NULL;
1155		dlink_list *free_items [] = {
1156	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1157	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1158	<	&nresv_items, &cluster_items,  &gdeny_items, NULL
1156	>	&server_items,   &operator_items,
1157	>	&shared_items,   &gecos_items,
1158	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1159		};
1160
1161		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2536 | Line 1163 | clear_out_old_conf(void)
1163		/* We only need to free anything allocated by yyparse() here.
1164		* Resetting structs, etc, is taken care of by set_default_conf().
1165		*/
1166	<
1167	<	for (; *iterator != NULL; iterator++)
1166	>
1167	>	for (; *iterator; iterator++)
1168		{
1169	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1169	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1170		{
1171	<	conf = ptr->data;
2545	<	/* XXX This is less than pretty */
2546	<	if (conf->type == SERVER_TYPE)
2547	<	{
2548	<	aconf = map_to_conf(conf);
1171	>	struct MaskItem *conf = node->data;
1172
1173	<	if (aconf->clients != 0)
2551	<	{
2552	<	SetConfIllegal(aconf);
2553	<	dlinkDelete(&conf->node, &server_items);
2554	<	}
2555	<	else
2556	<	{
2557	<	delete_conf_item(conf);
2558	<	}
2559	<	}
2560	<	else if (conf->type == OPER_TYPE)
2561	<	{
2562	<	aconf = map_to_conf(conf);
1173	>	conf->active = 0;
1174
1175	<	if (aconf->clients != 0)
2565	<	{
2566	<	SetConfIllegal(aconf);
2567	<	dlinkDelete(&conf->node, &oconf_items);
2568	<	}
2569	<	else
2570	<	{
2571	<	delete_conf_item(conf);
2572	<	}
2573	<	}
2574	<	else if (conf->type == CLIENT_TYPE)
1175	>	if (!IsConfDatabase(conf))
1176		{
1177	<	aconf = map_to_conf(conf);
2577	<
2578	<	if (aconf->clients != 0)
2579	<	{
2580	<	SetConfIllegal(aconf);
2581	<	}
2582	<	else
2583	<	{
2584	<	delete_conf_item(conf);
2585	<	}
2586	<	}
2587	<	else if (conf->type == XLINE_TYPE  ||
2588	<	conf->type == RXLINE_TYPE ||
2589	<	conf->type == RKLINE_TYPE)
2590	<	{
2591	<	/* temporary (r)xlines are also on
2592	<	* the (r)xconf items list */
2593	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2594	<	continue;
1177	>	dlinkDelete(&conf->node, *iterator);
1178
1179	<	delete_conf_item(conf);
1180	<	}
2598	<	else
2599	<	{
2600	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2601	<	{
2602	<	match_item = map_to_conf(conf);
2603	<	if (match_item->ref_count <= 0)
2604	<	delete_conf_item(conf);
2605	<	else
2606	<	{
2607	<	match_item->illegal = 1;
2608	<	dlinkDelete(&conf->node, *iterator);
2609	<	}
2610	<	}
2611	<	else
2612	<	delete_conf_item(conf);
1179	>	if (!conf->ref_count)
1180	>	conf_free(conf);
1181		}
1182		}
1183		}
1184
1185	+	motd_clear();
1186	+
1187		/*
1188	<	* don't delete the class table, rather mark all entries
1189	<	* for deletion. The table is cleaned up by check_class. - avalon
1188	>	* Don't delete the class table, rather mark all entries for deletion.
1189	>	* The table is cleaned up by class_delete_marked. - avalon
1190		*/
1191	<	DLINK_FOREACH(ptr, class_items.head)
2622	<	{
2623	<	cltmp = map_to_conf(ptr->data);
2624	<
2625	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2626	<	cltmp->active = 0;
2627	<	}
1191	>	class_mark_for_deletion();
1192
1193		clear_out_address_conf();
1194
1195	<	/* clean out module paths */
2632	<	#ifndef STATIC_MODULES
1195	>	/* Clean out module paths */
1196		mod_clear_paths();
2634	–	#endif
1197
1198	<	/* clean out ServerInfo */
1199	<	MyFree(ServerInfo.description);
1200	<	ServerInfo.description = NULL;
1201	<	MyFree(ServerInfo.network_name);
1202	<	ServerInfo.network_name = NULL;
1203	<	MyFree(ServerInfo.network_desc);
1204	<	ServerInfo.network_desc = NULL;
1205	<	MyFree(ConfigFileEntry.egdpool_path);
1206	<	ConfigFileEntry.egdpool_path = NULL;
1198	>	pseudo_clear();
1199	>
1200	>	/* Clean out ConfigServerInfo */
1201	>	MyFree(ConfigServerInfo.description);
1202	>	ConfigServerInfo.description = NULL;
1203	>	MyFree(ConfigServerInfo.network_name);
1204	>	ConfigServerInfo.network_name = NULL;
1205	>	MyFree(ConfigServerInfo.network_desc);
1206	>	ConfigServerInfo.network_desc = NULL;
1207		#ifdef HAVE_LIBCRYPTO
1208	<	if (ServerInfo.rsa_private_key != NULL)
1208	>	if (ConfigServerInfo.rsa_private_key)
1209		{
1210	<	RSA_free(ServerInfo.rsa_private_key);
1211	<	ServerInfo.rsa_private_key = NULL;
1210	>	RSA_free(ConfigServerInfo.rsa_private_key);
1211	>	ConfigServerInfo.rsa_private_key = NULL;
1212		}
1213
1214	<	MyFree(ServerInfo.rsa_private_key_file);
1215	<	ServerInfo.rsa_private_key_file = NULL;
1214	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1215	>	ConfigServerInfo.rsa_private_key_file = NULL;
1216		#endif
1217
1218	<	/* clean out old resvs from the conf */
1219	<	clear_conf_resv();
1218	>	/* Clean out ConfigAdminInfo */
1219	>	MyFree(ConfigAdminInfo.name);
1220	>	ConfigAdminInfo.name = NULL;
1221	>	MyFree(ConfigAdminInfo.email);
1222	>	ConfigAdminInfo.email = NULL;
1223	>	MyFree(ConfigAdminInfo.description);
1224	>	ConfigAdminInfo.description = NULL;
1225
1226	<	/* clean out AdminInfo */
1227	<	MyFree(AdminInfo.name);
2661	<	AdminInfo.name = NULL;
2662	<	MyFree(AdminInfo.email);
2663	<	AdminInfo.email = NULL;
2664	<	MyFree(AdminInfo.description);
2665	<	AdminInfo.description = NULL;
2666	<
2667	<	/* operator{} and class{} blocks are freed above */
2668	<	/* clean out listeners */
2669	<	close_listeners();
1226	>	MyFree(ConfigServerHide.flatten_links_file);
1227	>	ConfigServerHide.flatten_links_file = NULL;
1228
1229	<	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
1230	<	* exempt{} and gecos{} blocks are freed above too
2673	<	*/
2674	<
2675	<	/* clean out general */
2676	<	MyFree(ConfigFileEntry.servlink_path);
2677	<	ConfigFileEntry.servlink_path = NULL;
2678	<	#ifdef HAVE_LIBCRYPTO
2679	<	ConfigFileEntry.default_cipher_preference = NULL;
2680	<	#endif /* HAVE_LIBCRYPTO */
2681	<	delete_isupport("INVEX");
2682	<	delete_isupport("EXCEPTS");
1229	>	/* Clean out listeners */
1230	>	listener_close_marked();
1231		}
1232
1233	<	/* flush_deleted_I_P()
1233	>	/* read_conf_files()
1234		*
1235	<	* inputs       - none
1235	>	* inputs       - cold start YES or NO
1236		* output       - none
1237	<	* side effects - This function removes I/P conf items
2690	<	*/
2691	<	static void
2692	<	flush_deleted_I_P(void)
2693	<	{
2694	<	dlink_node *ptr;
2695	<	dlink_node *next_ptr;
2696	<	struct ConfItem *conf;
2697	<	struct AccessItem *aconf;
2698	<	dlink_list * free_items [] = {
2699	<	&server_items, &oconf_items, NULL
2700	<	};
2701	<	dlink_list ** iterator = free_items; /* C is dumb */
2702	<
2703	<	/* flush out deleted I and P lines
2704	<	* although still in use.
2705	<	*/
2706	<	for (; *iterator != NULL; iterator++)
2707	<	{
2708	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2709	<	{
2710	<	conf = ptr->data;
2711	<	aconf = (struct AccessItem *)map_to_conf(conf);
2712	<
2713	<	if (IsConfIllegal(aconf))
2714	<	{
2715	<	dlinkDelete(ptr, *iterator);
2716	<
2717	<	if (aconf->clients == 0)
2718	<	delete_conf_item(conf);
2719	<	}
2720	<	}
2721	<	}
2722	<	}
2723	<
2724	<	/* get_conf_name()
2725	<	*
2726	<	* inputs       - type of conf file to return name of file for
2727	<	* output       - pointer to filename for type of conf
2728	<	* side effects - none
2729	<	*/
2730	<	const char *
2731	<	get_conf_name(ConfType type)
2732	<	{
2733	<	switch (type)
2734	<	{
2735	<	case CONF_TYPE:
2736	<	return ConfigFileEntry.configfile;
2737	<	break;
2738	<	case KLINE_TYPE:
2739	<	return ConfigFileEntry.klinefile;
2740	<	break;
2741	<	case RKLINE_TYPE:
2742	<	return ConfigFileEntry.rklinefile;
2743	<	break;
2744	<	case DLINE_TYPE:
2745	<	return ConfigFileEntry.dlinefile;
2746	<	break;
2747	<	case XLINE_TYPE:
2748	<	return ConfigFileEntry.xlinefile;
2749	<	break;
2750	<	case RXLINE_TYPE:
2751	<	return ConfigFileEntry.rxlinefile;
2752	<	break;
2753	<	case CRESV_TYPE:
2754	<	return ConfigFileEntry.cresvfile;
2755	<	break;
2756	<	case NRESV_TYPE:
2757	<	return ConfigFileEntry.nresvfile;
2758	<	break;
2759	<	case GLINE_TYPE:
2760	<	return ConfigFileEntry.glinefile;
2761	<	break;
2762	<
2763	<	default:
2764	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2765	<	only with the above values, this will cause us to core
2766	<	at some point if this happens so we know where it was */
2767	<	}
2768	<	}
2769	<
2770	<	#define BAD_PING (-1)
2771	<
2772	<	/* get_conf_ping()
2773	<	*
2774	<	* inputs       - pointer to struct AccessItem
2775	<	*              - pointer to a variable that receives ping warning time
2776	<	* output       - ping frequency
2777	<	* side effects - NONE
1237	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1238		*/
1239	<	static int
1240	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
1239	>	void
1240	>	read_conf_files(int cold)
1241		{
1242	<	struct ClassItem *aclass;
1243	<	struct AccessItem *aconf;
1242	>	const char *filename = NULL;
1243	>	char chanmodes[IRCD_BUFSIZE] = "";
1244	>	char chanlimit[IRCD_BUFSIZE] = "";
1245
1246	<	if (conf != NULL)
1247	<	{
2787	<	aconf = (struct AccessItem *)map_to_conf(conf);
2788	<	if (aconf->class_ptr != NULL)
2789	<	{
2790	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2791	<	*pingwarn = PingWarning(aclass);
2792	<	return PingFreq(aclass);
2793	<	}
2794	<	}
1246	>	conf_parser_ctx.boot = cold;
1247	>	filename = ConfigGeneral.configfile;
1248
1249	<	return BAD_PING;
1250	<	}
1249	>	/* We need to know the initial filename for the yyerror() to report
1250	>	FIXME: The full path is in conffilenamebuf first time since we
1251	>	don't know anything else
1252
1253	<	/* get_client_class()
1254	<	*
1255	<	* inputs       - pointer to client struct
2802	<	* output       - pointer to name of class
2803	<	* side effects - NONE
2804	<	*/
2805	<	const char *
2806	<	get_client_class(struct Client *target_p)
2807	<	{
2808	<	dlink_node *ptr;
2809	<	struct ConfItem *conf;
2810	<	struct AccessItem *aconf;
1253	>	- Gozem 2002-07-21
1254	>	*/
1255	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1256
1257	<	if (target_p != NULL && !IsMe(target_p) &&
2813	<	target_p->localClient->confs.head != NULL)
1257	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1258		{
1259	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2816	<	{
2817	<	conf = ptr->data;
2818	<
2819	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2820	<	conf->type == OPER_TYPE)
2821	<	{
2822	<	aconf = (struct AccessItem *) map_to_conf(conf);
2823	<	if (aconf->class_ptr != NULL)
2824	<	return aconf->class_ptr->name;
2825	<	}
2826	<	}
2827	<	}
2828	<
2829	<	return "default";
2830	<	}
2831	<
2832	<	/* get_client_ping()
2833	<	*
2834	<	* inputs       - pointer to client struct
2835	<	*              - pointer to a variable that receives ping warning time
2836	<	* output       - ping frequency
2837	<	* side effects - NONE
2838	<	*/
2839	<	int
2840	<	get_client_ping(struct Client *target_p, int *pingwarn)
2841	<	{
2842	<	int ping;
2843	<	struct ConfItem *conf;
2844	<	dlink_node *nlink;
2845	<
2846	<	if (target_p->localClient->confs.head != NULL)
2847	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
1259	>	if (cold)
1260		{
1261	<	conf = nlink->data;
1262	<
1263	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2852	<	(conf->type == OPER_TYPE))
2853	<	{
2854	<	ping = get_conf_ping(conf, pingwarn);
2855	<	if (ping > 0)
2856	<	return ping;
2857	<	}
1261	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1262	>	filename, strerror(errno));
1263	>	exit(EXIT_FAILURE);
1264		}
1265	<
2860	<	*pingwarn = 0;
2861	<	return DEFAULT_PINGFREQUENCY;
2862	<	}
2863	<
2864	<	/* find_class()
2865	<	*
2866	<	* inputs       - string name of class
2867	<	* output       - corresponding Class pointer
2868	<	* side effects - NONE
2869	<	*/
2870	<	struct ConfItem *
2871	<	find_class(const char *classname)
2872	<	{
2873	<	struct ConfItem *conf;
2874	<
2875	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2876	<	return conf;
2877	<
2878	<	return class_default;
2879	<	}
2880	<
2881	<	/* check_class()
2882	<	*
2883	<	* inputs       - NONE
2884	<	* output       - NONE
2885	<	* side effects -
2886	<	*/
2887	<	void
2888	<	check_class(void)
2889	<	{
2890	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2891	<
2892	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2893	<	{
2894	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2895	<
2896	<	if (!aclass->active && !CurrUserCount(aclass))
1265	>	else
1266		{
1267	<	destroy_cidr_class(aclass);
1268	<	delete_conf_item(ptr->data);
1267	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1268	>	"Unable to read configuration file '%s': %s",
1269	>	filename, strerror(errno));
1270	>	return;
1271		}
1272		}
2902	–	}
1273
1274	<	/* init_class()
1275	<	*
2906	<	* inputs       - NONE
2907	<	* output       - NONE
2908	<	* side effects -
2909	<	*/
2910	<	void
2911	<	init_class(void)
2912	<	{
2913	<	struct ClassItem *aclass;
1274	>	if (!cold)
1275	>	clear_out_old_conf();
1276
1277	<	class_default = make_conf_item(CLASS_TYPE);
1277	>	read_conf(conf_parser_ctx.conf_file);
1278	>	fclose(conf_parser_ctx.conf_file);
1279
1280	<	aclass = map_to_conf(class_default);
2918	<	aclass->active = 1;
2919	<	DupString(class_default->name, "default");
2920	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2921	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2922	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2923	<	MaxSendq(aclass) = DEFAULT_SENDQ;
1280	>	log_reopen_all();
1281
1282	<	client_check_cb = register_callback("check_client", check_client);
1283	<	}
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284
1285	<	/* get_sendq()
1286	<	*
1287	<	* inputs       - pointer to client
1288	<	* output       - sendq for this client as found from its class
1289	<	* side effects - NONE
1290	<	*/
1291	<	unsigned int
1292	<	get_sendq(struct Client *client_p)
1293	<	{
1294	<	unsigned int sendq = DEFAULT_SENDQ;
1295	<	dlink_node *ptr;
1296	<	struct ConfItem *conf;
2940	<	struct ConfItem *class_conf;
2941	<	struct ClassItem *aclass;
2942	<	struct AccessItem *aconf;
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289	>
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291	>	ConfigChannel.max_channels);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297
1298	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
1299	<	{
1300	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2947	<	{
2948	<	conf = ptr->data;
2949	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2950	<	|| (conf->type == CLIENT_TYPE))
2951	<	{
2952	<	aconf = (struct AccessItem *)map_to_conf(conf);
2953	<	if ((class_conf = aconf->class_ptr) == NULL)
2954	<	continue;
2955	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2956	<	sendq = MaxSendq(aclass);
2957	<	return sendq;
2958	<	}
2959	<	}
2960	<	}
2961	<	/* XXX return a default?
2962	<	* if here, then there wasn't an attached conf with a sendq
2963	<	* that is very bad -Dianora
1298	>	/*
1299	>	* message_locale may have changed.  rebuild isupport since it relies
1300	>	* on strlen(form_str(RPL_ISUPPORT))
1301		*/
1302	<	return DEFAULT_SENDQ;
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
1306		*
1307		* inputs       - pointer to config item
1308		* output       - NONE
1309	<	* side effects - Add a class pointer to a conf
1309	>	* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	struct AccessItem *aconf = map_to_conf(conf);
2978	<	struct ClassItem *class = NULL;
2979	<
2980	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316	<	aconf->class_ptr = class_default;
1316	>	conf->class = class_default;
1317
1318	<	if (conf->type == CLIENT_TYPE)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1320	<	"Warning *** Defaulting to default class for %s@%s",
1321	<	aconf->user, aconf->host);
1318	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320	>	"Warning *** Defaulting to default class for %s@%s",
1321	>	conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1324	<	"Warning *** Defaulting to default class for %s",
1325	<	conf->name);
2992	<	}
2993	<	else
2994	<	aconf->class_ptr = find_class(class_name);
2995	<
2996	<	if (aconf->class_ptr)
2997	<	class = map_to_conf(aconf->class_ptr);
2998	<
2999	<	if (aconf->class_ptr == NULL || !class->active)
3000	<	{
3001	<	if (conf->type == CLIENT_TYPE)
3002	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3003	<	"Warning *** Defaulting to default class for %s@%s",
3004	<	aconf->user, aconf->host);
3005	<	else
3006	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3007	<	"Warning *** Defaulting to default class for %s",
3008	<	conf->name);
3009	<	aconf->class_ptr = class_default;
3010	<	}
3011	<	}
3012	<
3013	<	/* conf_add_server()
3014	<	*
3015	<	* inputs       - pointer to config item
3016	<	*              - pointer to link count already on this conf
3017	<	* output       - NONE
3018	<	* side effects - Add a connect block
3019	<	*/
3020	<	int
3021	<	conf_add_server(struct ConfItem *conf, const char *class_name)
3022	<	{
3023	<	struct AccessItem *aconf;
3024	<	struct split_nuh_item nuh;
3025	<	char conf_user[USERLEN + 1];
3026	<	char conf_host[HOSTLEN + 1];
3027	<
3028	<	aconf = map_to_conf(conf);
3029	<
3030	<	conf_add_class_to_conf(conf, class_name);
3031	<
3032	<	if (!aconf->host || !conf->name)
3033	<	{
3034	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3035	<	ilog(L_WARN, "Bad connect block");
3036	<	return -1;
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324	>	"Warning *** Defaulting to default class for %s",
1325	>	conf->name);
1326		}
3038	–
3039	–	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
3040	–	{
3041	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3042	–	conf->name);
3043	–	ilog(L_WARN, "Bad connect block, host %s", conf->name);
3044	–	return -1;
3045	–	}
3046	–
3047	–	nuh.nuhmask  = aconf->host;
3048	–	nuh.nickptr  = NULL;
3049	–	nuh.userptr  = conf_user;
3050	–	nuh.hostptr  = conf_host;
3051	–
3052	–	nuh.nicksize = 0;
3053	–	nuh.usersize = sizeof(conf_user);
3054	–	nuh.hostsize = sizeof(conf_host);
3055	–
3056	–	split_nuh(&nuh);
3057	–
3058	–	MyFree(aconf->host);
3059	–	aconf->host = NULL;
3060	–
3061	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3062	–	got lost in H6/7, will have to be re-added */
3063	–	DupString(aconf->host, conf_host);
3064	–
3065	–	lookup_confhost(conf);
3066	–
3067	–	return 0;
1327		}
1328
1329		/* yyerror()
#	Line 3082 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345	>	"\"%s\", line %u: %s: %s",
1346		conffilebuf, lineno + 1, msg, newlinebuf);
1347	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1347	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1348		conffilebuf, lineno + 1, msg, newlinebuf);
1349		}
1350
1351	<	int
1352	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1351	>	void
1352	>	conf_error_report(const char *msg)
1353		{
1354	<	if (fbgets(lbuf, max_size, fb) == NULL)
3095	<	return 0;
3096	<
3097	<	return strlen(lbuf);
3098	<	}
1354	>	char newlinebuf[IRCD_BUFSIZE];
1355
1356	<	int
1357	<	conf_yy_fatal_error(const char *msg)
1358	<	{
1359	<	return 0;
1356	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358	>	"\"%s\", line %u: %s: %s",
1359	>	conffilebuf, lineno + 1, msg, newlinebuf);
1360	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1361	>	conffilebuf, lineno + 1, msg, newlinebuf);
1362		}
1363
1364		/*
1365		* valid_tkline()
1366	<	*
1366	>	*
1367		* inputs       - pointer to ascii string to check
1368		*              - whether the specified time is in seconds or minutes
1369		* output       - -1 not enough parameters
#	Line 3114 | Line 1372 | conf_yy_fatal_error(const char *msg)
1372		* Originally written by Dianora (Diane, db@db.net)
1373		*/
1374		time_t
1375	<	valid_tkline(char *p, int minutes)
1375	>	valid_tkline(const char *data, const int minutes)
1376		{
1377	+	const unsigned char *p = (const unsigned char *)data;
1378	+	unsigned char tmpch = '\0';
1379		time_t result = 0;
1380
1381	<	while (*p)
1381	>	while ((tmpch = *p++))
1382		{
1383	<	if (IsDigit(*p))
3124	<	{
3125	<	result *= 10;
3126	<	result += ((*p) & 0xF);
3127	<	p++;
3128	<	}
3129	<	else
1383	>	if (!IsDigit(tmpch))
1384		return 0;
1385	+
1386	+	result *= 10;
1387	+	result += (tmpch & 0xF);
1388		}
1389
1390	<	/* in the degenerate case where oper does a /quote kline 0 user@host :reason
1391	<	* i.e. they specifically use 0, I am going to return 1 instead
1392	<	* as a return value of non-zero is used to flag it as a temporary kline
1390	>	/*
1391	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1393	>	* value of non-zero is used to flag it as a temporary kline
1394		*/
3137	–
1395		if (result == 0)
1396		result = 1;
1397
1398	<	/*
1398	>	/*
1399		* If the incoming time is in seconds convert it to minutes for the purpose
1400		* of this calculation
1401		*/
1402		if (!minutes)
1403	<	result = result / (time_t)60;
1403	>	result = result / 60;
1404
1405		if (result > MAX_TDKLINE_TIME)
1406		result = MAX_TDKLINE_TIME;
1407
1408	<	result = result * (time_t)60;  /* turn it into seconds */
1408	>	result = result * 60;  /* Turn it into seconds */
1409
1410		return result;
1411		}
1412
1413	+	/* valid_wild_card_simple()
1414	+	*
1415	+	* inputs       - data to check for sufficient non-wildcard characters
1416	+	* outputs      - 1 if valid, else 0
1417	+	* side effects - none
1418	+	*/
1419	+	int
1420	+	valid_wild_card_simple(const char *data)
1421	+	{
1422	+	const unsigned char *p = (const unsigned char *)data;
1423	+	unsigned char tmpch = '\0';
1424	+	unsigned int nonwild = 0, wild = 0;
1425	+
1426	+	while ((tmpch = *p++))
1427	+	{
1428	+	if (tmpch == '\\' && *p)
1429	+	{
1430	+	++p;
1431	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1432	+	return 1;
1433	+	}
1434	+	else if (!IsMWildChar(tmpch))
1435	+	{
1436	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437	+	return 1;
1438	+	}
1439	+	else
1440	+	++wild;
1441	+	}
1442	+
1443	+	return !wild;
1444	+	}
1445	+
1446		/* valid_wild_card()
1447		*
1448		* input        - pointer to client
#	Line 3162 | Line 1452 | valid_tkline(char *p, int minutes)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457	<	char *p;
1458	<	char tmpch;
3169	<	int nonwild = 0;
1457	>	unsigned char tmpch = '\0';
1458	>	unsigned int nonwild = 0;
1459		va_list args;
1460
1461		/*
#	Line 3185 | Line 1474 | valid_wild_card(struct Client *source_p,
1474
1475		while (count--)
1476		{
1477	<	p = va_arg(args, char *);
1477	>	const unsigned char *p = va_arg(args, const unsigned char *);
1478		if (p == NULL)
1479		continue;
1480
#	Line 3197 | Line 1486 | valid_wild_card(struct Client *source_p,
1486		* If we find enough non-wild characters, we can
1487		* break - no point in searching further.
1488		*/
1489	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1489	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1490	>	{
1491	>	va_end(args);
1492		return 1;
1493	+	}
1494		}
1495		}
1496		}
1497
1498	<	if (warn)
1499	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1500	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1498	>	if (IsClient(source_p))
1499	>	sendto_one_notice(source_p, &me,
1500	>	":Please include at least %u non-wildcard characters with the mask",
1501	>	ConfigGeneral.min_nonwildcard);
1502	>	va_end(args);
1503	>	return 0;
1504	>	}
1505	>
1506	>	/* find_user_host()
1507	>	*
1508	>	* inputs       - pointer to client placing kline
1509	>	*              - pointer to user_host_or_nick
1510	>	*              - pointer to user buffer
1511	>	*              - pointer to host buffer
1512	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1513	>	* side effects -
1514	>	*/
1515	>	static int
1516	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	>	char *luser, char *lhost)
1518	>	{
1519	>	struct Client *target_p = NULL;
1520	>	char *hostp = NULL;
1521	>
1522	>	if (lhost == NULL)
1523	>	{
1524	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1525	>	return 1;
1526	>	}
1527	>
1528	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1529	>	{
1530	>	/* Explicit user@host mask given */
1531	>	if (hostp)                            /* I'm a little user@host */
1532	>	{
1533	>	*(hostp++) = '\0';                       /* short and squat */
1534	>
1535	>	if (*user_host_or_nick)
1536	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1537	>	else
1538	>	strcpy(luser, "*");
1539	>
1540	>	if (*hostp)
1541	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1542	>	else
1543	>	strcpy(lhost, "*");
1544	>	}
1545	>	else
1546	>	{
1547	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1548	>	luser[1] = '\0';
1549	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1550	>	}
1551	>
1552	>	return 1;
1553	>	}
1554	>	else
1555	>	{
1556	>	/* Try to find user@host mask from nick */
1557	>	/* Okay to use source_p as the first param, because source_p == client_p */
1558	>	if ((target_p =
1559	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1560	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561	>
1562	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563	>	{
1564	>	if (IsClient(source_p))
1565	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1566	>	return 0;
1567	>	}
1568	>
1569	>	/*
1570	>	* Turn the "user" bit into "*user", blow away '~'
1571	>	* if found in original user name (non-idented)
1572	>	*/
1573	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1574	>
1575	>	if (target_p->username[0] == '~')
1576	>	luser[0] = '*';
1577	>
1578	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579	>	return 1;
1580	>	}
1581	>
1582		return 0;
1583		}
1584
#	Line 3219 | Line 1592 | valid_wild_card(struct Client *source_p,
1592		*              - parse_flags bit map of things to test
1593		*              - pointer to user or string to parse into
1594		*              - pointer to host or NULL to parse into if non NULL
1595	<	*              - pointer to optional tkline time or NULL
1595	>	*              - pointer to optional tkline time or NULL
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 3241 | Line 1614 | valid_wild_card(struct Client *source_p,
1614		*/
1615		int
1616		parse_aline(const char *cmd, struct Client *source_p,
1617	<	int parc, char **parv,
1618	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1619	<	char **target_server, char **reason)
1617	>	int parc, char **parv,
1618	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1619	>	char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = "No Reason";
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 3255 | Line 1628 | parse_aline(const char *cmd, struct Clie
1628
1629		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1630
1631	<	if (found_tkline_time != 0)
1631	>	if (found_tkline_time)
1632		{
1633		parv++;
1634		parc--;
1635
1636	<	if (tkline_time != NULL)
1636	>	if (tkline_time)
1637		*tkline_time = found_tkline_time;
1638		else
1639		{
1640	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1641	<	me.name, source_p->name, cmd);
3269	<	return -1;
1640	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1648	<	me.name, source_p->name, cmd);
3277	<	return -1;
1647	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
1660		}
1661	<
1661	>
1662		parc--;
1663		parv++;
1664
1665	<	if (parc != 0)
1665	>	if (parc)
1666		{
1667		if (irccmp(*parv, "ON") == 0)
1668		{
1669		parc--;
1670		parv++;
1671
1672	<	if (target_server == NULL)
3302	<	{
3303	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
3304	<	me.name, source_p->name, cmd);
3305	<	return -1;
3306	<	}
3307	<
3308	<	if (!IsOperRemoteBan(source_p))
1672	>	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1675	<	me.name, source_p->name, "remoteban");
3312	<	return -1;
1674	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1681	<	me.name, source_p->name, cmd);
3319	<	return -1;
1680	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 3328 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		/* Make sure target_server *is* NULL if no ON server found
1691		* caller probably NULL'd it first, but no harm to do it again -db
1692		*/
1693	<	if (target_server != NULL)
1694	<	*target_server = NULL;
1693	>	if (target_server)
1694	>	*target_server = NULL;
1695		}
1696		}
1697
1698	<	if (h_p != NULL)
1698	>	if (h_p)
1699		{
1700	<	if (strchr(user, '!') != NULL)
1700	>	if (strchr(user, '!'))
1701		{
1702	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1703	<	me.name, source_p->name);
3342	<	return -1;
1702	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713	<	if (reason != NULL)
1713	>	if (reason)
1714		{
1715	<	if (parc != 0 && !EmptyString(*parv))
3355	<	{
1715	>	if (parc && !EmptyString(*parv))
1716		*reason = *parv;
3357	–	if (!valid_comment(source_p, *reason, YES))
3358	–	return -1;
3359	–	}
3360	–	else
3361	–	*reason = def_reason;
3362	–	}
3363	–
3364	–	return 1;
3365	–	}
3366	–
3367	–	/* find_user_host()
3368	–	*
3369	–	* inputs       - pointer to client placing kline
3370	–	*              - pointer to user_host_or_nick
3371	–	*              - pointer to user buffer
3372	–	*              - pointer to host buffer
3373	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3374	–	* side effects -
3375	–	*/
3376	–	static int
3377	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3378	–	char *luser, char *lhost, unsigned int flags)
3379	–	{
3380	–	struct Client *target_p = NULL;
3381	–	char *hostp = NULL;
3382	–
3383	–	if (lhost == NULL)
3384	–	{
3385	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3386	–	return 1;
3387	–	}
3388	–
3389	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3390	–	{
3391	–	/* Explicit user@host mask given */
3392	–
3393	–	if (hostp != NULL)                            /* I'm a little user@host */
3394	–	{
3395	–	*(hostp++) = '\0';                       /* short and squat */
3396	–	if (*user_host_or_nick)
3397	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3398	–	else
3399	–	strcpy(luser, "*");
3400	–	if (*hostp)
3401	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3402	–	else
3403	–	strcpy(lhost, "*");
3404	–	}
3405	–	else
3406	–	{
3407	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3408	–	luser[1] = '\0';
3409	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3410	–	}
3411	–
3412	–	return 1;
3413	–	}
3414	–	else if (!(flags & NOUSERLOOKUP))
3415	–	{
3416	–	/* Try to find user@host mask from nick */
3417	–	/* Okay to use source_p as the first param, because source_p == client_p */
3418	–	if ((target_p =
3419	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3420	–	return 0;
3421	–
3422	–	if (IsExemptKline(target_p))
3423	–	{
3424	–	if (!IsServer(source_p))
3425	–	sendto_one(source_p,
3426	–	":%s NOTICE %s :%s is E-lined",
3427	–	me.name, source_p->name, target_p->name);
3428	–	return 0;
3429	–	}
3430	–
3431	–	/*
3432	–	* turn the "user" bit into "*user", blow away '~'
3433	–	* if found in original user name (non-idented)
3434	–	*/
3435	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3436	–
3437	–	if (target_p->username[0] == '~')
3438	–	luser[0] = '*';
3439	–
3440	–	if (target_p->sockhost[0] == '\0' ||
3441	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3442	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1717		else
1718	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3445	<	return 1;
1718	>	*reason = default_reason;
1719		}
1720
3448	–	return 0;
3449	–	}
3450	–
3451	–	/* valid_comment()
3452	–	*
3453	–	* inputs       - pointer to client
3454	–	*              - pointer to comment
3455	–	* output       - 0 if no valid comment,
3456	–	*              - 1 if valid
3457	–	* side effects - truncates reason where necessary
3458	–	*/
3459	–	int
3460	–	valid_comment(struct Client *source_p, char *comment, int warn)
3461	–	{
3462	–	if (strchr(comment, '"'))
3463	–	{
3464	–	if (warn)
3465	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3466	–	me.name, source_p->name);
3467	–	return 0;
3468	–	}
3469	–
3470	–	if (strlen(comment) > REASONLEN)
3471	–	comment[REASONLEN-1] = '\0';
3472	–
1721		return 1;
1722		}
1723
#	Line 3481 | Line 1729 | valid_comment(struct Client *source_p, c
1729		* side effects - none
1730		*/
1731		int
1732	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1732	>	match_conf_password(const char *password, const struct MaskItem *conf)
1733		{
1734		const char *encr = NULL;
1735
1736	<	if (password == NULL || aconf->passwd == NULL)
1736	>	if (EmptyString(password) || EmptyString(conf->passwd))
1737		return 0;
1738
1739	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1740	<	{
3493	<	/* use first two chars of the password they send in as salt */
3494	<	/* If the password in the conf is MD5, and ircd is linked
3495	<	* to scrypt on FreeBSD, or the standard crypt library on
3496	<	* glibc Linux, then this code will work fine on generating
3497	<	* the proper encrypted hash for comparison.
3498	<	*/
3499	<	if (*aconf->passwd)
3500	<	encr = crypt(password, aconf->passwd);
3501	<	else
3502	<	encr = "";
3503	<	}
1739	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1740	>	encr = crypt(password, conf->passwd);
1741		else
1742		encr = password;
1743
1744	<	return !strcmp(encr, aconf->passwd);
1744	>	return encr && !strcmp(encr, conf->passwd);
1745		}
1746
1747		/*
#	Line 3512 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from s_serv.h
1753	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753	>	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
1756		* side effects - Take source_p send the pattern with args given
1757		*                along to all servers that match capab and cluster type
1758		*/
1759		void
1760	<	cluster_a_line(struct Client *source_p, const char *command,
1761	<	int capab, int cluster_type, const char *pattern, ...)
1760	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1761	>	unsigned int cluster_type, const char *pattern, ...)
1762		{
1763		va_list args;
1764	<	char buffer[IRCD_BUFSIZE];
1765	<	const dlink_node *ptr = NULL;
1764	>	char buffer[IRCD_BUFSIZE] = "";
1765	>	const dlink_node *node = NULL;
1766
1767		va_start(args, pattern);
1768		vsnprintf(buffer, sizeof(buffer), pattern, args);
1769		va_end(args);
1770
1771	<	DLINK_FOREACH(ptr, cluster_items.head)
1771	>	DLINK_FOREACH(node, cluster_items.head)
1772		{
1773	<	const struct ConfItem *conf = ptr->data;
1773	>	const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1777	<	"%s %s %s", command, conf->name, buffer);
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777	>	"%s %s %s", command, conf->name, buffer);
1778		}
1779		}
1780
#	Line 3576 | Line 1813 | split_nuh(struct split_nuh_item *const i
1813
1814		if (iptr->nickptr)
1815		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1816	+
1817		if (iptr->userptr)
1818		strlcpy(iptr->userptr, "*", iptr->usersize);
1819	+
1820		if (iptr->hostptr)
1821		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1822
#	Line 3585 | Line 1824 | split_nuh(struct split_nuh_item *const i
1824		{
1825		*p = '\0';
1826
1827	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1827	>	if (iptr->nickptr && *iptr->nuhmask)
1828		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1829
1830	<	if ((q = strchr(++p, '@'))) {
1830	>	if ((q = strchr(++p, '@')))
1831	>	{
1832		*q++ = '\0';
1833
1834	<	if (*p != '\0')
1834	>	if (*p)
1835		strlcpy(iptr->userptr, p, iptr->usersize);
1836
1837	<	if (*q != '\0')
1837	>	if (*q)
1838		strlcpy(iptr->hostptr, q, iptr->hostsize);
1839		}
1840		else
1841		{
1842	<	if (*p != '\0')
1842	>	if (*p)
1843		strlcpy(iptr->userptr, p, iptr->usersize);
1844		}
1845		}
#	Line 3611 | Line 1851 | split_nuh(struct split_nuh_item *const i
1851		/* if found a @ */
1852		*p++ = '\0';
1853
1854	<	if (*iptr->nuhmask != '\0')
1854	>	if (*iptr->nuhmask)
1855		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1856
1857	<	if (*p != '\0')
1857	>	if (*p)
1858		strlcpy(iptr->hostptr, p, iptr->hostsize);
1859		}
1860		else
1861		{
1862	<	/* no @ found */
1862	>	/* No @ found */
1863		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1864		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1865		else
#	Line 3627 | Line 1867 | split_nuh(struct split_nuh_item *const i
1867		}
1868		}
1869		}
3630	–
3631	–	/*
3632	–	* flags_to_ascii
3633	–	*
3634	–	* inputs       - flags is a bitmask
3635	–	*              - pointer to table of ascii letters corresponding
3636	–	*                to each bit
3637	–	*              - flag 1 for convert ToLower if bit missing
3638	–	*                0 if ignore.
3639	–	* output       - none
3640	–	* side effects - string pointed to by p has bitmap chars written to it
3641	–	*/
3642	–	static void
3643	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3644	–	int lowerit)
3645	–	{
3646	–	unsigned int mask = 1;
3647	–	int i = 0;
3648	–
3649	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3650	–	{
3651	–	if (flags & mask)
3652	–	*p++ = bit_table[i];
3653	–	else if (lowerit)
3654	–	*p++ = ToLower(bit_table[i]);
3655	–	}
3656	–	*p = '\0';
3657	–	}
3658	–
3659	–	/*
3660	–	* cidr_limit_reached
3661	–	*
3662	–	* inputs       - int flag allowing over_rule of limits
3663	–	*              - pointer to the ip to be added
3664	–	*              - pointer to the class
3665	–	* output       - non zero if limit reached
3666	–	*                0 if limit not reached
3667	–	* side effects -
3668	–	*/
3669	–	static int
3670	–	cidr_limit_reached(int over_rule,
3671	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3672	–	{
3673	–	dlink_node *ptr = NULL;
3674	–	struct CidrItem *cidr;
3675	–
3676	–	if (NumberPerCidr(aclass) <= 0)
3677	–	return 0;
3678	–
3679	–	if (ip->ss.ss_family == AF_INET)
3680	–	{
3681	–	if (CidrBitlenIPV4(aclass) <= 0)
3682	–	return 0;
3683	–
3684	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3685	–	{
3686	–	cidr = ptr->data;
3687	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3688	–	{
3689	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3690	–	return -1;
3691	–	cidr->number_on_this_cidr++;
3692	–	return 0;
3693	–	}
3694	–	}
3695	–	cidr = MyMalloc(sizeof(struct CidrItem));
3696	–	cidr->number_on_this_cidr = 1;
3697	–	cidr->mask = *ip;
3698	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3699	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3700	–	}
3701	–	#ifdef IPV6
3702	–	else if (CidrBitlenIPV6(aclass) > 0)
3703	–	{
3704	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3705	–	{
3706	–	cidr = ptr->data;
3707	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3708	–	{
3709	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3710	–	return -1;
3711	–	cidr->number_on_this_cidr++;
3712	–	return 0;
3713	–	}
3714	–	}
3715	–	cidr = MyMalloc(sizeof(struct CidrItem));
3716	–	cidr->number_on_this_cidr = 1;
3717	–	cidr->mask = *ip;
3718	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3719	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3720	–	}
3721	–	#endif
3722	–	return 0;
3723	–	}
3724	–
3725	–	/*
3726	–	* remove_from_cidr_check
3727	–	*
3728	–	* inputs       - pointer to the ip to be removed
3729	–	*              - pointer to the class
3730	–	* output       - NONE
3731	–	* side effects -
3732	–	*/
3733	–	static void
3734	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3735	–	{
3736	–	dlink_node *ptr = NULL;
3737	–	dlink_node *next_ptr = NULL;
3738	–	struct CidrItem *cidr;
3739	–
3740	–	if (NumberPerCidr(aclass) == 0)
3741	–	return;
3742	–
3743	–	if (ip->ss.ss_family == AF_INET)
3744	–	{
3745	–	if (CidrBitlenIPV4(aclass) <= 0)
3746	–	return;
3747	–
3748	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3749	–	{
3750	–	cidr = ptr->data;
3751	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3752	–	{
3753	–	cidr->number_on_this_cidr--;
3754	–	if (cidr->number_on_this_cidr == 0)
3755	–	{
3756	–	dlinkDelete(ptr, &aclass->list_ipv4);
3757	–	MyFree(cidr);
3758	–	return;
3759	–	}
3760	–	}
3761	–	}
3762	–	}
3763	–	#ifdef IPV6
3764	–	else if (CidrBitlenIPV6(aclass) > 0)
3765	–	{
3766	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3767	–	{
3768	–	cidr = ptr->data;
3769	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3770	–	{
3771	–	cidr->number_on_this_cidr--;
3772	–	if (cidr->number_on_this_cidr == 0)
3773	–	{
3774	–	dlinkDelete(ptr, &aclass->list_ipv6);
3775	–	MyFree(cidr);
3776	–	return;
3777	–	}
3778	–	}
3779	–	}
3780	–	}
3781	–	#endif
3782	–	}
3783	–
3784	–	static void
3785	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3786	–	dlink_list *old_list, dlink_list *new_list, int changed)
3787	–	{
3788	–	dlink_node *ptr;
3789	–	struct Client *client_p;
3790	–	struct ConfItem *conf;
3791	–	struct AccessItem *aconf;
3792	–
3793	–	if (!changed)
3794	–	{
3795	–	*new_list = *old_list;
3796	–	old_list->head = old_list->tail = NULL;
3797	–	old_list->length = 0;
3798	–	return;
3799	–	}
3800	–
3801	–	DLINK_FOREACH(ptr, local_client_list.head)
3802	–	{
3803	–	client_p = ptr->data;
3804	–	if (client_p->localClient->aftype != aftype)
3805	–	continue;
3806	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3807	–	continue;
3808	–
3809	–	conf = client_p->localClient->confs.tail->data;
3810	–	if (conf->type == CLIENT_TYPE)
3811	–	{
3812	–	aconf = map_to_conf(conf);
3813	–	if (aconf->class_ptr == oldcl)
3814	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3815	–	}
3816	–	}
3817	–	}
3818	–
3819	–	/*
3820	–	* rebuild_cidr_class
3821	–	*
3822	–	* inputs       - pointer to old conf
3823	–	*              - pointer to new_class
3824	–	* output       - none
3825	–	* side effects - rebuilds the class link list of cidr blocks
3826	–	*/
3827	–	void
3828	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3829	–	{
3830	–	struct ClassItem *old_class = map_to_conf(conf);
3831	–
3832	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3833	–	{
3834	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3835	–	rebuild_cidr_list(AF_INET, conf, new_class,
3836	–	&old_class->list_ipv4, &new_class->list_ipv4,
3837	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3838	–
3839	–	#ifdef IPV6
3840	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3841	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3842	–	&old_class->list_ipv6, &new_class->list_ipv6,
3843	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3844	–	#endif
3845	–	}
3846	–
3847	–	destroy_cidr_class(old_class);
3848	–	}
3849	–
3850	–	/*
3851	–	* destroy_cidr_list
3852	–	*
3853	–	* inputs       - pointer to class dlink list of cidr blocks
3854	–	* output       - none
3855	–	* side effects - completely destroys the class link list of cidr blocks
3856	–	*/
3857	–	static void
3858	–	destroy_cidr_list(dlink_list *list)
3859	–	{
3860	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3861	–
3862	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3863	–	{
3864	–	dlinkDelete(ptr, list);
3865	–	MyFree(ptr->data);
3866	–	}
3867	–	}
3868	–
3869	–	/*
3870	–	* destroy_cidr_class
3871	–	*
3872	–	* inputs       - pointer to class
3873	–	* output       - none
3874	–	* side effects - completely destroys the class link list of cidr blocks
3875	–	*/
3876	–	static void
3877	–	destroy_cidr_class(struct ClassItem *aclass)
3878	–	{
3879	–	destroy_cidr_list(&aclass->list_ipv4);
3880	–	destroy_cidr_list(&aclass->list_ipv6);
3881	–	}

Diff Legend

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