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

Diff Legend

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