ViewVC Help

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

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

Comparing:
ircd-hybrid/src/s_conf.c (file contents), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 8314 by michael, Wed Feb 28 17:47:23 2018 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-2018 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"
33	<	#include "resv.h"
34	<	#include "s_stats.h"
30	>	#include "conf.h"
31	>	#include "conf_cluster.h"
32	>	#include "conf_gecos.h"
33	>	#include "conf_pseudo.h"
34	>	#include "conf_resv.h"
35	>	#include "conf_service.h"
36	>	#include "conf_shared.h"
37	>	#include "server.h"
38		#include "channel.h"
39		#include "client.h"
34	–	#include "common.h"
40		#include "event.h"
36	–	#include "hash.h"
37	–	#include "hook.h"
41		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
42		#include "s_bsd.h"
41	–	#include "irc_getnameinfo.h"
42	–	#include "irc_getaddrinfo.h"
43		#include "ircd.h"
44	–	#include "list.h"
44		#include "listener.h"
45		#include "hostmask.h"
46		#include "modules.h"
47		#include "numeric.h"
48		#include "fdlist.h"
49	<	#include "s_log.h"
49	>	#include "log.h"
50		#include "send.h"
52	–	#include "s_gline.h"
53	–	#include "fileio.h"
51		#include "memory.h"
52	<	#include "irc_res.h"
52	>	#include "res.h"
53		#include "userhost.h"
54	<	#include "s_user.h"
54	>	#include "user.h"
55		#include "channel_mode.h"
56	<
57	<	struct Callback *client_check_cb = NULL;
58	<	struct config_server_hide ConfigServerHide;
56	>	#include "parse.h"
57	>	#include "misc.h"
58	>	#include "conf_db.h"
59	>	#include "conf_class.h"
60	>	#include "motd.h"
61	>	#include "ipcache.h"
62	>	#include "isupport.h"
63	>	#include "whowas.h"
64	>
65	>
66	>	struct config_channel_entry ConfigChannel;
67	>	struct config_serverhide_entry ConfigServerHide;
68	>	struct config_general_entry ConfigGeneral;
69	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
70	>	struct config_serverinfo_entry ConfigServerInfo;
71	>	struct config_admin_entry ConfigAdminInfo;
72	>	struct conf_parser_context conf_parser_ctx;
73
74		/* general conf items link list root, other than k lines etc. */
75	<	dlink_list server_items  = { NULL, NULL, 0 };
76	<	dlink_list cluster_items = { NULL, NULL, 0 };
66	<	dlink_list hub_items     = { NULL, NULL, 0 };
67	<	dlink_list leaf_items    = { NULL, NULL, 0 };
68	<	dlink_list oconf_items   = { NULL, NULL, 0 };
69	<	dlink_list uconf_items   = { NULL, NULL, 0 };
70	<	dlink_list xconf_items   = { NULL, NULL, 0 };
71	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
72	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
73	<	dlink_list nresv_items   = { NULL, NULL, 0 };
74	<	dlink_list class_items   = { NULL, NULL, 0 };
75	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
76	<
77	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
79	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
80	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
81	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
82	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
83	<	dlink_list temporary_resv = { NULL, NULL, 0 };
75	>	dlink_list connect_items;
76	>	dlink_list operator_items;
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
88	–	extern char yytext[];
81		extern int yyparse(); /* defined in y.tab.c */
90	–	unsigned int scount = 0; /* used by yyparse(), etc */
91	–	int ypass  = 1; /* used by yyparse()      */
92	–
93	–	/* internally defined functions */
94	–	static void lookup_confhost(struct ConfItem *);
95	–	static void set_default_conf(void);
96	–	static void validate_conf(void);
97	–	static void read_conf(FBFILE *);
98	–	static void clear_out_old_conf(void);
99	–	static void flush_deleted_I_P(void);
100	–	static void expire_tklines(dlink_list *);
101	–	static void garbage_collect_ip_entries(void);
102	–	static int hash_ip(struct irc_ssaddr *);
103	–	static int verify_access(struct Client *, const char *);
104	–	static int attach_iline(struct Client *, struct ConfItem *);
105	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
106	–	static void parse_conf_file(int, int);
107	–	static dlink_list *map_to_list(ConfType);
108	–	static struct AccessItem *find_regexp_kline(const char *[]);
109	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
110	–
111	–	/*
112	–	* bit_len
113	–	*/
114	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
115	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
116	–	static void destroy_cidr_class(struct ClassItem *);
117	–
118	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
119	–
120	–	FBFILE *conf_fbfile_in = NULL;
121	–
122	–	/* address of default class conf */
123	–	static struct ConfItem *class_default;
124	–
125	–	/* usually, with hash tables, you use a prime number...
126	–	* but in this case I am dealing with ip addresses,
127	–	* not ascii strings.
128	–	*/
129	–	#define IP_HASH_SIZE 0x1000
130	–
131	–	struct ip_entry
132	–	{
133	–	struct irc_ssaddr ip;
134	–	int count;
135	–	time_t last_attempt;
136	–	struct ip_entry *next;
137	–	};
82
139	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
140	–	static BlockHeap *ip_entry_heap = NULL;
141	–	static int ip_entries_count = 0;
142	–
143	–
144	–	inline void *
145	–	map_to_conf(struct ConfItem *aconf)
146	–	{
147	–	void *conf;
148	–	conf = (void *)((unsigned long)aconf +
149	–	(unsigned long)sizeof(struct ConfItem));
150	–	return(conf);
151	–	}
152	–
153	–	inline struct ConfItem *
154	–	unmap_conf_item(void *aconf)
155	–	{
156	–	struct ConfItem *conf;
157	–
158	–	conf = (struct ConfItem *)((unsigned long)aconf -
159	–	(unsigned long)sizeof(struct ConfItem));
160	–	return(conf);
161	–	}
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 171 | 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;
177	<	struct ConfItem *conf;
97	>	struct MaskItem *const conf = vptr;
98
99	<	MyFree(aconf->dns_query);
180	<	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",
186	<	aconf->host);
187	<	conf = unmap_conf_item(aconf);
188	<	sendto_realops_flags(UMODE_ALL, L_ALL,
189	<	"Ignoring connect{} block for %s - host not found",
190	<	conf->name);
191	<	delete_conf_item(conf);
192	<	}
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 199 | 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		{
222	–	struct ConfItem *conf = NULL;
223	–	struct AccessItem *aconf = NULL;
224	–	struct ClassItem *aclass = NULL;
225	–	int status = 0;
226	–
136		switch (type)
137		{
138	<	case DLINE_TYPE:
139	<	case EXEMPTDLINE_TYPE:
231	<	case GLINE_TYPE:
232	<	case KLINE_TYPE:
233	<	case CLIENT_TYPE:
234	<	case OPER_TYPE:
235	<	case SERVER_TYPE:
236	<	conf = MyMalloc(sizeof(struct ConfItem) +
237	<	sizeof(struct AccessItem));
238	<	aconf = map_to_conf(conf);
239	<	aconf->aftype = AF_INET;
240	<
241	<	/* Yes, sigh. switch on type again */
242	<	switch (type)
243	<	{
244	<	case EXEMPTDLINE_TYPE:
245	<	status = CONF_EXEMPTDLINE;
246	<	break;
247	<
248	<	case DLINE_TYPE:
249	<	status = CONF_DLINE;
250	<	break;
251	<
252	<	case KLINE_TYPE:
253	<	status = CONF_KLINE;
138	>	case CONF_OPER:
139	>	return &operator_items;
140		break;
141	<
142	<	case GLINE_TYPE:
257	<	status = CONF_GLINE;
258	<	break;
259	<
260	<	case CLIENT_TYPE:
261	<	status = CONF_CLIENT;
262	<	break;
263	<
264	<	case OPER_TYPE:
265	<	status = CONF_OPERATOR;
266	<	dlinkAdd(conf, &conf->node, &oconf_items);
141	>	case CONF_SERVER:
142	>	return &connect_items;
143		break;
268	–
269	–	case SERVER_TYPE:
270	–	status = CONF_SERVER;
271	–	dlinkAdd(conf, &conf->node, &server_items);
272	–	break;
273	–
144		default:
145	<	break;
276	<	}
277	<	aconf->status = status;
278	<	break;
279	<
280	<	case LEAF_TYPE:
281	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
282	<	sizeof(struct MatchItem));
283	<	dlinkAdd(conf, &conf->node, &leaf_items);
284	<	break;
285	<
286	<	case HUB_TYPE:
287	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
288	<	sizeof(struct MatchItem));
289	<	dlinkAdd(conf, &conf->node, &hub_items);
290	<	break;
291	<
292	<	case ULINE_TYPE:
293	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
294	<	sizeof(struct MatchItem));
295	<	dlinkAdd(conf, &conf->node, &uconf_items);
296	<	break;
297	<
298	<	case GDENY_TYPE:
299	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
300	<	sizeof(struct AccessItem));
301	<	dlinkAddTail(conf, &conf->node, &gdeny_items);
302	<	break;
303	<
304	<	case XLINE_TYPE:
305	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
306	<	sizeof(struct MatchItem));
307	<	dlinkAdd(conf, &conf->node, &xconf_items);
308	<	break;
309	<
310	<	case RXLINE_TYPE:
311	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
312	<	sizeof(struct MatchItem));
313	<	dlinkAdd(conf, &conf->node, &rxconf_items);
314	<	break;
315	<
316	<	case RKLINE_TYPE:
317	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
318	<	sizeof(struct AccessItem));
319	<	aconf = map_to_conf(conf);
320	<	aconf->status = CONF_KLINE;
321	<	dlinkAdd(conf, &conf->node, &rkconf_items);
322	<	break;
323	<
324	<	case CLUSTER_TYPE:
325	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
326	<	dlinkAdd(conf, &conf->node, &cluster_items);
327	<	break;
328	<
329	<	case CRESV_TYPE:
330	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
331	<	sizeof(struct ResvChannel));
332	<	break;
333	<
334	<	case NRESV_TYPE:
335	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
336	<	sizeof(struct MatchItem));
337	<	dlinkAdd(conf, &conf->node, &nresv_items);
338	<	break;
339	<
340	<	case CLASS_TYPE:
341	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
342	<	sizeof(struct ClassItem));
343	<	dlinkAdd(conf, &conf->node, &class_items);
344	<	aclass = (struct ClassItem *)map_to_conf(conf);
345	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
346	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
347	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
348	<	MaxSendq(aclass) = DEFAULT_SENDQ;
349	<	CurrUserCount(aclass) = 0;
350	<	break;
351	<
352	<	default:
353	<	conf = NULL;
354	<	break;
145	>	return NULL;
146		}
356	–
357	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
358	–	conf->type = type;
359	–
360	–	return(conf);
147		}
148
149	<	void
150	<	delete_conf_item(struct ConfItem *conf)
149	>	struct MaskItem *
150	>	conf_make(enum maskitem_type type)
151		{
152	<	struct MatchItem *match_item;
153	<	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);
417	<	break;
418	<
419	<	case OPER_TYPE:
420	<	aconf = map_to_conf(conf);
421	<	if (!IsConfIllegal(aconf))
422	<	dlinkDelete(&conf->node, &oconf_items);
423	<	MyFree(conf);
424	<	break;
425	<
426	<	case SERVER_TYPE:
427	<	aconf = map_to_conf(conf);
428	<	if (!IsConfIllegal(aconf))
429	<	dlinkDelete(&conf->node, &server_items);
430	<	MyFree(conf);
431	<	break;
432	<
433	<	default:
434	<	break;
435	<	}
436	<	break;
152	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
153	>	dlink_list *list = NULL;
154
155	<	case HUB_TYPE:
156	<	match_item = map_to_conf(conf);
157	<	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	<	MyFree(conf);
513	<	break;
514	<
515	<	case GDENY_TYPE:
516	<	aconf = map_to_conf(conf);
517	<	MyFree(aconf->user);
518	<	MyFree(aconf->host);
519	<	dlinkDelete(&conf->node, &gdeny_items);
520	<	MyFree(conf);
521	<	break;
522	<
523	<	case CLUSTER_TYPE:
524	<	dlinkDelete(&conf->node, &cluster_items);
525	<	MyFree(conf);
526	<	break;
527	<
528	<	case CRESV_TYPE:
529	<	MyFree(conf);
530	<	break;
531	<
532	<	case CLASS_TYPE:
533	<	dlinkDelete(&conf->node, &class_items);
534	<	MyFree(conf);
535	<	break;
155	>	conf->type   = type;
156	>	conf->active = 1;
157	>	conf->aftype = AF_INET;
158
159	<	default:
160	<	break;
161	<	}
159	>	if ((list = map_to_list(type)))
160	>	dlinkAdd(conf, &conf->node, list);
161	>	return conf;
162		}
163
542	–	/* free_access_item()
543	–	*
544	–	* inputs       - pointer to conf to free
545	–	* output       - none
546	–	* side effects - crucial password fields are zeroed, conf is freed
547	–	*/
164		void
165	<	free_access_item(struct AccessItem *aconf)
550	<	{
551	<	struct ConfItem *conf;
552	<
553	<	if (aconf == NULL)
554	<	return;
555	<	conf = unmap_conf_item(aconf);
556	<	delete_conf_item(conf);
557	<	}
558	<
559	<	static const unsigned int shared_bit_table[] =
560	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
561	<
562	<	/* report_confitem_types()
563	<	*
564	<	* inputs       - pointer to client requesting confitem report
565	<	*              - ConfType to report
566	<	* output       - none
567	<	* side effects -
568	<	*/
569	<	void
570	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
571	<	{
572	<	dlink_node *ptr = NULL;
573	<	struct ConfItem *conf = NULL;
574	<	struct AccessItem *aconf = NULL;
575	<	struct MatchItem *matchitem = NULL;
576	<	struct ClassItem *classitem = NULL;
577	<	char buf[12];
578	<	char *p = NULL;
579	<
580	<	switch (type)
581	<	{
582	<	case GDENY_TYPE:
583	<	DLINK_FOREACH(ptr, gdeny_items.head)
584	<	{
585	<	conf = ptr->data;
586	<	aconf = map_to_conf(conf);
587	<
588	<	p = buf;
589	<
590	<	if (aconf->flags & GDENY_BLOCK)
591	<	*p++ = 'B';
592	<	else
593	<	*p++ = 'b';
594	<
595	<	if (aconf->flags & GDENY_REJECT)
596	<	*p++ = 'R';
597	<	else
598	<	*p++ = 'r';
599	<
600	<	*p = '\0';
601	<
602	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
603	<	me.name, RPL_STATSDEBUG, source_p->name,
604	<	aconf->user, aconf->host, conf->name, buf);
605	<	}
606	<	break;
607	<
608	<	case XLINE_TYPE:
609	<	DLINK_FOREACH(ptr, xconf_items.head)
610	<	{
611	<	conf = ptr->data;
612	<	matchitem = map_to_conf(conf);
613	<
614	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
615	<	me.name, source_p->name,
616	<	matchitem->hold ? "x": "X", matchitem->count,
617	<	conf->name, matchitem->reason);
618	<	}
619	<	break;
620	<
621	<	case RXLINE_TYPE:
622	<	DLINK_FOREACH(ptr, rxconf_items.head)
623	<	{
624	<	conf = ptr->data;
625	<	matchitem = map_to_conf(conf);
626	<
627	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
628	<	me.name, source_p->name,
629	<	matchitem->hold ? "xR": "XR", matchitem->count,
630	<	conf->name, matchitem->reason);
631	<	}
632	<	break;
633	<
634	<	case RKLINE_TYPE:
635	<	p = temp ? "Rk" : "RK";
636	<
637	<	DLINK_FOREACH(ptr, rkconf_items.head)
638	<	{
639	<	aconf = map_to_conf((conf = ptr->data));
640	<
641	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
642	<	continue;
643	<
644	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
645	<	source_p->name, p, aconf->host, aconf->user,
646	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
647	<	}
648	<	break;
649	<
650	<	case ULINE_TYPE:
651	<	DLINK_FOREACH(ptr, uconf_items.head)
652	<	{
653	<	conf = ptr->data;
654	<	matchitem = map_to_conf(conf);
655	<
656	<	p = buf;
657	<
658	<	/* some of these are redundant for the sake of
659	<	* consistency with cluster{} flags
660	<	*/
661	<	*p++ = 'c';
662	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
663	<
664	<	sendto_one(source_p, form_str(RPL_STATSULINE),
665	<	me.name, source_p->name, conf->name,
666	<	matchitem->user?matchitem->user: "*",
667	<	matchitem->host?matchitem->host: "*", buf);
668	<	}
669	<
670	<	DLINK_FOREACH(ptr, cluster_items.head)
671	<	{
672	<	conf = ptr->data;
673	<
674	<	p = buf;
675	<
676	<	*p++ = 'C';
677	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
678	<
679	<	sendto_one(source_p, form_str(RPL_STATSULINE),
680	<	me.name, source_p->name, conf->name,
681	<	"*", "*", buf);
682	<	}
683	<
684	<	break;
685	<
686	<	case OPER_TYPE:
687	<	DLINK_FOREACH(ptr, oconf_items.head)
688	<	{
689	<	conf = ptr->data;
690	<	aconf = map_to_conf(conf);
691	<
692	<	/* Don't allow non opers to see oper privs */
693	<	if (IsOper(source_p))
694	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
695	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
696	<	conf->name, oper_privs_as_string(aconf->port),
697	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
698	<	else
699	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
700	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
701	<	conf->name, "0",
702	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
703	<	}
704	<	break;
705	<
706	<	case CLASS_TYPE:
707	<	DLINK_FOREACH(ptr, class_items.head)
708	<	{
709	<	conf = ptr->data;
710	<	classitem = map_to_conf(conf);
711	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
712	<	me.name, source_p->name, 'Y',
713	<	conf->name, PingFreq(classitem),
714	<	ConFreq(classitem),
715	<	MaxTotal(classitem), MaxSendq(classitem));
716	<	}
717	<	break;
718	<
719	<	case CONF_TYPE:
720	<	case CLIENT_TYPE:
721	<	break;
722	<
723	<	case SERVER_TYPE:
724	<	DLINK_FOREACH(ptr, server_items.head)
725	<	{
726	<	p = buf;
727	<
728	<	conf = ptr->data;
729	<	aconf = map_to_conf(conf);
730	<
731	<	buf[0] = '\0';
732	<
733	<	if (IsConfAllowAutoConn(aconf))
734	<	*p++ = 'A';
735	<	if (IsConfCryptLink(aconf))
736	<	*p++ = 'C';
737	<	if (IsConfLazyLink(aconf))
738	<	*p++ = 'L';
739	<	if (aconf->fakename)
740	<	*p++ = 'M';
741	<	if (IsConfTopicBurst(aconf))
742	<	*p++ = 'T';
743	<	if (IsConfCompressed(aconf))
744	<	*p++ = 'Z';
745	<	if (buf[0] == '\0')
746	<	*p++ = '*';
747	<
748	<	*p = '\0';
749	<
750	<	/* Allow admins to see actual ips
751	<	* unless hide_server_ips is enabled
752	<	*/
753	<	if (!ConfigServerHide.hide_server_ips && IsAdmin(source_p))
754	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
755	<	me.name, source_p->name, 'C', aconf->host,
756	<	buf, conf->name, aconf->port,
757	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
758	<	else
759	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
760	<	me.name, source_p->name, 'C',
761	<	"*@127.0.0.1", buf, conf->name, aconf->port,
762	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
763	<	}
764	<	break;
765	<
766	<	case HUB_TYPE:
767	<	DLINK_FOREACH(ptr, hub_items.head)
768	<	{
769	<	conf = ptr->data;
770	<	matchitem = map_to_conf(conf);
771	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
772	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
773	<	}
774	<	break;
775	<
776	<	case LEAF_TYPE:
777	<	DLINK_FOREACH(ptr, leaf_items.head)
778	<	{
779	<	conf = ptr->data;
780	<	matchitem = map_to_conf(conf);
781	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
782	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
783	<	}
784	<	break;
785	<
786	<	case GLINE_TYPE:
787	<	case KLINE_TYPE:
788	<	case DLINE_TYPE:
789	<	case EXEMPTDLINE_TYPE:
790	<	case CRESV_TYPE:
791	<	case NRESV_TYPE:
792	<	case CLUSTER_TYPE:
793	<	break;
794	<	}
795	<	}
796	<
797	<	/* check_client()
798	<	*
799	<	* inputs       - pointer to client
800	<	* output       - 0 = Success
801	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
802	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
803	<	*                I_LINE_FULL       (-3) = I-line is full
804	<	*                TOO_MANY          (-4) = Too many connections from hostname
805	<	*                BANNED_CLIENT     (-5) = K-lined
806	<	* side effects - Ordinary client access check.
807	<	*                Look for conf lines which have the same
808	<	*                status as the flags passed.
809	<	*/
810	<	static void *
811	<	check_client(va_list args)
165	>	conf_free(struct MaskItem *conf)
166		{
167	<	struct Client *source_p = va_arg(args, struct Client *);
168	<	const char *username = va_arg(args, const char *);
815	<	int i;
816	<
817	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
818	<	if ((i = verify_access(source_p, username)))
819	<	{
820	<	ilog(L_INFO, "Access denied: %s[%s]",
821	<	source_p->name, source_p->sockhost);
822	<	}
167	>	dlink_node *node = NULL, *node_next = NULL;
168	>	dlink_list *list = NULL;
169
170	<	switch (i)
171	<	{
826	<	case IRCD_SOCKET_ERROR:
827	<	exit_client(source_p, &me, "Socket Error");
828	<	break;
170	>	if ((list = map_to_list(conf->type)))
171	>	dlinkFindDelete(list, conf);
172
173	<	case TOO_MANY:
831	<	sendto_realops_flags(UMODE_FULL, L_ALL,
832	<	"Too many on IP for %s (%s).",
833	<	get_client_name(source_p, SHOW_IP),
834	<	source_p->sockhost);
835	<	ilog(L_INFO,"Too many connections on IP from %s.",
836	<	get_client_name(source_p, SHOW_IP));
837	<	ServerStats->is_ref++;
838	<	exit_client(source_p, &me, "No more connections allowed on that IP");
839	<	break;
173	>	xfree(conf->name);
174
175	<	case I_LINE_FULL:
176	<	sendto_realops_flags(UMODE_FULL, L_ALL,
177	<	"I-line is full for %s (%s).",
178	<	get_client_name(source_p, SHOW_IP),
179	<	source_p->sockhost);
180	<	ilog(L_INFO,"Too many connections from %s.",
847	<	get_client_name(source_p, SHOW_IP));
848	<	ServerStats->is_ref++;
849	<	exit_client(source_p, &me,
850	<	"No more connections allowed in your connection class");
851	<	break;
175	>	if (conf->dns_pending)
176	>	delete_resolver_queries(conf);
177	>	if (conf->passwd)
178	>	memset(conf->passwd, 0, strlen(conf->passwd));
179	>	if (conf->spasswd)
180	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
181
182	<	case NOT_AUTHORIZED:
854	<	{
855	<	static char ipaddr[HOSTIPLEN];
856	<	ServerStats->is_ref++;
857	<	/* jdc - lists server name & port connections are on */
858	<	/*       a purely cosmetical change */
859	<	irc_getnameinfo((struct sockaddr*)&source_p->localClient->ip,
860	<	source_p->localClient->ip.ss_len, ipaddr, HOSTIPLEN, NULL, 0,
861	<	NI_NUMERICHOST);
862	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
863	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
864	<	get_client_name(source_p, SHOW_IP),
865	<	ipaddr,
866	<	source_p->localClient->listener->name,
867	<	source_p->localClient->listener->port);
868	<	ilog(L_INFO,
869	<	"Unauthorized client connection from %s on [%s/%u].",
870	<	get_client_name(source_p, SHOW_IP),
871	<	source_p->localClient->listener->name,
872	<	source_p->localClient->listener->port);
873	<
874	<	/* XXX It is prolematical whether it is better to use the
875	<	* capture reject code here or rely on the connecting too fast code.
876	<	* - Dianora
877	<	*/
878	<	if(REJECT_HOLD_TIME > 0)
879	<	{
880	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
881	<	me.name, source_p->name);
882	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
883	<	SetCaptured(source_p);
884	<	}
885	<	else
886	<	exit_client(source_p, &me, "You are not authorized to use this server");
887	<	break;
888	<	}
889	<
890	<	case BANNED_CLIENT:
891	<	/*
892	<	* Don't exit them immediately, play with them a bit.
893	<	* - Dianora
894	<	*/
895	<	if (REJECT_HOLD_TIME > 0)
896	<	{
897	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
898	<	SetCaptured(source_p);
899	<	}
900	<	else
901	<	exit_client(source_p, &me, "Banned");
902	<	ServerStats->is_ref++;
903	<	break;
904	<
905	<	case 0:
906	<	default:
907	<	break;
908	<	}
182	>	conf->class = NULL;
183
184	<	return (i < 0 ? NULL : source_p);
185	<	}
184	>	xfree(conf->passwd);
185	>	xfree(conf->spasswd);
186	>	xfree(conf->reason);
187	>	xfree(conf->certfp);
188	>	xfree(conf->whois);
189	>	xfree(conf->user);
190	>	xfree(conf->host);
191	>	xfree(conf->cipher_list);
192
193	<	/* verify_access()
914	<	*
915	<	* inputs       - pointer to client to verify
916	<	*              - pointer to proposed username
917	<	* output       - 0 if success -'ve if not
918	<	* side effect  - find the first (best) I line to attach.
919	<	*/
920	<	static int
921	<	verify_access(struct Client *client_p, const char *username)
922	<	{
923	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
924	<	struct ConfItem *conf = NULL;
925	<	char non_ident[USERLEN + 1] = { '~', '\0' };
926	<	const char *uhi[3];
927	<
928	<	if (IsGotId(client_p))
929	<	{
930	<	aconf = find_address_conf(client_p->host, client_p->username,
931	<	&client_p->localClient->ip,
932	<	client_p->localClient->aftype,
933	<	client_p->localClient->passwd);
934	<	}
935	<	else
193	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
194		{
195	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
196	<	aconf = find_address_conf(client_p->host,non_ident,
197	<	&client_p->localClient->ip,
940	<	client_p->localClient->aftype,
941	<	client_p->localClient->passwd);
195	>	xfree(node->data);
196	>	dlinkDelete(node, &conf->hub_list);
197	>	free_dlink_node(node);
198		}
199
200	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
945	<	uhi[1] = client_p->host;
946	<	uhi[2] = client_p->sockhost;
947	<
948	<	rkconf = find_regexp_kline(uhi);
949	<
950	<	if (aconf != NULL)
200	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
201		{
202	<	if (IsConfClient(aconf) && !rkconf)
203	<	{
204	<	conf = unmap_conf_item(aconf);
955	<
956	<	if (IsConfRedir(aconf))
957	<	{
958	<	sendto_one(client_p, form_str(RPL_REDIR),
959	<	me.name, client_p->name,
960	<	conf->name ? conf->name : "",
961	<	aconf->port);
962	<	return(NOT_AUTHORIZED);
963	<	}
964	<
965	<	if (IsConfDoIdentd(aconf))
966	<	SetNeedId(client_p);
967	<
968	<	/* Thanks for spoof idea amm */
969	<	if (IsConfDoSpoofIp(aconf))
970	<	{
971	<	conf = unmap_conf_item(aconf);
972	<
973	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
974	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
975	<	client_p->name, client_p->host, conf->name);
976	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
977	<	SetIPSpoof(client_p);
978	<	}
979	<
980	<	return(attach_iline(client_p, conf));
981	<	}
982	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
983	<	{
984	<	/* XXX */
985	<	aconf = rkconf ? rkconf : aconf;
986	<	if (IsConfGline(aconf))
987	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
988	<	client_p->name);
989	<	if (ConfigFileEntry.kline_with_reason)
990	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
991	<	me.name, client_p->name, aconf->reason);
992	<	return(BANNED_CLIENT);
993	<	}
202	>	xfree(node->data);
203	>	dlinkDelete(node, &conf->leaf_list);
204	>	free_dlink_node(node);
205		}
206
207	<	return(NOT_AUTHORIZED);
207	>	xfree(conf);
208		}
209
210		/* attach_iline()
211		*
212	<	* inputs       - client pointer
213	<	*              - conf pointer
214	<	* output       -
215	<	* side effects - do actual attach
212	>	* inputs       - client pointer
213	>	*              - conf pointer
214	>	* output       -
215	>	* side effects - do actual attach
216		*/
217		static int
218	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
218	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
219		{
220	<	struct AccessItem *aconf;
1010	<	struct ClassItem *aclass;
220	>	const struct ClassItem *const class = conf->class;
221		struct ip_entry *ip_found;
222		int a_limit_reached = 0;
223	<	int local = 0, global = 0, ident = 0;
223	>	unsigned int local = 0, global = 0;
224
225	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
225	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
226		ip_found->count++;
227	<	SetIpHash(client_p);
1018	<
1019	<	aconf = (struct AccessItem *)map_to_conf(conf);
1020	<	if (aconf->class_ptr == NULL)
1021	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
227	>	AddFlag(client_p, FLAGS_IPHASH);
228
229	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1024	<
1025	<	count_user_host(client_p->username, client_p->host,
1026	<	&global, &local, &ident);
229	>	userhost_count(client_p->sockhost, &global, &local);
230
231		/* XXX blah. go down checking the various silly limits
232		* setting a_limit_reached if any limit is reached.
233		* - Dianora
234		*/
235	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
1033	<	a_limit_reached = 1;
1034	<	else if (MaxPerIp(aclass) != 0 && ip_found->count >= MaxPerIp(aclass))
235	>	if (class->max_total && class->ref_count >= class->max_total)
236		a_limit_reached = 1;
237	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
237	>	else if (class->max_perip && ip_found->count > class->max_perip)
238		a_limit_reached = 1;
239	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
239	>	else if (class->max_local && local >= class->max_local) /* XXX: redundant */
240		a_limit_reached = 1;
241	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
1041	<	client_p->username[0] != '~')
241	>	else if (class->max_global && global >= class->max_global)
242		a_limit_reached = 1;
243
244		if (a_limit_reached)
245		{
246	<	if (!IsConfExemptLimits(aconf))
247	<	return TOO_MANY;  /* Already at maximum allowed */
246	>	if (!IsConfExemptLimits(conf))
247	>	return TOO_MANY;   /* Already at maximum allowed */
248
249	<	sendto_one(client_p,
250	<	":%s NOTICE %s :*** Your connection class is full, "
1051	<	"but you have exceed_limit = yes;", me.name, client_p->name);
249	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
250	>	"but you have exceed_limit = yes;");
251		}
252
253		return attach_conf(client_p, conf);
254		}
255
256	<	/* init_ip_hash_table()
1058	<	*
1059	<	* inputs               - NONE
1060	<	* output               - NONE
1061	<	* side effects         - allocate memory for ip_entry(s)
1062	<	*                      - clear the ip hash table
1063	<	*/
1064	<	void
1065	<	init_ip_hash_table(void)
1066	<	{
1067	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1068	<	2 * hard_fdlimit);
1069	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1070	<	}
1071	<
1072	<	/* find_or_add_ip()
1073	<	*
1074	<	* inputs       - pointer to struct irc_ssaddr
1075	<	* output       - pointer to a struct ip_entry
1076	<	* side effects -
256	>	/* verify_access()
257		*
258	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
259	<	* count set to 0.
258	>	* inputs       - pointer to client to verify
259	>	* output       - 0 if success -'ve if not
260	>	* side effect  - find the first (best) I line to attach.
261		*/
262	<	static struct ip_entry *
263	<	find_or_add_ip(struct irc_ssaddr *ip_in)
262	>	static int
263	>	verify_access(struct Client *client_p)
264		{
265	<	struct ip_entry *ptr, *newptr;
1085	<	int hash_index = hash_ip(ip_in), res;
1086	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1087	<	#ifdef IPV6
1088	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1089	<	#endif
265	>	struct MaskItem *conf = NULL;
266
267	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
267	>	if (HasFlag(client_p, FLAGS_GOTID))
268		{
269	<	#ifdef IPV6
270	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
271	<	continue;
272	<	if (ip_in->ss.ss_family == AF_INET6)
1097	<	{
1098	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1099	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1100	<	}
1101	<	else
1102	<	#endif
1103	<	{
1104	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1105	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1106	<	}
1107	<	if (res == 0)
1108	<	{
1109	<	/* Found entry already in hash, return it. */
1110	<	return ptr;
1111	<	}
269	>	conf = find_address_conf(client_p->host, client_p->username,
270	>	&client_p->connection->ip,
271	>	client_p->connection->aftype,
272	>	client_p->connection->password);
273		}
274	+	else
275	+	{
276	+	char non_ident[USERLEN + 1] = "~";
277
278	<	if (ip_entries_count >= 2 * hard_fdlimit)
279	<	garbage_collect_ip_entries();
280	<
281	<	newptr = BlockHeapAlloc(ip_entry_heap);
282	<	ip_entries_count++;
283	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
278	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
279	>	conf = find_address_conf(client_p->host, non_ident,
280	>	&client_p->connection->ip,
281	>	client_p->connection->aftype,
282	>	client_p->connection->password);
283	>	}
284
285	<	newptr->next = ip_hash_table[hash_index];
286	<	ip_hash_table[hash_index] = newptr;
285	>	if (!conf)
286	>	return NOT_AUTHORIZED;
287
288	<	return newptr;
1125	<	}
1126	<
1127	<	/* remove_one_ip()
1128	<	*
1129	<	* inputs        - unsigned long IP address value
1130	<	* output        - NONE
1131	<	* side effects  - The ip address given, is looked up in ip hash table
1132	<	*                 and number of ip#'s for that ip decremented.
1133	<	*                 If ip # count reaches 0 and has expired,
1134	<	*                 the struct ip_entry is returned to the ip_entry_heap
1135	<	*/
1136	<	void
1137	<	remove_one_ip(struct irc_ssaddr *ip_in)
1138	<	{
1139	<	struct ip_entry *ptr;
1140	<	struct ip_entry *last_ptr = NULL;
1141	<	int hash_index = hash_ip(ip_in), res;
1142	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1143	<	#ifdef IPV6
1144	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1145	<	#endif
288	>	assert(IsConfClient(conf) || IsConfKill(conf));
289
290	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
290	>	if (IsConfClient(conf))
291		{
292	<	#ifdef IPV6
1150	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1151	<	continue;
1152	<	if (ip_in->ss.ss_family == AF_INET6)
1153	<	{
1154	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1155	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1156	<	}
1157	<	else
1158	<	#endif
292	>	if (IsConfRedir(conf))
293		{
294	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
295	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
294	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
295	>	conf->name ? conf->name : "",
296	>	conf->port);
297	>	return NOT_AUTHORIZED;
298		}
299	<	if (res)
300	<	continue;
1165	<	if (ptr->count > 0)
1166	<	ptr->count--;
1167	<	if (ptr->count == 0 &&
1168	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
299	>
300	>	if (IsConfDoSpoofIp(conf))
301		{
302	<	if (last_ptr != NULL)
303	<	last_ptr->next = ptr->next;
304	<	else
1173	<	ip_hash_table[hash_index] = ptr->next;
302	>	if (IsConfSpoofNotice(conf))
303	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
304	>	client_p->name, client_p->host, conf->name);
305
306	<	BlockHeapFree(ip_entry_heap, ptr);
1176	<	ip_entries_count--;
1177	<	return;
306	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
307		}
1179	–	last_ptr = ptr;
1180	–	}
1181	–	}
1182	–
1183	–	/* hash_ip()
1184	–	*
1185	–	* input        - pointer to an irc_inaddr
1186	–	* output       - integer value used as index into hash table
1187	–	* side effects - hopefully, none
1188	–	*/
1189	–	static int
1190	–	hash_ip(struct irc_ssaddr *addr)
1191	–	{
1192	–	if (addr->ss.ss_family == AF_INET)
1193	–	{
1194	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1195	–	int hash;
1196	–	u_int32_t ip;
308
309	<	ip   = ntohl(v4->sin_addr.s_addr);
1199	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1200	<	return hash;
309	>	return attach_iline(client_p, conf);
310		}
311	<	#ifdef IPV6
312	<	else
313	<	{
1205	<	int hash;
1206	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1207	<	u_int32_t *ip = (u_int32_t *)&v6->sin6_addr.s6_addr;
1208	<
1209	<	hash  = ip[0] ^ ip[3];
1210	<	hash ^= hash >> 16;
1211	<	hash ^= hash >> 8;
1212	<	hash  = hash & (IP_HASH_SIZE - 1);
1213	<	return hash;
1214	<	}
1215	<	#else
1216	<	return 0;
1217	<	#endif
311	>
312	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
313	>	return BANNED_CLIENT;
314		}
315
316	<	/* count_ip_hash()
1221	<	*
1222	<	* inputs        - pointer to counter of number of ips hashed
1223	<	*               - pointer to memory used for ip hash
1224	<	* output        - returned via pointers input
1225	<	* side effects  - NONE
316	>	/* check_client()
317		*
318	<	* number of hashed ip #'s is counted up, plus the amount of memory
319	<	* used in the hash.
318	>	* inputs       - pointer to client
319	>	* output       - 0 = Success
320	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
321	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
322	>	*                I_LINE_FULL       (-3) = I-line is full
323	>	*                TOO_MANY          (-4) = Too many connections from hostname
324	>	*                BANNED_CLIENT     (-5) = K-lined
325	>	* side effects - Ordinary client access check.
326	>	*                Look for conf lines which have the same
327	>	*                status as the flags passed.
328		*/
329	<	void
330	<	count_ip_hash(int *number_ips_stored, unsigned long *mem_ips_stored)
329	>	int
330	>	check_client(struct Client *source_p)
331		{
1233	–	struct ip_entry *ptr;
332		int i;
333
334	<	*number_ips_stored = 0;
335	<	*mem_ips_stored    = 0;
334	>	if ((i = verify_access(source_p)))
335	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
336	>	source_p->name, source_p->sockhost);
337
338	<	for (i = 0; i < IP_HASH_SIZE; i++)
338	>	switch (i)
339		{
340	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
341	<	{
342	<	*number_ips_stored += 1;
343	<	*mem_ips_stored += sizeof(struct ip_entry);
344	<	}
345	<	}
346	<	}
347	<
348	<	/* garbage_collect_ip_entries()
349	<	*
1251	<	* input        - NONE
1252	<	* output       - NONE
1253	<	* side effects - free up all ip entries with no connections
1254	<	*/
1255	<	static void
1256	<	garbage_collect_ip_entries(void)
1257	<	{
1258	<	struct ip_entry *ptr;
1259	<	struct ip_entry *last_ptr;
1260	<	struct ip_entry *next_ptr;
1261	<	int i;
340	>	case TOO_MANY:
341	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
342	>	"Too many on IP for %s (%s).",
343	>	client_get_name(source_p, SHOW_IP),
344	>	source_p->sockhost);
345	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
346	>	client_get_name(source_p, SHOW_IP));
347	>	++ServerStats.is_ref;
348	>	exit_client(source_p, "No more connections allowed on that IP");
349	>	break;
350
351	<	for (i = 0; i < IP_HASH_SIZE; i++)
352	<	{
353	<	last_ptr = NULL;
351	>	case I_LINE_FULL:
352	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
353	>	"auth {} block is full for %s (%s).",
354	>	client_get_name(source_p, SHOW_IP),
355	>	source_p->sockhost);
356	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
357	>	client_get_name(source_p, SHOW_IP));
358	>	++ServerStats.is_ref;
359	>	exit_client(source_p, "No more connections allowed in your connection class");
360	>	break;
361
362	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
363	<	{
364	<	next_ptr = ptr->next;
362	>	case NOT_AUTHORIZED:
363	>	/* jdc - lists server name & port connections are on */
364	>	/*       a purely cosmetical change */
365	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
366	>	"Unauthorized client connection from %s on [%s/%u].",
367	>	client_get_name(source_p, SHOW_IP),
368	>	source_p->connection->listener->name,
369	>	source_p->connection->listener->port);
370	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
371	>	client_get_name(source_p, SHOW_IP),
372	>	source_p->connection->listener->name,
373	>	source_p->connection->listener->port);
374	>
375	>	++ServerStats.is_ref;
376	>	exit_client(source_p, "You are not authorized to use this server");
377	>	break;
378	>
379	>	case BANNED_CLIENT:
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "Banned");
382	>	break;
383
384	<	if (ptr->count == 0 &&
385	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
386	<	{
1274	<	if (last_ptr != NULL)
1275	<	last_ptr->next = ptr->next;
1276	<	else
1277	<	ip_hash_table[i] = ptr->next;
1278	<	BlockHeapFree(ip_entry_heap, ptr);
1279	<	ip_entries_count--;
1280	<	}
1281	<	else
1282	<	last_ptr = ptr;
1283	<	}
384	>	case 0:
385	>	default:
386	>	break;
387		}
388	+
389	+	return !(i < 0);
390		}
391
392		/* detach_conf()
#	Line 1292 | Line 397 | garbage_collect_ip_entries(void)
397		* side effects - Disassociate configuration from the client.
398		*                Also removes a class from the list if marked for deleting.
399		*/
400	<	int
401	<	detach_conf(struct Client *client_p, ConfType type)
400	>	void
401	>	detach_conf(struct Client *client_p, enum maskitem_type type)
402		{
403	<	dlink_node *ptr, *next_ptr;
1299	<	struct ConfItem *conf;
1300	<	struct ClassItem *aclass;
1301	<	struct AccessItem *aconf;
1302	<	struct ConfItem *aclass_conf;
1303	<	struct MatchItem *match_item;
403	>	dlink_node *node = NULL, *node_next = NULL;
404
405	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
405	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
406		{
407	<	conf = ptr->data;
1308	<
1309	<	if (type == CONF_TYPE || conf->type == type)
1310	<	{
1311	<	dlinkDelete(ptr, &client_p->localClient->confs);
1312	<	free_dlink_node(ptr);
407	>	struct MaskItem *conf = node->data;
408
409	<	switch (conf->type)
410	<	{
411	<	case CLIENT_TYPE:
1317	<	case OPER_TYPE:
1318	<	case SERVER_TYPE:
1319	<	aconf = (struct AccessItem *)map_to_conf(conf);
1320	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1321	<	{
1322	<	aclass = (struct ClassItem *)map_to_conf(aclass_conf);
409	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
410	>	assert(conf->ref_count > 0);
411	>	assert(conf->class->ref_count > 0);
412
413	<	if (conf->type == CLIENT_TYPE)
414	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
413	>	if (!(conf->type & type))
414	>	continue;
415
416	<	if (CurrUserCount(aclass) > 0)
417	<	aclass->curr_user_count--;
1329	<	if (MaxTotal(aclass) < 0 && CurrUserCount(aclass) <= 0)
1330	<	delete_conf_item(aclass_conf);
1331	<	}
416	>	dlinkDelete(node, &client_p->connection->confs);
417	>	free_dlink_node(node);
418
419	<	/* Please, no ioccc entries - Dianora */
420	<	if (aconf->clients > 0)
1335	<	--aconf->clients;
1336	<	if (aconf->clients == 0 && IsConfIllegal(aconf))
1337	<	delete_conf_item(conf);
1338	<	break;
1339	<	case LEAF_TYPE:
1340	<	case HUB_TYPE:
1341	<	match_item = (struct MatchItem *)map_to_conf(conf);
1342	<	if (match_item->ref_count == 0 && match_item->illegal)
1343	<	delete_conf_item(conf);
1344	<	break;
1345	<	default:
1346	<	break;
1347	<	}
419	>	if (conf->type == CONF_CLIENT)
420	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
421
422	<	if (type != CONF_TYPE)
423	<	return 0;
422	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
423	>	{
424	>	class_free(conf->class);
425	>	conf->class = NULL;
426		}
1352	–	}
427
428	<	return -1;
428	>	if (--conf->ref_count == 0 && conf->active == 0)
429	>	conf_free(conf);
430	>	}
431		}
432
433		/* attach_conf()
#	Line 1365 | Line 441 | detach_conf(struct Client *client_p, Con
441		*                attachment if there was an old one...
442		*/
443		int
444	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
444	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
445		{
446	<	struct AccessItem *aconf;
1371	<	struct MatchItem *match_item;
1372	<
1373	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
446	>	if (dlinkFind(&client_p->connection->confs, conf))
447		return 1;
448
449	<	if (conf->type == CLIENT_TYPE ||
450	<	conf->type == SERVER_TYPE ||
451	<	conf->type == OPER_TYPE)
452	<	{
1380	<	aconf = (struct AccessItem *)map_to_conf(conf);
1381	<
1382	<	if (IsConfIllegal(aconf))
1383	<	return NOT_AUTHORIZED;
1384	<
1385	<	if (conf->type == CLIENT_TYPE)
1386	<	{
1387	<	struct ClassItem *aclass;
1388	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1389	<
1390	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1391	<	&client_p->localClient->ip, aclass))
1392	<	return TOO_MANY;  /* Already at maximum allowed */
1393	<
1394	<	CurrUserCount(aclass)++;
1395	<	}
449	>	if (conf->type == CONF_CLIENT)
450	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
451	>	&client_p->connection->ip, conf->class))
452	>	return TOO_MANY;    /* Already at maximum allowed */
453
454	<	aconf->clients++;
455	<	}
1399	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1400	<	{
1401	<	match_item = (struct MatchItem *)map_to_conf(conf);
1402	<	match_item->ref_count++;
1403	<	}
454	>	conf->class->ref_count++;
455	>	conf->ref_count++;
456
457	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
457	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
458
459		return 0;
460		}
#	Line 1419 | Line 471 | int
471		attach_connect_block(struct Client *client_p, const char *name,
472		const char *host)
473		{
474	<	dlink_node *ptr;
1423	<	struct ConfItem *conf;
1424	<	struct AccessItem *aconf;
474	>	dlink_node *node = NULL;
475
476	<	assert(client_p != NULL);
1427	<	assert(host != NULL);
476	>	assert(host);
477
478	<	if (client_p == NULL || host == NULL)
1430	<	return 0;
1431	<
1432	<	DLINK_FOREACH(ptr, server_items.head)
478	>	DLINK_FOREACH(node, connect_items.head)
479		{
480	<	conf = ptr->data;
1435	<	aconf = (struct AccessItem *)map_to_conf(conf);
480	>	struct MaskItem *conf = node->data;
481
482	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
482	>	if (irccmp(conf->name, name) ||
483	>	irccmp(conf->host, host))
484		continue;
485
486		attach_conf(client_p, conf);
487	<	return -1;
487	>	return 1;
488		}
489
490		return 0;
491		}
492
1447	–	/* find_conf_exact()
1448	–	*
1449	–	* inputs       - type of ConfItem
1450	–	*              - pointer to name to find
1451	–	*              - pointer to username to find
1452	–	*              - pointer to host to find
1453	–	* output       - NULL or pointer to conf found
1454	–	* side effects - find a conf entry which matches the hostname
1455	–	*                and has the same name.
1456	–	*/
1457	–	struct ConfItem *
1458	–	find_conf_exact(ConfType type, const char *name, const char *user,
1459	–	const char *host)
1460	–	{
1461	–	dlink_node *ptr;
1462	–	dlink_list *list_p;
1463	–	struct ConfItem *conf = NULL;
1464	–	struct AccessItem *aconf;
1465	–
1466	–	/* Only valid for OPER_TYPE and ...? */
1467	–	list_p = map_to_list(type);
1468	–
1469	–	DLINK_FOREACH(ptr, (*list_p).head)
1470	–	{
1471	–	conf = ptr->data;
1472	–
1473	–	if (conf->name == NULL)
1474	–	continue;
1475	–	aconf = (struct AccessItem *)map_to_conf(conf);
1476	–	if (aconf->host == NULL)
1477	–	continue;
1478	–	if (irccmp(conf->name, name) != 0)
1479	–	continue;
1480	–
1481	–	/*
1482	–	** Accept if the *real* hostname (usually sockethost)
1483	–	** socket host) matches *either* host or name field
1484	–	** of the configuration.
1485	–	*/
1486	–	if (!match(aconf->host, host) || !match(aconf->user,user)
1487	–	|| irccmp(conf->name, name) )
1488	–	continue;
1489	–	if (type == OPER_TYPE)
1490	–	{
1491	–	struct ClassItem *aclass;
1492	–
1493	–	aclass = (struct ClassItem *)aconf->class_ptr;
1494	–	if (aconf->clients < MaxTotal(aclass))
1495	–	return conf;
1496	–	else
1497	–	continue;
1498	–	}
1499	–	else
1500	–	return conf;
1501	–	}
1502	–	return NULL;
1503	–	}
1504	–
493		/* find_conf_name()
494		*
495		* inputs       - pointer to conf link list to search
#	Line 1511 | Line 499 | find_conf_exact(ConfType type, const cha
499		* side effects - find a conf entry which matches the name
500		*                and has the given mask.
501		*/
502	<	struct ConfItem *
503	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
502	>	struct MaskItem *
503	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
504		{
505	<	dlink_node *ptr;
1518	<	struct ConfItem* conf;
505	>	dlink_node *node = NULL;
506
507	<	DLINK_FOREACH(ptr, list->head)
507	>	DLINK_FOREACH(node, list->head)
508		{
509	<	conf = ptr->data;
510	<
509	>	struct MaskItem *conf = node->data;
510	>
511		if (conf->type == type)
512		{
513	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
514	<	match(conf->name, name)))
1528	<	return conf;
513	>	if (conf->name && !irccmp(conf->name, name))
514	>	return conf;
515		}
516		}
517
518		return NULL;
519		}
520
1535	–	/* map_to_list()
1536	–	*
1537	–	* inputs       - ConfType conf
1538	–	* output       - pointer to dlink_list to use
1539	–	* side effects - none
1540	–	*/
1541	–	static dlink_list *
1542	–	map_to_list(ConfType type)
1543	–	{
1544	–	switch(type)
1545	–	{
1546	–	case RXLINE_TYPE:
1547	–	return(&rxconf_items);
1548	–	break;
1549	–	case XLINE_TYPE:
1550	–	return(&xconf_items);
1551	–	break;
1552	–	case ULINE_TYPE:
1553	–	return(&uconf_items);
1554	–	break;
1555	–	case NRESV_TYPE:
1556	–	return(&nresv_items);
1557	–	break;
1558	–	case OPER_TYPE:
1559	–	return(&oconf_items);
1560	–	break;
1561	–	case CLASS_TYPE:
1562	–	return(&class_items);
1563	–	break;
1564	–	case SERVER_TYPE:
1565	–	return(&server_items);
1566	–	break;
1567	–	case CLUSTER_TYPE:
1568	–	return(&cluster_items);
1569	–	break;
1570	–	case CONF_TYPE:
1571	–	case GLINE_TYPE:
1572	–	case KLINE_TYPE:
1573	–	case DLINE_TYPE:
1574	–	case CRESV_TYPE:
1575	–	default:
1576	–	return NULL;
1577	–	}
1578	–	}
1579	–
521		/* find_matching_name_conf()
522		*
523		* inputs       - type of link list to look in
524		*              - pointer to name string to find
525		*              - pointer to user
526		*              - pointer to host
527	<	*              - optional action to match on as well
528	<	* output       - NULL or pointer to found struct MatchItem
527	>	*              - optional flags to match on as well
528	>	* output       - NULL or pointer to found struct MaskItem
529		* side effects - looks for a match on name field
530		*/
531	<	struct ConfItem *
532	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
533	<	const char *host, int action)
534	<	{
1594	<	dlink_node *ptr=NULL;
1595	<	struct ConfItem *conf=NULL;
1596	<	struct AccessItem *aconf=NULL;
1597	<	struct MatchItem *match_item=NULL;
1598	<	dlink_list *list_p = map_to_list(type);
531	>	struct MaskItem *
532	>	connect_find(const char *name, const char *host, int (*compare)(const char *, const char *))
533	>	{
534	>	dlink_node *node = NULL;
535
536	<	switch (type)
536	>	DLINK_FOREACH(node, connect_items.head)
537		{
538	<	case RXLINE_TYPE:
1603	<	DLINK_FOREACH(ptr, list_p->head)
1604	<	{
1605	<	conf = ptr->data;
1606	<	assert(conf->regexpname);
1607	<
1608	<	if (!ircd_pcre_exec(conf->regexpname, name))
1609	<	return conf;
1610	<	}
1611	<	break;
1612	<
1613	<	case XLINE_TYPE:
1614	<	case ULINE_TYPE:
1615	<	case NRESV_TYPE:
1616	<	DLINK_FOREACH(ptr, list_p->head)
1617	<	{
1618	<	conf = ptr->data;
1619	<
1620	<	match_item = map_to_conf(conf);
1621	<	if (EmptyString(conf->name))
1622	<	continue;
1623	<	if ((name != NULL) && match_esc(conf->name, name))
1624	<	{
1625	<	if ((user == NULL && (host == NULL)))
1626	<	return conf;
1627	<	if ((match_item->action & action) != action)
1628	<	continue;
1629	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
1630	<	return conf;
1631	<	if (match(match_item->user, user) && match(match_item->host, host))
1632	<	return conf;
1633	<	}
1634	<	}
1635	<	break;
538	>	struct MaskItem *conf = node->data;
539
540	<	case SERVER_TYPE:
541	<	DLINK_FOREACH(ptr, list_p->head)
542	<	{
543	<	conf = ptr->data;
1641	<	aconf = map_to_conf(conf);
1642	<
1643	<	if ((name != NULL) && match_esc(name, conf->name))
1644	<	return conf;
1645	<	else if ((host != NULL) && match_esc(host, aconf->host))
1646	<	return conf;
1647	<	}
1648	<	break;
1649	<
1650	<	default:
1651	<	break;
540	>	if (name && !compare(name, conf->name))
541	>	return conf;
542	>	if (host && !compare(host, conf->host))
543	>	return conf;
544		}
545	+
546		return NULL;
547		}
548
#	Line 1659 | Line 552 | find_matching_name_conf(ConfType type, c
552		*              - pointer to name string to find
553		*              - pointer to user
554		*              - pointer to host
555	<	* output       - NULL or pointer to found struct MatchItem
555	>	* output       - NULL or pointer to found struct MaskItem
556		* side effects - looks for an exact match on name field
557		*/
558	<	struct ConfItem *
559	<	find_exact_name_conf(ConfType type, const char *name,
560	<	const char *user, const char *host)
561	<	{
1669	<	dlink_node *ptr = NULL;
1670	<	struct AccessItem *aconf;
1671	<	struct ConfItem *conf;
1672	<	struct MatchItem *match_item;
1673	<	dlink_list *list_p;
1674	<
1675	<	list_p = map_to_list(type);
1676	<
1677	<	switch(type)
1678	<	{
1679	<	case RXLINE_TYPE:
1680	<	case XLINE_TYPE:
1681	<	case ULINE_TYPE:
1682	<	case NRESV_TYPE:
1683	<
1684	<	DLINK_FOREACH(ptr, list_p->head)
1685	<	{
1686	<	conf = ptr->data;
1687	<	match_item = (struct MatchItem *)map_to_conf(conf);
1688	<	if (EmptyString(conf->name))
1689	<	continue;
1690	<
1691	<	if (irccmp(conf->name, name) == 0)
1692	<	{
1693	<	if ((user == NULL && (host == NULL)))
1694	<	return (conf);
1695	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
1696	<	return (conf);
1697	<	if (match(match_item->user, user) && match(match_item->host, host))
1698	<	return (conf);
1699	<	}
1700	<	}
1701	<	break;
558	>	struct MaskItem *
559	>	operator_find(const struct Client *who, const char *name)
560	>	{
561	>	dlink_node *node = NULL;
562
563	<	case OPER_TYPE:
564	<	DLINK_FOREACH(ptr, list_p->head)
565	<	{
1706	<	conf = ptr->data;
1707	<	aconf = (struct AccessItem *)map_to_conf(conf);
1708	<	if (EmptyString(conf->name))
1709	<	continue;
1710	<
1711	<	if (irccmp(conf->name, name) == 0)
1712	<	{
1713	<	if ((user == NULL && (host == NULL)))
1714	<	return (conf);
1715	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
1716	<	return (conf);
1717	<	if (match(aconf->user, user) && match(aconf->host, host))
1718	<	return (conf);
1719	<	}
1720	<	}
1721	<	break;
563	>	DLINK_FOREACH(node, operator_items.head)
564	>	{
565	>	struct MaskItem *conf = node->data;
566
567	<	case SERVER_TYPE:
1724	<	DLINK_FOREACH(ptr, list_p->head)
567	>	if (!irccmp(conf->name, name))
568		{
569	<	conf = ptr->data;
570	<	aconf = (struct AccessItem *)map_to_conf(conf);
571	<	if (EmptyString(conf->name))
572	<	continue;
1730	<
1731	<	if (name == NULL)
1732	<	{
1733	<	if (EmptyString(aconf->host))
1734	<	continue;
1735	<	if (irccmp(aconf->host, host) == 0)
1736	<	return(conf);
1737	<	}
1738	<	else if (irccmp(conf->name, name) == 0)
569	>	if (!who)
570	>	return conf;
571	>
572	>	if (!match(conf->user, who->username))
573		{
574	<	return (conf);
574	>	switch (conf->htype)
575	>	{
576	>	case HM_HOST:
577	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
578	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
579	>	return conf;
580	>	break;
581	>	case HM_IPV4:
582	>	if (who->connection->aftype == AF_INET)
583	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
584	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
585	>	return conf;
586	>	break;
587	>	case HM_IPV6:
588	>	if (who->connection->aftype == AF_INET6)
589	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
590	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
591	>	return conf;
592	>	break;
593	>	default:
594	>	assert(0);
595	>	}
596		}
597		}
1743	–	break;
1744	–
1745	–	case CLASS_TYPE:
1746	–	DLINK_FOREACH(ptr, list_p->head)
1747	–	{
1748	–	conf = ptr->data;
1749	–	if (EmptyString(conf->name))
1750	–	continue;
1751	–
1752	–	if (irccmp(conf->name, name) == 0)
1753	–	return (conf);
1754	–	}
1755	–	break;
1756	–
1757	–	default:
1758	–	break;
598		}
1760	–	return(NULL);
1761	–	}
1762	–
1763	–	/* rehash()
1764	–	*
1765	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1766	–	* as a result of an operator issuing this command, else assume it has been
1767	–	* called as a result of the server receiving a HUP signal.
1768	–	*/
1769	–	int
1770	–	rehash(int sig)
1771	–	{
1772	–	if (sig != 0)
1773	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1774	–	"Got signal SIGHUP, reloading ircd.conf file");
1775	–
1776	–	#ifndef _WIN32
1777	–	restart_resolver();
1778	–	#endif
1779	–	/* don't close listeners until we know we can go ahead with the rehash */
1780	–
1781	–	/* Check to see if we magically got(or lost) IPv6 support */
1782	–	check_can_use_v6();
1783	–
1784	–	read_conf_files(0);
1785	–
1786	–	if (ServerInfo.description != NULL)
1787	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
599
600	<	#ifndef STATIC_MODULES
1790	<	load_conf_modules();
1791	<	#endif
1792	<
1793	<	flush_deleted_I_P();
1794	<
1795	<	rehashed_klines = 1;
1796	<
1797	<	if (ConfigLoggingEntry.use_logging)
1798	<	reopen_log(logFileName);
1799	<
1800	<	return(0);
600	>	return NULL;
601		}
602
603		/* set_default_conf()
#	Line 1815 | Line 615 | set_default_conf(void)
615		/* verify init_class() ran, this should be an unnecessary check
616		* but its not much work.
617		*/
618	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
618	>	assert(class_default == class_get_list()->tail->data);
619	>
620	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
621	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
622
623	<	#ifdef HAVE_LIBCRYPTO
624	<	ServerInfo.rsa_private_key = NULL;
625	<	ServerInfo.rsa_private_key_file = NULL;
626	<	#endif
627	<
628	<	/* ServerInfo.name is not rehashable */
629	<	/* ServerInfo.name = ServerInfo.name; */
630	<	ServerInfo.description = NULL;
631	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
632	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
633	<
634	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
635	<	ServerInfo.specific_ipv4_vhost = 0;
636	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
637	<	ServerInfo.specific_ipv6_vhost = 0;
638	<
639	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
640	<	/* Don't reset hub, as that will break lazylinks */
641	<	/* ServerInfo.hub = NO; */
642	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
643	<	ServerInfo.dns_host.sin_port = 0;
1841	<	AdminInfo.name = NULL;
1842	<	AdminInfo.email = NULL;
1843	<	AdminInfo.description = NULL;
1844	<
1845	<	set_log_level(L_NOTICE);
1846	<	ConfigLoggingEntry.use_logging = 1;
1847	<	ConfigLoggingEntry.operlog[0] = '\0';
1848	<	ConfigLoggingEntry.userlog[0] = '\0';
1849	<	ConfigLoggingEntry.klinelog[0] = '\0';
1850	<	ConfigLoggingEntry.glinelog[0] = '\0';
1851	<	ConfigLoggingEntry.killlog[0] = '\0';
1852	<	ConfigLoggingEntry.operspylog[0] = '\0';
1853	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1854	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
1855	<
1856	<	ConfigChannel.restrict_channels = NO;
1857	<	ConfigChannel.disable_local_channels = NO;
1858	<	ConfigChannel.use_invex = YES;
1859	<	ConfigChannel.use_except = YES;
1860	<	ConfigChannel.use_knock = YES;
1861	<	ConfigChannel.knock_delay = 300;
623	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
624	>	ConfigServerInfo.specific_ipv4_vhost = 0;
625	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
626	>	ConfigServerInfo.specific_ipv6_vhost = 0;
627	>
628	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
629	>	ConfigServerInfo.max_nick_length = 9;
630	>	ConfigServerInfo.max_topic_length = 80;
631	>	ConfigServerInfo.hub = 0;
632	>
633	>	log_del_all();
634	>
635	>	ConfigLog.use_logging = 1;
636	>
637	>	ConfigChannel.disable_fake_channels = 0;
638	>	ConfigChannel.invite_client_count = 10;
639	>	ConfigChannel.invite_client_time = 300;
640	>	ConfigChannel.invite_delay_channel = 5;
641	>	ConfigChannel.invite_expire_time = 1800;
642	>	ConfigChannel.knock_client_count = 1;
643	>	ConfigChannel.knock_client_time = 300;
644		ConfigChannel.knock_delay_channel = 60;
645	<	ConfigChannel.invite_ops_only = YES;
646	<	ConfigChannel.max_chans_per_user = 15;
647	<	ConfigChannel.quiet_on_ban = YES;
648	<	ConfigChannel.max_bans = 25;
649	<	ConfigChannel.default_split_user_count = 0;
650	<	ConfigChannel.default_split_server_count = 0;
651	<	ConfigChannel.no_join_on_split = NO;
652	<	ConfigChannel.no_create_on_split = NO;
653	<	ConfigChannel.burst_topicwho = YES;
654	<
655	<	ConfigServerHide.flatten_links = NO;
656	<	ConfigServerHide.links_delay = 300;
657	<	ConfigServerHide.hidden = NO;
658	<	ConfigServerHide.disable_hidden = NO;
659	<	ConfigServerHide.hide_servers = NO;
660	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
661	<	ConfigServerHide.hide_server_ips = NO;
662	<
663	<	ConfigFileEntry.gline_min_cidr = 16;
664	<	ConfigFileEntry.gline_min_cidr6 = 48;
665	<	ConfigFileEntry.invisible_on_connect = YES;
666	<	ConfigFileEntry.burst_away = NO;
667	<	ConfigFileEntry.use_whois_actually = YES;
668	<	ConfigFileEntry.tkline_expire_notices = YES;
669	<	ConfigFileEntry.hide_spoof_ips = YES;
670	<	ConfigFileEntry.ignore_bogus_ts = NO;
671	<	ConfigFileEntry.disable_auth = NO;
672	<	ConfigFileEntry.disable_remote = NO;
673	<	ConfigFileEntry.kill_chase_time_limit = 90;
674	<	ConfigFileEntry.default_floodcount = 8; /* XXX */
675	<	ConfigFileEntry.failed_oper_notice = YES;
676	<	ConfigFileEntry.dots_in_ident = 0;      /* XXX */
677	<	ConfigFileEntry.dot_in_ip6_addr = YES;
678	<	ConfigFileEntry.min_nonwildcard = 4;
679	<	ConfigFileEntry.min_nonwildcard_simple = 3;
680	<	ConfigFileEntry.max_accept = 20;
681	<	ConfigFileEntry.anti_nick_flood = NO;   /* XXX */
682	<	ConfigFileEntry.max_nick_time = 20;
683	<	ConfigFileEntry.max_nick_changes = 5;
684	<	ConfigFileEntry.anti_spam_exit_message_time = 0;  /* XXX */
685	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
686	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;  /* XXX */
687	<	ConfigFileEntry.kline_with_reason = YES;
688	<	ConfigFileEntry.kline_reason = NULL;
689	<	ConfigFileEntry.warn_no_nline = YES;
690	<	ConfigFileEntry.stats_o_oper_only = NO; /* XXX */
691	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
692	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
693	<	ConfigFileEntry.stats_P_oper_only = NO;
694	<	ConfigFileEntry.caller_id_wait = 60;
695	<	ConfigFileEntry.opers_bypass_callerid = NO;
696	<	ConfigFileEntry.pace_wait = 10;
697	<	ConfigFileEntry.pace_wait_simple = 1;
698	<	ConfigFileEntry.short_motd = NO;
699	<	ConfigFileEntry.ping_cookie = NO;
700	<	ConfigFileEntry.no_oper_flood = NO;     /* XXX */
701	<	ConfigFileEntry.true_no_oper_flood = NO;  /* XXX */
702	<	ConfigFileEntry.oper_pass_resv = YES;
703	<	ConfigFileEntry.glines = NO;            /* XXX */
704	<	ConfigFileEntry.gline_time = 12 * 3600; /* XXX */
705	<	ConfigFileEntry.idletime = 0;
706	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
707	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
708	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;  /* XXX */
709	<	ConfigFileEntry.oper_umodes = UMODE_LOCOPS | UMODE_SERVNOTICE |
1928	<	UMODE_OPERWALL | UMODE_WALLOP;        /* XXX */
1929	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1930	<	#ifdef HAVE_LIBCRYPTO
1931	<	/* jdc -- This is our default value for a cipher.  According to the
1932	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1933	<	*        under all circumstances if cryptlinks are enabled.  So,
1934	<	*        this will be our default.
1935	<	*
1936	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1937	<	*              This should be moved into a find_cipher() routine.
1938	<	*/
1939	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1940	<	#endif
1941	<	ConfigFileEntry.use_egd = NO;
1942	<	ConfigFileEntry.egdpool_path = NULL;
1943	<	#ifdef HAVE_LIBZ
1944	<	ConfigFileEntry.compression_level = 0;
1945	<	#endif
1946	<	ConfigFileEntry.throttle_time = 10;
645	>	ConfigChannel.max_channels = 25;
646	>	ConfigChannel.max_invites = 20;
647	>	ConfigChannel.max_bans = 100;
648	>	ConfigChannel.max_bans_large = 500;
649	>	ConfigChannel.default_join_flood_count = 18;
650	>	ConfigChannel.default_join_flood_time = 6;
651	>
652	>	ConfigServerHide.flatten_links = 0;
653	>	ConfigServerHide.flatten_links_delay = 300;
654	>	ConfigServerHide.hidden = 0;
655	>	ConfigServerHide.hide_servers = 0;
656	>	ConfigServerHide.hide_services = 0;
657	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
658	>	ConfigServerHide.hide_server_ips = 0;
659	>	ConfigServerHide.disable_remote_commands = 0;
660	>
661	>	ConfigGeneral.away_count = 2;
662	>	ConfigGeneral.away_time = 10;
663	>	ConfigGeneral.max_watch = 50;
664	>	ConfigGeneral.whowas_history_length = 15000;
665	>	ConfigGeneral.cycle_on_host_change = 1;
666	>	ConfigGeneral.dline_min_cidr = 16;
667	>	ConfigGeneral.dline_min_cidr6 = 48;
668	>	ConfigGeneral.kline_min_cidr = 16;
669	>	ConfigGeneral.kline_min_cidr6 = 48;
670	>	ConfigGeneral.invisible_on_connect = 1;
671	>	ConfigGeneral.tkline_expire_notices = 1;
672	>	ConfigGeneral.ignore_bogus_ts = 0;
673	>	ConfigGeneral.disable_auth = 0;
674	>	ConfigGeneral.kill_chase_time_limit = 90;
675	>	ConfigGeneral.default_floodcount = 8;
676	>	ConfigGeneral.default_floodtime = 1;
677	>	ConfigGeneral.failed_oper_notice = 1;
678	>	ConfigGeneral.dots_in_ident = 0;
679	>	ConfigGeneral.min_nonwildcard = 4;
680	>	ConfigGeneral.min_nonwildcard_simple = 3;
681	>	ConfigGeneral.max_accept = 50;
682	>	ConfigGeneral.anti_nick_flood = 0;
683	>	ConfigGeneral.max_nick_time = 20;
684	>	ConfigGeneral.max_nick_changes = 5;
685	>	ConfigGeneral.anti_spam_exit_message_time = 0;
686	>	ConfigGeneral.ts_warn_delta = 30;
687	>	ConfigGeneral.ts_max_delta = 600;
688	>	ConfigGeneral.warn_no_connect_block = 1;
689	>	ConfigGeneral.stats_e_disabled = 0;
690	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
691	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
692	>	ConfigGeneral.stats_o_oper_only = 1;
693	>	ConfigGeneral.stats_m_oper_only = 1;
694	>	ConfigGeneral.stats_P_oper_only = 0;
695	>	ConfigGeneral.stats_u_oper_only = 0;
696	>	ConfigGeneral.caller_id_wait = 60;
697	>	ConfigGeneral.opers_bypass_callerid = 1;
698	>	ConfigGeneral.pace_wait = 10;
699	>	ConfigGeneral.pace_wait_simple = 1;
700	>	ConfigGeneral.short_motd = 0;
701	>	ConfigGeneral.ping_cookie = 0;
702	>	ConfigGeneral.no_oper_flood = 0;
703	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
704	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
705	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
706	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
707	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
708	>	ConfigGeneral.throttle_count = 1;
709	>	ConfigGeneral.throttle_time = 1;
710		}
711
712	<	/* read_conf()
712	>	static void
713	>	validate_conf(void)
714	>	{
715	>	if (EmptyString(ConfigServerInfo.network_name))
716	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
717	>
718	>	if (EmptyString(ConfigServerInfo.network_desc))
719	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
720	>	}
721	>
722	>	/* read_conf()
723		*
724		* inputs       - file descriptor pointing to config file to use
725		* output       - None
726		* side effects - Read configuration file.
727		*/
728		static void
729	<	read_conf(FBFILE *file)
729	>	read_conf(FILE *file)
730		{
731	<	scount = lineno = 0;
731	>	lineno = 1;
732
733	<	set_default_conf(); /* Set default values prior to conf parsing */
734	<	ypass = 1;
735	<	yyparse();          /* pick up the classes first */
733	>	set_default_conf();  /* Set default values prior to conf parsing */
734	>	conf_parser_ctx.pass = 1;
735	>	yyparse();  /* Pick up the classes first */
736
737	<	fbrewind(file);
737	>	rewind(file);
738
739	<	ypass = 2;
740	<	yyparse();          /* Load the values from the conf */
741	<	validate_conf();    /* Check to make sure some values are still okay. */
742	<	/* Some global values are also loaded here. */
743	<	check_class();      /* Make sure classes are valid */
739	>	conf_parser_ctx.pass = 2;
740	>	yyparse();  /* Load the values from the conf */
741	>	validate_conf();  /* Check to make sure some values are still okay. */
742	>	/* Some global values are also loaded here. */
743	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
744	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
745		}
746
747	<	static void
748	<	validate_conf(void)
747	>	/* conf_rehash()
748	>	*
749	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
750	>	* as a result of an operator issuing this command, else assume it has been
751	>	* called as a result of the server receiving a HUP signal.
752	>	*/
753	>	void
754	>	conf_rehash(int sig)
755		{
756	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
757	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
758	<
759	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
760	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
756	>	if (sig)
757	>	{
758	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
759	>	"Got signal SIGHUP, reloading configuration file(s)");
760	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
761	>	}
762
763	<	if (ConfigFileEntry.servlink_path == NULL)
1983	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
763	>	restart_resolver();
764
765	<	if (ServerInfo.network_name == NULL)
1986	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
765	>	/* don't close listeners until we know we can go ahead with the rehash */
766
767	<	if (ServerInfo.network_desc == NULL)
1989	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
767	>	read_conf_files(0);
768
769	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
770	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1993	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
769	>	load_conf_modules();
770	>	check_conf_klines();
771		}
772
773		/* lookup_confhost()
#	Line 1998 | Line 775 | validate_conf(void)
775		* start DNS lookups of all hostnames in the conf
776		* line and convert an IP addresses in a.b.c.d number for to IP#s.
777		*/
778	<	static void
779	<	lookup_confhost(struct ConfItem *conf)
778	>	void
779	>	lookup_confhost(struct MaskItem *conf)
780		{
2004	–	struct AccessItem *aconf;
781		struct addrinfo hints, *res;
782
783	<	aconf = map_to_conf(conf);
784	<
2009	<	if (EmptyString(aconf->host) ||
2010	<	EmptyString(aconf->user))
2011	<	{
2012	<	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
2013	<	aconf->host, conf->name);
2014	<	return;
2015	<	}
2016	<
2017	<	if (strchr(aconf->host, '*') ||
2018	<	strchr(aconf->host, '?'))
2019	<	return;
2020	<
2021	<	/* Do name lookup now on hostnames given and store the
783	>	/*
784	>	* Do name lookup now on hostnames given and store the
785		* ip numbers in conf structure.
786		*/
787		memset(&hints, 0, sizeof(hints));
#	Line 2029 | Line 792 | lookup_confhost(struct ConfItem *conf)
792		/* Get us ready for a bind() and don't bother doing dns lookup */
793		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
794
795	<	if (irc_getaddrinfo(aconf->host, NULL, &hints, &res))
795	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
796		{
797	<	conf_dns_lookup(aconf);
797	>	conf_dns_lookup(conf);
798		return;
799		}
800
801	<	assert(res != NULL);
801	>	assert(res);
802	>
803	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
804	>	conf->addr.ss_len = res->ai_addrlen;
805	>	conf->addr.ss.ss_family = res->ai_family;
806
807	<	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
2041	<	aconf->ipnum.ss_len = res->ai_addrlen;
2042	<	aconf->ipnum.ss.ss_family = res->ai_family;
2043	<	irc_freeaddrinfo(res);
807	>	freeaddrinfo(res);
808		}
809
810		/* conf_connect_allowed()
#	Line 2053 | Line 817 | lookup_confhost(struct ConfItem *conf)
817		int
818		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
819		{
820	<	struct ip_entry *ip_found;
821	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
2058	<
2059	<	/* DLINE exempt also gets you out of static limits/pacing... */
2060	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
2061	<	return 0;
2062	<
2063	<	if (aconf != NULL)
2064	<	return BANNED_CLIENT;
2065	<
2066	<	ip_found = find_or_add_ip(addr);
820	>	struct ip_entry *ip_found = NULL;
821	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
822
823	<	if ((CurrentTime - ip_found->last_attempt) <
2069	<	ConfigFileEntry.throttle_time)
823	>	if (conf)
824		{
825	<	ip_found->last_attempt = CurrentTime;
826	<	return TOO_FAST;
825	>	/* DLINE exempt also gets you out of static limits/pacing... */
826	>	if (conf->type == CONF_EXEMPT)
827	>	return 0;
828	>	return BANNED_CLIENT;
829		}
830
831	<	ip_found->last_attempt = CurrentTime;
2076	<	return 0;
2077	<	}
2078	<
2079	<	static struct AccessItem *
2080	<	find_regexp_kline(const char *uhi[])
2081	<	{
2082	<	const dlink_node *ptr = NULL;
831	>	ip_found = ipcache_find_or_add_address(addr);
832
833	<	DLINK_FOREACH(ptr, rkconf_items.head)
833	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
834		{
835	<	struct AccessItem *aptr = map_to_conf(ptr->data);
835	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
836	>	return TOO_FAST;
837
838	<	assert(aptr->regexuser);
2089	<	assert(aptr->regexhost);
2090	<
2091	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2092	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2093	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2094	<	return aptr;
838	>	++ip_found->connection_count;
839		}
840	+	else
841	+	ip_found->connection_count = 1;
842
843	<	return NULL;
844	<	}
2099	<
2100	<	/* find_kill()
2101	<	*
2102	<	* inputs       - pointer to client structure
2103	<	* output       - pointer to struct AccessItem if found
2104	<	* side effects - See if this user is klined already,
2105	<	*                and if so, return struct AccessItem pointer
2106	<	*/
2107	<	struct AccessItem *
2108	<	find_kill(struct Client *client_p)
2109	<	{
2110	<	struct AccessItem *aconf = NULL;
2111	<	const char *uhi[3];
2112	<
2113	<	uhi[0] = client_p->username;
2114	<	uhi[1] = client_p->host;
2115	<	uhi[2] = client_p->sockhost;
2116	<
2117	<	assert(client_p != NULL);
2118	<
2119	<	aconf = find_kline_conf(client_p->host, client_p->username,
2120	<	&client_p->localClient->ip,
2121	<	client_p->localClient->aftype);
2122	<	if (aconf == NULL)
2123	<	aconf = find_regexp_kline(uhi);
2124	<
2125	<	if (aconf && (aconf->status & CONF_KLINE))
2126	<	return aconf;
2127	<
2128	<	return NULL;
2129	<	}
2130	<
2131	<	struct AccessItem *
2132	<	find_gline(struct Client *client_p)
2133	<	{
2134	<	struct AccessItem *aconf;
2135	<
2136	<	assert(client_p != NULL);
2137	<
2138	<	aconf = find_gline_conf(client_p->host, client_p->username,
2139	<	&client_p->localClient->ip,
2140	<	client_p->localClient->aftype);
2141	<
2142	<	if (aconf && (aconf->status & CONF_GLINE))
2143	<	return aconf;
2144	<
2145	<	return NULL;
2146	<	}
2147	<
2148	<	/* add_temp_line()
2149	<	*
2150	<	* inputs        - pointer to struct ConfItem
2151	<	* output        - none
2152	<	* Side effects  - links in given struct ConfItem into
2153	<	*                 temporary *line link list
2154	<	*/
2155	<	void
2156	<	add_temp_line(struct ConfItem *conf)
2157	<	{
2158	<	struct AccessItem *aconf;
2159	<
2160	<	if (conf->type == DLINE_TYPE)
2161	<	{
2162	<	aconf = map_to_conf(conf);
2163	<	SetConfTemporary(aconf);
2164	<	dlinkAdd(conf, &conf->node, &temporary_dlines);
2165	<	MyFree(aconf->user);
2166	<	aconf->user = NULL;
2167	<	add_conf_by_address(CONF_DLINE, aconf);
2168	<	}
2169	<	else if (conf->type == KLINE_TYPE)
2170	<	{
2171	<	aconf = map_to_conf(conf);
2172	<	SetConfTemporary(aconf);
2173	<	dlinkAdd(conf, &conf->node, &temporary_klines);
2174	<	add_conf_by_address(CONF_KILL, aconf);
2175	<	}
2176	<	else if (conf->type == GLINE_TYPE)
2177	<	{
2178	<	aconf = map_to_conf(conf);
2179	<	SetConfTemporary(aconf);
2180	<	dlinkAdd(conf, &conf->node, &temporary_glines);
2181	<	add_conf_by_address(CONF_GLINE, aconf);
2182	<	}
2183	<	else if (conf->type == XLINE_TYPE)
2184	<	{
2185	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2186	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2187	<	}
2188	<	else if (conf->type == RXLINE_TYPE)
2189	<	{
2190	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2191	<	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2192	<	}
2193	<	else if (conf->type == RKLINE_TYPE)
2194	<	{
2195	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2196	<	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2197	<	}
2198	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2199	<	{
2200	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2201	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2202	<	}
843	>	ip_found->last_attempt = CurrentTime;
844	>	return 0;
845		}
846
847		/* cleanup_tklines()
#	Line 2210 | Line 852 | add_temp_line(struct ConfItem *conf)
852		*                This is an event started off in ircd.c
853		*/
854		void
855	<	cleanup_tklines(void *notused)
855	>	cleanup_tklines(void *unused)
856		{
857	<	expire_tklines(&temporary_glines);
858	<	expire_tklines(&temporary_klines);
859	<	expire_tklines(&temporary_dlines);
2218	<	expire_tklines(&temporary_xlines);
2219	<	expire_tklines(&temporary_rxlines);
2220	<	expire_tklines(&temporary_rklines);
2221	<	expire_tklines(&temporary_resv);
2222	<	}
2223	<
2224	<	/* expire_tklines()
2225	<	*
2226	<	* inputs       - tkline list pointer
2227	<	* output       - NONE
2228	<	* side effects - expire tklines
2229	<	*/
2230	<	static void
2231	<	expire_tklines(dlink_list *tklist)
2232	<	{
2233	<	dlink_node *ptr;
2234	<	dlink_node *next_ptr;
2235	<	struct ConfItem *conf;
2236	<	struct MatchItem *xconf;
2237	<	struct MatchItem *nconf;
2238	<	struct AccessItem *aconf;
2239	<	struct ResvChannel *cconf;
2240	<
2241	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2242	<	{
2243	<	conf = ptr->data;
2244	<	if (conf->type == GLINE_TYPE ||
2245	<	conf->type == KLINE_TYPE ||
2246	<	conf->type == DLINE_TYPE)
2247	<	{
2248	<	aconf = (struct AccessItem *)map_to_conf(conf);
2249	<	if (aconf->hold <= CurrentTime)
2250	<	{
2251	<	/* XXX - Do we want GLINE expiry notices?? */
2252	<	/* Alert opers that a TKline expired - Hwy */
2253	<	if (ConfigFileEntry.tkline_expire_notices)
2254	<	{
2255	<	if (aconf->status & CONF_KILL)
2256	<	{
2257	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2258	<	"Temporary K-line for [%s@%s] expired",
2259	<	(aconf->user) ? aconf->user : "*",
2260	<	(aconf->host) ? aconf->host : "*");
2261	<	}
2262	<	else if (conf->type == DLINE_TYPE)
2263	<	{
2264	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2265	<	"Temporary D-line for [%s] expired",
2266	<	(aconf->host) ? aconf->host : "*");
2267	<	}
2268	<	}
2269	<
2270	<	delete_one_address_conf(aconf->host, aconf);
2271	<	dlinkDelete(ptr, tklist);
2272	<	}
2273	<	}
2274	<	else if (conf->type == XLINE_TYPE ||
2275	<	conf->type == RXLINE_TYPE)
2276	<	{
2277	<	xconf = (struct MatchItem *)map_to_conf(conf);
2278	<	if (xconf->hold <= CurrentTime)
2279	<	{
2280	<	if (ConfigFileEntry.tkline_expire_notices)
2281	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2282	<	"Temporary X-line for [%s] %sexpired", conf->name,
2283	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2284	<	dlinkDelete(ptr, tklist);
2285	<	free_dlink_node(ptr);
2286	<	delete_conf_item(conf);
2287	<	}
2288	<	}
2289	<	else if (conf->type == RKLINE_TYPE)
2290	<	{
2291	<	aconf = map_to_conf(conf);
2292	<	if (aconf->hold <= CurrentTime)
2293	<	{
2294	<	if (ConfigFileEntry.tkline_expire_notices)
2295	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2296	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2297	<	(aconf->user) ? aconf->user : "*",
2298	<	(aconf->host) ? aconf->host : "*");
2299	<	dlinkDelete(ptr, tklist);
2300	<	free_dlink_node(ptr);
2301	<	delete_conf_item(conf);
2302	<	}
2303	<	}
2304	<	else if (conf->type == NRESV_TYPE)
2305	<	{
2306	<	nconf = (struct MatchItem *)map_to_conf(conf);
2307	<	if (nconf->hold <= CurrentTime)
2308	<	{
2309	<	if (ConfigFileEntry.tkline_expire_notices)
2310	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2311	<	"Temporary RESV for [%s] expired", conf->name);
2312	<	dlinkDelete(ptr, tklist);
2313	<	free_dlink_node(ptr);
2314	<	delete_conf_item(conf);
2315	<	}
2316	<	}
2317	<	else if (conf->type == CRESV_TYPE)
2318	<	{
2319	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2320	<	if (cconf->hold <= CurrentTime)
2321	<	{
2322	<	if (ConfigFileEntry.tkline_expire_notices)
2323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2324	<	"Temporary RESV for [%s] expired", cconf->name);
2325	<	dlinkDelete(ptr, tklist);
2326	<	free_dlink_node(ptr);
2327	<	delete_conf_item(conf);
2328	<	}
2329	<	}
2330	<	}
857	>	hostmask_expire_temporary();
858	>	gecos_expire();
859	>	resv_expire();
860		}
861
862		/* oper_privs_as_string()
863		*
864	<	* inputs        - pointer to client_p or NULL
864	>	* inputs        - pointer to client_p
865		* output        - pointer to static string showing oper privs
866		* side effects  - return as string, the oper privs as derived from port
867		*/
868	+	static const struct oper_flags
869	+	{
870	+	const unsigned int flag;
871	+	const unsigned char c;
872	+	} flag_table[] = {
873	+	{ OPER_FLAG_ADMIN,          'A' },
874	+	{ OPER_FLAG_CLOSE,          'B' },
875	+	{ OPER_FLAG_CONNECT,        'C' },
876	+	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
877	+	{ OPER_FLAG_DIE,            'E' },
878	+	{ OPER_FLAG_DLINE,          'F' },
879	+	{ OPER_FLAG_GLOBOPS,        'G' },
880	+	{ OPER_FLAG_JOIN_RESV,      'H' },
881	+	{ OPER_FLAG_KILL,           'I' },
882	+	{ OPER_FLAG_KILL_REMOTE,    'J' },
883	+	{ OPER_FLAG_KLINE,          'K' },
884	+	{ OPER_FLAG_LOCOPS,         'L' },
885	+	{ OPER_FLAG_MODULE,         'M' },
886	+	{ OPER_FLAG_NICK_RESV,      'N' },
887	+	{ OPER_FLAG_OPME,           'O' },
888	+	{ OPER_FLAG_REHASH,         'P' },
889	+	{ OPER_FLAG_REMOTEBAN,      'Q' },
890	+	{ OPER_FLAG_RESTART,        'R' },
891	+	{ OPER_FLAG_RESV,           'S' },
892	+	{ OPER_FLAG_SET,            'T' },
893	+	{ OPER_FLAG_SQUIT,          'U' },
894	+	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
895	+	{ OPER_FLAG_UNDLINE,        'W' },
896	+	{ OPER_FLAG_UNKLINE,        'X' },
897	+	{ OPER_FLAG_UNRESV,         'Y' },
898	+	{ OPER_FLAG_UNXLINE,        'Z' },
899	+	{ OPER_FLAG_WALLOPS,        'a' },
900	+	{ OPER_FLAG_XLINE,          'b' },
901	+	{ 0, '\0' }
902	+	};
903
904	<	static const unsigned int oper_flags_table[] =
905	<	{ 'O', 'R', 'U', 'G', 'N', 'K', 'X', 'D', 'H', 'A' , 0 };
2342	<
2343	<	char *
2344	<	oper_privs_as_string(const unsigned int port)
904	>	const char *
905	>	oper_privs_as_string(const unsigned int flags)
906		{
907	<	static char privs_out[12];
907	>	static char buf[sizeof(flag_table) / sizeof(flag_table[0])];
908	>	char *p = buf;
909
910	<	if (port & OPER_FLAG_HIDDEN_ADMIN)
911	<	flags_to_ascii(port & ~OPER_FLAG_ADMIN, oper_flags_table, privs_out, 1);
912	<	else
913	<	flags_to_ascii(port, oper_flags_table, privs_out, 1);
914	<	return privs_out;
910	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
911	>	if (flags & tab->flag)
912	>	*p++ = tab->c;
913	>
914	>	if (p == buf)
915	>	*p++ = '0';
916	>
917	>	*p = '\0';
918	>
919	>	return buf;
920		}
921
922		/*
923	<	* Input: A client to find the active oper{} name for.
923	>	* Input: A client to find the active operator {} name for.
924		* Output: The nick!user@host{oper} of the oper.
925		*         "oper" is server name for remote opers
926		* Side effects: None.
927		*/
928	<	char *
928	>	const char *
929		get_oper_name(const struct Client *client_p)
930		{
931	<	dlink_node *cnode;
2365	<	struct ConfItem *conf;
2366	<	struct AccessItem *aconf;
931	>	static char buffer[IRCD_BUFSIZE];
932
933	<	/* +5 for !,@,{,} and null */
934	<	static char buffer[NICKLEN+USERLEN+HOSTLEN+HOSTLEN+5];
933	>	if (IsServer(client_p))
934	>	return client_p->name;
935
936		if (MyConnect(client_p))
937		{
938	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
938	>	const dlink_node *const node = client_p->connection->confs.head;
939	>
940	>	if (node)
941		{
942	<	conf = cnode->data;
2376	<	aconf = map_to_conf(conf);
942	>	const struct MaskItem *const conf = node->data;
943
944	<	if (IsConfOperator(aconf))
944	>	if (conf->type == CONF_OPER)
945		{
946	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
947	<	client_p->username, client_p->host,
948	<	conf->name);
2383	<	return buffer;
946	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
947	>	client_p->username, client_p->host, conf->name);
948	>	return buffer;
949		}
950		}
951
952	<	/* Probably should assert here for now. If there is an oper out there
953	<	* with no oper{} conf attached, it would be good for us to know...
952	>	/*
953	>	* Probably should assert here for now. If there is an oper out there
954	>	* with no operator {} conf attached, it would be good for us to know...
955		*/
956	<	assert(0); /* Oper without oper conf! */
956	>	assert(0);  /* Oper without oper conf! */
957		}
958
959	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
960	<	client_p->username, client_p->host, client_p->servptr->name);
959	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
960	>	client_p->username, client_p->host, client_p->servptr->name);
961		return buffer;
962		}
963
2398	–	/* read_conf_files()
2399	–	*
2400	–	* inputs       - cold start YES or NO
2401	–	* output       - none
2402	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2403	–	*/
2404	–	void
2405	–	read_conf_files(int cold)
2406	–	{
2407	–	const char *filename;
2408	–	char chanmodes[32];
2409	–	char chanlimit[32];
2410	–
2411	–	filename = get_conf_name(CONF_TYPE);
2412	–
2413	–	/* We need to know the initial filename for the yyerror() to report
2414	–	FIXME: The full path is in conffilenamebuf first time since we
2415	–	dont know anything else
2416	–
2417	–	- Gozem 2002-07-21
2418	–	*/
2419	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2420	–
2421	–	if ((conf_fbfile_in = fbopen(filename, "r")) == NULL)
2422	–	{
2423	–	if (cold)
2424	–	{
2425	–	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
2426	–	filename, strerror(errno));
2427	–	exit(-1);
2428	–	}
2429	–	else
2430	–	{
2431	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2432	–	"Unable to read configuration file '%s': %s",
2433	–	filename, strerror(errno));
2434	–	return;
2435	–	}
2436	–	}
2437	–
2438	–	if (!cold)
2439	–	clear_out_old_conf();
2440	–
2441	–	read_conf(conf_fbfile_in);
2442	–	fbclose(conf_fbfile_in);
2443	–
2444	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2445	–	ircsprintf(chanmodes, "b%s%s:%d", ConfigChannel.use_except ? "e" : "",
2446	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2447	–	add_isupport("MAXLIST", chanmodes, -1);
2448	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2449	–	if (ConfigChannel.disable_local_channels)
2450	–	add_isupport("CHANTYPES", "#", -1);
2451	–	else
2452	–	add_isupport("CHANTYPES", "#&", -1);
2453	–	ircsprintf(chanlimit, "%s:%d", ConfigChannel.disable_local_channels ? "#" : "#&",
2454	–	ConfigChannel.max_chans_per_user);
2455	–	add_isupport("CHANLIMIT", chanlimit, -1);
2456	–	ircsprintf(chanmodes, "%s%s%s", ConfigChannel.use_except ? "e" : "",
2457	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnpst");
2458	–	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
2459	–	if (ConfigChannel.use_except)
2460	–	add_isupport("EXCEPTS", "e", -1);
2461	–	if (ConfigChannel.use_invex)
2462	–	add_isupport("INVEX", "I", -1);
2463	–	add_isupport("CHANMODES", chanmodes, -1);
2464	–
2465	–	/*
2466	–	* message_locale may have changed.  rebuild isupport since it relies
2467	–	* on strlen(form_str(RPL_ISUPPORT))
2468	–	*/
2469	–	rebuild_isupport_message_line();
2470	–
2471	–	parse_conf_file(KLINE_TYPE, cold);
2472	–	parse_conf_file(RKLINE_TYPE, cold);
2473	–	parse_conf_file(DLINE_TYPE, cold);
2474	–	parse_conf_file(XLINE_TYPE, cold);
2475	–	parse_conf_file(RXLINE_TYPE, cold);
2476	–	parse_conf_file(NRESV_TYPE, cold);
2477	–	parse_conf_file(CRESV_TYPE, cold);
2478	–	}
2479	–
2480	–	/* parse_conf_file()
2481	–	*
2482	–	* inputs       - type of conf file to parse
2483	–	* output       - none
2484	–	* side effects - conf file for givenconf type is opened and read then parsed
2485	–	*/
2486	–	static void
2487	–	parse_conf_file(int type, int cold)
2488	–	{
2489	–	FBFILE *file = NULL;
2490	–	const char *filename = get_conf_name(type);
2491	–
2492	–	if ((file = fbopen(filename, "r")) == NULL)
2493	–	{
2494	–	if (cold)
2495	–	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2496	–	filename, strerror(errno));
2497	–	else
2498	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2499	–	"Unable to read configuration file '%s': %s",
2500	–	filename, strerror(errno));
2501	–	}
2502	–	else
2503	–	{
2504	–	parse_csv_file(file, type);
2505	–	fbclose(file);
2506	–	}
2507	–	}
2508	–
964		/* clear_out_old_conf()
965		*
966		* inputs       - none
#	Line 2515 | Line 970 | parse_conf_file(int type, int cold)
970		static void
971		clear_out_old_conf(void)
972		{
973	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2519	<	struct ConfItem *conf;
2520	<	struct AccessItem *aconf;
2521	<	struct ClassItem *cltmp;
2522	<	struct MatchItem *match_item;
973	>	dlink_node *node = NULL, *node_next = NULL;
974		dlink_list *free_items [] = {
975	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
2525	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
2526	<	&nresv_items, &cluster_items,  &gdeny_items, NULL
975	>	&connect_items, &operator_items, NULL
976		};
977
978		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2531 | Line 980 | clear_out_old_conf(void)
980		/* We only need to free anything allocated by yyparse() here.
981		* Resetting structs, etc, is taken care of by set_default_conf().
982		*/
983	<
984	<	for (; *iterator != NULL; iterator++)
983	>
984	>	for (; *iterator; iterator++)
985		{
986	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
986	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
987		{
988	<	conf = ptr->data;
2540	<	/* XXX This is less than pretty */
2541	<	if (conf->type == SERVER_TYPE)
2542	<	{
2543	<	aconf = (struct AccessItem *)map_to_conf(conf);
2544	<	if (aconf->clients != 0)
2545	<	{
2546	<	SetConfIllegal(aconf);
2547	<	dlinkDelete(&conf->node, &server_items);
2548	<	}
2549	<	else
2550	<	{
2551	<	delete_conf_item(conf);
2552	<	}
2553	<	}
2554	<	else if (conf->type == OPER_TYPE)
2555	<	{
2556	<	aconf = (struct AccessItem *)map_to_conf(conf);
2557	<	if (aconf->clients != 0)
2558	<	{
2559	<	SetConfIllegal(aconf);
2560	<	dlinkDelete(&conf->node, &oconf_items);
2561	<	}
2562	<	else
2563	<	{
2564	<	delete_conf_item(conf);
2565	<	}
2566	<	}
2567	<	else if (conf->type == CLIENT_TYPE)
2568	<	{
2569	<	aconf = (struct AccessItem *)map_to_conf(conf);
2570	<	if (aconf->clients != 0)
2571	<	{
2572	<	SetConfIllegal(aconf);
2573	<	}
2574	<	else
2575	<	{
2576	<	delete_conf_item(conf);
2577	<	}
2578	<	}
2579	<	else if (conf->type == XLINE_TYPE  ||
2580	<	conf->type == RXLINE_TYPE ||
2581	<	conf->type == RKLINE_TYPE)
2582	<	{
2583	<	/* temporary (r)xlines are also on
2584	<	* the (r)xconf items list */
2585	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2586	<	continue;
988	>	struct MaskItem *conf = node->data;
989
990	<	delete_conf_item(conf);
991	<	}
992	<	else
993	<	{
994	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2593	<	{
2594	<	match_item = (struct MatchItem *)map_to_conf(conf);
2595	<	if ((match_item->ref_count <= 0))
2596	<	delete_conf_item(conf);
2597	<	else
2598	<	{
2599	<	match_item->illegal = 1;
2600	<	dlinkDelete(&conf->node, *iterator);
2601	<	}
2602	<	}
2603	<	else
2604	<	delete_conf_item(conf);
2605	<	}
990	>	conf->active = 0;
991	>	dlinkDelete(&conf->node, *iterator);
992	>
993	>	if (!conf->ref_count)
994	>	conf_free(conf);
995		}
996		}
997
998	<	/* don't delete the class table, rather mark all entries
999	<	* for deletion. The table is cleaned up by check_class. - avalon
998	>	/*
999	>	* Don't delete the class table, rather mark all entries for deletion.
1000	>	* The table is cleaned up by class_delete_marked. - avalon
1001		*/
1002	<	DLINK_FOREACH(ptr, class_items.head)
2613	<	{
2614	<	conf = ptr->data;
2615	<	cltmp = (struct ClassItem *)map_to_conf(conf);
2616	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2617	<	MaxTotal(cltmp) = -1;
2618	<	}
1002	>	class_mark_for_deletion();
1003
1004		clear_out_address_conf();
1005
1006	<	/* clean out module paths */
2623	<	#ifndef STATIC_MODULES
2624	<	mod_clear_paths();
2625	<	#endif
2626	<
2627	<	/* clean out ServerInfo */
2628	<	MyFree(ServerInfo.description);
2629	<	ServerInfo.description = NULL;
2630	<	MyFree(ServerInfo.network_name);
2631	<	ServerInfo.network_name = NULL;
2632	<	MyFree(ServerInfo.network_desc);
2633	<	ServerInfo.network_desc = NULL;
2634	<	MyFree(ConfigFileEntry.egdpool_path);
2635	<	ConfigFileEntry.egdpool_path = NULL;
2636	<	#ifdef HAVE_LIBCRYPTO
2637	<	if (ServerInfo.rsa_private_key != NULL)
2638	<	{
2639	<	RSA_free(ServerInfo.rsa_private_key);
2640	<	ServerInfo.rsa_private_key = NULL;
2641	<	}
2642	<
2643	<	MyFree(ServerInfo.rsa_private_key_file);
2644	<	ServerInfo.rsa_private_key_file = NULL;
2645	<	#endif
2646	<
2647	<	/* clean out old resvs from the conf */
2648	<	clear_conf_resv();
2649	<
2650	<	/* clean out AdminInfo */
2651	<	MyFree(AdminInfo.name);
2652	<	AdminInfo.name = NULL;
2653	<	MyFree(AdminInfo.email);
2654	<	AdminInfo.email = NULL;
2655	<	MyFree(AdminInfo.description);
2656	<	AdminInfo.description = NULL;
2657	<
2658	<	/* operator{} and class{} blocks are freed above */
2659	<	/* clean out listeners */
2660	<	close_listeners();
1006	>	modules_conf_clear();  /* Clear modules {} items */
1007
1008	<	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2663	<	* exempt{} and gecos{} blocks are freed above too
2664	<	*/
1008	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
1009
1010	<	/* clean out general */
2667	<	MyFree(ConfigFileEntry.servlink_path);
2668	<	ConfigFileEntry.servlink_path = NULL;
2669	<	#ifdef HAVE_LIBCRYPTO
2670	<	ConfigFileEntry.default_cipher_preference = NULL;
2671	<	#endif /* HAVE_LIBCRYPTO */
2672	<	delete_isupport("INVEX");
2673	<	delete_isupport("EXCEPTS");
2674	<	}
1010	>	cluster_clear();  /* Clear cluster {} items */
1011
1012	<	/* flush_deleted_I_P()
2677	<	*
2678	<	* inputs       - none
2679	<	* output       - none
2680	<	* side effects - This function removes I/P conf items
2681	<	*/
2682	<	static void
2683	<	flush_deleted_I_P(void)
2684	<	{
2685	<	dlink_node *ptr;
2686	<	dlink_node *next_ptr;
2687	<	struct ConfItem *conf;
2688	<	struct AccessItem *aconf;
2689	<	dlink_list * free_items [] = {
2690	<	&server_items, &oconf_items, &hub_items, &leaf_items, NULL
2691	<	};
2692	<	dlink_list ** iterator = free_items; /* C is dumb */
1012	>	gecos_clear();  /* Clear gecos {} items */
1013
1014	<	/* flush out deleted I and P lines
1015	<	* although still in use.
1016	<	*/
1017	<	for (; *iterator != NULL; iterator++)
1018	<	{
1019	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1020	<	{
1021	<	conf = ptr->data;
1022	<	aconf = (struct AccessItem *)map_to_conf(conf);
1014	>	resv_clear();  /* Clear resv {} items */
1015	>
1016	>	service_clear();  /* Clear service {} items */
1017	>
1018	>	shared_clear();  /* Clear shared {} items */
1019	>
1020	>	pseudo_clear();  /* Clear pseudo {} items */
1021	>
1022	>	/* Clean out ConfigServerInfo */
1023	>	xfree(ConfigServerInfo.description);
1024	>	ConfigServerInfo.description = NULL;
1025	>	xfree(ConfigServerInfo.network_name);
1026	>	ConfigServerInfo.network_name = NULL;
1027	>	xfree(ConfigServerInfo.network_desc);
1028	>	ConfigServerInfo.network_desc = NULL;
1029	>	xfree(ConfigServerInfo.rsa_private_key_file);
1030	>	ConfigServerInfo.rsa_private_key_file = NULL;
1031	>	xfree(ConfigServerInfo.ssl_certificate_file);
1032	>	ConfigServerInfo.ssl_certificate_file = NULL;
1033	>	xfree(ConfigServerInfo.ssl_dh_param_file);
1034	>	ConfigServerInfo.ssl_dh_param_file = NULL;
1035	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1036	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1037	>	xfree(ConfigServerInfo.ssl_cipher_list);
1038	>	ConfigServerInfo.ssl_cipher_list = NULL;
1039	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1040	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1041	>
1042	>	/* Clean out ConfigAdminInfo */
1043	>	xfree(ConfigAdminInfo.name);
1044	>	ConfigAdminInfo.name = NULL;
1045	>	xfree(ConfigAdminInfo.email);
1046	>	ConfigAdminInfo.email = NULL;
1047	>	xfree(ConfigAdminInfo.description);
1048	>	ConfigAdminInfo.description = NULL;
1049
1050	<	if (IsConfIllegal(aconf))
1051	<	{
2706	<	dlinkDelete(ptr, *iterator);
1050	>	xfree(ConfigServerHide.flatten_links_file);
1051	>	ConfigServerHide.flatten_links_file = NULL;
1052
1053	<	if (aconf->clients == 0)
1054	<	delete_conf_item(conf);
2710	<	}
2711	<	}
2712	<	}
2713	<	}
2714	<
2715	<	/* get_conf_name()
2716	<	*
2717	<	* inputs       - type of conf file to return name of file for
2718	<	* output       - pointer to filename for type of conf
2719	<	* side effects - none
2720	<	*/
2721	<	const char *
2722	<	get_conf_name(ConfType type)
2723	<	{
2724	<	switch (type)
2725	<	{
2726	<	case CONF_TYPE:
2727	<	return ConfigFileEntry.configfile;
2728	<	break;
2729	<	case KLINE_TYPE:
2730	<	return ConfigFileEntry.klinefile;
2731	<	break;
2732	<	case RKLINE_TYPE:
2733	<	return ConfigFileEntry.rklinefile;
2734	<	break;
2735	<	case DLINE_TYPE:
2736	<	return ConfigFileEntry.dlinefile;
2737	<	break;
2738	<	case XLINE_TYPE:
2739	<	return ConfigFileEntry.xlinefile;
2740	<	break;
2741	<	case RXLINE_TYPE:
2742	<	return ConfigFileEntry.rxlinefile;
2743	<	break;
2744	<	case CRESV_TYPE:
2745	<	return ConfigFileEntry.cresvfile;
2746	<	break;
2747	<	case NRESV_TYPE:
2748	<	return ConfigFileEntry.nresvfile;
2749	<	break;
2750	<	case GLINE_TYPE:
2751	<	return ConfigFileEntry.glinefile;
2752	<	break;
2753	<
2754	<	default:
2755	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2756	<	only with the above values, this will cause us to core
2757	<	at some point if this happens so we know where it was */
2758	<	}
2759	<	}
2760	<
2761	<	#define BAD_PING (-1)
2762	<
2763	<	/* get_conf_ping()
2764	<	*
2765	<	* inputs       - pointer to struct AccessItem
2766	<	*              - pointer to a variable that receives ping warning time
2767	<	* output       - ping frequency
2768	<	* side effects - NONE
2769	<	*/
2770	<	static int
2771	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2772	<	{
2773	<	struct ClassItem *aclass;
2774	<	struct AccessItem *aconf;
2775	<
2776	<	if (conf != NULL)
2777	<	{
2778	<	aconf = (struct AccessItem *)map_to_conf(conf);
2779	<	if (aconf->class_ptr != NULL)
2780	<	{
2781	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2782	<	*pingwarn = PingWarning(aclass);
2783	<	return PingFreq(aclass);
2784	<	}
2785	<	}
2786	<
2787	<	return BAD_PING;
1053	>	/* Clean out listeners */
1054	>	listener_close_marked();
1055		}
1056
1057	<	/* get_client_class()
1058	<	*
2792	<	* inputs       - pointer to client struct
2793	<	* output       - pointer to name of class
2794	<	* side effects - NONE
2795	<	*/
2796	<	const char *
2797	<	get_client_class(struct Client *target_p)
1057	>	static void
1058	>	conf_handle_tls(int cold)
1059		{
1060	<	dlink_node *ptr;
2800	<	struct ConfItem *conf;
2801	<	struct AccessItem *aconf;
2802	<
2803	<	if (target_p != NULL && !IsMe(target_p) &&
2804	<	target_p->localClient->confs.head != NULL)
1060	>	if (!tls_new_cred())
1061		{
1062	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2807	<	{
2808	<	conf = ptr->data;
2809	<
2810	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2811	<	conf->type == OPER_TYPE)
2812	<	{
2813	<	aconf = (struct AccessItem *) map_to_conf(conf);
2814	<	if (aconf->class_ptr != NULL)
2815	<	return aconf->class_ptr->name;
2816	<	}
2817	<	}
2818	<	}
2819	<
2820	<	return "default";
2821	<	}
2822	<
2823	<	/* get_client_ping()
2824	<	*
2825	<	* inputs       - pointer to client struct
2826	<	*              - pointer to a variable that receives ping warning time
2827	<	* output       - ping frequency
2828	<	* side effects - NONE
2829	<	*/
2830	<	int
2831	<	get_client_ping(struct Client *target_p, int *pingwarn)
2832	<	{
2833	<	int ping;
2834	<	struct ConfItem *conf;
2835	<	dlink_node *nlink;
2836	<
2837	<	if (target_p->localClient->confs.head != NULL)
2838	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
1062	>	if (cold)
1063		{
1064	<	conf = nlink->data;
1065	<
2842	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2843	<	(conf->type == OPER_TYPE))
2844	<	{
2845	<	ping = get_conf_ping(conf, pingwarn);
2846	<	if (ping > 0)
2847	<	return ping;
2848	<	}
1064	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1065	>	exit(EXIT_FAILURE);
1066		}
1067	<
2851	<	*pingwarn = 0;
2852	<	return DEFAULT_PINGFREQUENCY;
2853	<	}
2854	<
2855	<	/* find_class()
2856	<	*
2857	<	* inputs       - string name of class
2858	<	* output       - corresponding Class pointer
2859	<	* side effects - NONE
2860	<	*/
2861	<	struct ConfItem *
2862	<	find_class(const char *classname)
2863	<	{
2864	<	struct ConfItem *conf;
2865	<
2866	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2867	<	return(conf);
2868	<
2869	<	return class_default;
2870	<	}
2871	<
2872	<	/* check_class()
2873	<	*
2874	<	* inputs       - NONE
2875	<	* output       - NONE
2876	<	* side effects -
2877	<	*/
2878	<	void
2879	<	check_class(void)
2880	<	{
2881	<	dlink_node *ptr;
2882	<	dlink_node *next_ptr;
2883	<	struct ConfItem *conf;
2884	<	struct ClassItem *aclass;
2885	<
2886	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2887	<	{
2888	<	conf = ptr->data;
2889	<	aclass = (struct ClassItem *)map_to_conf(conf);
2890	<
2891	<	if (MaxTotal(aclass) < 0)
1067	>	else
1068		{
1069	<	destroy_cidr_class(aclass);
1070	<	if (CurrUserCount(aclass) > 0)
1071	<	dlinkDelete(&conf->node, &class_items);
2896	<	else
2897	<	delete_conf_item(conf);
1069	>	/* Failed to load new settings/certs, old ones remain active */
1070	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1071	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1072		}
1073		}
1074		}
1075
1076	<	/* init_class()
1076	>	/* read_conf_files()
1077		*
1078	<	* inputs       - NONE
1079	<	* output       - NONE
1080	<	* side effects -
1078	>	* inputs       - cold start YES or NO
1079	>	* output       - none
1080	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1081		*/
1082		void
1083	<	init_class(void)
1083	>	read_conf_files(int cold)
1084		{
1085	<	struct ClassItem *aclass;
1085	>	const char *filename = NULL;
1086	>	char chanmodes[IRCD_BUFSIZE] = "";
1087	>	char chanlimit[IRCD_BUFSIZE] = "";
1088
1089	<	class_default = make_conf_item(CLASS_TYPE);
1090	<	aclass = (struct ClassItem *)map_to_conf(class_default);
2915	<	DupString(class_default->name, "default");
2916	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2917	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2918	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2919	<	MaxSendq(aclass) = DEFAULT_SENDQ;
1089	>	conf_parser_ctx.boot = cold;
1090	>	filename = ConfigGeneral.configfile;
1091
1092	<	client_check_cb = register_callback("check_client", check_client);
1093	<	}
1092	>	/* We need to know the initial filename for the yyerror() to report
1093	>	FIXME: The full path is in conffilenamebuf first time since we
1094	>	don't know anything else
1095
1096	<	/* get_sendq()
1097	<	*
1098	<	* inputs       - pointer to client
2927	<	* output       - sendq for this client as found from its class
2928	<	* side effects - NONE
2929	<	*/
2930	<	unsigned long
2931	<	get_sendq(struct Client *client_p)
2932	<	{
2933	<	unsigned long sendq = DEFAULT_SENDQ;
2934	<	dlink_node *ptr;
2935	<	struct ConfItem *conf;
2936	<	struct ConfItem *class_conf;
2937	<	struct ClassItem *aclass;
2938	<	struct AccessItem *aconf;
1096	>	- Gozem 2002-07-21
1097	>	*/
1098	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1099
1100	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
1100	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1101		{
1102	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
1102	>	if (cold)
1103		{
1104	<	conf = ptr->data;
1105	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
1106	<	|| (conf->type == CLIENT_TYPE))
2947	<	{
2948	<	aconf = (struct AccessItem *)map_to_conf(conf);
2949	<	if ((class_conf = aconf->class_ptr) == NULL)
2950	<	continue;
2951	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2952	<	sendq = MaxSendq(aclass);
2953	<	return sendq;
2954	<	}
1104	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1105	>	filename, strerror(errno));
1106	>	exit(EXIT_FAILURE);
1107		}
2956	–	}
2957	–	/* XXX return a default?
2958	–	* if here, then there wasn't an attached conf with a sendq
2959	–	* that is very bad -Dianora
2960	–	*/
2961	–	return DEFAULT_SENDQ;
2962	–	}
2963	–
2964	–	/* conf_add_class_to_conf()
2965	–	*
2966	–	* inputs       - pointer to config item
2967	–	* output       - NONE
2968	–	* side effects - Add a class pointer to a conf
2969	–	*/
2970	–	void
2971	–	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
2972	–	{
2973	–	struct AccessItem *aconf;
2974	–	struct ClassItem *aclass;
2975	–
2976	–	aconf = (struct AccessItem *)map_to_conf(conf);
2977	–
2978	–	if (class_name == NULL)
2979	–	{
2980	–	aconf->class_ptr = class_default;
2981	–	if (conf->type == CLIENT_TYPE)
2982	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2983	–	"Warning *** Defaulting to default class for %s@%s",
2984	–	aconf->user, aconf->host);
2985	–	else
2986	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2987	–	"Warning *** Defaulting to default class for %s",
2988	–	conf->name);
2989	–	}
2990	–	else
2991	–	{
2992	–	aconf->class_ptr = find_class(class_name);
2993	–	}
2994	–
2995	–	if (aconf->class_ptr == NULL)
2996	–	{
2997	–	if (conf->type == CLIENT_TYPE)
2998	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2999	–	"Warning *** Defaulting to default class for %s@%s",
3000	–	aconf->user, aconf->host);
1108		else
3002	–	sendto_realops_flags(UMODE_ALL, L_ALL,
3003	–	"Warning *** Defaulting to default class for %s",
3004	–	conf->name);
3005	–	aconf->class_ptr = class_default;
3006	–	}
3007	–	else
3008	–	{
3009	–	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
3010	–	if (MaxTotal(aclass) < 0)
1109		{
1110	<	aconf->class_ptr = class_default;
1110	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1111	>	"Unable to read configuration file '%s': %s",
1112	>	filename, strerror(errno));
1113	>	return;
1114		}
1115		}
3015	–	}
3016	–
3017	–	#define MAXCONFLINKS 150
3018	–
3019	–	/* conf_add_server()
3020	–	*
3021	–	* inputs       - pointer to config item
3022	–	*              - pointer to link count already on this conf
3023	–	* output       - NONE
3024	–	* side effects - Add a connect block
3025	–	*/
3026	–	int
3027	–	conf_add_server(struct ConfItem *conf, unsigned int lcount, const char *class_name)
3028	–	{
3029	–	struct AccessItem *aconf;
3030	–	char *orig_host;
1116
1117	<	aconf = map_to_conf(conf);
1118	<
3034	<	conf_add_class_to_conf(conf, class_name);
1117	>	if (!cold)
1118	>	clear_out_old_conf();
1119
1120	<	if (lcount > MAXCONFLINKS || !aconf->host || !conf->name)
1121	<	{
3038	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3039	<	ilog(L_WARN, "Bad connect block");
3040	<	return -1;
3041	<	}
1120	>	read_conf(conf_parser_ctx.conf_file);
1121	>	fclose(conf_parser_ctx.conf_file);
1122
1123	<	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
1124	<	{
3045	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3046	<	conf->name);
3047	<	ilog(L_WARN, "Bad connect block, host %s", conf->name);
3048	<	return -1;
3049	<	}
1123	>	log_reopen_all();
1124	>	conf_handle_tls(cold);
1125
1126	<	orig_host = aconf->host;
1127	<	split_nuh(orig_host, NULL, &aconf->user, &aconf->host);
3053	<	MyFree(orig_host);
3054	<	lookup_confhost(conf);
1126	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1127	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1128
1129	<	return 0;
1129	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1130	>	isupport_add("MAXLIST", chanmodes, -1);
1131	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1132	>	isupport_add("CHANTYPES", "#", -1);
1133	>
1134	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1135	>	ConfigChannel.max_channels);
1136	>	isupport_add("CHANLIMIT", chanlimit, -1);
1137	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstuCLMORST");
1138	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1139	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1140	>	isupport_add("CHANMODES", chanmodes, -1);
1141		}
1142
1143	<	/* conf_add_d_conf()
1143	>	/* conf_add_class_to_conf()
1144		*
1145		* inputs       - pointer to config item
1146		* output       - NONE
1147	<	* side effects - Add a d/D line
1147	>	* side effects - Add a class pointer to a conf
1148		*/
1149		void
1150	<	conf_add_d_conf(struct AccessItem *aconf)
1150	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1151		{
1152	<	if (aconf->host == NULL)
3069	<	return;
3070	<
3071	<	aconf->user = NULL;
3072	<
3073	<	/* XXX - Should 'd' ever be in the old conf? For new conf we don't
3074	<	*       need this anyway, so I will disable it for now... -A1kmm
3075	<	*/
3076	<	if (parse_netmask(aconf->host, NULL, NULL) == HM_HOST)
1152	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1153		{
1154	<	ilog(L_WARN, "Invalid Dline %s ignored", aconf->host);
1155	<	free_access_item(aconf);
1156	<	}
1157	<	else
1158	<	{
1159	<	/* XXX ensure user is NULL */
1160	<	MyFree(aconf->user);
1161	<	aconf->user = NULL;
1162	<	add_conf_by_address(CONF_DLINE, aconf);
1154	>	conf->class = class_default;
1155	>
1156	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1157	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1158	>	"Warning *** Defaulting to default class for %s@%s",
1159	>	conf->user, conf->host);
1160	>	else
1161	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1162	>	"Warning *** Defaulting to default class for %s",
1163	>	conf->name);
1164		}
1165		}
1166
#	Line 3096 | Line 1173 | conf_add_d_conf(struct AccessItem *aconf
1173		void
1174		yyerror(const char *msg)
1175		{
1176	<	char newlinebuf[IRCD_BUFSIZE];
3100	<
3101	<	if (ypass != 1)
1176	>	if (conf_parser_ctx.pass != 1)
1177		return;
1178
1179	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1180	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1181	<	conffilebuf, lineno + 1, msg, newlinebuf);
1182	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1183	<	conffilebuf, lineno + 1, msg, newlinebuf);
1179	>	const char *p = stripws(linebuf);
1180	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1181	>	"\"%s\", line %u: %s: %s",
1182	>	conffilebuf, lineno, msg, p);
1183	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1184	>	conffilebuf, lineno, msg, p);
1185		}
1186
1187	<	int
1188	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
3113	<	{
3114	<	if (fbgets(lbuf, max_size, fb) == NULL)
3115	<	return 0;
3116	<
3117	<	return strlen(lbuf);
3118	<	}
3119	<
3120	<	int
3121	<	conf_yy_fatal_error(const char *msg)
1187	>	void
1188	>	conf_error_report(const char *msg)
1189		{
1190	<	return 0;
1190	>	const char *p = stripws(linebuf);
1191	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1192	>	"\"%s\", line %u: %s: %s",
1193	>	conffilebuf, lineno, msg, p);
1194	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1195	>	conffilebuf, lineno, msg, p);
1196		}
1197
1198		/*
1199		* valid_tkline()
1200	<	*
1200	>	*
1201		* inputs       - pointer to ascii string to check
1202		*              - whether the specified time is in seconds or minutes
1203		* output       - -1 not enough parameters
#	Line 3133 | Line 1205 | conf_yy_fatal_error(const char *msg)
1205		* side effects - none
1206		* Originally written by Dianora (Diane, db@db.net)
1207		*/
1208	<	time_t
1209	<	valid_tkline(char *p, int minutes)
1208	>	uintmax_t
1209	>	valid_tkline(const char *data, const int minutes)
1210		{
1211	<	time_t result = 0;
1211	>	const unsigned char *p = (const unsigned char *)data;
1212	>	unsigned char tmpch = '\0';
1213	>	uintmax_t result = 0;
1214
1215	<	while (*p)
1215	>	while ((tmpch = *p++))
1216		{
1217	<	if (IsDigit(*p))
3144	<	{
3145	<	result *= 10;
3146	<	result += ((*p) & 0xF);
3147	<	p++;
3148	<	}
3149	<	else
1217	>	if (!IsDigit(tmpch))
1218		return 0;
1219	+
1220	+	result *= 10;
1221	+	result += (tmpch & 0xF);
1222		}
1223
1224	<	/* in the degenerate case where oper does a /quote kline 0 user@host :reason
1225	<	* i.e. they specifically use 0, I am going to return 1 instead
1226	<	* as a return value of non-zero is used to flag it as a temporary kline
1224	>	/*
1225	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1226	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1227	>	* value of non-zero is used to flag it as a temporary kline
1228		*/
3157	–
1229		if (result == 0)
1230		result = 1;
1231
1232	<	/*
1232	>	/*
1233		* If the incoming time is in seconds convert it to minutes for the purpose
1234		* of this calculation
1235		*/
1236		if (!minutes)
1237	<	result = result / (time_t)60;
1237	>	result = result / 60;
1238
1239		if (result > MAX_TDKLINE_TIME)
1240		result = MAX_TDKLINE_TIME;
1241
1242	<	result = result * (time_t)60;  /* turn it into seconds */
1242	>	result = result * 60;  /* Turn it into seconds */
1243
1244		return result;
1245		}
1246
1247	+	/* valid_wild_card_simple()
1248	+	*
1249	+	* inputs       - data to check for sufficient non-wildcard characters
1250	+	* outputs      - 1 if valid, else 0
1251	+	* side effects - none
1252	+	*/
1253	+	int
1254	+	valid_wild_card_simple(const char *data)
1255	+	{
1256	+	const unsigned char *p = (const unsigned char *)data;
1257	+	unsigned char tmpch = '\0';
1258	+	unsigned int nonwild = 0, wild = 0;
1259	+
1260	+	while ((tmpch = *p++))
1261	+	{
1262	+	if (tmpch == '\\' && *p)
1263	+	{
1264	+	++p;
1265	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1266	+	return 1;
1267	+	}
1268	+	else if (!IsMWildChar(tmpch))
1269	+	{
1270	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1271	+	return 1;
1272	+	}
1273	+	else
1274	+	++wild;
1275	+	}
1276	+
1277	+	return !wild;
1278	+	}
1279	+
1280		/* valid_wild_card()
1281		*
1282		* input        - pointer to client
#	Line 3182 | Line 1286 | valid_tkline(char *p, int minutes)
1286		* side effects - NOTICE is given to source_p if warn is 1
1287		*/
1288		int
1289	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1289	>	valid_wild_card(int count, ...)
1290		{
1291	<	char *p;
1292	<	char tmpch;
3189	<	int nonwild = 0;
1291	>	unsigned char tmpch = '\0';
1292	>	unsigned int nonwild = 0;
1293		va_list args;
1294
1295		/*
#	Line 3205 | Line 1308 | valid_wild_card(struct Client *source_p,
1308
1309		while (count--)
1310		{
1311	<	p = va_arg(args, char *);
1311	>	const unsigned char *p = va_arg(args, const unsigned char *);
1312		if (p == NULL)
1313		continue;
1314
#	Line 3217 | Line 1320 | valid_wild_card(struct Client *source_p,
1320		* If we find enough non-wild characters, we can
1321		* break - no point in searching further.
1322		*/
1323	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1323	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1324	>	{
1325	>	va_end(args);
1326		return 1;
1327	+	}
1328		}
1329		}
1330		}
1331
1332	<	if (warn)
1333	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1334	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1332	>	va_end(args);
1333	>	return 0;
1334	>	}
1335	>
1336	>	/* find_user_host()
1337	>	*
1338	>	* inputs       - pointer to client placing kline
1339	>	*              - pointer to user_host_or_nick
1340	>	*              - pointer to user buffer
1341	>	*              - pointer to host buffer
1342	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1343	>	* side effects -
1344	>	*/
1345	>	static int
1346	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1347	>	char *luser, char *lhost)
1348	>	{
1349	>	struct Client *target_p = NULL;
1350	>	char *hostp = NULL;
1351	>
1352	>	if (lhost == NULL)
1353	>	{
1354	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1355	>	return 1;
1356	>	}
1357	>
1358	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1359	>	{
1360	>	/* Explicit user@host mask given */
1361	>	if (hostp)                            /* I'm a little user@host */
1362	>	{
1363	>	*(hostp++) = '\0';                       /* short and squat */
1364	>
1365	>	if (*user_host_or_nick)
1366	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1367	>	else
1368	>	strcpy(luser, "*");
1369	>
1370	>	if (*hostp)
1371	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1372	>	else
1373	>	strcpy(lhost, "*");
1374	>	}
1375	>	else
1376	>	{
1377	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1378	>	luser[1] = '\0';
1379	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1380	>	}
1381	>
1382	>	return 1;
1383	>	}
1384	>	else
1385	>	{
1386	>	/* Try to find user@host mask from nick */
1387	>	/* Okay to use source_p as the first param, because source_p == client_p */
1388	>	if ((target_p =
1389	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1390	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1391	>
1392	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1393	>	{
1394	>	if (IsClient(source_p))
1395	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1396	>	return 0;
1397	>	}
1398	>
1399	>	/*
1400	>	* Turn the "user" bit into "*user", blow away '~'
1401	>	* if found in original user name (non-idented)
1402	>	*/
1403	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1404	>
1405	>	if (target_p->username[0] == '~')
1406	>	luser[0] = '*';
1407	>
1408	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1409	>	return 1;
1410	>	}
1411	>
1412		return 0;
1413		}
1414
#	Line 3239 | Line 1422 | valid_wild_card(struct Client *source_p,
1422		*              - parse_flags bit map of things to test
1423		*              - pointer to user or string to parse into
1424		*              - pointer to host or NULL to parse into if non NULL
1425	<	*              - pointer to optional tkline time or NULL
1425	>	*              - pointer to optional tkline time or NULL
1426		*              - pointer to target_server to parse into if non NULL
1427		*              - pointer to reason to parse into
1428		*
1429	<	* output       - 1 if valid, -1 if not valid
1429	>	* output       - 1 if valid, 0 if not valid
1430		* side effects - A generalised k/d/x etc. line parser,
1431		*               "ALINE [time] user@host|string [ON] target :reason"
1432		*                will parse returning a parsed user, host if
#	Line 3255 | Line 1438 | valid_wild_card(struct Client *source_p,
1438		*                if target_server is NULL and an "ON" is found error
1439		*                is reported.
1440		*                if reason pointer is NULL ignore pointer,
1441	<	*                this allows usee of parse_a_line in unkline etc.
1441	>	*                this allows use of parse_a_line in unkline etc.
1442		*
1443		* - Dianora
1444		*/
1445		int
1446		parse_aline(const char *cmd, struct Client *source_p,
1447	<	int parc, char **parv,
1448	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1449	<	char **target_server, char **reason)
1447	>	int parc, char **parv,
1448	>	char **up_p, char **h_p, uintmax_t *tkline_time,
1449	>	char **target_server, char **reason)
1450		{
1451	<	int found_tkline_time=0;
1452	<	static char def_reason[] = "No Reason";
1451	>	uintmax_t found_tkline_time=0;
1452	>	static char default_reason[] = CONF_NOREASON;
1453		static char user[USERLEN*4+1];
1454		static char host[HOSTLEN*4+1];
1455
#	Line 3275 | Line 1458 | parse_aline(const char *cmd, struct Clie
1458
1459		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1460
1461	<	if (found_tkline_time != 0)
1461	>	if (found_tkline_time)
1462		{
1463		parv++;
1464		parc--;
1465
1466	<	if (tkline_time != NULL)
1466	>	if (tkline_time)
1467		*tkline_time = found_tkline_time;
1468		else
1469		{
1470	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1471	<	me.name, source_p->name, cmd);
3289	<	return -1;
1470	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1471	>	return 0;
1472		}
1473		}
1474
1475		if (parc == 0)
1476		{
1477	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1478	<	me.name, source_p->name, cmd);
3297	<	return -1;
1477	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1478	>	return 0;
1479		}
1480
1481		if (h_p == NULL)
1482		*up_p = *parv;
1483		else
1484		{
1485	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1486	<	return -1;
1485	>	if (find_user_host(source_p, *parv, user, host) == 0)
1486	>	return 0;
1487
1488		*up_p = user;
1489		*h_p = host;
1490		}
1491	<
1491	>
1492		parc--;
1493		parv++;
1494
1495	<	if (parc != 0)
1495	>	if (parc)
1496		{
1497		if (irccmp(*parv, "ON") == 0)
1498		{
1499		parc--;
1500		parv++;
1501
1502	<	if (target_server == NULL)
3322	<	{
3323	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
3324	<	me.name, source_p->name, cmd);
3325	<	return -1;
3326	<	}
3327	<
3328	<	if (!IsOperRemoteBan(source_p))
1502	>	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1503		{
1504	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1505	<	me.name, source_p->name, "remoteban");
3332	<	return -1;
1504	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1505	>	return 0;
1506		}
1507
1508		if (parc == 0 || EmptyString(*parv))
1509		{
1510	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1511	<	me.name, source_p->name, cmd);
3339	<	return -1;
1510	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1511	>	return 0;
1512		}
1513
1514		*target_server = *parv;
#	Line 3348 | Line 1520 | parse_aline(const char *cmd, struct Clie
1520		/* Make sure target_server *is* NULL if no ON server found
1521		* caller probably NULL'd it first, but no harm to do it again -db
1522		*/
1523	<	if (target_server != NULL)
1524	<	*target_server = NULL;
1523	>	if (target_server)
1524	>	*target_server = NULL;
1525		}
1526		}
1527
1528	<	if (h_p != NULL)
3357	<	{
3358	<	if (strchr(user, '!') != NULL)
3359	<	{
3360	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3361	<	me.name, source_p->name);
3362	<	return -1;
3363	<	}
3364	<
3365	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 2, *up_p, *h_p))
3366	<	return -1;
3367	<	}
3368	<	else
3369	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 1, *up_p))
3370	<	return -1;
3371	<
3372	<	if (reason != NULL)
1528	>	if (reason)
1529		{
1530	<	if (parc != 0)
3375	<	{
1530	>	if (parc && !EmptyString(*parv))
1531		*reason = *parv;
3377	–	if (!valid_comment(source_p, *reason, YES))
3378	–	return -1;
3379	–	}
1532		else
1533	<	*reason = def_reason;
1533	>	*reason = default_reason;
1534		}
1535
1536		return 1;
1537		}
1538
3387	–	/* find_user_host()
3388	–	*
3389	–	* inputs       - pointer to client placing kline
3390	–	*              - pointer to user_host_or_nick
3391	–	*              - pointer to user buffer
3392	–	*              - pointer to host buffer
3393	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3394	–	* side effects -
3395	–	*/
3396	–	static int
3397	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3398	–	char *luser, char *lhost, unsigned int flags)
3399	–	{
3400	–	struct Client *target_p = NULL;
3401	–	char *hostp = NULL;
3402	–
3403	–	if (lhost == NULL)
3404	–	{
3405	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3406	–	return 1;
3407	–	}
3408	–
3409	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3410	–	{
3411	–	/* Explicit user@host mask given */
3412	–
3413	–	if(hostp != NULL)                            /* I'm a little user@host */
3414	–	{
3415	–	*(hostp++) = '\0';                       /* short and squat */
3416	–	if (*user_host_or_nick)
3417	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3418	–	else
3419	–	strcpy(luser, "*");
3420	–	if (*hostp)
3421	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3422	–	else
3423	–	strcpy(lhost, "*");
3424	–	}
3425	–	else
3426	–	{
3427	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3428	–	luser[1] = '\0';
3429	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3430	–	}
3431	–
3432	–	return 1;
3433	–	}
3434	–	else if (!(flags & NOUSERLOOKUP))
3435	–	{
3436	–	/* Try to find user@host mask from nick */
3437	–	/* Okay to use source_p as the first param, because source_p == client_p */
3438	–	if ((target_p =
3439	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3440	–	return 0;
3441	–
3442	–	if (IsExemptKline(target_p))
3443	–	{
3444	–	if (!IsServer(source_p))
3445	–	sendto_one(source_p,
3446	–	":%s NOTICE %s :%s is E-lined",
3447	–	me.name, source_p->name, target_p->name);
3448	–	return 0;
3449	–	}
3450	–
3451	–	/*
3452	–	* turn the "user" bit into "*user", blow away '~'
3453	–	* if found in original user name (non-idented)
3454	–	*/
3455	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3456	–
3457	–	if (target_p->username[0] == '~')
3458	–	luser[0] = '*';
3459	–
3460	–	if (target_p->sockhost[0] == '\0' ||
3461	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3462	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3463	–	else
3464	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3465	–	return 1;
3466	–	}
3467	–
3468	–	return 0;
3469	–	}
3470	–
3471	–	/* valid_comment()
3472	–	*
3473	–	* inputs       - pointer to client
3474	–	*              - pointer to comment
3475	–	* output       - 0 if no valid comment,
3476	–	*              - 1 if valid
3477	–	* side effects - truncates reason where necessary
3478	–	*/
3479	–	int
3480	–	valid_comment(struct Client *source_p, char *comment, int warn)
3481	–	{
3482	–	if (strchr(comment, '"'))
3483	–	{
3484	–	if (warn)
3485	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3486	–	me.name, source_p->name);
3487	–	return 0;
3488	–	}
3489	–
3490	–	if (strlen(comment) > REASONLEN)
3491	–	comment[REASONLEN-1] = '\0';
3492	–
3493	–	return 1;
3494	–	}
3495	–
1539		/* match_conf_password()
1540		*
1541		* inputs       - pointer to given password
#	Line 3501 | Line 1544 | valid_comment(struct Client *source_p, c
1544		* side effects - none
1545		*/
1546		int
1547	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1547	>	match_conf_password(const char *password, const struct MaskItem *conf)
1548		{
1549		const char *encr = NULL;
1550
1551	<	if (password == NULL || aconf->passwd == NULL)
1551	>	if (EmptyString(password) || EmptyString(conf->passwd))
1552		return 0;
1553
1554	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1555	<	{
3513	<	/* use first two chars of the password they send in as salt */
3514	<	/* If the password in the conf is MD5, and ircd is linked
3515	<	* to scrypt on FreeBSD, or the standard crypt library on
3516	<	* glibc Linux, then this code will work fine on generating
3517	<	* the proper encrypted hash for comparison.
3518	<	*/
3519	<	if (*aconf->passwd)
3520	<	encr = crypt(password, aconf->passwd);
3521	<	else
3522	<	encr = "";
3523	<	}
1554	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1555	>	encr = crypt(password, conf->passwd);
1556		else
1557		encr = password;
1558
1559	<	return !strcmp(encr, aconf->passwd);
3528	<	}
3529	<
3530	<	/*
3531	<	* cluster_a_line
3532	<	*
3533	<	* inputs       - client sending the cluster
3534	<	*              - command name "KLINE" "XLINE" etc.
3535	<	*              - capab -- CAP_KLN etc. from s_serv.h
3536	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
3537	<	*              - pattern and args to send along
3538	<	* output       - none
3539	<	* side effects - Take source_p send the pattern with args given
3540	<	*                along to all servers that match capab and cluster type
3541	<	*/
3542	<	void
3543	<	cluster_a_line(struct Client *source_p, const char *command,
3544	<	int capab, int cluster_type, const char *pattern, ...)
3545	<	{
3546	<	va_list args;
3547	<	char buffer[IRCD_BUFSIZE];
3548	<	struct ConfItem *conf;
3549	<	dlink_node *ptr;
3550	<
3551	<	va_start(args, pattern);
3552	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
3553	<	va_end(args);
3554	<
3555	<	DLINK_FOREACH(ptr, cluster_items.head)
3556	<	{
3557	<	conf = ptr->data;
3558	<
3559	<	if (conf->flags & cluster_type)
3560	<	{
3561	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
3562	<	"%s %s %s", command, conf->name, buffer);
3563	<	}
3564	<	}
1559	>	return encr && !strcmp(encr, conf->passwd);
1560		}
1561
1562		/*
#	Line 3592 | Line 1587 | cluster_a_line(struct Client *source_p,
1587		* @                            *       *       *
1588		* !                            *       *       *
1589		*/
3595	–
1590		void
1591	<	split_nuh(char *mask, char **nick, char **user, char **host)
1591	>	split_nuh(struct split_nuh_item *const iptr)
1592		{
1593		char *p = NULL, *q = NULL;
1594
1595	<	if ((p = strchr(mask, '!')) != NULL)
1596	<	{
3603	<	*p = '\0';
3604	<	if (nick != NULL)
3605	<	{
3606	<	if (*mask != '\0')
3607	<	*nick = xstrldup(mask, NICKLEN);
3608	<	else
3609	<	DupString(*nick, "*");
3610	<	}
3611	<
3612	<	if ((q = strchr(++p, '@')) != NULL)
3613	<	{
3614	<	*q = '\0';
1595	>	if (iptr->nickptr)
1596	>	strlcpy(iptr->nickptr, "*", iptr->nicksize);
1597
1598	<	if (*p != '\0')
1599	<	*user = xstrldup(p, USERLEN+1);
3618	<	else
3619	<	DupString(*user, "*");
1598	>	if (iptr->userptr)
1599	>	strlcpy(iptr->userptr, "*", iptr->usersize);
1600
1601	<	if (*++q != '\0')
1602	<	*host = xstrldup(q, HOSTLEN+1);
3623	<	else
3624	<	DupString(*host, "*");
3625	<	}
3626	<	else
3627	<	{
3628	<	if (*p != '\0')
3629	<	*user = xstrldup(p, USERLEN+1);
3630	<	else
3631	<	DupString(*user, "*");
1601	>	if (iptr->hostptr)
1602	>	strlcpy(iptr->hostptr, "*", iptr->hostsize);
1603
1604	<	DupString(*host, "*");
3634	<	}
3635	<	}
3636	<	else  /* No ! found so lets look for a user@host */
1604	>	if ((p = strchr(iptr->nuhmask, '!')))
1605		{
1606	<	if ((p = strchr(mask, '@')) != NULL)        /* if found a @ */
3639	<	{
3640	<	if (nick != NULL)
3641	<	DupString(*nick, "*");
3642	<	*p = '\0';
1606	>	*p = '\0';
1607
1608	<	if (*mask != '\0')
1609	<	*user = xstrldup(mask, USERLEN+1);
3646	<	else
3647	<	DupString(*user, "*");
1608	>	if (iptr->nickptr && *iptr->nuhmask)
1609	>	strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1610
1611	<	if (*++p != '\0')
3650	<	*host = xstrldup(p, HOSTLEN+1);
3651	<	else
3652	<	DupString(*host, "*");
3653	<	}
3654	<	else                                        /* no @ found */
1611	>	if ((q = strchr(++p, '@')))
1612		{
1613	<	if (nick != NULL)
3657	<	{
3658	<	if (strpbrk(mask, ".:"))
3659	<	{
3660	<	DupString(*nick, "*");
3661	<	*host = xstrldup(mask, HOSTLEN+1);
3662	<	}
3663	<	else
3664	<	{
3665	<	*nick = xstrldup(mask, NICKLEN);
3666	<	DupString(*host, "*");
3667	<	}
1613	>	*q++ = '\0';
1614
1615	<	DupString(*user, "*");
1616	<	}
3671	<	else
3672	<	{
3673	<	DupString(*user, "*");
3674	<	*host = xstrldup(mask, HOSTLEN+1);
3675	<	}
3676	<	}
3677	<	}
3678	<	}
3679	<
3680	<	/*
3681	<	* flags_to_ascii
3682	<	*
3683	<	* inputs       - flags is a bitmask
3684	<	*              - pointer to table of ascii letters corresponding
3685	<	*                to each bit
3686	<	*              - flag 1 for convert ToLower if bit missing
3687	<	*                0 if ignore.
3688	<	* output       - none
3689	<	* side effects - string pointed to by p has bitmap chars written to it
3690	<	*/
3691	<	static void
3692	<	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3693	<	int lowerit)
3694	<	{
3695	<	unsigned int mask = 1;
3696	<	int i = 0;
1615	>	if (*p)
1616	>	strlcpy(iptr->userptr, p, iptr->usersize);
1617
1618	<	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
1619	<	{
3700	<	if (flags & mask)
3701	<	*p++ = bit_table[i];
3702	<	else if(lowerit)
3703	<	*p++ = ToLower(bit_table[i]);
3704	<	}
3705	<	*p = '\0';
3706	<	}
3707	<
3708	<	/*
3709	<	* cidr_limit_reached
3710	<	*
3711	<	* inputs       - int flag allowing over_rule of limits
3712	<	*              - pointer to the ip to be added
3713	<	*              - pointer to the class
3714	<	* output       - non zero if limit reached
3715	<	*                0 if limit not reached
3716	<	* side effects -
3717	<	*/
3718	<	static int
3719	<	cidr_limit_reached(int over_rule,
3720	<	struct irc_ssaddr *ip, struct ClassItem *aclass)
3721	<	{
3722	<	dlink_node *ptr = NULL;
3723	<	struct CidrItem *cidr;
3724	<
3725	<	if (NumberPerCidr(aclass) <= 0)
3726	<	return 0;
3727	<
3728	<	if (ip->ss.ss_family == AF_INET)
3729	<	{
3730	<	if (CidrBitlenIPV4(aclass) <= 0)
3731	<	return 0;
3732	<
3733	<	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3734	<	{
3735	<	cidr = ptr->data;
3736	<	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3737	<	{
3738	<	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3739	<	return -1;
3740	<	cidr->number_on_this_cidr++;
3741	<	return 0;
3742	<	}
3743	<	}
3744	<	cidr = MyMalloc(sizeof(struct CidrItem));
3745	<	cidr->number_on_this_cidr = 1;
3746	<	cidr->mask = *ip;
3747	<	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3748	<	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3749	<	}
3750	<	#ifdef IPV6
3751	<	else if (CidrBitlenIPV6(aclass) > 0)
3752	<	{
3753	<	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3754	<	{
3755	<	cidr = ptr->data;
3756	<	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3757	<	{
3758	<	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3759	<	return -1;
3760	<	cidr->number_on_this_cidr++;
3761	<	return 0;
3762	<	}
1618	>	if (*q)
1619	>	strlcpy(iptr->hostptr, q, iptr->hostsize);
1620		}
1621	<	cidr = MyMalloc(sizeof(struct CidrItem));
3765	<	cidr->number_on_this_cidr = 1;
3766	<	cidr->mask = *ip;
3767	<	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3768	<	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3769	<	}
3770	<	#endif
3771	<	return 0;
3772	<	}
3773	<
3774	<	/*
3775	<	* remove_from_cidr_check
3776	<	*
3777	<	* inputs       - pointer to the ip to be removed
3778	<	*              - pointer to the class
3779	<	* output       - NONE
3780	<	* side effects -
3781	<	*/
3782	<	static void
3783	<	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3784	<	{
3785	<	dlink_node *ptr = NULL;
3786	<	dlink_node *next_ptr = NULL;
3787	<	struct CidrItem *cidr;
3788	<
3789	<	if (NumberPerCidr(aclass) == 0)
3790	<	return;
3791	<
3792	<	if (ip->ss.ss_family == AF_INET)
3793	<	{
3794	<	if (CidrBitlenIPV4(aclass) <= 0)
3795	<	return;
3796	<
3797	<	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
1621	>	else
1622		{
1623	<	cidr = ptr->data;
1624	<	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3801	<	{
3802	<	cidr->number_on_this_cidr--;
3803	<	if (cidr->number_on_this_cidr == 0)
3804	<	{
3805	<	dlinkDelete(ptr, &aclass->list_ipv4);
3806	<	MyFree(cidr);
3807	<	return;
3808	<	}
3809	<	}
1623	>	if (*p)
1624	>	strlcpy(iptr->userptr, p, iptr->usersize);
1625		}
1626		}
1627	<	#ifdef IPV6
3813	<	else if (CidrBitlenIPV6(aclass) > 0)
1627	>	else
1628		{
1629	<	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
1629	>	/* No ! found so lets look for a user@host */
1630	>	if ((p = strchr(iptr->nuhmask, '@')))
1631		{
1632	<	cidr = ptr->data;
1633	<	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3819	<	{
3820	<	cidr->number_on_this_cidr--;
3821	<	if (cidr->number_on_this_cidr == 0)
3822	<	{
3823	<	dlinkDelete(ptr, &aclass->list_ipv6);
3824	<	MyFree(cidr);
3825	<	return;
3826	<	}
3827	<	}
3828	<	}
3829	<	}
3830	<	#endif
3831	<	}
1632	>	/* if found a @ */
1633	>	*p++ = '\0';
1634
1635	<	static void
1636	<	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3835	<	dlink_list *old_list, dlink_list *new_list, int changed)
3836	<	{
3837	<	dlink_node *ptr;
3838	<	struct Client *client_p;
3839	<	struct ConfItem *conf;
3840	<	struct AccessItem *aconf;
3841	<
3842	<	if (!changed)
3843	<	{
3844	<	*new_list = *old_list;
3845	<	old_list->head = old_list->tail = NULL;
3846	<	old_list->length = 0;
3847	<	return;
3848	<	}
3849	<
3850	<	DLINK_FOREACH(ptr, local_client_list.head)
3851	<	{
3852	<	client_p = ptr->data;
3853	<	if (client_p->localClient->aftype != aftype)
3854	<	continue;
3855	<	if (dlink_list_length(&client_p->localClient->confs) == 0)
3856	<	continue;
1635	>	if (*iptr->nuhmask)
1636	>	strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1637
1638	<	conf = client_p->localClient->confs.tail->data;
1639	<	if (conf->type == CLIENT_TYPE)
1638	>	if (*p)
1639	>	strlcpy(iptr->hostptr, p, iptr->hostsize);
1640	>	}
1641	>	else
1642		{
1643	<	aconf = map_to_conf(conf);
1644	<	if (aconf->class_ptr == oldcl)
1645	<	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
1643	>	/* No @ found */
1644	>	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1645	>	strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1646	>	else
1647	>	strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1648		}
1649		}
1650		}
3867	–
3868	–	/*
3869	–	* rebuild_cidr_class
3870	–	*
3871	–	* inputs       - pointer to old conf
3872	–	*              - pointer to new_class
3873	–	* output       - none
3874	–	* side effects - rebuilds the class link list of cidr blocks
3875	–	*/
3876	–	void
3877	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3878	–	{
3879	–	struct ClassItem *old_class = map_to_conf(conf);
3880	–
3881	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3882	–	{
3883	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3884	–	rebuild_cidr_list(AF_INET, conf, new_class,
3885	–	&old_class->list_ipv4, &new_class->list_ipv4,
3886	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3887	–
3888	–	#ifdef IPV6
3889	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3890	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3891	–	&old_class->list_ipv6, &new_class->list_ipv6,
3892	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3893	–	#endif
3894	–	}
3895	–
3896	–	destroy_cidr_class(old_class);
3897	–	}
3898	–
3899	–	/*
3900	–	* destroy_cidr_list
3901	–	*
3902	–	* inputs       - pointer to class dlink list of cidr blocks
3903	–	* output       - none
3904	–	* side effects - completely destroys the class link list of cidr blocks
3905	–	*/
3906	–	static void
3907	–	destroy_cidr_list(dlink_list *list)
3908	–	{
3909	–	dlink_node *ptr = NULL;
3910	–	dlink_node *next_ptr = NULL;
3911	–	struct CidrItem *cidr;
3912	–
3913	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3914	–	{
3915	–	cidr = ptr->data;
3916	–	dlinkDelete(ptr, list);
3917	–	MyFree(cidr);
3918	–	}
3919	–	}
3920	–
3921	–	/*
3922	–	* destroy_cidr_class
3923	–	*
3924	–	* inputs       - pointer to class
3925	–	* output       - none
3926	–	* side effects - completely destroys the class link list of cidr blocks
3927	–	*/
3928	–	static void
3929	–	destroy_cidr_class(struct ClassItem *aclass)
3930	–	{
3931	–	destroy_cidr_list(&aclass->list_ipv4);
3932	–	destroy_cidr_list(&aclass->list_ipv6);
3933	–	}

Comparing:
ircd-hybrid/src/s_conf.c (property svn:keywords), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 8314 by michael, Wed Feb 28 17:47:23 2018 UTC

#	Line 1 | Line 1
1	<	"Id Revision"
1	>	Id

Diff Legend

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