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 7217 by michael, Wed Feb 3 15:22:21 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_cluster.h"
32	>	#include "conf_pseudo.h"
33	>	#include "conf_shared.h"
34	>	#include "server.h"
35		#include "resv.h"
36		#include "channel.h"
37		#include "client.h"
38		#include "event.h"
34	–	#include "hook.h"
39		#include "irc_string.h"
40		#include "s_bsd.h"
41		#include "ircd.h"
#	Line 42 | Line 46
46		#include "fdlist.h"
47		#include "log.h"
48		#include "send.h"
45	–	#include "s_gline.h"
49		#include "memory.h"
50	<	#include "mempool.h"
48	<	#include "irc_res.h"
50	>	#include "res.h"
51		#include "userhost.h"
52	<	#include "s_user.h"
52	>	#include "user.h"
53		#include "channel_mode.h"
54		#include "parse.h"
55	<	#include "s_misc.h"
55	>	#include "misc.h"
56		#include "conf_db.h"
57		#include "conf_class.h"
58		#include "motd.h"
59	+	#include "ipcache.h"
60	+	#include "isupport.h"
61
62	<	struct config_server_hide ConfigServerHide;
62	>
63	>	struct config_channel_entry ConfigChannel;
64	>	struct config_serverhide_entry ConfigServerHide;
65	>	struct config_general_entry ConfigGeneral;
66	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
67	>	struct config_serverinfo_entry ConfigServerInfo;
68	>	struct config_admin_entry ConfigAdminInfo;
69	>	struct conf_parser_context conf_parser_ctx;
70
71		/* general conf items link list root, other than k lines etc. */
72	<	dlink_list service_items = { NULL, NULL, 0 };
73	<	dlink_list server_items  = { NULL, NULL, 0 };
74	<	dlink_list cluster_items = { NULL, NULL, 0 };
75	<	dlink_list oconf_items   = { NULL, NULL, 0 };
76	<	dlink_list uconf_items   = { NULL, NULL, 0 };
77	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list cresv_items = { NULL, NULL, 0 };
72	>	dlink_list service_items;
73	>	dlink_list server_items;
74	>	dlink_list operator_items;
75	>	dlink_list gecos_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 &gecos_items;
141	>	break;
142	>	case CONF_NRESV:
143	>	return &nresv_items;
144	>	break;
145	>	case CONF_CRESV:
146	>	return &cresv_items;
147	>	break;
148	>	case CONF_OPER:
149	>	return &operator_items;
150	>	break;
151	>	case CONF_SERVER:
152	>	return &server_items;
153	>	break;
154	>	case CONF_SERVICE:
155	>	return &service_items;
156	>	break;
157	>	default:
158	>	return NULL;
159		}
160		}
161
162		struct MaskItem *
163		conf_make(enum maskitem_type type)
164		{
165	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
165	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
166		dlink_list *list = NULL;
167
168		conf->type   = type;
#	Line 163 | Line 177 | conf_make(enum maskitem_type type)
177		void
178		conf_free(struct MaskItem *conf)
179		{
180	<	dlink_node *ptr = NULL, *ptr_next = NULL;
180	>	dlink_node *node = NULL, *node_next = NULL;
181		dlink_list *list = NULL;
182
183	<	if (conf->node.next)
184	<	if ((list = map_to_list(conf->type)))
171	<	dlinkDelete(&conf->node, list);
183	>	if ((list = map_to_list(conf->type)))
184	>	dlinkFindDelete(list, conf);
185
186	<	MyFree(conf->name);
186	>	xfree(conf->name);
187
188		if (conf->dns_pending)
189		delete_resolver_queries(conf);
190	<	if (conf->passwd != NULL)
190	>	if (conf->passwd)
191		memset(conf->passwd, 0, strlen(conf->passwd));
192	<	if (conf->spasswd != NULL)
192	>	if (conf->spasswd)
193		memset(conf->spasswd, 0, strlen(conf->spasswd));
194
195		conf->class = NULL;
196
197	<	MyFree(conf->passwd);
198	<	MyFree(conf->spasswd);
199	<	MyFree(conf->reason);
200	<	MyFree(conf->certfp);
201	<	MyFree(conf->user);
202	<	MyFree(conf->host);
203	<	#ifdef HAVE_LIBCRYPTO
204	<	MyFree(conf->cipher_list);
192	<
193	<	if (conf->rsa_public_key)
194	<	RSA_free(conf->rsa_public_key);
195	<	#endif
196	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
197	<	{
198	<	MyFree(ptr->data);
199	<	free_dlink_node(ptr);
200	<	}
201	<
202	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
203	<	{
204	<	MyFree(ptr->data);
205	<	free_dlink_node(ptr);
206	<	}
207	<
208	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
209	<	{
210	<	struct exempt *exptr = ptr->data;
211	<
212	<	MyFree(exptr->name);
213	<	MyFree(exptr->user);
214	<	MyFree(exptr->host);
215	<	MyFree(exptr);
216	<	}
217	<
218	<	MyFree(conf);
219	<	}
220	<
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);
197	>	xfree(conf->passwd);
198	>	xfree(conf->spasswd);
199	>	xfree(conf->reason);
200	>	xfree(conf->certfp);
201	>	xfree(conf->whois);
202	>	xfree(conf->user);
203	>	xfree(conf->host);
204	>	xfree(conf->cipher_list);
205
206	<	switch (i)
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207		{
208	<	case TOO_MANY:
209	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
210	<	"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;
208	>	xfree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211		}
212
213	<	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
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
216	<	conf = find_address_conf(client_p->host,non_ident,
217	<	&client_p->localClient->ip,
324	<	client_p->localClient->aftype,
325	<	client_p->localClient->passwd);
215	>	xfree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
219
220	<	if (conf != NULL)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	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	<	}
222	>	struct exempt *exptr = node->data;
223
224	<	return attach_iline(client_p, conf);
225	<	}
226	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
227	<	{
228	<	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	<	}
224	>	dlinkDelete(node, &conf->exempt_list);
225	>	xfree(exptr->name);
226	>	xfree(exptr->user);
227	>	xfree(exptr->host);
228	>	xfree(exptr);
229		}
230
231	<	return NOT_AUTHORIZED;
231	>	xfree(conf);
232		}
233
234		/* attach_iline()
235		*
236	<	* inputs       - client pointer
237	<	*              - conf pointer
238	<	* output       -
239	<	* side effects - do actual attach
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240		*/
241		static int
242		attach_iline(struct Client *client_p, struct MaskItem *conf)
243		{
244	<	struct ClassItem *class = NULL;
244	>	const struct ClassItem *const class = conf->class;
245		struct ip_entry *ip_found;
246		int a_limit_reached = 0;
247		unsigned int local = 0, global = 0, ident = 0;
248
249	<	assert(conf->class);
387	<
388	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250		ip_found->count++;
251	<	SetIpHash(client_p);
391	<
392	<	class = conf->class;
251	>	AddFlag(client_p, FLAGS_IPHASH);
252
253	<	count_user_host(client_p->username, client_p->host,
254	<	&global, &local, &ident);
253	>	userhost_count(client_p->username, client_p->host,
254	>	&global, &local, &ident);
255
256		/* XXX blah. go down checking the various silly limits
257		* setting a_limit_reached if any limit is reached.
258		* - Dianora
259		*/
260	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
260	>	if (class->max_total && class->ref_count >= class->max_total)
261		a_limit_reached = 1;
262	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263		a_limit_reached = 1;
264	<	else if (class->max_local != 0 && local >= class->max_local)
264	>	else if (class->max_local && local >= class->max_local)
265		a_limit_reached = 1;
266	<	else if (class->max_global != 0 && global >= class->max_global)
266	>	else if (class->max_global && global >= class->max_global)
267		a_limit_reached = 1;
268	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
268	>	else if (class->max_ident && ident >= class->max_ident &&
269		client_p->username[0] != '~')
270		a_limit_reached = 1;
271
#	Line 415 | Line 274 | attach_iline(struct Client *client_p, st
274		if (!IsConfExemptLimits(conf))
275		return TOO_MANY;   /* Already at maximum allowed */
276
277	<	sendto_one(client_p,
278	<	":%s NOTICE %s :*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;", me.name, client_p->name);
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281		return attach_conf(client_p, conf);
282		}
283
284	<	/* 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 -
284	>	/* verify_access()
285		*
286	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
287	<	* count set to 0.
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289		*/
290	<	static struct ip_entry *
291	<	find_or_add_ip(struct irc_ssaddr *ip_in)
290	>	static int
291	>	verify_access(struct Client *client_p)
292		{
293	<	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
293	>	struct MaskItem *conf = NULL;
294
295	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
295	>	if (HasFlag(client_p, FLAGS_GOTID))
296		{
297	<	#ifdef IPV6
298	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
299	<	continue;
300	<	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	<	}
297	>	conf = find_address_conf(client_p->host, client_p->username,
298	>	&client_p->connection->ip,
299	>	client_p->connection->aftype,
300	>	client_p->connection->password);
301		}
302	+	else
303	+	{
304	+	char non_ident[USERLEN + 1] = "~";
305
306	<	if (ip_entries_count >= 2 * hard_fdlimit)
307	<	garbage_collect_ip_entries();
308	<
309	<	newptr = mp_pool_get(ip_entry_pool);
310	<	memset(newptr, 0, sizeof(*newptr));
311	<	ip_entries_count++;
488	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
489	<
490	<	newptr->next = ip_hash_table[hash_index];
491	<	ip_hash_table[hash_index] = newptr;
306	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
307	>	conf = find_address_conf(client_p->host, non_ident,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311	>	}
312
313	<	return newptr;
314	<	}
313	>	if (!conf)
314	>	return NOT_AUTHORIZED;
315
316	<	/* 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
316	>	assert(IsConfClient(conf) || IsConfKill(conf));
317
318	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
318	>	if (IsConfClient(conf))
319		{
320	<	#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)
320	>	if (IsConfRedir(conf))
321		{
322	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
323	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
322	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
323	>	conf->name ? conf->name : "",
324	>	conf->port);
325	>	return NOT_AUTHORIZED;
326		}
327	<	else
328	<	#endif
528	<	{
529	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
530	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
531	<	}
532	<	if (res)
533	<	continue;
534	<	if (ptr->count > 0)
535	<	ptr->count--;
536	<	if (ptr->count == 0 &&
537	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
327	>
328	>	if (IsConfDoSpoofIp(conf))
329		{
330	<	if (last_ptr != NULL)
331	<	last_ptr->next = ptr->next;
332	<	else
542	<	ip_hash_table[hash_index] = ptr->next;
330	>	if (IsConfSpoofNotice(conf))
331	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
332	>	client_p->name, client_p->host, conf->name);
333
334	<	mp_pool_release(ptr);
545	<	ip_entries_count--;
546	<	return;
334	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
335		}
548	–	last_ptr = ptr;
549	–	}
550	–	}
551	–
552	–	/* 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;
336
337	<	ip   = ntohl(v4->sin_addr.s_addr);
568	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
569	<	return hash;
570	<	}
571	<	#ifdef IPV6
572	<	else
573	<	{
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;
337	>	return attach_iline(client_p, conf);
338		}
339	<	#else
340	<	return 0;
341	<	#endif
339	>
340	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
341	>	return BANNED_CLIENT;
342		}
343
344	<	/* 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
344	>	/* check_client()
345		*
346	<	* number of hashed ip #'s is counted up, plus the amount of memory
347	<	* used in the hash.
346	>	* inputs       - pointer to client
347	>	* output       - 0 = Success
348	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
349	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
350	>	*                I_LINE_FULL       (-3) = I-line is full
351	>	*                TOO_MANY          (-4) = Too many connections from hostname
352	>	*                BANNED_CLIENT     (-5) = K-lined
353	>	* side effects - Ordinary client access check.
354	>	*                Look for conf lines which have the same
355	>	*                status as the flags passed.
356		*/
357	<	void
358	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
357	>	int
358	>	check_client(struct Client *source_p)
359		{
602	–	struct ip_entry *ptr;
360		int i;
361
362	<	*number_ips_stored = 0;
363	<	*mem_ips_stored    = 0;
362	>	if ((i = verify_access(source_p)))
363	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
364	>	source_p->name, source_p->sockhost);
365
366	<	for (i = 0; i < IP_HASH_SIZE; i++)
366	>	switch (i)
367		{
368	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
369	<	{
370	<	*number_ips_stored += 1;
371	<	*mem_ips_stored += sizeof(struct ip_entry);
372	<	}
373	<	}
374	<	}
368	>	case TOO_MANY:
369	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
370	>	"Too many on IP for %s (%s).",
371	>	get_client_name(source_p, SHOW_IP),
372	>	source_p->sockhost);
373	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
374	>	get_client_name(source_p, SHOW_IP));
375	>	++ServerStats.is_ref;
376	>	exit_client(source_p, "No more connections allowed on that IP");
377	>	break;
378
379	<	/* garbage_collect_ip_entries()
380	<	*
381	<	* input        - NONE
382	<	* output       - NONE
383	<	* side effects - free up all ip entries with no connections
384	<	*/
385	<	static void
386	<	garbage_collect_ip_entries(void)
387	<	{
388	<	struct ip_entry *ptr;
628	<	struct ip_entry *last_ptr;
629	<	struct ip_entry *next_ptr;
630	<	int i;
379	>	case I_LINE_FULL:
380	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
381	>	"auth {} block is full for %s (%s).",
382	>	get_client_name(source_p, SHOW_IP),
383	>	source_p->sockhost);
384	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
385	>	get_client_name(source_p, SHOW_IP));
386	>	++ServerStats.is_ref;
387	>	exit_client(source_p, "No more connections allowed in your connection class");
388	>	break;
389
390	<	for (i = 0; i < IP_HASH_SIZE; i++)
391	<	{
392	<	last_ptr = NULL;
390	>	case NOT_AUTHORIZED:
391	>	/* jdc - lists server name & port connections are on */
392	>	/*       a purely cosmetical change */
393	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
394	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
395	>	get_client_name(source_p, SHOW_IP),
396	>	source_p->sockhost,
397	>	source_p->connection->listener->name,
398	>	source_p->connection->listener->port);
399	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
400	>	get_client_name(source_p, SHOW_IP),
401	>	source_p->connection->listener->name,
402	>	source_p->connection->listener->port);
403
404	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
405	<	{
406	<	next_ptr = ptr->next;
404	>	++ServerStats.is_ref;
405	>	exit_client(source_p, "You are not authorized to use this server");
406	>	break;
407
408	<	if (ptr->count == 0 &&
409	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
410	<	{
411	<	if (last_ptr != NULL)
412	<	last_ptr->next = ptr->next;
413	<	else
414	<	ip_hash_table[i] = ptr->next;
415	<	mp_pool_release(ptr);
648	<	ip_entries_count--;
649	<	}
650	<	else
651	<	last_ptr = ptr;
652	<	}
408	>	case BANNED_CLIENT:
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "Banned");
411	>	break;
412	>
413	>	case 0:
414	>	default:
415	>	break;
416		}
417	+
418	+	return !(i < 0);
419		}
420
421		/* detach_conf()
#	Line 664 | Line 429 | garbage_collect_ip_entries(void)
429		void
430		detach_conf(struct Client *client_p, enum maskitem_type type)
431		{
432	<	dlink_node *ptr = NULL, *next_ptr = NULL;
432	>	dlink_node *node = NULL, *node_next = NULL;
433
434	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
434	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
435		{
436	<	struct MaskItem *conf = ptr->data;
436	>	struct MaskItem *conf = node->data;
437
438		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
439		assert(conf->ref_count > 0);
#	Line 677 | Line 442 | detach_conf(struct Client *client_p, enu
442		if (!(conf->type & type))
443		continue;
444
445	<	dlinkDelete(ptr, &client_p->localClient->confs);
446	<	free_dlink_node(ptr);
445	>	dlinkDelete(node, &client_p->connection->confs);
446	>	free_dlink_node(node);
447
448		if (conf->type == CONF_CLIENT)
449	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
449	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
450
451		if (--conf->class->ref_count == 0 && conf->class->active == 0)
452		{
#	Line 707 | Line 472 | detach_conf(struct Client *client_p, enu
472		int
473		attach_conf(struct Client *client_p, struct MaskItem *conf)
474		{
475	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
475	>	if (dlinkFind(&client_p->connection->confs, conf))
476		return 1;
477
478		if (conf->type == CONF_CLIENT)
479		if (cidr_limit_reached(IsConfExemptLimits(conf),
480	<	&client_p->localClient->ip, conf->class))
480	>	&client_p->connection->ip, conf->class))
481		return TOO_MANY;    /* Already at maximum allowed */
482
483		conf->class->ref_count++;
484		conf->ref_count++;
485
486	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
486	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
487
488		return 0;
489		}
#	Line 735 | Line 500 | int
500		attach_connect_block(struct Client *client_p, const char *name,
501		const char *host)
502		{
503	<	dlink_node *ptr;
739	<	struct MaskItem *conf = NULL;
740	<
741	<	assert(client_p != NULL);
742	<	assert(host != NULL);
503	>	dlink_node *node = NULL;
504
505	<	if (client_p == NULL || host == NULL)
745	<	return 0;
505	>	assert(host);
506
507	<	DLINK_FOREACH(ptr, server_items.head)
507	>	DLINK_FOREACH(node, server_items.head)
508		{
509	<	conf = ptr->data;
509	>	struct MaskItem *conf = node->data;
510
511		if (match(conf->name, name) || match(conf->host, host))
512		continue;
513
514		attach_conf(client_p, conf);
515	<	return -1;
515	>	return 1;
516		}
517
518		return 0;
#	Line 770 | Line 530 | attach_connect_block(struct Client *clie
530		struct MaskItem *
531		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
532		{
533	<	dlink_node *ptr;
774	<	struct MaskItem* conf;
533	>	dlink_node *node = NULL;
534
535	<	DLINK_FOREACH(ptr, list->head)
535	>	DLINK_FOREACH(node, list->head)
536		{
537	<	conf = ptr->data;
538	<
537	>	struct MaskItem *conf = node->data;
538	>
539		if (conf->type == type)
540		{
541	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
542	<	!match(conf->name, name)))
784	<	return conf;
541	>	if (conf->name && !irccmp(conf->name, name))
542	>	return conf;
543		}
544		}
545
546		return NULL;
547		}
548
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	–
549		/* find_matching_name_conf()
550		*
551		* inputs       - type of link list to look in
#	Line 841 | Line 560 | struct MaskItem *
560		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
561		const char *host, unsigned int flags)
562		{
563	<	dlink_node *ptr=NULL;
564	<	struct MaskItem *conf=NULL;
565	<	dlink_list *list_p = map_to_list(type);
563	>	dlink_node *node = NULL;
564	>	dlink_list *list = map_to_list(type);
565	>	struct MaskItem *conf = NULL;
566
567		switch (type)
568		{
569		case CONF_SERVICE:
570	<	DLINK_FOREACH(ptr, list_p->head)
570	>	DLINK_FOREACH(node, list->head)
571		{
572	<	conf = ptr->data;
572	>	conf = node->data;
573
574		if (EmptyString(conf->name))
575		continue;
576	<	if ((name != NULL) && !irccmp(name, conf->name))
576	>	if (name && !irccmp(name, conf->name))
577		return conf;
578		}
579		break;
580
581		case CONF_XLINE:
863	–	case CONF_ULINE:
582		case CONF_NRESV:
583		case CONF_CRESV:
584	<	DLINK_FOREACH(ptr, list_p->head)
584	>	DLINK_FOREACH(node, list->head)
585		{
586	<	conf = ptr->data;
586	>	conf = node->data;
587
588		if (EmptyString(conf->name))
589		continue;
590	<	if ((name != NULL) && !match(conf->name, name))
590	>	if (name && !match(conf->name, name))
591		{
592		if ((user == NULL && (host == NULL)))
593		return conf;
594	<	if ((conf->flags & flags) != flags)
594	>	if ((conf->modes & flags) != flags)
595		continue;
596		if (EmptyString(conf->user) || EmptyString(conf->host))
597		return conf;
#	Line 884 | Line 602 | find_matching_name_conf(enum maskitem_ty
602		break;
603
604		case CONF_SERVER:
605	<	DLINK_FOREACH(ptr, list_p->head)
605	>	DLINK_FOREACH(node, list->head)
606		{
607	<	conf = ptr->data;
607	>	conf = node->data;
608
609	<	if ((name != NULL) && !match(name, conf->name))
609	>	if (name && !match(name, conf->name))
610		return conf;
611	<	else if ((host != NULL) && !match(host, conf->host))
611	>	if (host && !match(host, conf->host))
612		return conf;
613		}
614		break;
615	<
615	>
616		default:
617		break;
618		}
#	Line 914 | Line 632 | struct MaskItem *
632		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
633		const char *user, const char *host)
634		{
635	<	dlink_node *ptr = NULL;
636	<	struct MaskItem *conf;
637	<	dlink_list *list_p = map_to_list(type);
635	>	dlink_node *node = NULL;
636	>	dlink_list *list = map_to_list(type);
637	>	struct MaskItem *conf = NULL;
638
639		switch(type)
640		{
641		case CONF_XLINE:
924	–	case CONF_ULINE:
642		case CONF_NRESV:
643		case CONF_CRESV:
644
645	<	DLINK_FOREACH(ptr, list_p->head)
645	>	DLINK_FOREACH(node, list->head)
646		{
647	<	conf = ptr->data;
647	>	conf = node->data;
648
649		if (EmptyString(conf->name))
650		continue;
651	<
651	>
652		if (irccmp(conf->name, name) == 0)
653		{
654		if ((user == NULL && (host == NULL)))
#	Line 945 | Line 662 | find_exact_name_conf(enum maskitem_type
662		break;
663
664		case CONF_OPER:
665	<	DLINK_FOREACH(ptr, list_p->head)
665	>	DLINK_FOREACH(node, list->head)
666		{
667	<	conf = ptr->data;
667	>	conf = node->data;
668
669		if (EmptyString(conf->name))
670		continue;
#	Line 968 | Line 685 | find_exact_name_conf(enum maskitem_type
685		return conf;
686		break;
687		case HM_IPV4:
688	<	if (who->localClient->aftype == AF_INET)
689	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
688	>	if (who->connection->aftype == AF_INET)
689	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
690		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
691		return conf;
692		break;
976	–	#ifdef IPV6
693		case HM_IPV6:
694	<	if (who->localClient->aftype == AF_INET6)
695	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
694	>	if (who->connection->aftype == AF_INET6)
695	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
696		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
697		return conf;
698		break;
983	–	#endif
699		default:
700		assert(0);
701		}
#	Line 991 | Line 706 | find_exact_name_conf(enum maskitem_type
706		break;
707
708		case CONF_SERVER:
709	<	DLINK_FOREACH(ptr, list_p->head)
709	>	DLINK_FOREACH(node, list->head)
710		{
711	<	conf = ptr->data;
711	>	conf = node->data;
712
713		if (EmptyString(conf->name))
714		continue;
715	<
715	>
716		if (name == NULL)
717		{
718		if (EmptyString(conf->host))
#	Line 1018 | Line 733 | find_exact_name_conf(enum maskitem_type
733		return NULL;
734		}
735
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	–
736		/* set_default_conf()
737		*
738		* inputs       - NONE
#	Line 1067 | Line 750 | set_default_conf(void)
750		*/
751		assert(class_default == class_get_list()->tail->data);
752
753	<	#ifdef HAVE_LIBCRYPTO
754	<	ServerInfo.rsa_private_key = NULL;
755	<	ServerInfo.rsa_private_key_file = NULL;
756	<	#endif
757	<
758	<	/* ServerInfo.name is not rehashable */
759	<	/* ServerInfo.name = ServerInfo.name; */
760	<	ServerInfo.description = NULL;
761	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
762	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
763	<
764	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1082	<	ServerInfo.specific_ipv4_vhost = 0;
1083	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1084	<	ServerInfo.specific_ipv6_vhost = 0;
1085	<
1086	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1087	<	ServerInfo.max_nick_length = 9;
1088	<	ServerInfo.max_topic_length = 80;
1089	<
1090	<	ServerInfo.hub = 0;
1091	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1092	<	ServerInfo.dns_host.sin_port = 0;
1093	<	AdminInfo.name = NULL;
1094	<	AdminInfo.email = NULL;
1095	<	AdminInfo.description = NULL;
753	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
754	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
755	>
756	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
757	>	ConfigServerInfo.specific_ipv4_vhost = 0;
758	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
759	>	ConfigServerInfo.specific_ipv6_vhost = 0;
760	>
761	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
762	>	ConfigServerInfo.max_nick_length = 9;
763	>	ConfigServerInfo.max_topic_length = 80;
764	>	ConfigServerInfo.hub = 0;
765
766		log_del_all();
767
768	<	ConfigLoggingEntry.use_logging = 1;
768	>	ConfigLog.use_logging = 1;
769
770		ConfigChannel.disable_fake_channels = 0;
771	<	ConfigChannel.knock_delay = 300;
771	>	ConfigChannel.invite_client_count = 10;
772	>	ConfigChannel.invite_client_time = 300;
773	>	ConfigChannel.invite_delay_channel = 5;
774	>	ConfigChannel.knock_client_count = 1;
775	>	ConfigChannel.knock_client_time = 300;
776		ConfigChannel.knock_delay_channel = 60;
777	<	ConfigChannel.max_chans_per_user = 25;
1105	<	ConfigChannel.max_chans_per_oper = 50;
777	>	ConfigChannel.max_channels = 25;
778		ConfigChannel.max_bans = 25;
779	<	ConfigChannel.default_split_user_count = 0;
780	<	ConfigChannel.default_split_server_count = 0;
1109	<	ConfigChannel.no_join_on_split = 0;
1110	<	ConfigChannel.no_create_on_split = 0;
779	>	ConfigChannel.default_join_flood_count = 18;
780	>	ConfigChannel.default_join_flood_time = 6;
781
782		ConfigServerHide.flatten_links = 0;
783	<	ConfigServerHide.links_delay = 300;
783	>	ConfigServerHide.flatten_links_delay = 300;
784		ConfigServerHide.hidden = 0;
785		ConfigServerHide.hide_servers = 0;
786		ConfigServerHide.hide_services = 0;
#	Line 1118 | Line 788 | set_default_conf(void)
788		ConfigServerHide.hide_server_ips = 0;
789		ConfigServerHide.disable_remote_commands = 0;
790
791	<
792	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
793	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
794	<	ConfigFileEntry.cycle_on_host_change = 1;
795	<	ConfigFileEntry.glines = 0;
796	<	ConfigFileEntry.gline_time = 12 * 3600;
797	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
798	<	ConfigFileEntry.gline_min_cidr = 16;
799	<	ConfigFileEntry.gline_min_cidr6 = 48;
800	<	ConfigFileEntry.invisible_on_connect = 1;
801	<	ConfigFileEntry.tkline_expire_notices = 1;
802	<	ConfigFileEntry.hide_spoof_ips = 1;
803	<	ConfigFileEntry.ignore_bogus_ts = 0;
804	<	ConfigFileEntry.disable_auth = 0;
805	<	ConfigFileEntry.kill_chase_time_limit = 90;
806	<	ConfigFileEntry.default_floodcount = 8;
807	<	ConfigFileEntry.failed_oper_notice = 1;
808	<	ConfigFileEntry.dots_in_ident = 0;
809	<	ConfigFileEntry.min_nonwildcard = 4;
810	<	ConfigFileEntry.min_nonwildcard_simple = 3;
811	<	ConfigFileEntry.max_accept = 20;
812	<	ConfigFileEntry.anti_nick_flood = 0;
813	<	ConfigFileEntry.max_nick_time = 20;
814	<	ConfigFileEntry.max_nick_changes = 5;
815	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
816	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
817	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
818	<	ConfigFileEntry.warn_no_nline = 1;
819	<	ConfigFileEntry.stats_o_oper_only = 0;
820	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
821	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
822	<	ConfigFileEntry.stats_P_oper_only = 0;
823	<	ConfigFileEntry.stats_u_oper_only = 0;
824	<	ConfigFileEntry.caller_id_wait = 60;
825	<	ConfigFileEntry.opers_bypass_callerid = 0;
826	<	ConfigFileEntry.pace_wait = 10;
827	<	ConfigFileEntry.pace_wait_simple = 1;
828	<	ConfigFileEntry.short_motd = 0;
829	<	ConfigFileEntry.ping_cookie = 0;
830	<	ConfigFileEntry.no_oper_flood = 0;
831	<	ConfigFileEntry.true_no_oper_flood = 0;
832	<	ConfigFileEntry.oper_pass_resv = 1;
833	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
834	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
835	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
836	<	UMODE_OPERWALL | UMODE_WALLOP;
837	<	ConfigFileEntry.use_egd = 0;
1168	<	ConfigFileEntry.egdpool_path = NULL;
1169	<	ConfigFileEntry.throttle_time = 10;
791	>	ConfigGeneral.away_count = 2;
792	>	ConfigGeneral.away_time = 10;
793	>	ConfigGeneral.max_watch = 50;
794	>	ConfigGeneral.cycle_on_host_change = 1;
795	>	ConfigGeneral.dline_min_cidr = 16;
796	>	ConfigGeneral.dline_min_cidr6 = 48;
797	>	ConfigGeneral.kline_min_cidr = 16;
798	>	ConfigGeneral.kline_min_cidr6 = 48;
799	>	ConfigGeneral.invisible_on_connect = 1;
800	>	ConfigGeneral.tkline_expire_notices = 1;
801	>	ConfigGeneral.ignore_bogus_ts = 0;
802	>	ConfigGeneral.disable_auth = 0;
803	>	ConfigGeneral.kill_chase_time_limit = 90;
804	>	ConfigGeneral.default_floodcount = 8;
805	>	ConfigGeneral.failed_oper_notice = 1;
806	>	ConfigGeneral.dots_in_ident = 0;
807	>	ConfigGeneral.min_nonwildcard = 4;
808	>	ConfigGeneral.min_nonwildcard_simple = 3;
809	>	ConfigGeneral.max_accept = 50;
810	>	ConfigGeneral.anti_nick_flood = 0;
811	>	ConfigGeneral.max_nick_time = 20;
812	>	ConfigGeneral.max_nick_changes = 5;
813	>	ConfigGeneral.anti_spam_exit_message_time = 0;
814	>	ConfigGeneral.ts_warn_delta = 30;
815	>	ConfigGeneral.ts_max_delta = 600;
816	>	ConfigGeneral.warn_no_connect_block = 1;
817	>	ConfigGeneral.stats_e_disabled = 0;
818	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
819	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
820	>	ConfigGeneral.stats_o_oper_only = 1;
821	>	ConfigGeneral.stats_m_oper_only = 1;
822	>	ConfigGeneral.stats_P_oper_only = 0;
823	>	ConfigGeneral.stats_u_oper_only = 0;
824	>	ConfigGeneral.caller_id_wait = 60;
825	>	ConfigGeneral.opers_bypass_callerid = 0;
826	>	ConfigGeneral.pace_wait = 10;
827	>	ConfigGeneral.pace_wait_simple = 1;
828	>	ConfigGeneral.short_motd = 0;
829	>	ConfigGeneral.ping_cookie = 0;
830	>	ConfigGeneral.no_oper_flood = 0;
831	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
832	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
833	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
834	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
835	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
836	>	ConfigGeneral.throttle_count = 1;
837	>	ConfigGeneral.throttle_time = 1;
838		}
839
840		static void
841		validate_conf(void)
842		{
843	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
844	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1177	<
1178	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1179	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1180	<
1181	<	if (ServerInfo.network_name == NULL)
1182	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1183	<
1184	<	if (ServerInfo.network_desc == NULL)
1185	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
843	>	if (EmptyString(ConfigServerInfo.network_name))
844	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
845
846	<	if (ConfigFileEntry.service_name == NULL)
847	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1189	<
1190	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
846	>	if (EmptyString(ConfigServerInfo.network_desc))
847	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
848		}
849
850	<	/* read_conf()
850	>	/* read_conf()
851		*
852		* inputs       - file descriptor pointing to config file to use
853		* output       - None
#	Line 1201 | Line 858 | read_conf(FILE *file)
858		{
859		lineno = 0;
860
861	<	set_default_conf(); /* Set default values prior to conf parsing */
861	>	set_default_conf();  /* Set default values prior to conf parsing */
862		conf_parser_ctx.pass = 1;
863	<	yyparse();          /* pick up the classes first */
863	>	yyparse();  /* Pick up the classes first */
864
865		rewind(file);
866
867		conf_parser_ctx.pass = 2;
868	<	yyparse();          /* Load the values from the conf */
869	<	validate_conf();    /* Check to make sure some values are still okay. */
870	<	/* Some global values are also loaded here. */
871	<	class_delete_marked();      /* Make sure classes are valid */
868	>	yyparse();  /* Load the values from the conf */
869	>	validate_conf();  /* Check to make sure some values are still okay. */
870	>	/* Some global values are also loaded here. */
871	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
872	>	}
873	>
874	>	/* conf_rehash()
875	>	*
876	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
877	>	* as a result of an operator issuing this command, else assume it has been
878	>	* called as a result of the server receiving a HUP signal.
879	>	*/
880	>	void
881	>	conf_rehash(int sig)
882	>	{
883	>	if (sig)
884	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
885	>	"Got signal SIGHUP, reloading configuration file(s)");
886	>
887	>	restart_resolver();
888	>
889	>	/* don't close listeners until we know we can go ahead with the rehash */
890	>
891	>	read_conf_files(0);
892	>
893	>	load_conf_modules();
894	>	check_conf_klines();
895		}
896
897		/* lookup_confhost()
#	Line 1224 | Line 904 | lookup_confhost(struct MaskItem *conf)
904		{
905		struct addrinfo hints, *res;
906
907	<	/* Do name lookup now on hostnames given and store the
907	>	/*
908	>	* Do name lookup now on hostnames given and store the
909		* ip numbers in conf structure.
910		*/
911		memset(&hints, 0, sizeof(hints));
#	Line 1241 | Line 922 | lookup_confhost(struct MaskItem *conf)
922		return;
923		}
924
925	<	assert(res != NULL);
925	>	assert(res);
926
927		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
928		conf->addr.ss_len = res->ai_addrlen;
#	Line 1260 | Line 941 | lookup_confhost(struct MaskItem *conf)
941		int
942		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
943		{
944	<	struct ip_entry *ip_found;
945	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
944	>	struct ip_entry *ip_found = NULL;
945	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
946
947	<	/* DLINE exempt also gets you out of static limits/pacing... */
948	<	if (conf && (conf->type == CONF_EXEMPT))
949	<	return 0;
950	<
951	<	if (conf != NULL)
947	>	if (conf)
948	>	{
949	>	/* DLINE exempt also gets you out of static limits/pacing... */
950	>	if (conf->type == CONF_EXEMPT)
951	>	return 0;
952		return BANNED_CLIENT;
953	+	}
954
955	<	ip_found = find_or_add_ip(addr);
955	>	ip_found = ipcache_find_or_add_address(addr);
956
957	<	if ((CurrentTime - ip_found->last_attempt) <
1276	<	ConfigFileEntry.throttle_time)
957	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
958		{
959	<	ip_found->last_attempt = CurrentTime;
960	<	return TOO_FAST;
959	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
960	>	return TOO_FAST;
961	>
962	>	++ip_found->connection_count;
963		}
964	+	else
965	+	ip_found->connection_count = 1;
966
967		ip_found->last_attempt = CurrentTime;
968		return 0;
969		}
970
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	–
971		/* expire_tklines()
972		*
973		* inputs       - tkline list pointer
#	Line 1306 | Line 975 | cleanup_tklines(void *notused)
975		* side effects - expire tklines
976		*/
977		static void
978	<	expire_tklines(dlink_list *tklist)
978	>	expire_tklines(dlink_list *list)
979		{
980	<	dlink_node *ptr;
1312	<	dlink_node *next_ptr;
1313	<	struct MaskItem *conf;
980	>	dlink_node *node = NULL, *node_next = NULL;
981
982	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
982	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
983		{
984	<	conf = ptr->data;
984	>	struct MaskItem *conf = node->data;
985
986		if (!conf->until || conf->until > CurrentTime)
987		continue;
988
989	<	if (conf->type == CONF_XLINE)
990	<	{
991	<	if (ConfigFileEntry.tkline_expire_notices)
992	<	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	<	}
989	>	if (ConfigGeneral.tkline_expire_notices)
990	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
991	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
992	>	conf_free(conf);
993		}
994		}
995
996	+	/* cleanup_tklines()
997	+	*
998	+	* inputs       - NONE
999	+	* output       - NONE
1000	+	* side effects - call function to expire temporary k/d lines
1001	+	*                This is an event started off in ircd.c
1002	+	*/
1003	+	void
1004	+	cleanup_tklines(void *unused)
1005	+	{
1006	+	hostmask_expire_temporary();
1007	+	expire_tklines(&gecos_items);
1008	+	expire_tklines(&nresv_items);
1009	+	expire_tklines(&cresv_items);
1010	+	}
1011	+
1012		/* oper_privs_as_string()
1013		*
1014		* inputs        - pointer to client_p
#	Line 1348 | Line 1021 | static const struct oper_privs
1021		const unsigned char c;
1022		} flag_list[] = {
1023		{ OPER_FLAG_ADMIN,          'A' },
1024	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1025	<	{ OPER_FLAG_DIE,            'D' },
1026	<	{ OPER_FLAG_GLINE,          'G' },
1027	<	{ OPER_FLAG_REHASH,         'H' },
1028	<	{ OPER_FLAG_K,              'K' },
1029	<	{ OPER_FLAG_OPERWALL,       'L' },
1030	<	{ OPER_FLAG_KILL,           'N' },
1031	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1032	<	{ OPER_FLAG_CONNECT,        'P' },
1033	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1034	<	{ OPER_FLAG_SQUIT,          'R' },
1035	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1036	<	{ OPER_FLAG_UNKLINE,        'U' },
1037	<	{ OPER_FLAG_X,              'X' },
1024	>	{ OPER_FLAG_CLOSE,          'B' },
1025	>	{ OPER_FLAG_CONNECT,        'C' },
1026	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1027	>	{ OPER_FLAG_DIE,            'E' },
1028	>	{ OPER_FLAG_DLINE,          'F' },
1029	>	{ OPER_FLAG_GLOBOPS,        'G' },
1030	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1031	>	{ OPER_FLAG_KILL,           'I' },
1032	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1033	>	{ OPER_FLAG_KLINE,          'K' },
1034	>	{ OPER_FLAG_LOCOPS,         'L' },
1035	>	{ OPER_FLAG_MODULE,         'M' },
1036	>	{ OPER_FLAG_NICK_RESV,      'N' },
1037	>	{ OPER_FLAG_OPME,           'O' },
1038	>	{ OPER_FLAG_REHASH,         'P' },
1039	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1040	>	{ OPER_FLAG_RESTART,        'R' },
1041	>	{ OPER_FLAG_RESV,           'S' },
1042	>	{ OPER_FLAG_SET,            'T' },
1043	>	{ OPER_FLAG_SQUIT,          'U' },
1044	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1045	>	{ OPER_FLAG_UNDLINE,        'W' },
1046	>	{ OPER_FLAG_UNKLINE,        'X' },
1047	>	{ OPER_FLAG_UNRESV,         'Y' },
1048	>	{ OPER_FLAG_UNXLINE,        'Z' },
1049	>	{ OPER_FLAG_WALLOPS,        'a' },
1050	>	{ OPER_FLAG_XLINE,          'b' },
1051		{ 0, '\0' }
1052		};
1053
1054	<	char *
1054	>	const char *
1055		oper_privs_as_string(const unsigned int port)
1056		{
1057	<	static char privs_out[16];
1057	>	static char privs_out[IRCD_BUFSIZE];
1058		char *privs_ptr = privs_out;
1373	–	const struct oper_privs *opriv = flag_list;
1059
1060	<	for (; opriv->flag; ++opriv)
1376	<	{
1060	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1061		if (port & opriv->flag)
1062		*privs_ptr++ = opriv->c;
1063	<	else
1064	<	*privs_ptr++ = ToLower(opriv->c);
1065	<	}
1063	>
1064	>	if (privs_ptr == privs_out)
1065	>	*privs_ptr++ = '0';
1066
1067		*privs_ptr = '\0';
1068
#	Line 1386 | Line 1070 | oper_privs_as_string(const unsigned int
1070		}
1071
1072		/*
1073	<	* Input: A client to find the active oper{} name for.
1073	>	* Input: A client to find the active operator {} name for.
1074		* Output: The nick!user@host{oper} of the oper.
1075		*         "oper" is server name for remote opers
1076		* Side effects: None.
#	Line 1394 | Line 1078 | oper_privs_as_string(const unsigned int
1078		const char *
1079		get_oper_name(const struct Client *client_p)
1080		{
1081	<	dlink_node *cnode = NULL;
1082	<	/* +5 for !,@,{,} and null */
1083	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1081	>	static char buffer[IRCD_BUFSIZE];
1082	>
1083	>	if (IsServer(client_p))
1084	>	return client_p->name;
1085
1086		if (MyConnect(client_p))
1087		{
1088	<	if ((cnode = client_p->localClient->confs.head))
1088	>	const dlink_node *const node = client_p->connection->confs.head;
1089	>
1090	>	if (node)
1091		{
1092	<	struct MaskItem *conf = cnode->data;
1092	>	const struct MaskItem *const conf = node->data;
1093
1094	<	if (IsConfOperator(conf))
1094	>	if (conf->type == CONF_OPER)
1095		{
1096		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1097		client_p->username, client_p->host, conf->name);
#	Line 1412 | Line 1099 | get_oper_name(const struct Client *clien
1099		}
1100		}
1101
1102	<	/* Probably should assert here for now. If there is an oper out there
1103	<	* with no oper{} conf attached, it would be good for us to know...
1102	>	/*
1103	>	* Probably should assert here for now. If there is an oper out there
1104	>	* with no operator {} conf attached, it would be good for us to know...
1105		*/
1106	<	assert(0); /* Oper without oper conf! */
1106	>	assert(0);  /* Oper without oper conf! */
1107		}
1108
1109		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1423 | Line 1111 | get_oper_name(const struct Client *clien
1111		return buffer;
1112		}
1113
1114	+	/* clear_out_old_conf()
1115	+	*
1116	+	* inputs       - none
1117	+	* output       - none
1118	+	* side effects - Clear out the old configuration
1119	+	*/
1120	+	static void
1121	+	clear_out_old_conf(void)
1122	+	{
1123	+	dlink_node *node = NULL, *node_next = NULL;
1124	+	dlink_list *free_items [] = {
1125	+	&server_items,   &operator_items,
1126	+	&gecos_items,
1127	+	&nresv_items, &service_items, &cresv_items, NULL
1128	+	};
1129	+
1130	+	dlink_list ** iterator = free_items; /* C is dumb */
1131	+
1132	+	/* We only need to free anything allocated by yyparse() here.
1133	+	* Resetting structs, etc, is taken care of by set_default_conf().
1134	+	*/
1135	+
1136	+	for (; *iterator; iterator++)
1137	+	{
1138	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1139	+	{
1140	+	struct MaskItem *conf = node->data;
1141	+
1142	+	conf->active = 0;
1143	+
1144	+	if (!IsConfDatabase(conf))
1145	+	{
1146	+	dlinkDelete(&conf->node, *iterator);
1147	+
1148	+	if (!conf->ref_count)
1149	+	conf_free(conf);
1150	+	}
1151	+	}
1152	+	}
1153	+
1154	+	motd_clear();
1155	+
1156	+	/*
1157	+	* Don't delete the class table, rather mark all entries for deletion.
1158	+	* The table is cleaned up by class_delete_marked. - avalon
1159	+	*/
1160	+	class_mark_for_deletion();
1161	+
1162	+	clear_out_address_conf();
1163	+
1164	+	/* Clean out module paths */
1165	+	mod_clear_paths();
1166	+
1167	+	cluster_clear();  /* Clear cluster {} items */
1168	+
1169	+	shared_clear();  /* Clear shared {} items */
1170	+
1171	+	pseudo_clear();  /* Clear pseudo {} items */
1172	+
1173	+	/* Clean out ConfigServerInfo */
1174	+	xfree(ConfigServerInfo.description);
1175	+	ConfigServerInfo.description = NULL;
1176	+	xfree(ConfigServerInfo.network_name);
1177	+	ConfigServerInfo.network_name = NULL;
1178	+	xfree(ConfigServerInfo.network_desc);
1179	+	ConfigServerInfo.network_desc = NULL;
1180	+
1181	+	xfree(ConfigServerInfo.rsa_private_key_file);
1182	+	ConfigServerInfo.rsa_private_key_file = NULL;
1183	+	xfree(ConfigServerInfo.ssl_certificate_file);
1184	+	ConfigServerInfo.ssl_certificate_file = NULL;
1185	+	xfree(ConfigServerInfo.ssl_dh_param_file);
1186	+	ConfigServerInfo.ssl_dh_param_file = NULL;
1187	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1188	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1189	+	xfree(ConfigServerInfo.ssl_cipher_list);
1190	+	ConfigServerInfo.ssl_cipher_list = NULL;
1191	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1192	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1193	+
1194	+	/* Clean out ConfigAdminInfo */
1195	+	xfree(ConfigAdminInfo.name);
1196	+	ConfigAdminInfo.name = NULL;
1197	+	xfree(ConfigAdminInfo.email);
1198	+	ConfigAdminInfo.email = NULL;
1199	+	xfree(ConfigAdminInfo.description);
1200	+	ConfigAdminInfo.description = NULL;
1201	+
1202	+	xfree(ConfigServerHide.flatten_links_file);
1203	+	ConfigServerHide.flatten_links_file = NULL;
1204	+
1205	+	/* Clean out listeners */
1206	+	listener_close_marked();
1207	+	}
1208	+
1209	+	static void
1210	+	conf_handle_tls(int cold)
1211	+	{
1212	+	if (!tls_new_cred())
1213	+	{
1214	+	if (cold)
1215	+	{
1216	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1217	+	exit(-1);
1218	+	}
1219	+	else
1220	+	{
1221	+	/* Failed to load new settings/certs, old ones remain active */
1222	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1223	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1224	+	}
1225	+	}
1226	+	}
1227	+
1228		/* read_conf_files()
1229		*
1230		* inputs       - cold start YES or NO
#	Line 1432 | Line 1234 | get_oper_name(const struct Client *clien
1234		void
1235		read_conf_files(int cold)
1236		{
1237	<	const char *filename;
1238	<	char chanmodes[32];
1239	<	char chanlimit[32];
1237	>	const char *filename = NULL;
1238	>	char chanmodes[IRCD_BUFSIZE] = "";
1239	>	char chanlimit[IRCD_BUFSIZE] = "";
1240
1241		conf_parser_ctx.boot = cold;
1242	<	filename = ConfigFileEntry.configfile;
1242	>	filename = ConfigGeneral.configfile;
1243
1244		/* We need to know the initial filename for the yyerror() to report
1245		FIXME: The full path is in conffilenamebuf first time since we
1246	<	dont know anything else
1246	>	don't know anything else
1247
1248	<	- Gozem 2002-07-21
1248	>	- Gozem 2002-07-21
1249		*/
1250		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1251
#	Line 1453 | Line 1255 | read_conf_files(int cold)
1255		{
1256		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1257		filename, strerror(errno));
1258	<	exit(-1);
1258	>	exit(EXIT_FAILURE);
1259		}
1260		else
1261		{
1262	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1262	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1263		"Unable to read configuration file '%s': %s",
1264		filename, strerror(errno));
1265		return;
#	Line 1471 | Line 1273 | read_conf_files(int cold)
1273		fclose(conf_parser_ctx.conf_file);
1274
1275		log_reopen_all();
1276	+	conf_handle_tls(cold);
1277
1278	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1279	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1278	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1279	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1280
1281	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1282	<	add_isupport("MAXLIST", chanmodes, -1);
1283	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1284	<	add_isupport("CHANTYPES", "#", -1);
1285	<
1286	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1287	<	ConfigChannel.max_chans_per_user);
1288	<	add_isupport("CHANLIMIT", chanlimit, -1);
1289	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1290	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1291	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1292	<	add_isupport("CHANMODES", chanmodes, -1);
1281	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1282	>	isupport_add("MAXLIST", chanmodes, -1);
1283	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1284	>	isupport_add("CHANTYPES", "#", -1);
1285	>
1286	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1287	>	ConfigChannel.max_channels);
1288	>	isupport_add("CHANLIMIT", chanlimit, -1);
1289	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1290	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1291	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1292	>	isupport_add("CHANMODES", chanmodes, -1);
1293
1294		/*
1295		* message_locale may have changed.  rebuild isupport since it relies
1296		* on strlen(form_str(RPL_ISUPPORT))
1297		*/
1298	<	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;
1298	>	isupport_rebuild();
1299		}
1300
1301		/* conf_add_class_to_conf()
1302		*
1303		* inputs       - pointer to config item
1304		* output       - NONE
1305	<	* side effects - Add a class pointer to a conf
1305	>	* side effects - Add a class pointer to a conf
1306		*/
1307		void
1308	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1308	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1309		{
1310	<	if (class_name == NULL)
1310	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1311		{
1312		conf->class = class_default;
1313
1314	<	if (conf->type == CONF_CLIENT)
1315	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1618	<	"Warning *** Defaulting to default class for %s@%s",
1619	<	conf->user, conf->host);
1620	<	else
1621	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1622	<	"Warning *** Defaulting to default class for %s",
1623	<	conf->name);
1624	<	}
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,
1314	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1315	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1316		"Warning *** Defaulting to default class for %s@%s",
1317		conf->user, conf->host);
1318		else
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320		"Warning *** Defaulting to default class for %s",
1321		conf->name);
1638	–	conf->class = class_default;
1322		}
1323		}
1324
#	Line 1654 | Line 1337 | yyerror(const char *msg)
1337		return;
1338
1339		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1340	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1340	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1341		"\"%s\", line %u: %s: %s",
1342		conffilebuf, lineno + 1, msg, newlinebuf);
1343		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1667 | Line 1350 | conf_error_report(const char *msg)
1350		char newlinebuf[IRCD_BUFSIZE];
1351
1352		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1353	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1353	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1354		"\"%s\", line %u: %s: %s",
1355		conffilebuf, lineno + 1, msg, newlinebuf);
1356		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1676 | Line 1359 | conf_error_report(const char *msg)
1359
1360		/*
1361		* valid_tkline()
1362	<	*
1362	>	*
1363		* inputs       - pointer to ascii string to check
1364		*              - whether the specified time is in seconds or minutes
1365		* output       - -1 not enough parameters
#	Line 1701 | Line 1384 | valid_tkline(const char *data, const int
1384		}
1385
1386		/*
1387	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1388	<	* i.e. they specifically use 0, I am going to return 1 instead
1389	<	* as a return value of non-zero is used to flag it as a temporary kline
1387	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1388	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1389	>	* value of non-zero is used to flag it as a temporary kline
1390		*/
1391		if (result == 0)
1392		result = 1;
1393
1394	<	/*
1394	>	/*
1395		* If the incoming time is in seconds convert it to minutes for the purpose
1396		* of this calculation
1397		*/
1398		if (!minutes)
1399	<	result = result / 60;
1399	>	result = result / 60;
1400
1401		if (result > MAX_TDKLINE_TIME)
1402		result = MAX_TDKLINE_TIME;
1403
1404	<	result = result * 60;  /* turn it into seconds */
1404	>	result = result * 60;  /* Turn it into seconds */
1405
1406		return result;
1407		}
#	Line 1734 | Line 1417 | valid_wild_card_simple(const char *data)
1417		{
1418		const unsigned char *p = (const unsigned char *)data;
1419		unsigned char tmpch = '\0';
1420	<	int nonwild = 0;
1420	>	unsigned int nonwild = 0, wild = 0;
1421
1422		while ((tmpch = *p++))
1423		{
1424	<	if (tmpch == '\\')
1424	>	if (tmpch == '\\' && *p)
1425		{
1426		++p;
1427	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1427	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1428		return 1;
1429		}
1430		else if (!IsMWildChar(tmpch))
1431		{
1432	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1432	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1433		return 1;
1434		}
1435	+	else
1436	+	++wild;
1437		}
1438
1439	<	return 0;
1439	>	return !wild;
1440		}
1441
1442		/* valid_wild_card()
#	Line 1763 | Line 1448 | valid_wild_card_simple(const char *data)
1448		* side effects - NOTICE is given to source_p if warn is 1
1449		*/
1450		int
1451	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1451	>	valid_wild_card(struct Client *source_p, int count, ...)
1452		{
1453	<	char tmpch;
1454	<	int nonwild = 0;
1453	>	unsigned char tmpch = '\0';
1454	>	unsigned int nonwild = 0;
1455		va_list args;
1456
1457		/*
#	Line 1785 | Line 1470 | valid_wild_card(struct Client *source_p,
1470
1471		while (count--)
1472		{
1473	<	const char *p = va_arg(args, const char *);
1473	>	const unsigned char *p = va_arg(args, const unsigned char *);
1474		if (p == NULL)
1475		continue;
1476
#	Line 1797 | Line 1482 | valid_wild_card(struct Client *source_p,
1482		* If we find enough non-wild characters, we can
1483		* break - no point in searching further.
1484		*/
1485	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1485	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1486	>	{
1487	>	va_end(args);
1488		return 1;
1489	+	}
1490		}
1491		}
1492		}
1493
1494	<	if (warn)
1495	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1496	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1494	>	if (IsClient(source_p))
1495	>	sendto_one_notice(source_p, &me,
1496	>	":Please include at least %u non-wildcard characters with the mask",
1497	>	ConfigGeneral.min_nonwildcard);
1498	>	va_end(args);
1499	>	return 0;
1500	>	}
1501	>
1502	>	/* find_user_host()
1503	>	*
1504	>	* inputs       - pointer to client placing kline
1505	>	*              - pointer to user_host_or_nick
1506	>	*              - pointer to user buffer
1507	>	*              - pointer to host buffer
1508	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1509	>	* side effects -
1510	>	*/
1511	>	static int
1512	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1513	>	char *luser, char *lhost)
1514	>	{
1515	>	struct Client *target_p = NULL;
1516	>	char *hostp = NULL;
1517	>
1518	>	if (lhost == NULL)
1519	>	{
1520	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1521	>	return 1;
1522	>	}
1523	>
1524	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1525	>	{
1526	>	/* Explicit user@host mask given */
1527	>	if (hostp)                            /* I'm a little user@host */
1528	>	{
1529	>	*(hostp++) = '\0';                       /* short and squat */
1530	>
1531	>	if (*user_host_or_nick)
1532	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1533	>	else
1534	>	strcpy(luser, "*");
1535	>
1536	>	if (*hostp)
1537	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1538	>	else
1539	>	strcpy(lhost, "*");
1540	>	}
1541	>	else
1542	>	{
1543	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1544	>	luser[1] = '\0';
1545	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1546	>	}
1547	>
1548	>	return 1;
1549	>	}
1550	>	else
1551	>	{
1552	>	/* Try to find user@host mask from nick */
1553	>	/* Okay to use source_p as the first param, because source_p == client_p */
1554	>	if ((target_p =
1555	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1556	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1557	>
1558	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1559	>	{
1560	>	if (IsClient(source_p))
1561	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1562	>	return 0;
1563	>	}
1564	>
1565	>	/*
1566	>	* Turn the "user" bit into "*user", blow away '~'
1567	>	* if found in original user name (non-idented)
1568	>	*/
1569	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1570	>
1571	>	if (target_p->username[0] == '~')
1572	>	luser[0] = '*';
1573	>
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);
2090	<	}
2091	<
2092	<	/*
2093	<	* cluster_a_line
2094	<	*
2095	<	* inputs       - client sending the cluster
2096	<	*              - command name "KLINE" "XLINE" etc.
2097	<	*              - capab -- CAP_KLN etc. from s_serv.h
2098	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2099	<	*              - pattern and args to send along
2100	<	* output       - none
2101	<	* side effects - Take source_p send the pattern with args given
2102	<	*                along to all servers that match capab and cluster type
2103	<	*/
2104	<	void
2105	<	cluster_a_line(struct Client *source_p, const char *command,
2106	<	int capab, int cluster_type, const char *pattern, ...)
2107	<	{
2108	<	va_list args;
2109	<	char buffer[IRCD_BUFSIZE];
2110	<	const dlink_node *ptr = NULL;
2111	<
2112	<	va_start(args, pattern);
2113	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
2114	<	va_end(args);
2115	<
2116	<	DLINK_FOREACH(ptr, cluster_items.head)
2117	<	{
2118	<	const struct MaskItem *conf = ptr->data;
2119	<
2120	<	if (conf->flags & cluster_type)
2121	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2122	<	"%s %s %s", command, conf->name, buffer);
2123	<	}
1740	>	return encr && !strcmp(encr, conf->passwd);
1741		}
1742
1743		/*
#	Line 2158 | Line 1775 | split_nuh(struct split_nuh_item *const i
1775
1776		if (iptr->nickptr)
1777		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1778	+
1779		if (iptr->userptr)
1780		strlcpy(iptr->userptr, "*", iptr->usersize);
1781	+
1782		if (iptr->hostptr)
1783		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1784
#	Line 2167 | Line 1786 | split_nuh(struct split_nuh_item *const i
1786		{
1787		*p = '\0';
1788
1789	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1789	>	if (iptr->nickptr && *iptr->nuhmask)
1790		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1791
1792		if ((q = strchr(++p, '@')))
1793		{
1794		*q++ = '\0';
1795
1796	<	if (*p != '\0')
1796	>	if (*p)
1797		strlcpy(iptr->userptr, p, iptr->usersize);
1798
1799	<	if (*q != '\0')
1799	>	if (*q)
1800		strlcpy(iptr->hostptr, q, iptr->hostsize);
1801		}
1802		else
1803		{
1804	<	if (*p != '\0')
1804	>	if (*p)
1805		strlcpy(iptr->userptr, p, iptr->usersize);
1806		}
1807		}
#	Line 2194 | Line 1813 | split_nuh(struct split_nuh_item *const i
1813		/* if found a @ */
1814		*p++ = '\0';
1815
1816	<	if (*iptr->nuhmask != '\0')
1816	>	if (*iptr->nuhmask)
1817		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1818
1819	<	if (*p != '\0')
1819	>	if (*p)
1820		strlcpy(iptr->hostptr, p, iptr->hostsize);
1821		}
1822		else
1823		{
1824	<	/* no @ found */
1824	>	/* No @ found */
1825		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1826		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1827		else

Diff Legend

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