ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_conf.c (file contents), Revision 1306 by michael, Sat Mar 24 07:43:04 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 5805 by michael, Tue Apr 21 21:49:58 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	<	#include "balloc.h"
31	<	#include "s_conf.h"
32	<	#include "s_serv.h"
30	>	#include "conf.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
35	–	#include "hash.h"
36	–	#include "hook.h"
37		#include "irc_string.h"
38	–	#include "sprintf_irc.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
40		#include "listener.h"
#	Line 43 | 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"
48	–	#include "s_gline.h"
49	–	#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		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58
59	<	struct Callback *client_check_cb = NULL;
60	<	struct config_server_hide ConfigServerHide;
59	>
60	>	struct config_channel_entry ConfigChannel;
61	>	struct config_serverhide_entry ConfigServerHide;
62	>	struct config_general_entry ConfigGeneral;
63	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
64	>	struct config_serverinfo_entry ConfigServerInfo;
65	>	struct config_admin_entry ConfigAdminInfo;
66	>	struct conf_parser_context conf_parser_ctx;
67
68		/* general conf items link list root, other than k lines etc. */
69	<	dlink_list service_items = { NULL, NULL, 0 };
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 };
70	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
71	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
72	<	dlink_list nresv_items   = { NULL, NULL, 0 };
73	<	dlink_list class_items   = { NULL, NULL, 0 };
74	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
75	<
76	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
79	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
80	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
81	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
82	<	dlink_list temporary_resv = { NULL, NULL, 0 };
69	>	dlink_list service_items;
70	>	dlink_list server_items;
71	>	dlink_list cluster_items;
72	>	dlink_list oconf_items;
73	>	dlink_list uconf_items;
74	>	dlink_list xconf_items;
75	>	dlink_list nresv_items;
76	>	dlink_list cresv_items;
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
87	–	extern char yytext[];
81		extern int yyparse(); /* defined in y.tab.c */
82
90	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
91	–
92	–	/* internally defined functions */
93	–	static void lookup_confhost(struct ConfItem *);
94	–	static void set_default_conf(void);
95	–	static void validate_conf(void);
96	–	static void read_conf(FBFILE *);
97	–	static void clear_out_old_conf(void);
98	–	static void flush_deleted_I_P(void);
99	–	static void expire_tklines(dlink_list *);
100	–	static void garbage_collect_ip_entries(void);
101	–	static int hash_ip(struct irc_ssaddr *);
102	–	static int verify_access(struct Client *, const char *);
103	–	static int attach_iline(struct Client *, struct ConfItem *);
104	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
105	–	static void parse_conf_file(int, int);
106	–	static dlink_list *map_to_list(ConfType);
107	–	static struct AccessItem *find_regexp_kline(const char *[]);
108	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
109	–
110	–	/*
111	–	* bit_len
112	–	*/
113	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
114	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
115	–	static void destroy_cidr_class(struct ClassItem *);
116	–
117	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
118	–
119	–	/* address of default class conf */
120	–	static struct ConfItem *class_default;
121	–
122	–	/* usually, with hash tables, you use a prime number...
123	–	* but in this case I am dealing with ip addresses,
124	–	* not ascii strings.
125	–	*/
126	–	#define IP_HASH_SIZE 0x1000
127	–
128	–	struct ip_entry
129	–	{
130	–	struct irc_ssaddr ip;
131	–	int count;
132	–	time_t last_attempt;
133	–	struct ip_entry *next;
134	–	};
135	–
136	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
137	–	static BlockHeap *ip_entry_heap = NULL;
138	–	static int ip_entries_count = 0;
139	–
140	–
141	–	void *
142	–	map_to_conf(struct ConfItem *aconf)
143	–	{
144	–	void *conf;
145	–	conf = (void *)((uintptr_t)aconf +
146	–	(uintptr_t)sizeof(struct ConfItem));
147	–	return(conf);
148	–	}
149	–
150	–	struct ConfItem *
151	–	unmap_conf_item(void *aconf)
152	–	{
153	–	struct ConfItem *conf;
154	–
155	–	conf = (struct ConfItem *)((uintptr_t)aconf -
156	–	(uintptr_t)sizeof(struct ConfItem));
157	–	return(conf);
158	–	}
83
84		/* conf_dns_callback()
85		*
86	<	* inputs       - pointer to struct AccessItem
86	>	* inputs       - pointer to struct MaskItem
87		*              - pointer to DNSReply reply
88		* output       - none
89		* side effects - called when resolver query finishes
#	Line 168 | Line 92 | unmap_conf_item(void *aconf)
92		* if successful save hp in the conf item it was called with
93		*/
94		static void
95	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
95	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
96		{
97	<	struct AccessItem *aconf = vptr;
97	>	struct MaskItem *const conf = vptr;
98
99	<	aconf->dns_pending = 0;
99	>	conf->dns_pending = 0;
100
101	<	if (addr != NULL)
102	<	memcpy(&aconf->ipnum, addr, sizeof(aconf->ipnum));
101	>	if (addr)
102	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104	<	aconf->dns_failed = 1;
104	>	conf->dns_failed = 1;
105		}
106
107		/* conf_dns_lookup()
#	Line 187 | Line 111 | conf_dns_callback(void *vptr, const stru
111		* allocate a dns_query and start ns lookup.
112		*/
113		static void
114	<	conf_dns_lookup(struct AccessItem *aconf)
114	>	conf_dns_lookup(struct MaskItem *conf)
115		{
116	<	if (!aconf->dns_pending)
117	<	{
118	<	aconf->dns_pending = 1;
119	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
120	<	}
116	>	if (conf->dns_pending)
117	>	return;
118	>
119	>	conf->dns_pending = 1;
120	>
121	>	if (conf->aftype == AF_INET)
122	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
123	>	else
124	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
125		}
126
127	<	/* make_conf_item()
127	>	/* map_to_list()
128		*
129	<	* inputs       - type of item
130	<	* output       - pointer to new conf entry
131	<	* side effects - none
129	>	* inputs       - ConfType conf
130	>	* output       - pointer to dlink_list to use
131	>	* side effects - none
132		*/
133	<	struct ConfItem *
134	<	make_conf_item(ConfType type)
133	>	static dlink_list *
134	>	map_to_list(enum maskitem_type type)
135		{
208	–	struct ConfItem *conf = NULL;
209	–	struct AccessItem *aconf = NULL;
210	–	struct ClassItem *aclass = NULL;
211	–	int status = 0;
212	–
136		switch (type)
137		{
138	<	case DLINE_TYPE:
139	<	case EXEMPTDLINE_TYPE:
217	<	case GLINE_TYPE:
218	<	case KLINE_TYPE:
219	<	case CLIENT_TYPE:
220	<	case OPER_TYPE:
221	<	case SERVER_TYPE:
222	<	conf = MyMalloc(sizeof(struct ConfItem) +
223	<	sizeof(struct AccessItem));
224	<	aconf = map_to_conf(conf);
225	<	aconf->aftype = AF_INET;
226	<
227	<	/* Yes, sigh. switch on type again */
228	<	switch (type)
229	<	{
230	<	case EXEMPTDLINE_TYPE:
231	<	status = CONF_EXEMPTDLINE;
138	>	case CONF_XLINE:
139	>	return &xconf_items;
140		break;
141	<
142	<	case DLINE_TYPE:
235	<	status = CONF_DLINE;
141	>	case CONF_ULINE:
142	>	return &uconf_items;
143		break;
144	<
145	<	case KLINE_TYPE:
239	<	status = CONF_KLINE;
144	>	case CONF_NRESV:
145	>	return &nresv_items;
146		break;
147	<
148	<	case GLINE_TYPE:
243	<	status = CONF_GLINE;
147	>	case CONF_CRESV:
148	>	return &cresv_items;
149		break;
150	<
151	<	case CLIENT_TYPE:
247	<	status = CONF_CLIENT;
150	>	case CONF_OPER:
151	>	return &oconf_items;
152		break;
153	<
154	<	case OPER_TYPE:
251	<	status = CONF_OPERATOR;
252	<	dlinkAdd(conf, &conf->node, &oconf_items);
153	>	case CONF_SERVER:
154	>	return &server_items;
155		break;
156	<
157	<	case SERVER_TYPE:
256	<	status = CONF_SERVER;
257	<	dlinkAdd(conf, &conf->node, &server_items);
156	>	case CONF_SERVICE:
157	>	return &service_items;
158		break;
159	<
160	<	default:
159	>	case CONF_CLUSTER:
160	>	return &cluster_items;
161		break;
262	–	}
263	–	aconf->status = status;
264	–	break;
265	–
266	–	case LEAF_TYPE:
267	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
268	–	sizeof(struct MatchItem));
269	–	dlinkAdd(conf, &conf->node, &leaf_items);
270	–	break;
271	–
272	–	case HUB_TYPE:
273	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
274	–	sizeof(struct MatchItem));
275	–	dlinkAdd(conf, &conf->node, &hub_items);
276	–	break;
277	–
278	–	case ULINE_TYPE:
279	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
280	–	sizeof(struct MatchItem));
281	–	dlinkAdd(conf, &conf->node, &uconf_items);
282	–	break;
283	–
284	–	case GDENY_TYPE:
285	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
286	–	sizeof(struct AccessItem));
287	–	dlinkAdd(conf, &conf->node, &gdeny_items);
288	–	break;
289	–
290	–	case XLINE_TYPE:
291	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
292	–	sizeof(struct MatchItem));
293	–	dlinkAdd(conf, &conf->node, &xconf_items);
294	–	break;
295	–	#ifdef HAVE_LIBPCRE
296	–	case RXLINE_TYPE:
297	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
298	–	sizeof(struct MatchItem));
299	–	dlinkAdd(conf, &conf->node, &rxconf_items);
300	–	break;
301	–
302	–	case RKLINE_TYPE:
303	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
304	–	sizeof(struct AccessItem));
305	–	aconf = map_to_conf(conf);
306	–	aconf->status = CONF_KLINE;
307	–	dlinkAdd(conf, &conf->node, &rkconf_items);
308	–	break;
309	–	#endif
310	–	case CLUSTER_TYPE:
311	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
312	–	dlinkAdd(conf, &conf->node, &cluster_items);
313	–	break;
314	–
315	–	case CRESV_TYPE:
316	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
317	–	sizeof(struct ResvChannel));
318	–	break;
319	–
320	–	case NRESV_TYPE:
321	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
322	–	sizeof(struct MatchItem));
323	–	dlinkAdd(conf, &conf->node, &nresv_items);
324	–	break;
325	–
326	–	case SERVICE_TYPE:
327	–	status = CONF_SERVICE;
328	–	conf = MyMalloc(sizeof(struct ConfItem));
329	–	dlinkAdd(conf, &conf->node, &service_items);
330	–	break;
331	–
332	–	case CLASS_TYPE:
333	–	conf = MyMalloc(sizeof(struct ConfItem) +
334	–	sizeof(struct ClassItem));
335	–	dlinkAdd(conf, &conf->node, &class_items);
336	–
337	–	aclass = map_to_conf(conf);
338	–	aclass->active = 1;
339	–	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
340	–	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
341	–	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
342	–	MaxSendq(aclass) = DEFAULT_SENDQ;
343	–
344	–	break;
345	–
346	–	default:
347	–	conf = NULL;
348	–	break;
349	–	}
350	–
351	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
352	–	conf->type = type;
353	–
354	–	return conf;
355	–	}
356	–
357	–	void
358	–	delete_conf_item(struct ConfItem *conf)
359	–	{
360	–	dlink_node *m = NULL;
361	–	struct MatchItem *match_item;
362	–	struct AccessItem *aconf;
363	–	ConfType type = conf->type;
364	–
365	–	MyFree(conf->name);
366	–	conf->name = NULL;
367	–
368	–	switch(type)
369	–	{
370	–	case DLINE_TYPE:
371	–	case EXEMPTDLINE_TYPE:
372	–	case GLINE_TYPE:
373	–	case KLINE_TYPE:
374	–	case CLIENT_TYPE:
375	–	case OPER_TYPE:
376	–	case SERVER_TYPE:
377	–	aconf = map_to_conf(conf);
378	–
379	–	if (aconf->dns_pending)
380	–	delete_resolver_queries(aconf);
381	–	if (aconf->passwd != NULL)
382	–	memset(aconf->passwd, 0, strlen(aconf->passwd));
383	–	if (aconf->spasswd != NULL)
384	–	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
385	–	aconf->class_ptr = NULL;
386	–
387	–	MyFree(aconf->passwd);
388	–	MyFree(aconf->spasswd);
389	–	MyFree(aconf->reason);
390	–	MyFree(aconf->oper_reason);
391	–	MyFree(aconf->user);
392	–	MyFree(aconf->host);
393	–	MyFree(aconf->cipher_list);
394	–	#ifdef HAVE_LIBCRYPTO
395	–	if (aconf->rsa_public_key)
396	–	RSA_free(aconf->rsa_public_key);
397	–	MyFree(aconf->rsa_public_key_file);
398	–	#endif
399	–
400	–	/* Yes, sigh. switch on type again */
401	–	switch(type)
402	–	{
403	–	case EXEMPTDLINE_TYPE:
404	–	case DLINE_TYPE:
405	–	case GLINE_TYPE:
406	–	case KLINE_TYPE:
407	–	case CLIENT_TYPE:
408	–	MyFree(conf);
409	–	break;
410	–
411	–	case OPER_TYPE:
412	–	aconf = map_to_conf(conf);
413	–	if (!IsConfIllegal(aconf))
414	–	dlinkDelete(&conf->node, &oconf_items);
415	–	MyFree(conf);
416	–	break;
417	–
418	–	case SERVER_TYPE:
419	–	aconf = map_to_conf(conf);
420	–	if (!IsConfIllegal(aconf))
421	–	dlinkDelete(&conf->node, &server_items);
422	–	MyFree(conf);
423	–	break;
424	–
162		default:
163	<	break;
427	<	}
428	<	break;
429	<
430	<	case HUB_TYPE:
431	<	match_item = map_to_conf(conf);
432	<	MyFree(match_item->user);
433	<	MyFree(match_item->host);
434	<	MyFree(match_item->reason);
435	<	MyFree(match_item->oper_reason);
436	<	/* If marked illegal, its already been pulled off of the hub_items list */
437	<	if (!match_item->illegal)
438	<	dlinkDelete(&conf->node, &hub_items);
439	<	MyFree(conf);
440	<	break;
441	<
442	<	case LEAF_TYPE:
443	<	match_item = map_to_conf(conf);
444	<	MyFree(match_item->user);
445	<	MyFree(match_item->host);
446	<	MyFree(match_item->reason);
447	<	MyFree(match_item->oper_reason);
448	<	/* If marked illegal, its already been pulled off of the leaf_items list */
449	<	if (!match_item->illegal)
450	<	dlinkDelete(&conf->node, &leaf_items);
451	<	MyFree(conf);
452	<	break;
453	<
454	<	case ULINE_TYPE:
455	<	match_item = map_to_conf(conf);
456	<	MyFree(match_item->user);
457	<	MyFree(match_item->host);
458	<	MyFree(match_item->reason);
459	<	MyFree(match_item->oper_reason);
460	<	dlinkDelete(&conf->node, &uconf_items);
461	<	MyFree(conf);
462	<	break;
463	<
464	<	case XLINE_TYPE:
465	<	match_item = map_to_conf(conf);
466	<	MyFree(match_item->user);
467	<	MyFree(match_item->host);
468	<	MyFree(match_item->reason);
469	<	MyFree(match_item->oper_reason);
470	<	dlinkDelete(&conf->node, &xconf_items);
471	<	MyFree(conf);
472	<	break;
473	<	#ifdef HAVE_LIBPCRE
474	<	case RKLINE_TYPE:
475	<	aconf = map_to_conf(conf);
476	<	MyFree(aconf->regexuser);
477	<	MyFree(aconf->regexhost);
478	<	MyFree(aconf->user);
479	<	MyFree(aconf->host);
480	<	MyFree(aconf->reason);
481	<	MyFree(aconf->oper_reason);
482	<	dlinkDelete(&conf->node, &rkconf_items);
483	<	MyFree(conf);
484	<	break;
485	<
486	<	case RXLINE_TYPE:
487	<	MyFree(conf->regexpname);
488	<	match_item = map_to_conf(conf);
489	<	MyFree(match_item->user);
490	<	MyFree(match_item->host);
491	<	MyFree(match_item->reason);
492	<	MyFree(match_item->oper_reason);
493	<	dlinkDelete(&conf->node, &rxconf_items);
494	<	MyFree(conf);
495	<	break;
496	<	#endif
497	<	case NRESV_TYPE:
498	<	match_item = map_to_conf(conf);
499	<	MyFree(match_item->user);
500	<	MyFree(match_item->host);
501	<	MyFree(match_item->reason);
502	<	MyFree(match_item->oper_reason);
503	<	dlinkDelete(&conf->node, &nresv_items);
504	<
505	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
506	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
507	<	free_dlink_node(m);
508	<
509	<	MyFree(conf);
510	<	break;
511	<
512	<	case GDENY_TYPE:
513	<	aconf = map_to_conf(conf);
514	<	MyFree(aconf->user);
515	<	MyFree(aconf->host);
516	<	dlinkDelete(&conf->node, &gdeny_items);
517	<	MyFree(conf);
518	<	break;
519	<
520	<	case CLUSTER_TYPE:
521	<	dlinkDelete(&conf->node, &cluster_items);
522	<	MyFree(conf);
523	<	break;
524	<
525	<	case CRESV_TYPE:
526	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
527	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
528	<	free_dlink_node(m);
529	<
530	<	MyFree(conf);
531	<	break;
532	<
533	<	case CLASS_TYPE:
534	<	dlinkDelete(&conf->node, &class_items);
535	<	MyFree(conf);
536	<	break;
537	<
538	<	case SERVICE_TYPE:
539	<	dlinkDelete(&conf->node, &service_items);
540	<	MyFree(conf);
541	<	break;
542	<
543	<	default:
544	<	break;
163	>	return NULL;
164		}
165		}
166
167	<	/* free_access_item()
168	<	*
550	<	* inputs       - pointer to conf to free
551	<	* output       - none
552	<	* side effects - crucial password fields are zeroed, conf is freed
553	<	*/
554	<	void
555	<	free_access_item(struct AccessItem *aconf)
167	>	struct MaskItem *
168	>	conf_make(enum maskitem_type type)
169		{
170	<	struct ConfItem *conf;
170	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
171	>	dlink_list *list = NULL;
172
173	<	if (aconf == NULL)
174	<	return;
175	<	conf = unmap_conf_item(aconf);
562	<	delete_conf_item(conf);
563	<	}
173	>	conf->type   = type;
174	>	conf->active = 1;
175	>	conf->aftype = AF_INET;
176
177	<	static const unsigned int shared_bit_table[] =
178	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
177	>	if ((list = map_to_list(type)))
178	>	dlinkAdd(conf, &conf->node, list);
179	>	return conf;
180	>	}
181
568	–	/* report_confitem_types()
569	–	*
570	–	* inputs       - pointer to client requesting confitem report
571	–	*              - ConfType to report
572	–	* output       - none
573	–	* side effects -
574	–	*/
182		void
183	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
183	>	conf_free(struct MaskItem *conf)
184		{
185	<	dlink_node *ptr = NULL;
186	<	struct ConfItem *conf = NULL;
580	<	struct AccessItem *aconf = NULL;
581	<	struct MatchItem *matchitem = NULL;
582	<	struct ClassItem *classitem = NULL;
583	<	char buf[12];
584	<	char *p = NULL;
585	<	const char *pfx = NULL;
586	<
587	<	switch (type)
588	<	{
589	<	case GDENY_TYPE:
590	<	DLINK_FOREACH(ptr, gdeny_items.head)
591	<	{
592	<	conf = ptr->data;
593	<	aconf = map_to_conf(conf);
594	<
595	<	p = buf;
185	>	dlink_node *node = NULL, *node_next = NULL;
186	>	dlink_list *list = NULL;
187
188	<	if (aconf->flags & GDENY_BLOCK)
189	<	*p++ = 'B';
599	<	else
600	<	*p++ = 'b';
601	<
602	<	if (aconf->flags & GDENY_REJECT)
603	<	*p++ = 'R';
604	<	else
605	<	*p++ = 'r';
606	<
607	<	*p = '\0';
608	<
609	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
610	<	me.name, RPL_STATSDEBUG, source_p->name,
611	<	aconf->user, aconf->host, conf->name, buf);
612	<	}
613	<	break;
614	<
615	<	case XLINE_TYPE:
616	<	DLINK_FOREACH(ptr, xconf_items.head)
617	<	{
618	<	conf = ptr->data;
619	<	matchitem = map_to_conf(conf);
188	>	if ((list = map_to_list(conf->type)))
189	>	dlinkFindDelete(list, conf);
190
191	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
622	<	me.name, source_p->name,
623	<	matchitem->hold ? "x": "X", matchitem->count,
624	<	conf->name, matchitem->reason);
625	<	}
626	<	break;
627	<
628	<	#ifdef HAVE_LIBPCRE
629	<	case RXLINE_TYPE:
630	<	DLINK_FOREACH(ptr, rxconf_items.head)
631	<	{
632	<	conf = ptr->data;
633	<	matchitem = map_to_conf(conf);
634	<
635	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
636	<	me.name, source_p->name,
637	<	matchitem->hold ? "xR": "XR", matchitem->count,
638	<	conf->name, matchitem->reason);
639	<	}
640	<	break;
641	<
642	<	case RKLINE_TYPE:
643	<	pfx = temp ? "kR" : "KR";
644	<
645	<	DLINK_FOREACH(ptr, rkconf_items.head)
646	<	{
647	<	aconf = map_to_conf((conf = ptr->data));
191	>	MyFree(conf->name);
192
193	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
194	<	continue;
193	>	if (conf->dns_pending)
194	>	delete_resolver_queries(conf);
195	>	if (conf->passwd)
196	>	memset(conf->passwd, 0, strlen(conf->passwd));
197	>	if (conf->spasswd)
198	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
199	>
200	>	conf->class = NULL;
201	>
202	>	MyFree(conf->passwd);
203	>	MyFree(conf->spasswd);
204	>	MyFree(conf->reason);
205	>	MyFree(conf->certfp);
206	>	MyFree(conf->whois);
207	>	MyFree(conf->user);
208	>	MyFree(conf->host);
209	>	#ifdef HAVE_LIBCRYPTO
210	>	MyFree(conf->cipher_list);
211
212	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
213	<	source_p->name, pfx, aconf->host, aconf->user,
654	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
655	<	}
656	<	break;
212	>	if (conf->rsa_public_key)
213	>	RSA_free(conf->rsa_public_key);
214		#endif
215	<
659	<	case ULINE_TYPE:
660	<	DLINK_FOREACH(ptr, uconf_items.head)
661	<	{
662	<	conf = ptr->data;
663	<	matchitem = map_to_conf(conf);
664	<
665	<	p = buf;
666	<
667	<	/* some of these are redundant for the sake of
668	<	* consistency with cluster{} flags
669	<	*/
670	<	*p++ = 'c';
671	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
672	<
673	<	sendto_one(source_p, form_str(RPL_STATSULINE),
674	<	me.name, source_p->name, conf->name,
675	<	matchitem->user?matchitem->user: "*",
676	<	matchitem->host?matchitem->host: "*", buf);
677	<	}
678	<
679	<	DLINK_FOREACH(ptr, cluster_items.head)
680	<	{
681	<	conf = ptr->data;
682	<
683	<	p = buf;
684	<
685	<	*p++ = 'C';
686	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
687	<
688	<	sendto_one(source_p, form_str(RPL_STATSULINE),
689	<	me.name, source_p->name, conf->name,
690	<	"*", "*", buf);
691	<	}
692	<
693	<	break;
694	<
695	<	case OPER_TYPE:
696	<	DLINK_FOREACH(ptr, oconf_items.head)
697	<	{
698	<	conf = ptr->data;
699	<	aconf = map_to_conf(conf);
700	<
701	<	/* Don't allow non opers to see oper privs */
702	<	if (HasUMode(source_p, UMODE_OPER))
703	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
704	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
705	<	conf->name, oper_privs_as_string(aconf->port),
706	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
707	<	else
708	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
709	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
710	<	conf->name, "0",
711	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
712	<	}
713	<	break;
714	<
715	<	case CLASS_TYPE:
716	<	DLINK_FOREACH(ptr, class_items.head)
717	<	{
718	<	conf = ptr->data;
719	<	classitem = map_to_conf(conf);
720	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
721	<	me.name, source_p->name, 'Y',
722	<	conf->name, PingFreq(classitem),
723	<	ConFreq(classitem),
724	<	MaxTotal(classitem), MaxSendq(classitem),
725	<	CurrUserCount(classitem),
726	<	classitem->active ? "active" : "disabled");
727	<	}
728	<	break;
729	<
730	<	case CONF_TYPE:
731	<	case CLIENT_TYPE:
732	<	break;
733	<
734	<	case SERVICE_TYPE:
735	<	DLINK_FOREACH(ptr, service_items.head)
736	<	{
737	<	conf = ptr->data;
738	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
739	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
740	<	}
741	<	break;
742	<
743	<	case SERVER_TYPE:
744	<	DLINK_FOREACH(ptr, server_items.head)
745	<	{
746	<	p = buf;
747	<
748	<	conf = ptr->data;
749	<	aconf = map_to_conf(conf);
750	<
751	<	buf[0] = '\0';
752	<
753	<	if (IsConfAllowAutoConn(aconf))
754	<	*p++ = 'A';
755	<	if (IsConfSSL(aconf))
756	<	*p++ = 'S';
757	<	if (IsConfTopicBurst(aconf))
758	<	*p++ = 'T';
759	<	if (buf[0] == '\0')
760	<	*p++ = '*';
761	<
762	<	*p = '\0';
763	<
764	<	/*
765	<	* Allow admins to see actual ips unless hide_server_ips is enabled
766	<	*/
767	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
768	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
769	<	me.name, source_p->name, 'C', aconf->host,
770	<	buf, conf->name, aconf->port,
771	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
772	<	else
773	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
774	<	me.name, source_p->name, 'C',
775	<	"*@127.0.0.1", buf, conf->name, aconf->port,
776	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
777	<	}
778	<	break;
779	<
780	<	case HUB_TYPE:
781	<	DLINK_FOREACH(ptr, hub_items.head)
782	<	{
783	<	conf = ptr->data;
784	<	matchitem = map_to_conf(conf);
785	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
786	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
787	<	}
788	<	break;
789	<
790	<	case LEAF_TYPE:
791	<	DLINK_FOREACH(ptr, leaf_items.head)
792	<	{
793	<	conf = ptr->data;
794	<	matchitem = map_to_conf(conf);
795	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
796	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
797	<	}
798	<	break;
799	<
800	<	case GLINE_TYPE:
801	<	case KLINE_TYPE:
802	<	case DLINE_TYPE:
803	<	case EXEMPTDLINE_TYPE:
804	<	case CRESV_TYPE:
805	<	case NRESV_TYPE:
806	<	case CLUSTER_TYPE:
807	<	default:
808	<	break;
809	<	}
810	<	}
811	<
812	<	/* check_client()
813	<	*
814	<	* inputs       - pointer to client
815	<	* output       - 0 = Success
816	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
817	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
818	<	*                I_LINE_FULL       (-3) = I-line is full
819	<	*                TOO_MANY          (-4) = Too many connections from hostname
820	<	*                BANNED_CLIENT     (-5) = K-lined
821	<	* side effects - Ordinary client access check.
822	<	*                Look for conf lines which have the same
823	<	*                status as the flags passed.
824	<	*/
825	<	static void *
826	<	check_client(va_list args)
827	<	{
828	<	struct Client *source_p = va_arg(args, struct Client *);
829	<	const char *username = va_arg(args, const char *);
830	<	int i;
831	<
832	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
833	<	if ((i = verify_access(source_p, username)))
834	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
835	<	source_p->name, source_p->sockhost);
836	<
837	<	switch (i)
215	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
216		{
217	<	case TOO_MANY:
218	<	sendto_realops_flags(UMODE_FULL, L_ALL,
219	<	"Too many on IP for %s (%s).",
842	<	get_client_name(source_p, SHOW_IP),
843	<	source_p->sockhost);
844	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
845	<	get_client_name(source_p, SHOW_IP));
846	<	++ServerStats.is_ref;
847	<	exit_client(source_p, &me, "No more connections allowed on that IP");
848	<	break;
849	<
850	<	case I_LINE_FULL:
851	<	sendto_realops_flags(UMODE_FULL, L_ALL,
852	<	"I-line is full for %s (%s).",
853	<	get_client_name(source_p, SHOW_IP),
854	<	source_p->sockhost);
855	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
856	<	get_client_name(source_p, SHOW_IP));
857	<	++ServerStats.is_ref;
858	<	exit_client(source_p, &me,
859	<	"No more connections allowed in your connection class");
860	<	break;
861	<
862	<	case NOT_AUTHORIZED:
863	<	++ServerStats.is_ref;
864	<	/* jdc - lists server name & port connections are on */
865	<	/*       a purely cosmetical change */
866	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
867	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
868	<	get_client_name(source_p, SHOW_IP),
869	<	source_p->sockhost,
870	<	source_p->localClient->listener->name,
871	<	source_p->localClient->listener->port);
872	<	ilog(LOG_TYPE_IRCD,
873	<	"Unauthorized client connection from %s on [%s/%u].",
874	<	get_client_name(source_p, SHOW_IP),
875	<	source_p->localClient->listener->name,
876	<	source_p->localClient->listener->port);
877	<
878	<	/* XXX It is prolematical whether it is better to use the
879	<	* capture reject code here or rely on the connecting too fast code.
880	<	* - Dianora
881	<	*/
882	<	if (REJECT_HOLD_TIME > 0)
883	<	{
884	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
885	<	me.name, source_p->name);
886	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
887	<	SetCaptured(source_p);
888	<	}
889	<	else
890	<	exit_client(source_p, &me, "You are not authorized to use this server");
891	<	break;
892	<
893	<	case BANNED_CLIENT:
894	<	/*
895	<	* Don't exit them immediately, play with them a bit.
896	<	* - Dianora
897	<	*/
898	<	if (REJECT_HOLD_TIME > 0)
899	<	{
900	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
901	<	SetCaptured(source_p);
902	<	}
903	<	else
904	<	exit_client(source_p, &me, "Banned");
905	<	++ServerStats.is_ref;
906	<	break;
907	<
908	<	case 0:
909	<	default:
910	<	break;
217	>	MyFree(node->data);
218	>	dlinkDelete(node, &conf->hub_list);
219	>	free_dlink_node(node);
220		}
221
222	<	return (i < 0 ? NULL : source_p);
914	<	}
915	<
916	<	/* verify_access()
917	<	*
918	<	* inputs       - pointer to client to verify
919	<	*              - pointer to proposed username
920	<	* output       - 0 if success -'ve if not
921	<	* side effect  - find the first (best) I line to attach.
922	<	*/
923	<	static int
924	<	verify_access(struct Client *client_p, const char *username)
925	<	{
926	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
927	<	struct ConfItem *conf = NULL;
928	<	char non_ident[USERLEN + 1] = { '~', '\0' };
929	<	const char *uhi[3];
930	<
931	<	if (IsGotId(client_p))
932	<	{
933	<	aconf = find_address_conf(client_p->host, client_p->username,
934	<	&client_p->localClient->ip,
935	<	client_p->localClient->aftype,
936	<	client_p->localClient->passwd);
937	<	}
938	<	else
222	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
223		{
224	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
225	<	aconf = find_address_conf(client_p->host,non_ident,
226	<	&client_p->localClient->ip,
943	<	client_p->localClient->aftype,
944	<	client_p->localClient->passwd);
224	>	MyFree(node->data);
225	>	dlinkDelete(node, &conf->leaf_list);
226	>	free_dlink_node(node);
227		}
228
229	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
948	<	uhi[1] = client_p->host;
949	<	uhi[2] = client_p->sockhost;
950	<
951	<	rkconf = find_regexp_kline(uhi);
952	<
953	<	if (aconf != NULL)
229	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
230		{
231	<	if (IsConfClient(aconf) && !rkconf)
956	<	{
957	<	conf = unmap_conf_item(aconf);
231	>	struct exempt *exptr = node->data;
232
233	<	if (IsConfRedir(aconf))
234	<	{
235	<	sendto_one(client_p, form_str(RPL_REDIR),
236	<	me.name, client_p->name,
237	<	conf->name ? conf->name : "",
964	<	aconf->port);
965	<	return(NOT_AUTHORIZED);
966	<	}
967	<
968	<	if (IsConfDoIdentd(aconf))
969	<	SetNeedId(client_p);
970	<
971	<	/* Thanks for spoof idea amm */
972	<	if (IsConfDoSpoofIp(aconf))
973	<	{
974	<	conf = unmap_conf_item(aconf);
975	<
976	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
977	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
978	<	client_p->name, client_p->host, conf->name);
979	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
980	<	SetIPSpoof(client_p);
981	<	}
982	<
983	<	return(attach_iline(client_p, conf));
984	<	}
985	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
986	<	{
987	<	/* XXX */
988	<	aconf = rkconf ? rkconf : aconf;
989	<	if (IsConfGline(aconf))
990	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
991	<	client_p->name);
992	<	if (ConfigFileEntry.kline_with_reason)
993	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
994	<	me.name, client_p->name, aconf->reason);
995	<	return(BANNED_CLIENT);
996	<	}
233	>	dlinkDelete(node, &conf->exempt_list);
234	>	MyFree(exptr->name);
235	>	MyFree(exptr->user);
236	>	MyFree(exptr->host);
237	>	MyFree(exptr);
238		}
239
240	<	return(NOT_AUTHORIZED);
240	>	MyFree(conf);
241		}
242
243		/* attach_iline()
244		*
245	<	* inputs       - client pointer
246	<	*              - conf pointer
247	<	* output       -
248	<	* side effects - do actual attach
245	>	* inputs       - client pointer
246	>	*              - conf pointer
247	>	* output       -
248	>	* side effects - do actual attach
249		*/
250		static int
251	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
251	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
252		{
253	<	struct AccessItem *aconf;
1013	<	struct ClassItem *aclass;
253	>	const struct ClassItem *const class = conf->class;
254		struct ip_entry *ip_found;
255		int a_limit_reached = 0;
256	<	int local = 0, global = 0, ident = 0;
256	>	unsigned int local = 0, global = 0, ident = 0;
257
258	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
258	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
259		ip_found->count++;
260	<	SetIpHash(client_p);
1021	<
1022	<	aconf = map_to_conf(conf);
1023	<	if (aconf->class_ptr == NULL)
1024	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1025	<
1026	<	aclass = map_to_conf(aconf->class_ptr);
260	>	AddFlag(client_p, FLAGS_IPHASH);
261
262		count_user_host(client_p->username, client_p->host,
263		&global, &local, &ident);
#	Line 1032 | Line 266 | attach_iline(struct Client *client_p, st
266		* setting a_limit_reached if any limit is reached.
267		* - Dianora
268		*/
269	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
269	>	if (class->max_total && class->ref_count >= class->max_total)
270		a_limit_reached = 1;
271	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
271	>	else if (class->max_perip && ip_found->count > class->max_perip)
272		a_limit_reached = 1;
273	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
273	>	else if (class->max_local && local >= class->max_local)
274		a_limit_reached = 1;
275	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
275	>	else if (class->max_global && global >= class->max_global)
276		a_limit_reached = 1;
277	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
277	>	else if (class->max_ident && ident >= class->max_ident &&
278		client_p->username[0] != '~')
279		a_limit_reached = 1;
280
281		if (a_limit_reached)
282		{
283	<	if (!IsConfExemptLimits(aconf))
283	>	if (!IsConfExemptLimits(conf))
284		return TOO_MANY;   /* Already at maximum allowed */
285
286	<	sendto_one(client_p,
287	<	":%s NOTICE %s :*** Your connection class is full, "
1054	<	"but you have exceed_limit = yes;", me.name, client_p->name);
286	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
287	>	"but you have exceed_limit = yes;");
288		}
289
290		return attach_conf(client_p, conf);
291		}
292
293	<	/* init_ip_hash_table()
1061	<	*
1062	<	* inputs               - NONE
1063	<	* output               - NONE
1064	<	* side effects         - allocate memory for ip_entry(s)
1065	<	*                      - clear the ip hash table
1066	<	*/
1067	<	void
1068	<	init_ip_hash_table(void)
1069	<	{
1070	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1071	<	2 * hard_fdlimit);
1072	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1073	<	}
1074	<
1075	<	/* find_or_add_ip()
1076	<	*
1077	<	* inputs       - pointer to struct irc_ssaddr
1078	<	* output       - pointer to a struct ip_entry
1079	<	* side effects -
293	>	/* verify_access()
294		*
295	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
296	<	* count set to 0.
295	>	* inputs       - pointer to client to verify
296	>	* output       - 0 if success -'ve if not
297	>	* side effect  - find the first (best) I line to attach.
298		*/
299	<	static struct ip_entry *
300	<	find_or_add_ip(struct irc_ssaddr *ip_in)
299	>	static int
300	>	verify_access(struct Client *client_p)
301		{
302	<	struct ip_entry *ptr, *newptr;
1088	<	int hash_index = hash_ip(ip_in), res;
1089	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1090	<	#ifdef IPV6
1091	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1092	<	#endif
302	>	struct MaskItem *conf = NULL;
303
304	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
304	>	if (IsGotId(client_p))
305		{
306	<	#ifdef IPV6
307	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
308	<	continue;
309	<	if (ip_in->ss.ss_family == AF_INET6)
1100	<	{
1101	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1102	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1103	<	}
1104	<	else
1105	<	#endif
1106	<	{
1107	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1108	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1109	<	}
1110	<	if (res == 0)
1111	<	{
1112	<	/* Found entry already in hash, return it. */
1113	<	return ptr;
1114	<	}
306	>	conf = find_address_conf(client_p->host, client_p->username,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311	+	else
312	+	{
313	+	char non_ident[USERLEN + 1] = "~";
314
315	<	if (ip_entries_count >= 2 * hard_fdlimit)
316	<	garbage_collect_ip_entries();
317	<
318	<	newptr = BlockHeapAlloc(ip_entry_heap);
319	<	ip_entries_count++;
320	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
1123	<
1124	<	newptr->next = ip_hash_table[hash_index];
1125	<	ip_hash_table[hash_index] = newptr;
315	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
316	>	conf = find_address_conf(client_p->host, non_ident,
317	>	&client_p->connection->ip,
318	>	client_p->connection->aftype,
319	>	client_p->connection->password);
320	>	}
321
322	<	return newptr;
323	<	}
322	>	if (!conf)
323	>	return NOT_AUTHORIZED;
324
325	<	/* remove_one_ip()
1131	<	*
1132	<	* inputs        - unsigned long IP address value
1133	<	* output        - NONE
1134	<	* side effects  - The ip address given, is looked up in ip hash table
1135	<	*                 and number of ip#'s for that ip decremented.
1136	<	*                 If ip # count reaches 0 and has expired,
1137	<	*                 the struct ip_entry is returned to the ip_entry_heap
1138	<	*/
1139	<	void
1140	<	remove_one_ip(struct irc_ssaddr *ip_in)
1141	<	{
1142	<	struct ip_entry *ptr;
1143	<	struct ip_entry *last_ptr = NULL;
1144	<	int hash_index = hash_ip(ip_in), res;
1145	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1146	<	#ifdef IPV6
1147	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1148	<	#endif
325	>	assert(IsConfClient(conf) || IsConfKill(conf));
326
327	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
327	>	if (IsConfClient(conf))
328		{
329	<	#ifdef IPV6
1153	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1154	<	continue;
1155	<	if (ip_in->ss.ss_family == AF_INET6)
1156	<	{
1157	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1158	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1159	<	}
1160	<	else
1161	<	#endif
329	>	if (IsConfRedir(conf))
330		{
331	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
332	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
331	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
332	>	conf->name ? conf->name : "",
333	>	conf->port);
334	>	return NOT_AUTHORIZED;
335		}
336	<	if (res)
337	<	continue;
1168	<	if (ptr->count > 0)
1169	<	ptr->count--;
1170	<	if (ptr->count == 0 &&
1171	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
336	>
337	>	if (IsConfDoSpoofIp(conf))
338		{
339	<	if (last_ptr != NULL)
340	<	last_ptr->next = ptr->next;
341	<	else
1176	<	ip_hash_table[hash_index] = ptr->next;
339	>	if (IsConfSpoofNotice(conf))
340	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
341	>	client_p->name, client_p->host, conf->name);
342
343	<	BlockHeapFree(ip_entry_heap, ptr);
1179	<	ip_entries_count--;
1180	<	return;
343	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
344		}
1182	–	last_ptr = ptr;
1183	–	}
1184	–	}
345
346	<	/* hash_ip()
1187	<	*
1188	<	* input        - pointer to an irc_inaddr
1189	<	* output       - integer value used as index into hash table
1190	<	* side effects - hopefully, none
1191	<	*/
1192	<	static int
1193	<	hash_ip(struct irc_ssaddr *addr)
1194	<	{
1195	<	if (addr->ss.ss_family == AF_INET)
1196	<	{
1197	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1198	<	int hash;
1199	<	uint32_t ip;
1200	<
1201	<	ip   = ntohl(v4->sin_addr.s_addr);
1202	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1203	<	return hash;
1204	<	}
1205	<	#ifdef IPV6
1206	<	else
1207	<	{
1208	<	int hash;
1209	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1210	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1211	<
1212	<	hash  = ip[0] ^ ip[3];
1213	<	hash ^= hash >> 16;
1214	<	hash ^= hash >> 8;
1215	<	hash  = hash & (IP_HASH_SIZE - 1);
1216	<	return hash;
346	>	return attach_iline(client_p, conf);
347		}
348	<	#else
349	<	return 0;
350	<	#endif
348	>
349	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
350	>	return BANNED_CLIENT;
351		}
352
353	<	/* count_ip_hash()
1224	<	*
1225	<	* inputs        - pointer to counter of number of ips hashed
1226	<	*               - pointer to memory used for ip hash
1227	<	* output        - returned via pointers input
1228	<	* side effects  - NONE
353	>	/* check_client()
354		*
355	<	* number of hashed ip #'s is counted up, plus the amount of memory
356	<	* used in the hash.
355	>	* inputs       - pointer to client
356	>	* output       - 0 = Success
357	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
358	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
359	>	*                I_LINE_FULL       (-3) = I-line is full
360	>	*                TOO_MANY          (-4) = Too many connections from hostname
361	>	*                BANNED_CLIENT     (-5) = K-lined
362	>	* side effects - Ordinary client access check.
363	>	*                Look for conf lines which have the same
364	>	*                status as the flags passed.
365		*/
366	<	void
367	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
366	>	int
367	>	check_client(struct Client *source_p)
368		{
1236	–	struct ip_entry *ptr;
369		int i;
370
371	<	*number_ips_stored = 0;
372	<	*mem_ips_stored    = 0;
371	>	if ((i = verify_access(source_p)))
372	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
373	>	source_p->name, source_p->sockhost);
374
375	<	for (i = 0; i < IP_HASH_SIZE; i++)
375	>	switch (i)
376		{
377	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
378	<	{
379	<	*number_ips_stored += 1;
380	<	*mem_ips_stored += sizeof(struct ip_entry);
381	<	}
382	<	}
383	<	}
377	>	case TOO_MANY:
378	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
379	>	"Too many on IP for %s (%s).",
380	>	get_client_name(source_p, SHOW_IP),
381	>	source_p->sockhost);
382	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
383	>	get_client_name(source_p, SHOW_IP));
384	>	++ServerStats.is_ref;
385	>	exit_client(source_p, "No more connections allowed on that IP");
386	>	break;
387
388	<	/* garbage_collect_ip_entries()
389	<	*
390	<	* input        - NONE
391	<	* output       - NONE
392	<	* side effects - free up all ip entries with no connections
393	<	*/
394	<	static void
395	<	garbage_collect_ip_entries(void)
396	<	{
397	<	struct ip_entry *ptr;
1262	<	struct ip_entry *last_ptr;
1263	<	struct ip_entry *next_ptr;
1264	<	int i;
388	>	case I_LINE_FULL:
389	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
390	>	"auth {} block is full for %s (%s).",
391	>	get_client_name(source_p, SHOW_IP),
392	>	source_p->sockhost);
393	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
394	>	get_client_name(source_p, SHOW_IP));
395	>	++ServerStats.is_ref;
396	>	exit_client(source_p, "No more connections allowed in your connection class");
397	>	break;
398
399	<	for (i = 0; i < IP_HASH_SIZE; i++)
400	<	{
401	<	last_ptr = NULL;
399	>	case NOT_AUTHORIZED:
400	>	/* jdc - lists server name & port connections are on */
401	>	/*       a purely cosmetical change */
402	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
403	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
404	>	get_client_name(source_p, SHOW_IP),
405	>	source_p->sockhost,
406	>	source_p->connection->listener->name,
407	>	source_p->connection->listener->port);
408	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
409	>	get_client_name(source_p, SHOW_IP),
410	>	source_p->connection->listener->name,
411	>	source_p->connection->listener->port);
412
413	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
414	<	{
415	<	next_ptr = ptr->next;
413	>	++ServerStats.is_ref;
414	>	exit_client(source_p, "You are not authorized to use this server");
415	>	break;
416
417	<	if (ptr->count == 0 &&
418	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
419	<	{
420	<	if (last_ptr != NULL)
421	<	last_ptr->next = ptr->next;
422	<	else
423	<	ip_hash_table[i] = ptr->next;
424	<	BlockHeapFree(ip_entry_heap, ptr);
1282	<	ip_entries_count--;
1283	<	}
1284	<	else
1285	<	last_ptr = ptr;
1286	<	}
417	>	case BANNED_CLIENT:
418	>	++ServerStats.is_ref;
419	>	exit_client(source_p, "Banned");
420	>	break;
421	>
422	>	case 0:
423	>	default:
424	>	break;
425		}
426	+
427	+	return !(i < 0);
428		}
429
430		/* detach_conf()
#	Line 1295 | Line 435 | garbage_collect_ip_entries(void)
435		* side effects - Disassociate configuration from the client.
436		*                Also removes a class from the list if marked for deleting.
437		*/
438	<	int
439	<	detach_conf(struct Client *client_p, ConfType type)
438	>	void
439	>	detach_conf(struct Client *client_p, enum maskitem_type type)
440		{
441	<	dlink_node *ptr, *next_ptr;
1302	<	struct ConfItem *conf;
1303	<	struct ClassItem *aclass;
1304	<	struct AccessItem *aconf;
1305	<	struct ConfItem *aclass_conf;
1306	<	struct MatchItem *match_item;
441	>	dlink_node *node = NULL, *node_next = NULL;
442
443	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
443	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
444		{
445	<	conf = ptr->data;
445	>	struct MaskItem *conf = node->data;
446
447	<	if (type == CONF_TYPE || conf->type == type)
448	<	{
449	<	dlinkDelete(ptr, &client_p->localClient->confs);
1315	<	free_dlink_node(ptr);
1316	<
1317	<	switch (conf->type)
1318	<	{
1319	<	case CLIENT_TYPE:
1320	<	case OPER_TYPE:
1321	<	case SERVER_TYPE:
1322	<	aconf = map_to_conf(conf);
1323	<
1324	<	assert(aconf->clients > 0);
1325	<
1326	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1327	<	{
1328	<	aclass = map_to_conf(aclass_conf);
1329	<
1330	<	assert(aclass->curr_user_count > 0);
447	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
448	>	assert(conf->ref_count > 0);
449	>	assert(conf->class->ref_count > 0);
450
451	<	if (conf->type == CLIENT_TYPE)
452	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1334	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1335	<	delete_conf_item(aclass_conf);
1336	<	}
451	>	if (!(conf->type & type))
452	>	continue;
453
454	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
455	<	delete_conf_item(conf);
454	>	dlinkDelete(node, &client_p->connection->confs);
455	>	free_dlink_node(node);
456
457	<	break;
457	>	if (conf->type == CONF_CLIENT)
458	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
459
460	<	case LEAF_TYPE:
461	<	case HUB_TYPE:
462	<	match_item = map_to_conf(conf);
463	<	if (match_item->ref_count == 0 && match_item->illegal)
1347	<	delete_conf_item(conf);
1348	<	break;
1349	<	default:
1350	<	break;
1351	<	}
1352	<
1353	<	if (type != CONF_TYPE)
1354	<	return 0;
460	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
461	>	{
462	>	class_free(conf->class);
463	>	conf->class = NULL;
464		}
1356	–	}
465
466	<	return -1;
466	>	if (--conf->ref_count == 0 && conf->active == 0)
467	>	conf_free(conf);
468	>	}
469		}
470
471		/* attach_conf()
#	Line 1369 | Line 479 | detach_conf(struct Client *client_p, Con
479		*                attachment if there was an old one...
480		*/
481		int
482	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
482	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
483		{
484	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
484	>	if (dlinkFind(&client_p->connection->confs, conf))
485		return 1;
486
487	<	if (conf->type == CLIENT_TYPE ||
488	<	conf->type == SERVER_TYPE ||
489	<	conf->type == OPER_TYPE)
490	<	{
1381	<	struct AccessItem *aconf = map_to_conf(conf);
1382	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1383	<
1384	<	if (IsConfIllegal(aconf))
1385	<	return NOT_AUTHORIZED;
1386	<
1387	<	if (conf->type == CLIENT_TYPE)
1388	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1389	<	&client_p->localClient->ip, aclass))
1390	<	return TOO_MANY;    /* Already at maximum allowed */
487	>	if (conf->type == CONF_CLIENT)
488	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
489	>	&client_p->connection->ip, conf->class))
490	>	return TOO_MANY;    /* Already at maximum allowed */
491
492	<	CurrUserCount(aclass)++;
493	<	aconf->clients++;
1394	<	}
1395	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1396	<	{
1397	<	struct MatchItem *match_item = map_to_conf(conf);
1398	<	match_item->ref_count++;
1399	<	}
492	>	conf->class->ref_count++;
493	>	conf->ref_count++;
494
495	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
495	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
496
497		return 0;
498		}
#	Line 1415 | Line 509 | int
509		attach_connect_block(struct Client *client_p, const char *name,
510		const char *host)
511		{
512	<	dlink_node *ptr;
1419	<	struct ConfItem *conf;
1420	<	struct AccessItem *aconf;
512	>	dlink_node *node = NULL;
513
514	<	assert(client_p != NULL);
1423	<	assert(host != NULL);
1424	<
1425	<	if (client_p == NULL || host == NULL)
1426	<	return 0;
514	>	assert(host);
515
516	<	DLINK_FOREACH(ptr, server_items.head)
516	>	DLINK_FOREACH(node, server_items.head)
517		{
518	<	conf = ptr->data;
1431	<	aconf = map_to_conf(conf);
518	>	struct MaskItem *conf = node->data;
519
520	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
520	>	if (match(conf->name, name) || match(conf->host, host))
521		continue;
522
523		attach_conf(client_p, conf);
524	<	return -1;
524	>	return 1;
525		}
526
527		return 0;
528		}
529
1443	–	/* find_conf_exact()
1444	–	*
1445	–	* inputs       - type of ConfItem
1446	–	*              - pointer to name to find
1447	–	*              - pointer to username to find
1448	–	*              - pointer to host to find
1449	–	* output       - NULL or pointer to conf found
1450	–	* side effects - find a conf entry which matches the hostname
1451	–	*                and has the same name.
1452	–	*/
1453	–	struct ConfItem *
1454	–	find_conf_exact(ConfType type, const char *name, const char *user,
1455	–	const char *host)
1456	–	{
1457	–	dlink_node *ptr;
1458	–	dlink_list *list_p;
1459	–	struct ConfItem *conf = NULL;
1460	–	struct AccessItem *aconf;
1461	–
1462	–	/* Only valid for OPER_TYPE and ...? */
1463	–	list_p = map_to_list(type);
1464	–
1465	–	DLINK_FOREACH(ptr, (*list_p).head)
1466	–	{
1467	–	conf = ptr->data;
1468	–
1469	–	if (conf->name == NULL)
1470	–	continue;
1471	–	aconf = map_to_conf(conf);
1472	–	if (aconf->host == NULL)
1473	–	continue;
1474	–	if (irccmp(conf->name, name) != 0)
1475	–	continue;
1476	–
1477	–	/*
1478	–	** Accept if the *real* hostname (usually sockethost)
1479	–	** socket host) matches *either* host or name field
1480	–	** of the configuration.
1481	–	*/
1482	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1483	–	continue;
1484	–	if (type == OPER_TYPE)
1485	–	{
1486	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1487	–
1488	–	if (aconf->clients >= MaxTotal(aclass))
1489	–	continue;
1490	–	}
1491	–
1492	–	return conf;
1493	–	}
1494	–
1495	–	return NULL;
1496	–	}
1497	–
530		/* find_conf_name()
531		*
532		* inputs       - pointer to conf link list to search
#	Line 1504 | Line 536 | find_conf_exact(ConfType type, const cha
536		* side effects - find a conf entry which matches the name
537		*                and has the given mask.
538		*/
539	<	struct ConfItem *
540	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
539	>	struct MaskItem *
540	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
541		{
542	<	dlink_node *ptr;
1511	<	struct ConfItem* conf;
542	>	dlink_node *node = NULL;
543
544	<	DLINK_FOREACH(ptr, list->head)
544	>	DLINK_FOREACH(node, list->head)
545		{
546	<	conf = ptr->data;
547	<
546	>	struct MaskItem *conf = node->data;
547	>
548		if (conf->type == type)
549		{
550	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
551	<	match(conf->name, name)))
1521	<	return conf;
550	>	if (conf->name && !irccmp(conf->name, name))
551	>	return conf;
552		}
553		}
554
555		return NULL;
556		}
557
1528	–	/* map_to_list()
1529	–	*
1530	–	* inputs       - ConfType conf
1531	–	* output       - pointer to dlink_list to use
1532	–	* side effects - none
1533	–	*/
1534	–	static dlink_list *
1535	–	map_to_list(ConfType type)
1536	–	{
1537	–	switch(type)
1538	–	{
1539	–	case RXLINE_TYPE:
1540	–	return(&rxconf_items);
1541	–	break;
1542	–	case XLINE_TYPE:
1543	–	return(&xconf_items);
1544	–	break;
1545	–	case ULINE_TYPE:
1546	–	return(&uconf_items);
1547	–	break;
1548	–	case NRESV_TYPE:
1549	–	return(&nresv_items);
1550	–	break;
1551	–	case OPER_TYPE:
1552	–	return(&oconf_items);
1553	–	break;
1554	–	case CLASS_TYPE:
1555	–	return(&class_items);
1556	–	break;
1557	–	case SERVER_TYPE:
1558	–	return(&server_items);
1559	–	break;
1560	–	case SERVICE_TYPE:
1561	–	return(&service_items);
1562	–	break;
1563	–	case CLUSTER_TYPE:
1564	–	return(&cluster_items);
1565	–	break;
1566	–	case CONF_TYPE:
1567	–	case GLINE_TYPE:
1568	–	case KLINE_TYPE:
1569	–	case DLINE_TYPE:
1570	–	case CRESV_TYPE:
1571	–	default:
1572	–	return NULL;
1573	–	}
1574	–	}
1575	–
558		/* find_matching_name_conf()
559		*
560		* inputs       - type of link list to look in
561		*              - pointer to name string to find
562		*              - pointer to user
563		*              - pointer to host
564	<	*              - optional action to match on as well
565	<	* output       - NULL or pointer to found struct MatchItem
564	>	*              - optional flags to match on as well
565	>	* output       - NULL or pointer to found struct MaskItem
566		* side effects - looks for a match on name field
567		*/
568	<	struct ConfItem *
569	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
570	<	const char *host, int action)
571	<	{
572	<	dlink_node *ptr=NULL;
573	<	struct ConfItem *conf=NULL;
574	<	struct AccessItem *aconf=NULL;
1593	<	struct MatchItem *match_item=NULL;
1594	<	dlink_list *list_p = map_to_list(type);
568	>	struct MaskItem *
569	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
570	>	const char *host, unsigned int flags)
571	>	{
572	>	dlink_node *node = NULL;
573	>	dlink_list *list = map_to_list(type);
574	>	struct MaskItem *conf = NULL;
575
576		switch (type)
577		{
578	<	#ifdef HAVE_LIBPCRE
579	<	case RXLINE_TYPE:
1600	<	DLINK_FOREACH(ptr, list_p->head)
1601	<	{
1602	<	conf = ptr->data;
1603	<	assert(conf->regexpname);
1604	<
1605	<	if (!ircd_pcre_exec(conf->regexpname, name))
1606	<	return conf;
1607	<	}
1608	<	break;
1609	<	#endif
1610	<	case SERVICE_TYPE:
1611	<	DLINK_FOREACH(ptr, list_p->head)
578	>	case CONF_SERVICE:
579	>	DLINK_FOREACH(node, list->head)
580		{
581	<	conf = ptr->data;
581	>	conf = node->data;
582
583		if (EmptyString(conf->name))
584		continue;
585	<	if ((name != NULL) && !irccmp(name, conf->name))
585	>	if (name && !irccmp(name, conf->name))
586		return conf;
587		}
588		break;
589
590	<	case XLINE_TYPE:
591	<	case ULINE_TYPE:
592	<	case NRESV_TYPE:
593	<	DLINK_FOREACH(ptr, list_p->head)
590	>	case CONF_XLINE:
591	>	case CONF_ULINE:
592	>	case CONF_NRESV:
593	>	case CONF_CRESV:
594	>	DLINK_FOREACH(node, list->head)
595		{
596	<	conf = ptr->data;
596	>	conf = node->data;
597
1629	–	match_item = map_to_conf(conf);
598		if (EmptyString(conf->name))
599	<	continue;
600	<	if ((name != NULL) && match_esc(conf->name, name))
599	>	continue;
600	>	if (name && !match(conf->name, name))
601		{
602	<	if ((user == NULL && (host == NULL)))
603	<	return conf;
604	<	if ((match_item->action & action) != action)
602	>	if ((user == NULL && (host == NULL)))
603	>	return conf;
604	>	if ((conf->flags & flags) != flags)
605		continue;
606	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
607	<	return conf;
608	<	if (match(match_item->user, user) && match(match_item->host, host))
609	<	return conf;
606	>	if (EmptyString(conf->user) || EmptyString(conf->host))
607	>	return conf;
608	>	if (!match(conf->user, user) && !match(conf->host, host))
609	>	return conf;
610		}
611		}
612		break;
613
614	<	case SERVER_TYPE:
615	<	DLINK_FOREACH(ptr, list_p->head)
614	>	case CONF_SERVER:
615	>	DLINK_FOREACH(node, list->head)
616		{
617	<	conf = ptr->data;
1650	<	aconf = map_to_conf(conf);
617	>	conf = node->data;
618
619	<	if ((name != NULL) && match_esc(name, conf->name))
619	>	if (name && !match(name, conf->name))
620		return conf;
621	<	else if ((host != NULL) && match_esc(host, aconf->host))
621	>	if (host && !match(host, conf->host))
622		return conf;
623		}
624		break;
625	<
625	>
626		default:
627		break;
628		}
#	Line 1668 | Line 635 | find_matching_name_conf(ConfType type, c
635		*              - pointer to name string to find
636		*              - pointer to user
637		*              - pointer to host
638	<	* output       - NULL or pointer to found struct MatchItem
638	>	* output       - NULL or pointer to found struct MaskItem
639		* side effects - looks for an exact match on name field
640		*/
641	<	struct ConfItem *
642	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
641	>	struct MaskItem *
642	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
643		const char *user, const char *host)
644		{
645	<	dlink_node *ptr = NULL;
646	<	struct AccessItem *aconf;
647	<	struct ConfItem *conf;
1681	<	struct MatchItem *match_item;
1682	<	dlink_list *list_p;
1683	<
1684	<	list_p = map_to_list(type);
645	>	dlink_node *node = NULL;
646	>	dlink_list *list = map_to_list(type);
647	>	struct MaskItem *conf = NULL;
648
649		switch(type)
650		{
651	<	case RXLINE_TYPE:
652	<	case XLINE_TYPE:
653	<	case ULINE_TYPE:
654	<	case NRESV_TYPE:
651	>	case CONF_XLINE:
652	>	case CONF_ULINE:
653	>	case CONF_NRESV:
654	>	case CONF_CRESV:
655
656	<	DLINK_FOREACH(ptr, list_p->head)
656	>	DLINK_FOREACH(node, list->head)
657		{
658	<	conf = ptr->data;
659	<	match_item = (struct MatchItem *)map_to_conf(conf);
658	>	conf = node->data;
659	>
660		if (EmptyString(conf->name))
661	<	continue;
662	<
661	>	continue;
662	>
663		if (irccmp(conf->name, name) == 0)
664		{
665	<	if ((user == NULL && (host == NULL)))
666	<	return (conf);
667	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
668	<	return (conf);
669	<	if (match(match_item->user, user) && match(match_item->host, host))
670	<	return (conf);
665	>	if ((user == NULL && (host == NULL)))
666	>	return conf;
667	>	if (EmptyString(conf->user) || EmptyString(conf->host))
668	>	return conf;
669	>	if (!match(conf->user, user) && !match(conf->host, host))
670	>	return conf;
671		}
672		}
673		break;
674
675	<	case OPER_TYPE:
676	<	DLINK_FOREACH(ptr, list_p->head)
675	>	case CONF_OPER:
676	>	DLINK_FOREACH(node, list->head)
677		{
678	<	conf = ptr->data;
1716	<	aconf = map_to_conf(conf);
678	>	conf = node->data;
679
680		if (EmptyString(conf->name))
681		continue;
#	Line 1722 | Line 684 | find_exact_name_conf(ConfType type, cons
684		{
685		if (!who)
686		return conf;
687	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
688	<	return conf;
689	<	if (match(aconf->user, who->username))
687	>	if (EmptyString(conf->user) || EmptyString(conf->host))
688	>	return NULL;
689	>	if (!match(conf->user, who->username))
690		{
691	<	switch (aconf->type)
691	>	switch (conf->htype)
692		{
693		case HM_HOST:
694	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
695	<	return conf;
694	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
695	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
696	>	return conf;
697		break;
698		case HM_IPV4:
699	<	if (who->localClient->aftype == AF_INET)
700	<	if (match_ipv4(&who->localClient->ip, &aconf->ipnum, aconf->bits))
701	<	return conf;
699	>	if (who->connection->aftype == AF_INET)
700	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
701	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
702	>	return conf;
703		break;
1740	–	#ifdef IPV6
704		case HM_IPV6:
705	<	if (who->localClient->aftype == AF_INET6)
706	<	if (match_ipv6(&who->localClient->ip, &aconf->ipnum, aconf->bits))
707	<	return conf;
705	>	if (who->connection->aftype == AF_INET6)
706	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
707	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
708	>	return conf;
709		break;
1746	–	#endif
710		default:
711		assert(0);
712		}
#	Line 1753 | Line 716 | find_exact_name_conf(ConfType type, cons
716
717		break;
718
719	<	case SERVER_TYPE:
720	<	DLINK_FOREACH(ptr, list_p->head)
719	>	case CONF_SERVER:
720	>	DLINK_FOREACH(node, list->head)
721		{
722	<	conf = ptr->data;
723	<	aconf = (struct AccessItem *)map_to_conf(conf);
722	>	conf = node->data;
723	>
724		if (EmptyString(conf->name))
725	<	continue;
726	<
725	>	continue;
726	>
727		if (name == NULL)
728		{
729	<	if (EmptyString(aconf->host))
730	<	continue;
731	<	if (irccmp(aconf->host, host) == 0)
732	<	return(conf);
729	>	if (EmptyString(conf->host))
730	>	continue;
731	>	if (irccmp(conf->host, host) == 0)
732	>	return conf;
733		}
734		else if (irccmp(conf->name, name) == 0)
735	<	{
1773	<	return (conf);
1774	<	}
735	>	return conf;
736		}
1776	–	break;
737
1778	–	case CLASS_TYPE:
1779	–	DLINK_FOREACH(ptr, list_p->head)
1780	–	{
1781	–	conf = ptr->data;
1782	–	if (EmptyString(conf->name))
1783	–	continue;
1784	–
1785	–	if (irccmp(conf->name, name) == 0)
1786	–	return (conf);
1787	–	}
738		break;
739
740		default:
741		break;
742		}
1793	–	return(NULL);
1794	–	}
1795	–
1796	–	/* rehash()
1797	–	*
1798	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1799	–	* as a result of an operator issuing this command, else assume it has been
1800	–	* called as a result of the server receiving a HUP signal.
1801	–	*/
1802	–	int
1803	–	rehash(int sig)
1804	–	{
1805	–	if (sig != 0)
1806	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1807	–	"Got signal SIGHUP, reloading ircd.conf file");
1808	–
1809	–	restart_resolver();
1810	–
1811	–	/* don't close listeners until we know we can go ahead with the rehash */
743
744	<	/* Check to see if we magically got(or lost) IPv6 support */
1814	<	check_can_use_v6();
1815	<
1816	<	read_conf_files(0);
1817	<
1818	<	if (ServerInfo.description != NULL)
1819	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1820	<
1821	<	load_conf_modules();
1822	<
1823	<	flush_deleted_I_P();
1824	<
1825	<	rehashed_klines = 1;
1826	<	/* XXX */
1827	<	if (ConfigLoggingEntry.use_logging)
1828	<	log_close_all();
1829	<
1830	<	return(0);
744	>	return NULL;
745		}
746
747		/* set_default_conf()
#	Line 1845 | Line 759 | set_default_conf(void)
759		/* verify init_class() ran, this should be an unnecessary check
760		* but its not much work.
761		*/
762	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
762	>	assert(class_default == class_get_list()->tail->data);
763
764		#ifdef HAVE_LIBCRYPTO
765	<	ServerInfo.rsa_private_key = NULL;
766	<	ServerInfo.rsa_private_key_file = NULL;
765	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
766	>	{
767	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
768	>
769	>	if (key)
770	>	{
771	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
772	>	EC_KEY_free(key);
773	>	}
774	>	}
775	>
776	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
777	>	#endif
778	>
779	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
780	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
781	>	ConfigServerInfo.rsa_private_key = NULL;
782	>	ConfigServerInfo.rsa_private_key_file = NULL;
783		#endif
784
785	<	/* ServerInfo.name is not rehashable */
786	<	/* ServerInfo.name = ServerInfo.name; */
787	<	ServerInfo.description = NULL;
788	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
789	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
790	<
791	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
792	<	ServerInfo.specific_ipv4_vhost = 0;
793	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
794	<	ServerInfo.specific_ipv6_vhost = 0;
795	<
796	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
797	<
798	<	ServerInfo.hub = 0;
799	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
800	<	ServerInfo.dns_host.sin_port = 0;
801	<	AdminInfo.name = NULL;
802	<	AdminInfo.email = NULL;
803	<	AdminInfo.description = NULL;
785	>	/* ConfigServerInfo.name is not rehashable */
786	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
787	>	ConfigServerInfo.description = NULL;
788	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
789	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
790	>
791	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
792	>	ConfigServerInfo.specific_ipv4_vhost = 0;
793	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
794	>	ConfigServerInfo.specific_ipv6_vhost = 0;
795	>
796	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
797	>	ConfigServerInfo.max_nick_length = 9;
798	>	ConfigServerInfo.max_topic_length = 80;
799	>	ConfigServerInfo.hub = 0;
800	>
801	>	ConfigAdminInfo.name = NULL;
802	>	ConfigAdminInfo.email = NULL;
803	>	ConfigAdminInfo.description = NULL;
804
805	<	log_close_all();
805	>	log_del_all();
806
807	<	ConfigLoggingEntry.use_logging = 1;
1878	<	ConfigLoggingEntry.timestamp = 1;
807	>	ConfigLog.use_logging = 1;
808
809		ConfigChannel.disable_fake_channels = 0;
810	<	ConfigChannel.restrict_channels = 0;
811	<	ConfigChannel.disable_local_channels = 0;
812	<	ConfigChannel.use_invex = 1;
813	<	ConfigChannel.use_except = 1;
1885	<	ConfigChannel.use_knock = 1;
1886	<	ConfigChannel.knock_delay = 300;
810	>	ConfigChannel.invite_client_count = 10;
811	>	ConfigChannel.invite_client_time = 300;
812	>	ConfigChannel.knock_client_count = 1;
813	>	ConfigChannel.knock_client_time = 300;
814		ConfigChannel.knock_delay_channel = 60;
815	<	ConfigChannel.max_chans_per_user = 15;
1889	<	ConfigChannel.quiet_on_ban = 1;
815	>	ConfigChannel.max_channels = 25;
816		ConfigChannel.max_bans = 25;
817	+	ConfigChannel.default_join_flood_count = 18;
818	+	ConfigChannel.default_join_flood_time = 6;
819		ConfigChannel.default_split_user_count = 0;
820		ConfigChannel.default_split_server_count = 0;
821		ConfigChannel.no_join_on_split = 0;
822		ConfigChannel.no_create_on_split = 0;
1895	–	ConfigChannel.burst_topicwho = 1;
823
824		ConfigServerHide.flatten_links = 0;
825		ConfigServerHide.links_delay = 300;
826		ConfigServerHide.hidden = 0;
1900	–	ConfigServerHide.disable_hidden = 0;
827		ConfigServerHide.hide_servers = 0;
828	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
828	>	ConfigServerHide.hide_services = 0;
829	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
830		ConfigServerHide.hide_server_ips = 0;
831	+	ConfigServerHide.disable_remote_commands = 0;
832
833	<
834	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
835	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
836	<	ConfigFileEntry.gline_min_cidr = 16;
837	<	ConfigFileEntry.gline_min_cidr6 = 48;
838	<	ConfigFileEntry.invisible_on_connect = 1;
839	<	ConfigFileEntry.burst_away = 0;
840	<	ConfigFileEntry.use_whois_actually = 1;
841	<	ConfigFileEntry.tkline_expire_notices = 1;
842	<	ConfigFileEntry.hide_spoof_ips = 1;
843	<	ConfigFileEntry.ignore_bogus_ts = 0;
844	<	ConfigFileEntry.disable_auth = 0;
845	<	ConfigFileEntry.disable_remote = 0;
846	<	ConfigFileEntry.kill_chase_time_limit = 90;
847	<	ConfigFileEntry.default_floodcount = 8;
848	<	ConfigFileEntry.failed_oper_notice = 1;
849	<	ConfigFileEntry.dots_in_ident = 0;
850	<	ConfigFileEntry.min_nonwildcard = 4;
851	<	ConfigFileEntry.min_nonwildcard_simple = 3;
852	<	ConfigFileEntry.max_accept = 20;
853	<	ConfigFileEntry.anti_nick_flood = 0;
854	<	ConfigFileEntry.max_nick_time = 20;
855	<	ConfigFileEntry.max_nick_changes = 5;
856	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
857	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
858	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
859	<	ConfigFileEntry.kline_with_reason = 1;
860	<	ConfigFileEntry.kline_reason = NULL;
861	<	ConfigFileEntry.warn_no_nline = 1;
862	<	ConfigFileEntry.stats_o_oper_only = 0;
863	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
864	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
865	<	ConfigFileEntry.stats_P_oper_only = 0;
866	<	ConfigFileEntry.caller_id_wait = 60;
867	<	ConfigFileEntry.opers_bypass_callerid = 0;
868	<	ConfigFileEntry.pace_wait = 10;
869	<	ConfigFileEntry.pace_wait_simple = 1;
870	<	ConfigFileEntry.short_motd = 0;
871	<	ConfigFileEntry.ping_cookie = 0;
872	<	ConfigFileEntry.no_oper_flood = 0;
873	<	ConfigFileEntry.true_no_oper_flood = 0;
874	<	ConfigFileEntry.oper_pass_resv = 1;
875	<	ConfigFileEntry.glines = 0;
876	<	ConfigFileEntry.gline_time = 12 * 3600;
877	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
878	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
879	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
880	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1953	<	UMODE_OPERWALL | UMODE_WALLOP;
1954	<	ConfigFileEntry.use_egd = 0;
1955	<	ConfigFileEntry.egdpool_path = NULL;
1956	<	ConfigFileEntry.throttle_time = 10;
833	>	ConfigGeneral.away_count = 2;
834	>	ConfigGeneral.away_time = 10;
835	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
836	>	ConfigGeneral.cycle_on_host_change = 1;
837	>	ConfigGeneral.dline_min_cidr = 16;
838	>	ConfigGeneral.dline_min_cidr6 = 48;
839	>	ConfigGeneral.kline_min_cidr = 16;
840	>	ConfigGeneral.kline_min_cidr6 = 48;
841	>	ConfigGeneral.invisible_on_connect = 1;
842	>	ConfigGeneral.tkline_expire_notices = 1;
843	>	ConfigGeneral.ignore_bogus_ts = 0;
844	>	ConfigGeneral.disable_auth = 0;
845	>	ConfigGeneral.kill_chase_time_limit = 90;
846	>	ConfigGeneral.default_floodcount = 8;
847	>	ConfigGeneral.failed_oper_notice = 1;
848	>	ConfigGeneral.dots_in_ident = 0;
849	>	ConfigGeneral.min_nonwildcard = 4;
850	>	ConfigGeneral.min_nonwildcard_simple = 3;
851	>	ConfigGeneral.max_accept = 20;
852	>	ConfigGeneral.anti_nick_flood = 0;
853	>	ConfigGeneral.max_nick_time = 20;
854	>	ConfigGeneral.max_nick_changes = 5;
855	>	ConfigGeneral.anti_spam_exit_message_time = 0;
856	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
857	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
858	>	ConfigGeneral.warn_no_connect_block = 1;
859	>	ConfigGeneral.stats_e_disabled = 0;
860	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
861	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
862	>	ConfigGeneral.stats_o_oper_only = 1;
863	>	ConfigGeneral.stats_m_oper_only = 1;
864	>	ConfigGeneral.stats_P_oper_only = 0;
865	>	ConfigGeneral.stats_u_oper_only = 0;
866	>	ConfigGeneral.caller_id_wait = 60;
867	>	ConfigGeneral.opers_bypass_callerid = 0;
868	>	ConfigGeneral.pace_wait = 10;
869	>	ConfigGeneral.pace_wait_simple = 1;
870	>	ConfigGeneral.short_motd = 0;
871	>	ConfigGeneral.ping_cookie = 0;
872	>	ConfigGeneral.no_oper_flood = 0;
873	>	ConfigGeneral.oper_pass_resv = 1;
874	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
875	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
876	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
877	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
878	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
879	>	ConfigGeneral.throttle_count = 1;
880	>	ConfigGeneral.throttle_time = 1;
881		}
882
883	<	/* read_conf()
883	>	static void
884	>	validate_conf(void)
885	>	{
886	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
887	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
888	>
889	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
890	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
891	>
892	>	if (EmptyString(ConfigServerInfo.network_name))
893	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
894	>
895	>	if (EmptyString(ConfigServerInfo.network_desc))
896	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
897	>
898	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
899	>	}
900	>
901	>	/* read_conf()
902		*
903		* inputs       - file descriptor pointing to config file to use
904		* output       - None
905		* side effects - Read configuration file.
906		*/
907		static void
908	<	read_conf(FBFILE *file)
908	>	read_conf(FILE *file)
909		{
910		lineno = 0;
911
912	<	set_default_conf(); /* Set default values prior to conf parsing */
912	>	set_default_conf();  /* Set default values prior to conf parsing */
913		conf_parser_ctx.pass = 1;
914	<	yyparse();          /* pick up the classes first */
914	>	yyparse();  /* Pick up the classes first */
915
916	<	fbrewind(file);
916	>	rewind(file);
917
918		conf_parser_ctx.pass = 2;
919	<	yyparse();          /* Load the values from the conf */
920	<	validate_conf();    /* Check to make sure some values are still okay. */
921	<	/* Some global values are also loaded here. */
922	<	check_class();      /* Make sure classes are valid */
919	>	yyparse();  /* Load the values from the conf */
920	>	validate_conf();  /* Check to make sure some values are still okay. */
921	>	/* Some global values are also loaded here. */
922	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
923		}
924
925	<	static void
926	<	validate_conf(void)
925	>	/* conf_rehash()
926	>	*
927	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
928	>	* as a result of an operator issuing this command, else assume it has been
929	>	* called as a result of the server receiving a HUP signal.
930	>	*/
931	>	void
932	>	conf_rehash(int sig)
933		{
934	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
935	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
936	<
1989	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1990	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
934	>	if (sig)
935	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
936	>	"Got signal SIGHUP, reloading configuration file(s)");
937
938	<	if (ServerInfo.network_name == NULL)
1993	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1994	<
1995	<	if (ServerInfo.network_desc == NULL)
1996	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
938	>	restart_resolver();
939
940	<	if (ConfigFileEntry.service_name == NULL)
1999	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
940	>	/* don't close listeners until we know we can go ahead with the rehash */
941
942	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
2002	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2003	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
942	>	read_conf_files(0);
943
944	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
944	>	load_conf_modules();
945	>	check_conf_klines();
946		}
947
948		/* lookup_confhost()
#	Line 2010 | Line 950 | validate_conf(void)
950		* start DNS lookups of all hostnames in the conf
951		* line and convert an IP addresses in a.b.c.d number for to IP#s.
952		*/
953	<	static void
954	<	lookup_confhost(struct ConfItem *conf)
953	>	void
954	>	lookup_confhost(struct MaskItem *conf)
955		{
2016	–	struct AccessItem *aconf;
956		struct addrinfo hints, *res;
957
958	<	aconf = map_to_conf(conf);
959	<
2021	<	if (EmptyString(aconf->host) ||
2022	<	EmptyString(aconf->user))
2023	<	{
2024	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
2025	<	aconf->host, conf->name);
2026	<	return;
2027	<	}
2028	<
2029	<	if (strchr(aconf->host, '*') ||
2030	<	strchr(aconf->host, '?'))
2031	<	return;
2032	<
2033	<	/* Do name lookup now on hostnames given and store the
958	>	/*
959	>	* Do name lookup now on hostnames given and store the
960		* ip numbers in conf structure.
961		*/
962		memset(&hints, 0, sizeof(hints));
#	Line 2041 | Line 967 | lookup_confhost(struct ConfItem *conf)
967		/* Get us ready for a bind() and don't bother doing dns lookup */
968		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
969
970	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
970	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
971		{
972	<	conf_dns_lookup(aconf);
972	>	conf_dns_lookup(conf);
973		return;
974		}
975
976	<	assert(res != NULL);
976	>	assert(res);
977	>
978	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
979	>	conf->addr.ss_len = res->ai_addrlen;
980	>	conf->addr.ss.ss_family = res->ai_family;
981
2052	–	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
2053	–	aconf->ipnum.ss_len = res->ai_addrlen;
2054	–	aconf->ipnum.ss.ss_family = res->ai_family;
982		freeaddrinfo(res);
983		}
984
#	Line 2065 | Line 992 | lookup_confhost(struct ConfItem *conf)
992		int
993		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
994		{
995	<	struct ip_entry *ip_found;
996	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
995	>	struct ip_entry *ip_found = NULL;
996	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
997
998		/* DLINE exempt also gets you out of static limits/pacing... */
999	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
999	>	if (conf && (conf->type == CONF_EXEMPT))
1000		return 0;
1001
1002	<	if (aconf != NULL)
1002	>	if (conf)
1003		return BANNED_CLIENT;
1004
1005	<	ip_found = find_or_add_ip(addr);
1005	>	ip_found = ipcache_find_or_add_address(addr);
1006
1007	<	if ((CurrentTime - ip_found->last_attempt) <
2081	<	ConfigFileEntry.throttle_time)
1007	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1008		{
1009	<	ip_found->last_attempt = CurrentTime;
1010	<	return TOO_FAST;
1009	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1010	>	return TOO_FAST;
1011	>
1012	>	++ip_found->connection_count;
1013		}
1014	+	else
1015	+	ip_found->connection_count = 1;
1016
1017		ip_found->last_attempt = CurrentTime;
1018		return 0;
1019		}
1020
1021	<	static struct AccessItem *
2092	<	find_regexp_kline(const char *uhi[])
2093	<	{
2094	<	#ifdef HAVE_LIBPCRE
2095	<	const dlink_node *ptr = NULL;
2096	<
2097	<	DLINK_FOREACH(ptr, rkconf_items.head)
2098	<	{
2099	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2100	<
2101	<	assert(aptr->regexuser);
2102	<	assert(aptr->regexhost);
2103	<
2104	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2105	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2106	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2107	<	return aptr;
2108	<	}
2109	<	#endif
2110	<	return NULL;
2111	<	}
2112	<
2113	<	/* find_kill()
1021	>	/* expire_tklines()
1022		*
1023	<	* inputs       - pointer to client structure
1024	<	* output       - pointer to struct AccessItem if found
1025	<	* side effects - See if this user is klined already,
2118	<	*                and if so, return struct AccessItem pointer
1023	>	* inputs       - tkline list pointer
1024	>	* output       - NONE
1025	>	* side effects - expire tklines
1026		*/
1027	<	struct AccessItem *
1028	<	find_kill(struct Client *client_p)
2122	<	{
2123	<	struct AccessItem *aconf = NULL;
2124	<	const char *uhi[3];
2125	<
2126	<	uhi[0] = client_p->username;
2127	<	uhi[1] = client_p->host;
2128	<	uhi[2] = client_p->sockhost;
2129	<
2130	<	assert(client_p != NULL);
2131	<
2132	<	aconf = find_kline_conf(client_p->host, client_p->username,
2133	<	&client_p->localClient->ip,
2134	<	client_p->localClient->aftype);
2135	<	if (aconf == NULL)
2136	<	aconf = find_regexp_kline(uhi);
2137	<
2138	<	if (aconf && (aconf->status & CONF_KLINE))
2139	<	return aconf;
2140	<
2141	<	return NULL;
2142	<	}
2143	<
2144	<	struct AccessItem *
2145	<	find_gline(struct Client *client_p)
1027	>	static void
1028	>	expire_tklines(dlink_list *list)
1029		{
1030	<	struct AccessItem *aconf;
1030	>	dlink_node *node = NULL, *node_next = NULL;
1031
1032	<	assert(client_p != NULL);
1033	<
1034	<	aconf = find_gline_conf(client_p->host, client_p->username,
2152	<	&client_p->localClient->ip,
2153	<	client_p->localClient->aftype);
2154	<
2155	<	if (aconf && (aconf->status & CONF_GLINE))
2156	<	return aconf;
2157	<
2158	<	return NULL;
2159	<	}
1032	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1033	>	{
1034	>	struct MaskItem *conf = node->data;
1035
1036	<	/* add_temp_line()
1037	<	*
2163	<	* inputs        - pointer to struct ConfItem
2164	<	* output        - none
2165	<	* Side effects  - links in given struct ConfItem into
2166	<	*                 temporary *line link list
2167	<	*/
2168	<	void
2169	<	add_temp_line(struct ConfItem *conf)
2170	<	{
2171	<	struct AccessItem *aconf;
1036	>	if (!conf->until || conf->until > CurrentTime)
1037	>	continue;
1038
1039	<	if (conf->type == DLINE_TYPE)
1040	<	{
1041	<	aconf = map_to_conf(conf);
1042	<	SetConfTemporary(aconf);
1043	<	dlinkAdd(conf, &conf->node, &temporary_dlines);
1044	<	MyFree(aconf->user);
1045	<	aconf->user = NULL;
1046	<	add_conf_by_address(CONF_DLINE, aconf);
1047	<	}
1048	<	else if (conf->type == KLINE_TYPE)
1049	<	{
1050	<	aconf = map_to_conf(conf);
1051	<	SetConfTemporary(aconf);
1052	<	dlinkAdd(conf, &conf->node, &temporary_klines);
2187	<	add_conf_by_address(CONF_KILL, aconf);
2188	<	}
2189	<	else if (conf->type == GLINE_TYPE)
2190	<	{
2191	<	aconf = map_to_conf(conf);
2192	<	SetConfTemporary(aconf);
2193	<	dlinkAdd(conf, &conf->node, &temporary_glines);
2194	<	add_conf_by_address(CONF_GLINE, aconf);
2195	<	}
2196	<	else if (conf->type == XLINE_TYPE)
2197	<	{
2198	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2199	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2200	<	}
2201	<	else if (conf->type == RXLINE_TYPE)
2202	<	{
2203	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2204	<	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2205	<	}
2206	<	else if (conf->type == RKLINE_TYPE)
2207	<	{
2208	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2209	<	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2210	<	}
2211	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2212	<	{
2213	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2214	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1039	>	if (conf->type == CONF_XLINE)
1040	>	{
1041	>	if (ConfigGeneral.tkline_expire_notices)
1042	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1043	>	"Temporary X-line for [%s] expired", conf->name);
1044	>	conf_free(conf);
1045	>	}
1046	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1047	>	{
1048	>	if (ConfigGeneral.tkline_expire_notices)
1049	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1050	>	"Temporary RESV for [%s] expired", conf->name);
1051	>	conf_free(conf);
1052	>	}
1053		}
1054		}
1055
#	Line 2223 | Line 1061 | add_temp_line(struct ConfItem *conf)
1061		*                This is an event started off in ircd.c
1062		*/
1063		void
1064	<	cleanup_tklines(void *notused)
1064	>	cleanup_tklines(void *unused)
1065		{
1066	<	expire_tklines(&temporary_glines);
1067	<	expire_tklines(&temporary_klines);
1068	<	expire_tklines(&temporary_dlines);
1069	<	expire_tklines(&temporary_xlines);
2232	<	expire_tklines(&temporary_rxlines);
2233	<	expire_tklines(&temporary_rklines);
2234	<	expire_tklines(&temporary_resv);
2235	<	}
2236	<
2237	<	/* expire_tklines()
2238	<	*
2239	<	* inputs       - tkline list pointer
2240	<	* output       - NONE
2241	<	* side effects - expire tklines
2242	<	*/
2243	<	static void
2244	<	expire_tklines(dlink_list *tklist)
2245	<	{
2246	<	dlink_node *ptr;
2247	<	dlink_node *next_ptr;
2248	<	struct ConfItem *conf;
2249	<	struct MatchItem *xconf;
2250	<	struct MatchItem *nconf;
2251	<	struct AccessItem *aconf;
2252	<	struct ResvChannel *cconf;
2253	<
2254	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2255	<	{
2256	<	conf = ptr->data;
2257	<	if (conf->type == GLINE_TYPE ||
2258	<	conf->type == KLINE_TYPE ||
2259	<	conf->type == DLINE_TYPE)
2260	<	{
2261	<	aconf = (struct AccessItem *)map_to_conf(conf);
2262	<	if (aconf->hold <= CurrentTime)
2263	<	{
2264	<	/* XXX - Do we want GLINE expiry notices?? */
2265	<	/* Alert opers that a TKline expired - Hwy */
2266	<	if (ConfigFileEntry.tkline_expire_notices)
2267	<	{
2268	<	if (aconf->status & CONF_KILL)
2269	<	{
2270	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2271	<	"Temporary K-line for [%s@%s] expired",
2272	<	(aconf->user) ? aconf->user : "*",
2273	<	(aconf->host) ? aconf->host : "*");
2274	<	}
2275	<	else if (conf->type == DLINE_TYPE)
2276	<	{
2277	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2278	<	"Temporary D-line for [%s] expired",
2279	<	(aconf->host) ? aconf->host : "*");
2280	<	}
2281	<	}
2282	<
2283	<	dlinkDelete(ptr, tklist);
2284	<	delete_one_address_conf(aconf->host, aconf);
2285	<	}
2286	<	}
2287	<	else if (conf->type == XLINE_TYPE ||
2288	<	conf->type == RXLINE_TYPE)
2289	<	{
2290	<	xconf = (struct MatchItem *)map_to_conf(conf);
2291	<	if (xconf->hold <= CurrentTime)
2292	<	{
2293	<	if (ConfigFileEntry.tkline_expire_notices)
2294	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2295	<	"Temporary X-line for [%s] %sexpired", conf->name,
2296	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2297	<	dlinkDelete(ptr, tklist);
2298	<	free_dlink_node(ptr);
2299	<	delete_conf_item(conf);
2300	<	}
2301	<	}
2302	<	else if (conf->type == RKLINE_TYPE)
2303	<	{
2304	<	aconf = map_to_conf(conf);
2305	<	if (aconf->hold <= CurrentTime)
2306	<	{
2307	<	if (ConfigFileEntry.tkline_expire_notices)
2308	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2309	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2310	<	(aconf->user) ? aconf->user : "*",
2311	<	(aconf->host) ? aconf->host : "*");
2312	<	dlinkDelete(ptr, tklist);
2313	<	free_dlink_node(ptr);
2314	<	delete_conf_item(conf);
2315	<	}
2316	<	}
2317	<	else if (conf->type == NRESV_TYPE)
2318	<	{
2319	<	nconf = (struct MatchItem *)map_to_conf(conf);
2320	<	if (nconf->hold <= CurrentTime)
2321	<	{
2322	<	if (ConfigFileEntry.tkline_expire_notices)
2323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2324	<	"Temporary RESV for [%s] expired", conf->name);
2325	<	dlinkDelete(ptr, tklist);
2326	<	free_dlink_node(ptr);
2327	<	delete_conf_item(conf);
2328	<	}
2329	<	}
2330	<	else if (conf->type == CRESV_TYPE)
2331	<	{
2332	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2333	<	if (cconf->hold <= CurrentTime)
2334	<	{
2335	<	if (ConfigFileEntry.tkline_expire_notices)
2336	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2337	<	"Temporary RESV for [%s] expired", cconf->name);
2338	<	delete_channel_resv(cconf);
2339	<	}
2340	<	}
2341	<	}
1066	>	hostmask_expire_temporary();
1067	>	expire_tklines(&xconf_items);
1068	>	expire_tklines(&nresv_items);
1069	>	expire_tklines(&cresv_items);
1070		}
1071
1072		/* oper_privs_as_string()
#	Line 2349 | Line 1077 | expire_tklines(dlink_list *tklist)
1077		*/
1078		static const struct oper_privs
1079		{
1080	<	const unsigned int oprivs;
1080	>	const unsigned int flag;
1081		const unsigned char c;
1082		} flag_list[] = {
1083	<	{ OPER_FLAG_ADMIN,       'A' },
1084	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1085	<	{ OPER_FLAG_DIE,         'D' },
1086	<	{ OPER_FLAG_GLINE,       'G' },
1087	<	{ OPER_FLAG_REHASH,      'H' },
1088	<	{ OPER_FLAG_K,           'K' },
1089	<	{ OPER_FLAG_OPERWALL,    'L' },
1090	<	{ OPER_FLAG_N,           'N' },
1091	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1092	<	{ OPER_FLAG_REMOTE,      'R' },
1093	<	{ OPER_FLAG_OPER_SPY,    'S' },
1094	<	{ OPER_FLAG_UNKLINE,     'U' },
1095	<	{ OPER_FLAG_X,           'X' },
1083	>	{ OPER_FLAG_ADMIN,          'A' },
1084	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1085	>	{ OPER_FLAG_DIE,            'D' },
1086	>	{ OPER_FLAG_REHASH,         'H' },
1087	>	{ OPER_FLAG_KLINE,          'K' },
1088	>	{ OPER_FLAG_KILL,           'N' },
1089	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1090	>	{ OPER_FLAG_CONNECT,        'P' },
1091	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1092	>	{ OPER_FLAG_SQUIT,          'R' },
1093	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1094	>	{ OPER_FLAG_UNKLINE,        'U' },
1095	>	{ OPER_FLAG_XLINE,          'X' },
1096		{ 0, '\0' }
1097		};
1098
1099	<	char *
1099	>	const char *
1100		oper_privs_as_string(const unsigned int port)
1101		{
1102	<	static char privs_out[16];
1102	>	static char privs_out[IRCD_BUFSIZE];
1103		char *privs_ptr = privs_out;
2376	–	unsigned int i = 0;
1104
1105	<	for (; flag_list[i].oprivs; ++i)
1105	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1106		{
1107	<	if (port & flag_list[i].oprivs)
1108	<	*privs_ptr++ = flag_list[i].c;
1107	>	if (port & opriv->flag)
1108	>	*privs_ptr++ = opriv->c;
1109		else
1110	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1110	>	*privs_ptr++ = ToLower(opriv->c);
1111		}
1112
1113		*privs_ptr = '\0';
#	Line 2389 | Line 1116 | oper_privs_as_string(const unsigned int
1116		}
1117
1118		/*
1119	<	* Input: A client to find the active oper{} name for.
1119	>	* Input: A client to find the active operator {} name for.
1120		* Output: The nick!user@host{oper} of the oper.
1121		*         "oper" is server name for remote opers
1122		* Side effects: None.
1123		*/
1124	<	char *
1124	>	const char *
1125		get_oper_name(const struct Client *client_p)
1126		{
1127	<	dlink_node *cnode;
2401	<	struct ConfItem *conf;
2402	<	struct AccessItem *aconf;
1127	>	static char buffer[IRCD_BUFSIZE];
1128
1129	<	/* +5 for !,@,{,} and null */
1130	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1129	>	if (IsServer(client_p))
1130	>	return client_p->name;
1131
1132		if (MyConnect(client_p))
1133		{
1134	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1134	>	const dlink_node *const node = client_p->connection->confs.head;
1135	>
1136	>	if (node)
1137		{
1138	<	conf = cnode->data;
2412	<	aconf = map_to_conf(conf);
1138	>	const struct MaskItem *const conf = node->data;
1139
1140	<	if (IsConfOperator(aconf))
1140	>	if (conf->type == CONF_OPER)
1141		{
1142	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1142	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1143		client_p->username, client_p->host, conf->name);
1144	<	return buffer;
1144	>	return buffer;
1145		}
1146		}
1147
1148	<	/* Probably should assert here for now. If there is an oper out there
1149	<	* with no oper{} conf attached, it would be good for us to know...
1148	>	/*
1149	>	* Probably should assert here for now. If there is an oper out there
1150	>	* with no operator {} conf attached, it would be good for us to know...
1151		*/
1152	<	assert(0); /* Oper without oper conf! */
1152	>	assert(0);  /* Oper without oper conf! */
1153		}
1154
1155		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1156	<	client_p->username, client_p->host, client_p->servptr->name);
1156	>	client_p->username, client_p->host, client_p->servptr->name);
1157		return buffer;
1158		}
1159
2433	–	/* read_conf_files()
2434	–	*
2435	–	* inputs       - cold start YES or NO
2436	–	* output       - none
2437	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2438	–	*/
2439	–	void
2440	–	read_conf_files(int cold)
2441	–	{
2442	–	const char *filename;
2443	–	char chanmodes[32];
2444	–	char chanlimit[32];
2445	–
2446	–	conf_parser_ctx.boot = cold;
2447	–	filename = get_conf_name(CONF_TYPE);
2448	–
2449	–	/* We need to know the initial filename for the yyerror() to report
2450	–	FIXME: The full path is in conffilenamebuf first time since we
2451	–	dont know anything else
2452	–
2453	–	- Gozem 2002-07-21
2454	–	*/
2455	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2456	–
2457	–	if ((conf_parser_ctx.conf_file = fbopen(filename, "r")) == NULL)
2458	–	{
2459	–	if (cold)
2460	–	{
2461	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2462	–	filename, strerror(errno));
2463	–	exit(-1);
2464	–	}
2465	–	else
2466	–	{
2467	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2468	–	"Unable to read configuration file '%s': %s",
2469	–	filename, strerror(errno));
2470	–	return;
2471	–	}
2472	–	}
2473	–
2474	–	if (!cold)
2475	–	clear_out_old_conf();
2476	–
2477	–	read_conf(conf_parser_ctx.conf_file);
2478	–	fbclose(conf_parser_ctx.conf_file);
2479	–
2480	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2481	–	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2482	–	ConfigChannel.use_except ? "e" : "",
2483	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2484	–	add_isupport("MAXLIST", chanmodes, -1);
2485	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2486	–
2487	–	if (ConfigChannel.disable_local_channels)
2488	–	add_isupport("CHANTYPES", "#", -1);
2489	–	else
2490	–	add_isupport("CHANTYPES", "#&", -1);
2491	–
2492	–	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2493	–	ConfigChannel.disable_local_channels ? "#" : "#&",
2494	–	ConfigChannel.max_chans_per_user);
2495	–	add_isupport("CHANLIMIT", chanlimit, -1);
2496	–	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2497	–	ConfigChannel.use_except ? "e" : "",
2498	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2499	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2500	–
2501	–	if (ConfigChannel.use_except)
2502	–	add_isupport("EXCEPTS", "e", -1);
2503	–	if (ConfigChannel.use_invex)
2504	–	add_isupport("INVEX", "I", -1);
2505	–	add_isupport("CHANMODES", chanmodes, -1);
2506	–
2507	–	/*
2508	–	* message_locale may have changed.  rebuild isupport since it relies
2509	–	* on strlen(form_str(RPL_ISUPPORT))
2510	–	*/
2511	–	rebuild_isupport_message_line();
2512	–
2513	–	#ifdef HAVE_LIBPCRE
2514	–	parse_conf_file(RKLINE_TYPE, cold);
2515	–	parse_conf_file(RXLINE_TYPE, cold);
2516	–	#endif
2517	–	parse_conf_file(KLINE_TYPE, cold);
2518	–	parse_conf_file(DLINE_TYPE, cold);
2519	–	parse_conf_file(XLINE_TYPE, cold);
2520	–	parse_conf_file(NRESV_TYPE, cold);
2521	–	parse_conf_file(CRESV_TYPE, cold);
2522	–	}
2523	–
2524	–	/* parse_conf_file()
2525	–	*
2526	–	* inputs       - type of conf file to parse
2527	–	* output       - none
2528	–	* side effects - conf file for givenconf type is opened and read then parsed
2529	–	*/
2530	–	static void
2531	–	parse_conf_file(int type, int cold)
2532	–	{
2533	–	FBFILE *file = NULL;
2534	–	const char *filename = get_conf_name(type);
2535	–
2536	–	if ((file = fbopen(filename, "r")) == NULL)
2537	–	{
2538	–	if (cold)
2539	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2540	–	filename, strerror(errno));
2541	–	else
2542	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2543	–	"Unable to read configuration file '%s': %s",
2544	–	filename, strerror(errno));
2545	–	}
2546	–	else
2547	–	{
2548	–	parse_csv_file(file, type);
2549	–	fbclose(file);
2550	–	}
2551	–	}
2552	–
1160		/* clear_out_old_conf()
1161		*
1162		* inputs       - none
#	Line 2559 | Line 1166 | parse_conf_file(int type, int cold)
1166		static void
1167		clear_out_old_conf(void)
1168		{
1169	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2563	<	struct ConfItem *conf;
2564	<	struct AccessItem *aconf;
2565	<	struct ClassItem *cltmp;
2566	<	struct MatchItem *match_item;
1169	>	dlink_node *node = NULL, *node_next = NULL;
1170		dlink_list *free_items [] = {
1171	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1172	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1173	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1171	>	&server_items,   &oconf_items,
1172	>	&uconf_items,   &xconf_items,
1173	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1174		};
1175
1176		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2575 | Line 1178 | clear_out_old_conf(void)
1178		/* We only need to free anything allocated by yyparse() here.
1179		* Resetting structs, etc, is taken care of by set_default_conf().
1180		*/
1181	<
1182	<	for (; *iterator != NULL; iterator++)
1181	>
1182	>	for (; *iterator; iterator++)
1183		{
1184	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1184	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1185		{
1186	<	conf = ptr->data;
2584	<	/* XXX This is less than pretty */
2585	<	if (conf->type == SERVER_TYPE)
2586	<	{
2587	<	aconf = map_to_conf(conf);
1186	>	struct MaskItem *conf = node->data;
1187
1188	<	if (aconf->clients != 0)
1189	<	{
2591	<	SetConfIllegal(aconf);
2592	<	dlinkDelete(&conf->node, &server_items);
2593	<	}
2594	<	else
2595	<	{
2596	<	delete_conf_item(conf);
2597	<	}
2598	<	}
2599	<	else if (conf->type == OPER_TYPE)
2600	<	{
2601	<	aconf = map_to_conf(conf);
1188	>	conf->active = 0;
1189	>	dlinkDelete(&conf->node, *iterator);
1190
1191	<	if (aconf->clients != 0)
1192	<	{
2605	<	SetConfIllegal(aconf);
2606	<	dlinkDelete(&conf->node, &oconf_items);
2607	<	}
2608	<	else
2609	<	{
2610	<	delete_conf_item(conf);
2611	<	}
2612	<	}
2613	<	else if (conf->type == CLIENT_TYPE)
1191	>	/* XXX This is less than pretty */
1192	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1193		{
1194	<	aconf = map_to_conf(conf);
1195	<
2617	<	if (aconf->clients != 0)
2618	<	{
2619	<	SetConfIllegal(aconf);
2620	<	}
2621	<	else
2622	<	{
2623	<	delete_conf_item(conf);
2624	<	}
1194	>	if (!conf->ref_count)
1195	>	conf_free(conf);
1196		}
1197	<	else if (conf->type == XLINE_TYPE  ||
2627	<	conf->type == RXLINE_TYPE ||
2628	<	conf->type == RKLINE_TYPE)
1197	>	else if (conf->type == CONF_XLINE)
1198		{
1199	<	/* temporary (r)xlines are also on
1200	<	* the (r)xconf items list */
2632	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2633	<	continue;
2634	<
2635	<	delete_conf_item(conf);
1199	>	if (!conf->until)
1200	>	conf_free(conf);
1201		}
1202		else
1203	<	{
2639	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2640	<	{
2641	<	match_item = map_to_conf(conf);
2642	<	if (match_item->ref_count <= 0)
2643	<	delete_conf_item(conf);
2644	<	else
2645	<	{
2646	<	match_item->illegal = 1;
2647	<	dlinkDelete(&conf->node, *iterator);
2648	<	}
2649	<	}
2650	<	else
2651	<	delete_conf_item(conf);
2652	<	}
1203	>	conf_free(conf);
1204		}
1205		}
1206
1207	+	motd_clear();
1208	+
1209		/*
1210	<	* don't delete the class table, rather mark all entries
1211	<	* for deletion. The table is cleaned up by check_class. - avalon
1210	>	* Don't delete the class table, rather mark all entries for deletion.
1211	>	* The table is cleaned up by class_delete_marked. - avalon
1212		*/
1213	<	DLINK_FOREACH(ptr, class_items.head)
2661	<	{
2662	<	cltmp = map_to_conf(ptr->data);
2663	<
2664	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2665	<	cltmp->active = 0;
2666	<	}
1213	>	class_mark_for_deletion();
1214
1215		clear_out_address_conf();
1216
1217	<	/* clean out module paths */
1217	>	/* Clean out module paths */
1218		mod_clear_paths();
1219
1220	<	/* clean out ServerInfo */
1221	<	MyFree(ServerInfo.description);
1222	<	ServerInfo.description = NULL;
1223	<	MyFree(ServerInfo.network_name);
1224	<	ServerInfo.network_name = NULL;
1225	<	MyFree(ServerInfo.network_desc);
1226	<	ServerInfo.network_desc = NULL;
1227	<	MyFree(ConfigFileEntry.egdpool_path);
1228	<	ConfigFileEntry.egdpool_path = NULL;
1220	>	pseudo_clear();
1221	>
1222	>	/* Clean out ConfigServerInfo */
1223	>	MyFree(ConfigServerInfo.description);
1224	>	ConfigServerInfo.description = NULL;
1225	>	MyFree(ConfigServerInfo.network_name);
1226	>	ConfigServerInfo.network_name = NULL;
1227	>	MyFree(ConfigServerInfo.network_desc);
1228	>	ConfigServerInfo.network_desc = NULL;
1229		#ifdef HAVE_LIBCRYPTO
1230	<	if (ServerInfo.rsa_private_key != NULL)
1230	>	if (ConfigServerInfo.rsa_private_key)
1231		{
1232	<	RSA_free(ServerInfo.rsa_private_key);
1233	<	ServerInfo.rsa_private_key = NULL;
1232	>	RSA_free(ConfigServerInfo.rsa_private_key);
1233	>	ConfigServerInfo.rsa_private_key = NULL;
1234		}
1235
1236	<	MyFree(ServerInfo.rsa_private_key_file);
1237	<	ServerInfo.rsa_private_key_file = NULL;
1236	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1237	>	ConfigServerInfo.rsa_private_key_file = NULL;
1238		#endif
1239
1240	<	/* clean out old resvs from the conf */
1241	<	clear_conf_resv();
1242	<
1243	<	/* clean out AdminInfo */
1244	<	MyFree(AdminInfo.name);
1245	<	AdminInfo.name = NULL;
1246	<	MyFree(AdminInfo.email);
2700	<	AdminInfo.email = NULL;
2701	<	MyFree(AdminInfo.description);
2702	<	AdminInfo.description = NULL;
1240	>	/* Clean out ConfigAdminInfo */
1241	>	MyFree(ConfigAdminInfo.name);
1242	>	ConfigAdminInfo.name = NULL;
1243	>	MyFree(ConfigAdminInfo.email);
1244	>	ConfigAdminInfo.email = NULL;
1245	>	MyFree(ConfigAdminInfo.description);
1246	>	ConfigAdminInfo.description = NULL;
1247
1248	<	/* operator{} and class{} blocks are freed above */
2705	<	/* clean out listeners */
1248	>	/* Clean out listeners */
1249		close_listeners();
2707	–
2708	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2709	–	* exempt{} and gecos{} blocks are freed above too
2710	–	*/
2711	–
2712	–	/* clean out general */
2713	–	MyFree(ConfigFileEntry.service_name);
2714	–	ConfigFileEntry.service_name = NULL;
2715	–
2716	–	delete_isupport("INVEX");
2717	–	delete_isupport("EXCEPTS");
1250		}
1251
1252	<	/* flush_deleted_I_P()
1252	>	/* read_conf_files()
1253		*
1254	<	* inputs       - none
1254	>	* inputs       - cold start YES or NO
1255		* output       - none
1256	<	* side effects - This function removes I/P conf items
2725	<	*/
2726	<	static void
2727	<	flush_deleted_I_P(void)
2728	<	{
2729	<	dlink_node *ptr;
2730	<	dlink_node *next_ptr;
2731	<	struct ConfItem *conf;
2732	<	struct AccessItem *aconf;
2733	<	dlink_list * free_items [] = {
2734	<	&server_items, &oconf_items, NULL
2735	<	};
2736	<	dlink_list ** iterator = free_items; /* C is dumb */
2737	<
2738	<	/* flush out deleted I and P lines
2739	<	* although still in use.
2740	<	*/
2741	<	for (; *iterator != NULL; iterator++)
2742	<	{
2743	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2744	<	{
2745	<	conf = ptr->data;
2746	<	aconf = (struct AccessItem *)map_to_conf(conf);
2747	<
2748	<	if (IsConfIllegal(aconf))
2749	<	{
2750	<	dlinkDelete(ptr, *iterator);
2751	<
2752	<	if (aconf->clients == 0)
2753	<	delete_conf_item(conf);
2754	<	}
2755	<	}
2756	<	}
2757	<	}
2758	<
2759	<	/* get_conf_name()
2760	<	*
2761	<	* inputs       - type of conf file to return name of file for
2762	<	* output       - pointer to filename for type of conf
2763	<	* side effects - none
1256	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1257		*/
1258	<	const char *
1259	<	get_conf_name(ConfType type)
1258	>	void
1259	>	read_conf_files(int cold)
1260		{
1261	<	switch (type)
1262	<	{
1263	<	case CONF_TYPE:
2771	<	return ConfigFileEntry.configfile;
2772	<	break;
2773	<	case KLINE_TYPE:
2774	<	return ConfigFileEntry.klinefile;
2775	<	break;
2776	<	case RKLINE_TYPE:
2777	<	return ConfigFileEntry.rklinefile;
2778	<	break;
2779	<	case DLINE_TYPE:
2780	<	return ConfigFileEntry.dlinefile;
2781	<	break;
2782	<	case XLINE_TYPE:
2783	<	return ConfigFileEntry.xlinefile;
2784	<	break;
2785	<	case RXLINE_TYPE:
2786	<	return ConfigFileEntry.rxlinefile;
2787	<	break;
2788	<	case CRESV_TYPE:
2789	<	return ConfigFileEntry.cresvfile;
2790	<	break;
2791	<	case NRESV_TYPE:
2792	<	return ConfigFileEntry.nresvfile;
2793	<	break;
2794	<	case GLINE_TYPE:
2795	<	return ConfigFileEntry.glinefile;
2796	<	break;
1261	>	const char *filename = NULL;
1262	>	char chanmodes[IRCD_BUFSIZE] = "";
1263	>	char chanlimit[IRCD_BUFSIZE] = "";
1264
1265	<	default:
1266	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2800	<	only with the above values, this will cause us to core
2801	<	at some point if this happens so we know where it was */
2802	<	}
2803	<	}
1265	>	conf_parser_ctx.boot = cold;
1266	>	filename = ConfigGeneral.configfile;
1267
1268	<	#define BAD_PING (-1)
1268	>	/* We need to know the initial filename for the yyerror() to report
1269	>	FIXME: The full path is in conffilenamebuf first time since we
1270	>	don't know anything else
1271
1272	<	/* get_conf_ping()
1273	<	*
1274	<	* inputs       - pointer to struct AccessItem
2810	<	*              - pointer to a variable that receives ping warning time
2811	<	* output       - ping frequency
2812	<	* side effects - NONE
2813	<	*/
2814	<	static int
2815	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2816	<	{
2817	<	struct ClassItem *aclass;
2818	<	struct AccessItem *aconf;
1272	>	- Gozem 2002-07-21
1273	>	*/
1274	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1275
1276	<	if (conf != NULL)
1276	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1277		{
1278	<	aconf = (struct AccessItem *)map_to_conf(conf);
2823	<	if (aconf->class_ptr != NULL)
1278	>	if (cold)
1279		{
1280	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1281	<	*pingwarn = PingWarning(aclass);
1282	<	return PingFreq(aclass);
1280	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1281	>	filename, strerror(errno));
1282	>	exit(-1);
1283		}
1284	<	}
2830	<
2831	<	return BAD_PING;
2832	<	}
2833	<
2834	<	/* get_client_class()
2835	<	*
2836	<	* inputs       - pointer to client struct
2837	<	* output       - pointer to name of class
2838	<	* side effects - NONE
2839	<	*/
2840	<	const char *
2841	<	get_client_class(struct Client *target_p)
2842	<	{
2843	<	dlink_node *ptr;
2844	<	struct ConfItem *conf;
2845	<	struct AccessItem *aconf;
2846	<
2847	<	if (target_p != NULL && !IsMe(target_p) &&
2848	<	target_p->localClient->confs.head != NULL)
2849	<	{
2850	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
1284	>	else
1285		{
1286	<	conf = ptr->data;
1287	<
1288	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
1289	<	conf->type == OPER_TYPE)
2856	<	{
2857	<	aconf = (struct AccessItem *) map_to_conf(conf);
2858	<	if (aconf->class_ptr != NULL)
2859	<	return aconf->class_ptr->name;
2860	<	}
1286	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1287	>	"Unable to read configuration file '%s': %s",
1288	>	filename, strerror(errno));
1289	>	return;
1290		}
1291		}
1292
1293	<	return "default";
1294	<	}
2866	<
2867	<	/* get_client_ping()
2868	<	*
2869	<	* inputs       - pointer to client struct
2870	<	*              - pointer to a variable that receives ping warning time
2871	<	* output       - ping frequency
2872	<	* side effects - NONE
2873	<	*/
2874	<	int
2875	<	get_client_ping(struct Client *target_p, int *pingwarn)
2876	<	{
2877	<	int ping;
2878	<	struct ConfItem *conf;
2879	<	dlink_node *nlink;
2880	<
2881	<	if (target_p->localClient->confs.head != NULL)
2882	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2883	<	{
2884	<	conf = nlink->data;
2885	<
2886	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2887	<	(conf->type == OPER_TYPE))
2888	<	{
2889	<	ping = get_conf_ping(conf, pingwarn);
2890	<	if (ping > 0)
2891	<	return ping;
2892	<	}
2893	<	}
2894	<
2895	<	*pingwarn = 0;
2896	<	return DEFAULT_PINGFREQUENCY;
2897	<	}
2898	<
2899	<	/* find_class()
2900	<	*
2901	<	* inputs       - string name of class
2902	<	* output       - corresponding Class pointer
2903	<	* side effects - NONE
2904	<	*/
2905	<	struct ConfItem *
2906	<	find_class(const char *classname)
2907	<	{
2908	<	struct ConfItem *conf;
2909	<
2910	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2911	<	return conf;
2912	<
2913	<	return class_default;
2914	<	}
2915	<
2916	<	/* check_class()
2917	<	*
2918	<	* inputs       - NONE
2919	<	* output       - NONE
2920	<	* side effects -
2921	<	*/
2922	<	void
2923	<	check_class(void)
2924	<	{
2925	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2926	<
2927	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2928	<	{
2929	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2930	<
2931	<	if (!aclass->active && !CurrUserCount(aclass))
2932	<	{
2933	<	destroy_cidr_class(aclass);
2934	<	delete_conf_item(ptr->data);
2935	<	}
2936	<	}
2937	<	}
1293	>	if (!cold)
1294	>	clear_out_old_conf();
1295
1296	<	/* init_class()
1297	<	*
2941	<	* inputs       - NONE
2942	<	* output       - NONE
2943	<	* side effects -
2944	<	*/
2945	<	void
2946	<	init_class(void)
2947	<	{
2948	<	struct ClassItem *aclass;
1296	>	read_conf(conf_parser_ctx.conf_file);
1297	>	fclose(conf_parser_ctx.conf_file);
1298
1299	<	class_default = make_conf_item(CLASS_TYPE);
1299	>	log_reopen_all();
1300
1301	<	aclass = map_to_conf(class_default);
1302	<	aclass->active = 1;
2954	<	DupString(class_default->name, "default");
2955	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2956	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2957	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2958	<	MaxSendq(aclass) = DEFAULT_SENDQ;
1301	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1302	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1303
1304	<	client_check_cb = register_callback("check_client", check_client);
1305	<	}
1304	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1305	>	add_isupport("MAXLIST", chanmodes, -1);
1306	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1307	>	add_isupport("CHANTYPES", "#", -1);
1308
1309	<	/* get_sendq()
1310	<	*
1311	<	* inputs       - pointer to client
1312	<	* output       - sendq for this client as found from its class
1313	<	* side effects - NONE
1314	<	*/
1315	<	unsigned int
2970	<	get_sendq(struct Client *client_p)
2971	<	{
2972	<	unsigned int sendq = DEFAULT_SENDQ;
2973	<	dlink_node *ptr;
2974	<	struct ConfItem *conf;
2975	<	struct ConfItem *class_conf;
2976	<	struct ClassItem *aclass;
2977	<	struct AccessItem *aconf;
1309	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1310	>	ConfigChannel.max_channels);
1311	>	add_isupport("CHANLIMIT", chanlimit, -1);
1312	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1313	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1314	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1315	>	add_isupport("CHANMODES", chanmodes, -1);
1316
1317	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
1318	<	{
1319	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2982	<	{
2983	<	conf = ptr->data;
2984	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2985	<	|| (conf->type == CLIENT_TYPE))
2986	<	{
2987	<	aconf = (struct AccessItem *)map_to_conf(conf);
2988	<	if ((class_conf = aconf->class_ptr) == NULL)
2989	<	continue;
2990	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2991	<	sendq = MaxSendq(aclass);
2992	<	return sendq;
2993	<	}
2994	<	}
2995	<	}
2996	<	/* XXX return a default?
2997	<	* if here, then there wasn't an attached conf with a sendq
2998	<	* that is very bad -Dianora
1317	>	/*
1318	>	* message_locale may have changed.  rebuild isupport since it relies
1319	>	* on strlen(form_str(RPL_ISUPPORT))
1320		*/
1321	<	return DEFAULT_SENDQ;
1321	>	rebuild_isupport_message_line();
1322		}
1323
1324		/* conf_add_class_to_conf()
1325		*
1326		* inputs       - pointer to config item
1327		* output       - NONE
1328	<	* side effects - Add a class pointer to a conf
1328	>	* side effects - Add a class pointer to a conf
1329		*/
1330		void
1331	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1331	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1332		{
1333	<	struct AccessItem *aconf = map_to_conf(conf);
3013	<	struct ClassItem *class = NULL;
3014	<
3015	<	if (class_name == NULL)
1333	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1334		{
1335	<	aconf->class_ptr = class_default;
3018	<
3019	<	if (conf->type == CLIENT_TYPE)
3020	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3021	<	"Warning *** Defaulting to default class for %s@%s",
3022	<	aconf->user, aconf->host);
3023	<	else
3024	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3025	<	"Warning *** Defaulting to default class for %s",
3026	<	conf->name);
3027	<	}
3028	<	else
3029	<	aconf->class_ptr = find_class(class_name);
3030	<
3031	<	if (aconf->class_ptr)
3032	<	class = map_to_conf(aconf->class_ptr);
1335	>	conf->class = class_default;
1336
1337	<	if (aconf->class_ptr == NULL || !class->active)
1338	<	{
1339	<	if (conf->type == CLIENT_TYPE)
1340	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3038	<	"Warning *** Defaulting to default class for %s@%s",
3039	<	aconf->user, aconf->host);
1337	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1338	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1339	>	"Warning *** Defaulting to default class for %s@%s",
1340	>	conf->user, conf->host);
1341		else
1342	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1343	<	"Warning *** Defaulting to default class for %s",
1344	<	conf->name);
3044	<	aconf->class_ptr = class_default;
1342	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1343	>	"Warning *** Defaulting to default class for %s",
1344	>	conf->name);
1345		}
1346		}
1347
3048	–	/* conf_add_server()
3049	–	*
3050	–	* inputs       - pointer to config item
3051	–	*              - pointer to link count already on this conf
3052	–	* output       - NONE
3053	–	* side effects - Add a connect block
3054	–	*/
3055	–	int
3056	–	conf_add_server(struct ConfItem *conf, const char *class_name)
3057	–	{
3058	–	struct AccessItem *aconf;
3059	–	struct split_nuh_item nuh;
3060	–	char conf_user[USERLEN + 1];
3061	–	char conf_host[HOSTLEN + 1];
3062	–
3063	–	aconf = map_to_conf(conf);
3064	–
3065	–	conf_add_class_to_conf(conf, class_name);
3066	–
3067	–	if (!aconf->host || !conf->name)
3068	–	{
3069	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3070	–	ilog(LOG_TYPE_IRCD, "Bad connect block");
3071	–	return -1;
3072	–	}
3073	–
3074	–	if (EmptyString(aconf->passwd))
3075	–	{
3076	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3077	–	conf->name);
3078	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
3079	–	return -1;
3080	–	}
3081	–
3082	–	nuh.nuhmask  = aconf->host;
3083	–	nuh.nickptr  = NULL;
3084	–	nuh.userptr  = conf_user;
3085	–	nuh.hostptr  = conf_host;
3086	–
3087	–	nuh.nicksize = 0;
3088	–	nuh.usersize = sizeof(conf_user);
3089	–	nuh.hostsize = sizeof(conf_host);
3090	–
3091	–	split_nuh(&nuh);
3092	–
3093	–	MyFree(aconf->host);
3094	–	aconf->host = NULL;
3095	–
3096	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3097	–	got lost in H6/7, will have to be re-added */
3098	–	DupString(aconf->host, conf_host);
3099	–
3100	–	lookup_confhost(conf);
3101	–
3102	–	return 0;
3103	–	}
3104	–
1348		/* yyerror()
1349		*
1350		* inputs       - message from parser
#	Line 3117 | Line 1360 | yyerror(const char *msg)
1360		return;
1361
1362		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1363	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1363	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1364	>	"\"%s\", line %u: %s: %s",
1365		conffilebuf, lineno + 1, msg, newlinebuf);
1366		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1367		conffilebuf, lineno + 1, msg, newlinebuf);
1368		}
1369
1370	<	int
1371	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1370	>	void
1371	>	conf_error_report(const char *msg)
1372		{
1373	<	if (fbgets(lbuf, max_size, fb) == NULL)
3130	<	return 0;
3131	<
3132	<	return strlen(lbuf);
3133	<	}
1373	>	char newlinebuf[IRCD_BUFSIZE];
1374
1375	<	int
1376	<	conf_yy_fatal_error(const char *msg)
1377	<	{
1378	<	return 0;
1375	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1376	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1377	>	"\"%s\", line %u: %s: %s",
1378	>	conffilebuf, lineno + 1, msg, newlinebuf);
1379	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1380	>	conffilebuf, lineno + 1, msg, newlinebuf);
1381		}
1382
1383		/*
1384		* valid_tkline()
1385	<	*
1385	>	*
1386		* inputs       - pointer to ascii string to check
1387		*              - whether the specified time is in seconds or minutes
1388		* output       - -1 not enough parameters
#	Line 3149 | Line 1391 | conf_yy_fatal_error(const char *msg)
1391		* Originally written by Dianora (Diane, db@db.net)
1392		*/
1393		time_t
1394	<	valid_tkline(const char *p, int minutes)
1394	>	valid_tkline(const char *data, const int minutes)
1395		{
1396	+	const unsigned char *p = (const unsigned char *)data;
1397	+	unsigned char tmpch = '\0';
1398		time_t result = 0;
1399
1400	<	for (; *p; ++p)
1400	>	while ((tmpch = *p++))
1401		{
1402	<	if (!IsDigit(*p))
1402	>	if (!IsDigit(tmpch))
1403		return 0;
1404
1405		result *= 10;
1406	<	result += ((*p) & 0xF);
1406	>	result += (tmpch & 0xF);
1407		}
1408
1409		/*
1410	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1411	<	* i.e. they specifically use 0, I am going to return 1 instead
1412	<	* as a return value of non-zero is used to flag it as a temporary kline
1410	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1411	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1412	>	* value of non-zero is used to flag it as a temporary kline
1413		*/
1414		if (result == 0)
1415		result = 1;
1416
1417	<	/*
1417	>	/*
1418		* If the incoming time is in seconds convert it to minutes for the purpose
1419		* of this calculation
1420		*/
1421		if (!minutes)
1422	<	result = result / (time_t)60;
1422	>	result = result / 60;
1423
1424		if (result > MAX_TDKLINE_TIME)
1425		result = MAX_TDKLINE_TIME;
1426
1427	<	result = result * (time_t)60;  /* turn it into seconds */
1427	>	result = result * 60;  /* Turn it into seconds */
1428
1429		return result;
1430		}
1431
1432	+	/* valid_wild_card_simple()
1433	+	*
1434	+	* inputs       - data to check for sufficient non-wildcard characters
1435	+	* outputs      - 1 if valid, else 0
1436	+	* side effects - none
1437	+	*/
1438	+	int
1439	+	valid_wild_card_simple(const char *data)
1440	+	{
1441	+	const unsigned char *p = (const unsigned char *)data;
1442	+	unsigned char tmpch = '\0';
1443	+	unsigned int nonwild = 0;
1444	+
1445	+	while ((tmpch = *p++))
1446	+	{
1447	+	if (tmpch == '\\' && *p)
1448	+	{
1449	+	++p;
1450	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1451	+	return 1;
1452	+	}
1453	+	else if (!IsMWildChar(tmpch))
1454	+	{
1455	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1456	+	return 1;
1457	+	}
1458	+	}
1459	+
1460	+	return 0;
1461	+	}
1462	+
1463		/* valid_wild_card()
1464		*
1465		* input        - pointer to client
#	Line 3194 | Line 1469 | valid_tkline(const char *p, int minutes)
1469		* side effects - NOTICE is given to source_p if warn is 1
1470		*/
1471		int
1472	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1472	>	valid_wild_card(struct Client *source_p, int count, ...)
1473		{
1474	<	char *p;
1475	<	char tmpch;
3201	<	int nonwild = 0;
1474	>	unsigned char tmpch = '\0';
1475	>	unsigned int nonwild = 0;
1476		va_list args;
1477
1478		/*
#	Line 3217 | Line 1491 | valid_wild_card(struct Client *source_p,
1491
1492		while (count--)
1493		{
1494	<	p = va_arg(args, char *);
1494	>	const unsigned char *p = va_arg(args, const unsigned char *);
1495		if (p == NULL)
1496		continue;
1497
#	Line 3229 | Line 1503 | valid_wild_card(struct Client *source_p,
1503		* If we find enough non-wild characters, we can
1504		* break - no point in searching further.
1505		*/
1506	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1506	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1507	>	{
1508	>	va_end(args);
1509		return 1;
1510	+	}
1511		}
1512		}
1513		}
1514
1515	<	if (warn)
1516	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1517	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1515	>	if (IsClient(source_p))
1516	>	sendto_one_notice(source_p, &me,
1517	>	":Please include at least %u non-wildcard characters with the mask",
1518	>	ConfigGeneral.min_nonwildcard);
1519	>	va_end(args);
1520	>	return 0;
1521	>	}
1522	>
1523	>	/* find_user_host()
1524	>	*
1525	>	* inputs       - pointer to client placing kline
1526	>	*              - pointer to user_host_or_nick
1527	>	*              - pointer to user buffer
1528	>	*              - pointer to host buffer
1529	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1530	>	* side effects -
1531	>	*/
1532	>	static int
1533	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1534	>	char *luser, char *lhost)
1535	>	{
1536	>	struct Client *target_p = NULL;
1537	>	char *hostp = NULL;
1538	>
1539	>	if (lhost == NULL)
1540	>	{
1541	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1542	>	return 1;
1543	>	}
1544	>
1545	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1546	>	{
1547	>	/* Explicit user@host mask given */
1548	>	if (hostp)                            /* I'm a little user@host */
1549	>	{
1550	>	*(hostp++) = '\0';                       /* short and squat */
1551	>
1552	>	if (*user_host_or_nick)
1553	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1554	>	else
1555	>	strcpy(luser, "*");
1556	>
1557	>	if (*hostp)
1558	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1559	>	else
1560	>	strcpy(lhost, "*");
1561	>	}
1562	>	else
1563	>	{
1564	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1565	>	luser[1] = '\0';
1566	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1567	>	}
1568	>
1569	>	return 1;
1570	>	}
1571	>	else
1572	>	{
1573	>	/* Try to find user@host mask from nick */
1574	>	/* Okay to use source_p as the first param, because source_p == client_p */
1575	>	if ((target_p =
1576	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1577	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1578	>
1579	>	if (IsExemptKline(target_p))
1580	>	{
1581	>	if (IsClient(source_p))
1582	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1583	>	return 0;
1584	>	}
1585	>
1586	>	/*
1587	>	* Turn the "user" bit into "*user", blow away '~'
1588	>	* if found in original user name (non-idented)
1589	>	*/
1590	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1591	>
1592	>	if (target_p->username[0] == '~')
1593	>	luser[0] = '*';
1594	>
1595	>	if (!strcmp(target_p->sockhost, "0"))
1596	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1597	>	else
1598	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1599	>	return 1;
1600	>	}
1601	>
1602		return 0;
1603		}
1604
#	Line 3251 | Line 1612 | valid_wild_card(struct Client *source_p,
1612		*              - parse_flags bit map of things to test
1613		*              - pointer to user or string to parse into
1614		*              - pointer to host or NULL to parse into if non NULL
1615	<	*              - pointer to optional tkline time or NULL
1615	>	*              - pointer to optional tkline time or NULL
1616		*              - pointer to target_server to parse into if non NULL
1617		*              - pointer to reason to parse into
1618		*
1619	<	* output       - 1 if valid, -1 if not valid
1619	>	* output       - 1 if valid, 0 if not valid
1620		* side effects - A generalised k/d/x etc. line parser,
1621		*               "ALINE [time] user@host|string [ON] target :reason"
1622		*                will parse returning a parsed user, host if
#	Line 3273 | Line 1634 | valid_wild_card(struct Client *source_p,
1634		*/
1635		int
1636		parse_aline(const char *cmd, struct Client *source_p,
1637	<	int parc, char **parv,
1638	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1639	<	char **target_server, char **reason)
1637	>	int parc, char **parv,
1638	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1639	>	char **target_server, char **reason)
1640		{
1641		int found_tkline_time=0;
1642	<	static char def_reason[] = "No Reason";
1642	>	static char def_reason[] = CONF_NOREASON;
1643		static char user[USERLEN*4+1];
1644		static char host[HOSTLEN*4+1];
1645
#	Line 3287 | Line 1648 | parse_aline(const char *cmd, struct Clie
1648
1649		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1650
1651	<	if (found_tkline_time != 0)
1651	>	if (found_tkline_time)
1652		{
1653		parv++;
1654		parc--;
1655
1656	<	if (tkline_time != NULL)
1656	>	if (tkline_time)
1657		*tkline_time = found_tkline_time;
1658		else
1659		{
1660	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1661	<	me.name, source_p->name, cmd);
3301	<	return -1;
1660	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1661	>	return 0;
1662		}
1663		}
1664
1665		if (parc == 0)
1666		{
1667	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1668	<	me.name, source_p->name, cmd);
3309	<	return -1;
1667	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1668	>	return 0;
1669		}
1670
1671		if (h_p == NULL)
1672		*up_p = *parv;
1673		else
1674		{
1675	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1676	<	return -1;
1675	>	if (find_user_host(source_p, *parv, user, host) == 0)
1676	>	return 0;
1677
1678		*up_p = user;
1679		*h_p = host;
1680		}
1681	<
1681	>
1682		parc--;
1683		parv++;
1684
1685	<	if (parc != 0)
1685	>	if (parc)
1686		{
1687		if (irccmp(*parv, "ON") == 0)
1688		{
#	Line 3332 | Line 1691 | parse_aline(const char *cmd, struct Clie
1691
1692		if (target_server == NULL)
1693		{
1694	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1695	<	me.name, source_p->name, cmd);
3337	<	return -1;
1694	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1695	>	return 0;
1696		}
1697
1698		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1699		{
1700	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1701	<	me.name, source_p->name, "remoteban");
3344	<	return -1;
1700	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1701	>	return 0;
1702		}
1703
1704		if (parc == 0 || EmptyString(*parv))
1705		{
1706	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1707	<	me.name, source_p->name, cmd);
3351	<	return -1;
1706	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1707	>	return 0;
1708		}
1709
1710		*target_server = *parv;
#	Line 3360 | Line 1716 | parse_aline(const char *cmd, struct Clie
1716		/* Make sure target_server *is* NULL if no ON server found
1717		* caller probably NULL'd it first, but no harm to do it again -db
1718		*/
1719	<	if (target_server != NULL)
1720	<	*target_server = NULL;
1719	>	if (target_server)
1720	>	*target_server = NULL;
1721		}
1722		}
1723
1724	<	if (h_p != NULL)
1724	>	if (h_p)
1725		{
1726	<	if (strchr(user, '!') != NULL)
1726	>	if (strchr(user, '!'))
1727		{
1728	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1729	<	me.name, source_p->name);
3374	<	return -1;
1728	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1729	>	return 0;
1730		}
1731
1732	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1733	<	return -1;
1732	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1733	>	return 0;
1734		}
1735		else
1736	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1737	<	return -1;
1736	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1737	>	return 0;
1738
1739	<	if (reason != NULL)
1739	>	if (reason)
1740		{
1741	<	if (parc != 0 && !EmptyString(*parv))
1741	>	if (parc && !EmptyString(*parv))
1742		{
1743		*reason = *parv;
1744	+
1745		if (!valid_comment(source_p, *reason, 1))
1746	<	return -1;
1746	>	return 0;
1747		}
1748		else
1749		*reason = def_reason;
#	Line 3396 | Line 1752 | parse_aline(const char *cmd, struct Clie
1752		return 1;
1753		}
1754
3399	–	/* find_user_host()
3400	–	*
3401	–	* inputs       - pointer to client placing kline
3402	–	*              - pointer to user_host_or_nick
3403	–	*              - pointer to user buffer
3404	–	*              - pointer to host buffer
3405	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3406	–	* side effects -
3407	–	*/
3408	–	static int
3409	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3410	–	char *luser, char *lhost, unsigned int flags)
3411	–	{
3412	–	struct Client *target_p = NULL;
3413	–	char *hostp = NULL;
3414	–
3415	–	if (lhost == NULL)
3416	–	{
3417	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3418	–	return 1;
3419	–	}
3420	–
3421	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3422	–	{
3423	–	/* Explicit user@host mask given */
3424	–
3425	–	if (hostp != NULL)                            /* I'm a little user@host */
3426	–	{
3427	–	*(hostp++) = '\0';                       /* short and squat */
3428	–	if (*user_host_or_nick)
3429	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3430	–	else
3431	–	strcpy(luser, "*");
3432	–	if (*hostp)
3433	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3434	–	else
3435	–	strcpy(lhost, "*");
3436	–	}
3437	–	else
3438	–	{
3439	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3440	–	luser[1] = '\0';
3441	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3442	–	}
3443	–
3444	–	return 1;
3445	–	}
3446	–	else if (!(flags & NOUSERLOOKUP))
3447	–	{
3448	–	/* Try to find user@host mask from nick */
3449	–	/* Okay to use source_p as the first param, because source_p == client_p */
3450	–	if ((target_p =
3451	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3452	–	return 0;
3453	–
3454	–	if (IsExemptKline(target_p))
3455	–	{
3456	–	if (!IsServer(source_p))
3457	–	sendto_one(source_p,
3458	–	":%s NOTICE %s :%s is E-lined",
3459	–	me.name, source_p->name, target_p->name);
3460	–	return 0;
3461	–	}
3462	–
3463	–	/*
3464	–	* turn the "user" bit into "*user", blow away '~'
3465	–	* if found in original user name (non-idented)
3466	–	*/
3467	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3468	–
3469	–	if (target_p->username[0] == '~')
3470	–	luser[0] = '*';
3471	–
3472	–	if (target_p->sockhost[0] == '\0' ||
3473	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3474	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3475	–	else
3476	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3477	–	return 1;
3478	–	}
3479	–
3480	–	return 0;
3481	–	}
3482	–
1755		/* valid_comment()
1756		*
1757		* inputs       - pointer to client
#	Line 3491 | Line 1763 | find_user_host(struct Client *source_p,
1763		int
1764		valid_comment(struct Client *source_p, char *comment, int warn)
1765		{
3494	–	if (strchr(comment, '"'))
3495	–	{
3496	–	if (warn)
3497	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3498	–	me.name, source_p->name);
3499	–	return 0;
3500	–	}
3501	–
1766		if (strlen(comment) > REASONLEN)
1767		comment[REASONLEN-1] = '\0';
1768
#	Line 3513 | Line 1777 | valid_comment(struct Client *source_p, c
1777		* side effects - none
1778		*/
1779		int
1780	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1780	>	match_conf_password(const char *password, const struct MaskItem *conf)
1781		{
1782		const char *encr = NULL;
1783
1784	<	if (password == NULL || aconf->passwd == NULL)
1784	>	if (EmptyString(password) || EmptyString(conf->passwd))
1785		return 0;
1786
1787	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1788	<	{
3525	<	/* use first two chars of the password they send in as salt */
3526	<	/* If the password in the conf is MD5, and ircd is linked
3527	<	* to scrypt on FreeBSD, or the standard crypt library on
3528	<	* glibc Linux, then this code will work fine on generating
3529	<	* the proper encrypted hash for comparison.
3530	<	*/
3531	<	if (*aconf->passwd)
3532	<	encr = crypt(password, aconf->passwd);
3533	<	else
3534	<	encr = "";
3535	<	}
1787	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1788	>	encr = crypt(password, conf->passwd);
1789		else
1790		encr = password;
1791
1792	<	return !strcmp(encr, aconf->passwd);
1792	>	return encr && !strcmp(encr, conf->passwd);
1793		}
1794
1795		/*
#	Line 3544 | Line 1797 | match_conf_password(const char *password
1797		*
1798		* inputs       - client sending the cluster
1799		*              - command name "KLINE" "XLINE" etc.
1800	<	*              - capab -- CAP_KLN etc. from s_serv.h
1801	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
1800	>	*              - capab -- CAP_KLN etc. from server.h
1801	>	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1802		*              - pattern and args to send along
1803		* output       - none
1804		* side effects - Take source_p send the pattern with args given
1805		*                along to all servers that match capab and cluster type
1806		*/
1807		void
1808	<	cluster_a_line(struct Client *source_p, const char *command,
1809	<	int capab, int cluster_type, const char *pattern, ...)
1808	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1809	>	unsigned int cluster_type, const char *pattern, ...)
1810		{
1811		va_list args;
1812	<	char buffer[IRCD_BUFSIZE];
1813	<	const dlink_node *ptr = NULL;
1812	>	char buffer[IRCD_BUFSIZE] = "";
1813	>	const dlink_node *node = NULL;
1814
1815		va_start(args, pattern);
1816		vsnprintf(buffer, sizeof(buffer), pattern, args);
1817		va_end(args);
1818
1819	<	DLINK_FOREACH(ptr, cluster_items.head)
1819	>	DLINK_FOREACH(node, cluster_items.head)
1820		{
1821	<	const struct ConfItem *conf = ptr->data;
1821	>	const struct MaskItem *conf = node->data;
1822
1823		if (conf->flags & cluster_type)
1824	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1825	<	"%s %s %s", command, conf->name, buffer);
1824	>	sendto_match_servs(source_p, conf->name, CAP_CLUSTER | capab,
1825	>	"%s %s %s", command, conf->name, buffer);
1826		}
1827		}
1828
#	Line 3608 | Line 1861 | split_nuh(struct split_nuh_item *const i
1861
1862		if (iptr->nickptr)
1863		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1864	+
1865		if (iptr->userptr)
1866		strlcpy(iptr->userptr, "*", iptr->usersize);
1867	+
1868		if (iptr->hostptr)
1869		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1870
#	Line 3617 | Line 1872 | split_nuh(struct split_nuh_item *const i
1872		{
1873		*p = '\0';
1874
1875	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1875	>	if (iptr->nickptr && *iptr->nuhmask)
1876		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1877
1878	<	if ((q = strchr(++p, '@'))) {
1878	>	if ((q = strchr(++p, '@')))
1879	>	{
1880		*q++ = '\0';
1881
1882	<	if (*p != '\0')
1882	>	if (*p)
1883		strlcpy(iptr->userptr, p, iptr->usersize);
1884
1885	<	if (*q != '\0')
1885	>	if (*q)
1886		strlcpy(iptr->hostptr, q, iptr->hostsize);
1887		}
1888		else
1889		{
1890	<	if (*p != '\0')
1890	>	if (*p)
1891		strlcpy(iptr->userptr, p, iptr->usersize);
1892		}
1893		}
#	Line 3643 | Line 1899 | split_nuh(struct split_nuh_item *const i
1899		/* if found a @ */
1900		*p++ = '\0';
1901
1902	<	if (*iptr->nuhmask != '\0')
1902	>	if (*iptr->nuhmask)
1903		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1904
1905	<	if (*p != '\0')
1905	>	if (*p)
1906		strlcpy(iptr->hostptr, p, iptr->hostsize);
1907		}
1908		else
1909		{
1910	<	/* no @ found */
1910	>	/* No @ found */
1911		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1912		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1913		else
#	Line 3659 | Line 1915 | split_nuh(struct split_nuh_item *const i
1915		}
1916		}
1917		}
3662	–
3663	–	/*
3664	–	* flags_to_ascii
3665	–	*
3666	–	* inputs       - flags is a bitmask
3667	–	*              - pointer to table of ascii letters corresponding
3668	–	*                to each bit
3669	–	*              - flag 1 for convert ToLower if bit missing
3670	–	*                0 if ignore.
3671	–	* output       - none
3672	–	* side effects - string pointed to by p has bitmap chars written to it
3673	–	*/
3674	–	static void
3675	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3676	–	int lowerit)
3677	–	{
3678	–	unsigned int mask = 1;
3679	–	int i = 0;
3680	–
3681	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3682	–	{
3683	–	if (flags & mask)
3684	–	*p++ = bit_table[i];
3685	–	else if (lowerit)
3686	–	*p++ = ToLower(bit_table[i]);
3687	–	}
3688	–	*p = '\0';
3689	–	}
3690	–
3691	–	/*
3692	–	* cidr_limit_reached
3693	–	*
3694	–	* inputs       - int flag allowing over_rule of limits
3695	–	*              - pointer to the ip to be added
3696	–	*              - pointer to the class
3697	–	* output       - non zero if limit reached
3698	–	*                0 if limit not reached
3699	–	* side effects -
3700	–	*/
3701	–	static int
3702	–	cidr_limit_reached(int over_rule,
3703	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3704	–	{
3705	–	dlink_node *ptr = NULL;
3706	–	struct CidrItem *cidr;
3707	–
3708	–	if (NumberPerCidr(aclass) <= 0)
3709	–	return 0;
3710	–
3711	–	if (ip->ss.ss_family == AF_INET)
3712	–	{
3713	–	if (CidrBitlenIPV4(aclass) <= 0)
3714	–	return 0;
3715	–
3716	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3717	–	{
3718	–	cidr = ptr->data;
3719	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3720	–	{
3721	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3722	–	return -1;
3723	–	cidr->number_on_this_cidr++;
3724	–	return 0;
3725	–	}
3726	–	}
3727	–	cidr = MyMalloc(sizeof(struct CidrItem));
3728	–	cidr->number_on_this_cidr = 1;
3729	–	cidr->mask = *ip;
3730	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3731	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3732	–	}
3733	–	#ifdef IPV6
3734	–	else if (CidrBitlenIPV6(aclass) > 0)
3735	–	{
3736	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3737	–	{
3738	–	cidr = ptr->data;
3739	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3740	–	{
3741	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3742	–	return -1;
3743	–	cidr->number_on_this_cidr++;
3744	–	return 0;
3745	–	}
3746	–	}
3747	–	cidr = MyMalloc(sizeof(struct CidrItem));
3748	–	cidr->number_on_this_cidr = 1;
3749	–	cidr->mask = *ip;
3750	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3751	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3752	–	}
3753	–	#endif
3754	–	return 0;
3755	–	}
3756	–
3757	–	/*
3758	–	* remove_from_cidr_check
3759	–	*
3760	–	* inputs       - pointer to the ip to be removed
3761	–	*              - pointer to the class
3762	–	* output       - NONE
3763	–	* side effects -
3764	–	*/
3765	–	static void
3766	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3767	–	{
3768	–	dlink_node *ptr = NULL;
3769	–	dlink_node *next_ptr = NULL;
3770	–	struct CidrItem *cidr;
3771	–
3772	–	if (NumberPerCidr(aclass) == 0)
3773	–	return;
3774	–
3775	–	if (ip->ss.ss_family == AF_INET)
3776	–	{
3777	–	if (CidrBitlenIPV4(aclass) <= 0)
3778	–	return;
3779	–
3780	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3781	–	{
3782	–	cidr = ptr->data;
3783	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3784	–	{
3785	–	cidr->number_on_this_cidr--;
3786	–	if (cidr->number_on_this_cidr == 0)
3787	–	{
3788	–	dlinkDelete(ptr, &aclass->list_ipv4);
3789	–	MyFree(cidr);
3790	–	return;
3791	–	}
3792	–	}
3793	–	}
3794	–	}
3795	–	#ifdef IPV6
3796	–	else if (CidrBitlenIPV6(aclass) > 0)
3797	–	{
3798	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3799	–	{
3800	–	cidr = ptr->data;
3801	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3802	–	{
3803	–	cidr->number_on_this_cidr--;
3804	–	if (cidr->number_on_this_cidr == 0)
3805	–	{
3806	–	dlinkDelete(ptr, &aclass->list_ipv6);
3807	–	MyFree(cidr);
3808	–	return;
3809	–	}
3810	–	}
3811	–	}
3812	–	}
3813	–	#endif
3814	–	}
3815	–
3816	–	static void
3817	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3818	–	dlink_list *old_list, dlink_list *new_list, int changed)
3819	–	{
3820	–	dlink_node *ptr;
3821	–	struct Client *client_p;
3822	–	struct ConfItem *conf;
3823	–	struct AccessItem *aconf;
3824	–
3825	–	if (!changed)
3826	–	{
3827	–	*new_list = *old_list;
3828	–	old_list->head = old_list->tail = NULL;
3829	–	old_list->length = 0;
3830	–	return;
3831	–	}
3832	–
3833	–	DLINK_FOREACH(ptr, local_client_list.head)
3834	–	{
3835	–	client_p = ptr->data;
3836	–	if (client_p->localClient->aftype != aftype)
3837	–	continue;
3838	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3839	–	continue;
3840	–
3841	–	conf = client_p->localClient->confs.tail->data;
3842	–	if (conf->type == CLIENT_TYPE)
3843	–	{
3844	–	aconf = map_to_conf(conf);
3845	–	if (aconf->class_ptr == oldcl)
3846	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3847	–	}
3848	–	}
3849	–	}
3850	–
3851	–	/*
3852	–	* rebuild_cidr_class
3853	–	*
3854	–	* inputs       - pointer to old conf
3855	–	*              - pointer to new_class
3856	–	* output       - none
3857	–	* side effects - rebuilds the class link list of cidr blocks
3858	–	*/
3859	–	void
3860	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3861	–	{
3862	–	struct ClassItem *old_class = map_to_conf(conf);
3863	–
3864	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3865	–	{
3866	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3867	–	rebuild_cidr_list(AF_INET, conf, new_class,
3868	–	&old_class->list_ipv4, &new_class->list_ipv4,
3869	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3870	–
3871	–	#ifdef IPV6
3872	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3873	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3874	–	&old_class->list_ipv6, &new_class->list_ipv6,
3875	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3876	–	#endif
3877	–	}
3878	–
3879	–	destroy_cidr_class(old_class);
3880	–	}
3881	–
3882	–	/*
3883	–	* destroy_cidr_list
3884	–	*
3885	–	* inputs       - pointer to class dlink list of cidr blocks
3886	–	* output       - none
3887	–	* side effects - completely destroys the class link list of cidr blocks
3888	–	*/
3889	–	static void
3890	–	destroy_cidr_list(dlink_list *list)
3891	–	{
3892	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3893	–
3894	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3895	–	{
3896	–	dlinkDelete(ptr, list);
3897	–	MyFree(ptr->data);
3898	–	}
3899	–	}
3900	–
3901	–	/*
3902	–	* destroy_cidr_class
3903	–	*
3904	–	* inputs       - pointer to class
3905	–	* output       - none
3906	–	* side effects - completely destroys the class link list of cidr blocks
3907	–	*/
3908	–	static void
3909	–	destroy_cidr_class(struct ClassItem *aclass)
3910	–	{
3911	–	destroy_cidr_list(&aclass->list_ipv4);
3912	–	destroy_cidr_list(&aclass->list_ipv6);
3913	–	}

Diff Legend

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