ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/conf.c (file contents), Revision 2174 by michael, Mon Jun 3 19:45:38 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (file contents), Revision 7725 by michael, Mon Sep 26 14:59:44 2016 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-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
32	<	#include "resv.h"
31	>	#include "conf_cluster.h"
32	>	#include "conf_gecos.h"
33	>	#include "conf_pseudo.h"
34	>	#include "conf_resv.h"
35	>	#include "conf_service.h"
36	>	#include "conf_shared.h"
37	>	#include "server.h"
38		#include "channel.h"
39		#include "client.h"
40		#include "event.h"
34	–	#include "hook.h"
41		#include "irc_string.h"
42		#include "s_bsd.h"
43		#include "ircd.h"
#	Line 42 | Line 48
48		#include "fdlist.h"
49		#include "log.h"
50		#include "send.h"
45	–	#include "s_gline.h"
51		#include "memory.h"
52	<	#include "mempool.h"
48	<	#include "irc_res.h"
52	>	#include "res.h"
53		#include "userhost.h"
54	<	#include "s_user.h"
54	>	#include "user.h"
55		#include "channel_mode.h"
56		#include "parse.h"
57	<	#include "s_misc.h"
57	>	#include "misc.h"
58		#include "conf_db.h"
59		#include "conf_class.h"
60		#include "motd.h"
61	+	#include "ipcache.h"
62	+	#include "isupport.h"
63	+	#include "whowas.h"
64
65	<	struct config_server_hide ConfigServerHide;
65	>
66	>	struct config_channel_entry ConfigChannel;
67	>	struct config_serverhide_entry ConfigServerHide;
68	>	struct config_general_entry ConfigGeneral;
69	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
70	>	struct config_serverinfo_entry ConfigServerInfo;
71	>	struct config_admin_entry ConfigAdminInfo;
72	>	struct conf_parser_context conf_parser_ctx;
73
74		/* general conf items link list root, other than k lines etc. */
75	<	dlink_list service_items = { NULL, NULL, 0 };
76	<	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 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list cresv_items = { NULL, NULL, 0 };
75	>	dlink_list connect_items;
76	>	dlink_list operator_items;
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
81		extern int yyparse(); /* defined in y.tab.c */
82
75	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
76	–
77	–	/* internally defined functions */
78	–	static void read_conf(FILE *);
79	–	static void clear_out_old_conf(void);
80	–	static void expire_tklines(dlink_list *);
81	–	static void garbage_collect_ip_entries(void);
82	–	static int hash_ip(struct irc_ssaddr *);
83	–	static int verify_access(struct Client *);
84	–	static int attach_iline(struct Client *, struct MaskItem *);
85	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
86	–	static dlink_list *map_to_list(enum maskitem_type);
87	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
88	–
89	–
90	–	/* usually, with hash tables, you use a prime number...
91	–	* but in this case I am dealing with ip addresses,
92	–	* not ascii strings.
93	–	*/
94	–	#define IP_HASH_SIZE 0x1000
95	–
96	–	struct ip_entry
97	–	{
98	–	struct irc_ssaddr ip;
99	–	unsigned int count;
100	–	time_t last_attempt;
101	–	struct ip_entry *next;
102	–	};
103	–
104	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
105	–	static mp_pool_t *ip_entry_pool = NULL;
106	–	static int ip_entries_count = 0;
107	–
83
84		/* conf_dns_callback()
85		*
#	Line 117 | Line 92 | static int ip_entries_count = 0;
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 MaskItem *conf = vptr;
97	>	struct MaskItem *const conf = vptr;
98
99		conf->dns_pending = 0;
100
101	<	if (addr != NULL)
101	>	if (addr)
102		memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104		conf->dns_failed = 1;
#	Line 138 | Line 113 | conf_dns_callback(void *vptr, const stru
113		static void
114		conf_dns_lookup(struct MaskItem *conf)
115		{
116	<	if (!conf->dns_pending)
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	>	/* map_to_list()
128	>	*
129	>	* inputs       - ConfType conf
130	>	* output       - pointer to dlink_list to use
131	>	* side effects - none
132	>	*/
133	>	static dlink_list *
134	>	map_to_list(enum maskitem_type type)
135	>	{
136	>	switch (type)
137		{
138	<	conf->dns_pending = 1;
139	<	gethost_byname(conf_dns_callback, conf, conf->host);
138	>	case CONF_OPER:
139	>	return &operator_items;
140	>	break;
141	>	case CONF_SERVER:
142	>	return &connect_items;
143	>	break;
144	>	default:
145	>	return NULL;
146		}
147		}
148
149		struct MaskItem *
150		conf_make(enum maskitem_type type)
151		{
152	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
152	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
153		dlink_list *list = NULL;
154
155		conf->type   = type;
#	Line 163 | Line 164 | conf_make(enum maskitem_type type)
164		void
165		conf_free(struct MaskItem *conf)
166		{
167	<	dlink_node *ptr = NULL, *ptr_next = NULL;
167	>	dlink_node *node = NULL, *node_next = NULL;
168		dlink_list *list = NULL;
169
170	<	if (conf->node.next)
171	<	if ((list = map_to_list(conf->type)))
171	<	dlinkDelete(&conf->node, list);
170	>	if ((list = map_to_list(conf->type)))
171	>	dlinkFindDelete(list, conf);
172
173	<	MyFree(conf->name);
173	>	xfree(conf->name);
174
175		if (conf->dns_pending)
176		delete_resolver_queries(conf);
177	<	if (conf->passwd != NULL)
177	>	if (conf->passwd)
178		memset(conf->passwd, 0, strlen(conf->passwd));
179	<	if (conf->spasswd != NULL)
179	>	if (conf->spasswd)
180		memset(conf->spasswd, 0, strlen(conf->spasswd));
181
182		conf->class = NULL;
183
184	<	MyFree(conf->passwd);
185	<	MyFree(conf->spasswd);
186	<	MyFree(conf->reason);
187	<	MyFree(conf->user);
188	<	MyFree(conf->host);
189	<	#ifdef HAVE_LIBCRYPTO
190	<	MyFree(conf->cipher_list);
184	>	xfree(conf->passwd);
185	>	xfree(conf->spasswd);
186	>	xfree(conf->reason);
187	>	xfree(conf->certfp);
188	>	xfree(conf->whois);
189	>	xfree(conf->user);
190	>	xfree(conf->host);
191	>	xfree(conf->cipher_list);
192
193	<	if (conf->rsa_public_key)
193	<	RSA_free(conf->rsa_public_key);
194	<	#endif
195	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
193	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
194		{
195	<	MyFree(ptr->data);
196	<	free_dlink_node(ptr);
195	>	xfree(node->data);
196	>	dlinkDelete(node, &conf->hub_list);
197	>	free_dlink_node(node);
198		}
199
200	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
200	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
201		{
202	<	MyFree(ptr->data);
203	<	free_dlink_node(ptr);
202	>	xfree(node->data);
203	>	dlinkDelete(node, &conf->leaf_list);
204	>	free_dlink_node(node);
205		}
206
207	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
208	<	{
209	<	struct exempt *exptr = ptr->data;
210	<
211	<	MyFree(exptr->name);
212	<	MyFree(exptr->user);
213	<	MyFree(exptr->host);
214	<	MyFree(exptr);
215	<	}
216	<
217	<	MyFree(conf);
218	<	}
219	<
220	<	/* check_client()
221	<	*
222	<	* inputs       - pointer to client
223	<	* output       - 0 = Success
224	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
225	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
226	<	*                I_LINE_FULL       (-3) = I-line is full
227	<	*                TOO_MANY          (-4) = Too many connections from hostname
228	<	*                BANNED_CLIENT     (-5) = K-lined
229	<	* side effects - Ordinary client access check.
230	<	*                Look for conf lines which have the same
231	<	*                status as the flags passed.
232	<	*/
233	<	int
234	<	check_client(struct Client *source_p)
235	<	{
236	<	int i;
237	<
238	<	if ((i = verify_access(source_p)))
239	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
240	<	source_p->name, source_p->sockhost);
241	<
242	<	switch (i)
243	<	{
244	<	case TOO_MANY:
245	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
246	<	"Too many on IP for %s (%s).",
247	<	get_client_name(source_p, SHOW_IP),
248	<	source_p->sockhost);
249	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
250	<	get_client_name(source_p, SHOW_IP));
251	<	++ServerStats.is_ref;
252	<	exit_client(source_p, &me, "No more connections allowed on that IP");
253	<	break;
254	<
255	<	case I_LINE_FULL:
256	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
257	<	"auth{} block is full for %s (%s).",
258	<	get_client_name(source_p, SHOW_IP),
259	<	source_p->sockhost);
260	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
261	<	get_client_name(source_p, SHOW_IP));
262	<	++ServerStats.is_ref;
263	<	exit_client(source_p, &me,
264	<	"No more connections allowed in your connection class");
265	<	break;
266	<
267	<	case NOT_AUTHORIZED:
268	<	++ServerStats.is_ref;
269	<	/* jdc - lists server name & port connections are on */
270	<	/*       a purely cosmetical change */
271	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
272	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
273	<	get_client_name(source_p, SHOW_IP),
274	<	source_p->sockhost,
275	<	source_p->localClient->listener->name,
276	<	source_p->localClient->listener->port);
277	<	ilog(LOG_TYPE_IRCD,
278	<	"Unauthorized client connection from %s on [%s/%u].",
279	<	get_client_name(source_p, SHOW_IP),
280	<	source_p->localClient->listener->name,
281	<	source_p->localClient->listener->port);
282	<
283	<	exit_client(source_p, &me, "You are not authorized to use this server");
284	<	break;
285	<
286	<	case BANNED_CLIENT:
287	<	exit_client(source_p, &me, "Banned");
288	<	++ServerStats.is_ref;
289	<	break;
290	<
291	<	case 0:
292	<	default:
293	<	break;
294	<	}
295	<
296	<	return (i < 0 ? 0 : 1);
297	<	}
298	<
299	<	/* verify_access()
300	<	*
301	<	* inputs       - pointer to client to verify
302	<	* output       - 0 if success -'ve if not
303	<	* side effect  - find the first (best) I line to attach.
304	<	*/
305	<	static int
306	<	verify_access(struct Client *client_p)
307	<	{
308	<	struct MaskItem *conf = NULL;
309	<	char non_ident[USERLEN + 1] = { '~', '\0' };
310	<
311	<	if (IsGotId(client_p))
312	<	{
313	<	conf = find_address_conf(client_p->host, client_p->username,
314	<	&client_p->localClient->ip,
315	<	client_p->localClient->aftype,
316	<	client_p->localClient->passwd);
317	<	}
318	<	else
319	<	{
320	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
321	<	conf = find_address_conf(client_p->host,non_ident,
322	<	&client_p->localClient->ip,
323	<	client_p->localClient->aftype,
324	<	client_p->localClient->passwd);
325	<	}
326	<
327	<	if (conf != NULL)
328	<	{
329	<	if (IsConfClient(conf))
330	<	{
331	<	if (IsConfRedir(conf))
332	<	{
333	<	sendto_one(client_p, form_str(RPL_REDIR),
334	<	me.name, client_p->name,
335	<	conf->name ? conf->name : "",
336	<	conf->port);
337	<	return(NOT_AUTHORIZED);
338	<	}
339	<
340	<	if (IsConfDoIdentd(conf))
341	<	SetNeedId(client_p);
342	<
343	<	/* Thanks for spoof idea amm */
344	<	if (IsConfDoSpoofIp(conf))
345	<	{
346	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
347	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
348	<	"%s spoofing: %s as %s",
349	<	client_p->name, client_p->host, conf->name);
350	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
351	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
352	<	}
353	<
354	<	return(attach_iline(client_p, conf));
355	<	}
356	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
357	<	{
358	<	if (IsConfGline(conf))
359	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
360	<	client_p->name);
361	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
362	<	me.name, client_p->name, conf->reason);
363	<	return(BANNED_CLIENT);
364	<	}
365	<	}
366	<
367	<	return(NOT_AUTHORIZED);
207	>	xfree(conf);
208		}
209
210		/* attach_iline()
211		*
212	<	* inputs       - client pointer
213	<	*              - conf pointer
214	<	* output       -
215	<	* side effects - do actual attach
212	>	* inputs       - client pointer
213	>	*              - conf pointer
214	>	* output       -
215	>	* side effects - do actual attach
216		*/
217		static int
218		attach_iline(struct Client *client_p, struct MaskItem *conf)
219		{
220	<	struct ClassItem *class = NULL;
220	>	const struct ClassItem *const class = conf->class;
221		struct ip_entry *ip_found;
222		int a_limit_reached = 0;
223	<	unsigned int local = 0, global = 0, ident = 0;
223	>	unsigned int local = 0, global = 0;
224
225	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
225	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
226		ip_found->count++;
227	<	SetIpHash(client_p);
388	<
389	<	if (conf->class == NULL)
390	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
227	>	AddFlag(client_p, FLAGS_IPHASH);
228
229	<	class = conf->class;
393	<
394	<	count_user_host(client_p->username, client_p->host,
395	<	&global, &local, &ident);
229	>	userhost_count(client_p->sockhost, &global, &local);
230
231		/* XXX blah. go down checking the various silly limits
232		* setting a_limit_reached if any limit is reached.
233		* - Dianora
234		*/
235	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
402	<	a_limit_reached = 1;
403	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
235	>	if (class->max_total && class->ref_count >= class->max_total)
236		a_limit_reached = 1;
237	<	else if (class->max_local != 0 && local >= class->max_local)
237	>	else if (class->max_perip && ip_found->count > class->max_perip)
238		a_limit_reached = 1;
239	<	else if (class->max_global != 0 && global >= class->max_global)
239	>	else if (class->max_local && local >= class->max_local) /* XXX: redundant */
240		a_limit_reached = 1;
241	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
410	<	client_p->username[0] != '~')
241	>	else if (class->max_global && global >= class->max_global)
242		a_limit_reached = 1;
243
244		if (a_limit_reached)
#	Line 415 | Line 246 | attach_iline(struct Client *client_p, st
246		if (!IsConfExemptLimits(conf))
247		return TOO_MANY;   /* Already at maximum allowed */
248
249	<	sendto_one(client_p,
250	<	":%s NOTICE %s :*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;", me.name, client_p->name);
249	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
250	>	"but you have exceed_limit = yes;");
251		}
252
253		return attach_conf(client_p, conf);
254		}
255
256	<	/* init_ip_hash_table()
427	<	*
428	<	* inputs               - NONE
429	<	* output               - NONE
430	<	* side effects         - allocate memory for ip_entry(s)
431	<	*                      - clear the ip hash table
432	<	*/
433	<	void
434	<	init_ip_hash_table(void)
435	<	{
436	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
437	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
438	<	}
439	<
440	<	/* find_or_add_ip()
441	<	*
442	<	* inputs       - pointer to struct irc_ssaddr
443	<	* output       - pointer to a struct ip_entry
444	<	* side effects -
256	>	/* verify_access()
257		*
258	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
259	<	* count set to 0.
258	>	* inputs       - pointer to client to verify
259	>	* output       - 0 if success -'ve if not
260	>	* side effect  - find the first (best) I line to attach.
261		*/
262	<	static struct ip_entry *
263	<	find_or_add_ip(struct irc_ssaddr *ip_in)
262	>	static int
263	>	verify_access(struct Client *client_p)
264		{
265	<	struct ip_entry *ptr, *newptr;
453	<	int hash_index = hash_ip(ip_in), res;
454	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
455	<	#ifdef IPV6
456	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
457	<	#endif
265	>	struct MaskItem *conf = NULL;
266
267	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
267	>	if (HasFlag(client_p, FLAGS_GOTID))
268		{
269	<	#ifdef IPV6
270	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
271	<	continue;
272	<	if (ip_in->ss.ss_family == AF_INET6)
465	<	{
466	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
467	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
468	<	}
469	<	else
470	<	#endif
471	<	{
472	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
473	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
474	<	}
475	<	if (res == 0)
476	<	{
477	<	/* Found entry already in hash, return it. */
478	<	return ptr;
479	<	}
269	>	conf = find_address_conf(client_p->host, client_p->username,
270	>	&client_p->connection->ip,
271	>	client_p->connection->aftype,
272	>	client_p->connection->password);
273		}
274	+	else
275	+	{
276	+	char non_ident[USERLEN + 1] = "~";
277
278	<	if (ip_entries_count >= 2 * hard_fdlimit)
279	<	garbage_collect_ip_entries();
280	<
281	<	newptr = mp_pool_get(ip_entry_pool);
282	<	memset(newptr, 0, sizeof(*newptr));
283	<	ip_entries_count++;
488	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
489	<
490	<	newptr->next = ip_hash_table[hash_index];
491	<	ip_hash_table[hash_index] = newptr;
278	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
279	>	conf = find_address_conf(client_p->host, non_ident,
280	>	&client_p->connection->ip,
281	>	client_p->connection->aftype,
282	>	client_p->connection->password);
283	>	}
284
285	<	return newptr;
286	<	}
285	>	if (!conf)
286	>	return NOT_AUTHORIZED;
287
288	<	/* remove_one_ip()
497	<	*
498	<	* inputs        - unsigned long IP address value
499	<	* output        - NONE
500	<	* side effects  - The ip address given, is looked up in ip hash table
501	<	*                 and number of ip#'s for that ip decremented.
502	<	*                 If ip # count reaches 0 and has expired,
503	<	*                 the struct ip_entry is returned to the ip_entry_heap
504	<	*/
505	<	void
506	<	remove_one_ip(struct irc_ssaddr *ip_in)
507	<	{
508	<	struct ip_entry *ptr;
509	<	struct ip_entry *last_ptr = NULL;
510	<	int hash_index = hash_ip(ip_in), res;
511	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
512	<	#ifdef IPV6
513	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
514	<	#endif
288	>	assert(IsConfClient(conf) || IsConfKill(conf));
289
290	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
290	>	if (IsConfClient(conf))
291		{
292	<	#ifdef IPV6
519	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
520	<	continue;
521	<	if (ip_in->ss.ss_family == AF_INET6)
522	<	{
523	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
524	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
525	<	}
526	<	else
527	<	#endif
292	>	if (IsConfRedir(conf))
293		{
294	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
295	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
294	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
295	>	conf->name ? conf->name : "",
296	>	conf->port);
297	>	return NOT_AUTHORIZED;
298		}
299	<	if (res)
300	<	continue;
534	<	if (ptr->count > 0)
535	<	ptr->count--;
536	<	if (ptr->count == 0 &&
537	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
299	>
300	>	if (IsConfDoSpoofIp(conf))
301		{
302	<	if (last_ptr != NULL)
303	<	last_ptr->next = ptr->next;
304	<	else
542	<	ip_hash_table[hash_index] = ptr->next;
302	>	if (IsConfSpoofNotice(conf))
303	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
304	>	client_p->name, client_p->host, conf->name);
305
306	<	mp_pool_release(ptr);
545	<	ip_entries_count--;
546	<	return;
306	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
307		}
548	–	last_ptr = ptr;
549	–	}
550	–	}
308
309	<	/* hash_ip()
553	<	*
554	<	* input        - pointer to an irc_inaddr
555	<	* output       - integer value used as index into hash table
556	<	* side effects - hopefully, none
557	<	*/
558	<	static int
559	<	hash_ip(struct irc_ssaddr *addr)
560	<	{
561	<	if (addr->ss.ss_family == AF_INET)
562	<	{
563	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
564	<	int hash;
565	<	uint32_t ip;
566	<
567	<	ip   = ntohl(v4->sin_addr.s_addr);
568	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
569	<	return hash;
309	>	return attach_iline(client_p, conf);
310		}
311	<	#ifdef IPV6
312	<	else
313	<	{
574	<	int hash;
575	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
576	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
577	<
578	<	hash  = ip[0] ^ ip[3];
579	<	hash ^= hash >> 16;
580	<	hash ^= hash >> 8;
581	<	hash  = hash & (IP_HASH_SIZE - 1);
582	<	return hash;
583	<	}
584	<	#else
585	<	return 0;
586	<	#endif
311	>
312	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
313	>	return BANNED_CLIENT;
314		}
315
316	<	/* count_ip_hash()
590	<	*
591	<	* inputs        - pointer to counter of number of ips hashed
592	<	*               - pointer to memory used for ip hash
593	<	* output        - returned via pointers input
594	<	* side effects  - NONE
316	>	/* check_client()
317		*
318	<	* number of hashed ip #'s is counted up, plus the amount of memory
319	<	* used in the hash.
318	>	* inputs       - pointer to client
319	>	* output       - 0 = Success
320	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
321	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
322	>	*                I_LINE_FULL       (-3) = I-line is full
323	>	*                TOO_MANY          (-4) = Too many connections from hostname
324	>	*                BANNED_CLIENT     (-5) = K-lined
325	>	* side effects - Ordinary client access check.
326	>	*                Look for conf lines which have the same
327	>	*                status as the flags passed.
328		*/
329	<	void
330	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
329	>	int
330	>	check_client(struct Client *source_p)
331		{
602	–	struct ip_entry *ptr;
332		int i;
333
334	<	*number_ips_stored = 0;
335	<	*mem_ips_stored    = 0;
334	>	if ((i = verify_access(source_p)))
335	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
336	>	source_p->name, source_p->sockhost);
337
338	<	for (i = 0; i < IP_HASH_SIZE; i++)
338	>	switch (i)
339		{
340	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
341	<	{
342	<	*number_ips_stored += 1;
343	<	*mem_ips_stored += sizeof(struct ip_entry);
344	<	}
345	<	}
346	<	}
340	>	case TOO_MANY:
341	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
342	>	"Too many on IP for %s (%s).",
343	>	get_client_name(source_p, SHOW_IP),
344	>	source_p->sockhost);
345	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
346	>	get_client_name(source_p, SHOW_IP));
347	>	++ServerStats.is_ref;
348	>	exit_client(source_p, "No more connections allowed on that IP");
349	>	break;
350
351	<	/* garbage_collect_ip_entries()
352	<	*
353	<	* input        - NONE
354	<	* output       - NONE
355	<	* side effects - free up all ip entries with no connections
356	<	*/
357	<	static void
358	<	garbage_collect_ip_entries(void)
359	<	{
360	<	struct ip_entry *ptr;
628	<	struct ip_entry *last_ptr;
629	<	struct ip_entry *next_ptr;
630	<	int i;
351	>	case I_LINE_FULL:
352	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
353	>	"auth {} block is full for %s (%s).",
354	>	get_client_name(source_p, SHOW_IP),
355	>	source_p->sockhost);
356	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
357	>	get_client_name(source_p, SHOW_IP));
358	>	++ServerStats.is_ref;
359	>	exit_client(source_p, "No more connections allowed in your connection class");
360	>	break;
361
362	<	for (i = 0; i < IP_HASH_SIZE; i++)
363	<	{
364	<	last_ptr = NULL;
362	>	case NOT_AUTHORIZED:
363	>	/* jdc - lists server name & port connections are on */
364	>	/*       a purely cosmetical change */
365	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
366	>	"Unauthorized client connection from %s on [%s/%u].",
367	>	get_client_name(source_p, SHOW_IP),
368	>	source_p->connection->listener->name,
369	>	source_p->connection->listener->port);
370	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
371	>	get_client_name(source_p, SHOW_IP),
372	>	source_p->connection->listener->name,
373	>	source_p->connection->listener->port);
374
375	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
376	<	{
377	<	next_ptr = ptr->next;
375	>	++ServerStats.is_ref;
376	>	exit_client(source_p, "You are not authorized to use this server");
377	>	break;
378
379	<	if (ptr->count == 0 &&
380	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
381	<	{
382	<	if (last_ptr != NULL)
383	<	last_ptr->next = ptr->next;
384	<	else
385	<	ip_hash_table[i] = ptr->next;
386	<	mp_pool_release(ptr);
648	<	ip_entries_count--;
649	<	}
650	<	else
651	<	last_ptr = ptr;
652	<	}
379	>	case BANNED_CLIENT:
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "Banned");
382	>	break;
383	>
384	>	case 0:
385	>	default:
386	>	break;
387		}
388	+
389	+	return !(i < 0);
390		}
391
392		/* detach_conf()
#	Line 664 | Line 400 | garbage_collect_ip_entries(void)
400		void
401		detach_conf(struct Client *client_p, enum maskitem_type type)
402		{
403	<	dlink_node *ptr = NULL, *next_ptr = NULL;
403	>	dlink_node *node = NULL, *node_next = NULL;
404
405	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
405	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
406		{
407	<	struct MaskItem *conf = ptr->data;
407	>	struct MaskItem *conf = node->data;
408
409		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
410		assert(conf->ref_count > 0);
#	Line 677 | Line 413 | detach_conf(struct Client *client_p, enu
413		if (!(conf->type & type))
414		continue;
415
416	<	dlinkDelete(ptr, &client_p->localClient->confs);
417	<	free_dlink_node(ptr);
416	>	dlinkDelete(node, &client_p->connection->confs);
417	>	free_dlink_node(node);
418
419		if (conf->type == CONF_CLIENT)
420	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
420	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
421
422		if (--conf->class->ref_count == 0 && conf->class->active == 0)
423		{
#	Line 707 | Line 443 | detach_conf(struct Client *client_p, enu
443		int
444		attach_conf(struct Client *client_p, struct MaskItem *conf)
445		{
446	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
446	>	if (dlinkFind(&client_p->connection->confs, conf))
447		return 1;
448
449		if (conf->type == CONF_CLIENT)
450		if (cidr_limit_reached(IsConfExemptLimits(conf),
451	<	&client_p->localClient->ip, conf->class))
451	>	&client_p->connection->ip, conf->class))
452		return TOO_MANY;    /* Already at maximum allowed */
453
454		conf->class->ref_count++;
455		conf->ref_count++;
456
457	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
457	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
458
459		return 0;
460		}
#	Line 735 | Line 471 | int
471		attach_connect_block(struct Client *client_p, const char *name,
472		const char *host)
473		{
474	<	dlink_node *ptr;
739	<	struct MaskItem *conf = NULL;
740	<
741	<	assert(client_p != NULL);
742	<	assert(host != NULL);
474	>	dlink_node *node = NULL;
475
476	<	if (client_p == NULL || host == NULL)
745	<	return 0;
476	>	assert(host);
477
478	<	DLINK_FOREACH(ptr, server_items.head)
478	>	DLINK_FOREACH(node, connect_items.head)
479		{
480	<	conf = ptr->data;
480	>	struct MaskItem *conf = node->data;
481
482	<	if (match(conf->name, name) || match(conf->host, host))
482	>	if (irccmp(conf->name, name) ||
483	>	irccmp(conf->host, host))
484		continue;
485
486		attach_conf(client_p, conf);
487	<	return -1;
487	>	return 1;
488		}
489
490		return 0;
#	Line 770 | Line 502 | attach_connect_block(struct Client *clie
502		struct MaskItem *
503		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
504		{
505	<	dlink_node *ptr;
774	<	struct MaskItem* conf;
505	>	dlink_node *node = NULL;
506
507	<	DLINK_FOREACH(ptr, list->head)
507	>	DLINK_FOREACH(node, list->head)
508		{
509	<	conf = ptr->data;
510	<
509	>	struct MaskItem *conf = node->data;
510	>
511		if (conf->type == type)
512		{
513	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
514	<	!match(conf->name, name)))
784	<	return conf;
513	>	if (conf->name && !irccmp(conf->name, name))
514	>	return conf;
515		}
516		}
517
518		return NULL;
519		}
520
791	–	/* map_to_list()
792	–	*
793	–	* inputs       - ConfType conf
794	–	* output       - pointer to dlink_list to use
795	–	* side effects - none
796	–	*/
797	–	static dlink_list *
798	–	map_to_list(enum maskitem_type type)
799	–	{
800	–	switch(type)
801	–	{
802	–	case CONF_XLINE:
803	–	return(&xconf_items);
804	–	break;
805	–	case CONF_ULINE:
806	–	return(&uconf_items);
807	–	break;
808	–	case CONF_NRESV:
809	–	return(&nresv_items);
810	–	break;
811	–	case CONF_CRESV:
812	–	return(&cresv_items);
813	–	case CONF_OPER:
814	–	return(&oconf_items);
815	–	break;
816	–	case CONF_SERVER:
817	–	return(&server_items);
818	–	break;
819	–	case CONF_SERVICE:
820	–	return(&service_items);
821	–	break;
822	–	case CONF_CLUSTER:
823	–	return(&cluster_items);
824	–	break;
825	–	default:
826	–	return NULL;
827	–	}
828	–	}
829	–
521		/* find_matching_name_conf()
522		*
523		* inputs       - type of link list to look in
#	Line 838 | Line 529 | map_to_list(enum maskitem_type type)
529		* side effects - looks for a match on name field
530		*/
531		struct MaskItem *
532	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
842	<	const char *host, unsigned int flags)
532	>	connect_find(const char *name, const char *host, int (*compare)(const char *, const char *))
533		{
534	<	dlink_node *ptr=NULL;
845	<	struct MaskItem *conf=NULL;
846	<	dlink_list *list_p = map_to_list(type);
534	>	dlink_node *node = NULL;
535
536	<	switch (type)
536	>	DLINK_FOREACH(node, connect_items.head)
537		{
538	<	case CONF_SERVICE:
851	<	DLINK_FOREACH(ptr, list_p->head)
852	<	{
853	<	conf = ptr->data;
854	<
855	<	if (EmptyString(conf->name))
856	<	continue;
857	<	if ((name != NULL) && !irccmp(name, conf->name))
858	<	return conf;
859	<	}
860	<	break;
861	<
862	<	case CONF_XLINE:
863	<	case CONF_ULINE:
864	<	case CONF_NRESV:
865	<	case CONF_CRESV:
866	<	DLINK_FOREACH(ptr, list_p->head)
867	<	{
868	<	conf = ptr->data;
869	<
870	<	if (EmptyString(conf->name))
871	<	continue;
872	<	if ((name != NULL) && !match(conf->name, name))
873	<	{
874	<	if ((user == NULL && (host == NULL)))
875	<	return conf;
876	<	if ((conf->flags & flags) != flags)
877	<	continue;
878	<	if (EmptyString(conf->user) || EmptyString(conf->host))
879	<	return conf;
880	<	if (!match(conf->user, user) && !match(conf->host, host))
881	<	return conf;
882	<	}
883	<	}
884	<	break;
885	<
886	<	case CONF_SERVER:
887	<	DLINK_FOREACH(ptr, list_p->head)
888	<	{
889	<	conf = ptr->data;
538	>	struct MaskItem *conf = node->data;
539
540	<	if ((name != NULL) && !match(name, conf->name))
541	<	return conf;
542	<	else if ((host != NULL) && !match(host, conf->host))
543	<	return conf;
895	<	}
896	<	break;
897	<
898	<	default:
899	<	break;
540	>	if (name && !compare(name, conf->name))
541	>	return conf;
542	>	if (host && !compare(host, conf->host))
543	>	return conf;
544		}
545	+
546		return NULL;
547		}
548
#	Line 911 | Line 556 | find_matching_name_conf(enum maskitem_ty
556		* side effects - looks for an exact match on name field
557		*/
558		struct MaskItem *
559	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
915	<	const char *user, const char *host)
559	>	operator_find(const struct Client *who, const char *name)
560		{
561	<	dlink_node *ptr = NULL;
918	<	struct MaskItem *conf;
919	<	dlink_list *list_p = map_to_list(type);
561	>	dlink_node *node = NULL;
562
563	<	switch(type)
563	>	DLINK_FOREACH(node, operator_items.head)
564		{
565	<	case CONF_XLINE:
924	<	case CONF_ULINE:
925	<	case CONF_NRESV:
926	<	case CONF_CRESV:
565	>	struct MaskItem *conf = node->data;
566
567	<	DLINK_FOREACH(ptr, list_p->head)
567	>	if (!irccmp(conf->name, name))
568		{
569	<	conf = ptr->data;
570	<
932	<	if (EmptyString(conf->name))
933	<	continue;
934	<
935	<	if (irccmp(conf->name, name) == 0)
936	<	{
937	<	if ((user == NULL && (host == NULL)))
938	<	return (conf);
939	<	if (EmptyString(conf->user) || EmptyString(conf->host))
940	<	return (conf);
941	<	if (!match(conf->user, user) && !match(conf->host, host))
942	<	return (conf);
943	<	}
944	<	}
945	<	break;
946	<
947	<	case CONF_OPER:
948	<	DLINK_FOREACH(ptr, list_p->head)
949	<	{
950	<	conf = ptr->data;
951	<
952	<	if (EmptyString(conf->name))
953	<	continue;
569	>	if (!who)
570	>	return conf;
571
572	<	if (!irccmp(conf->name, name))
572	>	if (!match(conf->user, who->username))
573		{
574	<	if (!who)
958	<	return conf;
959	<	if (EmptyString(conf->user) || EmptyString(conf->host))
960	<	return NULL;
961	<	if (!match(conf->user, who->username))
574	>	switch (conf->htype)
575		{
576	<	switch (conf->htype)
577	<	{
578	<	case HM_HOST:
579	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
576	>	case HM_HOST:
577	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
578	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
579	>	return conf;
580	>	break;
581	>	case HM_IPV4:
582	>	if (who->connection->aftype == AF_INET)
583	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
584		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
585		return conf;
586	<	break;
587	<	case HM_IPV4:
588	<	if (who->localClient->aftype == AF_INET)
589	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
590	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
591	<	return conf;
592	<	break;
593	<	#ifdef IPV6
594	<	case HM_IPV6:
978	<	if (who->localClient->aftype == AF_INET6)
979	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
980	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
981	<	return conf;
982	<	break;
983	<	#endif
984	<	default:
985	<	assert(0);
986	<	}
586	>	break;
587	>	case HM_IPV6:
588	>	if (who->connection->aftype == AF_INET6)
589	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
590	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
591	>	return conf;
592	>	break;
593	>	default:
594	>	assert(0);
595		}
596		}
597		}
990	–
991	–	break;
992	–
993	–	case CONF_SERVER:
994	–	DLINK_FOREACH(ptr, list_p->head)
995	–	{
996	–	conf = ptr->data;
997	–
998	–	if (EmptyString(conf->name))
999	–	continue;
1000	–
1001	–	if (name == NULL)
1002	–	{
1003	–	if (EmptyString(conf->host))
1004	–	continue;
1005	–	if (irccmp(conf->host, host) == 0)
1006	–	return(conf);
1007	–	}
1008	–	else if (irccmp(conf->name, name) == 0)
1009	–	{
1010	–	return (conf);
1011	–	}
1012	–	}
1013	–	break;
1014	–
1015	–	default:
1016	–	break;
598		}
1018	–	return(NULL);
1019	–	}
1020	–
1021	–	/* rehash()
1022	–	*
1023	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1024	–	* as a result of an operator issuing this command, else assume it has been
1025	–	* called as a result of the server receiving a HUP signal.
1026	–	*/
1027	–	int
1028	–	rehash(int sig)
1029	–	{
1030	–	if (sig != 0)
1031	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1032	–	"Got signal SIGHUP, reloading ircd.conf file");
1033	–
1034	–	restart_resolver();
599
600	<	/* don't close listeners until we know we can go ahead with the rehash */
1037	<
1038	<	/* Check to see if we magically got(or lost) IPv6 support */
1039	<	check_can_use_v6();
1040	<
1041	<	read_conf_files(0);
1042	<
1043	<	if (ServerInfo.description != NULL)
1044	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1045	<
1046	<	load_conf_modules();
1047	<
1048	<	rehashed_klines = 1;
1049	<
1050	<	return 0;
600	>	return NULL;
601		}
602
603		/* set_default_conf()
#	Line 1067 | Line 617 | set_default_conf(void)
617		*/
618		assert(class_default == class_get_list()->tail->data);
619
620	<	#ifdef HAVE_LIBCRYPTO
621	<	ServerInfo.rsa_private_key = NULL;
1072	<	ServerInfo.rsa_private_key_file = NULL;
1073	<	#endif
620	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
621	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
622
623	<	/* ServerInfo.name is not rehashable */
624	<	/* ServerInfo.name = ServerInfo.name; */
625	<	ServerInfo.description = NULL;
626	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
627	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
628	<
629	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
630	<	ServerInfo.specific_ipv4_vhost = 0;
631	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
632	<	ServerInfo.specific_ipv6_vhost = 0;
1085	<
1086	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1087	<	ServerInfo.max_nick_length = 9;
1088	<	ServerInfo.max_topic_length = 80;
1089	<
1090	<	ServerInfo.hub = 0;
1091	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1092	<	ServerInfo.dns_host.sin_port = 0;
1093	<	AdminInfo.name = NULL;
1094	<	AdminInfo.email = NULL;
1095	<	AdminInfo.description = NULL;
623	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
624	>	ConfigServerInfo.specific_ipv4_vhost = 0;
625	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
626	>	ConfigServerInfo.specific_ipv6_vhost = 0;
627	>
628	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
629	>	ConfigServerInfo.max_nick_length = 9;
630	>	ConfigServerInfo.max_topic_length = 80;
631	>	ConfigServerInfo.hub = 0;
632	>	ConfigServerInfo.libgeoip_database_options = 0;
633
634		log_del_all();
635
636	<	ConfigLoggingEntry.use_logging = 1;
636	>	ConfigLog.use_logging = 1;
637
638		ConfigChannel.disable_fake_channels = 0;
639	<	ConfigChannel.knock_delay = 300;
639	>	ConfigChannel.invite_client_count = 10;
640	>	ConfigChannel.invite_client_time = 300;
641	>	ConfigChannel.invite_delay_channel = 5;
642	>	ConfigChannel.knock_client_count = 1;
643	>	ConfigChannel.knock_client_time = 300;
644		ConfigChannel.knock_delay_channel = 60;
645	<	ConfigChannel.max_chans_per_user = 25;
1105	<	ConfigChannel.max_chans_per_oper = 50;
645	>	ConfigChannel.max_channels = 25;
646		ConfigChannel.max_bans = 25;
647	<	ConfigChannel.default_split_user_count = 0;
648	<	ConfigChannel.default_split_server_count = 0;
1109	<	ConfigChannel.no_join_on_split = 0;
1110	<	ConfigChannel.no_create_on_split = 0;
647	>	ConfigChannel.default_join_flood_count = 18;
648	>	ConfigChannel.default_join_flood_time = 6;
649
650		ConfigServerHide.flatten_links = 0;
651	<	ConfigServerHide.links_delay = 300;
651	>	ConfigServerHide.flatten_links_delay = 300;
652		ConfigServerHide.hidden = 0;
653		ConfigServerHide.hide_servers = 0;
654		ConfigServerHide.hide_services = 0;
655		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
656		ConfigServerHide.hide_server_ips = 0;
657	+	ConfigServerHide.disable_remote_commands = 0;
658
659	<
660	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
661	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
662	<	ConfigFileEntry.glines = 0;
663	<	ConfigFileEntry.gline_time = 12 * 3600;
664	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
665	<	ConfigFileEntry.gline_min_cidr = 16;
666	<	ConfigFileEntry.gline_min_cidr6 = 48;
667	<	ConfigFileEntry.invisible_on_connect = 1;
668	<	ConfigFileEntry.tkline_expire_notices = 1;
669	<	ConfigFileEntry.hide_spoof_ips = 1;
670	<	ConfigFileEntry.ignore_bogus_ts = 0;
671	<	ConfigFileEntry.disable_auth = 0;
672	<	ConfigFileEntry.disable_remote = 0;
673	<	ConfigFileEntry.kill_chase_time_limit = 90;
674	<	ConfigFileEntry.default_floodcount = 8;
675	<	ConfigFileEntry.failed_oper_notice = 1;
676	<	ConfigFileEntry.dots_in_ident = 0;
677	<	ConfigFileEntry.min_nonwildcard = 4;
678	<	ConfigFileEntry.min_nonwildcard_simple = 3;
679	<	ConfigFileEntry.max_accept = 20;
680	<	ConfigFileEntry.anti_nick_flood = 0;
681	<	ConfigFileEntry.max_nick_time = 20;
682	<	ConfigFileEntry.max_nick_changes = 5;
683	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
684	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
685	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
686	<	ConfigFileEntry.warn_no_nline = 1;
687	<	ConfigFileEntry.stats_o_oper_only = 0;
688	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
689	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
690	<	ConfigFileEntry.stats_P_oper_only = 0;
691	<	ConfigFileEntry.caller_id_wait = 60;
692	<	ConfigFileEntry.opers_bypass_callerid = 0;
693	<	ConfigFileEntry.pace_wait = 10;
694	<	ConfigFileEntry.pace_wait_simple = 1;
695	<	ConfigFileEntry.short_motd = 0;
696	<	ConfigFileEntry.ping_cookie = 0;
697	<	ConfigFileEntry.no_oper_flood = 0;
698	<	ConfigFileEntry.true_no_oper_flood = 0;
699	<	ConfigFileEntry.oper_pass_resv = 1;
700	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
701	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
702	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
703	<	UMODE_OPERWALL | UMODE_WALLOP;
704	<	ConfigFileEntry.use_egd = 0;
705	<	ConfigFileEntry.egdpool_path = NULL;
706	<	ConfigFileEntry.throttle_time = 10;
659	>	ConfigGeneral.away_count = 2;
660	>	ConfigGeneral.away_time = 10;
661	>	ConfigGeneral.max_watch = 50;
662	>	ConfigGeneral.whowas_history_length = 15000;
663	>	ConfigGeneral.cycle_on_host_change = 1;
664	>	ConfigGeneral.dline_min_cidr = 16;
665	>	ConfigGeneral.dline_min_cidr6 = 48;
666	>	ConfigGeneral.kline_min_cidr = 16;
667	>	ConfigGeneral.kline_min_cidr6 = 48;
668	>	ConfigGeneral.invisible_on_connect = 1;
669	>	ConfigGeneral.tkline_expire_notices = 1;
670	>	ConfigGeneral.ignore_bogus_ts = 0;
671	>	ConfigGeneral.disable_auth = 0;
672	>	ConfigGeneral.kill_chase_time_limit = 90;
673	>	ConfigGeneral.default_floodcount = 8;
674	>	ConfigGeneral.failed_oper_notice = 1;
675	>	ConfigGeneral.dots_in_ident = 0;
676	>	ConfigGeneral.min_nonwildcard = 4;
677	>	ConfigGeneral.min_nonwildcard_simple = 3;
678	>	ConfigGeneral.max_accept = 50;
679	>	ConfigGeneral.anti_nick_flood = 0;
680	>	ConfigGeneral.max_nick_time = 20;
681	>	ConfigGeneral.max_nick_changes = 5;
682	>	ConfigGeneral.anti_spam_exit_message_time = 0;
683	>	ConfigGeneral.ts_warn_delta = 30;
684	>	ConfigGeneral.ts_max_delta = 600;
685	>	ConfigGeneral.warn_no_connect_block = 1;
686	>	ConfigGeneral.stats_e_disabled = 0;
687	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
688	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
689	>	ConfigGeneral.stats_o_oper_only = 1;
690	>	ConfigGeneral.stats_m_oper_only = 1;
691	>	ConfigGeneral.stats_P_oper_only = 0;
692	>	ConfigGeneral.stats_u_oper_only = 0;
693	>	ConfigGeneral.caller_id_wait = 60;
694	>	ConfigGeneral.opers_bypass_callerid = 0;
695	>	ConfigGeneral.pace_wait = 10;
696	>	ConfigGeneral.pace_wait_simple = 1;
697	>	ConfigGeneral.short_motd = 0;
698	>	ConfigGeneral.ping_cookie = 0;
699	>	ConfigGeneral.no_oper_flood = 0;
700	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
701	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
702	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
703	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
704	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
705	>	ConfigGeneral.throttle_count = 1;
706	>	ConfigGeneral.throttle_time = 1;
707		}
708
709		static void
710		validate_conf(void)
711		{
712	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
713	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1175	<
1176	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1177	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1178	<
1179	<	if (ServerInfo.network_name == NULL)
1180	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1181	<
1182	<	if (ServerInfo.network_desc == NULL)
1183	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1184	<
1185	<	if (ConfigFileEntry.service_name == NULL)
1186	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
712	>	if (EmptyString(ConfigServerInfo.network_name))
713	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
714
715	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
715	>	if (EmptyString(ConfigServerInfo.network_desc))
716	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
717		}
718
719	<	/* read_conf()
719	>	/* read_conf()
720		*
721		* inputs       - file descriptor pointing to config file to use
722		* output       - None
#	Line 1199 | Line 727 | read_conf(FILE *file)
727		{
728		lineno = 0;
729
730	<	set_default_conf(); /* Set default values prior to conf parsing */
730	>	set_default_conf();  /* Set default values prior to conf parsing */
731		conf_parser_ctx.pass = 1;
732	<	yyparse();          /* pick up the classes first */
732	>	yyparse();  /* Pick up the classes first */
733
734		rewind(file);
735
736		conf_parser_ctx.pass = 2;
737	<	yyparse();          /* Load the values from the conf */
738	<	validate_conf();    /* Check to make sure some values are still okay. */
739	<	/* Some global values are also loaded here. */
740	<	class_delete_marked();      /* Make sure classes are valid */
737	>	yyparse();  /* Load the values from the conf */
738	>	validate_conf();  /* Check to make sure some values are still okay. */
739	>	/* Some global values are also loaded here. */
740	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
741	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
742	>	}
743	>
744	>	/* conf_rehash()
745	>	*
746	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
747	>	* as a result of an operator issuing this command, else assume it has been
748	>	* called as a result of the server receiving a HUP signal.
749	>	*/
750	>	void
751	>	conf_rehash(int sig)
752	>	{
753	>	if (sig)
754	>	{
755	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
756	>	"Got signal SIGHUP, reloading configuration file(s)");
757	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
758	>	}
759	>
760	>	restart_resolver();
761	>
762	>	/* don't close listeners until we know we can go ahead with the rehash */
763	>
764	>	read_conf_files(0);
765	>
766	>	load_conf_modules();
767	>	check_conf_klines();
768		}
769
770		/* lookup_confhost()
#	Line 1222 | Line 777 | lookup_confhost(struct MaskItem *conf)
777		{
778		struct addrinfo hints, *res;
779
780	<	/* Do name lookup now on hostnames given and store the
780	>	/*
781	>	* Do name lookup now on hostnames given and store the
782		* ip numbers in conf structure.
783		*/
784		memset(&hints, 0, sizeof(hints));
#	Line 1239 | Line 795 | lookup_confhost(struct MaskItem *conf)
795		return;
796		}
797
798	<	assert(res != NULL);
798	>	assert(res);
799
800		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
801		conf->addr.ss_len = res->ai_addrlen;
#	Line 1258 | Line 814 | lookup_confhost(struct MaskItem *conf)
814		int
815		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
816		{
817	<	struct ip_entry *ip_found;
818	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
817	>	struct ip_entry *ip_found = NULL;
818	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
819
820	<	/* DLINE exempt also gets you out of static limits/pacing... */
821	<	if (conf && (conf->type == CONF_EXEMPT))
822	<	return 0;
823	<
824	<	if (conf != NULL)
820	>	if (conf)
821	>	{
822	>	/* DLINE exempt also gets you out of static limits/pacing... */
823	>	if (conf->type == CONF_EXEMPT)
824	>	return 0;
825		return BANNED_CLIENT;
826	+	}
827
828	<	ip_found = find_or_add_ip(addr);
828	>	ip_found = ipcache_find_or_add_address(addr);
829
830	<	if ((CurrentTime - ip_found->last_attempt) <
1274	<	ConfigFileEntry.throttle_time)
830	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
831		{
832	<	ip_found->last_attempt = CurrentTime;
833	<	return TOO_FAST;
832	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
833	>	return TOO_FAST;
834	>
835	>	++ip_found->connection_count;
836		}
837	+	else
838	+	ip_found->connection_count = 1;
839
840		ip_found->last_attempt = CurrentTime;
841		return 0;
842		}
843
1284	–	/* find_kill()
1285	–	*
1286	–	* inputs       - pointer to client structure
1287	–	* output       - pointer to struct MaskItem if found
1288	–	* side effects - See if this user is klined already,
1289	–	*                and if so, return struct MaskItem pointer
1290	–	*/
1291	–	struct MaskItem *
1292	–	find_kill(struct Client *client_p)
1293	–	{
1294	–	struct MaskItem *conf = NULL;
1295	–
1296	–	assert(client_p != NULL);
1297	–
1298	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1299	–	CONF_KLINE, client_p->localClient->aftype,
1300	–	client_p->username, NULL, 1);
1301	–	return conf;
1302	–	}
1303	–
1304	–	struct MaskItem *
1305	–	find_gline(struct Client *client_p)
1306	–	{
1307	–	struct MaskItem *conf;
1308	–
1309	–	assert(client_p != NULL);
1310	–
1311	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1312	–	CONF_GLINE, client_p->localClient->aftype,
1313	–	client_p->username, NULL, 1);
1314	–	return conf;
1315	–	}
1316	–
844		/* cleanup_tklines()
845		*
846		* inputs       - NONE
#	Line 1322 | Line 849 | find_gline(struct Client *client_p)
849		*                This is an event started off in ircd.c
850		*/
851		void
852	<	cleanup_tklines(void *notused)
852	>	cleanup_tklines(void *unused)
853		{
854		hostmask_expire_temporary();
855	<	expire_tklines(&xconf_items);
856	<	expire_tklines(&nresv_items);
1330	<	expire_tklines(&cresv_items);
1331	<	}
1332	<
1333	<	/* expire_tklines()
1334	<	*
1335	<	* inputs       - tkline list pointer
1336	<	* output       - NONE
1337	<	* side effects - expire tklines
1338	<	*/
1339	<	static void
1340	<	expire_tklines(dlink_list *tklist)
1341	<	{
1342	<	dlink_node *ptr;
1343	<	dlink_node *next_ptr;
1344	<	struct MaskItem *conf;
1345	<
1346	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1347	<	{
1348	<	conf = ptr->data;
1349	<
1350	<	if (!conf->until || conf->until > CurrentTime)
1351	<	continue;
1352	<
1353	<	if (conf->type == CONF_XLINE)
1354	<	{
1355	<	if (ConfigFileEntry.tkline_expire_notices)
1356	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	<	"Temporary X-line for [%s] expired", conf->name);
1358	<	conf_free(conf);
1359	<	}
1360	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1361	<	{
1362	<	if (ConfigFileEntry.tkline_expire_notices)
1363	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1364	<	"Temporary RESV for [%s] expired", conf->name);
1365	<	conf_free(conf);
1366	<	}
1367	<	}
855	>	gecos_expire();
856	>	resv_expire();
857		}
858
859		/* oper_privs_as_string()
#	Line 1373 | Line 862 | expire_tklines(dlink_list *tklist)
862		* output        - pointer to static string showing oper privs
863		* side effects  - return as string, the oper privs as derived from port
864		*/
865	<	static const struct oper_privs
865	>	static const struct oper_flags
866		{
867		const unsigned int flag;
868		const unsigned char c;
869	<	} flag_list[] = {
869	>	} flag_table[] = {
870		{ OPER_FLAG_ADMIN,          'A' },
871	<	{ OPER_FLAG_REMOTEBAN,      'B' },
872	<	{ OPER_FLAG_DIE,            'D' },
873	<	{ OPER_FLAG_GLINE,          'G' },
874	<	{ OPER_FLAG_REHASH,         'H' },
875	<	{ OPER_FLAG_K,              'K' },
876	<	{ OPER_FLAG_OPERWALL,       'L' },
877	<	{ OPER_FLAG_KILL,           'N' },
878	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
879	<	{ OPER_FLAG_CONNECT,        'P' },
880	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
881	<	{ OPER_FLAG_SQUIT,          'R' },
882	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
883	<	{ OPER_FLAG_UNKLINE,        'U' },
884	<	{ OPER_FLAG_X,              'X' },
871	>	{ OPER_FLAG_CLOSE,          'B' },
872	>	{ OPER_FLAG_CONNECT,        'C' },
873	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
874	>	{ OPER_FLAG_DIE,            'E' },
875	>	{ OPER_FLAG_DLINE,          'F' },
876	>	{ OPER_FLAG_GLOBOPS,        'G' },
877	>	{ OPER_FLAG_JOIN_RESV,      'H' },
878	>	{ OPER_FLAG_KILL,           'I' },
879	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
880	>	{ OPER_FLAG_KLINE,          'K' },
881	>	{ OPER_FLAG_LOCOPS,         'L' },
882	>	{ OPER_FLAG_MODULE,         'M' },
883	>	{ OPER_FLAG_NICK_RESV,      'N' },
884	>	{ OPER_FLAG_OPME,           'O' },
885	>	{ OPER_FLAG_REHASH,         'P' },
886	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
887	>	{ OPER_FLAG_RESTART,        'R' },
888	>	{ OPER_FLAG_RESV,           'S' },
889	>	{ OPER_FLAG_SET,            'T' },
890	>	{ OPER_FLAG_SQUIT,          'U' },
891	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
892	>	{ OPER_FLAG_UNDLINE,        'W' },
893	>	{ OPER_FLAG_UNKLINE,        'X' },
894	>	{ OPER_FLAG_UNRESV,         'Y' },
895	>	{ OPER_FLAG_UNXLINE,        'Z' },
896	>	{ OPER_FLAG_WALLOPS,        'a' },
897	>	{ OPER_FLAG_XLINE,          'b' },
898		{ 0, '\0' }
899		};
900
901	<	char *
902	<	oper_privs_as_string(const unsigned int port)
901	>	const char *
902	>	oper_privs_as_string(const unsigned int flags)
903		{
904	<	static char privs_out[16];
905	<	char *privs_ptr = privs_out;
1404	<	const struct oper_privs *opriv = flag_list;
904	>	static char buf[sizeof(flag_table) / sizeof(struct oper_flags)];
905	>	char *p = buf;
906
907	<	for (; opriv->flag; ++opriv)
908	<	{
909	<	if (port & opriv->flag)
910	<	*privs_ptr++ = opriv->c;
911	<	else
912	<	*privs_ptr++ = ToLower(opriv->c);
1412	<	}
907	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
908	>	if (flags & tab->flag)
909	>	*p++ = tab->c;
910	>
911	>	if (p == buf)
912	>	*p++ = '0';
913
914	<	*privs_ptr = '\0';
914	>	*p = '\0';
915
916	<	return privs_out;
916	>	return buf;
917		}
918
919		/*
920	<	* Input: A client to find the active oper{} name for.
920	>	* Input: A client to find the active operator {} name for.
921		* Output: The nick!user@host{oper} of the oper.
922		*         "oper" is server name for remote opers
923		* Side effects: None.
#	Line 1425 | Line 925 | oper_privs_as_string(const unsigned int
925		const char *
926		get_oper_name(const struct Client *client_p)
927		{
928	<	dlink_node *cnode = NULL;
929	<	/* +5 for !,@,{,} and null */
930	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
928	>	static char buffer[IRCD_BUFSIZE];
929	>
930	>	if (IsServer(client_p))
931	>	return client_p->name;
932
933		if (MyConnect(client_p))
934		{
935	<	if ((cnode = client_p->localClient->confs.head))
935	>	const dlink_node *const node = client_p->connection->confs.head;
936	>
937	>	if (node)
938		{
939	<	struct MaskItem *conf = cnode->data;
939	>	const struct MaskItem *const conf = node->data;
940
941	<	if (IsConfOperator(conf))
941	>	if (conf->type == CONF_OPER)
942		{
943	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
943	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
944		client_p->username, client_p->host, conf->name);
945	<	return buffer;
945	>	return buffer;
946		}
947		}
948
949	<	/* Probably should assert here for now. If there is an oper out there
950	<	* with no oper{} conf attached, it would be good for us to know...
949	>	/*
950	>	* Probably should assert here for now. If there is an oper out there
951	>	* with no operator {} conf attached, it would be good for us to know...
952		*/
953	<	assert(0); /* Oper without oper conf! */
953	>	assert(0);  /* Oper without oper conf! */
954		}
955
956		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
957	<	client_p->username, client_p->host, client_p->servptr->name);
957	>	client_p->username, client_p->host, client_p->servptr->name);
958		return buffer;
959		}
960
961	+	/* clear_out_old_conf()
962	+	*
963	+	* inputs       - none
964	+	* output       - none
965	+	* side effects - Clear out the old configuration
966	+	*/
967	+	static void
968	+	clear_out_old_conf(void)
969	+	{
970	+	dlink_node *node = NULL, *node_next = NULL;
971	+	dlink_list *free_items [] = {
972	+	&connect_items, &operator_items, NULL
973	+	};
974	+
975	+	dlink_list ** iterator = free_items; /* C is dumb */
976	+
977	+	/* We only need to free anything allocated by yyparse() here.
978	+	* Resetting structs, etc, is taken care of by set_default_conf().
979	+	*/
980	+
981	+	for (; *iterator; iterator++)
982	+	{
983	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
984	+	{
985	+	struct MaskItem *conf = node->data;
986	+
987	+	conf->active = 0;
988	+	dlinkDelete(&conf->node, *iterator);
989	+
990	+	if (!conf->ref_count)
991	+	conf_free(conf);
992	+	}
993	+	}
994	+
995	+	/*
996	+	* Don't delete the class table, rather mark all entries for deletion.
997	+	* The table is cleaned up by class_delete_marked. - avalon
998	+	*/
999	+	class_mark_for_deletion();
1000	+
1001	+	clear_out_address_conf();
1002	+
1003	+	modules_conf_clear();  /* Clear modules {} items */
1004	+
1005	+	motd_clear();  /* Clear motd {} items and re-cache default motd */
1006	+
1007	+	cluster_clear();  /* Clear cluster {} items */
1008	+
1009	+	gecos_clear();  /* Clear gecos {} items */
1010	+
1011	+	resv_clear();  /* Clear resv {} items */
1012	+
1013	+	service_clear();  /* Clear service {} items */
1014	+
1015	+	shared_clear();  /* Clear shared {} items */
1016	+
1017	+	pseudo_clear();  /* Clear pseudo {} items */
1018	+
1019	+	#ifdef HAVE_LIBGEOIP
1020	+	GeoIP_delete(GeoIPv4_ctx);
1021	+	GeoIPv4_ctx = NULL;
1022	+	GeoIP_delete(GeoIPv6_ctx);
1023	+	GeoIPv6_ctx = NULL;
1024	+	#endif
1025	+
1026	+	/* Clean out ConfigServerInfo */
1027	+	xfree(ConfigServerInfo.description);
1028	+	ConfigServerInfo.description = NULL;
1029	+	xfree(ConfigServerInfo.network_name);
1030	+	ConfigServerInfo.network_name = NULL;
1031	+	xfree(ConfigServerInfo.network_desc);
1032	+	ConfigServerInfo.network_desc = NULL;
1033	+	xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
1034	+	ConfigServerInfo.libgeoip_ipv6_database_file = NULL;
1035	+	xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
1036	+	ConfigServerInfo.libgeoip_ipv4_database_file = NULL;
1037	+	xfree(ConfigServerInfo.rsa_private_key_file);
1038	+	ConfigServerInfo.rsa_private_key_file = NULL;
1039	+	xfree(ConfigServerInfo.ssl_certificate_file);
1040	+	ConfigServerInfo.ssl_certificate_file = NULL;
1041	+	xfree(ConfigServerInfo.ssl_dh_param_file);
1042	+	ConfigServerInfo.ssl_dh_param_file = NULL;
1043	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1044	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1045	+	xfree(ConfigServerInfo.ssl_cipher_list);
1046	+	ConfigServerInfo.ssl_cipher_list = NULL;
1047	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1048	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1049	+
1050	+	/* Clean out ConfigAdminInfo */
1051	+	xfree(ConfigAdminInfo.name);
1052	+	ConfigAdminInfo.name = NULL;
1053	+	xfree(ConfigAdminInfo.email);
1054	+	ConfigAdminInfo.email = NULL;
1055	+	xfree(ConfigAdminInfo.description);
1056	+	ConfigAdminInfo.description = NULL;
1057	+
1058	+	xfree(ConfigServerHide.flatten_links_file);
1059	+	ConfigServerHide.flatten_links_file = NULL;
1060	+
1061	+	/* Clean out listeners */
1062	+	listener_close_marked();
1063	+	}
1064	+
1065	+	static void
1066	+	conf_handle_tls(int cold)
1067	+	{
1068	+	if (!tls_new_cred())
1069	+	{
1070	+	if (cold)
1071	+	{
1072	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1073	+	exit(EXIT_FAILURE);
1074	+	}
1075	+	else
1076	+	{
1077	+	/* Failed to load new settings/certs, old ones remain active */
1078	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1079	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1080	+	}
1081	+	}
1082	+	}
1083	+
1084		/* read_conf_files()
1085		*
1086		* inputs       - cold start YES or NO
#	Line 1463 | Line 1090 | get_oper_name(const struct Client *clien
1090		void
1091		read_conf_files(int cold)
1092		{
1093	<	const char *filename;
1094	<	char chanmodes[32];
1095	<	char chanlimit[32];
1093	>	const char *filename = NULL;
1094	>	char chanmodes[IRCD_BUFSIZE] = "";
1095	>	char chanlimit[IRCD_BUFSIZE] = "";
1096
1097		conf_parser_ctx.boot = cold;
1098	<	filename = ConfigFileEntry.configfile;
1098	>	filename = ConfigGeneral.configfile;
1099
1100		/* We need to know the initial filename for the yyerror() to report
1101		FIXME: The full path is in conffilenamebuf first time since we
1102	<	dont know anything else
1102	>	don't know anything else
1103
1104	<	- Gozem 2002-07-21
1104	>	- Gozem 2002-07-21
1105		*/
1106		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1107
#	Line 1484 | Line 1111 | read_conf_files(int cold)
1111		{
1112		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1113		filename, strerror(errno));
1114	<	exit(-1);
1114	>	exit(EXIT_FAILURE);
1115		}
1116		else
1117		{
1118	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1119	<	"Unable to read configuration file '%s': %s",
1120	<	filename, strerror(errno));
1118	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1119	>	"Unable to read configuration file '%s': %s",
1120	>	filename, strerror(errno));
1121		return;
1122		}
1123		}
#	Line 1502 | Line 1129 | read_conf_files(int cold)
1129		fclose(conf_parser_ctx.conf_file);
1130
1131		log_reopen_all();
1132	+	conf_handle_tls(cold);
1133
1134	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1135	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1508	<
1509	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1510	<	add_isupport("MAXLIST", chanmodes, -1);
1511	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1512	<	add_isupport("CHANTYPES", "#", -1);
1513	<
1514	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1515	<	ConfigChannel.max_chans_per_user);
1516	<	add_isupport("CHANLIMIT", chanlimit, -1);
1517	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1518	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1519	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1520	<	add_isupport("EXCEPTS", "e", -1);
1521	<	add_isupport("INVEX", "I", -1);
1522	<	add_isupport("CHANMODES", chanmodes, -1);
1523	<
1524	<	/*
1525	<	* message_locale may have changed.  rebuild isupport since it relies
1526	<	* on strlen(form_str(RPL_ISUPPORT))
1527	<	*/
1528	<	rebuild_isupport_message_line();
1529	<	}
1530	<
1531	<	/* clear_out_old_conf()
1532	<	*
1533	<	* inputs       - none
1534	<	* output       - none
1535	<	* side effects - Clear out the old configuration
1536	<	*/
1537	<	static void
1538	<	clear_out_old_conf(void)
1539	<	{
1540	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1541	<	struct MaskItem *conf;
1542	<	dlink_list *free_items [] = {
1543	<	&server_items,   &oconf_items,
1544	<	&uconf_items,   &xconf_items,
1545	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1546	<	};
1547	<
1548	<	dlink_list ** iterator = free_items; /* C is dumb */
1549	<
1550	<	/* We only need to free anything allocated by yyparse() here.
1551	<	* Resetting structs, etc, is taken care of by set_default_conf().
1552	<	*/
1553	<
1554	<	for (; *iterator != NULL; iterator++)
1555	<	{
1556	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1557	<	{
1558	<	conf = ptr->data;
1559	<
1560	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1561	<
1562	<	/* XXX This is less than pretty */
1563	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1564	<	{
1565	<	if (!conf->ref_count)
1566	<	conf_free(conf);
1567	<	}
1568	<	else if (conf->type == CONF_XLINE)
1569	<	{
1570	<	if (!conf->until)
1571	<	conf_free(conf);
1572	<	}
1573	<	else
1574	<	conf_free(conf);
1575	<	}
1576	<	}
1577	<
1578	<	motd_clear();
1579	<
1580	<	/*
1581	<	* don't delete the class table, rather mark all entries
1582	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1583	<	*/
1584	<	class_mark_for_deletion();
1585	<
1586	<	clear_out_address_conf();
1587	<
1588	<	/* clean out module paths */
1589	<	mod_clear_paths();
1590	<
1591	<	/* clean out ServerInfo */
1592	<	MyFree(ServerInfo.description);
1593	<	ServerInfo.description = NULL;
1594	<	MyFree(ServerInfo.network_name);
1595	<	ServerInfo.network_name = NULL;
1596	<	MyFree(ServerInfo.network_desc);
1597	<	ServerInfo.network_desc = NULL;
1598	<	MyFree(ConfigFileEntry.egdpool_path);
1599	<	ConfigFileEntry.egdpool_path = NULL;
1600	<	#ifdef HAVE_LIBCRYPTO
1601	<	if (ServerInfo.rsa_private_key != NULL)
1602	<	{
1603	<	RSA_free(ServerInfo.rsa_private_key);
1604	<	ServerInfo.rsa_private_key = NULL;
1605	<	}
1606	<
1607	<	MyFree(ServerInfo.rsa_private_key_file);
1608	<	ServerInfo.rsa_private_key_file = NULL;
1609	<
1610	<	if (ServerInfo.server_ctx)
1611	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1612	<	SSL_OP_NO_SSLv3|
1613	<	SSL_OP_NO_TLSv1);
1614	<	if (ServerInfo.client_ctx)
1615	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1616	<	SSL_OP_NO_SSLv3|
1617	<	SSL_OP_NO_TLSv1);
1618	<	#endif
1619	<
1620	<	/* clean out AdminInfo */
1621	<	MyFree(AdminInfo.name);
1622	<	AdminInfo.name = NULL;
1623	<	MyFree(AdminInfo.email);
1624	<	AdminInfo.email = NULL;
1625	<	MyFree(AdminInfo.description);
1626	<	AdminInfo.description = NULL;
1627	<
1628	<	/* clean out listeners */
1629	<	close_listeners();
1630	<
1631	<	/* clean out general */
1632	<	MyFree(ConfigFileEntry.service_name);
1633	<	ConfigFileEntry.service_name = NULL;
1134	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1135	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1136
1137	<	delete_isupport("INVEX");
1138	<	delete_isupport("EXCEPTS");
1137	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1138	>	isupport_add("MAXLIST", chanmodes, -1);
1139	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1140	>	isupport_add("CHANTYPES", "#", -1);
1141	>
1142	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1143	>	ConfigChannel.max_channels);
1144	>	isupport_add("CHANLIMIT", chanlimit, -1);
1145	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1146	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1147	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1148	>	isupport_add("CHANMODES", chanmodes, -1);
1149		}
1150
1151		/* conf_add_class_to_conf()
1152		*
1153		* inputs       - pointer to config item
1154		* output       - NONE
1155	<	* side effects - Add a class pointer to a conf
1155	>	* side effects - Add a class pointer to a conf
1156		*/
1157		void
1158	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1158	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1159		{
1160	<	if (class_name == NULL)
1160	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1161		{
1162		conf->class = class_default;
1163
1164	<	if (conf->type == CONF_CLIENT)
1165	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1166	<	"Warning *** Defaulting to default class for %s@%s",
1167	<	conf->user, conf->host);
1164	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1165	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1166	>	"Warning *** Defaulting to default class for %s@%s",
1167	>	conf->user, conf->host);
1168		else
1169	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1170	<	"Warning *** Defaulting to default class for %s",
1171	<	conf->name);
1660	<	}
1661	<	else
1662	<	conf->class = class_find(class_name, 1);
1663	<
1664	<	if (conf->class == NULL)
1665	<	{
1666	<	if (conf->type == CONF_CLIENT)
1667	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1668	<	"Warning *** Defaulting to default class for %s@%s",
1669	<	conf->user, conf->host);
1670	<	else
1671	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1672	<	"Warning *** Defaulting to default class for %s",
1673	<	conf->name);
1674	<	conf->class = class_default;
1169	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1170	>	"Warning *** Defaulting to default class for %s",
1171	>	conf->name);
1172		}
1173		}
1174
#	Line 1684 | Line 1181 | conf_add_class_to_conf(struct MaskItem *
1181		void
1182		yyerror(const char *msg)
1183		{
1687	–	char newlinebuf[IRCD_BUFSIZE];
1688	–
1184		if (conf_parser_ctx.pass != 1)
1185		return;
1186
1187	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1188	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1187	>	char *p = stripws(linebuf);
1188	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1189		"\"%s\", line %u: %s: %s",
1190	<	conffilebuf, lineno + 1, msg, newlinebuf);
1190	>	conffilebuf, lineno + 1, msg, p);
1191		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1192	<	conffilebuf, lineno + 1, msg, newlinebuf);
1192	>	conffilebuf, lineno + 1, msg, p);
1193		}
1194
1195		void
1196		conf_error_report(const char *msg)
1197		{
1198	<	char newlinebuf[IRCD_BUFSIZE];
1199	<
1705	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1706	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1198	>	char *p = stripws(linebuf);
1199	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1200		"\"%s\", line %u: %s: %s",
1201	<	conffilebuf, lineno + 1, msg, newlinebuf);
1201	>	conffilebuf, lineno + 1, msg, linebuf);
1202		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1203	<	conffilebuf, lineno + 1, msg, newlinebuf);
1203	>	conffilebuf, lineno + 1, msg, linebuf);
1204		}
1205
1206		/*
1207		* valid_tkline()
1208	<	*
1208	>	*
1209		* inputs       - pointer to ascii string to check
1210		*              - whether the specified time is in seconds or minutes
1211		* output       - -1 not enough parameters
#	Line 1720 | Line 1213 | conf_error_report(const char *msg)
1213		* side effects - none
1214		* Originally written by Dianora (Diane, db@db.net)
1215		*/
1216	<	time_t
1217	<	valid_tkline(const char *p, int minutes)
1216	>	uintmax_t
1217	>	valid_tkline(const char *data, const int minutes)
1218		{
1219	<	time_t result = 0;
1219	>	const unsigned char *p = (const unsigned char *)data;
1220	>	unsigned char tmpch = '\0';
1221	>	uintmax_t result = 0;
1222
1223	<	for (; *p; ++p)
1223	>	while ((tmpch = *p++))
1224		{
1225	<	if (!IsDigit(*p))
1225	>	if (!IsDigit(tmpch))
1226		return 0;
1227
1228		result *= 10;
1229	<	result += ((*p) & 0xF);
1229	>	result += (tmpch & 0xF);
1230		}
1231
1232		/*
1233	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1234	<	* i.e. they specifically use 0, I am going to return 1 instead
1235	<	* as a return value of non-zero is used to flag it as a temporary kline
1233	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1234	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1235	>	* value of non-zero is used to flag it as a temporary kline
1236		*/
1237		if (result == 0)
1238		result = 1;
1239
1240	<	/*
1240	>	/*
1241		* If the incoming time is in seconds convert it to minutes for the purpose
1242		* of this calculation
1243		*/
1244		if (!minutes)
1245	<	result = result / (time_t)60;
1245	>	result = result / 60;
1246
1247		if (result > MAX_TDKLINE_TIME)
1248		result = MAX_TDKLINE_TIME;
1249
1250	<	result = result * (time_t)60;  /* turn it into seconds */
1250	>	result = result * 60;  /* Turn it into seconds */
1251
1252		return result;
1253		}
#	Line 1768 | Line 1263 | valid_wild_card_simple(const char *data)
1263		{
1264		const unsigned char *p = (const unsigned char *)data;
1265		unsigned char tmpch = '\0';
1266	<	int nonwild = 0;
1266	>	unsigned int nonwild = 0, wild = 0;
1267
1268		while ((tmpch = *p++))
1269		{
1270	<	if (tmpch == '\\')
1270	>	if (tmpch == '\\' && *p)
1271		{
1272		++p;
1273	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1273	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1274		return 1;
1275		}
1276		else if (!IsMWildChar(tmpch))
1277		{
1278	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1278	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1279		return 1;
1280		}
1281	+	else
1282	+	++wild;
1283		}
1284
1285	<	return 0;
1285	>	return !wild;
1286		}
1287
1288		/* valid_wild_card()
#	Line 1797 | Line 1294 | valid_wild_card_simple(const char *data)
1294		* side effects - NOTICE is given to source_p if warn is 1
1295		*/
1296		int
1297	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1297	>	valid_wild_card(int count, ...)
1298		{
1299	<	char tmpch;
1300	<	int nonwild = 0;
1299	>	unsigned char tmpch = '\0';
1300	>	unsigned int nonwild = 0;
1301		va_list args;
1302
1303		/*
#	Line 1819 | Line 1316 | valid_wild_card(struct Client *source_p,
1316
1317		while (count--)
1318		{
1319	<	const char *p = va_arg(args, const char *);
1319	>	const unsigned char *p = va_arg(args, const unsigned char *);
1320		if (p == NULL)
1321		continue;
1322
#	Line 1831 | Line 1328 | valid_wild_card(struct Client *source_p,
1328		* If we find enough non-wild characters, we can
1329		* break - no point in searching further.
1330		*/
1331	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1331	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1332	>	{
1333	>	va_end(args);
1334		return 1;
1335	+	}
1336		}
1337		}
1338		}
1339
1340	<	if (warn)
1341	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1342	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1340	>	va_end(args);
1341	>	return 0;
1342	>	}
1343	>
1344	>	/* find_user_host()
1345	>	*
1346	>	* inputs       - pointer to client placing kline
1347	>	*              - pointer to user_host_or_nick
1348	>	*              - pointer to user buffer
1349	>	*              - pointer to host buffer
1350	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1351	>	* side effects -
1352	>	*/
1353	>	static int
1354	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1355	>	char *luser, char *lhost)
1356	>	{
1357	>	struct Client *target_p = NULL;
1358	>	char *hostp = NULL;
1359	>
1360	>	if (lhost == NULL)
1361	>	{
1362	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1363	>	return 1;
1364	>	}
1365	>
1366	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1367	>	{
1368	>	/* Explicit user@host mask given */
1369	>	if (hostp)                            /* I'm a little user@host */
1370	>	{
1371	>	*(hostp++) = '\0';                       /* short and squat */
1372	>
1373	>	if (*user_host_or_nick)
1374	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1375	>	else
1376	>	strcpy(luser, "*");
1377	>
1378	>	if (*hostp)
1379	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1380	>	else
1381	>	strcpy(lhost, "*");
1382	>	}
1383	>	else
1384	>	{
1385	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1386	>	luser[1] = '\0';
1387	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1388	>	}
1389	>
1390	>	return 1;
1391	>	}
1392	>	else
1393	>	{
1394	>	/* Try to find user@host mask from nick */
1395	>	/* Okay to use source_p as the first param, because source_p == client_p */
1396	>	if ((target_p =
1397	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1398	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1399	>
1400	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1401	>	{
1402	>	if (IsClient(source_p))
1403	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1404	>	return 0;
1405	>	}
1406	>
1407	>	/*
1408	>	* Turn the "user" bit into "*user", blow away '~'
1409	>	* if found in original user name (non-idented)
1410	>	*/
1411	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1412	>
1413	>	if (target_p->username[0] == '~')
1414	>	luser[0] = '*';
1415	>
1416	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1417	>	return 1;
1418	>	}
1419	>
1420		return 0;
1421		}
1422
#	Line 1853 | Line 1430 | valid_wild_card(struct Client *source_p,
1430		*              - parse_flags bit map of things to test
1431		*              - pointer to user or string to parse into
1432		*              - pointer to host or NULL to parse into if non NULL
1433	<	*              - pointer to optional tkline time or NULL
1433	>	*              - pointer to optional tkline time or NULL
1434		*              - pointer to target_server to parse into if non NULL
1435		*              - pointer to reason to parse into
1436		*
1437	<	* output       - 1 if valid, -1 if not valid
1437	>	* output       - 1 if valid, 0 if not valid
1438		* side effects - A generalised k/d/x etc. line parser,
1439		*               "ALINE [time] user@host|string [ON] target :reason"
1440		*                will parse returning a parsed user, host if
#	Line 1875 | Line 1452 | valid_wild_card(struct Client *source_p,
1452		*/
1453		int
1454		parse_aline(const char *cmd, struct Client *source_p,
1455	<	int parc, char **parv,
1456	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1457	<	char **target_server, char **reason)
1455	>	int parc, char **parv,
1456	>	char **up_p, char **h_p, uintmax_t *tkline_time,
1457	>	char **target_server, char **reason)
1458		{
1459	<	int found_tkline_time=0;
1460	<	static char def_reason[] = "No Reason";
1459	>	uintmax_t found_tkline_time=0;
1460	>	static char default_reason[] = CONF_NOREASON;
1461		static char user[USERLEN*4+1];
1462		static char host[HOSTLEN*4+1];
1463
#	Line 1889 | Line 1466 | parse_aline(const char *cmd, struct Clie
1466
1467		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1468
1469	<	if (found_tkline_time != 0)
1469	>	if (found_tkline_time)
1470		{
1471		parv++;
1472		parc--;
1473
1474	<	if (tkline_time != NULL)
1474	>	if (tkline_time)
1475		*tkline_time = found_tkline_time;
1476		else
1477		{
1478	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1479	<	me.name, source_p->name, cmd);
1903	<	return -1;
1478	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1479	>	return 0;
1480		}
1481		}
1482
1483		if (parc == 0)
1484		{
1485	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1486	<	me.name, source_p->name, cmd);
1911	<	return -1;
1485	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1486	>	return 0;
1487		}
1488
1489		if (h_p == NULL)
1490		*up_p = *parv;
1491		else
1492		{
1493	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1494	<	return -1;
1493	>	if (find_user_host(source_p, *parv, user, host) == 0)
1494	>	return 0;
1495
1496		*up_p = user;
1497		*h_p = host;
1498		}
1499	<
1499	>
1500		parc--;
1501		parv++;
1502
1503	<	if (parc != 0)
1503	>	if (parc)
1504		{
1505		if (irccmp(*parv, "ON") == 0)
1506		{
1507		parc--;
1508		parv++;
1509
1935	–	if (target_server == NULL)
1936	–	{
1937	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1938	–	me.name, source_p->name, cmd);
1939	–	return -1;
1940	–	}
1941	–
1510		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1511		{
1512	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1513	<	me.name, source_p->name, "remoteban");
1946	<	return -1;
1512	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1513	>	return 0;
1514		}
1515
1516		if (parc == 0 || EmptyString(*parv))
1517		{
1518	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1519	<	me.name, source_p->name, cmd);
1953	<	return -1;
1518	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1519	>	return 0;
1520		}
1521
1522		*target_server = *parv;
#	Line 1962 | Line 1528 | parse_aline(const char *cmd, struct Clie
1528		/* Make sure target_server *is* NULL if no ON server found
1529		* caller probably NULL'd it first, but no harm to do it again -db
1530		*/
1531	<	if (target_server != NULL)
1532	<	*target_server = NULL;
1531	>	if (target_server)
1532	>	*target_server = NULL;
1533		}
1534		}
1535
1536	<	if (h_p != NULL)
1536	>	if (reason)
1537		{
1538	<	if (strchr(user, '!') != NULL)
1973	<	{
1974	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1975	<	me.name, source_p->name);
1976	<	return -1;
1977	<	}
1978	<
1979	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1980	<	return -1;
1981	<	}
1982	<	else
1983	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1984	<	return -1;
1985	<
1986	<	if (reason != NULL)
1987	<	{
1988	<	if (parc != 0 && !EmptyString(*parv))
1989	<	{
1538	>	if (parc && !EmptyString(*parv))
1539		*reason = *parv;
1991	–	if (!valid_comment(source_p, *reason, 1))
1992	–	return -1;
1993	–	}
1994	–	else
1995	–	*reason = def_reason;
1996	–	}
1997	–
1998	–	return 1;
1999	–	}
2000	–
2001	–	/* find_user_host()
2002	–	*
2003	–	* inputs       - pointer to client placing kline
2004	–	*              - pointer to user_host_or_nick
2005	–	*              - pointer to user buffer
2006	–	*              - pointer to host buffer
2007	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
2008	–	* side effects -
2009	–	*/
2010	–	static int
2011	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
2012	–	char *luser, char *lhost, unsigned int flags)
2013	–	{
2014	–	struct Client *target_p = NULL;
2015	–	char *hostp = NULL;
2016	–
2017	–	if (lhost == NULL)
2018	–	{
2019	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
2020	–	return 1;
2021	–	}
2022	–
2023	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2024	–	{
2025	–	/* Explicit user@host mask given */
2026	–
2027	–	if (hostp != NULL)                            /* I'm a little user@host */
2028	–	{
2029	–	*(hostp++) = '\0';                       /* short and squat */
2030	–	if (*user_host_or_nick)
2031	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2032	–	else
2033	–	strcpy(luser, "*");
2034	–	if (*hostp)
2035	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2036	–	else
2037	–	strcpy(lhost, "*");
2038	–	}
2039	–	else
2040	–	{
2041	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2042	–	luser[1] = '\0';
2043	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2044	–	}
2045	–
2046	–	return 1;
2047	–	}
2048	–	else
2049	–	{
2050	–	/* Try to find user@host mask from nick */
2051	–	/* Okay to use source_p as the first param, because source_p == client_p */
2052	–	if ((target_p =
2053	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2054	–	return 0;
2055	–
2056	–	if (IsExemptKline(target_p))
2057	–	{
2058	–	if (!IsServer(source_p))
2059	–	sendto_one(source_p,
2060	–	":%s NOTICE %s :%s is E-lined",
2061	–	me.name, source_p->name, target_p->name);
2062	–	return 0;
2063	–	}
2064	–
2065	–	/*
2066	–	* turn the "user" bit into "*user", blow away '~'
2067	–	* if found in original user name (non-idented)
2068	–	*/
2069	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2070	–
2071	–	if (target_p->username[0] == '~')
2072	–	luser[0] = '*';
2073	–
2074	–	if (target_p->sockhost[0] == '\0' ||
2075	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2076	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1540		else
1541	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2079	<	return 1;
1541	>	*reason = default_reason;
1542		}
1543
2082	–	return 0;
2083	–	}
2084	–
2085	–	/* valid_comment()
2086	–	*
2087	–	* inputs       - pointer to client
2088	–	*              - pointer to comment
2089	–	* output       - 0 if no valid comment,
2090	–	*              - 1 if valid
2091	–	* side effects - truncates reason where necessary
2092	–	*/
2093	–	int
2094	–	valid_comment(struct Client *source_p, char *comment, int warn)
2095	–	{
2096	–	if (strlen(comment) > REASONLEN)
2097	–	comment[REASONLEN-1] = '\0';
2098	–
1544		return 1;
1545		}
1546
#	Line 2119 | Line 1564 | match_conf_password(const char *password
1564		else
1565		encr = password;
1566
1567	<	return !strcmp(encr, conf->passwd);
2123	<	}
2124	<
2125	<	/*
2126	<	* cluster_a_line
2127	<	*
2128	<	* inputs       - client sending the cluster
2129	<	*              - command name "KLINE" "XLINE" etc.
2130	<	*              - capab -- CAP_KLN etc. from s_serv.h
2131	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2132	<	*              - pattern and args to send along
2133	<	* output       - none
2134	<	* side effects - Take source_p send the pattern with args given
2135	<	*                along to all servers that match capab and cluster type
2136	<	*/
2137	<	void
2138	<	cluster_a_line(struct Client *source_p, const char *command,
2139	<	int capab, int cluster_type, const char *pattern, ...)
2140	<	{
2141	<	va_list args;
2142	<	char buffer[IRCD_BUFSIZE];
2143	<	const dlink_node *ptr = NULL;
2144	<
2145	<	va_start(args, pattern);
2146	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
2147	<	va_end(args);
2148	<
2149	<	DLINK_FOREACH(ptr, cluster_items.head)
2150	<	{
2151	<	const struct MaskItem *conf = ptr->data;
2152	<
2153	<	if (conf->flags & cluster_type)
2154	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2155	<	"%s %s %s", command, conf->name, buffer);
2156	<	}
1567	>	return encr && !strcmp(encr, conf->passwd);
1568		}
1569
1570		/*
#	Line 2191 | Line 1602 | split_nuh(struct split_nuh_item *const i
1602
1603		if (iptr->nickptr)
1604		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1605	+
1606		if (iptr->userptr)
1607		strlcpy(iptr->userptr, "*", iptr->usersize);
1608	+
1609		if (iptr->hostptr)
1610		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1611
#	Line 2200 | Line 1613 | split_nuh(struct split_nuh_item *const i
1613		{
1614		*p = '\0';
1615
1616	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1616	>	if (iptr->nickptr && *iptr->nuhmask)
1617		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1618
1619	<	if ((q = strchr(++p, '@'))) {
1619	>	if ((q = strchr(++p, '@')))
1620	>	{
1621		*q++ = '\0';
1622
1623	<	if (*p != '\0')
1623	>	if (*p)
1624		strlcpy(iptr->userptr, p, iptr->usersize);
1625
1626	<	if (*q != '\0')
1626	>	if (*q)
1627		strlcpy(iptr->hostptr, q, iptr->hostsize);
1628		}
1629		else
1630		{
1631	<	if (*p != '\0')
1631	>	if (*p)
1632		strlcpy(iptr->userptr, p, iptr->usersize);
1633		}
1634		}
#	Line 2226 | Line 1640 | split_nuh(struct split_nuh_item *const i
1640		/* if found a @ */
1641		*p++ = '\0';
1642
1643	<	if (*iptr->nuhmask != '\0')
1643	>	if (*iptr->nuhmask)
1644		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1645
1646	<	if (*p != '\0')
1646	>	if (*p)
1647		strlcpy(iptr->hostptr, p, iptr->hostsize);
1648		}
1649		else
1650		{
1651	<	/* no @ found */
1651	>	/* No @ found */
1652		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1653		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1654		else

Comparing:
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 2174 by michael, Mon Jun 3 19:45:38 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (property svn:keywords), Revision 7725 by michael, Mon Sep 26 14:59:44 2016 UTC

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

Diff Legend

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