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

Diff Legend

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