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 2852 by michael, Sat Jan 18 16:30:48 2014 UTC vs.
Revision 5602 by michael, Mon Feb 23 21:04:46 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"
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"
34	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 42 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
45	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "mempool.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
59	+
60	+	struct config_channel_entry ConfigChannel;
61		struct config_server_hide ConfigServerHide;
62	+	struct config_general_entry ConfigGeneral;
63	+	struct logging_entry ConfigLog = { .use_logging = 1 };
64	+	struct server_info ConfigServerInfo;
65	+	struct admin_info ConfigAdminInfo;
66	+	struct conf_parser_context conf_parser_ctx;
67
68		/* general conf items link list root, other than k lines etc. */
69	<	dlink_list service_items = { NULL, NULL, 0 };
70	<	dlink_list server_items  = { NULL, NULL, 0 };
71	<	dlink_list cluster_items = { NULL, NULL, 0 };
72	<	dlink_list oconf_items   = { NULL, NULL, 0 };
73	<	dlink_list uconf_items   = { NULL, NULL, 0 };
74	<	dlink_list xconf_items   = { NULL, NULL, 0 };
75	<	dlink_list nresv_items   = { NULL, NULL, 0 };
76	<	dlink_list cresv_items = { NULL, NULL, 0 };
69	>	dlink_list service_items;
70	>	dlink_list server_items;
71	>	dlink_list cluster_items;
72	>	dlink_list oconf_items;
73	>	dlink_list uconf_items;
74	>	dlink_list xconf_items;
75	>	dlink_list nresv_items;
76	>	dlink_list cresv_items;
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
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_XLINE:
139	>	return &xconf_items;
140	>	break;
141	>	case CONF_ULINE:
142	>	return &uconf_items;
143	>	break;
144	>	case CONF_NRESV:
145	>	return &nresv_items;
146	>	break;
147	>	case CONF_CRESV:
148	>	return &cresv_items;
149	>	break;
150	>	case CONF_OPER:
151	>	return &oconf_items;
152	>	break;
153	>	case CONF_SERVER:
154	>	return &server_items;
155	>	break;
156	>	case CONF_SERVICE:
157	>	return &service_items;
158	>	break;
159	>	case CONF_CLUSTER:
160	>	return &cluster_items;
161	>	break;
162	>	default:
163	>	return NULL;
164		}
165		}
166
167		struct MaskItem *
168		conf_make(enum maskitem_type type)
169		{
170	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
170	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
171		dlink_list *list = NULL;
172
173		conf->type   = type;
#	Line 163 | Line 182 | conf_make(enum maskitem_type type)
182		void
183		conf_free(struct MaskItem *conf)
184		{
185	<	dlink_node *ptr = NULL, *ptr_next = NULL;
185	>	dlink_node *node = NULL, *node_next = NULL;
186		dlink_list *list = NULL;
187
188	<	if (conf->node.next)
189	<	if ((list = map_to_list(conf->type)))
171	<	dlinkDelete(&conf->node, list);
188	>	if ((list = map_to_list(conf->type)))
189	>	dlinkFindDelete(list, conf);
190
191		MyFree(conf->name);
192
193		if (conf->dns_pending)
194		delete_resolver_queries(conf);
195	<	if (conf->passwd != NULL)
195	>	if (conf->passwd)
196		memset(conf->passwd, 0, strlen(conf->passwd));
197	<	if (conf->spasswd != NULL)
197	>	if (conf->spasswd)
198		memset(conf->spasswd, 0, strlen(conf->spasswd));
199
200		conf->class = NULL;
#	Line 185 | Line 203 | conf_free(struct MaskItem *conf)
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
#	Line 193 | Line 212 | conf_free(struct MaskItem *conf)
212		if (conf->rsa_public_key)
213		RSA_free(conf->rsa_public_key);
214		#endif
215	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
215	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
216		{
217	<	MyFree(ptr->data);
218	<	dlinkDelete(ptr, &conf->hub_list);
219	<	free_dlink_node(ptr);
217	>	MyFree(node->data);
218	>	dlinkDelete(node, &conf->hub_list);
219	>	free_dlink_node(node);
220		}
221
222	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
222	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
223		{
224	<	MyFree(ptr->data);
225	<	dlinkDelete(ptr, &conf->leaf_list);
226	<	free_dlink_node(ptr);
224	>	MyFree(node->data);
225	>	dlinkDelete(node, &conf->leaf_list);
226	>	free_dlink_node(node);
227		}
228
229	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
229	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
230		{
231	<	struct exempt *exptr = ptr->data;
231	>	struct exempt *exptr = node->data;
232
233	<	dlinkDelete(ptr, &conf->exempt_list);
233	>	dlinkDelete(node, &conf->exempt_list);
234		MyFree(exptr->name);
235		MyFree(exptr->user);
236		MyFree(exptr->host);
#	Line 221 | Line 240 | conf_free(struct MaskItem *conf)
240		MyFree(conf);
241		}
242
243	<	/* check_client()
243	>	/* attach_iline()
244		*
245	<	* inputs       - pointer to client
246	<	* output       - 0 = Success
247	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
248	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
230	<	*                I_LINE_FULL       (-3) = I-line is full
231	<	*                TOO_MANY          (-4) = Too many connections from hostname
232	<	*                BANNED_CLIENT     (-5) = K-lined
233	<	* side effects - Ordinary client access check.
234	<	*                Look for conf lines which have the same
235	<	*                status as the flags passed.
245	>	* inputs       - client pointer
246	>	*              - conf pointer
247	>	* output       -
248	>	* side effects - do actual attach
249		*/
250	<	int
251	<	check_client(struct Client *source_p)
250	>	static int
251	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
252		{
253	<	int i;
254	<
255	<	if ((i = verify_access(source_p)))
256	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
244	<	source_p->name, source_p->sockhost);
245	<
246	<	switch (i)
247	<	{
248	<	case TOO_MANY:
249	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
250	<	"Too many on IP for %s (%s).",
251	<	get_client_name(source_p, SHOW_IP),
252	<	source_p->sockhost);
253	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
254	<	get_client_name(source_p, SHOW_IP));
255	<	++ServerStats.is_ref;
256	<	exit_client(source_p, &me, "No more connections allowed on that IP");
257	<	break;
253	>	const struct ClassItem *const class = conf->class;
254	>	struct ip_entry *ip_found;
255	>	int a_limit_reached = 0;
256	>	unsigned int local = 0, global = 0, ident = 0;
257
258	<	case I_LINE_FULL:
259	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
260	<	"auth{} block is full for %s (%s).",
262	<	get_client_name(source_p, SHOW_IP),
263	<	source_p->sockhost);
264	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
265	<	get_client_name(source_p, SHOW_IP));
266	<	++ServerStats.is_ref;
267	<	exit_client(source_p, &me,
268	<	"No more connections allowed in your connection class");
269	<	break;
258	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
259	>	ip_found->count++;
260	>	AddFlag(client_p, FLAGS_IPHASH);
261
262	<	case NOT_AUTHORIZED:
263	<	++ServerStats.is_ref;
273	<	/* jdc - lists server name & port connections are on */
274	<	/*       a purely cosmetical change */
275	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
276	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
277	<	get_client_name(source_p, SHOW_IP),
278	<	source_p->sockhost,
279	<	source_p->localClient->listener->name,
280	<	source_p->localClient->listener->port);
281	<	ilog(LOG_TYPE_IRCD,
282	<	"Unauthorized client connection from %s on [%s/%u].",
283	<	get_client_name(source_p, SHOW_IP),
284	<	source_p->localClient->listener->name,
285	<	source_p->localClient->listener->port);
262	>	count_user_host(client_p->username, client_p->host,
263	>	&global, &local, &ident);
264
265	<	exit_client(source_p, &me, "You are not authorized to use this server");
266	<	break;
265	>	/* XXX blah. go down checking the various silly limits
266	>	* setting a_limit_reached if any limit is reached.
267	>	* - Dianora
268	>	*/
269	>	if (class->max_total && class->ref_count >= class->max_total)
270	>	a_limit_reached = 1;
271	>	else if (class->max_perip && ip_found->count > class->max_perip)
272	>	a_limit_reached = 1;
273	>	else if (class->max_local && local >= class->max_local)
274	>	a_limit_reached = 1;
275	>	else if (class->max_global && global >= class->max_global)
276	>	a_limit_reached = 1;
277	>	else if (class->max_ident && ident >= class->max_ident &&
278	>	client_p->username[0] != '~')
279	>	a_limit_reached = 1;
280
281	<	case BANNED_CLIENT:
282	<	exit_client(source_p, &me, "Banned");
283	<	++ServerStats.is_ref;
284	<	break;
281	>	if (a_limit_reached)
282	>	{
283	>	if (!IsConfExemptLimits(conf))
284	>	return TOO_MANY;   /* Already at maximum allowed */
285
286	<	case 0:
287	<	default:
297	<	break;
286	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
287	>	"but you have exceed_limit = yes;");
288		}
289
290	<	return (i < 0 ? 0 : 1);
290	>	return attach_conf(client_p, conf);
291		}
292
293		/* verify_access()
294		*
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.
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 int
300		verify_access(struct Client *client_p)
301		{
302		struct MaskItem *conf = NULL;
313	–	char non_ident[USERLEN + 1] = { '~', '\0' };
303
304		if (IsGotId(client_p))
305		{
306		conf = find_address_conf(client_p->host, client_p->username,
307	<	&client_p->localClient->ip,
308	<	client_p->localClient->aftype,
309	<	client_p->localClient->passwd);
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		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
316	<	conf = find_address_conf(client_p->host,non_ident,
317	<	&client_p->localClient->ip,
318	<	client_p->localClient->aftype,
319	<	client_p->localClient->passwd);
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	<	if (conf != NULL)
322	>	if (conf)
323		{
324		if (IsConfClient(conf))
325		{
326		if (IsConfRedir(conf))
327		{
328	<	sendto_one(client_p, form_str(RPL_REDIR),
329	<	me.name, client_p->name,
330	<	conf->name ? conf->name : "",
340	<	conf->port);
328	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
329	>	conf->name ? conf->name : "",
330	>	conf->port);
331		return NOT_AUTHORIZED;
332		}
333
344	–	if (IsConfDoIdentd(conf))
345	–	SetNeedId(client_p);
346	–
334		/* Thanks for spoof idea amm */
335		if (IsConfDoSpoofIp(conf))
336		{
337	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
338	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
352	<	"%s spoofing: %s as %s",
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		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
355	–	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
342		}
343
344		return attach_iline(client_p, conf);
345		}
346	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
346	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
347		{
348		if (IsConfGline(conf))
349	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
350	<	client_p->name);
351	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
366	<	me.name, client_p->name, conf->reason);
349	>	sendto_one_notice(client_p, &me, ":*** G-lined");
350	>
351	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
352		return BANNED_CLIENT;
353		}
354		}
#	Line 371 | Line 356 | verify_access(struct Client *client_p)
356		return NOT_AUTHORIZED;
357		}
358
359	<	/* attach_iline()
375	<	*
376	<	* inputs       - client pointer
377	<	*              - conf pointer
378	<	* output       -
379	<	* side effects - do actual attach
380	<	*/
381	<	static int
382	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
383	<	{
384	<	struct ClassItem *class = NULL;
385	<	struct ip_entry *ip_found;
386	<	int a_limit_reached = 0;
387	<	unsigned int local = 0, global = 0, ident = 0;
388	<
389	<	assert(conf->class);
390	<
391	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
392	<	ip_found->count++;
393	<	SetIpHash(client_p);
394	<
395	<	class = conf->class;
396	<
397	<	count_user_host(client_p->username, client_p->host,
398	<	&global, &local, &ident);
399	<
400	<	/* XXX blah. go down checking the various silly limits
401	<	* setting a_limit_reached if any limit is reached.
402	<	* - Dianora
403	<	*/
404	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
405	<	a_limit_reached = 1;
406	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
407	<	a_limit_reached = 1;
408	<	else if (class->max_local != 0 && local >= class->max_local)
409	<	a_limit_reached = 1;
410	<	else if (class->max_global != 0 && global >= class->max_global)
411	<	a_limit_reached = 1;
412	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
413	<	client_p->username[0] != '~')
414	<	a_limit_reached = 1;
415	<
416	<	if (a_limit_reached)
417	<	{
418	<	if (!IsConfExemptLimits(conf))
419	<	return TOO_MANY;   /* Already at maximum allowed */
420	<
421	<	sendto_one(client_p,
422	<	":%s NOTICE %s :*** Your connection class is full, "
423	<	"but you have exceed_limit = yes;", me.name, client_p->name);
424	<	}
425	<
426	<	return attach_conf(client_p, conf);
427	<	}
428	<
429	<	/* init_ip_hash_table()
430	<	*
431	<	* inputs               - NONE
432	<	* output               - NONE
433	<	* side effects         - allocate memory for ip_entry(s)
434	<	*                      - clear the ip hash table
435	<	*/
436	<	void
437	<	init_ip_hash_table(void)
438	<	{
439	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
440	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
441	<	}
442	<
443	<	/* find_or_add_ip()
444	<	*
445	<	* inputs       - pointer to struct irc_ssaddr
446	<	* output       - pointer to a struct ip_entry
447	<	* side effects -
359	>	/* check_client()
360		*
361	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
362	<	* count set to 0.
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	<	static struct ip_entry *
373	<	find_or_add_ip(struct irc_ssaddr *ip_in)
372	>	int
373	>	check_client(struct Client *source_p)
374		{
375	<	struct ip_entry *ptr, *newptr;
456	<	int hash_index = hash_ip(ip_in), res;
457	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
458	<	#ifdef IPV6
459	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
460	<	#endif
461	<
462	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
463	<	{
464	<	#ifdef IPV6
465	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
466	<	continue;
467	<	if (ip_in->ss.ss_family == AF_INET6)
468	<	{
469	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
470	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
471	<	}
472	<	else
473	<	#endif
474	<	{
475	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
476	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
477	<	}
478	<	if (res == 0)
479	<	{
480	<	/* Found entry already in hash, return it. */
481	<	return ptr;
482	<	}
483	<	}
484	<
485	<	if (ip_entries_count >= 2 * hard_fdlimit)
486	<	garbage_collect_ip_entries();
487	<
488	<	newptr = mp_pool_get(ip_entry_pool);
489	<	memset(newptr, 0, sizeof(*newptr));
490	<	ip_entries_count++;
491	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
492	<
493	<	newptr->next = ip_hash_table[hash_index];
494	<	ip_hash_table[hash_index] = newptr;
495	<
496	<	return newptr;
497	<	}
375	>	int i;
376
377	<	/* remove_one_ip()
378	<	*
379	<	* inputs        - unsigned long IP address value
502	<	* output        - NONE
503	<	* side effects  - The ip address given, is looked up in ip hash table
504	<	*                 and number of ip#'s for that ip decremented.
505	<	*                 If ip # count reaches 0 and has expired,
506	<	*                 the struct ip_entry is returned to the ip_entry_heap
507	<	*/
508	<	void
509	<	remove_one_ip(struct irc_ssaddr *ip_in)
510	<	{
511	<	struct ip_entry *ptr;
512	<	struct ip_entry *last_ptr = NULL;
513	<	int hash_index = hash_ip(ip_in), res;
514	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
515	<	#ifdef IPV6
516	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
517	<	#endif
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 (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
381	>	switch (i)
382		{
383	<	#ifdef IPV6
384	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
385	<	continue;
386	<	if (ip_in->ss.ss_family == AF_INET6)
387	<	{
388	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
389	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
390	<	}
391	<	else
392	<	#endif
531	<	{
532	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
533	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
534	<	}
535	<	if (res)
536	<	continue;
537	<	if (ptr->count > 0)
538	<	ptr->count--;
539	<	if (ptr->count == 0 &&
540	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
541	<	{
542	<	if (last_ptr != NULL)
543	<	last_ptr->next = ptr->next;
544	<	else
545	<	ip_hash_table[hash_index] = ptr->next;
546	<
547	<	mp_pool_release(ptr);
548	<	ip_entries_count--;
549	<	return;
550	<	}
551	<	last_ptr = ptr;
552	<	}
553	<	}
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	<	/* hash_ip()
395	<	*
396	<	* input        - pointer to an irc_inaddr
397	<	* output       - integer value used as index into hash table
398	<	* side effects - hopefully, none
399	<	*/
400	<	static int
401	<	hash_ip(struct irc_ssaddr *addr)
402	<	{
403	<	if (addr->ss.ss_family == AF_INET)
565	<	{
566	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
567	<	int hash;
568	<	uint32_t ip;
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	<	ip   = ntohl(v4->sin_addr.s_addr);
406	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
407	<	return hash;
408	<	}
409	<	#ifdef IPV6
410	<	else
411	<	{
412	<	int hash;
413	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
414	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
415	<
416	<	hash  = ip[0] ^ ip[3];
417	<	hash ^= hash >> 16;
583	<	hash ^= hash >> 8;
584	<	hash  = hash & (IP_HASH_SIZE - 1);
585	<	return hash;
586	<	}
587	<	#else
588	<	return 0;
589	<	#endif
590	<	}
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	<	/* count_ip_hash()
420	<	*
421	<	* inputs        - pointer to counter of number of ips hashed
595	<	*               - pointer to memory used for ip hash
596	<	* output        - returned via pointers input
597	<	* side effects  - NONE
598	<	*
599	<	* number of hashed ip #'s is counted up, plus the amount of memory
600	<	* used in the hash.
601	<	*/
602	<	void
603	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
604	<	{
605	<	struct ip_entry *ptr;
606	<	int i;
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "You are not authorized to use this server");
421	>	break;
422
423	<	*number_ips_stored = 0;
424	<	*mem_ips_stored    = 0;
423	>	case BANNED_CLIENT:
424	>	++ServerStats.is_ref;
425	>	exit_client(source_p, "Banned");
426	>	break;
427
428	<	for (i = 0; i < IP_HASH_SIZE; i++)
429	<	{
430	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
614	<	{
615	<	*number_ips_stored += 1;
616	<	*mem_ips_stored += sizeof(struct ip_entry);
617	<	}
428	>	case 0:
429	>	default:
430	>	break;
431		}
619	–	}
432
433	<	/* garbage_collect_ip_entries()
622	<	*
623	<	* input        - NONE
624	<	* output       - NONE
625	<	* side effects - free up all ip entries with no connections
626	<	*/
627	<	static void
628	<	garbage_collect_ip_entries(void)
629	<	{
630	<	struct ip_entry *ptr;
631	<	struct ip_entry *last_ptr;
632	<	struct ip_entry *next_ptr;
633	<	int i;
634	<
635	<	for (i = 0; i < IP_HASH_SIZE; i++)
636	<	{
637	<	last_ptr = NULL;
638	<
639	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
640	<	{
641	<	next_ptr = ptr->next;
642	<
643	<	if (ptr->count == 0 &&
644	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
645	<	{
646	<	if (last_ptr != NULL)
647	<	last_ptr->next = ptr->next;
648	<	else
649	<	ip_hash_table[i] = ptr->next;
650	<	mp_pool_release(ptr);
651	<	ip_entries_count--;
652	<	}
653	<	else
654	<	last_ptr = ptr;
655	<	}
656	<	}
433	>	return !(i < 0);
434		}
435
436		/* detach_conf()
#	Line 667 | Line 444 | garbage_collect_ip_entries(void)
444		void
445		detach_conf(struct Client *client_p, enum maskitem_type type)
446		{
447	<	dlink_node *ptr = NULL, *next_ptr = NULL;
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	<	struct MaskItem *conf = ptr->data;
451	>	struct MaskItem *conf = node->data;
452
453		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
454		assert(conf->ref_count > 0);
#	Line 680 | Line 457 | detach_conf(struct Client *client_p, enu
457		if (!(conf->type & type))
458		continue;
459
460	<	dlinkDelete(ptr, &client_p->localClient->confs);
461	<	free_dlink_node(ptr);
460	>	dlinkDelete(node, &client_p->connection->confs);
461	>	free_dlink_node(node);
462
463		if (conf->type == CONF_CLIENT)
464	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
464	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
465
466		if (--conf->class->ref_count == 0 && conf->class->active == 0)
467		{
#	Line 710 | Line 487 | detach_conf(struct Client *client_p, enu
487		int
488		attach_conf(struct Client *client_p, struct MaskItem *conf)
489		{
490	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
490	>	if (dlinkFind(&client_p->connection->confs, conf))
491		return 1;
492
493		if (conf->type == CONF_CLIENT)
494		if (cidr_limit_reached(IsConfExemptLimits(conf),
495	<	&client_p->localClient->ip, conf->class))
495	>	&client_p->connection->ip, conf->class))
496		return TOO_MANY;    /* Already at maximum allowed */
497
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 738 | Line 515 | int
515		attach_connect_block(struct Client *client_p, const char *name,
516		const char *host)
517		{
518	<	dlink_node *ptr;
742	<	struct MaskItem *conf = NULL;
743	<
744	<	assert(client_p != NULL);
745	<	assert(host != NULL);
518	>	dlink_node *node = NULL;
519
520	<	if (client_p == NULL || host == NULL)
748	<	return 0;
520	>	assert(host);
521
522	<	DLINK_FOREACH(ptr, server_items.head)
522	>	DLINK_FOREACH(node, server_items.head)
523		{
524	<	conf = ptr->data;
524	>	struct MaskItem *conf = node->data;
525
526		if (match(conf->name, name) || match(conf->host, host))
527		continue;
#	Line 773 | Line 545 | attach_connect_block(struct Client *clie
545		struct MaskItem *
546		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
547		{
548	<	dlink_node *ptr;
777	<	struct MaskItem* 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)))
787	<	return conf;
556	>	if (conf->name && !irccmp(conf->name, name))
557	>	return conf;
558		}
559		}
560
561		return NULL;
562		}
563
794	–	/* map_to_list()
795	–	*
796	–	* inputs       - ConfType conf
797	–	* output       - pointer to dlink_list to use
798	–	* side effects - none
799	–	*/
800	–	static dlink_list *
801	–	map_to_list(enum maskitem_type type)
802	–	{
803	–	switch(type)
804	–	{
805	–	case CONF_XLINE:
806	–	return(&xconf_items);
807	–	break;
808	–	case CONF_ULINE:
809	–	return(&uconf_items);
810	–	break;
811	–	case CONF_NRESV:
812	–	return(&nresv_items);
813	–	break;
814	–	case CONF_CRESV:
815	–	return(&cresv_items);
816	–	case CONF_OPER:
817	–	return(&oconf_items);
818	–	break;
819	–	case CONF_SERVER:
820	–	return(&server_items);
821	–	break;
822	–	case CONF_SERVICE:
823	–	return(&service_items);
824	–	break;
825	–	case CONF_CLUSTER:
826	–	return(&cluster_items);
827	–	break;
828	–	default:
829	–	return NULL;
830	–	}
831	–	}
832	–
564		/* find_matching_name_conf()
565		*
566		* inputs       - type of link list to look in
#	Line 844 | Line 575 | 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 *ptr=NULL;
579	<	struct MaskItem *conf=NULL;
580	<	dlink_list *list_p = map_to_list(type);
578	>	dlink_node *node = NULL;
579	>	dlink_list *list = map_to_list(type);
580	>	struct MaskItem *conf = NULL;
581
582		switch (type)
583		{
584		case CONF_SERVICE:
585	<	DLINK_FOREACH(ptr, list_p->head)
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;
#	Line 866 | Line 597 | find_matching_name_conf(enum maskitem_ty
597		case CONF_ULINE:
598		case CONF_NRESV:
599		case CONF_CRESV:
600	<	DLINK_FOREACH(ptr, list_p->head)
600	>	DLINK_FOREACH(node, list->head)
601		{
602	<	conf = ptr->data;
602	>	conf = node->data;
603
604		if (EmptyString(conf->name))
605		continue;
606	<	if ((name != NULL) && !match(conf->name, name))
606	>	if (name && !match(conf->name, name))
607		{
608		if ((user == NULL && (host == NULL)))
609		return conf;
#	Line 887 | Line 618 | find_matching_name_conf(enum maskitem_ty
618		break;
619
620		case CONF_SERVER:
621	<	DLINK_FOREACH(ptr, list_p->head)
621	>	DLINK_FOREACH(node, list->head)
622		{
623	<	conf = ptr->data;
623	>	conf = node->data;
624
625	<	if ((name != NULL) && !match(name, conf->name))
625	>	if (name && !match(name, conf->name))
626		return conf;
627	<	else if ((host != NULL) && !match(host, conf->host))
627	>	if (host && !match(host, conf->host))
628		return conf;
629		}
630		break;
631	<
631	>
632		default:
633		break;
634		}
#	Line 917 | Line 648 | 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 MaskItem *conf;
653	<	dlink_list *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		{
#	Line 928 | Line 659 | find_exact_name_conf(enum maskitem_type
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;
664	>	conf = node->data;
665
666		if (EmptyString(conf->name))
667		continue;
668	<
668	>
669		if (irccmp(conf->name, name) == 0)
670		{
671		if ((user == NULL && (host == NULL)))
#	Line 948 | Line 679 | find_exact_name_conf(enum maskitem_type
679		break;
680
681		case CONF_OPER:
682	<	DLINK_FOREACH(ptr, list_p->head)
682	>	DLINK_FOREACH(node, list->head)
683		{
684	<	conf = ptr->data;
684	>	conf = node->data;
685
686		if (EmptyString(conf->name))
687		continue;
#	Line 971 | Line 702 | find_exact_name_conf(enum maskitem_type
702		return conf;
703		break;
704		case HM_IPV4:
705	<	if (who->localClient->aftype == AF_INET)
706	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
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;
979	–	#ifdef IPV6
710		case HM_IPV6:
711	<	if (who->localClient->aftype == AF_INET6)
712	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
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;
986	–	#endif
716		default:
717		assert(0);
718		}
#	Line 994 | Line 723 | find_exact_name_conf(enum maskitem_type
723		break;
724
725		case CONF_SERVER:
726	<	DLINK_FOREACH(ptr, list_p->head)
726	>	DLINK_FOREACH(node, list->head)
727		{
728	<	conf = ptr->data;
728	>	conf = node->data;
729
730		if (EmptyString(conf->name))
731		continue;
732	<
732	>
733		if (name == NULL)
734		{
735		if (EmptyString(conf->host))
#	Line 1021 | Line 750 | find_exact_name_conf(enum maskitem_type
750		return NULL;
751		}
752
1024	–	/* rehash()
1025	–	*
1026	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1027	–	* as a result of an operator issuing this command, else assume it has been
1028	–	* called as a result of the server receiving a HUP signal.
1029	–	*/
1030	–	int
1031	–	rehash(int sig)
1032	–	{
1033	–	if (sig != 0)
1034	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1035	–	"Got signal SIGHUP, reloading configuration file(s)");
1036	–
1037	–	restart_resolver();
1038	–
1039	–	/* don't close listeners until we know we can go ahead with the rehash */
1040	–
1041	–	/* Check to see if we magically got(or lost) IPv6 support */
1042	–	check_can_use_v6();
1043	–
1044	–	read_conf_files(0);
1045	–
1046	–	if (ServerInfo.description != NULL)
1047	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1048	–
1049	–	load_conf_modules();
1050	–
1051	–	rehashed_klines = 1;
1052	–
1053	–	return 0;
1054	–	}
1055	–
753		/* set_default_conf()
754		*
755		* inputs       - NONE
#	Line 1071 | Line 768 | set_default_conf(void)
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	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
789	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
790	<
791	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
792	<	ServerInfo.specific_ipv4_vhost = 0;
793	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
794	<	ServerInfo.specific_ipv6_vhost = 0;
795	<
796	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
797	<	ServerInfo.max_nick_length = 9;
798	<	ServerInfo.max_topic_length = 80;
799	<
800	<	ServerInfo.hub = 0;
801	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
802	<	ServerInfo.dns_host.sin_port = 0;
803	<	AdminInfo.name = NULL;
804	<	AdminInfo.email = NULL;
805	<	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	>	/* 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		log_del_all();
812
813	<	ConfigLoggingEntry.use_logging = 1;
813	>	ConfigLog.use_logging = 1;
814
815		ConfigChannel.disable_fake_channels = 0;
816	<	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;
1108	<	ConfigChannel.max_chans_per_oper = 50;
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 1121 | Line 836 | set_default_conf(void)
836		ConfigServerHide.hide_server_ips = 0;
837		ConfigServerHide.disable_remote_commands = 0;
838
839	<
840	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
841	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
842	<	ConfigFileEntry.cycle_on_host_change = 1;
843	<	ConfigFileEntry.glines = 0;
844	<	ConfigFileEntry.gline_time = 12 * 3600;
845	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
846	<	ConfigFileEntry.gline_min_cidr = 16;
847	<	ConfigFileEntry.gline_min_cidr6 = 48;
848	<	ConfigFileEntry.invisible_on_connect = 1;
849	<	ConfigFileEntry.tkline_expire_notices = 1;
850	<	ConfigFileEntry.hide_spoof_ips = 1;
851	<	ConfigFileEntry.ignore_bogus_ts = 0;
852	<	ConfigFileEntry.disable_auth = 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.stats_u_oper_only = 0;
872	<	ConfigFileEntry.caller_id_wait = 60;
873	<	ConfigFileEntry.opers_bypass_callerid = 0;
874	<	ConfigFileEntry.pace_wait = 10;
875	<	ConfigFileEntry.pace_wait_simple = 1;
876	<	ConfigFileEntry.short_motd = 0;
877	<	ConfigFileEntry.ping_cookie = 0;
878	<	ConfigFileEntry.no_oper_flood = 0;
879	<	ConfigFileEntry.true_no_oper_flood = 0;
880	<	ConfigFileEntry.oper_pass_resv = 1;
881	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
882	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
883	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
884	<	UMODE_OPERWALL | UMODE_WALLOP;
885	<	ConfigFileEntry.use_egd = 0;
886	<	ConfigFileEntry.egdpool_path = NULL;
887	<	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;
1180	<
1181	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1182	<	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	<	ServerInfo.network_name = xstrdup(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	<	ServerInfo.network_desc = xstrdup(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	<	ConfigFileEntry.service_name = xstrdup(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 1204 | 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	<	class_delete_marked();      /* 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	>	int
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	>	return 0;
955		}
956
957		/* lookup_confhost()
#	Line 1227 | Line 964 | lookup_confhost(struct MaskItem *conf)
964		{
965		struct addrinfo hints, *res;
966
967	<	/* Do name lookup now on hostnames given and store the
967	>	/*
968	>	* Do name lookup now on hostnames given and store the
969		* ip numbers in conf structure.
970		*/
971		memset(&hints, 0, sizeof(hints));
#	Line 1244 | Line 982 | lookup_confhost(struct MaskItem *conf)
982		return;
983		}
984
985	<	assert(res != NULL);
985	>	assert(res);
986
987		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
988		conf->addr.ss_len = res->ai_addrlen;
#	Line 1263 | Line 1001 | lookup_confhost(struct MaskItem *conf)
1001		int
1002		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1003		{
1004	<	struct ip_entry *ip_found;
1005	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
1004	>	struct ip_entry *ip_found = NULL;
1005	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
1006
1007		/* DLINE exempt also gets you out of static limits/pacing... */
1008		if (conf && (conf->type == CONF_EXEMPT))
1009		return 0;
1010
1011	<	if (conf != NULL)
1011	>	if (conf)
1012		return BANNED_CLIENT;
1013
1014	<	ip_found = find_or_add_ip(addr);
1014	>	ip_found = ipcache_find_or_add_address(addr);
1015
1016	<	if ((CurrentTime - ip_found->last_attempt) <
1279	<	ConfigFileEntry.throttle_time)
1016	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1017		{
1018	<	ip_found->last_attempt = CurrentTime;
1019	<	return TOO_FAST;
1018	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1019	>	return TOO_FAST;
1020	>
1021	>	++ip_found->connection_count;
1022		}
1023	+	else
1024	+	ip_found->connection_count = 1;
1025
1026		ip_found->last_attempt = CurrentTime;
1027		return 0;
1028		}
1029
1289	–	/* cleanup_tklines()
1290	–	*
1291	–	* inputs       - NONE
1292	–	* output       - NONE
1293	–	* side effects - call function to expire temporary k/d lines
1294	–	*                This is an event started off in ircd.c
1295	–	*/
1296	–	void
1297	–	cleanup_tklines(void *notused)
1298	–	{
1299	–	hostmask_expire_temporary();
1300	–	expire_tklines(&xconf_items);
1301	–	expire_tklines(&nresv_items);
1302	–	expire_tklines(&cresv_items);
1303	–	}
1304	–
1030		/* expire_tklines()
1031		*
1032		* inputs       - tkline list pointer
#	Line 1309 | Line 1034 | cleanup_tklines(void *notused)
1034		* side effects - expire tklines
1035		*/
1036		static void
1037	<	expire_tklines(dlink_list *tklist)
1037	>	expire_tklines(dlink_list *list)
1038		{
1039	<	dlink_node *ptr;
1315	<	dlink_node *next_ptr;
1316	<	struct MaskItem *conf;
1039	>	dlink_node *node = NULL, *node_next = NULL;
1040
1041	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1041	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1042		{
1043	<	conf = ptr->data;
1043	>	struct MaskItem *conf = node->data;
1044
1045		if (!conf->until || conf->until > CurrentTime)
1046		continue;
1047
1048		if (conf->type == CONF_XLINE)
1049		{
1050	<	if (ConfigFileEntry.tkline_expire_notices)
1050	>	if (ConfigGeneral.tkline_expire_notices)
1051		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1052	<	"Temporary X-line for [%s] expired", conf->name);
1052	>	"Temporary X-line for [%s] expired", conf->name);
1053		conf_free(conf);
1054		}
1055		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1056		{
1057	<	if (ConfigFileEntry.tkline_expire_notices)
1057	>	if (ConfigGeneral.tkline_expire_notices)
1058		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1059	<	"Temporary RESV for [%s] expired", conf->name);
1059	>	"Temporary RESV for [%s] expired", conf->name);
1060		conf_free(conf);
1061		}
1062		}
1063		}
1064
1065	+	/* cleanup_tklines()
1066	+	*
1067	+	* inputs       - NONE
1068	+	* output       - NONE
1069	+	* side effects - call function to expire temporary k/d lines
1070	+	*                This is an event started off in ircd.c
1071	+	*/
1072	+	void
1073	+	cleanup_tklines(void *unused)
1074	+	{
1075	+	hostmask_expire_temporary();
1076	+	expire_tklines(&xconf_items);
1077	+	expire_tklines(&nresv_items);
1078	+	expire_tklines(&cresv_items);
1079	+	}
1080	+
1081		/* oper_privs_as_string()
1082		*
1083		* inputs        - pointer to client_p
#	Line 1355 | Line 1094 | static const struct oper_privs
1094		{ OPER_FLAG_DIE,            'D' },
1095		{ OPER_FLAG_GLINE,          'G' },
1096		{ OPER_FLAG_REHASH,         'H' },
1097	<	{ OPER_FLAG_K,              'K' },
1359	<	{ OPER_FLAG_OPERWALL,       'L' },
1097	>	{ OPER_FLAG_KLINE,          'K' },
1098		{ OPER_FLAG_KILL,           'N' },
1099		{ OPER_FLAG_KILL_REMOTE,    'O' },
1100		{ OPER_FLAG_CONNECT,        'P' },
#	Line 1373 | Line 1111 | oper_privs_as_string(const unsigned int
1111		{
1112		static char privs_out[IRCD_BUFSIZE];
1113		char *privs_ptr = privs_out;
1376	–	const struct oper_privs *opriv = flag_list;
1114
1115	<	for (; opriv->flag; ++opriv)
1115	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1116		{
1117		if (port & opriv->flag)
1118		*privs_ptr++ = opriv->c;
#	Line 1389 | Line 1126 | oper_privs_as_string(const unsigned int
1126		}
1127
1128		/*
1129	<	* Input: A client to find the active oper{} name for.
1129	>	* Input: A client to find the active operator {} name for.
1130		* Output: The nick!user@host{oper} of the oper.
1131		*         "oper" is server name for remote opers
1132		* Side effects: None.
#	Line 1397 | Line 1134 | oper_privs_as_string(const unsigned int
1134		const char *
1135		get_oper_name(const struct Client *client_p)
1136		{
1137	<	dlink_node *cnode = NULL;
1138	<	/* +5 for !,@,{,} and null */
1139	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1137	>	static char buffer[IRCD_BUFSIZE];
1138	>
1139	>	if (IsServer(client_p))
1140	>	return client_p->name;
1141
1142		if (MyConnect(client_p))
1143		{
1144	<	if ((cnode = client_p->localClient->confs.head))
1144	>	const dlink_node *const node = client_p->connection->confs.head;
1145	>
1146	>	if (node)
1147		{
1148	<	struct MaskItem *conf = cnode->data;
1148	>	const struct MaskItem *const conf = node->data;
1149
1150	<	if (IsConfOperator(conf))
1150	>	if (conf->type == CONF_OPER)
1151		{
1152		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1153		client_p->username, client_p->host, conf->name);
#	Line 1415 | Line 1155 | get_oper_name(const struct Client *clien
1155		}
1156		}
1157
1158	<	/* Probably should assert here for now. If there is an oper out there
1159	<	* with no oper{} conf attached, it would be good for us to know...
1158	>	/*
1159	>	* Probably should assert here for now. If there is an oper out there
1160	>	* with no operator {} conf attached, it would be good for us to know...
1161		*/
1162	<	assert(0); /* Oper without oper conf! */
1162	>	assert(0);  /* Oper without oper conf! */
1163		}
1164
1165		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1426 | Line 1167 | get_oper_name(const struct Client *clien
1167		return buffer;
1168		}
1169
1429	–	/* read_conf_files()
1430	–	*
1431	–	* inputs       - cold start YES or NO
1432	–	* output       - none
1433	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1434	–	*/
1435	–	void
1436	–	read_conf_files(int cold)
1437	–	{
1438	–	const char *filename;
1439	–	char chanmodes[IRCD_BUFSIZE];
1440	–	char chanlimit[IRCD_BUFSIZE];
1441	–
1442	–	conf_parser_ctx.boot = cold;
1443	–	filename = ConfigFileEntry.configfile;
1444	–
1445	–	/* We need to know the initial filename for the yyerror() to report
1446	–	FIXME: The full path is in conffilenamebuf first time since we
1447	–	dont know anything else
1448	–
1449	–	- Gozem 2002-07-21
1450	–	*/
1451	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1452	–
1453	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1454	–	{
1455	–	if (cold)
1456	–	{
1457	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1458	–	filename, strerror(errno));
1459	–	exit(-1);
1460	–	}
1461	–	else
1462	–	{
1463	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1464	–	"Unable to read configuration file '%s': %s",
1465	–	filename, strerror(errno));
1466	–	return;
1467	–	}
1468	–	}
1469	–
1470	–	if (!cold)
1471	–	clear_out_old_conf();
1472	–
1473	–	read_conf(conf_parser_ctx.conf_file);
1474	–	fclose(conf_parser_ctx.conf_file);
1475	–
1476	–	log_reopen_all();
1477	–
1478	–	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1479	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1480	–
1481	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1482	–	add_isupport("MAXLIST", chanmodes, -1);
1483	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1484	–	add_isupport("CHANTYPES", "#", -1);
1485	–
1486	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1487	–	ConfigChannel.max_chans_per_user);
1488	–	add_isupport("CHANLIMIT", chanlimit, -1);
1489	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1490	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1491	–	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1492	–	add_isupport("CHANMODES", chanmodes, -1);
1493	–
1494	–	/*
1495	–	* message_locale may have changed.  rebuild isupport since it relies
1496	–	* on strlen(form_str(RPL_ISUPPORT))
1497	–	*/
1498	–	rebuild_isupport_message_line();
1499	–	}
1500	–
1170		/* clear_out_old_conf()
1171		*
1172		* inputs       - none
#	Line 1507 | Line 1176 | read_conf_files(int cold)
1176		static void
1177		clear_out_old_conf(void)
1178		{
1179	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1511	<	struct MaskItem *conf;
1179	>	dlink_node *node = NULL, *node_next = NULL;
1180		dlink_list *free_items [] = {
1181		&server_items,   &oconf_items,
1182		&uconf_items,   &xconf_items,
#	Line 1520 | Line 1188 | clear_out_old_conf(void)
1188		/* We only need to free anything allocated by yyparse() here.
1189		* Resetting structs, etc, is taken care of by set_default_conf().
1190		*/
1191	<
1192	<	for (; *iterator != NULL; iterator++)
1191	>
1192	>	for (; *iterator; iterator++)
1193		{
1194	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1194	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1195		{
1196	<	conf = ptr->data;
1196	>	struct MaskItem *conf = node->data;
1197
1198	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1198	>	conf->active = 0;
1199	>	dlinkDelete(&conf->node, *iterator);
1200
1201		/* XXX This is less than pretty */
1202		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
#	Line 1548 | Line 1217 | clear_out_old_conf(void)
1217		motd_clear();
1218
1219		/*
1220	<	* don't delete the class table, rather mark all entries
1221	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1220	>	* Don't delete the class table, rather mark all entries for deletion.
1221	>	* The table is cleaned up by class_delete_marked. - avalon
1222		*/
1223		class_mark_for_deletion();
1224
1225		clear_out_address_conf();
1226
1227	<	/* clean out module paths */
1227	>	/* Clean out module paths */
1228		mod_clear_paths();
1229
1230	<	/* clean out ServerInfo */
1231	<	MyFree(ServerInfo.description);
1232	<	ServerInfo.description = NULL;
1233	<	MyFree(ServerInfo.network_name);
1234	<	ServerInfo.network_name = NULL;
1235	<	MyFree(ServerInfo.network_desc);
1236	<	ServerInfo.network_desc = NULL;
1237	<	MyFree(ConfigFileEntry.egdpool_path);
1238	<	ConfigFileEntry.egdpool_path = NULL;
1230	>	pseudo_clear();
1231	>
1232	>	/* Clean out ConfigServerInfo */
1233	>	MyFree(ConfigServerInfo.description);
1234	>	ConfigServerInfo.description = NULL;
1235	>	MyFree(ConfigServerInfo.network_name);
1236	>	ConfigServerInfo.network_name = NULL;
1237	>	MyFree(ConfigServerInfo.network_desc);
1238	>	ConfigServerInfo.network_desc = NULL;
1239		#ifdef HAVE_LIBCRYPTO
1240	<	if (ServerInfo.rsa_private_key != NULL)
1240	>	if (ConfigServerInfo.rsa_private_key)
1241		{
1242	<	RSA_free(ServerInfo.rsa_private_key);
1243	<	ServerInfo.rsa_private_key = NULL;
1242	>	RSA_free(ConfigServerInfo.rsa_private_key);
1243	>	ConfigServerInfo.rsa_private_key = NULL;
1244		}
1245
1246	<	MyFree(ServerInfo.rsa_private_key_file);
1247	<	ServerInfo.rsa_private_key_file = NULL;
1579	<
1580	<	if (ServerInfo.server_ctx)
1581	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1582	<	SSL_OP_NO_SSLv3|
1583	<	SSL_OP_NO_TLSv1);
1584	<	if (ServerInfo.client_ctx)
1585	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1586	<	SSL_OP_NO_SSLv3|
1587	<	SSL_OP_NO_TLSv1);
1246	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1247	>	ConfigServerInfo.rsa_private_key_file = NULL;
1248		#endif
1249
1250	<	/* clean out AdminInfo */
1251	<	MyFree(AdminInfo.name);
1252	<	AdminInfo.name = NULL;
1253	<	MyFree(AdminInfo.email);
1254	<	AdminInfo.email = NULL;
1255	<	MyFree(AdminInfo.description);
1256	<	AdminInfo.description = NULL;
1250	>	/* Clean out ConfigAdminInfo */
1251	>	MyFree(ConfigAdminInfo.name);
1252	>	ConfigAdminInfo.name = NULL;
1253	>	MyFree(ConfigAdminInfo.email);
1254	>	ConfigAdminInfo.email = NULL;
1255	>	MyFree(ConfigAdminInfo.description);
1256	>	ConfigAdminInfo.description = NULL;
1257
1258	<	/* clean out listeners */
1258	>	/* Clean out listeners */
1259		close_listeners();
1260	+	}
1261	+
1262	+	/* read_conf_files()
1263	+	*
1264	+	* inputs       - cold start YES or NO
1265	+	* output       - none
1266	+	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1267	+	*/
1268	+	void
1269	+	read_conf_files(int cold)
1270	+	{
1271	+	const char *filename = NULL;
1272	+	char chanmodes[IRCD_BUFSIZE] = "";
1273	+	char chanlimit[IRCD_BUFSIZE] = "";
1274	+
1275	+	conf_parser_ctx.boot = cold;
1276	+	filename = ConfigGeneral.configfile;
1277	+
1278	+	/* We need to know the initial filename for the yyerror() to report
1279	+	FIXME: The full path is in conffilenamebuf first time since we
1280	+	don't know anything else
1281	+
1282	+	- Gozem 2002-07-21
1283	+	*/
1284	+	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1285	+
1286	+	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1287	+	{
1288	+	if (cold)
1289	+	{
1290	+	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1291	+	filename, strerror(errno));
1292	+	exit(-1);
1293	+	}
1294	+	else
1295	+	{
1296	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1297	+	"Unable to read configuration file '%s': %s",
1298	+	filename, strerror(errno));
1299	+	return;
1300	+	}
1301	+	}
1302	+
1303	+	if (!cold)
1304	+	clear_out_old_conf();
1305	+
1306	+	read_conf(conf_parser_ctx.conf_file);
1307	+	fclose(conf_parser_ctx.conf_file);
1308
1309	<	/* clean out general */
1310	<	MyFree(ConfigFileEntry.service_name);
1311	<	ConfigFileEntry.service_name = NULL;
1309	>	log_reopen_all();
1310	>
1311	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1312	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1313	>
1314	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1315	>	add_isupport("MAXLIST", chanmodes, -1);
1316	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1317	>	add_isupport("CHANTYPES", "#", -1);
1318	>
1319	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1320	>	ConfigChannel.max_channels);
1321	>	add_isupport("CHANLIMIT", chanlimit, -1);
1322	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1323	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1324	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1325	>	add_isupport("CHANMODES", chanmodes, -1);
1326	>
1327	>	/*
1328	>	* message_locale may have changed.  rebuild isupport since it relies
1329	>	* on strlen(form_str(RPL_ISUPPORT))
1330	>	*/
1331	>	rebuild_isupport_message_line();
1332		}
1333
1334		/* conf_add_class_to_conf()
1335		*
1336		* inputs       - pointer to config item
1337		* output       - NONE
1338	<	* side effects - Add a class pointer to a conf
1338	>	* side effects - Add a class pointer to a conf
1339		*/
1340		void
1341		conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1342		{
1343	<	if (class_name == NULL)
1343	>	if (class_name == NULL)
1344		{
1345		conf->class = class_default;
1346
1347	<	if (conf->type == CONF_CLIENT)
1347	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1348		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1349		"Warning *** Defaulting to default class for %s@%s",
1350		conf->user, conf->host);
#	Line 1630 | Line 1358 | conf_add_class_to_conf(struct MaskItem *
1358
1359		if (conf->class == NULL)
1360		{
1361	<	if (conf->type == CONF_CLIENT)
1361	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1362		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1363		"Warning *** Defaulting to default class for %s@%s",
1364		conf->user, conf->host);
#	Line 1679 | Line 1407 | conf_error_report(const char *msg)
1407
1408		/*
1409		* valid_tkline()
1410	<	*
1410	>	*
1411		* inputs       - pointer to ascii string to check
1412		*              - whether the specified time is in seconds or minutes
1413		* output       - -1 not enough parameters
#	Line 1704 | Line 1432 | valid_tkline(const char *data, const int
1432		}
1433
1434		/*
1435	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1436	<	* i.e. they specifically use 0, I am going to return 1 instead
1437	<	* as a return value of non-zero is used to flag it as a temporary kline
1435	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1436	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1437	>	* value of non-zero is used to flag it as a temporary kline
1438		*/
1439		if (result == 0)
1440		result = 1;
1441
1442	<	/*
1442	>	/*
1443		* If the incoming time is in seconds convert it to minutes for the purpose
1444		* of this calculation
1445		*/
1446		if (!minutes)
1447	<	result = result / 60;
1447	>	result = result / 60;
1448
1449		if (result > MAX_TDKLINE_TIME)
1450		result = MAX_TDKLINE_TIME;
1451
1452	<	result = result * 60;  /* turn it into seconds */
1452	>	result = result * 60;  /* Turn it into seconds */
1453
1454		return result;
1455		}
#	Line 1737 | Line 1465 | valid_wild_card_simple(const char *data)
1465		{
1466		const unsigned char *p = (const unsigned char *)data;
1467		unsigned char tmpch = '\0';
1468	<	int nonwild = 0;
1468	>	unsigned int nonwild = 0;
1469
1470		while ((tmpch = *p++))
1471		{
1472	<	if (tmpch == '\\')
1472	>	if (tmpch == '\\' && *p)
1473		{
1474		++p;
1475	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1475	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1476		return 1;
1477		}
1478		else if (!IsMWildChar(tmpch))
1479		{
1480	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1480	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1481		return 1;
1482		}
1483		}
#	Line 1768 | Line 1496 | valid_wild_card_simple(const char *data)
1496		int
1497		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1498		{
1499	<	char tmpch;
1500	<	int nonwild = 0;
1499	>	unsigned char tmpch = '\0';
1500	>	unsigned int nonwild = 0;
1501		va_list args;
1502
1503		/*
#	Line 1788 | Line 1516 | valid_wild_card(struct Client *source_p,
1516
1517		while (count--)
1518		{
1519	<	const char *p = va_arg(args, const char *);
1519	>	const unsigned char *p = va_arg(args, const unsigned char *);
1520		if (p == NULL)
1521		continue;
1522
#	Line 1800 | Line 1528 | valid_wild_card(struct Client *source_p,
1528		* If we find enough non-wild characters, we can
1529		* break - no point in searching further.
1530		*/
1531	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1531	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1532		{
1533		va_end(args);
1534		return 1;
#	Line 1810 | Line 1538 | valid_wild_card(struct Client *source_p,
1538		}
1539
1540		if (warn)
1541	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1542	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1541	>	sendto_one_notice(source_p, &me,
1542	>	":Please include at least %u non-wildcard characters with the mask",
1543	>	ConfigGeneral.min_nonwildcard);
1544		va_end(args);
1545		return 0;
1546		}
1547
1548	+	/* find_user_host()
1549	+	*
1550	+	* inputs       - pointer to client placing kline
1551	+	*              - pointer to user_host_or_nick
1552	+	*              - pointer to user buffer
1553	+	*              - pointer to host buffer
1554	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1555	+	* side effects -
1556	+	*/
1557	+	static int
1558	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1559	+	char *luser, char *lhost, unsigned int flags)
1560	+	{
1561	+	struct Client *target_p = NULL;
1562	+	char *hostp = NULL;
1563	+
1564	+	if (lhost == NULL)
1565	+	{
1566	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1567	+	return 1;
1568	+	}
1569	+
1570	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1571	+	{
1572	+	/* Explicit user@host mask given */
1573	+	if (hostp)                            /* I'm a little user@host */
1574	+	{
1575	+	*(hostp++) = '\0';                       /* short and squat */
1576	+
1577	+	if (*user_host_or_nick)
1578	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1579	+	else
1580	+	strcpy(luser, "*");
1581	+
1582	+	if (*hostp)
1583	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1584	+	else
1585	+	strcpy(lhost, "*");
1586	+	}
1587	+	else
1588	+	{
1589	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1590	+	luser[1] = '\0';
1591	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1592	+	}
1593	+
1594	+	return 1;
1595	+	}
1596	+	else
1597	+	{
1598	+	/* Try to find user@host mask from nick */
1599	+	/* Okay to use source_p as the first param, because source_p == client_p */
1600	+	if ((target_p =
1601	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1602	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1603	+
1604	+	if (IsExemptKline(target_p))
1605	+	{
1606	+	if (IsClient(source_p))
1607	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1608	+	return 0;
1609	+	}
1610	+
1611	+	/*
1612	+	* Turn the "user" bit into "*user", blow away '~'
1613	+	* if found in original user name (non-idented)
1614	+	*/
1615	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1616	+
1617	+	if (target_p->username[0] == '~')
1618	+	luser[0] = '*';
1619	+
1620	+	if (!strcmp(target_p->sockhost, "0"))
1621	+	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1622	+	else
1623	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1624	+	return 1;
1625	+	}
1626	+
1627	+	return 0;
1628	+	}
1629	+
1630		/* XXX should this go into a separate file ? -Dianora */
1631		/* parse_aline
1632		*
#	Line 1826 | Line 1637 | valid_wild_card(struct Client *source_p,
1637		*              - parse_flags bit map of things to test
1638		*              - pointer to user or string to parse into
1639		*              - pointer to host or NULL to parse into if non NULL
1640	<	*              - pointer to optional tkline time or NULL
1640	>	*              - pointer to optional tkline time or NULL
1641		*              - pointer to target_server to parse into if non NULL
1642		*              - pointer to reason to parse into
1643		*
#	Line 1853 | Line 1664 | parse_aline(const char *cmd, struct Clie
1664		char **target_server, char **reason)
1665		{
1666		int found_tkline_time=0;
1667	<	static char def_reason[] = "No Reason";
1667	>	static char def_reason[] = CONF_NOREASON;
1668		static char user[USERLEN*4+1];
1669		static char host[HOSTLEN*4+1];
1670
#	Line 1862 | Line 1673 | parse_aline(const char *cmd, struct Clie
1673
1674		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1675
1676	<	if (found_tkline_time != 0)
1676	>	if (found_tkline_time)
1677		{
1678		parv++;
1679		parc--;
1680
1681	<	if (tkline_time != NULL)
1681	>	if (tkline_time)
1682		*tkline_time = found_tkline_time;
1683		else
1684		{
1685	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1875	<	me.name, source_p->name, cmd);
1685	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1686		return -1;
1687		}
1688		}
1689
1690		if (parc == 0)
1691		{
1692	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1883	<	me.name, source_p->name, cmd);
1692	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1693		return -1;
1694		}
1695
#	Line 1894 | Line 1703 | parse_aline(const char *cmd, struct Clie
1703		*up_p = user;
1704		*h_p = host;
1705		}
1706	<
1706	>
1707		parc--;
1708		parv++;
1709
1710	<	if (parc != 0)
1710	>	if (parc)
1711		{
1712		if (irccmp(*parv, "ON") == 0)
1713		{
#	Line 1907 | Line 1716 | parse_aline(const char *cmd, struct Clie
1716
1717		if (target_server == NULL)
1718		{
1719	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1911	<	me.name, source_p->name, cmd);
1719	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1720		return -1;
1721		}
1722
1723		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1724		{
1725	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1918	<	me.name, source_p->name, "remoteban");
1725	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1726		return -1;
1727		}
1728
1729		if (parc == 0 || EmptyString(*parv))
1730		{
1731	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1925	<	me.name, source_p->name, cmd);
1731	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1732		return -1;
1733		}
1734
#	Line 1935 | Line 1741 | parse_aline(const char *cmd, struct Clie
1741		/* Make sure target_server *is* NULL if no ON server found
1742		* caller probably NULL'd it first, but no harm to do it again -db
1743		*/
1744	<	if (target_server != NULL)
1744	>	if (target_server)
1745		*target_server = NULL;
1746		}
1747		}
1748
1749	<	if (h_p != NULL)
1749	>	if (h_p)
1750		{
1751	<	if (strchr(user, '!') != NULL)
1751	>	if (strchr(user, '!'))
1752		{
1753	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1948	<	me.name, source_p->name);
1753	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1754		return -1;
1755		}
1756
#	Line 1956 | Line 1761 | parse_aline(const char *cmd, struct Clie
1761		if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1762		return -1;
1763
1764	<	if (reason != NULL)
1764	>	if (reason)
1765		{
1766	<	if (parc != 0 && !EmptyString(*parv))
1766	>	if (parc && !EmptyString(*parv))
1767		{
1768		*reason = *parv;
1769	+
1770		if (!valid_comment(source_p, *reason, 1))
1771		return -1;
1772		}
#	Line 1971 | Line 1777 | parse_aline(const char *cmd, struct Clie
1777		return 1;
1778		}
1779
1974	–	/* find_user_host()
1975	–	*
1976	–	* inputs       - pointer to client placing kline
1977	–	*              - pointer to user_host_or_nick
1978	–	*              - pointer to user buffer
1979	–	*              - pointer to host buffer
1980	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1981	–	* side effects -
1982	–	*/
1983	–	static int
1984	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1985	–	char *luser, char *lhost, unsigned int flags)
1986	–	{
1987	–	struct Client *target_p = NULL;
1988	–	char *hostp = NULL;
1989	–
1990	–	if (lhost == NULL)
1991	–	{
1992	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1993	–	return 1;
1994	–	}
1995	–
1996	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1997	–	{
1998	–	/* Explicit user@host mask given */
1999	–
2000	–	if (hostp != NULL)                            /* I'm a little user@host */
2001	–	{
2002	–	*(hostp++) = '\0';                       /* short and squat */
2003	–	if (*user_host_or_nick)
2004	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2005	–	else
2006	–	strcpy(luser, "*");
2007	–
2008	–	if (*hostp)
2009	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2010	–	else
2011	–	strcpy(lhost, "*");
2012	–	}
2013	–	else
2014	–	{
2015	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2016	–	luser[1] = '\0';
2017	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2018	–	}
2019	–
2020	–	return 1;
2021	–	}
2022	–	else
2023	–	{
2024	–	/* Try to find user@host mask from nick */
2025	–	/* Okay to use source_p as the first param, because source_p == client_p */
2026	–	if ((target_p =
2027	–	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
2028	–	return 0;
2029	–
2030	–	if (IsExemptKline(target_p))
2031	–	{
2032	–	if (!IsServer(source_p))
2033	–	sendto_one(source_p,
2034	–	":%s NOTICE %s :%s is E-lined",
2035	–	me.name, source_p->name, target_p->name);
2036	–	return 0;
2037	–	}
2038	–
2039	–	/*
2040	–	* turn the "user" bit into "*user", blow away '~'
2041	–	* if found in original user name (non-idented)
2042	–	*/
2043	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2044	–
2045	–	if (target_p->username[0] == '~')
2046	–	luser[0] = '*';
2047	–
2048	–	if (target_p->sockhost[0] == '\0' ||
2049	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2050	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2051	–	else
2052	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2053	–	return 1;
2054	–	}
2055	–
2056	–	return 0;
2057	–	}
2058	–
1780		/* valid_comment()
1781		*
1782		* inputs       - pointer to client
#	Line 2093 | Line 1814 | match_conf_password(const char *password
1814		else
1815		encr = password;
1816
1817	<	return !strcmp(encr, conf->passwd);
1817	>	return encr && !strcmp(encr, conf->passwd);
1818		}
1819
1820		/*
#	Line 2101 | Line 1822 | match_conf_password(const char *password
1822		*
1823		* inputs       - client sending the cluster
1824		*              - command name "KLINE" "XLINE" etc.
1825	<	*              - capab -- CAP_KLN etc. from s_serv.h
1825	>	*              - capab -- CAP_KLN etc. from server.h
1826		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1827		*              - pattern and args to send along
1828		* output       - none
#	Line 2109 | Line 1830 | match_conf_password(const char *password
1830		*                along to all servers that match capab and cluster type
1831		*/
1832		void
1833	<	cluster_a_line(struct Client *source_p, const char *command,
1834	<	int capab, int cluster_type, const char *pattern, ...)
1833	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1834	>	unsigned int cluster_type, const char *pattern, ...)
1835		{
1836		va_list args;
1837	<	char buffer[IRCD_BUFSIZE];
1838	<	const dlink_node *ptr = NULL;
1837	>	char buffer[IRCD_BUFSIZE] = "";
1838	>	const dlink_node *node = NULL;
1839
1840		va_start(args, pattern);
1841		vsnprintf(buffer, sizeof(buffer), pattern, args);
1842		va_end(args);
1843
1844	<	DLINK_FOREACH(ptr, cluster_items.head)
1844	>	DLINK_FOREACH(node, cluster_items.head)
1845		{
1846	<	const struct MaskItem *conf = ptr->data;
1846	>	const struct MaskItem *conf = node->data;
1847
1848		if (conf->flags & cluster_type)
1849	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1849	>	sendto_match_servs(source_p, conf->name, CAP_CLUSTER | capab,
1850		"%s %s %s", command, conf->name, buffer);
1851		}
1852		}
#	Line 2165 | Line 1886 | split_nuh(struct split_nuh_item *const i
1886
1887		if (iptr->nickptr)
1888		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1889	+
1890		if (iptr->userptr)
1891		strlcpy(iptr->userptr, "*", iptr->usersize);
1892	+
1893		if (iptr->hostptr)
1894		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1895
#	Line 2174 | Line 1897 | split_nuh(struct split_nuh_item *const i
1897		{
1898		*p = '\0';
1899
1900	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1900	>	if (iptr->nickptr && *iptr->nuhmask)
1901		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1902
1903		if ((q = strchr(++p, '@')))
1904		{
1905		*q++ = '\0';
1906
1907	<	if (*p != '\0')
1907	>	if (*p)
1908		strlcpy(iptr->userptr, p, iptr->usersize);
1909
1910	<	if (*q != '\0')
1910	>	if (*q)
1911		strlcpy(iptr->hostptr, q, iptr->hostsize);
1912		}
1913		else
1914		{
1915	<	if (*p != '\0')
1915	>	if (*p)
1916		strlcpy(iptr->userptr, p, iptr->usersize);
1917		}
1918		}
#	Line 2201 | Line 1924 | split_nuh(struct split_nuh_item *const i
1924		/* if found a @ */
1925		*p++ = '\0';
1926
1927	<	if (*iptr->nuhmask != '\0')
1927	>	if (*iptr->nuhmask)
1928		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1929
1930	<	if (*p != '\0')
1930	>	if (*p)
1931		strlcpy(iptr->hostptr, p, iptr->hostsize);
1932		}
1933		else
1934		{
1935	<	/* no @ found */
1935	>	/* No @ found */
1936		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1937		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1938		else

Diff Legend

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