ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/conf.c

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 896 by michael, Sat Nov 3 08:54:09 2007 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (file contents), Revision 7436 by michael, Thu Mar 10 19:57:51 2016 UTC

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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines