ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 1618 by michael, Tue Oct 30 21:04:38 2012 UTC vs.
Revision 5797 by michael, Fri Apr 17 16:19:21 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
35	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 43 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
46	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58
55	–	struct Callback *client_check_cb = NULL;
56	–	struct config_server_hide ConfigServerHide;
59
60	<	/* general conf items link list root, other than k lines etc. */
61	<	dlink_list service_items = { NULL, NULL, 0 };
62	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list oconf_items   = { NULL, NULL, 0 };
65	<	dlink_list uconf_items   = { NULL, NULL, 0 };
66	<	dlink_list xconf_items   = { NULL, NULL, 0 };
65	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
66	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list class_items   = { NULL, NULL, 0 };
60	>	struct config_channel_entry ConfigChannel;
61	>	struct config_serverhide_entry ConfigServerHide;
62	>	struct config_general_entry ConfigGeneral;
63	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
64	>	struct config_serverinfo_entry ConfigServerInfo;
65	>	struct config_admin_entry ConfigAdminInfo;
66	>	struct conf_parser_context conf_parser_ctx;
67
68	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
69	<	dlink_list temporary_resv = { NULL, NULL, 0 };
68	>	/* general conf items link list root, other than k lines etc. */
69	>	dlink_list service_items;
70	>	dlink_list server_items;
71	>	dlink_list cluster_items;
72	>	dlink_list oconf_items;
73	>	dlink_list uconf_items;
74	>	dlink_list xconf_items;
75	>	dlink_list nresv_items;
76	>	dlink_list cresv_items;
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
81		extern int yyparse(); /* defined in y.tab.c */
82
78	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
79	–
80	–	/* internally defined functions */
81	–	static void read_conf(FILE *);
82	–	static void clear_out_old_conf(void);
83	–	static void flush_deleted_I_P(void);
84	–	static void expire_tklines(dlink_list *);
85	–	static void garbage_collect_ip_entries(void);
86	–	static int hash_ip(struct irc_ssaddr *);
87	–	static int verify_access(struct Client *, const char *);
88	–	static int attach_iline(struct Client *, struct ConfItem *);
89	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
90	–	static void parse_conf_file(int, int);
91	–	static dlink_list *map_to_list(ConfType);
92	–	static struct AccessItem *find_regexp_kline(const char *[]);
93	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
94	–
95	–	/*
96	–	* bit_len
97	–	*/
98	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
99	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
100	–	static void destroy_cidr_class(struct ClassItem *);
101	–
102	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
103	–
104	–	/* address of default class conf */
105	–	static struct ConfItem *class_default;
106	–
107	–	/* usually, with hash tables, you use a prime number...
108	–	* but in this case I am dealing with ip addresses,
109	–	* not ascii strings.
110	–	*/
111	–	#define IP_HASH_SIZE 0x1000
112	–
113	–	struct ip_entry
114	–	{
115	–	struct irc_ssaddr ip;
116	–	int count;
117	–	time_t last_attempt;
118	–	struct ip_entry *next;
119	–	};
120	–
121	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
122	–	static BlockHeap *ip_entry_heap = NULL;
123	–	static int ip_entries_count = 0;
124	–
125	–
126	–	void *
127	–	map_to_conf(struct ConfItem *aconf)
128	–	{
129	–	void *conf;
130	–	conf = (void *)((uintptr_t)aconf +
131	–	(uintptr_t)sizeof(struct ConfItem));
132	–	return(conf);
133	–	}
134	–
135	–	struct ConfItem *
136	–	unmap_conf_item(void *aconf)
137	–	{
138	–	struct ConfItem *conf;
139	–
140	–	conf = (struct ConfItem *)((uintptr_t)aconf -
141	–	(uintptr_t)sizeof(struct ConfItem));
142	–	return(conf);
143	–	}
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 153 | Line 92 | unmap_conf_item(void *aconf)
92		* if successful save hp in the conf item it was called with
93		*/
94		static void
95	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
95	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
96		{
97	<	struct AccessItem *aconf = vptr;
97	>	struct MaskItem *const conf = vptr;
98
99	<	aconf->dns_pending = 0;
99	>	conf->dns_pending = 0;
100
101	<	if (addr != NULL)
102	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
101	>	if (addr)
102	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104	<	aconf->dns_failed = 1;
104	>	conf->dns_failed = 1;
105		}
106
107		/* conf_dns_lookup()
#	Line 172 | Line 111 | conf_dns_callback(void *vptr, const stru
111		* allocate a dns_query and start ns lookup.
112		*/
113		static void
114	<	conf_dns_lookup(struct AccessItem *aconf)
114	>	conf_dns_lookup(struct MaskItem *conf)
115		{
116	<	if (!aconf->dns_pending)
117	<	{
118	<	aconf->dns_pending = 1;
119	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
120	<	}
116	>	if (conf->dns_pending)
117	>	return;
118	>
119	>	conf->dns_pending = 1;
120	>
121	>	if (conf->aftype == AF_INET)
122	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
123	>	else
124	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
125		}
126
127	<	/* make_conf_item()
127	>	/* map_to_list()
128		*
129	<	* inputs       - type of item
130	<	* output       - pointer to new conf entry
131	<	* side effects - none
129	>	* inputs       - ConfType conf
130	>	* output       - pointer to dlink_list to use
131	>	* side effects - none
132		*/
133	<	struct ConfItem *
134	<	make_conf_item(ConfType type)
133	>	static dlink_list *
134	>	map_to_list(enum maskitem_type type)
135		{
193	–	struct ConfItem *conf = NULL;
194	–	struct AccessItem *aconf = NULL;
195	–	struct ClassItem *aclass = NULL;
196	–	int status = 0;
197	–
136		switch (type)
137		{
138	<	case DLINE_TYPE:
139	<	case EXEMPTDLINE_TYPE:
202	<	case GLINE_TYPE:
203	<	case KLINE_TYPE:
204	<	case CLIENT_TYPE:
205	<	case OPER_TYPE:
206	<	case SERVER_TYPE:
207	<	conf = MyMalloc(sizeof(struct ConfItem) +
208	<	sizeof(struct AccessItem));
209	<	aconf = map_to_conf(conf);
210	<	aconf->aftype = AF_INET;
211	<
212	<	/* Yes, sigh. switch on type again */
213	<	switch (type)
214	<	{
215	<	case EXEMPTDLINE_TYPE:
216	<	status = CONF_EXEMPTDLINE;
138	>	case CONF_XLINE:
139	>	return &xconf_items;
140		break;
141	<
142	<	case DLINE_TYPE:
220	<	status = CONF_DLINE;
141	>	case CONF_ULINE:
142	>	return &uconf_items;
143		break;
144	<
145	<	case KLINE_TYPE:
224	<	status = CONF_KLINE;
144	>	case CONF_NRESV:
145	>	return &nresv_items;
146		break;
147	<
148	<	case GLINE_TYPE:
228	<	status = CONF_GLINE;
147	>	case CONF_CRESV:
148	>	return &cresv_items;
149		break;
150	<
151	<	case CLIENT_TYPE:
232	<	status = CONF_CLIENT;
150	>	case CONF_OPER:
151	>	return &oconf_items;
152		break;
153	<
154	<	case OPER_TYPE:
236	<	status = CONF_OPERATOR;
237	<	dlinkAdd(conf, &conf->node, &oconf_items);
153	>	case CONF_SERVER:
154	>	return &server_items;
155		break;
156	<
157	<	case SERVER_TYPE:
241	<	status = CONF_SERVER;
242	<	dlinkAdd(conf, &conf->node, &server_items);
156	>	case CONF_SERVICE:
157	>	return &service_items;
158		break;
159	<
160	<	default:
159	>	case CONF_CLUSTER:
160	>	return &cluster_items;
161		break;
247	–	}
248	–	aconf->status = status;
249	–	break;
250	–
251	–	case ULINE_TYPE:
252	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
253	–	sizeof(struct MatchItem));
254	–	dlinkAdd(conf, &conf->node, &uconf_items);
255	–	break;
256	–
257	–	case XLINE_TYPE:
258	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
259	–	sizeof(struct MatchItem));
260	–	dlinkAdd(conf, &conf->node, &xconf_items);
261	–	break;
262	–	#ifdef HAVE_LIBPCRE
263	–	case RXLINE_TYPE:
264	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
265	–	sizeof(struct MatchItem));
266	–	dlinkAdd(conf, &conf->node, &rxconf_items);
267	–	break;
268	–
269	–	case RKLINE_TYPE:
270	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
271	–	sizeof(struct AccessItem));
272	–	aconf = map_to_conf(conf);
273	–	aconf->status = CONF_KLINE;
274	–	dlinkAdd(conf, &conf->node, &rkconf_items);
275	–	break;
276	–	#endif
277	–	case CLUSTER_TYPE:
278	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
279	–	dlinkAdd(conf, &conf->node, &cluster_items);
280	–	break;
281	–
282	–	case CRESV_TYPE:
283	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
284	–	sizeof(struct ResvChannel));
285	–	break;
286	–
287	–	case NRESV_TYPE:
288	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
289	–	sizeof(struct MatchItem));
290	–	dlinkAdd(conf, &conf->node, &nresv_items);
291	–	break;
292	–
293	–	case SERVICE_TYPE:
294	–	status = CONF_SERVICE;
295	–	conf = MyMalloc(sizeof(struct ConfItem));
296	–	dlinkAdd(conf, &conf->node, &service_items);
297	–	break;
298	–
299	–	case CLASS_TYPE:
300	–	conf = MyMalloc(sizeof(struct ConfItem) +
301	–	sizeof(struct ClassItem));
302	–	dlinkAdd(conf, &conf->node, &class_items);
303	–
304	–	aclass = map_to_conf(conf);
305	–	aclass->active = 1;
306	–	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
307	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
308	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
309	–	aclass->max_sendq = DEFAULT_SENDQ;
310	–	aclass->max_recvq = DEFAULT_RECVQ;
311	–
312	–	break;
313	–
314	–	default:
315	–	conf = NULL;
316	–	break;
317	–	}
318	–
319	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
320	–	conf->type = type;
321	–
322	–	return conf;
323	–	}
324	–
325	–	void
326	–	delete_conf_item(struct ConfItem *conf)
327	–	{
328	–	dlink_node *m = NULL, *m_next = NULL;
329	–	struct MatchItem *match_item;
330	–	struct AccessItem *aconf;
331	–	ConfType type = conf->type;
332	–
333	–	MyFree(conf->name);
334	–	conf->name = NULL;
335	–
336	–	switch(type)
337	–	{
338	–	case DLINE_TYPE:
339	–	case EXEMPTDLINE_TYPE:
340	–	case GLINE_TYPE:
341	–	case KLINE_TYPE:
342	–	case CLIENT_TYPE:
343	–	case OPER_TYPE:
344	–	case SERVER_TYPE:
345	–	aconf = map_to_conf(conf);
346	–
347	–	if (aconf->dns_pending)
348	–	delete_resolver_queries(aconf);
349	–	if (aconf->passwd != NULL)
350	–	memset(aconf->passwd, 0, strlen(aconf->passwd));
351	–	if (aconf->spasswd != NULL)
352	–	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
353	–	aconf->class_ptr = NULL;
354	–
355	–	MyFree(aconf->passwd);
356	–	MyFree(aconf->spasswd);
357	–	MyFree(aconf->reason);
358	–	MyFree(aconf->oper_reason);
359	–	MyFree(aconf->user);
360	–	MyFree(aconf->host);
361	–	#ifdef HAVE_LIBCRYPTO
362	–	MyFree(aconf->cipher_list);
363	–
364	–	if (aconf->rsa_public_key)
365	–	RSA_free(aconf->rsa_public_key);
366	–	MyFree(aconf->rsa_public_key_file);
367	–	#endif
368	–
369	–	/* Yes, sigh. switch on type again */
370	–	switch(type)
371	–	{
372	–	case EXEMPTDLINE_TYPE:
373	–	case DLINE_TYPE:
374	–	case GLINE_TYPE:
375	–	case KLINE_TYPE:
376	–	case CLIENT_TYPE:
377	–	MyFree(conf);
378	–	break;
379	–
380	–	case OPER_TYPE:
381	–	aconf = map_to_conf(conf);
382	–	if (!IsConfIllegal(aconf))
383	–	dlinkDelete(&conf->node, &oconf_items);
384	–	MyFree(conf);
385	–	break;
386	–
387	–	case SERVER_TYPE:
388	–	aconf = map_to_conf(conf);
389	–
390	–	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
391	–	{
392	–	MyFree(m->data);
393	–	free_dlink_node(m);
394	–	}
395	–
396	–	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
397	–	{
398	–	MyFree(m->data);
399	–	free_dlink_node(m);
400	–	}
401	–
402	–	if (!IsConfIllegal(aconf))
403	–	dlinkDelete(&conf->node, &server_items);
404	–	MyFree(conf);
405	–	break;
406	–
162		default:
163	<	break;
409	<	}
410	<	break;
411	<
412	<	case ULINE_TYPE:
413	<	match_item = map_to_conf(conf);
414	<	MyFree(match_item->user);
415	<	MyFree(match_item->host);
416	<	MyFree(match_item->reason);
417	<	MyFree(match_item->oper_reason);
418	<	dlinkDelete(&conf->node, &uconf_items);
419	<	MyFree(conf);
420	<	break;
421	<
422	<	case XLINE_TYPE:
423	<	match_item = map_to_conf(conf);
424	<	MyFree(match_item->user);
425	<	MyFree(match_item->host);
426	<	MyFree(match_item->reason);
427	<	MyFree(match_item->oper_reason);
428	<	dlinkDelete(&conf->node, &xconf_items);
429	<	MyFree(conf);
430	<	break;
431	<	#ifdef HAVE_LIBPCRE
432	<	case RKLINE_TYPE:
433	<	aconf = map_to_conf(conf);
434	<	MyFree(aconf->regexuser);
435	<	MyFree(aconf->regexhost);
436	<	MyFree(aconf->user);
437	<	MyFree(aconf->host);
438	<	MyFree(aconf->reason);
439	<	MyFree(aconf->oper_reason);
440	<	dlinkDelete(&conf->node, &rkconf_items);
441	<	MyFree(conf);
442	<	break;
443	<
444	<	case RXLINE_TYPE:
445	<	MyFree(conf->regexpname);
446	<	match_item = map_to_conf(conf);
447	<	MyFree(match_item->user);
448	<	MyFree(match_item->host);
449	<	MyFree(match_item->reason);
450	<	MyFree(match_item->oper_reason);
451	<	dlinkDelete(&conf->node, &rxconf_items);
452	<	MyFree(conf);
453	<	break;
454	<	#endif
455	<	case NRESV_TYPE:
456	<	match_item = map_to_conf(conf);
457	<	MyFree(match_item->user);
458	<	MyFree(match_item->host);
459	<	MyFree(match_item->reason);
460	<	MyFree(match_item->oper_reason);
461	<	dlinkDelete(&conf->node, &nresv_items);
462	<
463	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
464	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
465	<	free_dlink_node(m);
466	<
467	<	MyFree(conf);
468	<	break;
469	<
470	<	case CLUSTER_TYPE:
471	<	dlinkDelete(&conf->node, &cluster_items);
472	<	MyFree(conf);
473	<	break;
474	<
475	<	case CRESV_TYPE:
476	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
477	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
478	<	free_dlink_node(m);
479	<
480	<	MyFree(conf);
481	<	break;
482	<
483	<	case CLASS_TYPE:
484	<	dlinkDelete(&conf->node, &class_items);
485	<	MyFree(conf);
486	<	break;
487	<
488	<	case SERVICE_TYPE:
489	<	dlinkDelete(&conf->node, &service_items);
490	<	MyFree(conf);
491	<	break;
492	<
493	<	default:
494	<	break;
163	>	return NULL;
164		}
165		}
166
167	<	/* free_access_item()
168	<	*
500	<	* inputs       - pointer to conf to free
501	<	* output       - none
502	<	* side effects - crucial password fields are zeroed, conf is freed
503	<	*/
504	<	void
505	<	free_access_item(struct AccessItem *aconf)
167	>	struct MaskItem *
168	>	conf_make(enum maskitem_type type)
169		{
170	<	struct ConfItem *conf;
170	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
171	>	dlink_list *list = NULL;
172
173	<	if (aconf == NULL)
174	<	return;
175	<	conf = unmap_conf_item(aconf);
512	<	delete_conf_item(conf);
513	<	}
173	>	conf->type   = type;
174	>	conf->active = 1;
175	>	conf->aftype = AF_INET;
176
177	<	static const unsigned int shared_bit_table[] =
178	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
177	>	if ((list = map_to_list(type)))
178	>	dlinkAdd(conf, &conf->node, list);
179	>	return conf;
180	>	}
181
518	–	/* report_confitem_types()
519	–	*
520	–	* inputs       - pointer to client requesting confitem report
521	–	*              - ConfType to report
522	–	* output       - none
523	–	* side effects -
524	–	*/
182		void
183	<	report_confitem_types(struct Client *source_p, ConfType type)
183	>	conf_free(struct MaskItem *conf)
184		{
185	<	dlink_node *ptr = NULL, *dptr = NULL;
186	<	struct ConfItem *conf = NULL;
530	<	struct AccessItem *aconf = NULL;
531	<	struct MatchItem *matchitem = NULL;
532	<	struct ClassItem *classitem = NULL;
533	<	char buf[12];
534	<	char *p = NULL;
535	<
536	<	switch (type)
537	<	{
538	<	case XLINE_TYPE:
539	<	DLINK_FOREACH(ptr, xconf_items.head)
540	<	{
541	<	conf = ptr->data;
542	<	matchitem = map_to_conf(conf);
185	>	dlink_node *node = NULL, *node_next = NULL;
186	>	dlink_list *list = NULL;
187
188	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
189	<	me.name, source_p->name,
546	<	matchitem->hold ? "x": "X", matchitem->count,
547	<	conf->name, matchitem->reason);
548	<	}
549	<	break;
188	>	if ((list = map_to_list(conf->type)))
189	>	dlinkFindDelete(list, conf);
190
191	<	#ifdef HAVE_LIBPCRE
552	<	case RXLINE_TYPE:
553	<	DLINK_FOREACH(ptr, rxconf_items.head)
554	<	{
555	<	conf = ptr->data;
556	<	matchitem = map_to_conf(conf);
557	<
558	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
559	<	me.name, source_p->name,
560	<	"XR", matchitem->count,
561	<	conf->name, matchitem->reason);
562	<	}
563	<	break;
191	>	MyFree(conf->name);
192
193	<	case RKLINE_TYPE:
194	<	DLINK_FOREACH(ptr, rkconf_items.head)
195	<	{
196	<	aconf = map_to_conf((conf = ptr->data));
193	>	if (conf->dns_pending)
194	>	delete_resolver_queries(conf);
195	>	if (conf->passwd)
196	>	memset(conf->passwd, 0, strlen(conf->passwd));
197	>	if (conf->spasswd)
198	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
199	>
200	>	conf->class = NULL;
201	>
202	>	MyFree(conf->passwd);
203	>	MyFree(conf->spasswd);
204	>	MyFree(conf->reason);
205	>	MyFree(conf->certfp);
206	>	MyFree(conf->whois);
207	>	MyFree(conf->user);
208	>	MyFree(conf->host);
209	>	#ifdef HAVE_LIBCRYPTO
210	>	MyFree(conf->cipher_list);
211
212	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
213	<	source_p->name, "KR", aconf->host, aconf->user,
572	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
573	<	}
574	<	break;
212	>	if (conf->rsa_public_key)
213	>	RSA_free(conf->rsa_public_key);
214		#endif
215	<
577	<	case ULINE_TYPE:
578	<	DLINK_FOREACH(ptr, uconf_items.head)
579	<	{
580	<	conf = ptr->data;
581	<	matchitem = map_to_conf(conf);
582	<
583	<	p = buf;
584	<
585	<	/* some of these are redundant for the sake of
586	<	* consistency with cluster{} flags
587	<	*/
588	<	*p++ = 'c';
589	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
590	<
591	<	sendto_one(source_p, form_str(RPL_STATSULINE),
592	<	me.name, source_p->name, conf->name,
593	<	matchitem->user?matchitem->user: "*",
594	<	matchitem->host?matchitem->host: "*", buf);
595	<	}
596	<
597	<	DLINK_FOREACH(ptr, cluster_items.head)
598	<	{
599	<	conf = ptr->data;
600	<
601	<	p = buf;
602	<
603	<	*p++ = 'C';
604	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
605	<
606	<	sendto_one(source_p, form_str(RPL_STATSULINE),
607	<	me.name, source_p->name, conf->name,
608	<	"*", "*", buf);
609	<	}
610	<
611	<	break;
612	<
613	<	case OPER_TYPE:
614	<	DLINK_FOREACH(ptr, oconf_items.head)
615	<	{
616	<	conf = ptr->data;
617	<	aconf = map_to_conf(conf);
618	<
619	<	/* Don't allow non opers to see oper privs */
620	<	if (HasUMode(source_p, UMODE_OPER))
621	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
622	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
623	<	conf->name, oper_privs_as_string(aconf->port),
624	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
625	<	else
626	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
627	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
628	<	conf->name, "0",
629	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
630	<	}
631	<	break;
632	<
633	<	case CLASS_TYPE:
634	<	DLINK_FOREACH(ptr, class_items.head)
635	<	{
636	<	conf = ptr->data;
637	<	classitem = map_to_conf(conf);
638	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
639	<	me.name, source_p->name, 'Y',
640	<	conf->name, classitem->ping_freq,
641	<	classitem->con_freq,
642	<	classitem->max_total, classitem->max_sendq,
643	<	classitem->max_recvq,
644	<	classitem->curr_user_count,
645	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv4,
646	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv6,
647	<	classitem->active ? "active" : "disabled");
648	<	}
649	<	break;
650	<
651	<	case CONF_TYPE:
652	<	case CLIENT_TYPE:
653	<	break;
654	<
655	<	case SERVICE_TYPE:
656	<	DLINK_FOREACH(ptr, service_items.head)
657	<	{
658	<	conf = ptr->data;
659	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
660	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
661	<	}
662	<	break;
663	<
664	<	case SERVER_TYPE:
665	<	DLINK_FOREACH(ptr, server_items.head)
666	<	{
667	<	p = buf;
668	<
669	<	conf = ptr->data;
670	<	aconf = map_to_conf(conf);
671	<
672	<	buf[0] = '\0';
673	<
674	<	if (IsConfAllowAutoConn(aconf))
675	<	*p++ = 'A';
676	<	if (IsConfSSL(aconf))
677	<	*p++ = 'S';
678	<	if (buf[0] == '\0')
679	<	*p++ = '*';
680	<
681	<	*p = '\0';
682	<
683	<	/*
684	<	* Allow admins to see actual ips unless hide_server_ips is enabled
685	<	*/
686	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
687	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
688	<	me.name, source_p->name, 'C', aconf->host,
689	<	buf, conf->name, aconf->port,
690	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
691	<	else
692	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
693	<	me.name, source_p->name, 'C',
694	<	"*@127.0.0.1", buf, conf->name, aconf->port,
695	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
696	<	}
697	<	break;
698	<
699	<	case HUB_TYPE:
700	<	DLINK_FOREACH(ptr, server_items.head)
701	<	{
702	<	conf = ptr->data;
703	<	aconf = map_to_conf(conf);
704	<
705	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
706	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
707	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
708	<	}
709	<	break;
710	<
711	<	case LEAF_TYPE:
712	<	DLINK_FOREACH(ptr, server_items.head)
713	<	{
714	<	conf = ptr->data;
715	<	aconf = map_to_conf(conf);
716	<
717	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
718	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
719	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
720	<	}
721	<	break;
722	<
723	<	case GLINE_TYPE:
724	<	case KLINE_TYPE:
725	<	case DLINE_TYPE:
726	<	case EXEMPTDLINE_TYPE:
727	<	case CRESV_TYPE:
728	<	case NRESV_TYPE:
729	<	case CLUSTER_TYPE:
730	<	default:
731	<	break;
732	<	}
733	<	}
734	<
735	<	/* check_client()
736	<	*
737	<	* inputs       - pointer to client
738	<	* output       - 0 = Success
739	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
740	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
741	<	*                I_LINE_FULL       (-3) = I-line is full
742	<	*                TOO_MANY          (-4) = Too many connections from hostname
743	<	*                BANNED_CLIENT     (-5) = K-lined
744	<	* side effects - Ordinary client access check.
745	<	*                Look for conf lines which have the same
746	<	*                status as the flags passed.
747	<	*/
748	<	static void *
749	<	check_client(va_list args)
750	<	{
751	<	struct Client *source_p = va_arg(args, struct Client *);
752	<	const char *username = va_arg(args, const char *);
753	<	int i;
754	<
755	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
756	<	if ((i = verify_access(source_p, username)))
757	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
758	<	source_p->name, source_p->sockhost);
759	<
760	<	switch (i)
215	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
216		{
217	<	case TOO_MANY:
218	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
219	<	"Too many on IP for %s (%s).",
765	<	get_client_name(source_p, SHOW_IP),
766	<	source_p->sockhost);
767	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
768	<	get_client_name(source_p, SHOW_IP));
769	<	++ServerStats.is_ref;
770	<	exit_client(source_p, &me, "No more connections allowed on that IP");
771	<	break;
772	<
773	<	case I_LINE_FULL:
774	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
775	<	"auth{} block is full for %s (%s).",
776	<	get_client_name(source_p, SHOW_IP),
777	<	source_p->sockhost);
778	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
779	<	get_client_name(source_p, SHOW_IP));
780	<	++ServerStats.is_ref;
781	<	exit_client(source_p, &me,
782	<	"No more connections allowed in your connection class");
783	<	break;
784	<
785	<	case NOT_AUTHORIZED:
786	<	++ServerStats.is_ref;
787	<	/* jdc - lists server name & port connections are on */
788	<	/*       a purely cosmetical change */
789	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
790	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
791	<	get_client_name(source_p, SHOW_IP),
792	<	source_p->sockhost,
793	<	source_p->localClient->listener->name,
794	<	source_p->localClient->listener->port);
795	<	ilog(LOG_TYPE_IRCD,
796	<	"Unauthorized client connection from %s on [%s/%u].",
797	<	get_client_name(source_p, SHOW_IP),
798	<	source_p->localClient->listener->name,
799	<	source_p->localClient->listener->port);
800	<
801	<	exit_client(source_p, &me, "You are not authorized to use this server");
802	<	break;
803	<
804	<	case BANNED_CLIENT:
805	<	exit_client(source_p, &me, "Banned");
806	<	++ServerStats.is_ref;
807	<	break;
808	<
809	<	case 0:
810	<	default:
811	<	break;
217	>	MyFree(node->data);
218	>	dlinkDelete(node, &conf->hub_list);
219	>	free_dlink_node(node);
220		}
221
222	<	return (i < 0 ? NULL : source_p);
815	<	}
816	<
817	<	/* verify_access()
818	<	*
819	<	* inputs       - pointer to client to verify
820	<	*              - pointer to proposed username
821	<	* output       - 0 if success -'ve if not
822	<	* side effect  - find the first (best) I line to attach.
823	<	*/
824	<	static int
825	<	verify_access(struct Client *client_p, const char *username)
826	<	{
827	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
828	<	struct ConfItem *conf = NULL;
829	<	char non_ident[USERLEN + 1] = { '~', '\0' };
830	<	const char *uhi[3];
831	<
832	<	if (IsGotId(client_p))
222	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
223		{
224	<	aconf = find_address_conf(client_p->host, client_p->username,
225	<	&client_p->localClient->ip,
226	<	client_p->localClient->aftype,
837	<	client_p->localClient->passwd);
224	>	MyFree(node->data);
225	>	dlinkDelete(node, &conf->leaf_list);
226	>	free_dlink_node(node);
227		}
839	–	else
840	–	{
841	–	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
842	–	aconf = find_address_conf(client_p->host,non_ident,
843	–	&client_p->localClient->ip,
844	–	client_p->localClient->aftype,
845	–	client_p->localClient->passwd);
846	–	}
847	–
848	–	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
849	–	uhi[1] = client_p->host;
850	–	uhi[2] = client_p->sockhost;
228
229	<	rkconf = find_regexp_kline(uhi);
853	<
854	<	if (aconf != NULL)
229	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
230		{
231	<	if (IsConfClient(aconf) && !rkconf)
857	<	{
858	<	conf = unmap_conf_item(aconf);
231	>	struct exempt *exptr = node->data;
232
233	<	if (IsConfRedir(aconf))
234	<	{
235	<	sendto_one(client_p, form_str(RPL_REDIR),
236	<	me.name, client_p->name,
237	<	conf->name ? conf->name : "",
865	<	aconf->port);
866	<	return(NOT_AUTHORIZED);
867	<	}
868	<
869	<	if (IsConfDoIdentd(aconf))
870	<	SetNeedId(client_p);
871	<
872	<	/* Thanks for spoof idea amm */
873	<	if (IsConfDoSpoofIp(aconf))
874	<	{
875	<	conf = unmap_conf_item(aconf);
876	<
877	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
878	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
879	<	"%s spoofing: %s as %s",
880	<	client_p->name, client_p->host, conf->name);
881	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
882	<	SetIPSpoof(client_p);
883	<	}
884	<
885	<	return(attach_iline(client_p, conf));
886	<	}
887	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
888	<	{
889	<	/* XXX */
890	<	aconf = rkconf ? rkconf : aconf;
891	<	if (IsConfGline(aconf))
892	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
893	<	client_p->name);
894	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
895	<	me.name, client_p->name, aconf->reason);
896	<	return(BANNED_CLIENT);
897	<	}
233	>	dlinkDelete(node, &conf->exempt_list);
234	>	MyFree(exptr->name);
235	>	MyFree(exptr->user);
236	>	MyFree(exptr->host);
237	>	MyFree(exptr);
238		}
239
240	<	return(NOT_AUTHORIZED);
240	>	MyFree(conf);
241		}
242
243		/* attach_iline()
244		*
245	<	* inputs       - client pointer
246	<	*              - conf pointer
247	<	* output       -
248	<	* side effects - do actual attach
245	>	* inputs       - client pointer
246	>	*              - conf pointer
247	>	* output       -
248	>	* side effects - do actual attach
249		*/
250		static int
251	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
251	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
252		{
253	<	struct AccessItem *aconf;
914	<	struct ClassItem *aclass;
253	>	const struct ClassItem *const class = conf->class;
254		struct ip_entry *ip_found;
255		int a_limit_reached = 0;
256	<	int local = 0, global = 0, ident = 0;
256	>	unsigned int local = 0, global = 0, ident = 0;
257
258	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
258	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
259		ip_found->count++;
260	<	SetIpHash(client_p);
922	<
923	<	aconf = map_to_conf(conf);
924	<	if (aconf->class_ptr == NULL)
925	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
926	<
927	<	aclass = map_to_conf(aconf->class_ptr);
260	>	AddFlag(client_p, FLAGS_IPHASH);
261
262		count_user_host(client_p->username, client_p->host,
263		&global, &local, &ident);
#	Line 933 | Line 266 | attach_iline(struct Client *client_p, st
266		* setting a_limit_reached if any limit is reached.
267		* - Dianora
268		*/
269	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
269	>	if (class->max_total && class->ref_count >= class->max_total)
270		a_limit_reached = 1;
271	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
271	>	else if (class->max_perip && ip_found->count > class->max_perip)
272		a_limit_reached = 1;
273	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
273	>	else if (class->max_local && local >= class->max_local)
274		a_limit_reached = 1;
275	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
275	>	else if (class->max_global && global >= class->max_global)
276		a_limit_reached = 1;
277	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
277	>	else if (class->max_ident && ident >= class->max_ident &&
278		client_p->username[0] != '~')
279		a_limit_reached = 1;
280
281		if (a_limit_reached)
282		{
283	<	if (!IsConfExemptLimits(aconf))
283	>	if (!IsConfExemptLimits(conf))
284		return TOO_MANY;   /* Already at maximum allowed */
285
286	<	sendto_one(client_p,
287	<	":%s NOTICE %s :*** Your connection class is full, "
955	<	"but you have exceed_limit = yes;", me.name, client_p->name);
286	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
287	>	"but you have exceed_limit = yes;");
288		}
289
290		return attach_conf(client_p, conf);
291		}
292
293	<	/* init_ip_hash_table()
962	<	*
963	<	* inputs               - NONE
964	<	* output               - NONE
965	<	* side effects         - allocate memory for ip_entry(s)
966	<	*                      - clear the ip hash table
967	<	*/
968	<	void
969	<	init_ip_hash_table(void)
970	<	{
971	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
972	<	2 * hard_fdlimit);
973	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
974	<	}
975	<
976	<	/* find_or_add_ip()
977	<	*
978	<	* inputs       - pointer to struct irc_ssaddr
979	<	* output       - pointer to a struct ip_entry
980	<	* side effects -
293	>	/* verify_access()
294		*
295	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
296	<	* count set to 0.
295	>	* inputs       - pointer to client to verify
296	>	* output       - 0 if success -'ve if not
297	>	* side effect  - find the first (best) I line to attach.
298		*/
299	<	static struct ip_entry *
300	<	find_or_add_ip(struct irc_ssaddr *ip_in)
299	>	static int
300	>	verify_access(struct Client *client_p)
301		{
302	<	struct ip_entry *ptr, *newptr;
989	<	int hash_index = hash_ip(ip_in), res;
990	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
991	<	#ifdef IPV6
992	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
993	<	#endif
302	>	struct MaskItem *conf = NULL;
303
304	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
304	>	if (IsGotId(client_p))
305		{
306	<	#ifdef IPV6
307	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
308	<	continue;
309	<	if (ip_in->ss.ss_family == AF_INET6)
1001	<	{
1002	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1003	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1004	<	}
1005	<	else
1006	<	#endif
1007	<	{
1008	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1009	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1010	<	}
1011	<	if (res == 0)
1012	<	{
1013	<	/* Found entry already in hash, return it. */
1014	<	return ptr;
1015	<	}
306	>	conf = find_address_conf(client_p->host, client_p->username,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311	+	else
312	+	{
313	+	char non_ident[USERLEN + 1] = "~";
314
315	<	if (ip_entries_count >= 2 * hard_fdlimit)
316	<	garbage_collect_ip_entries();
317	<
318	<	newptr = BlockHeapAlloc(ip_entry_heap);
319	<	ip_entries_count++;
320	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
315	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
316	>	conf = find_address_conf(client_p->host, non_ident,
317	>	&client_p->connection->ip,
318	>	client_p->connection->aftype,
319	>	client_p->connection->password);
320	>	}
321
322	<	newptr->next = ip_hash_table[hash_index];
323	<	ip_hash_table[hash_index] = newptr;
322	>	if (conf)
323	>	{
324	>	if (IsConfClient(conf))
325	>	{
326	>	if (IsConfRedir(conf))
327	>	{
328	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
329	>	conf->name ? conf->name : "",
330	>	conf->port);
331	>	return NOT_AUTHORIZED;
332	>	}
333
334	<	return newptr;
335	<	}
334	>	/* Thanks for spoof idea amm */
335	>	if (IsConfDoSpoofIp(conf))
336	>	{
337	>	if (IsConfSpoofNotice(conf))
338	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
339	>	client_p->name, client_p->host, conf->name);
340
341	<	/* remove_one_ip()
342	<	*
1033	<	* inputs        - unsigned long IP address value
1034	<	* output        - NONE
1035	<	* side effects  - The ip address given, is looked up in ip hash table
1036	<	*                 and number of ip#'s for that ip decremented.
1037	<	*                 If ip # count reaches 0 and has expired,
1038	<	*                 the struct ip_entry is returned to the ip_entry_heap
1039	<	*/
1040	<	void
1041	<	remove_one_ip(struct irc_ssaddr *ip_in)
1042	<	{
1043	<	struct ip_entry *ptr;
1044	<	struct ip_entry *last_ptr = NULL;
1045	<	int hash_index = hash_ip(ip_in), res;
1046	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1047	<	#ifdef IPV6
1048	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1049	<	#endif
341	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
342	>	}
343
344	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1052	<	{
1053	<	#ifdef IPV6
1054	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1055	<	continue;
1056	<	if (ip_in->ss.ss_family == AF_INET6)
1057	<	{
1058	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1059	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
344	>	return attach_iline(client_p, conf);
345		}
346	<	else
1062	<	#endif
1063	<	{
1064	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1065	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1066	<	}
1067	<	if (res)
1068	<	continue;
1069	<	if (ptr->count > 0)
1070	<	ptr->count--;
1071	<	if (ptr->count == 0 &&
1072	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
346	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
347		{
348	<	if (last_ptr != NULL)
349	<	last_ptr->next = ptr->next;
1076	<	else
1077	<	ip_hash_table[hash_index] = ptr->next;
348	>	if (IsConfGline(conf))
349	>	sendto_one_notice(client_p, &me, ":*** G-lined");
350
351	<	BlockHeapFree(ip_entry_heap, ptr);
352	<	ip_entries_count--;
1081	<	return;
351	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
352	>	return BANNED_CLIENT;
353		}
1083	–	last_ptr = ptr;
354		}
1085	–	}
1086	–
1087	–	/* hash_ip()
1088	–	*
1089	–	* input        - pointer to an irc_inaddr
1090	–	* output       - integer value used as index into hash table
1091	–	* side effects - hopefully, none
1092	–	*/
1093	–	static int
1094	–	hash_ip(struct irc_ssaddr *addr)
1095	–	{
1096	–	if (addr->ss.ss_family == AF_INET)
1097	–	{
1098	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1099	–	int hash;
1100	–	uint32_t ip;
355
356	<	ip   = ntohl(v4->sin_addr.s_addr);
1103	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1104	<	return hash;
1105	<	}
1106	<	#ifdef IPV6
1107	<	else
1108	<	{
1109	<	int hash;
1110	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1111	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1112	<
1113	<	hash  = ip[0] ^ ip[3];
1114	<	hash ^= hash >> 16;
1115	<	hash ^= hash >> 8;
1116	<	hash  = hash & (IP_HASH_SIZE - 1);
1117	<	return hash;
1118	<	}
1119	<	#else
1120	<	return 0;
1121	<	#endif
356	>	return NOT_AUTHORIZED;
357		}
358
359	<	/* count_ip_hash()
1125	<	*
1126	<	* inputs        - pointer to counter of number of ips hashed
1127	<	*               - pointer to memory used for ip hash
1128	<	* output        - returned via pointers input
1129	<	* side effects  - NONE
359	>	/* check_client()
360		*
361	<	* number of hashed ip #'s is counted up, plus the amount of memory
362	<	* used in the hash.
361	>	* inputs       - pointer to client
362	>	* output       - 0 = Success
363	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
364	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
365	>	*                I_LINE_FULL       (-3) = I-line is full
366	>	*                TOO_MANY          (-4) = Too many connections from hostname
367	>	*                BANNED_CLIENT     (-5) = K-lined
368	>	* side effects - Ordinary client access check.
369	>	*                Look for conf lines which have the same
370	>	*                status as the flags passed.
371		*/
372	<	void
373	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
372	>	int
373	>	check_client(struct Client *source_p)
374		{
1137	–	struct ip_entry *ptr;
375		int i;
376
377	<	*number_ips_stored = 0;
378	<	*mem_ips_stored    = 0;
377	>	if ((i = verify_access(source_p)))
378	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
379	>	source_p->name, source_p->sockhost);
380
381	<	for (i = 0; i < IP_HASH_SIZE; i++)
381	>	switch (i)
382		{
383	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
384	<	{
385	<	*number_ips_stored += 1;
386	<	*mem_ips_stored += sizeof(struct ip_entry);
387	<	}
388	<	}
389	<	}
383	>	case TOO_MANY:
384	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
385	>	"Too many on IP for %s (%s).",
386	>	get_client_name(source_p, SHOW_IP),
387	>	source_p->sockhost);
388	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
389	>	get_client_name(source_p, SHOW_IP));
390	>	++ServerStats.is_ref;
391	>	exit_client(source_p, "No more connections allowed on that IP");
392	>	break;
393
394	<	/* garbage_collect_ip_entries()
395	<	*
396	<	* input        - NONE
397	<	* output       - NONE
398	<	* side effects - free up all ip entries with no connections
399	<	*/
400	<	static void
401	<	garbage_collect_ip_entries(void)
402	<	{
403	<	struct ip_entry *ptr;
1163	<	struct ip_entry *last_ptr;
1164	<	struct ip_entry *next_ptr;
1165	<	int i;
394	>	case I_LINE_FULL:
395	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
396	>	"auth {} block is full for %s (%s).",
397	>	get_client_name(source_p, SHOW_IP),
398	>	source_p->sockhost);
399	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
400	>	get_client_name(source_p, SHOW_IP));
401	>	++ServerStats.is_ref;
402	>	exit_client(source_p, "No more connections allowed in your connection class");
403	>	break;
404
405	<	for (i = 0; i < IP_HASH_SIZE; i++)
406	<	{
407	<	last_ptr = NULL;
405	>	case NOT_AUTHORIZED:
406	>	/* jdc - lists server name & port connections are on */
407	>	/*       a purely cosmetical change */
408	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
409	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->sockhost,
412	>	source_p->connection->listener->name,
413	>	source_p->connection->listener->port);
414	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
415	>	get_client_name(source_p, SHOW_IP),
416	>	source_p->connection->listener->name,
417	>	source_p->connection->listener->port);
418
419	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
420	<	{
421	<	next_ptr = ptr->next;
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "You are not authorized to use this server");
421	>	break;
422
423	<	if (ptr->count == 0 &&
424	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
425	<	{
426	<	if (last_ptr != NULL)
427	<	last_ptr->next = ptr->next;
428	<	else
429	<	ip_hash_table[i] = ptr->next;
430	<	BlockHeapFree(ip_entry_heap, ptr);
1183	<	ip_entries_count--;
1184	<	}
1185	<	else
1186	<	last_ptr = ptr;
1187	<	}
423	>	case BANNED_CLIENT:
424	>	++ServerStats.is_ref;
425	>	exit_client(source_p, "Banned");
426	>	break;
427	>
428	>	case 0:
429	>	default:
430	>	break;
431		}
432	+
433	+	return !(i < 0);
434		}
435
436		/* detach_conf()
#	Line 1196 | Line 441 | garbage_collect_ip_entries(void)
441		* side effects - Disassociate configuration from the client.
442		*                Also removes a class from the list if marked for deleting.
443		*/
444	<	int
445	<	detach_conf(struct Client *client_p, ConfType type)
444	>	void
445	>	detach_conf(struct Client *client_p, enum maskitem_type type)
446		{
447	<	dlink_node *ptr, *next_ptr;
1203	<	struct ConfItem *conf;
1204	<	struct ClassItem *aclass;
1205	<	struct AccessItem *aconf;
1206	<	struct ConfItem *aclass_conf;
447	>	dlink_node *node = NULL, *node_next = NULL;
448
449	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
449	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
450		{
451	<	conf = ptr->data;
1211	<
1212	<	if (type == CONF_TYPE || conf->type == type)
1213	<	{
1214	<	dlinkDelete(ptr, &client_p->localClient->confs);
1215	<	free_dlink_node(ptr);
451	>	struct MaskItem *conf = node->data;
452
453	<	switch (conf->type)
454	<	{
455	<	case CLIENT_TYPE:
1220	<	case OPER_TYPE:
1221	<	case SERVER_TYPE:
1222	<	aconf = map_to_conf(conf);
1223	<
1224	<	assert(aconf->clients > 0);
1225	<
1226	<	if ((aclass_conf = aconf->class_ptr) != NULL)
1227	<	{
1228	<	aclass = map_to_conf(aclass_conf);
1229	<
1230	<	assert(aclass->curr_user_count > 0);
453	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
454	>	assert(conf->ref_count > 0);
455	>	assert(conf->class->ref_count > 0);
456
457	<	if (conf->type == CLIENT_TYPE)
458	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1234	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1235	<	delete_conf_item(aclass_conf);
1236	<	}
457	>	if (!(conf->type & type))
458	>	continue;
459
460	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
461	<	delete_conf_item(conf);
460	>	dlinkDelete(node, &client_p->connection->confs);
461	>	free_dlink_node(node);
462
463	<	break;
464	<	default:
1243	<	break;
1244	<	}
463	>	if (conf->type == CONF_CLIENT)
464	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
465
466	<	if (type != CONF_TYPE)
467	<	return 0;
466	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
467	>	{
468	>	class_free(conf->class);
469	>	conf->class = NULL;
470		}
1249	–	}
471
472	<	return -1;
472	>	if (--conf->ref_count == 0 && conf->active == 0)
473	>	conf_free(conf);
474	>	}
475		}
476
477		/* attach_conf()
#	Line 1262 | Line 485 | detach_conf(struct Client *client_p, Con
485		*                attachment if there was an old one...
486		*/
487		int
488	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
488	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
489		{
490	<	struct AccessItem *aconf = map_to_conf(conf);
1268	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1269	<
1270	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
490	>	if (dlinkFind(&client_p->connection->confs, conf))
491		return 1;
492
493	<	if (IsConfIllegal(aconf)) /* TBV: can't happen */
494	<	return NOT_AUTHORIZED;
495	<
1276	<	if (conf->type == CLIENT_TYPE)
1277	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1278	<	&client_p->localClient->ip, aclass))
493	>	if (conf->type == CONF_CLIENT)
494	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
495	>	&client_p->connection->ip, conf->class))
496		return TOO_MANY;    /* Already at maximum allowed */
497
498	<	aclass->curr_user_count++;
499	<	aconf->clients++;
498	>	conf->class->ref_count++;
499	>	conf->ref_count++;
500
501	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
501	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
502
503		return 0;
504		}
#	Line 1298 | Line 515 | int
515		attach_connect_block(struct Client *client_p, const char *name,
516		const char *host)
517		{
518	<	dlink_node *ptr;
1302	<	struct ConfItem *conf;
1303	<	struct AccessItem *aconf;
518	>	dlink_node *node = NULL;
519
520	<	assert(client_p != NULL);
1306	<	assert(host != NULL);
520	>	assert(host);
521
522	<	if (client_p == NULL || host == NULL)
1309	<	return 0;
1310	<
1311	<	DLINK_FOREACH(ptr, server_items.head)
522	>	DLINK_FOREACH(node, server_items.head)
523		{
524	<	conf = ptr->data;
1314	<	aconf = map_to_conf(conf);
524	>	struct MaskItem *conf = node->data;
525
526	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
526	>	if (match(conf->name, name) || match(conf->host, host))
527		continue;
528
529		attach_conf(client_p, conf);
530	<	return -1;
530	>	return 1;
531		}
532
533		return 0;
534		}
535
1326	–	/* find_conf_exact()
1327	–	*
1328	–	* inputs       - type of ConfItem
1329	–	*              - pointer to name to find
1330	–	*              - pointer to username to find
1331	–	*              - pointer to host to find
1332	–	* output       - NULL or pointer to conf found
1333	–	* side effects - find a conf entry which matches the hostname
1334	–	*                and has the same name.
1335	–	*/
1336	–	struct ConfItem *
1337	–	find_conf_exact(ConfType type, const char *name, const char *user,
1338	–	const char *host)
1339	–	{
1340	–	dlink_node *ptr;
1341	–	dlink_list *list_p;
1342	–	struct ConfItem *conf = NULL;
1343	–	struct AccessItem *aconf;
1344	–
1345	–	/* Only valid for OPER_TYPE and ...? */
1346	–	list_p = map_to_list(type);
1347	–
1348	–	DLINK_FOREACH(ptr, (*list_p).head)
1349	–	{
1350	–	conf = ptr->data;
1351	–
1352	–	if (conf->name == NULL)
1353	–	continue;
1354	–	aconf = map_to_conf(conf);
1355	–	if (aconf->host == NULL)
1356	–	continue;
1357	–	if (irccmp(conf->name, name) != 0)
1358	–	continue;
1359	–
1360	–	/*
1361	–	** Accept if the *real* hostname (usually sockethost)
1362	–	** socket host) matches *either* host or name field
1363	–	** of the configuration.
1364	–	*/
1365	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1366	–	continue;
1367	–	if (type == OPER_TYPE)
1368	–	{
1369	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1370	–
1371	–	if (aconf->clients >= aclass->max_total)
1372	–	continue;
1373	–	}
1374	–
1375	–	return conf;
1376	–	}
1377	–
1378	–	return NULL;
1379	–	}
1380	–
536		/* find_conf_name()
537		*
538		* inputs       - pointer to conf link list to search
#	Line 1387 | Line 542 | find_conf_exact(ConfType type, const cha
542		* side effects - find a conf entry which matches the name
543		*                and has the given mask.
544		*/
545	<	struct ConfItem *
546	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
545	>	struct MaskItem *
546	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
547		{
548	<	dlink_node *ptr;
1394	<	struct ConfItem* conf;
548	>	dlink_node *node = NULL;
549
550	<	DLINK_FOREACH(ptr, list->head)
550	>	DLINK_FOREACH(node, list->head)
551		{
552	<	conf = ptr->data;
553	<
552	>	struct MaskItem *conf = node->data;
553	>
554		if (conf->type == type)
555		{
556	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
557	<	match(conf->name, name)))
1404	<	return conf;
556	>	if (conf->name && !irccmp(conf->name, name))
557	>	return conf;
558		}
559		}
560
561		return NULL;
562		}
563
1411	–	/* map_to_list()
1412	–	*
1413	–	* inputs       - ConfType conf
1414	–	* output       - pointer to dlink_list to use
1415	–	* side effects - none
1416	–	*/
1417	–	static dlink_list *
1418	–	map_to_list(ConfType type)
1419	–	{
1420	–	switch(type)
1421	–	{
1422	–	case RXLINE_TYPE:
1423	–	return(&rxconf_items);
1424	–	break;
1425	–	case XLINE_TYPE:
1426	–	return(&xconf_items);
1427	–	break;
1428	–	case ULINE_TYPE:
1429	–	return(&uconf_items);
1430	–	break;
1431	–	case NRESV_TYPE:
1432	–	return(&nresv_items);
1433	–	break;
1434	–	case OPER_TYPE:
1435	–	return(&oconf_items);
1436	–	break;
1437	–	case CLASS_TYPE:
1438	–	return(&class_items);
1439	–	break;
1440	–	case SERVER_TYPE:
1441	–	return(&server_items);
1442	–	break;
1443	–	case SERVICE_TYPE:
1444	–	return(&service_items);
1445	–	break;
1446	–	case CLUSTER_TYPE:
1447	–	return(&cluster_items);
1448	–	break;
1449	–	case CONF_TYPE:
1450	–	case GLINE_TYPE:
1451	–	case KLINE_TYPE:
1452	–	case DLINE_TYPE:
1453	–	case CRESV_TYPE:
1454	–	default:
1455	–	return NULL;
1456	–	}
1457	–	}
1458	–
564		/* find_matching_name_conf()
565		*
566		* inputs       - type of link list to look in
567		*              - pointer to name string to find
568		*              - pointer to user
569		*              - pointer to host
570	<	*              - optional action to match on as well
571	<	* output       - NULL or pointer to found struct MatchItem
570	>	*              - optional flags to match on as well
571	>	* output       - NULL or pointer to found struct MaskItem
572		* side effects - looks for a match on name field
573		*/
574	<	struct ConfItem *
575	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
576	<	const char *host, int action)
577	<	{
578	<	dlink_node *ptr=NULL;
579	<	struct ConfItem *conf=NULL;
580	<	struct AccessItem *aconf=NULL;
1476	<	struct MatchItem *match_item=NULL;
1477	<	dlink_list *list_p = map_to_list(type);
574	>	struct MaskItem *
575	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
576	>	const char *host, unsigned int flags)
577	>	{
578	>	dlink_node *node = NULL;
579	>	dlink_list *list = map_to_list(type);
580	>	struct MaskItem *conf = NULL;
581
582		switch (type)
583		{
584	<	#ifdef HAVE_LIBPCRE
585	<	case RXLINE_TYPE:
1483	<	DLINK_FOREACH(ptr, list_p->head)
1484	<	{
1485	<	conf = ptr->data;
1486	<	assert(conf->regexpname);
1487	<
1488	<	if (!ircd_pcre_exec(conf->regexpname, name))
1489	<	return conf;
1490	<	}
1491	<	break;
1492	<	#endif
1493	<	case SERVICE_TYPE:
1494	<	DLINK_FOREACH(ptr, list_p->head)
584	>	case CONF_SERVICE:
585	>	DLINK_FOREACH(node, list->head)
586		{
587	<	conf = ptr->data;
587	>	conf = node->data;
588
589		if (EmptyString(conf->name))
590		continue;
591	<	if ((name != NULL) && !irccmp(name, conf->name))
591	>	if (name && !irccmp(name, conf->name))
592		return conf;
593		}
594		break;
595
596	<	case XLINE_TYPE:
597	<	case ULINE_TYPE:
598	<	case NRESV_TYPE:
599	<	DLINK_FOREACH(ptr, list_p->head)
596	>	case CONF_XLINE:
597	>	case CONF_ULINE:
598	>	case CONF_NRESV:
599	>	case CONF_CRESV:
600	>	DLINK_FOREACH(node, list->head)
601		{
602	<	conf = ptr->data;
602	>	conf = node->data;
603
1512	–	match_item = map_to_conf(conf);
604		if (EmptyString(conf->name))
605	<	continue;
606	<	if ((name != NULL) && match_esc(conf->name, name))
605	>	continue;
606	>	if (name && !match(conf->name, name))
607		{
608	<	if ((user == NULL && (host == NULL)))
609	<	return conf;
610	<	if ((match_item->action & action) != action)
608	>	if ((user == NULL && (host == NULL)))
609	>	return conf;
610	>	if ((conf->flags & flags) != flags)
611		continue;
612	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
613	<	return conf;
614	<	if (match(match_item->user, user) && match(match_item->host, host))
615	<	return conf;
612	>	if (EmptyString(conf->user) || EmptyString(conf->host))
613	>	return conf;
614	>	if (!match(conf->user, user) && !match(conf->host, host))
615	>	return conf;
616		}
617		}
618		break;
619
620	<	case SERVER_TYPE:
621	<	DLINK_FOREACH(ptr, list_p->head)
620	>	case CONF_SERVER:
621	>	DLINK_FOREACH(node, list->head)
622		{
623	<	conf = ptr->data;
1533	<	aconf = map_to_conf(conf);
623	>	conf = node->data;
624
625	<	if ((name != NULL) && match_esc(name, conf->name))
625	>	if (name && !match(name, conf->name))
626		return conf;
627	<	else if ((host != NULL) && match_esc(host, aconf->host))
627	>	if (host && !match(host, conf->host))
628		return conf;
629		}
630		break;
631	<
631	>
632		default:
633		break;
634		}
#	Line 1551 | Line 641 | find_matching_name_conf(ConfType type, c
641		*              - pointer to name string to find
642		*              - pointer to user
643		*              - pointer to host
644	<	* output       - NULL or pointer to found struct MatchItem
644	>	* output       - NULL or pointer to found struct MaskItem
645		* side effects - looks for an exact match on name field
646		*/
647	<	struct ConfItem *
648	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
647	>	struct MaskItem *
648	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
649		const char *user, const char *host)
650		{
651	<	dlink_node *ptr = NULL;
652	<	struct AccessItem *aconf;
653	<	struct ConfItem *conf;
1564	<	struct MatchItem *match_item;
1565	<	dlink_list *list_p;
1566	<
1567	<	list_p = map_to_list(type);
651	>	dlink_node *node = NULL;
652	>	dlink_list *list = map_to_list(type);
653	>	struct MaskItem *conf = NULL;
654
655		switch(type)
656		{
657	<	case RXLINE_TYPE:
658	<	case XLINE_TYPE:
659	<	case ULINE_TYPE:
660	<	case NRESV_TYPE:
657	>	case CONF_XLINE:
658	>	case CONF_ULINE:
659	>	case CONF_NRESV:
660	>	case CONF_CRESV:
661
662	<	DLINK_FOREACH(ptr, list_p->head)
662	>	DLINK_FOREACH(node, list->head)
663		{
664	<	conf = ptr->data;
665	<	match_item = (struct MatchItem *)map_to_conf(conf);
664	>	conf = node->data;
665	>
666		if (EmptyString(conf->name))
667	<	continue;
668	<
667	>	continue;
668	>
669		if (irccmp(conf->name, name) == 0)
670		{
671	<	if ((user == NULL && (host == NULL)))
672	<	return (conf);
673	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
674	<	return (conf);
675	<	if (match(match_item->user, user) && match(match_item->host, host))
676	<	return (conf);
671	>	if ((user == NULL && (host == NULL)))
672	>	return conf;
673	>	if (EmptyString(conf->user) || EmptyString(conf->host))
674	>	return conf;
675	>	if (!match(conf->user, user) && !match(conf->host, host))
676	>	return conf;
677		}
678		}
679		break;
680
681	<	case OPER_TYPE:
682	<	DLINK_FOREACH(ptr, list_p->head)
681	>	case CONF_OPER:
682	>	DLINK_FOREACH(node, list->head)
683		{
684	<	conf = ptr->data;
1599	<	aconf = map_to_conf(conf);
684	>	conf = node->data;
685
686		if (EmptyString(conf->name))
687		continue;
#	Line 1605 | Line 690 | find_exact_name_conf(ConfType type, cons
690		{
691		if (!who)
692		return conf;
693	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
694	<	return conf;
695	<	if (match(aconf->user, who->username))
693	>	if (EmptyString(conf->user) || EmptyString(conf->host))
694	>	return NULL;
695	>	if (!match(conf->user, who->username))
696		{
697	<	switch (aconf->type)
697	>	switch (conf->htype)
698		{
699		case HM_HOST:
700	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
701	<	return conf;
700	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
701	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
702	>	return conf;
703		break;
704		case HM_IPV4:
705	<	if (who->localClient->aftype == AF_INET)
706	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
707	<	return conf;
705	>	if (who->connection->aftype == AF_INET)
706	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
707	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
708	>	return conf;
709		break;
1623	–	#ifdef IPV6
710		case HM_IPV6:
711	<	if (who->localClient->aftype == AF_INET6)
712	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
713	<	return conf;
711	>	if (who->connection->aftype == AF_INET6)
712	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
713	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
714	>	return conf;
715		break;
1629	–	#endif
716		default:
717		assert(0);
718		}
#	Line 1636 | Line 722 | find_exact_name_conf(ConfType type, cons
722
723		break;
724
725	<	case SERVER_TYPE:
726	<	DLINK_FOREACH(ptr, list_p->head)
725	>	case CONF_SERVER:
726	>	DLINK_FOREACH(node, list->head)
727		{
728	<	conf = ptr->data;
729	<	aconf = (struct AccessItem *)map_to_conf(conf);
728	>	conf = node->data;
729	>
730		if (EmptyString(conf->name))
731	<	continue;
732	<
731	>	continue;
732	>
733		if (name == NULL)
734		{
735	<	if (EmptyString(aconf->host))
736	<	continue;
737	<	if (irccmp(aconf->host, host) == 0)
738	<	return(conf);
735	>	if (EmptyString(conf->host))
736	>	continue;
737	>	if (irccmp(conf->host, host) == 0)
738	>	return conf;
739		}
740		else if (irccmp(conf->name, name) == 0)
741	<	{
1656	<	return (conf);
1657	<	}
741	>	return conf;
742		}
1659	–	break;
743
1661	–	case CLASS_TYPE:
1662	–	DLINK_FOREACH(ptr, list_p->head)
1663	–	{
1664	–	conf = ptr->data;
1665	–	if (EmptyString(conf->name))
1666	–	continue;
1667	–
1668	–	if (irccmp(conf->name, name) == 0)
1669	–	return (conf);
1670	–	}
744		break;
745
746		default:
747		break;
748		}
1676	–	return(NULL);
1677	–	}
1678	–
1679	–	/* rehash()
1680	–	*
1681	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1682	–	* as a result of an operator issuing this command, else assume it has been
1683	–	* called as a result of the server receiving a HUP signal.
1684	–	*/
1685	–	int
1686	–	rehash(int sig)
1687	–	{
1688	–	if (sig != 0)
1689	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1690	–	"Got signal SIGHUP, reloading ircd.conf file");
1691	–
1692	–	restart_resolver();
1693	–
1694	–	/* don't close listeners until we know we can go ahead with the rehash */
1695	–
1696	–	/* Check to see if we magically got(or lost) IPv6 support */
1697	–	check_can_use_v6();
1698	–
1699	–	read_conf_files(0);
1700	–
1701	–	if (ServerInfo.description != NULL)
1702	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1703	–
1704	–	load_conf_modules();
749
750	<	flush_deleted_I_P();
1707	<
1708	<	rehashed_klines = 1;
1709	<	/* XXX */
1710	<	if (ConfigLoggingEntry.use_logging)
1711	<	log_close_all();
1712	<
1713	<	return(0);
750	>	return NULL;
751		}
752
753		/* set_default_conf()
#	Line 1728 | Line 765 | set_default_conf(void)
765		/* verify init_class() ran, this should be an unnecessary check
766		* but its not much work.
767		*/
768	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
768	>	assert(class_default == class_get_list()->tail->data);
769
770		#ifdef HAVE_LIBCRYPTO
771	<	ServerInfo.rsa_private_key = NULL;
772	<	ServerInfo.rsa_private_key_file = NULL;
771	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
772	>	{
773	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
774	>
775	>	if (key)
776	>	{
777	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
778	>	EC_KEY_free(key);
779	>	}
780	>	}
781	>
782	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
783		#endif
784
785	<	/* ServerInfo.name is not rehashable */
786	<	/* ServerInfo.name = ServerInfo.name; */
787	<	ServerInfo.description = NULL;
788	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
789	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1743	<
1744	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1745	<	ServerInfo.specific_ipv4_vhost = 0;
1746	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1747	<	ServerInfo.specific_ipv6_vhost = 0;
1748	<
1749	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1750	<
1751	<	ServerInfo.hub = 0;
1752	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1753	<	ServerInfo.dns_host.sin_port = 0;
1754	<	AdminInfo.name = NULL;
1755	<	AdminInfo.email = NULL;
1756	<	AdminInfo.description = NULL;
785	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
786	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
787	>	ConfigServerInfo.rsa_private_key = NULL;
788	>	ConfigServerInfo.rsa_private_key_file = NULL;
789	>	#endif
790
791	<	log_close_all();
791	>	/* ConfigServerInfo.name is not rehashable */
792	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
793	>	ConfigServerInfo.description = NULL;
794	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
795	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
796	>
797	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
798	>	ConfigServerInfo.specific_ipv4_vhost = 0;
799	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
800	>	ConfigServerInfo.specific_ipv6_vhost = 0;
801	>
802	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
803	>	ConfigServerInfo.max_nick_length = 9;
804	>	ConfigServerInfo.max_topic_length = 80;
805	>	ConfigServerInfo.hub = 0;
806	>
807	>	ConfigAdminInfo.name = NULL;
808	>	ConfigAdminInfo.email = NULL;
809	>	ConfigAdminInfo.description = NULL;
810
811	<	ConfigLoggingEntry.use_logging = 1;
811	>	log_del_all();
812	>
813	>	ConfigLog.use_logging = 1;
814
815		ConfigChannel.disable_fake_channels = 0;
816	<	ConfigChannel.restrict_channels = 0;
817	<	ConfigChannel.knock_delay = 300;
816	>	ConfigChannel.invite_client_count = 10;
817	>	ConfigChannel.invite_client_time = 300;
818	>	ConfigChannel.knock_client_count = 1;
819	>	ConfigChannel.knock_client_time = 300;
820		ConfigChannel.knock_delay_channel = 60;
821	<	ConfigChannel.max_chans_per_user = 25;
1767	<	ConfigChannel.max_chans_per_oper = 50;
1768	<	ConfigChannel.quiet_on_ban = 1;
821	>	ConfigChannel.max_channels = 25;
822		ConfigChannel.max_bans = 25;
823	+	ConfigChannel.default_join_flood_count = 18;
824	+	ConfigChannel.default_join_flood_time = 6;
825		ConfigChannel.default_split_user_count = 0;
826		ConfigChannel.default_split_server_count = 0;
827		ConfigChannel.no_join_on_split = 0;
#	Line 1776 | Line 831 | set_default_conf(void)
831		ConfigServerHide.links_delay = 300;
832		ConfigServerHide.hidden = 0;
833		ConfigServerHide.hide_servers = 0;
834	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
834	>	ConfigServerHide.hide_services = 0;
835	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
836		ConfigServerHide.hide_server_ips = 0;
837	+	ConfigServerHide.disable_remote_commands = 0;
838
839	<
840	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
841	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
842	<	ConfigFileEntry.glines = 0;
843	<	ConfigFileEntry.gline_time = 12 * 3600;
844	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
845	<	ConfigFileEntry.gline_min_cidr = 16;
846	<	ConfigFileEntry.gline_min_cidr6 = 48;
847	<	ConfigFileEntry.invisible_on_connect = 1;
848	<	ConfigFileEntry.tkline_expire_notices = 1;
849	<	ConfigFileEntry.hide_spoof_ips = 1;
850	<	ConfigFileEntry.ignore_bogus_ts = 0;
851	<	ConfigFileEntry.disable_auth = 0;
852	<	ConfigFileEntry.disable_remote = 0;
853	<	ConfigFileEntry.kill_chase_time_limit = 90;
854	<	ConfigFileEntry.default_floodcount = 8;
855	<	ConfigFileEntry.failed_oper_notice = 1;
856	<	ConfigFileEntry.dots_in_ident = 0;
857	<	ConfigFileEntry.min_nonwildcard = 4;
858	<	ConfigFileEntry.min_nonwildcard_simple = 3;
859	<	ConfigFileEntry.max_accept = 20;
860	<	ConfigFileEntry.anti_nick_flood = 0;
861	<	ConfigFileEntry.max_nick_time = 20;
862	<	ConfigFileEntry.max_nick_changes = 5;
863	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
864	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
865	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
866	<	ConfigFileEntry.warn_no_nline = 1;
867	<	ConfigFileEntry.stats_o_oper_only = 0;
868	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
869	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
870	<	ConfigFileEntry.stats_P_oper_only = 0;
871	<	ConfigFileEntry.caller_id_wait = 60;
872	<	ConfigFileEntry.opers_bypass_callerid = 0;
873	<	ConfigFileEntry.pace_wait = 10;
874	<	ConfigFileEntry.pace_wait_simple = 1;
875	<	ConfigFileEntry.short_motd = 0;
876	<	ConfigFileEntry.ping_cookie = 0;
877	<	ConfigFileEntry.no_oper_flood = 0;
878	<	ConfigFileEntry.true_no_oper_flood = 0;
879	<	ConfigFileEntry.oper_pass_resv = 1;
880	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
881	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
882	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
883	<	UMODE_OPERWALL | UMODE_WALLOP;
884	<	ConfigFileEntry.use_egd = 0;
885	<	ConfigFileEntry.egdpool_path = NULL;
886	<	ConfigFileEntry.throttle_time = 10;
839	>	ConfigGeneral.away_count = 2;
840	>	ConfigGeneral.away_time = 10;
841	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
842	>	ConfigGeneral.cycle_on_host_change = 1;
843	>	ConfigGeneral.glines = 0;
844	>	ConfigGeneral.gline_time = 12 * 3600;
845	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
846	>	ConfigGeneral.gline_min_cidr = 16;
847	>	ConfigGeneral.gline_min_cidr6 = 48;
848	>	ConfigGeneral.invisible_on_connect = 1;
849	>	ConfigGeneral.tkline_expire_notices = 1;
850	>	ConfigGeneral.ignore_bogus_ts = 0;
851	>	ConfigGeneral.disable_auth = 0;
852	>	ConfigGeneral.kill_chase_time_limit = 90;
853	>	ConfigGeneral.default_floodcount = 8;
854	>	ConfigGeneral.failed_oper_notice = 1;
855	>	ConfigGeneral.dots_in_ident = 0;
856	>	ConfigGeneral.min_nonwildcard = 4;
857	>	ConfigGeneral.min_nonwildcard_simple = 3;
858	>	ConfigGeneral.max_accept = 20;
859	>	ConfigGeneral.anti_nick_flood = 0;
860	>	ConfigGeneral.max_nick_time = 20;
861	>	ConfigGeneral.max_nick_changes = 5;
862	>	ConfigGeneral.anti_spam_exit_message_time = 0;
863	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
864	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
865	>	ConfigGeneral.warn_no_connect_block = 1;
866	>	ConfigGeneral.stats_e_disabled = 0;
867	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
868	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
869	>	ConfigGeneral.stats_o_oper_only = 1;
870	>	ConfigGeneral.stats_m_oper_only = 1;
871	>	ConfigGeneral.stats_P_oper_only = 0;
872	>	ConfigGeneral.stats_u_oper_only = 0;
873	>	ConfigGeneral.caller_id_wait = 60;
874	>	ConfigGeneral.opers_bypass_callerid = 0;
875	>	ConfigGeneral.pace_wait = 10;
876	>	ConfigGeneral.pace_wait_simple = 1;
877	>	ConfigGeneral.short_motd = 0;
878	>	ConfigGeneral.ping_cookie = 0;
879	>	ConfigGeneral.no_oper_flood = 0;
880	>	ConfigGeneral.oper_pass_resv = 1;
881	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
882	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
883	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
884	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
885	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
886	>	ConfigGeneral.throttle_count = 1;
887	>	ConfigGeneral.throttle_time = 1;
888		}
889
890		static void
891		validate_conf(void)
892		{
893	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
894	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1837	<
1838	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1839	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
893	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
894	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895
896	<	if (ServerInfo.network_name == NULL)
897	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
896	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
897	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
898
899	<	if (ServerInfo.network_desc == NULL)
900	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
899	>	if (EmptyString(ConfigServerInfo.network_name))
900	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
901
902	<	if (ConfigFileEntry.service_name == NULL)
903	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
902	>	if (EmptyString(ConfigServerInfo.network_desc))
903	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
904
905	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
905	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
906		}
907
908	<	/* read_conf()
908	>	/* read_conf()
909		*
910		* inputs       - file descriptor pointing to config file to use
911		* output       - None
#	Line 1861 | Line 916 | read_conf(FILE *file)
916		{
917		lineno = 0;
918
919	<	set_default_conf(); /* Set default values prior to conf parsing */
919	>	set_default_conf();  /* Set default values prior to conf parsing */
920		conf_parser_ctx.pass = 1;
921	<	yyparse();          /* pick up the classes first */
921	>	yyparse();  /* Pick up the classes first */
922
923		rewind(file);
924
925		conf_parser_ctx.pass = 2;
926	<	yyparse();          /* Load the values from the conf */
927	<	validate_conf();    /* Check to make sure some values are still okay. */
928	<	/* Some global values are also loaded here. */
929	<	check_class();      /* Make sure classes are valid */
926	>	yyparse();  /* Load the values from the conf */
927	>	validate_conf();  /* Check to make sure some values are still okay. */
928	>	/* Some global values are also loaded here. */
929	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
930	>	}
931	>
932	>	/* conf_rehash()
933	>	*
934	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
935	>	* as a result of an operator issuing this command, else assume it has been
936	>	* called as a result of the server receiving a HUP signal.
937	>	*/
938	>	void
939	>	conf_rehash(int sig)
940	>	{
941	>	if (sig)
942	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
943	>	"Got signal SIGHUP, reloading configuration file(s)");
944	>
945	>	restart_resolver();
946	>
947	>	/* don't close listeners until we know we can go ahead with the rehash */
948	>
949	>	read_conf_files(0);
950	>
951	>	load_conf_modules();
952	>	check_conf_klines();
953		}
954
955		/* lookup_confhost()
#	Line 1879 | Line 957 | read_conf(FILE *file)
957		* start DNS lookups of all hostnames in the conf
958		* line and convert an IP addresses in a.b.c.d number for to IP#s.
959		*/
960	<	static void
961	<	lookup_confhost(struct ConfItem *conf)
960	>	void
961	>	lookup_confhost(struct MaskItem *conf)
962		{
1885	–	struct AccessItem *aconf;
963		struct addrinfo hints, *res;
964
965	<	aconf = map_to_conf(conf);
966	<
1890	<	if (has_wildcards(aconf->host))
1891	<	{
1892	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1893	<	aconf->host, conf->name);
1894	<	return;
1895	<	}
1896	<
1897	<	/* Do name lookup now on hostnames given and store the
965	>	/*
966	>	* Do name lookup now on hostnames given and store the
967		* ip numbers in conf structure.
968		*/
969		memset(&hints, 0, sizeof(hints));
#	Line 1905 | Line 974 | lookup_confhost(struct ConfItem *conf)
974		/* Get us ready for a bind() and don't bother doing dns lookup */
975		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
976
977	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
977	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
978		{
979	<	conf_dns_lookup(aconf);
979	>	conf_dns_lookup(conf);
980		return;
981		}
982
983	<	assert(res != NULL);
983	>	assert(res);
984	>
985	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
986	>	conf->addr.ss_len = res->ai_addrlen;
987	>	conf->addr.ss.ss_family = res->ai_family;
988
1916	–	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1917	–	aconf->addr.ss_len = res->ai_addrlen;
1918	–	aconf->addr.ss.ss_family = res->ai_family;
989		freeaddrinfo(res);
990		}
991
#	Line 1929 | Line 999 | lookup_confhost(struct ConfItem *conf)
999		int
1000		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1001		{
1002	<	struct ip_entry *ip_found;
1003	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1002	>	struct ip_entry *ip_found = NULL;
1003	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
1004
1005		/* DLINE exempt also gets you out of static limits/pacing... */
1006	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1006	>	if (conf && (conf->type == CONF_EXEMPT))
1007		return 0;
1008
1009	<	if (aconf != NULL)
1009	>	if (conf)
1010		return BANNED_CLIENT;
1011
1012	<	ip_found = find_or_add_ip(addr);
1012	>	ip_found = ipcache_find_or_add_address(addr);
1013
1014	<	if ((CurrentTime - ip_found->last_attempt) <
1945	<	ConfigFileEntry.throttle_time)
1014	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1015		{
1016	<	ip_found->last_attempt = CurrentTime;
1017	<	return TOO_FAST;
1016	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1017	>	return TOO_FAST;
1018	>
1019	>	++ip_found->connection_count;
1020		}
1021	+	else
1022	+	ip_found->connection_count = 1;
1023
1024		ip_found->last_attempt = CurrentTime;
1025		return 0;
1026		}
1027
1028	<	static struct AccessItem *
1956	<	find_regexp_kline(const char *uhi[])
1957	<	{
1958	<	#ifdef HAVE_LIBPCRE
1959	<	const dlink_node *ptr = NULL;
1960	<
1961	<	DLINK_FOREACH(ptr, rkconf_items.head)
1962	<	{
1963	<	struct AccessItem *aptr = map_to_conf(ptr->data);
1964	<
1965	<	assert(aptr->regexuser);
1966	<	assert(aptr->regexhost);
1967	<
1968	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1969	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1970	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1971	<	return aptr;
1972	<	}
1973	<	#endif
1974	<	return NULL;
1975	<	}
1976	<
1977	<	/* find_kill()
1028	>	/* expire_tklines()
1029		*
1030	<	* inputs       - pointer to client structure
1031	<	* output       - pointer to struct AccessItem if found
1032	<	* side effects - See if this user is klined already,
1982	<	*                and if so, return struct AccessItem pointer
1030	>	* inputs       - tkline list pointer
1031	>	* output       - NONE
1032	>	* side effects - expire tklines
1033		*/
1034	<	struct AccessItem *
1035	<	find_kill(struct Client *client_p)
1986	<	{
1987	<	struct AccessItem *aconf = NULL;
1988	<	const char *uhi[3];
1989	<
1990	<	uhi[0] = client_p->username;
1991	<	uhi[1] = client_p->host;
1992	<	uhi[2] = client_p->sockhost;
1993	<
1994	<	assert(client_p != NULL);
1995	<
1996	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1997	<	CONF_KLINE, client_p->localClient->aftype,
1998	<	client_p->username, NULL, 1);
1999	<	if (aconf == NULL)
2000	<	aconf = find_regexp_kline(uhi);
2001	<
2002	<	return aconf;
2003	<	}
2004	<
2005	<	struct AccessItem *
2006	<	find_gline(struct Client *client_p)
1034	>	static void
1035	>	expire_tklines(dlink_list *list)
1036		{
1037	<	struct AccessItem *aconf;
1037	>	dlink_node *node = NULL, *node_next = NULL;
1038
1039	<	assert(client_p != NULL);
1039	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1040	>	{
1041	>	struct MaskItem *conf = node->data;
1042
1043	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1044	<	CONF_GLINE, client_p->localClient->aftype,
2014	<	client_p->username, NULL, 1);
2015	<	return aconf;
2016	<	}
1043	>	if (!conf->until || conf->until > CurrentTime)
1044	>	continue;
1045
1046	<	/* add_temp_line()
1047	<	*
1048	<	* inputs        - pointer to struct ConfItem
1049	<	* output        - none
1050	<	* Side effects  - links in given struct ConfItem into
1051	<	*                 temporary *line link list
1052	<	*/
1053	<	void
1054	<	add_temp_line(struct ConfItem *conf)
1055	<	{
1056	<	if (conf->type == XLINE_TYPE)
1057	<	{
1058	<	conf->flags |= CONF_FLAGS_TEMPORARY;
1059	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2032	<	}
2033	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2034	<	{
2035	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2036	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1046	>	if (conf->type == CONF_XLINE)
1047	>	{
1048	>	if (ConfigGeneral.tkline_expire_notices)
1049	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1050	>	"Temporary X-line for [%s] expired", conf->name);
1051	>	conf_free(conf);
1052	>	}
1053	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1054	>	{
1055	>	if (ConfigGeneral.tkline_expire_notices)
1056	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1057	>	"Temporary RESV for [%s] expired", conf->name);
1058	>	conf_free(conf);
1059	>	}
1060		}
1061		}
1062
#	Line 2045 | Line 1068 | add_temp_line(struct ConfItem *conf)
1068		*                This is an event started off in ircd.c
1069		*/
1070		void
1071	<	cleanup_tklines(void *notused)
1071	>	cleanup_tklines(void *unused)
1072		{
1073		hostmask_expire_temporary();
1074	<	expire_tklines(&temporary_xlines);
1075	<	expire_tklines(&temporary_resv);
1076	<	}
2054	<
2055	<	/* expire_tklines()
2056	<	*
2057	<	* inputs       - tkline list pointer
2058	<	* output       - NONE
2059	<	* side effects - expire tklines
2060	<	*/
2061	<	static void
2062	<	expire_tklines(dlink_list *tklist)
2063	<	{
2064	<	dlink_node *ptr;
2065	<	dlink_node *next_ptr;
2066	<	struct ConfItem *conf;
2067	<	struct MatchItem *xconf;
2068	<	struct MatchItem *nconf;
2069	<	struct ResvChannel *cconf;
2070	<
2071	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2072	<	{
2073	<	conf = ptr->data;
2074	<
2075	<	if (conf->type == XLINE_TYPE)
2076	<	{
2077	<	xconf = (struct MatchItem *)map_to_conf(conf);
2078	<	if (xconf->hold <= CurrentTime)
2079	<	{
2080	<	if (ConfigFileEntry.tkline_expire_notices)
2081	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2082	<	"Temporary X-line for [%s] expired", conf->name);
2083	<	dlinkDelete(ptr, tklist);
2084	<	free_dlink_node(ptr);
2085	<	delete_conf_item(conf);
2086	<	}
2087	<	}
2088	<	else if (conf->type == NRESV_TYPE)
2089	<	{
2090	<	nconf = (struct MatchItem *)map_to_conf(conf);
2091	<	if (nconf->hold <= CurrentTime)
2092	<	{
2093	<	if (ConfigFileEntry.tkline_expire_notices)
2094	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2095	<	"Temporary RESV for [%s] expired", conf->name);
2096	<	dlinkDelete(ptr, tklist);
2097	<	free_dlink_node(ptr);
2098	<	delete_conf_item(conf);
2099	<	}
2100	<	}
2101	<	else if (conf->type == CRESV_TYPE)
2102	<	{
2103	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2104	<	if (cconf->hold <= CurrentTime)
2105	<	{
2106	<	if (ConfigFileEntry.tkline_expire_notices)
2107	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2108	<	"Temporary RESV for [%s] expired", cconf->name);
2109	<	delete_channel_resv(cconf);
2110	<	}
2111	<	}
2112	<	}
1074	>	expire_tklines(&xconf_items);
1075	>	expire_tklines(&nresv_items);
1076	>	expire_tklines(&cresv_items);
1077		}
1078
1079		/* oper_privs_as_string()
#	Line 2120 | Line 1084 | expire_tklines(dlink_list *tklist)
1084		*/
1085		static const struct oper_privs
1086		{
1087	<	const unsigned int oprivs;
1087	>	const unsigned int flag;
1088		const unsigned char c;
1089		} flag_list[] = {
1090	<	{ OPER_FLAG_ADMIN,       'A' },
1091	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1092	<	{ OPER_FLAG_DIE,         'D' },
1093	<	{ OPER_FLAG_GLINE,       'G' },
1094	<	{ OPER_FLAG_REHASH,      'H' },
1095	<	{ OPER_FLAG_K,           'K' },
1096	<	{ OPER_FLAG_OPERWALL,    'L' },
1097	<	{ OPER_FLAG_N,           'N' },
1098	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1099	<	{ OPER_FLAG_REMOTE,      'R' },
1100	<	{ OPER_FLAG_OPER_SPY,    'S' },
1101	<	{ OPER_FLAG_UNKLINE,     'U' },
1102	<	{ OPER_FLAG_X,           'X' },
1090	>	{ OPER_FLAG_ADMIN,          'A' },
1091	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1092	>	{ OPER_FLAG_DIE,            'D' },
1093	>	{ OPER_FLAG_GLINE,          'G' },
1094	>	{ OPER_FLAG_REHASH,         'H' },
1095	>	{ OPER_FLAG_KLINE,          'K' },
1096	>	{ OPER_FLAG_KILL,           'N' },
1097	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1098	>	{ OPER_FLAG_CONNECT,        'P' },
1099	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1100	>	{ OPER_FLAG_SQUIT,          'R' },
1101	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1102	>	{ OPER_FLAG_UNKLINE,        'U' },
1103	>	{ OPER_FLAG_XLINE,          'X' },
1104		{ 0, '\0' }
1105		};
1106
1107	<	char *
1107	>	const char *
1108		oper_privs_as_string(const unsigned int port)
1109		{
1110	<	static char privs_out[16];
1110	>	static char privs_out[IRCD_BUFSIZE];
1111		char *privs_ptr = privs_out;
2147	–	unsigned int i = 0;
1112
1113	<	for (; flag_list[i].oprivs; ++i)
1113	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1114		{
1115	<	if (port & flag_list[i].oprivs)
1116	<	*privs_ptr++ = flag_list[i].c;
1115	>	if (port & opriv->flag)
1116	>	*privs_ptr++ = opriv->c;
1117		else
1118	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1118	>	*privs_ptr++ = ToLower(opriv->c);
1119		}
1120
1121		*privs_ptr = '\0';
#	Line 2160 | Line 1124 | oper_privs_as_string(const unsigned int
1124		}
1125
1126		/*
1127	<	* Input: A client to find the active oper{} name for.
1127	>	* Input: A client to find the active operator {} name for.
1128		* Output: The nick!user@host{oper} of the oper.
1129		*         "oper" is server name for remote opers
1130		* Side effects: None.
#	Line 2168 | Line 1132 | oper_privs_as_string(const unsigned int
1132		const char *
1133		get_oper_name(const struct Client *client_p)
1134		{
1135	<	dlink_node *cnode = NULL;
1136	<	/* +5 for !,@,{,} and null */
1137	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1135	>	static char buffer[IRCD_BUFSIZE];
1136	>
1137	>	if (IsServer(client_p))
1138	>	return client_p->name;
1139
1140		if (MyConnect(client_p))
1141		{
1142	<	if ((cnode = client_p->localClient->confs.head))
1142	>	const dlink_node *const node = client_p->connection->confs.head;
1143	>
1144	>	if (node)
1145		{
1146	<	struct ConfItem *conf = cnode->data;
2180	<	const struct AccessItem *aconf = map_to_conf(conf);
1146	>	const struct MaskItem *const conf = node->data;
1147
1148	<	if (IsConfOperator(aconf))
1148	>	if (conf->type == CONF_OPER)
1149		{
1150	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1150	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1151		client_p->username, client_p->host, conf->name);
1152	<	return buffer;
1152	>	return buffer;
1153		}
1154		}
1155
1156	<	/* Probably should assert here for now. If there is an oper out there
1157	<	* with no oper{} conf attached, it would be good for us to know...
1156	>	/*
1157	>	* Probably should assert here for now. If there is an oper out there
1158	>	* with no operator {} conf attached, it would be good for us to know...
1159		*/
1160	<	assert(0); /* Oper without oper conf! */
1160	>	assert(0);  /* Oper without oper conf! */
1161		}
1162
1163		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1164	<	client_p->username, client_p->host, client_p->servptr->name);
1164	>	client_p->username, client_p->host, client_p->servptr->name);
1165		return buffer;
1166		}
1167
2201	–	/* read_conf_files()
2202	–	*
2203	–	* inputs       - cold start YES or NO
2204	–	* output       - none
2205	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2206	–	*/
2207	–	void
2208	–	read_conf_files(int cold)
2209	–	{
2210	–	const char *filename;
2211	–	char chanmodes[32];
2212	–	char chanlimit[32];
2213	–
2214	–	conf_parser_ctx.boot = cold;
2215	–	filename = get_conf_name(CONF_TYPE);
2216	–
2217	–	/* We need to know the initial filename for the yyerror() to report
2218	–	FIXME: The full path is in conffilenamebuf first time since we
2219	–	dont know anything else
2220	–
2221	–	- Gozem 2002-07-21
2222	–	*/
2223	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2224	–
2225	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
2226	–	{
2227	–	if (cold)
2228	–	{
2229	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2230	–	filename, strerror(errno));
2231	–	exit(-1);
2232	–	}
2233	–	else
2234	–	{
2235	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2236	–	"Unable to read configuration file '%s': %s",
2237	–	filename, strerror(errno));
2238	–	return;
2239	–	}
2240	–	}
2241	–
2242	–	if (!cold)
2243	–	clear_out_old_conf();
2244	–
2245	–	read_conf(conf_parser_ctx.conf_file);
2246	–	fclose(conf_parser_ctx.conf_file);
2247	–
2248	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2249	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d",
2250	–	ConfigChannel.max_bans);
2251	–	add_isupport("MAXLIST", chanmodes, -1);
2252	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2253	–
2254	–	add_isupport("CHANTYPES", "#", -1);
2255	–
2256	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
2257	–	ConfigChannel.max_chans_per_user);
2258	–	add_isupport("CHANLIMIT", chanlimit, -1);
2259	–	snprintf(chanmodes, sizeof(chanmodes), "%s",
2260	–	"beI,k,l,imnprstORS");
2261	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2262	–
2263	–	add_isupport("EXCEPTS", "e", -1);
2264	–	add_isupport("INVEX", "I", -1);
2265	–	add_isupport("CHANMODES", chanmodes, -1);
2266	–
2267	–	/*
2268	–	* message_locale may have changed.  rebuild isupport since it relies
2269	–	* on strlen(form_str(RPL_ISUPPORT))
2270	–	*/
2271	–	rebuild_isupport_message_line();
2272	–
2273	–	parse_conf_file(KLINE_TYPE, cold);
2274	–	parse_conf_file(DLINE_TYPE, cold);
2275	–	parse_conf_file(XLINE_TYPE, cold);
2276	–	parse_conf_file(NRESV_TYPE, cold);
2277	–	parse_conf_file(CRESV_TYPE, cold);
2278	–	}
2279	–
2280	–	/* parse_conf_file()
2281	–	*
2282	–	* inputs       - type of conf file to parse
2283	–	* output       - none
2284	–	* side effects - conf file for givenconf type is opened and read then parsed
2285	–	*/
2286	–	static void
2287	–	parse_conf_file(int type, int cold)
2288	–	{
2289	–	FILE *file = NULL;
2290	–	const char *filename = get_conf_name(type);
2291	–
2292	–	if ((file = fopen(filename, "r")) == NULL)
2293	–	{
2294	–	if (cold)
2295	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2296	–	filename, strerror(errno));
2297	–	else
2298	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2299	–	"Unable to read configuration file '%s': %s",
2300	–	filename, strerror(errno));
2301	–	}
2302	–	else
2303	–	{
2304	–	parse_csv_file(file, type);
2305	–	fclose(file);
2306	–	}
2307	–	}
2308	–
1168		/* clear_out_old_conf()
1169		*
1170		* inputs       - none
#	Line 2315 | Line 1174 | parse_conf_file(int type, int cold)
1174		static void
1175		clear_out_old_conf(void)
1176		{
1177	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2319	<	struct ConfItem *conf;
2320	<	struct AccessItem *aconf;
2321	<	struct ClassItem *cltmp;
1177	>	dlink_node *node = NULL, *node_next = NULL;
1178		dlink_list *free_items [] = {
1179		&server_items,   &oconf_items,
1180	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1181	<	&nresv_items, &cluster_items,  &service_items, NULL
1180	>	&uconf_items,   &xconf_items,
1181	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1182		};
1183
1184		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2330 | Line 1186 | clear_out_old_conf(void)
1186		/* We only need to free anything allocated by yyparse() here.
1187		* Resetting structs, etc, is taken care of by set_default_conf().
1188		*/
1189	<
1190	<	for (; *iterator != NULL; iterator++)
1189	>
1190	>	for (; *iterator; iterator++)
1191		{
1192	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1192	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1193		{
1194	<	conf = ptr->data;
2339	<	/* XXX This is less than pretty */
2340	<	if (conf->type == SERVER_TYPE)
2341	<	{
2342	<	aconf = map_to_conf(conf);
1194	>	struct MaskItem *conf = node->data;
1195
1196	<	if (aconf->clients != 0)
1197	<	{
2346	<	SetConfIllegal(aconf);
2347	<	dlinkDelete(&conf->node, &server_items);
2348	<	}
2349	<	else
2350	<	{
2351	<	delete_conf_item(conf);
2352	<	}
2353	<	}
2354	<	else if (conf->type == OPER_TYPE)
2355	<	{
2356	<	aconf = map_to_conf(conf);
1196	>	conf->active = 0;
1197	>	dlinkDelete(&conf->node, *iterator);
1198
1199	<	if (aconf->clients != 0)
1200	<	{
2360	<	SetConfIllegal(aconf);
2361	<	dlinkDelete(&conf->node, &oconf_items);
2362	<	}
2363	<	else
2364	<	{
2365	<	delete_conf_item(conf);
2366	<	}
2367	<	}
2368	<	else if (conf->type == XLINE_TYPE  ||
2369	<	conf->type == RXLINE_TYPE ||
2370	<	conf->type == RKLINE_TYPE)
1199	>	/* XXX This is less than pretty */
1200	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1201		{
1202	<	/* temporary (r)xlines are also on
1203	<	* the (r)xconf items list */
2374	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2375	<	continue;
2376	<
2377	<	delete_conf_item(conf);
1202	>	if (!conf->ref_count)
1203	>	conf_free(conf);
1204		}
1205	<	else
1205	>	else if (conf->type == CONF_XLINE)
1206		{
1207	<	delete_conf_item(conf);
1207	>	if (!conf->until)
1208	>	conf_free(conf);
1209		}
1210	+	else
1211	+	conf_free(conf);
1212		}
1213		}
1214
1215	+	motd_clear();
1216	+
1217		/*
1218	<	* don't delete the class table, rather mark all entries
1219	<	* for deletion. The table is cleaned up by check_class. - avalon
1218	>	* Don't delete the class table, rather mark all entries for deletion.
1219	>	* The table is cleaned up by class_delete_marked. - avalon
1220		*/
1221	<	DLINK_FOREACH(ptr, class_items.head)
2391	<	{
2392	<	cltmp = map_to_conf(ptr->data);
2393	<
2394	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2395	<	cltmp->active = 0;
2396	<	}
1221	>	class_mark_for_deletion();
1222
1223		clear_out_address_conf();
1224
1225	<	/* clean out module paths */
1225	>	/* Clean out module paths */
1226		mod_clear_paths();
1227
1228	<	/* clean out ServerInfo */
1229	<	MyFree(ServerInfo.description);
1230	<	ServerInfo.description = NULL;
1231	<	MyFree(ServerInfo.network_name);
1232	<	ServerInfo.network_name = NULL;
1233	<	MyFree(ServerInfo.network_desc);
1234	<	ServerInfo.network_desc = NULL;
1235	<	MyFree(ConfigFileEntry.egdpool_path);
1236	<	ConfigFileEntry.egdpool_path = NULL;
1228	>	pseudo_clear();
1229	>
1230	>	/* Clean out ConfigServerInfo */
1231	>	MyFree(ConfigServerInfo.description);
1232	>	ConfigServerInfo.description = NULL;
1233	>	MyFree(ConfigServerInfo.network_name);
1234	>	ConfigServerInfo.network_name = NULL;
1235	>	MyFree(ConfigServerInfo.network_desc);
1236	>	ConfigServerInfo.network_desc = NULL;
1237		#ifdef HAVE_LIBCRYPTO
1238	<	if (ServerInfo.rsa_private_key != NULL)
1238	>	if (ConfigServerInfo.rsa_private_key)
1239		{
1240	<	RSA_free(ServerInfo.rsa_private_key);
1241	<	ServerInfo.rsa_private_key = NULL;
1240	>	RSA_free(ConfigServerInfo.rsa_private_key);
1241	>	ConfigServerInfo.rsa_private_key = NULL;
1242		}
1243
1244	<	MyFree(ServerInfo.rsa_private_key_file);
1245	<	ServerInfo.rsa_private_key_file = NULL;
2421	<
2422	<	if (ServerInfo.server_ctx)
2423	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2424	<	SSL_OP_NO_SSLv3|
2425	<	SSL_OP_NO_TLSv1);
2426	<	if (ServerInfo.client_ctx)
2427	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2428	<	SSL_OP_NO_SSLv3|
2429	<	SSL_OP_NO_TLSv1);
1244	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1245	>	ConfigServerInfo.rsa_private_key_file = NULL;
1246		#endif
1247
1248	<	/* clean out old resvs from the conf */
1249	<	clear_conf_resv();
1250	<
1251	<	/* clean out AdminInfo */
1252	<	MyFree(AdminInfo.name);
1253	<	AdminInfo.name = NULL;
1254	<	MyFree(AdminInfo.email);
2439	<	AdminInfo.email = NULL;
2440	<	MyFree(AdminInfo.description);
2441	<	AdminInfo.description = NULL;
1248	>	/* Clean out ConfigAdminInfo */
1249	>	MyFree(ConfigAdminInfo.name);
1250	>	ConfigAdminInfo.name = NULL;
1251	>	MyFree(ConfigAdminInfo.email);
1252	>	ConfigAdminInfo.email = NULL;
1253	>	MyFree(ConfigAdminInfo.description);
1254	>	ConfigAdminInfo.description = NULL;
1255
1256	<	/* operator{} and class{} blocks are freed above */
2444	<	/* clean out listeners */
1256	>	/* Clean out listeners */
1257		close_listeners();
2446	–
2447	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2448	–	* exempt{} and gecos{} blocks are freed above too
2449	–	*/
2450	–
2451	–	/* clean out general */
2452	–	MyFree(ConfigFileEntry.service_name);
2453	–	ConfigFileEntry.service_name = NULL;
2454	–
2455	–	delete_isupport("INVEX");
2456	–	delete_isupport("EXCEPTS");
1258		}
1259
1260	<	/* flush_deleted_I_P()
1260	>	/* read_conf_files()
1261		*
1262	<	* inputs       - none
1262	>	* inputs       - cold start YES or NO
1263		* output       - none
1264	<	* side effects - This function removes I/P conf items
1264	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1265		*/
1266	<	static void
1267	<	flush_deleted_I_P(void)
1266	>	void
1267	>	read_conf_files(int cold)
1268		{
1269	<	dlink_node *ptr;
1270	<	dlink_node *next_ptr;
1271	<	struct ConfItem *conf;
2471	<	struct AccessItem *aconf;
2472	<	dlink_list * free_items [] = {
2473	<	&server_items, &oconf_items, NULL
2474	<	};
2475	<	dlink_list ** iterator = free_items; /* C is dumb */
2476	<
2477	<	/* flush out deleted I and P lines
2478	<	* although still in use.
2479	<	*/
2480	<	for (; *iterator != NULL; iterator++)
2481	<	{
2482	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2483	<	{
2484	<	conf = ptr->data;
2485	<	aconf = (struct AccessItem *)map_to_conf(conf);
2486	<
2487	<	if (IsConfIllegal(aconf))
2488	<	{
2489	<	dlinkDelete(ptr, *iterator);
2490	<
2491	<	if (aconf->clients == 0)
2492	<	delete_conf_item(conf);
2493	<	}
2494	<	}
2495	<	}
2496	<	}
1269	>	const char *filename = NULL;
1270	>	char chanmodes[IRCD_BUFSIZE] = "";
1271	>	char chanlimit[IRCD_BUFSIZE] = "";
1272
1273	<	/* get_conf_name()
1274	<	*
2500	<	* inputs       - type of conf file to return name of file for
2501	<	* output       - pointer to filename for type of conf
2502	<	* side effects - none
2503	<	*/
2504	<	const char *
2505	<	get_conf_name(ConfType type)
2506	<	{
2507	<	switch (type)
2508	<	{
2509	<	case CONF_TYPE:
2510	<	return ConfigFileEntry.configfile;
2511	<	break;
2512	<	case KLINE_TYPE:
2513	<	return ConfigFileEntry.klinefile;
2514	<	break;
2515	<	case DLINE_TYPE:
2516	<	return ConfigFileEntry.dlinefile;
2517	<	break;
2518	<	case XLINE_TYPE:
2519	<	return ConfigFileEntry.xlinefile;
2520	<	break;
2521	<	case CRESV_TYPE:
2522	<	return ConfigFileEntry.cresvfile;
2523	<	break;
2524	<	case NRESV_TYPE:
2525	<	return ConfigFileEntry.nresvfile;
2526	<	break;
2527	<	default:
2528	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2529	<	only with the above values, this will cause us to core
2530	<	at some point if this happens so we know where it was */
2531	<	}
2532	<	}
1273	>	conf_parser_ctx.boot = cold;
1274	>	filename = ConfigGeneral.configfile;
1275
1276	<	#define BAD_PING (-1)
1276	>	/* We need to know the initial filename for the yyerror() to report
1277	>	FIXME: The full path is in conffilenamebuf first time since we
1278	>	don't know anything else
1279
1280	<	/* get_conf_ping()
1281	<	*
1282	<	* inputs       - pointer to struct AccessItem
2539	<	*              - pointer to a variable that receives ping warning time
2540	<	* output       - ping frequency
2541	<	* side effects - NONE
2542	<	*/
2543	<	static int
2544	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2545	<	{
2546	<	struct ClassItem *aclass;
2547	<	struct AccessItem *aconf;
1280	>	- Gozem 2002-07-21
1281	>	*/
1282	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1283
1284	<	if (conf != NULL)
1284	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1285		{
1286	<	aconf = (struct AccessItem *)map_to_conf(conf);
2552	<	if (aconf->class_ptr != NULL)
1286	>	if (cold)
1287		{
1288	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1289	<	*pingwarn = aclass->ping_warning;
1290	<	return aclass->ping_freq;
1288	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1289	>	filename, strerror(errno));
1290	>	exit(-1);
1291		}
1292	<	}
2559	<
2560	<	return BAD_PING;
2561	<	}
2562	<
2563	<	/* get_client_class()
2564	<	*
2565	<	* inputs       - pointer to client struct
2566	<	* output       - pointer to name of class
2567	<	* side effects - NONE
2568	<	*/
2569	<	const char *
2570	<	get_client_class(struct Client *target_p)
2571	<	{
2572	<	dlink_node *cnode = NULL;
2573	<	struct AccessItem *aconf = NULL;
2574	<
2575	<	assert(!IsMe(target_p));
2576	<
2577	<	if ((cnode = target_p->localClient->confs.head))
2578	<	{
2579	<	struct ConfItem *conf = cnode->data;
2580	<
2581	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2582	<	(conf->type == OPER_TYPE));
2583	<
2584	<	aconf = map_to_conf(conf);
2585	<	if (aconf->class_ptr != NULL)
2586	<	return aconf->class_ptr->name;
2587	<	}
2588	<
2589	<	return "default";
2590	<	}
2591	<
2592	<	/* get_client_ping()
2593	<	*
2594	<	* inputs       - pointer to client struct
2595	<	*              - pointer to a variable that receives ping warning time
2596	<	* output       - ping frequency
2597	<	* side effects - NONE
2598	<	*/
2599	<	int
2600	<	get_client_ping(struct Client *target_p, int *pingwarn)
2601	<	{
2602	<	int ping = 0;
2603	<	dlink_node *cnode = NULL;
2604	<
2605	<	if ((cnode = target_p->localClient->confs.head))
2606	<	{
2607	<	struct ConfItem *conf = cnode->data;
2608	<
2609	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2610	<	(conf->type == OPER_TYPE));
2611	<
2612	<	ping = get_conf_ping(conf, pingwarn);
2613	<	if (ping > 0)
2614	<	return ping;
2615	<	}
2616	<
2617	<	*pingwarn = 0;
2618	<	return DEFAULT_PINGFREQUENCY;
2619	<	}
2620	<
2621	<	/* find_class()
2622	<	*
2623	<	* inputs       - string name of class
2624	<	* output       - corresponding Class pointer
2625	<	* side effects - NONE
2626	<	*/
2627	<	struct ConfItem *
2628	<	find_class(const char *classname)
2629	<	{
2630	<	struct ConfItem *conf;
2631	<
2632	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2633	<	return conf;
2634	<
2635	<	return class_default;
2636	<	}
2637	<
2638	<	/* check_class()
2639	<	*
2640	<	* inputs       - NONE
2641	<	* output       - NONE
2642	<	* side effects -
2643	<	*/
2644	<	void
2645	<	check_class(void)
2646	<	{
2647	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2648	<
2649	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2650	<	{
2651	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2652	<
2653	<	if (!aclass->active && !aclass->curr_user_count)
1292	>	else
1293		{
1294	<	destroy_cidr_class(aclass);
1295	<	delete_conf_item(ptr->data);
1294	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1295	>	"Unable to read configuration file '%s': %s",
1296	>	filename, strerror(errno));
1297	>	return;
1298		}
1299		}
2659	–	}
1300
1301	<	/* init_class()
1302	<	*
2663	<	* inputs       - NONE
2664	<	* output       - NONE
2665	<	* side effects -
2666	<	*/
2667	<	void
2668	<	init_class(void)
2669	<	{
2670	<	struct ClassItem *aclass;
2671	<
2672	<	class_default = make_conf_item(CLASS_TYPE);
2673	<
2674	<	aclass = map_to_conf(class_default);
2675	<	aclass->active = 1;
2676	<	DupString(class_default->name, "default");
2677	<	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2678	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2679	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2680	<	aclass->max_sendq = DEFAULT_SENDQ;
2681	<	aclass->max_recvq = DEFAULT_RECVQ;
2682	<
2683	<	client_check_cb = register_callback("check_client", check_client);
2684	<	}
2685	<
2686	<	/* get_sendq()
2687	<	*
2688	<	* inputs       - pointer to client
2689	<	* output       - sendq for this client as found from its class
2690	<	* side effects - NONE
2691	<	*/
2692	<	unsigned int
2693	<	get_sendq(struct Client *client_p)
2694	<	{
2695	<	unsigned int sendq = DEFAULT_SENDQ;
2696	<	dlink_node *cnode;
2697	<	struct ConfItem *class_conf;
2698	<	struct ClassItem *aclass;
2699	<	struct AccessItem *aconf;
2700	<
2701	<	assert(!IsMe(client_p));
2702	<
2703	<	if ((cnode = client_p->localClient->confs.head))
2704	<	{
2705	<	struct ConfItem *conf = cnode->data;
2706	<
2707	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2708	<	(conf->type == OPER_TYPE));
2709	<
2710	<	aconf = map_to_conf(conf);
2711	<
2712	<	if ((class_conf = aconf->class_ptr) == NULL)
2713	<	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
2714	<
2715	<	aclass = map_to_conf(class_conf);
2716	<	sendq = aclass->max_sendq;
2717	<	return sendq;
2718	<	}
2719	<
2720	<	/* XXX return a default?
2721	<	* if here, then there wasn't an attached conf with a sendq
2722	<	* that is very bad -Dianora
2723	<	*/
2724	<	return DEFAULT_SENDQ;
2725	<	}
2726	<
2727	<	unsigned int
2728	<	get_recvq(struct Client *client_p)
2729	<	{
2730	<	unsigned int recvq = DEFAULT_RECVQ;
2731	<	dlink_node *cnode;
2732	<	struct ConfItem *class_conf;
2733	<	struct ClassItem *aclass;
2734	<	struct AccessItem *aconf;
2735	<
2736	<	assert(!IsMe(client_p));
1301	>	if (!cold)
1302	>	clear_out_old_conf();
1303
1304	<	if ((cnode = client_p->localClient->confs.head))
1305	<	{
2740	<	struct ConfItem *conf = cnode->data;
1304	>	read_conf(conf_parser_ctx.conf_file);
1305	>	fclose(conf_parser_ctx.conf_file);
1306
1307	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2743	<	(conf->type == OPER_TYPE));
1307	>	log_reopen_all();
1308
1309	<	aconf = map_to_conf(conf);
1309	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1310	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1311
1312	<	if ((class_conf = aconf->class_ptr) == NULL)
1313	<	return DEFAULT_RECVQ; /* TBV: shouldn't be possible at all */
1312	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1313	>	add_isupport("MAXLIST", chanmodes, -1);
1314	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1315	>	add_isupport("CHANTYPES", "#", -1);
1316
1317	<	aclass = map_to_conf(class_conf);
1318	<	recvq = aclass->max_recvq;
1319	<	return recvq;
1320	<	}
1317	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1318	>	ConfigChannel.max_channels);
1319	>	add_isupport("CHANLIMIT", chanlimit, -1);
1320	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1321	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1322	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1323	>	add_isupport("CHANMODES", chanmodes, -1);
1324
1325	<	/* XXX return a default?
1326	<	* if here, then there wasn't an attached conf with a recvq
1327	<	* that is very bad -Dianora
1325	>	/*
1326	>	* message_locale may have changed.  rebuild isupport since it relies
1327	>	* on strlen(form_str(RPL_ISUPPORT))
1328		*/
1329	<	return DEFAULT_RECVQ;
1329	>	rebuild_isupport_message_line();
1330		}
1331
1332		/* conf_add_class_to_conf()
1333		*
1334		* inputs       - pointer to config item
1335		* output       - NONE
1336	<	* side effects - Add a class pointer to a conf
1336	>	* side effects - Add a class pointer to a conf
1337		*/
1338		void
1339	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1339	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1340		{
1341	<	struct AccessItem *aconf = map_to_conf(conf);
2772	<	struct ClassItem *class = NULL;
2773	<
2774	<	if (class_name == NULL)
1341	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1342		{
1343	<	aconf->class_ptr = class_default;
1343	>	conf->class = class_default;
1344
1345	<	if (conf->type == CLIENT_TYPE)
1345	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1346		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1347	<	"Warning *** Defaulting to default class for %s@%s",
1348	<	aconf->user, aconf->host);
1347	>	"Warning *** Defaulting to default class for %s@%s",
1348	>	conf->user, conf->host);
1349		else
1350		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1351	<	"Warning *** Defaulting to default class for %s",
1352	<	conf->name);
2786	<	}
2787	<	else
2788	<	aconf->class_ptr = find_class(class_name);
2789	<
2790	<	if (aconf->class_ptr)
2791	<	class = map_to_conf(aconf->class_ptr);
2792	<
2793	<	if (aconf->class_ptr == NULL || !class->active)
2794	<	{
2795	<	if (conf->type == CLIENT_TYPE)
2796	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2797	<	"Warning *** Defaulting to default class for %s@%s",
2798	<	aconf->user, aconf->host);
2799	<	else
2800	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2801	<	"Warning *** Defaulting to default class for %s",
2802	<	conf->name);
2803	<	aconf->class_ptr = class_default;
1351	>	"Warning *** Defaulting to default class for %s",
1352	>	conf->name);
1353		}
1354		}
1355
2807	–	/* conf_add_server()
2808	–	*
2809	–	* inputs       - pointer to config item
2810	–	*              - pointer to link count already on this conf
2811	–	* output       - NONE
2812	–	* side effects - Add a connect block
2813	–	*/
2814	–	int
2815	–	conf_add_server(struct ConfItem *conf, const char *class_name)
2816	–	{
2817	–	struct AccessItem *aconf = map_to_conf(conf);
2818	–
2819	–	conf_add_class_to_conf(conf, class_name);
2820	–
2821	–	if (!aconf->host || !conf->name)
2822	–	{
2823	–	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
2824	–	"Bad connect block");
2825	–	ilog(LOG_TYPE_IRCD, "Bad connect block");
2826	–	return -1;
2827	–	}
2828	–
2829	–	if (EmptyString(aconf->passwd))
2830	–	{
2831	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2832	–	"Bad connect block, name %s",
2833	–	conf->name);
2834	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2835	–	return -1;
2836	–	}
2837	–
2838	–	lookup_confhost(conf);
2839	–
2840	–	return 0;
2841	–	}
2842	–
1356		/* yyerror()
1357		*
1358		* inputs       - message from parser
#	Line 2855 | Line 1368 | yyerror(const char *msg)
1368		return;
1369
1370		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1371	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1371	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1372	>	"\"%s\", line %u: %s: %s",
1373	>	conffilebuf, lineno + 1, msg, newlinebuf);
1374	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1375	>	conffilebuf, lineno + 1, msg, newlinebuf);
1376	>	}
1377	>
1378	>	void
1379	>	conf_error_report(const char *msg)
1380	>	{
1381	>	char newlinebuf[IRCD_BUFSIZE];
1382	>
1383	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1384	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1385		"\"%s\", line %u: %s: %s",
1386		conffilebuf, lineno + 1, msg, newlinebuf);
1387		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 2864 | Line 1390 | yyerror(const char *msg)
1390
1391		/*
1392		* valid_tkline()
1393	<	*
1393	>	*
1394		* inputs       - pointer to ascii string to check
1395		*              - whether the specified time is in seconds or minutes
1396		* output       - -1 not enough parameters
#	Line 2873 | Line 1399 | yyerror(const char *msg)
1399		* Originally written by Dianora (Diane, db@db.net)
1400		*/
1401		time_t
1402	<	valid_tkline(const char *p, int minutes)
1402	>	valid_tkline(const char *data, const int minutes)
1403		{
1404	+	const unsigned char *p = (const unsigned char *)data;
1405	+	unsigned char tmpch = '\0';
1406		time_t result = 0;
1407
1408	<	for (; *p; ++p)
1408	>	while ((tmpch = *p++))
1409		{
1410	<	if (!IsDigit(*p))
1410	>	if (!IsDigit(tmpch))
1411		return 0;
1412
1413		result *= 10;
1414	<	result += ((*p) & 0xF);
1414	>	result += (tmpch & 0xF);
1415		}
1416
1417		/*
1418	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1419	<	* i.e. they specifically use 0, I am going to return 1 instead
1420	<	* as a return value of non-zero is used to flag it as a temporary kline
1418	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1419	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1420	>	* value of non-zero is used to flag it as a temporary kline
1421		*/
1422		if (result == 0)
1423		result = 1;
1424
1425	<	/*
1425	>	/*
1426		* If the incoming time is in seconds convert it to minutes for the purpose
1427		* of this calculation
1428		*/
1429		if (!minutes)
1430	<	result = result / (time_t)60;
1430	>	result = result / 60;
1431
1432		if (result > MAX_TDKLINE_TIME)
1433		result = MAX_TDKLINE_TIME;
1434
1435	<	result = result * (time_t)60;  /* turn it into seconds */
1435	>	result = result * 60;  /* Turn it into seconds */
1436
1437		return result;
1438		}
1439
1440	+	/* valid_wild_card_simple()
1441	+	*
1442	+	* inputs       - data to check for sufficient non-wildcard characters
1443	+	* outputs      - 1 if valid, else 0
1444	+	* side effects - none
1445	+	*/
1446	+	int
1447	+	valid_wild_card_simple(const char *data)
1448	+	{
1449	+	const unsigned char *p = (const unsigned char *)data;
1450	+	unsigned char tmpch = '\0';
1451	+	unsigned int nonwild = 0;
1452	+
1453	+	while ((tmpch = *p++))
1454	+	{
1455	+	if (tmpch == '\\' && *p)
1456	+	{
1457	+	++p;
1458	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1459	+	return 1;
1460	+	}
1461	+	else if (!IsMWildChar(tmpch))
1462	+	{
1463	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1464	+	return 1;
1465	+	}
1466	+	}
1467	+
1468	+	return 0;
1469	+	}
1470	+
1471		/* valid_wild_card()
1472		*
1473		* input        - pointer to client
#	Line 2918 | Line 1477 | valid_tkline(const char *p, int minutes)
1477		* side effects - NOTICE is given to source_p if warn is 1
1478		*/
1479		int
1480	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1480	>	valid_wild_card(struct Client *source_p, int count, ...)
1481		{
1482	<	char *p;
1483	<	char tmpch;
2925	<	int nonwild = 0;
1482	>	unsigned char tmpch = '\0';
1483	>	unsigned int nonwild = 0;
1484		va_list args;
1485
1486		/*
#	Line 2941 | Line 1499 | valid_wild_card(struct Client *source_p,
1499
1500		while (count--)
1501		{
1502	<	p = va_arg(args, char *);
1502	>	const unsigned char *p = va_arg(args, const unsigned char *);
1503		if (p == NULL)
1504		continue;
1505
#	Line 2953 | Line 1511 | valid_wild_card(struct Client *source_p,
1511		* If we find enough non-wild characters, we can
1512		* break - no point in searching further.
1513		*/
1514	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1514	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1515	>	{
1516	>	va_end(args);
1517		return 1;
1518	+	}
1519		}
1520		}
1521		}
1522
1523	<	if (warn)
1524	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1525	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1523	>	if (IsClient(source_p))
1524	>	sendto_one_notice(source_p, &me,
1525	>	":Please include at least %u non-wildcard characters with the mask",
1526	>	ConfigGeneral.min_nonwildcard);
1527	>	va_end(args);
1528	>	return 0;
1529	>	}
1530	>
1531	>	/* find_user_host()
1532	>	*
1533	>	* inputs       - pointer to client placing kline
1534	>	*              - pointer to user_host_or_nick
1535	>	*              - pointer to user buffer
1536	>	*              - pointer to host buffer
1537	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1538	>	* side effects -
1539	>	*/
1540	>	static int
1541	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1542	>	char *luser, char *lhost)
1543	>	{
1544	>	struct Client *target_p = NULL;
1545	>	char *hostp = NULL;
1546	>
1547	>	if (lhost == NULL)
1548	>	{
1549	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1550	>	return 1;
1551	>	}
1552	>
1553	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1554	>	{
1555	>	/* Explicit user@host mask given */
1556	>	if (hostp)                            /* I'm a little user@host */
1557	>	{
1558	>	*(hostp++) = '\0';                       /* short and squat */
1559	>
1560	>	if (*user_host_or_nick)
1561	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1562	>	else
1563	>	strcpy(luser, "*");
1564	>
1565	>	if (*hostp)
1566	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1567	>	else
1568	>	strcpy(lhost, "*");
1569	>	}
1570	>	else
1571	>	{
1572	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1573	>	luser[1] = '\0';
1574	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1575	>	}
1576	>
1577	>	return 1;
1578	>	}
1579	>	else
1580	>	{
1581	>	/* Try to find user@host mask from nick */
1582	>	/* Okay to use source_p as the first param, because source_p == client_p */
1583	>	if ((target_p =
1584	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1585	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1586	>
1587	>	if (IsExemptKline(target_p))
1588	>	{
1589	>	if (IsClient(source_p))
1590	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1591	>	return 0;
1592	>	}
1593	>
1594	>	/*
1595	>	* Turn the "user" bit into "*user", blow away '~'
1596	>	* if found in original user name (non-idented)
1597	>	*/
1598	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1599	>
1600	>	if (target_p->username[0] == '~')
1601	>	luser[0] = '*';
1602	>
1603	>	if (!strcmp(target_p->sockhost, "0"))
1604	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1605	>	else
1606	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1607	>	return 1;
1608	>	}
1609	>
1610		return 0;
1611		}
1612
#	Line 2975 | Line 1620 | valid_wild_card(struct Client *source_p,
1620		*              - parse_flags bit map of things to test
1621		*              - pointer to user or string to parse into
1622		*              - pointer to host or NULL to parse into if non NULL
1623	<	*              - pointer to optional tkline time or NULL
1623	>	*              - pointer to optional tkline time or NULL
1624		*              - pointer to target_server to parse into if non NULL
1625		*              - pointer to reason to parse into
1626		*
1627	<	* output       - 1 if valid, -1 if not valid
1627	>	* output       - 1 if valid, 0 if not valid
1628		* side effects - A generalised k/d/x etc. line parser,
1629		*               "ALINE [time] user@host|string [ON] target :reason"
1630		*                will parse returning a parsed user, host if
#	Line 2997 | Line 1642 | valid_wild_card(struct Client *source_p,
1642		*/
1643		int
1644		parse_aline(const char *cmd, struct Client *source_p,
1645	<	int parc, char **parv,
1646	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1647	<	char **target_server, char **reason)
1645	>	int parc, char **parv,
1646	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1647	>	char **target_server, char **reason)
1648		{
1649		int found_tkline_time=0;
1650	<	static char def_reason[] = "No Reason";
1650	>	static char def_reason[] = CONF_NOREASON;
1651		static char user[USERLEN*4+1];
1652		static char host[HOSTLEN*4+1];
1653
#	Line 3011 | Line 1656 | parse_aline(const char *cmd, struct Clie
1656
1657		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1658
1659	<	if (found_tkline_time != 0)
1659	>	if (found_tkline_time)
1660		{
1661		parv++;
1662		parc--;
1663
1664	<	if (tkline_time != NULL)
1664	>	if (tkline_time)
1665		*tkline_time = found_tkline_time;
1666		else
1667		{
1668	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1669	<	me.name, source_p->name, cmd);
3025	<	return -1;
1668	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1669	>	return 0;
1670		}
1671		}
1672
1673		if (parc == 0)
1674		{
1675	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1676	<	me.name, source_p->name, cmd);
3033	<	return -1;
1675	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1676	>	return 0;
1677		}
1678
1679		if (h_p == NULL)
1680		*up_p = *parv;
1681		else
1682		{
1683	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1684	<	return -1;
1683	>	if (find_user_host(source_p, *parv, user, host) == 0)
1684	>	return 0;
1685
1686		*up_p = user;
1687		*h_p = host;
1688		}
1689	<
1689	>
1690		parc--;
1691		parv++;
1692
1693	<	if (parc != 0)
1693	>	if (parc)
1694		{
1695		if (irccmp(*parv, "ON") == 0)
1696		{
#	Line 3056 | Line 1699 | parse_aline(const char *cmd, struct Clie
1699
1700		if (target_server == NULL)
1701		{
1702	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1703	<	me.name, source_p->name, cmd);
3061	<	return -1;
1702	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1703	>	return 0;
1704		}
1705
1706		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1707		{
1708	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1709	<	me.name, source_p->name, "remoteban");
3068	<	return -1;
1708	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1709	>	return 0;
1710		}
1711
1712		if (parc == 0 || EmptyString(*parv))
1713		{
1714	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1715	<	me.name, source_p->name, cmd);
3075	<	return -1;
1714	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1715	>	return 0;
1716		}
1717
1718		*target_server = *parv;
#	Line 3084 | Line 1724 | parse_aline(const char *cmd, struct Clie
1724		/* Make sure target_server *is* NULL if no ON server found
1725		* caller probably NULL'd it first, but no harm to do it again -db
1726		*/
1727	<	if (target_server != NULL)
1728	<	*target_server = NULL;
1727	>	if (target_server)
1728	>	*target_server = NULL;
1729		}
1730		}
1731
1732	<	if (h_p != NULL)
1732	>	if (h_p)
1733		{
1734	<	if (strchr(user, '!') != NULL)
1734	>	if (strchr(user, '!'))
1735		{
1736	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1737	<	me.name, source_p->name);
3098	<	return -1;
1736	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1737	>	return 0;
1738		}
1739
1740	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1741	<	return -1;
1740	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1741	>	return 0;
1742		}
1743		else
1744	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1745	<	return -1;
1744	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1745	>	return 0;
1746
1747	<	if (reason != NULL)
1747	>	if (reason)
1748		{
1749	<	if (parc != 0 && !EmptyString(*parv))
1749	>	if (parc && !EmptyString(*parv))
1750		{
1751		*reason = *parv;
1752	+
1753		if (!valid_comment(source_p, *reason, 1))
1754	<	return -1;
1754	>	return 0;
1755		}
1756		else
1757		*reason = def_reason;
#	Line 3120 | Line 1760 | parse_aline(const char *cmd, struct Clie
1760		return 1;
1761		}
1762
3123	–	/* find_user_host()
3124	–	*
3125	–	* inputs       - pointer to client placing kline
3126	–	*              - pointer to user_host_or_nick
3127	–	*              - pointer to user buffer
3128	–	*              - pointer to host buffer
3129	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3130	–	* side effects -
3131	–	*/
3132	–	static int
3133	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3134	–	char *luser, char *lhost, unsigned int flags)
3135	–	{
3136	–	struct Client *target_p = NULL;
3137	–	char *hostp = NULL;
3138	–
3139	–	if (lhost == NULL)
3140	–	{
3141	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3142	–	return 1;
3143	–	}
3144	–
3145	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3146	–	{
3147	–	/* Explicit user@host mask given */
3148	–
3149	–	if (hostp != NULL)                            /* I'm a little user@host */
3150	–	{
3151	–	*(hostp++) = '\0';                       /* short and squat */
3152	–	if (*user_host_or_nick)
3153	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3154	–	else
3155	–	strcpy(luser, "*");
3156	–	if (*hostp)
3157	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3158	–	else
3159	–	strcpy(lhost, "*");
3160	–	}
3161	–	else
3162	–	{
3163	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3164	–	luser[1] = '\0';
3165	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3166	–	}
3167	–
3168	–	return 1;
3169	–	}
3170	–	else
3171	–	{
3172	–	/* Try to find user@host mask from nick */
3173	–	/* Okay to use source_p as the first param, because source_p == client_p */
3174	–	if ((target_p =
3175	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3176	–	return 0;
3177	–
3178	–	if (IsExemptKline(target_p))
3179	–	{
3180	–	if (!IsServer(source_p))
3181	–	sendto_one(source_p,
3182	–	":%s NOTICE %s :%s is E-lined",
3183	–	me.name, source_p->name, target_p->name);
3184	–	return 0;
3185	–	}
3186	–
3187	–	/*
3188	–	* turn the "user" bit into "*user", blow away '~'
3189	–	* if found in original user name (non-idented)
3190	–	*/
3191	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3192	–
3193	–	if (target_p->username[0] == '~')
3194	–	luser[0] = '*';
3195	–
3196	–	if (target_p->sockhost[0] == '\0' ||
3197	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3198	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3199	–	else
3200	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3201	–	return 1;
3202	–	}
3203	–
3204	–	return 0;
3205	–	}
3206	–
1763		/* valid_comment()
1764		*
1765		* inputs       - pointer to client
#	Line 3215 | Line 1771 | find_user_host(struct Client *source_p,
1771		int
1772		valid_comment(struct Client *source_p, char *comment, int warn)
1773		{
3218	–	if (strchr(comment, '"'))
3219	–	{
3220	–	if (warn)
3221	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3222	–	me.name, source_p->name);
3223	–	return 0;
3224	–	}
3225	–
1774		if (strlen(comment) > REASONLEN)
1775		comment[REASONLEN-1] = '\0';
1776
#	Line 3237 | Line 1785 | valid_comment(struct Client *source_p, c
1785		* side effects - none
1786		*/
1787		int
1788	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1788	>	match_conf_password(const char *password, const struct MaskItem *conf)
1789		{
1790		const char *encr = NULL;
1791
1792	<	if (EmptyString(password) || EmptyString(aconf->passwd))
1792	>	if (EmptyString(password) || EmptyString(conf->passwd))
1793		return 0;
1794
1795	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1796	<	encr = crypt(password, aconf->passwd);
1795	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1796	>	encr = crypt(password, conf->passwd);
1797		else
1798		encr = password;
1799
1800	<	return !strcmp(encr, aconf->passwd);
1800	>	return encr && !strcmp(encr, conf->passwd);
1801		}
1802
1803		/*
#	Line 3257 | Line 1805 | match_conf_password(const char *password
1805		*
1806		* inputs       - client sending the cluster
1807		*              - command name "KLINE" "XLINE" etc.
1808	<	*              - capab -- CAP_KLN etc. from s_serv.h
1808	>	*              - capab -- CAP_KLN etc. from server.h
1809		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1810		*              - pattern and args to send along
1811		* output       - none
#	Line 3265 | Line 1813 | match_conf_password(const char *password
1813		*                along to all servers that match capab and cluster type
1814		*/
1815		void
1816	<	cluster_a_line(struct Client *source_p, const char *command,
1817	<	int capab, int cluster_type, const char *pattern, ...)
1816	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1817	>	unsigned int cluster_type, const char *pattern, ...)
1818		{
1819		va_list args;
1820	<	char buffer[IRCD_BUFSIZE];
1821	<	const dlink_node *ptr = NULL;
1820	>	char buffer[IRCD_BUFSIZE] = "";
1821	>	const dlink_node *node = NULL;
1822
1823		va_start(args, pattern);
1824		vsnprintf(buffer, sizeof(buffer), pattern, args);
1825		va_end(args);
1826
1827	<	DLINK_FOREACH(ptr, cluster_items.head)
1827	>	DLINK_FOREACH(node, cluster_items.head)
1828		{
1829	<	const struct ConfItem *conf = ptr->data;
1829	>	const struct MaskItem *conf = node->data;
1830
1831		if (conf->flags & cluster_type)
1832	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1833	<	"%s %s %s", command, conf->name, buffer);
1832	>	sendto_match_servs(source_p, conf->name, CAP_CLUSTER | capab,
1833	>	"%s %s %s", command, conf->name, buffer);
1834		}
1835		}
1836
#	Line 3321 | Line 1869 | split_nuh(struct split_nuh_item *const i
1869
1870		if (iptr->nickptr)
1871		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1872	+
1873		if (iptr->userptr)
1874		strlcpy(iptr->userptr, "*", iptr->usersize);
1875	+
1876		if (iptr->hostptr)
1877		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1878
#	Line 3330 | Line 1880 | split_nuh(struct split_nuh_item *const i
1880		{
1881		*p = '\0';
1882
1883	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1883	>	if (iptr->nickptr && *iptr->nuhmask)
1884		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1885
1886	<	if ((q = strchr(++p, '@'))) {
1886	>	if ((q = strchr(++p, '@')))
1887	>	{
1888		*q++ = '\0';
1889
1890	<	if (*p != '\0')
1890	>	if (*p)
1891		strlcpy(iptr->userptr, p, iptr->usersize);
1892
1893	<	if (*q != '\0')
1893	>	if (*q)
1894		strlcpy(iptr->hostptr, q, iptr->hostsize);
1895		}
1896		else
1897		{
1898	<	if (*p != '\0')
1898	>	if (*p)
1899		strlcpy(iptr->userptr, p, iptr->usersize);
1900		}
1901		}
#	Line 3356 | Line 1907 | split_nuh(struct split_nuh_item *const i
1907		/* if found a @ */
1908		*p++ = '\0';
1909
1910	<	if (*iptr->nuhmask != '\0')
1910	>	if (*iptr->nuhmask)
1911		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1912
1913	<	if (*p != '\0')
1913	>	if (*p)
1914		strlcpy(iptr->hostptr, p, iptr->hostsize);
1915		}
1916		else
1917		{
1918	<	/* no @ found */
1918	>	/* No @ found */
1919		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1920		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1921		else
#	Line 3372 | Line 1923 | split_nuh(struct split_nuh_item *const i
1923		}
1924		}
1925		}
3375	–
3376	–	/*
3377	–	* flags_to_ascii
3378	–	*
3379	–	* inputs       - flags is a bitmask
3380	–	*              - pointer to table of ascii letters corresponding
3381	–	*                to each bit
3382	–	*              - flag 1 for convert ToLower if bit missing
3383	–	*                0 if ignore.
3384	–	* output       - none
3385	–	* side effects - string pointed to by p has bitmap chars written to it
3386	–	*/
3387	–	static void
3388	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3389	–	int lowerit)
3390	–	{
3391	–	unsigned int mask = 1;
3392	–	int i = 0;
3393	–
3394	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3395	–	{
3396	–	if (flags & mask)
3397	–	*p++ = bit_table[i];
3398	–	else if (lowerit)
3399	–	*p++ = ToLower(bit_table[i]);
3400	–	}
3401	–	*p = '\0';
3402	–	}
3403	–
3404	–	/*
3405	–	* cidr_limit_reached
3406	–	*
3407	–	* inputs       - int flag allowing over_rule of limits
3408	–	*              - pointer to the ip to be added
3409	–	*              - pointer to the class
3410	–	* output       - non zero if limit reached
3411	–	*                0 if limit not reached
3412	–	* side effects -
3413	–	*/
3414	–	static int
3415	–	cidr_limit_reached(int over_rule,
3416	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3417	–	{
3418	–	dlink_node *ptr = NULL;
3419	–	struct CidrItem *cidr;
3420	–
3421	–	if (aclass->number_per_cidr <= 0)
3422	–	return 0;
3423	–
3424	–	if (ip->ss.ss_family == AF_INET)
3425	–	{
3426	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3427	–	return 0;
3428	–
3429	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3430	–	{
3431	–	cidr = ptr->data;
3432	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3433	–	{
3434	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3435	–	return -1;
3436	–	cidr->number_on_this_cidr++;
3437	–	return 0;
3438	–	}
3439	–	}
3440	–	cidr = MyMalloc(sizeof(struct CidrItem));
3441	–	cidr->number_on_this_cidr = 1;
3442	–	cidr->mask = *ip;
3443	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3444	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3445	–	}
3446	–	#ifdef IPV6
3447	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3448	–	{
3449	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3450	–	{
3451	–	cidr = ptr->data;
3452	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3453	–	{
3454	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3455	–	return -1;
3456	–	cidr->number_on_this_cidr++;
3457	–	return 0;
3458	–	}
3459	–	}
3460	–	cidr = MyMalloc(sizeof(struct CidrItem));
3461	–	cidr->number_on_this_cidr = 1;
3462	–	cidr->mask = *ip;
3463	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3464	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3465	–	}
3466	–	#endif
3467	–	return 0;
3468	–	}
3469	–
3470	–	/*
3471	–	* remove_from_cidr_check
3472	–	*
3473	–	* inputs       - pointer to the ip to be removed
3474	–	*              - pointer to the class
3475	–	* output       - NONE
3476	–	* side effects -
3477	–	*/
3478	–	static void
3479	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3480	–	{
3481	–	dlink_node *ptr = NULL;
3482	–	dlink_node *next_ptr = NULL;
3483	–	struct CidrItem *cidr;
3484	–
3485	–	if (aclass->number_per_cidr == 0)
3486	–	return;
3487	–
3488	–	if (ip->ss.ss_family == AF_INET)
3489	–	{
3490	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3491	–	return;
3492	–
3493	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3494	–	{
3495	–	cidr = ptr->data;
3496	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3497	–	{
3498	–	cidr->number_on_this_cidr--;
3499	–	if (cidr->number_on_this_cidr == 0)
3500	–	{
3501	–	dlinkDelete(ptr, &aclass->list_ipv4);
3502	–	MyFree(cidr);
3503	–	return;
3504	–	}
3505	–	}
3506	–	}
3507	–	}
3508	–	#ifdef IPV6
3509	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3510	–	{
3511	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3512	–	{
3513	–	cidr = ptr->data;
3514	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3515	–	{
3516	–	cidr->number_on_this_cidr--;
3517	–	if (cidr->number_on_this_cidr == 0)
3518	–	{
3519	–	dlinkDelete(ptr, &aclass->list_ipv6);
3520	–	MyFree(cidr);
3521	–	return;
3522	–	}
3523	–	}
3524	–	}
3525	–	}
3526	–	#endif
3527	–	}
3528	–
3529	–	static void
3530	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3531	–	dlink_list *old_list, dlink_list *new_list, int changed)
3532	–	{
3533	–	dlink_node *ptr;
3534	–	struct Client *client_p;
3535	–	struct ConfItem *conf;
3536	–	struct AccessItem *aconf;
3537	–
3538	–	if (!changed)
3539	–	{
3540	–	*new_list = *old_list;
3541	–	old_list->head = old_list->tail = NULL;
3542	–	old_list->length = 0;
3543	–	return;
3544	–	}
3545	–
3546	–	DLINK_FOREACH(ptr, local_client_list.head)
3547	–	{
3548	–	client_p = ptr->data;
3549	–	if (client_p->localClient->aftype != aftype)
3550	–	continue;
3551	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3552	–	continue;
3553	–
3554	–	conf = client_p->localClient->confs.tail->data;
3555	–	if (conf->type == CLIENT_TYPE)
3556	–	{
3557	–	aconf = map_to_conf(conf);
3558	–	if (aconf->class_ptr == oldcl)
3559	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3560	–	}
3561	–	}
3562	–	}
3563	–
3564	–	/*
3565	–	* rebuild_cidr_class
3566	–	*
3567	–	* inputs       - pointer to old conf
3568	–	*              - pointer to new_class
3569	–	* output       - none
3570	–	* side effects - rebuilds the class link list of cidr blocks
3571	–	*/
3572	–	void
3573	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3574	–	{
3575	–	struct ClassItem *old_class = map_to_conf(conf);
3576	–
3577	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3578	–	{
3579	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3580	–	rebuild_cidr_list(AF_INET, conf, new_class,
3581	–	&old_class->list_ipv4, &new_class->list_ipv4,
3582	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3583	–
3584	–	#ifdef IPV6
3585	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3586	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3587	–	&old_class->list_ipv6, &new_class->list_ipv6,
3588	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3589	–	#endif
3590	–	}
3591	–
3592	–	destroy_cidr_class(old_class);
3593	–	}
3594	–
3595	–	/*
3596	–	* destroy_cidr_list
3597	–	*
3598	–	* inputs       - pointer to class dlink list of cidr blocks
3599	–	* output       - none
3600	–	* side effects - completely destroys the class link list of cidr blocks
3601	–	*/
3602	–	static void
3603	–	destroy_cidr_list(dlink_list *list)
3604	–	{
3605	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3606	–
3607	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3608	–	{
3609	–	dlinkDelete(ptr, list);
3610	–	MyFree(ptr->data);
3611	–	}
3612	–	}
3613	–
3614	–	/*
3615	–	* destroy_cidr_class
3616	–	*
3617	–	* inputs       - pointer to class
3618	–	* output       - none
3619	–	* side effects - completely destroys the class link list of cidr blocks
3620	–	*/
3621	–	static void
3622	–	destroy_cidr_class(struct ClassItem *aclass)
3623	–	{
3624	–	destroy_cidr_list(&aclass->list_ipv4);
3625	–	destroy_cidr_list(&aclass->list_ipv6);
3626	–	}

Diff Legend

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