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 2525 by michael, Sat Nov 2 17:07:38 2013 UTC vs.
Revision 6645 by michael, Sat Oct 24 18:55:04 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	+	#include "isupport.h"
59
60	<	struct config_server_hide ConfigServerHide;
60	>
61	>	struct config_channel_entry ConfigChannel;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list service_items = { NULL, NULL, 0 };
71	<	dlink_list server_items  = { NULL, NULL, 0 };
72	<	dlink_list cluster_items = { NULL, NULL, 0 };
73	<	dlink_list oconf_items   = { NULL, NULL, 0 };
74	<	dlink_list uconf_items   = { NULL, NULL, 0 };
75	<	dlink_list xconf_items   = { NULL, NULL, 0 };
76	<	dlink_list nresv_items   = { NULL, NULL, 0 };
77	<	dlink_list cresv_items = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list xconf_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
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	–
84
85		/* conf_dns_callback()
86		*
#	Line 117 | Line 93 | static int ip_entries_count = 0;
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct MaskItem *conf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100		conf->dns_pending = 0;
101
102	<	if (addr != NULL)
102	>	if (addr)
103		memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105		conf->dns_failed = 1;
#	Line 138 | Line 114 | conf_dns_callback(void *vptr, const stru
114		static void
115		conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!conf->dns_pending)
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126	>	}
127	>
128	>	/* map_to_list()
129	>	*
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133	>	*/
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136	>	{
137	>	switch (type)
138		{
139	<	conf->dns_pending = 1;
140	<	gethost_byname(conf_dns_callback, conf, conf->host);
139	>	case CONF_XLINE:
140	>	return &xconf_items;
141	>	break;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144	>	break;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147	>	break;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150	>	break;
151	>	case CONF_OPER:
152	>	return &operator_items;
153	>	break;
154	>	case CONF_SERVER:
155	>	return &server_items;
156	>	break;
157	>	case CONF_SERVICE:
158	>	return &service_items;
159	>	break;
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162	>	break;
163	>	default:
164	>	return NULL;
165		}
166		}
167
168		struct MaskItem *
169		conf_make(enum maskitem_type type)
170		{
171	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 163 | Line 183 | conf_make(enum maskitem_type type)
183		void
184		conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL, *ptr_next = NULL;
186	>	dlink_node *node = NULL, *node_next = NULL;
187		dlink_list *list = NULL;
188
189	<	if (conf->node.next)
190	<	if ((list = map_to_list(conf->type)))
171	<	dlinkDelete(&conf->node, list);
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192		MyFree(conf->name);
193
194		if (conf->dns_pending)
195		delete_resolver_queries(conf);
196	<	if (conf->passwd != NULL)
196	>	if (conf->passwd)
197		memset(conf->passwd, 0, strlen(conf->passwd));
198	<	if (conf->spasswd != NULL)
198	>	if (conf->spasswd)
199		memset(conf->spasswd, 0, strlen(conf->spasswd));
200
201		conf->class = NULL;
#	Line 185 | Line 204 | conf_free(struct MaskItem *conf)
204		MyFree(conf->spasswd);
205		MyFree(conf->reason);
206		MyFree(conf->certfp);
207	+	MyFree(conf->whois);
208		MyFree(conf->user);
209		MyFree(conf->host);
210		#ifdef HAVE_LIBCRYPTO
#	Line 193 | Line 213 | conf_free(struct MaskItem *conf)
213		if (conf->rsa_public_key)
214		RSA_free(conf->rsa_public_key);
215		#endif
216	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	MyFree(ptr->data);
219	<	free_dlink_node(ptr);
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	MyFree(ptr->data);
226	<	free_dlink_node(ptr);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	struct exempt *exptr = ptr->data;
232	>	struct exempt *exptr = node->data;
233
234	+	dlinkDelete(node, &conf->exempt_list);
235		MyFree(exptr->name);
236		MyFree(exptr->user);
237		MyFree(exptr->host);
#	Line 218 | Line 241 | conf_free(struct MaskItem *conf)
241		MyFree(conf);
242		}
243
221	–	/* check_client()
222	–	*
223	–	* inputs       - pointer to client
224	–	* output       - 0 = Success
225	–	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
226	–	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
227	–	*                I_LINE_FULL       (-3) = I-line is full
228	–	*                TOO_MANY          (-4) = Too many connections from hostname
229	–	*                BANNED_CLIENT     (-5) = K-lined
230	–	* side effects - Ordinary client access check.
231	–	*                Look for conf lines which have the same
232	–	*                status as the flags passed.
233	–	*/
234	–	int
235	–	check_client(struct Client *source_p)
236	–	{
237	–	int i;
238	–
239	–	if ((i = verify_access(source_p)))
240	–	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
241	–	source_p->name, source_p->sockhost);
242	–
243	–	switch (i)
244	–	{
245	–	case TOO_MANY:
246	–	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
247	–	"Too many on IP for %s (%s).",
248	–	get_client_name(source_p, SHOW_IP),
249	–	source_p->sockhost);
250	–	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
251	–	get_client_name(source_p, SHOW_IP));
252	–	++ServerStats.is_ref;
253	–	exit_client(source_p, &me, "No more connections allowed on that IP");
254	–	break;
255	–
256	–	case I_LINE_FULL:
257	–	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
258	–	"auth{} block is full for %s (%s).",
259	–	get_client_name(source_p, SHOW_IP),
260	–	source_p->sockhost);
261	–	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
262	–	get_client_name(source_p, SHOW_IP));
263	–	++ServerStats.is_ref;
264	–	exit_client(source_p, &me,
265	–	"No more connections allowed in your connection class");
266	–	break;
267	–
268	–	case NOT_AUTHORIZED:
269	–	++ServerStats.is_ref;
270	–	/* jdc - lists server name & port connections are on */
271	–	/*       a purely cosmetical change */
272	–	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
273	–	"Unauthorized client connection from %s [%s] on [%s/%u].",
274	–	get_client_name(source_p, SHOW_IP),
275	–	source_p->sockhost,
276	–	source_p->localClient->listener->name,
277	–	source_p->localClient->listener->port);
278	–	ilog(LOG_TYPE_IRCD,
279	–	"Unauthorized client connection from %s on [%s/%u].",
280	–	get_client_name(source_p, SHOW_IP),
281	–	source_p->localClient->listener->name,
282	–	source_p->localClient->listener->port);
283	–
284	–	exit_client(source_p, &me, "You are not authorized to use this server");
285	–	break;
286	–
287	–	case BANNED_CLIENT:
288	–	exit_client(source_p, &me, "Banned");
289	–	++ServerStats.is_ref;
290	–	break;
291	–
292	–	case 0:
293	–	default:
294	–	break;
295	–	}
296	–
297	–	return (i < 0 ? 0 : 1);
298	–	}
299	–
300	–	/* verify_access()
301	–	*
302	–	* inputs       - pointer to client to verify
303	–	* output       - 0 if success -'ve if not
304	–	* side effect  - find the first (best) I line to attach.
305	–	*/
306	–	static int
307	–	verify_access(struct Client *client_p)
308	–	{
309	–	struct MaskItem *conf = NULL;
310	–	char non_ident[USERLEN + 1] = { '~', '\0' };
311	–
312	–	if (IsGotId(client_p))
313	–	{
314	–	conf = find_address_conf(client_p->host, client_p->username,
315	–	&client_p->localClient->ip,
316	–	client_p->localClient->aftype,
317	–	client_p->localClient->passwd);
318	–	}
319	–	else
320	–	{
321	–	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
322	–	conf = find_address_conf(client_p->host,non_ident,
323	–	&client_p->localClient->ip,
324	–	client_p->localClient->aftype,
325	–	client_p->localClient->passwd);
326	–	}
327	–
328	–	if (conf != NULL)
329	–	{
330	–	if (IsConfClient(conf))
331	–	{
332	–	if (IsConfRedir(conf))
333	–	{
334	–	sendto_one(client_p, form_str(RPL_REDIR),
335	–	me.name, client_p->name,
336	–	conf->name ? conf->name : "",
337	–	conf->port);
338	–	return NOT_AUTHORIZED;
339	–	}
340	–
341	–	if (IsConfDoIdentd(conf))
342	–	SetNeedId(client_p);
343	–
344	–	/* Thanks for spoof idea amm */
345	–	if (IsConfDoSpoofIp(conf))
346	–	{
347	–	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
348	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
349	–	"%s spoofing: %s as %s",
350	–	client_p->name, client_p->host, conf->name);
351	–	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
352	–	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
353	–	}
354	–
355	–	return attach_iline(client_p, conf);
356	–	}
357	–	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
358	–	{
359	–	if (IsConfGline(conf))
360	–	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
361	–	client_p->name);
362	–	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
363	–	me.name, client_p->name, conf->reason);
364	–	return BANNED_CLIENT;
365	–	}
366	–	}
367	–
368	–	return NOT_AUTHORIZED;
369	–	}
370	–
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252		attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct ClassItem *class = NULL;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257		unsigned int local = 0, global = 0, ident = 0;
258
259	<	assert(conf->class);
387	<
388	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263	<	class = conf->class;
264	<
394	<	count_user_host(client_p->username, client_p->host,
395	<	&global, &local, &ident);
263	>	userhost_count(client_p->username, client_p->host,
264	>	&global, &local, &ident);
265
266		/* XXX blah. go down checking the various silly limits
267		* setting a_limit_reached if any limit is reached.
268		* - Dianora
269		*/
270	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
270	>	if (class->max_total && class->ref_count >= class->max_total)
271		a_limit_reached = 1;
272	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
272	>	else if (class->max_perip && ip_found->count > class->max_perip)
273		a_limit_reached = 1;
274	<	else if (class->max_local != 0 && local >= class->max_local)
274	>	else if (class->max_local && local >= class->max_local)
275		a_limit_reached = 1;
276	<	else if (class->max_global != 0 && global >= class->max_global)
276	>	else if (class->max_global && global >= class->max_global)
277		a_limit_reached = 1;
278	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
278	>	else if (class->max_ident && ident >= class->max_ident &&
279		client_p->username[0] != '~')
280		a_limit_reached = 1;
281
#	Line 415 | Line 284 | attach_iline(struct Client *client_p, st
284		if (!IsConfExemptLimits(conf))
285		return TOO_MANY;   /* Already at maximum allowed */
286
287	<	sendto_one(client_p,
288	<	":%s NOTICE %s :*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;", me.name, client_p->name);
287	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	>	"but you have exceed_limit = yes;");
289		}
290
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* 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 -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	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
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	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	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	newptr = mp_pool_get(ip_entry_pool);
324	<	memset(newptr, 0, sizeof(*newptr));
487	<	ip_entries_count++;
488	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	newptr->next = ip_hash_table[hash_index];
491	<	ip_hash_table[hash_index] = newptr;
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	return newptr;
494	<	}
495	<
496	<	/* 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
515	<
516	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#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
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
534	<	if (ptr->count > 0)
535	<	ptr->count--;
536	<	if (ptr->count == 0 &&
537	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
542	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	mp_pool_release(ptr);
545	<	ip_entries_count--;
546	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
548	–	last_ptr = ptr;
549	–	}
550	–	}
346
347	<	/* 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;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#ifdef IPV6
350	<	else
351	<	{
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
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* 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
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
602	–	struct ip_entry *ptr;
370		int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (i = 0; i < IP_HASH_SIZE; i++)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
628	<	struct ip_entry *last_ptr;
629	<	struct ip_entry *next_ptr;
630	<	int i;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (i = 0; i < IP_HASH_SIZE; i++)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	mp_pool_release(ptr);
648	<	ip_entries_count--;
649	<	}
650	<	else
651	<	last_ptr = ptr;
652	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 664 | Line 439 | garbage_collect_ip_entries(void)
439		void
440		detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr = NULL, *next_ptr = NULL;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	struct MaskItem *conf = ptr->data;
446	>	struct MaskItem *conf = node->data;
447
448		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449		assert(conf->ref_count > 0);
#	Line 677 | Line 452 | detach_conf(struct Client *client_p, enu
452		if (!(conf->type & type))
453		continue;
454
455	<	dlinkDelete(ptr, &client_p->localClient->confs);
456	<	free_dlink_node(ptr);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458		if (conf->type == CONF_CLIENT)
459	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461		if (--conf->class->ref_count == 0 && conf->class->active == 0)
462		{
#	Line 707 | Line 482 | detach_conf(struct Client *client_p, enu
482		int
483		attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488		if (conf->type == CONF_CLIENT)
489		if (cidr_limit_reached(IsConfExemptLimits(conf),
490	<	&client_p->localClient->ip, conf->class))
490	>	&client_p->connection->ip, conf->class))
491		return TOO_MANY;    /* Already at maximum allowed */
492
493		conf->class->ref_count++;
494		conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 735 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
739	<	struct MaskItem *conf = NULL;
513	>	dlink_node *node = NULL;
514
515	<	assert(client_p != NULL);
742	<	assert(host != NULL);
743	<
744	<	if (client_p == NULL || host == NULL)
745	<	return 0;
515	>	assert(host);
516
517	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
519	>	struct MaskItem *conf = node->data;
520
521		if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
#	Line 770 | Line 540 | attach_connect_block(struct Client *clie
540		struct MaskItem *
541		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
774	<	struct MaskItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
548	<
547	>	struct MaskItem *conf = node->data;
548	>
549		if (conf->type == type)
550		{
551	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
552	<	!match(conf->name, name)))
784	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
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	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
#	Line 841 | Line 570 | struct MaskItem *
570		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571		const char *host, unsigned int flags)
572		{
573	<	dlink_node *ptr=NULL;
574	<	struct MaskItem *conf=NULL;
575	<	dlink_list *list_p = map_to_list(type);
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579		case CONF_SERVICE:
580	<	DLINK_FOREACH(ptr, list_p->head)
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
590
591		case CONF_XLINE:
592	<	case CONF_ULINE:
592	>	case CONF_SHARED:
593		case CONF_NRESV:
594		case CONF_CRESV:
595	<	DLINK_FOREACH(ptr, list_p->head)
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
599		if (EmptyString(conf->name))
600		continue;
601	<	if ((name != NULL) && !match(conf->name, name))
601	>	if (name && !match(conf->name, name))
602		{
603		if ((user == NULL && (host == NULL)))
604		return conf;
#	Line 884 | Line 613 | find_matching_name_conf(enum maskitem_ty
613		break;
614
615		case CONF_SERVER:
616	<	DLINK_FOREACH(ptr, list_p->head)
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
618	>	conf = node->data;
619
620	<	if ((name != NULL) && !match(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && !match(host, conf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
626	<
626	>
627		default:
628		break;
629		}
#	Line 914 | Line 643 | struct MaskItem *
643		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct MaskItem *conf;
648	<	dlink_list *list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
652		case CONF_XLINE:
653	<	case CONF_ULINE:
653	>	case CONF_SHARED:
654		case CONF_NRESV:
655		case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
659	>	conf = node->data;
660
661		if (EmptyString(conf->name))
662		continue;
663	<
663	>
664		if (irccmp(conf->name, name) == 0)
665		{
666		if ((user == NULL && (host == NULL)))
#	Line 945 | Line 674 | find_exact_name_conf(enum maskitem_type
674		break;
675
676		case CONF_OPER:
677	<	DLINK_FOREACH(ptr, list_p->head)
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 968 | Line 697 | find_exact_name_conf(enum maskitem_type
697		return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703		return conf;
704		break;
976	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709		return conf;
710		break;
983	–	#endif
711		default:
712		assert(0);
713		}
#	Line 991 | Line 718 | find_exact_name_conf(enum maskitem_type
718		break;
719
720		case CONF_SERVER:
721	<	DLINK_FOREACH(ptr, list_p->head)
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
723	>	conf = node->data;
724
725		if (EmptyString(conf->name))
726		continue;
727	<
727	>
728		if (name == NULL)
729		{
730		if (EmptyString(conf->host))
#	Line 1018 | Line 745 | find_exact_name_conf(enum maskitem_type
745		return NULL;
746		}
747
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();
1035	–
1036	–	/* 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;
1051	–	}
1052	–
748		/* set_default_conf()
749		*
750		* inputs       - NONE
#	Line 1068 | Line 763 | set_default_conf(void)
763		assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778		#endif
779
780	<	/* ServerInfo.name is not rehashable */
781	<	/* ServerInfo.name = ServerInfo.name; */
782	<	ServerInfo.description = NULL;
783	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
784	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
785	<
786	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
787	<	ServerInfo.specific_ipv4_vhost = 0;
788	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
789	<	ServerInfo.specific_ipv6_vhost = 0;
790	<
791	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
792	<	ServerInfo.max_nick_length = 9;
793	<	ServerInfo.max_topic_length = 80;
794	<
795	<	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;
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	>	#endif
783	>
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796
797		log_del_all();
798
799	<	ConfigLoggingEntry.use_logging = 1;
799	>	ConfigLog.use_logging = 1;
800
801		ConfigChannel.disable_fake_channels = 0;
802	<	ConfigChannel.knock_delay = 300;
802	>	ConfigChannel.invite_client_count = 10;
803	>	ConfigChannel.invite_client_time = 300;
804	>	ConfigChannel.knock_client_count = 1;
805	>	ConfigChannel.knock_client_time = 300;
806		ConfigChannel.knock_delay_channel = 60;
807	<	ConfigChannel.max_chans_per_user = 25;
1105	<	ConfigChannel.max_chans_per_oper = 50;
807	>	ConfigChannel.max_channels = 25;
808		ConfigChannel.max_bans = 25;
809	<	ConfigChannel.default_split_user_count = 0;
810	<	ConfigChannel.default_split_server_count = 0;
1109	<	ConfigChannel.no_join_on_split = 0;
1110	<	ConfigChannel.no_create_on_split = 0;
809	>	ConfigChannel.default_join_flood_count = 18;
810	>	ConfigChannel.default_join_flood_time = 6;
811
812		ConfigServerHide.flatten_links = 0;
813	<	ConfigServerHide.links_delay = 300;
813	>	ConfigServerHide.flatten_links_delay = 300;
814		ConfigServerHide.hidden = 0;
815		ConfigServerHide.hide_servers = 0;
816		ConfigServerHide.hide_services = 0;
#	Line 1118 | Line 818 | set_default_conf(void)
818		ConfigServerHide.hide_server_ips = 0;
819		ConfigServerHide.disable_remote_commands = 0;
820
821	<
822	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
823	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
824	<	ConfigFileEntry.cycle_on_host_change = 1;
825	<	ConfigFileEntry.glines = 0;
826	<	ConfigFileEntry.gline_time = 12 * 3600;
827	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
828	<	ConfigFileEntry.gline_min_cidr = 16;
829	<	ConfigFileEntry.gline_min_cidr6 = 48;
830	<	ConfigFileEntry.invisible_on_connect = 1;
831	<	ConfigFileEntry.tkline_expire_notices = 1;
832	<	ConfigFileEntry.hide_spoof_ips = 1;
833	<	ConfigFileEntry.ignore_bogus_ts = 0;
834	<	ConfigFileEntry.disable_auth = 0;
835	<	ConfigFileEntry.kill_chase_time_limit = 90;
836	<	ConfigFileEntry.default_floodcount = 8;
837	<	ConfigFileEntry.failed_oper_notice = 1;
838	<	ConfigFileEntry.dots_in_ident = 0;
839	<	ConfigFileEntry.min_nonwildcard = 4;
840	<	ConfigFileEntry.min_nonwildcard_simple = 3;
841	<	ConfigFileEntry.max_accept = 20;
842	<	ConfigFileEntry.anti_nick_flood = 0;
843	<	ConfigFileEntry.max_nick_time = 20;
844	<	ConfigFileEntry.max_nick_changes = 5;
845	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
846	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
847	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
848	<	ConfigFileEntry.warn_no_nline = 1;
849	<	ConfigFileEntry.stats_o_oper_only = 0;
850	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
851	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
852	<	ConfigFileEntry.stats_P_oper_only = 0;
853	<	ConfigFileEntry.stats_u_oper_only = 0;
854	<	ConfigFileEntry.caller_id_wait = 60;
855	<	ConfigFileEntry.opers_bypass_callerid = 0;
856	<	ConfigFileEntry.pace_wait = 10;
857	<	ConfigFileEntry.pace_wait_simple = 1;
858	<	ConfigFileEntry.short_motd = 0;
859	<	ConfigFileEntry.ping_cookie = 0;
860	<	ConfigFileEntry.no_oper_flood = 0;
861	<	ConfigFileEntry.true_no_oper_flood = 0;
862	<	ConfigFileEntry.oper_pass_resv = 1;
863	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
864	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
865	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
866	<	UMODE_OPERWALL | UMODE_WALLOP;
867	<	ConfigFileEntry.use_egd = 0;
1168	<	ConfigFileEntry.egdpool_path = NULL;
1169	<	ConfigFileEntry.throttle_time = 10;
821	>	ConfigGeneral.away_count = 2;
822	>	ConfigGeneral.away_time = 10;
823	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
824	>	ConfigGeneral.cycle_on_host_change = 1;
825	>	ConfigGeneral.dline_min_cidr = 16;
826	>	ConfigGeneral.dline_min_cidr6 = 48;
827	>	ConfigGeneral.kline_min_cidr = 16;
828	>	ConfigGeneral.kline_min_cidr6 = 48;
829	>	ConfigGeneral.invisible_on_connect = 1;
830	>	ConfigGeneral.tkline_expire_notices = 1;
831	>	ConfigGeneral.ignore_bogus_ts = 0;
832	>	ConfigGeneral.disable_auth = 0;
833	>	ConfigGeneral.kill_chase_time_limit = 90;
834	>	ConfigGeneral.default_floodcount = 8;
835	>	ConfigGeneral.failed_oper_notice = 1;
836	>	ConfigGeneral.dots_in_ident = 0;
837	>	ConfigGeneral.min_nonwildcard = 4;
838	>	ConfigGeneral.min_nonwildcard_simple = 3;
839	>	ConfigGeneral.max_accept = 20;
840	>	ConfigGeneral.anti_nick_flood = 0;
841	>	ConfigGeneral.max_nick_time = 20;
842	>	ConfigGeneral.max_nick_changes = 5;
843	>	ConfigGeneral.anti_spam_exit_message_time = 0;
844	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
845	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
846	>	ConfigGeneral.warn_no_connect_block = 1;
847	>	ConfigGeneral.stats_e_disabled = 0;
848	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
849	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
850	>	ConfigGeneral.stats_o_oper_only = 1;
851	>	ConfigGeneral.stats_m_oper_only = 1;
852	>	ConfigGeneral.stats_P_oper_only = 0;
853	>	ConfigGeneral.stats_u_oper_only = 0;
854	>	ConfigGeneral.caller_id_wait = 60;
855	>	ConfigGeneral.opers_bypass_callerid = 0;
856	>	ConfigGeneral.pace_wait = 10;
857	>	ConfigGeneral.pace_wait_simple = 1;
858	>	ConfigGeneral.short_motd = 0;
859	>	ConfigGeneral.ping_cookie = 0;
860	>	ConfigGeneral.no_oper_flood = 0;
861	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
862	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
863	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
864	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
865	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
866	>	ConfigGeneral.throttle_count = 1;
867	>	ConfigGeneral.throttle_time = 1;
868		}
869
870		static void
871		validate_conf(void)
872		{
873	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
874	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
873	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
874	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
875
876	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
877	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
876	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
877	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
878
879	<	if (ServerInfo.network_name == NULL)
880	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
879	>	if (EmptyString(ConfigServerInfo.network_name))
880	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
881
882	<	if (ServerInfo.network_desc == NULL)
883	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
882	>	if (EmptyString(ConfigServerInfo.network_desc))
883	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
884
885	<	if (ConfigFileEntry.service_name == NULL)
1188	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1189	<
1190	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
885	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
886		}
887
888	<	/* read_conf()
888	>	/* read_conf()
889		*
890		* inputs       - file descriptor pointing to config file to use
891		* output       - None
#	Line 1201 | Line 896 | read_conf(FILE *file)
896		{
897		lineno = 0;
898
899	<	set_default_conf(); /* Set default values prior to conf parsing */
899	>	set_default_conf();  /* Set default values prior to conf parsing */
900		conf_parser_ctx.pass = 1;
901	<	yyparse();          /* pick up the classes first */
901	>	yyparse();  /* Pick up the classes first */
902
903		rewind(file);
904
905		conf_parser_ctx.pass = 2;
906	<	yyparse();          /* Load the values from the conf */
907	<	validate_conf();    /* Check to make sure some values are still okay. */
908	<	/* Some global values are also loaded here. */
909	<	class_delete_marked();      /* Make sure classes are valid */
906	>	yyparse();  /* Load the values from the conf */
907	>	validate_conf();  /* Check to make sure some values are still okay. */
908	>	/* Some global values are also loaded here. */
909	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
910	>	}
911	>
912	>	/* conf_rehash()
913	>	*
914	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
915	>	* as a result of an operator issuing this command, else assume it has been
916	>	* called as a result of the server receiving a HUP signal.
917	>	*/
918	>	void
919	>	conf_rehash(int sig)
920	>	{
921	>	if (sig)
922	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
923	>	"Got signal SIGHUP, reloading configuration file(s)");
924	>
925	>	restart_resolver();
926	>
927	>	/* don't close listeners until we know we can go ahead with the rehash */
928	>
929	>	read_conf_files(0);
930	>
931	>	load_conf_modules();
932	>	check_conf_klines();
933		}
934
935		/* lookup_confhost()
#	Line 1224 | Line 942 | lookup_confhost(struct MaskItem *conf)
942		{
943		struct addrinfo hints, *res;
944
945	<	/* Do name lookup now on hostnames given and store the
945	>	/*
946	>	* Do name lookup now on hostnames given and store the
947		* ip numbers in conf structure.
948		*/
949		memset(&hints, 0, sizeof(hints));
#	Line 1241 | Line 960 | lookup_confhost(struct MaskItem *conf)
960		return;
961		}
962
963	<	assert(res != NULL);
963	>	assert(res);
964
965		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
966		conf->addr.ss_len = res->ai_addrlen;
#	Line 1260 | Line 979 | lookup_confhost(struct MaskItem *conf)
979		int
980		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
981		{
982	<	struct ip_entry *ip_found;
983	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
982	>	struct ip_entry *ip_found = NULL;
983	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
984
985	<	/* DLINE exempt also gets you out of static limits/pacing... */
986	<	if (conf && (conf->type == CONF_EXEMPT))
987	<	return 0;
988	<
989	<	if (conf != NULL)
985	>	if (conf)
986	>	{
987	>	/* DLINE exempt also gets you out of static limits/pacing... */
988	>	if (conf->type == CONF_EXEMPT)
989	>	return 0;
990		return BANNED_CLIENT;
991	+	}
992
993	<	ip_found = find_or_add_ip(addr);
993	>	ip_found = ipcache_find_or_add_address(addr);
994
995	<	if ((CurrentTime - ip_found->last_attempt) <
1276	<	ConfigFileEntry.throttle_time)
995	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
996		{
997	<	ip_found->last_attempt = CurrentTime;
998	<	return TOO_FAST;
997	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
998	>	return TOO_FAST;
999	>
1000	>	++ip_found->connection_count;
1001		}
1002	+	else
1003	+	ip_found->connection_count = 1;
1004
1005		ip_found->last_attempt = CurrentTime;
1006		return 0;
1007		}
1008
1286	–	/* cleanup_tklines()
1287	–	*
1288	–	* inputs       - NONE
1289	–	* output       - NONE
1290	–	* side effects - call function to expire temporary k/d lines
1291	–	*                This is an event started off in ircd.c
1292	–	*/
1293	–	void
1294	–	cleanup_tklines(void *notused)
1295	–	{
1296	–	hostmask_expire_temporary();
1297	–	expire_tklines(&xconf_items);
1298	–	expire_tklines(&nresv_items);
1299	–	expire_tklines(&cresv_items);
1300	–	}
1301	–
1009		/* expire_tklines()
1010		*
1011		* inputs       - tkline list pointer
#	Line 1306 | Line 1013 | cleanup_tklines(void *notused)
1013		* side effects - expire tklines
1014		*/
1015		static void
1016	<	expire_tklines(dlink_list *tklist)
1016	>	expire_tklines(dlink_list *list)
1017		{
1018	<	dlink_node *ptr;
1312	<	dlink_node *next_ptr;
1313	<	struct MaskItem *conf;
1018	>	dlink_node *node = NULL, *node_next = NULL;
1019
1020	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1020	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1021		{
1022	<	conf = ptr->data;
1022	>	struct MaskItem *conf = node->data;
1023
1024		if (!conf->until || conf->until > CurrentTime)
1025		continue;
1026
1027	<	if (conf->type == CONF_XLINE)
1028	<	{
1029	<	if (ConfigFileEntry.tkline_expire_notices)
1030	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1326	<	"Temporary X-line for [%s] expired", conf->name);
1327	<	conf_free(conf);
1328	<	}
1329	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1330	<	{
1331	<	if (ConfigFileEntry.tkline_expire_notices)
1332	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1333	<	"Temporary RESV for [%s] expired", conf->name);
1334	<	conf_free(conf);
1335	<	}
1027	>	if (ConfigGeneral.tkline_expire_notices)
1028	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1029	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1030	>	conf_free(conf);
1031		}
1032		}
1033
1034	+	/* cleanup_tklines()
1035	+	*
1036	+	* inputs       - NONE
1037	+	* output       - NONE
1038	+	* side effects - call function to expire temporary k/d lines
1039	+	*                This is an event started off in ircd.c
1040	+	*/
1041	+	void
1042	+	cleanup_tklines(void *unused)
1043	+	{
1044	+	hostmask_expire_temporary();
1045	+	expire_tklines(&xconf_items);
1046	+	expire_tklines(&nresv_items);
1047	+	expire_tklines(&cresv_items);
1048	+	}
1049	+
1050		/* oper_privs_as_string()
1051		*
1052		* inputs        - pointer to client_p
#	Line 1350 | Line 1061 | static const struct oper_privs
1061		{ OPER_FLAG_ADMIN,          'A' },
1062		{ OPER_FLAG_REMOTEBAN,      'B' },
1063		{ OPER_FLAG_DIE,            'D' },
1353	–	{ OPER_FLAG_GLINE,          'G' },
1064		{ OPER_FLAG_REHASH,         'H' },
1065	<	{ OPER_FLAG_K,              'K' },
1356	<	{ OPER_FLAG_OPERWALL,       'L' },
1065	>	{ OPER_FLAG_KLINE,          'K' },
1066		{ OPER_FLAG_KILL,           'N' },
1067		{ OPER_FLAG_KILL_REMOTE,    'O' },
1068		{ OPER_FLAG_CONNECT,        'P' },
#	Line 1361 | Line 1070 | static const struct oper_privs
1070		{ OPER_FLAG_SQUIT,          'R' },
1071		{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1072		{ OPER_FLAG_UNKLINE,        'U' },
1073	<	{ OPER_FLAG_X,              'X' },
1073	>	{ OPER_FLAG_XLINE,          'X' },
1074		{ 0, '\0' }
1075		};
1076
1077	<	char *
1077	>	const char *
1078		oper_privs_as_string(const unsigned int port)
1079		{
1080	<	static char privs_out[16];
1080	>	static char privs_out[IRCD_BUFSIZE];
1081		char *privs_ptr = privs_out;
1373	–	const struct oper_privs *opriv = flag_list;
1082
1083	<	for (; opriv->flag; ++opriv)
1083	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1084		{
1085		if (port & opriv->flag)
1086		*privs_ptr++ = opriv->c;
#	Line 1386 | Line 1094 | oper_privs_as_string(const unsigned int
1094		}
1095
1096		/*
1097	<	* Input: A client to find the active oper{} name for.
1097	>	* Input: A client to find the active operator {} name for.
1098		* Output: The nick!user@host{oper} of the oper.
1099		*         "oper" is server name for remote opers
1100		* Side effects: None.
#	Line 1394 | Line 1102 | oper_privs_as_string(const unsigned int
1102		const char *
1103		get_oper_name(const struct Client *client_p)
1104		{
1105	<	dlink_node *cnode = NULL;
1106	<	/* +5 for !,@,{,} and null */
1107	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1105	>	static char buffer[IRCD_BUFSIZE];
1106	>
1107	>	if (IsServer(client_p))
1108	>	return client_p->name;
1109
1110		if (MyConnect(client_p))
1111		{
1112	<	if ((cnode = client_p->localClient->confs.head))
1112	>	const dlink_node *const node = client_p->connection->confs.head;
1113	>
1114	>	if (node)
1115		{
1116	<	struct MaskItem *conf = cnode->data;
1116	>	const struct MaskItem *const conf = node->data;
1117
1118	<	if (IsConfOperator(conf))
1118	>	if (conf->type == CONF_OPER)
1119		{
1120		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1121		client_p->username, client_p->host, conf->name);
#	Line 1412 | Line 1123 | get_oper_name(const struct Client *clien
1123		}
1124		}
1125
1126	<	/* Probably should assert here for now. If there is an oper out there
1127	<	* with no oper{} conf attached, it would be good for us to know...
1126	>	/*
1127	>	* Probably should assert here for now. If there is an oper out there
1128	>	* with no operator {} conf attached, it would be good for us to know...
1129		*/
1130	<	assert(0); /* Oper without oper conf! */
1130	>	assert(0);  /* Oper without oper conf! */
1131		}
1132
1133		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1423 | Line 1135 | get_oper_name(const struct Client *clien
1135		return buffer;
1136		}
1137
1138	+	/* clear_out_old_conf()
1139	+	*
1140	+	* inputs       - none
1141	+	* output       - none
1142	+	* side effects - Clear out the old configuration
1143	+	*/
1144	+	static void
1145	+	clear_out_old_conf(void)
1146	+	{
1147	+	dlink_node *node = NULL, *node_next = NULL;
1148	+	dlink_list *free_items [] = {
1149	+	&server_items,   &operator_items,
1150	+	&shared_items,   &xconf_items,
1151	+	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1152	+	};
1153	+
1154	+	dlink_list ** iterator = free_items; /* C is dumb */
1155	+
1156	+	/* We only need to free anything allocated by yyparse() here.
1157	+	* Resetting structs, etc, is taken care of by set_default_conf().
1158	+	*/
1159	+
1160	+	for (; *iterator; iterator++)
1161	+	{
1162	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1163	+	{
1164	+	struct MaskItem *conf = node->data;
1165	+
1166	+	conf->active = 0;
1167	+
1168	+	if (!IsConfDatabase(conf))
1169	+	{
1170	+	dlinkDelete(&conf->node, *iterator);
1171	+
1172	+	if (!conf->ref_count)
1173	+	conf_free(conf);
1174	+	}
1175	+	}
1176	+	}
1177	+
1178	+	motd_clear();
1179	+
1180	+	/*
1181	+	* Don't delete the class table, rather mark all entries for deletion.
1182	+	* The table is cleaned up by class_delete_marked. - avalon
1183	+	*/
1184	+	class_mark_for_deletion();
1185	+
1186	+	clear_out_address_conf();
1187	+
1188	+	/* Clean out module paths */
1189	+	mod_clear_paths();
1190	+
1191	+	pseudo_clear();
1192	+
1193	+	/* Clean out ConfigServerInfo */
1194	+	MyFree(ConfigServerInfo.description);
1195	+	ConfigServerInfo.description = NULL;
1196	+	MyFree(ConfigServerInfo.network_name);
1197	+	ConfigServerInfo.network_name = NULL;
1198	+	MyFree(ConfigServerInfo.network_desc);
1199	+	ConfigServerInfo.network_desc = NULL;
1200	+	#ifdef HAVE_LIBCRYPTO
1201	+	if (ConfigServerInfo.rsa_private_key)
1202	+	{
1203	+	RSA_free(ConfigServerInfo.rsa_private_key);
1204	+	ConfigServerInfo.rsa_private_key = NULL;
1205	+	}
1206	+
1207	+	MyFree(ConfigServerInfo.rsa_private_key_file);
1208	+	ConfigServerInfo.rsa_private_key_file = NULL;
1209	+	#endif
1210	+
1211	+	/* Clean out ConfigAdminInfo */
1212	+	MyFree(ConfigAdminInfo.name);
1213	+	ConfigAdminInfo.name = NULL;
1214	+	MyFree(ConfigAdminInfo.email);
1215	+	ConfigAdminInfo.email = NULL;
1216	+	MyFree(ConfigAdminInfo.description);
1217	+	ConfigAdminInfo.description = NULL;
1218	+
1219	+	MyFree(ConfigServerHide.flatten_links_file);
1220	+	ConfigServerHide.flatten_links_file = NULL;
1221	+
1222	+	/* Clean out listeners */
1223	+	listener_close_marked();
1224	+	}
1225	+
1226		/* read_conf_files()
1227		*
1228		* inputs       - cold start YES or NO
#	Line 1432 | Line 1232 | get_oper_name(const struct Client *clien
1232		void
1233		read_conf_files(int cold)
1234		{
1235	<	const char *filename;
1236	<	char chanmodes[32];
1237	<	char chanlimit[32];
1235	>	const char *filename = NULL;
1236	>	char chanmodes[IRCD_BUFSIZE] = "";
1237	>	char chanlimit[IRCD_BUFSIZE] = "";
1238
1239		conf_parser_ctx.boot = cold;
1240	<	filename = ConfigFileEntry.configfile;
1240	>	filename = ConfigGeneral.configfile;
1241
1242		/* We need to know the initial filename for the yyerror() to report
1243		FIXME: The full path is in conffilenamebuf first time since we
1244	<	dont know anything else
1244	>	don't know anything else
1245
1246	<	- Gozem 2002-07-21
1246	>	- Gozem 2002-07-21
1247		*/
1248		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1249
#	Line 1453 | Line 1253 | read_conf_files(int cold)
1253		{
1254		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1255		filename, strerror(errno));
1256	<	exit(-1);
1256	>	exit(EXIT_FAILURE);
1257		}
1258		else
1259		{
1260	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1260	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1261		"Unable to read configuration file '%s': %s",
1262		filename, strerror(errno));
1263		return;
#	Line 1472 | Line 1272 | read_conf_files(int cold)
1272
1273		log_reopen_all();
1274
1275	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1276	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1275	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1276	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1277
1278		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1279	<	add_isupport("MAXLIST", chanmodes, -1);
1280	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1281	<	add_isupport("CHANTYPES", "#", -1);
1279	>	isupport_add("MAXLIST", chanmodes, -1);
1280	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1281	>	isupport_add("CHANTYPES", "#", -1);
1282
1283		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1284	<	ConfigChannel.max_chans_per_user);
1285	<	add_isupport("CHANLIMIT", chanlimit, -1);
1286	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1287	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1288	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1289	<	add_isupport("CHANMODES", chanmodes, -1);
1284	>	ConfigChannel.max_channels);
1285	>	isupport_add("CHANLIMIT", chanlimit, -1);
1286	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1287	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1288	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1289	>	isupport_add("CHANMODES", chanmodes, -1);
1290
1291		/*
1292		* message_locale may have changed.  rebuild isupport since it relies
1293		* on strlen(form_str(RPL_ISUPPORT))
1294		*/
1295	<	rebuild_isupport_message_line();
1496	<	}
1497	<
1498	<	/* clear_out_old_conf()
1499	<	*
1500	<	* inputs       - none
1501	<	* output       - none
1502	<	* side effects - Clear out the old configuration
1503	<	*/
1504	<	static void
1505	<	clear_out_old_conf(void)
1506	<	{
1507	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1508	<	struct MaskItem *conf;
1509	<	dlink_list *free_items [] = {
1510	<	&server_items,   &oconf_items,
1511	<	&uconf_items,   &xconf_items,
1512	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1513	<	};
1514	<
1515	<	dlink_list ** iterator = free_items; /* C is dumb */
1516	<
1517	<	/* We only need to free anything allocated by yyparse() here.
1518	<	* Resetting structs, etc, is taken care of by set_default_conf().
1519	<	*/
1520	<
1521	<	for (; *iterator != NULL; iterator++)
1522	<	{
1523	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1524	<	{
1525	<	conf = ptr->data;
1526	<
1527	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1528	<
1529	<	/* XXX This is less than pretty */
1530	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1531	<	{
1532	<	if (!conf->ref_count)
1533	<	conf_free(conf);
1534	<	}
1535	<	else if (conf->type == CONF_XLINE)
1536	<	{
1537	<	if (!conf->until)
1538	<	conf_free(conf);
1539	<	}
1540	<	else
1541	<	conf_free(conf);
1542	<	}
1543	<	}
1544	<
1545	<	motd_clear();
1546	<
1547	<	/*
1548	<	* don't delete the class table, rather mark all entries
1549	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1550	<	*/
1551	<	class_mark_for_deletion();
1552	<
1553	<	clear_out_address_conf();
1554	<
1555	<	/* clean out module paths */
1556	<	mod_clear_paths();
1557	<
1558	<	/* clean out ServerInfo */
1559	<	MyFree(ServerInfo.description);
1560	<	ServerInfo.description = NULL;
1561	<	MyFree(ServerInfo.network_name);
1562	<	ServerInfo.network_name = NULL;
1563	<	MyFree(ServerInfo.network_desc);
1564	<	ServerInfo.network_desc = NULL;
1565	<	MyFree(ConfigFileEntry.egdpool_path);
1566	<	ConfigFileEntry.egdpool_path = NULL;
1567	<	#ifdef HAVE_LIBCRYPTO
1568	<	if (ServerInfo.rsa_private_key != NULL)
1569	<	{
1570	<	RSA_free(ServerInfo.rsa_private_key);
1571	<	ServerInfo.rsa_private_key = NULL;
1572	<	}
1573	<
1574	<	MyFree(ServerInfo.rsa_private_key_file);
1575	<	ServerInfo.rsa_private_key_file = NULL;
1576	<
1577	<	if (ServerInfo.server_ctx)
1578	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1579	<	SSL_OP_NO_SSLv3|
1580	<	SSL_OP_NO_TLSv1);
1581	<	if (ServerInfo.client_ctx)
1582	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1583	<	SSL_OP_NO_SSLv3|
1584	<	SSL_OP_NO_TLSv1);
1585	<	#endif
1586	<
1587	<	/* clean out AdminInfo */
1588	<	MyFree(AdminInfo.name);
1589	<	AdminInfo.name = NULL;
1590	<	MyFree(AdminInfo.email);
1591	<	AdminInfo.email = NULL;
1592	<	MyFree(AdminInfo.description);
1593	<	AdminInfo.description = NULL;
1594	<
1595	<	/* clean out listeners */
1596	<	close_listeners();
1597	<
1598	<	/* clean out general */
1599	<	MyFree(ConfigFileEntry.service_name);
1600	<	ConfigFileEntry.service_name = NULL;
1295	>	isupport_rebuild();
1296		}
1297
1298		/* conf_add_class_to_conf()
1299		*
1300		* inputs       - pointer to config item
1301		* output       - NONE
1302	<	* side effects - Add a class pointer to a conf
1302	>	* side effects - Add a class pointer to a conf
1303		*/
1304		void
1305	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1305	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1306		{
1307	<	if (class_name == NULL)
1307	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1308		{
1309		conf->class = class_default;
1310
1311	<	if (conf->type == CONF_CLIENT)
1312	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1311	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1312	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1313		"Warning *** Defaulting to default class for %s@%s",
1314		conf->user, conf->host);
1315		else
1316	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1316	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1317		"Warning *** Defaulting to default class for %s",
1318		conf->name);
1319		}
1625	–	else
1626	–	conf->class = class_find(class_name, 1);
1627	–
1628	–	if (conf->class == NULL)
1629	–	{
1630	–	if (conf->type == CONF_CLIENT)
1631	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1632	–	"Warning *** Defaulting to default class for %s@%s",
1633	–	conf->user, conf->host);
1634	–	else
1635	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1636	–	"Warning *** Defaulting to default class for %s",
1637	–	conf->name);
1638	–	conf->class = class_default;
1639	–	}
1320		}
1321
1322		/* yyerror()
#	Line 1654 | Line 1334 | yyerror(const char *msg)
1334		return;
1335
1336		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1337	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1337	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1338		"\"%s\", line %u: %s: %s",
1339		conffilebuf, lineno + 1, msg, newlinebuf);
1340		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1667 | Line 1347 | conf_error_report(const char *msg)
1347		char newlinebuf[IRCD_BUFSIZE];
1348
1349		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1350	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1350	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1351		"\"%s\", line %u: %s: %s",
1352		conffilebuf, lineno + 1, msg, newlinebuf);
1353		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1676 | Line 1356 | conf_error_report(const char *msg)
1356
1357		/*
1358		* valid_tkline()
1359	<	*
1359	>	*
1360		* inputs       - pointer to ascii string to check
1361		*              - whether the specified time is in seconds or minutes
1362		* output       - -1 not enough parameters
#	Line 1701 | Line 1381 | valid_tkline(const char *data, const int
1381		}
1382
1383		/*
1384	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1385	<	* i.e. they specifically use 0, I am going to return 1 instead
1386	<	* as a return value of non-zero is used to flag it as a temporary kline
1384	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1385	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1386	>	* value of non-zero is used to flag it as a temporary kline
1387		*/
1388		if (result == 0)
1389		result = 1;
1390
1391	<	/*
1391	>	/*
1392		* If the incoming time is in seconds convert it to minutes for the purpose
1393		* of this calculation
1394		*/
1395		if (!minutes)
1396	<	result = result / 60;
1396	>	result = result / 60;
1397
1398		if (result > MAX_TDKLINE_TIME)
1399		result = MAX_TDKLINE_TIME;
1400
1401	<	result = result * 60;  /* turn it into seconds */
1401	>	result = result * 60;  /* Turn it into seconds */
1402
1403		return result;
1404		}
#	Line 1734 | Line 1414 | valid_wild_card_simple(const char *data)
1414		{
1415		const unsigned char *p = (const unsigned char *)data;
1416		unsigned char tmpch = '\0';
1417	<	int nonwild = 0;
1417	>	unsigned int nonwild = 0, wild = 0;
1418
1419		while ((tmpch = *p++))
1420		{
1421	<	if (tmpch == '\\')
1421	>	if (tmpch == '\\' && *p)
1422		{
1423		++p;
1424	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1424	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1425		return 1;
1426		}
1427		else if (!IsMWildChar(tmpch))
1428		{
1429	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1429	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1430		return 1;
1431		}
1432	+	else
1433	+	++wild;
1434		}
1435
1436	<	return 0;
1436	>	return !wild;
1437		}
1438
1439		/* valid_wild_card()
#	Line 1763 | Line 1445 | valid_wild_card_simple(const char *data)
1445		* side effects - NOTICE is given to source_p if warn is 1
1446		*/
1447		int
1448	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1448	>	valid_wild_card(struct Client *source_p, int count, ...)
1449		{
1450	<	char tmpch;
1451	<	int nonwild = 0;
1450	>	unsigned char tmpch = '\0';
1451	>	unsigned int nonwild = 0;
1452		va_list args;
1453
1454		/*
#	Line 1785 | Line 1467 | valid_wild_card(struct Client *source_p,
1467
1468		while (count--)
1469		{
1470	<	const char *p = va_arg(args, const char *);
1470	>	const unsigned char *p = va_arg(args, const unsigned char *);
1471		if (p == NULL)
1472		continue;
1473
#	Line 1797 | Line 1479 | valid_wild_card(struct Client *source_p,
1479		* If we find enough non-wild characters, we can
1480		* break - no point in searching further.
1481		*/
1482	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1482	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1483	>	{
1484	>	va_end(args);
1485		return 1;
1486	+	}
1487		}
1488		}
1489		}
1490
1491	<	if (warn)
1492	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1493	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1491	>	if (IsClient(source_p))
1492	>	sendto_one_notice(source_p, &me,
1493	>	":Please include at least %u non-wildcard characters with the mask",
1494	>	ConfigGeneral.min_nonwildcard);
1495	>	va_end(args);
1496	>	return 0;
1497	>	}
1498	>
1499	>	/* find_user_host()
1500	>	*
1501	>	* inputs       - pointer to client placing kline
1502	>	*              - pointer to user_host_or_nick
1503	>	*              - pointer to user buffer
1504	>	*              - pointer to host buffer
1505	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1506	>	* side effects -
1507	>	*/
1508	>	static int
1509	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1510	>	char *luser, char *lhost)
1511	>	{
1512	>	struct Client *target_p = NULL;
1513	>	char *hostp = NULL;
1514	>
1515	>	if (lhost == NULL)
1516	>	{
1517	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1518	>	return 1;
1519	>	}
1520	>
1521	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1522	>	{
1523	>	/* Explicit user@host mask given */
1524	>	if (hostp)                            /* I'm a little user@host */
1525	>	{
1526	>	*(hostp++) = '\0';                       /* short and squat */
1527	>
1528	>	if (*user_host_or_nick)
1529	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1530	>	else
1531	>	strcpy(luser, "*");
1532	>
1533	>	if (*hostp)
1534	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1535	>	else
1536	>	strcpy(lhost, "*");
1537	>	}
1538	>	else
1539	>	{
1540	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1541	>	luser[1] = '\0';
1542	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1543	>	}
1544	>
1545	>	return 1;
1546	>	}
1547	>	else
1548	>	{
1549	>	/* Try to find user@host mask from nick */
1550	>	/* Okay to use source_p as the first param, because source_p == client_p */
1551	>	if ((target_p =
1552	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1553	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1554	>
1555	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1556	>	{
1557	>	if (IsClient(source_p))
1558	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1559	>	return 0;
1560	>	}
1561	>
1562	>	/*
1563	>	* Turn the "user" bit into "*user", blow away '~'
1564	>	* if found in original user name (non-idented)
1565	>	*/
1566	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1567	>
1568	>	if (target_p->username[0] == '~')
1569	>	luser[0] = '*';
1570	>
1571	>	if (!strcmp(target_p->sockhost, "0"))
1572	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1573	>	else
1574	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1575	>	return 1;
1576	>	}
1577	>
1578		return 0;
1579		}
1580
#	Line 1819 | Line 1588 | valid_wild_card(struct Client *source_p,
1588		*              - parse_flags bit map of things to test
1589		*              - pointer to user or string to parse into
1590		*              - pointer to host or NULL to parse into if non NULL
1591	<	*              - pointer to optional tkline time or NULL
1591	>	*              - pointer to optional tkline time or NULL
1592		*              - pointer to target_server to parse into if non NULL
1593		*              - pointer to reason to parse into
1594		*
1595	<	* output       - 1 if valid, -1 if not valid
1595	>	* output       - 1 if valid, 0 if not valid
1596		* side effects - A generalised k/d/x etc. line parser,
1597		*               "ALINE [time] user@host|string [ON] target :reason"
1598		*                will parse returning a parsed user, host if
#	Line 1846 | Line 1615 | parse_aline(const char *cmd, struct Clie
1615		char **target_server, char **reason)
1616		{
1617		int found_tkline_time=0;
1618	<	static char def_reason[] = "No Reason";
1618	>	static char default_reason[] = CONF_NOREASON;
1619		static char user[USERLEN*4+1];
1620		static char host[HOSTLEN*4+1];
1621
#	Line 1855 | Line 1624 | parse_aline(const char *cmd, struct Clie
1624
1625		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1626
1627	<	if (found_tkline_time != 0)
1627	>	if (found_tkline_time)
1628		{
1629		parv++;
1630		parc--;
1631
1632	<	if (tkline_time != NULL)
1632	>	if (tkline_time)
1633		*tkline_time = found_tkline_time;
1634		else
1635		{
1636	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1637	<	me.name, source_p->name, cmd);
1869	<	return -1;
1636	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1637	>	return 0;
1638		}
1639		}
1640
1641		if (parc == 0)
1642		{
1643	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1644	<	me.name, source_p->name, cmd);
1877	<	return -1;
1643	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1644	>	return 0;
1645		}
1646
1647		if (h_p == NULL)
1648		*up_p = *parv;
1649		else
1650		{
1651	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1652	<	return -1;
1651	>	if (find_user_host(source_p, *parv, user, host) == 0)
1652	>	return 0;
1653
1654		*up_p = user;
1655		*h_p = host;
1656		}
1657	<
1657	>
1658		parc--;
1659		parv++;
1660
1661	<	if (parc != 0)
1661	>	if (parc)
1662		{
1663		if (irccmp(*parv, "ON") == 0)
1664		{
1665		parc--;
1666		parv++;
1667
1901	–	if (target_server == NULL)
1902	–	{
1903	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1904	–	me.name, source_p->name, cmd);
1905	–	return -1;
1906	–	}
1907	–
1668		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1669		{
1670	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1671	<	me.name, source_p->name, "remoteban");
1912	<	return -1;
1670	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1671	>	return 0;
1672		}
1673
1674		if (parc == 0 || EmptyString(*parv))
1675		{
1676	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1677	<	me.name, source_p->name, cmd);
1919	<	return -1;
1676	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1677	>	return 0;
1678		}
1679
1680		*target_server = *parv;
#	Line 1928 | Line 1686 | parse_aline(const char *cmd, struct Clie
1686		/* Make sure target_server *is* NULL if no ON server found
1687		* caller probably NULL'd it first, but no harm to do it again -db
1688		*/
1689	<	if (target_server != NULL)
1689	>	if (target_server)
1690		*target_server = NULL;
1691		}
1692		}
1693
1694	<	if (h_p != NULL)
1694	>	if (h_p)
1695		{
1696	<	if (strchr(user, '!') != NULL)
1696	>	if (strchr(user, '!'))
1697		{
1698	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1699	<	me.name, source_p->name);
1942	<	return -1;
1698	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1699	>	return 0;
1700		}
1701
1702	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1703	<	return -1;
1702	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1703	>	return 0;
1704		}
1705		else
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1707	>	return 0;
1708
1709	<	if (reason != NULL)
1709	>	if (reason)
1710		{
1711	<	if (parc != 0 && !EmptyString(*parv))
1955	<	{
1711	>	if (parc && !EmptyString(*parv))
1712		*reason = *parv;
1957	–	if (!valid_comment(source_p, *reason, 1))
1958	–	return -1;
1959	–	}
1713		else
1714	<	*reason = def_reason;
1714	>	*reason = default_reason;
1715		}
1716
1717		return 1;
1718		}
1719
1967	–	/* find_user_host()
1968	–	*
1969	–	* inputs       - pointer to client placing kline
1970	–	*              - pointer to user_host_or_nick
1971	–	*              - pointer to user buffer
1972	–	*              - pointer to host buffer
1973	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1974	–	* side effects -
1975	–	*/
1976	–	static int
1977	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1978	–	char *luser, char *lhost, unsigned int flags)
1979	–	{
1980	–	struct Client *target_p = NULL;
1981	–	char *hostp = NULL;
1982	–
1983	–	if (lhost == NULL)
1984	–	{
1985	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1986	–	return 1;
1987	–	}
1988	–
1989	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1990	–	{
1991	–	/* Explicit user@host mask given */
1992	–
1993	–	if (hostp != NULL)                            /* I'm a little user@host */
1994	–	{
1995	–	*(hostp++) = '\0';                       /* short and squat */
1996	–	if (*user_host_or_nick)
1997	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1998	–	else
1999	–	strcpy(luser, "*");
2000	–
2001	–	if (*hostp)
2002	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2003	–	else
2004	–	strcpy(lhost, "*");
2005	–	}
2006	–	else
2007	–	{
2008	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2009	–	luser[1] = '\0';
2010	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2011	–	}
2012	–
2013	–	return 1;
2014	–	}
2015	–	else
2016	–	{
2017	–	/* Try to find user@host mask from nick */
2018	–	/* Okay to use source_p as the first param, because source_p == client_p */
2019	–	if ((target_p =
2020	–	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
2021	–	return 0;
2022	–
2023	–	if (IsExemptKline(target_p))
2024	–	{
2025	–	if (!IsServer(source_p))
2026	–	sendto_one(source_p,
2027	–	":%s NOTICE %s :%s is E-lined",
2028	–	me.name, source_p->name, target_p->name);
2029	–	return 0;
2030	–	}
2031	–
2032	–	/*
2033	–	* turn the "user" bit into "*user", blow away '~'
2034	–	* if found in original user name (non-idented)
2035	–	*/
2036	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2037	–
2038	–	if (target_p->username[0] == '~')
2039	–	luser[0] = '*';
2040	–
2041	–	if (target_p->sockhost[0] == '\0' ||
2042	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2043	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2044	–	else
2045	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2046	–	return 1;
2047	–	}
2048	–
2049	–	return 0;
2050	–	}
2051	–
2052	–	/* valid_comment()
2053	–	*
2054	–	* inputs       - pointer to client
2055	–	*              - pointer to comment
2056	–	* output       - 0 if no valid comment,
2057	–	*              - 1 if valid
2058	–	* side effects - truncates reason where necessary
2059	–	*/
2060	–	int
2061	–	valid_comment(struct Client *source_p, char *comment, int warn)
2062	–	{
2063	–	if (strlen(comment) > REASONLEN)
2064	–	comment[REASONLEN-1] = '\0';
2065	–
2066	–	return 1;
2067	–	}
2068	–
1720		/* match_conf_password()
1721		*
1722		* inputs       - pointer to given password
#	Line 2086 | Line 1737 | match_conf_password(const char *password
1737		else
1738		encr = password;
1739
1740	<	return !strcmp(encr, conf->passwd);
1740	>	return encr && !strcmp(encr, conf->passwd);
1741		}
1742
1743		/*
#	Line 2094 | Line 1745 | match_conf_password(const char *password
1745		*
1746		* inputs       - client sending the cluster
1747		*              - command name "KLINE" "XLINE" etc.
1748	<	*              - capab -- CAP_KLN etc. from s_serv.h
1748	>	*              - capab -- CAPAB_KLN etc. from server.h
1749		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1750		*              - pattern and args to send along
1751		* output       - none
#	Line 2102 | Line 1753 | match_conf_password(const char *password
1753		*                along to all servers that match capab and cluster type
1754		*/
1755		void
1756	<	cluster_a_line(struct Client *source_p, const char *command,
1757	<	int capab, int cluster_type, const char *pattern, ...)
1756	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1757	>	unsigned int cluster_type, const char *pattern, ...)
1758		{
1759		va_list args;
1760	<	char buffer[IRCD_BUFSIZE];
1761	<	const dlink_node *ptr = NULL;
1760	>	char buffer[IRCD_BUFSIZE] = "";
1761	>	const dlink_node *node = NULL;
1762
1763		va_start(args, pattern);
1764		vsnprintf(buffer, sizeof(buffer), pattern, args);
1765		va_end(args);
1766
1767	<	DLINK_FOREACH(ptr, cluster_items.head)
1767	>	DLINK_FOREACH(node, cluster_items.head)
1768		{
1769	<	const struct MaskItem *conf = ptr->data;
1769	>	const struct MaskItem *conf = node->data;
1770
1771		if (conf->flags & cluster_type)
1772	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1772	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1773		"%s %s %s", command, conf->name, buffer);
1774		}
1775		}
#	Line 2158 | Line 1809 | split_nuh(struct split_nuh_item *const i
1809
1810		if (iptr->nickptr)
1811		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1812	+
1813		if (iptr->userptr)
1814		strlcpy(iptr->userptr, "*", iptr->usersize);
1815	+
1816		if (iptr->hostptr)
1817		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1818
#	Line 2167 | Line 1820 | split_nuh(struct split_nuh_item *const i
1820		{
1821		*p = '\0';
1822
1823	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1823	>	if (iptr->nickptr && *iptr->nuhmask)
1824		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1825
1826		if ((q = strchr(++p, '@')))
1827		{
1828		*q++ = '\0';
1829
1830	<	if (*p != '\0')
1830	>	if (*p)
1831		strlcpy(iptr->userptr, p, iptr->usersize);
1832
1833	<	if (*q != '\0')
1833	>	if (*q)
1834		strlcpy(iptr->hostptr, q, iptr->hostsize);
1835		}
1836		else
1837		{
1838	<	if (*p != '\0')
1838	>	if (*p)
1839		strlcpy(iptr->userptr, p, iptr->usersize);
1840		}
1841		}
#	Line 2194 | Line 1847 | split_nuh(struct split_nuh_item *const i
1847		/* if found a @ */
1848		*p++ = '\0';
1849
1850	<	if (*iptr->nuhmask != '\0')
1850	>	if (*iptr->nuhmask)
1851		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1852
1853	<	if (*p != '\0')
1853	>	if (*p)
1854		strlcpy(iptr->hostptr, p, iptr->hostsize);
1855		}
1856		else
1857		{
1858	<	/* no @ found */
1858	>	/* No @ found */
1859		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1860		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1861		else

Diff Legend

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