ViewVC Help

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

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

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

Diff Legend

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