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 2830 by michael, Thu Jan 16 15:23:07 2014 UTC vs.
Revision 9638 by michael, Tue Sep 29 12:49:07 2020 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-2020 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 "parse.h"
31		#include "conf.h"
32	<	#include "s_serv.h"
33	<	#include "resv.h"
32	>	#include "conf_cluster.h"
33	>	#include "conf_gecos.h"
34	>	#include "conf_pseudo.h"
35	>	#include "conf_resv.h"
36	>	#include "conf_service.h"
37	>	#include "conf_shared.h"
38	>	#include "server.h"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
34	–	#include "hook.h"
42		#include "irc_string.h"
43		#include "s_bsd.h"
44		#include "ircd.h"
#	Line 42 | Line 49
49		#include "fdlist.h"
50		#include "log.h"
51		#include "send.h"
45	–	#include "s_gline.h"
52		#include "memory.h"
53	<	#include "mempool.h"
54	<	#include "irc_res.h"
49	<	#include "userhost.h"
50	<	#include "s_user.h"
53	>	#include "res.h"
54	>	#include "user.h"
55		#include "channel_mode.h"
56	<	#include "parse.h"
53	<	#include "s_misc.h"
56	>	#include "misc.h"
57		#include "conf_db.h"
58		#include "conf_class.h"
59		#include "motd.h"
60	+	#include "ipcache.h"
61	+	#include "isupport.h"
62	+	#include "whowas.h"
63
64	<	struct config_server_hide ConfigServerHide;
64	>
65	>	struct config_channel_entry ConfigChannel;
66	>	struct config_serverhide_entry ConfigServerHide;
67	>	struct config_general_entry ConfigGeneral;
68	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
69	>	struct config_serverinfo_entry ConfigServerInfo;
70	>	struct config_admin_entry ConfigAdminInfo;
71	>	struct conf_parser_context conf_parser_ctx;
72
73		/* general conf items link list root, other than k lines etc. */
74	<	dlink_list service_items = { NULL, NULL, 0 };
75	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list oconf_items   = { NULL, NULL, 0 };
65	<	dlink_list uconf_items   = { NULL, NULL, 0 };
66	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list cresv_items = { NULL, NULL, 0 };
74	>	dlink_list connect_items;
75	>	dlink_list operator_items;
76
77		extern unsigned int lineno;
78		extern char linebuf[];
79		extern char conffilebuf[IRCD_BUFSIZE];
80		extern int yyparse(); /* defined in y.tab.c */
81
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	–
82
83		/* conf_dns_callback()
84		*
#	Line 117 | Line 91 | static int ip_entries_count = 0;
91		* if successful save hp in the conf item it was called with
92		*/
93		static void
94	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
94	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
95		{
96	<	struct MaskItem *conf = vptr;
96	>	struct MaskItem *const conf = vptr;
97
98	<	conf->dns_pending = 0;
98	>	conf->dns_pending = false;
99
100	<	if (addr != NULL)
101	<	memcpy(&conf->addr, addr, sizeof(conf->addr));
100	>	if (addr)
101	>	*conf->addr = *addr;
102		else
103	<	conf->dns_failed = 1;
103	>	conf->dns_failed = true;
104		}
105
106	<	/* conf_dns_lookup()
106	>	/* conf_resolve_host()
107		*
108	<	* do a nameserver lookup of the conf host
109	<	* if the conf entry is currently doing a ns lookup do nothing, otherwise
136	<	* allocate a dns_query and start ns lookup.
108	>	* start DNS lookups of all hostnames in the conf
109	>	* line and convert an IP addresses in a.b.c.d number for to IP#s.
110		*/
111	<	static void
111	>	void
112		conf_dns_lookup(struct MaskItem *conf)
113		{
114	<	if (!conf->dns_pending)
114	>	struct addrinfo hints, *res;
115	>
116	>	/*
117	>	* Do name lookup now on hostnames given and store the
118	>	* ip numbers in conf structure.
119	>	*/
120	>	memset(&hints, 0, sizeof(hints));
121	>
122	>	hints.ai_family = AF_UNSPEC;
123	>	hints.ai_socktype = SOCK_STREAM;
124	>
125	>	/* Get us ready for a bind() and don't bother doing dns lookup */
126	>	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
127	>
128	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
129		{
130	<	conf->dns_pending = 1;
131	<	gethost_byname(conf_dns_callback, conf, conf->host);
130	>	/*
131	>	* By this point conf->host possibly is not a numerical network address. Do a nameserver
132	>	* lookup of the conf host. If the conf entry is currently doing a ns lookup do nothing.
133	>	*/
134	>	if (conf->dns_pending == true)
135	>	return;
136	>
137	>	conf->dns_pending = true;
138	>
139	>	if (conf->aftype == AF_INET)
140	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
141	>	else
142	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
143	>	return;
144	>	}
145	>
146	>	assert(res);
147	>
148	>	memcpy(conf->addr, res->ai_addr, res->ai_addrlen);
149	>	conf->addr->ss_len = res->ai_addrlen;
150	>
151	>	freeaddrinfo(res);
152	>	}
153	>
154	>	/* map_to_list()
155	>	*
156	>	* inputs       - ConfType conf
157	>	* output       - pointer to dlink_list to use
158	>	* side effects - none
159	>	*/
160	>	static dlink_list *
161	>	map_to_list(enum maskitem_type type)
162	>	{
163	>	switch (type)
164	>	{
165	>	case CONF_OPER:
166	>	return &operator_items;
167	>	break;
168	>	case CONF_SERVER:
169	>	return &connect_items;
170	>	break;
171	>	default:
172	>	return NULL;
173		}
174		}
175
176		struct MaskItem *
177		conf_make(enum maskitem_type type)
178		{
179	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
179	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
180		dlink_list *list = NULL;
181
182		conf->type   = type;
183	<	conf->active = 1;
183	>	conf->active = true;
184		conf->aftype = AF_INET;
185
186		if ((list = map_to_list(type)))
#	Line 163 | Line 191 | conf_make(enum maskitem_type type)
191		void
192		conf_free(struct MaskItem *conf)
193		{
194	<	dlink_node *ptr = NULL, *ptr_next = NULL;
194	>	dlink_node *node = NULL, *node_next = NULL;
195		dlink_list *list = NULL;
196
197	<	if (conf->node.next)
198	<	if ((list = map_to_list(conf->type)))
171	<	dlinkDelete(&conf->node, list);
197	>	if ((list = map_to_list(conf->type)))
198	>	dlinkFindDelete(list, conf);
199
200	<	MyFree(conf->name);
200	>	xfree(conf->name);
201
202	<	if (conf->dns_pending)
202	>	if (conf->dns_pending == true)
203		delete_resolver_queries(conf);
204	<	if (conf->passwd != NULL)
204	>	if (conf->passwd)
205		memset(conf->passwd, 0, strlen(conf->passwd));
206	<	if (conf->spasswd != NULL)
206	>	if (conf->spasswd)
207		memset(conf->spasswd, 0, strlen(conf->spasswd));
208
209		conf->class = NULL;
210
211	<	MyFree(conf->passwd);
212	<	MyFree(conf->spasswd);
213	<	MyFree(conf->reason);
214	<	MyFree(conf->certfp);
215	<	MyFree(conf->user);
216	<	MyFree(conf->host);
217	<	#ifdef HAVE_LIBCRYPTO
218	<	MyFree(conf->cipher_list);
211	>	xfree(conf->passwd);
212	>	xfree(conf->spasswd);
213	>	xfree(conf->reason);
214	>	xfree(conf->certfp);
215	>	xfree(conf->whois);
216	>	xfree(conf->user);
217	>	xfree(conf->host);
218	>	xfree(conf->addr);
219	>	xfree(conf->bind);
220	>	xfree(conf->cipher_list);
221
222	<	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)
222	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
223		{
224	<	MyFree(ptr->data);
225	<	dlinkDelete(ptr, &conf->hub_list);
226	<	free_dlink_node(ptr);
224	>	xfree(node->data);
225	>	dlinkDelete(node, &conf->hub_list);
226	>	free_dlink_node(node);
227		}
228
229	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
229	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
230		{
231	<	MyFree(ptr->data);
232	<	dlinkDelete(ptr, &conf->leaf_list);
233	<	free_dlink_node(ptr);
231	>	xfree(node->data);
232	>	dlinkDelete(node, &conf->leaf_list);
233	>	free_dlink_node(node);
234		}
235
236	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
211	<	{
212	<	struct exempt *exptr = ptr->data;
213	<
214	<	dlinkDelete(ptr, &conf->exempt_list);
215	<	MyFree(exptr->name);
216	<	MyFree(exptr->user);
217	<	MyFree(exptr->host);
218	<	MyFree(exptr);
219	<	}
220	<
221	<	MyFree(conf);
236	>	xfree(conf);
237		}
238
239	<	/* check_client()
239	>	/* attach_iline()
240		*
241	<	* inputs       - pointer to client
242	<	* output       - 0 = Success
243	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
244	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
230	<	*                I_LINE_FULL       (-3) = I-line is full
231	<	*                TOO_MANY          (-4) = Too many connections from hostname
232	<	*                BANNED_CLIENT     (-5) = K-lined
233	<	* side effects - Ordinary client access check.
234	<	*                Look for conf lines which have the same
235	<	*                status as the flags passed.
241	>	* inputs       - client pointer
242	>	*              - conf pointer
243	>	* output       -
244	>	* side effects - do actual attach
245		*/
246	<	int
247	<	check_client(struct Client *source_p)
246	>	static int
247	>	attach_iline(struct Client *client, struct MaskItem *conf)
248		{
249	<	int i;
250	<
242	<	if ((i = verify_access(source_p)))
243	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
244	<	source_p->name, source_p->sockhost);
245	<
246	<	switch (i)
247	<	{
248	<	case TOO_MANY:
249	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
250	<	"Too many on IP for %s (%s).",
251	<	get_client_name(source_p, SHOW_IP),
252	<	source_p->sockhost);
253	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
254	<	get_client_name(source_p, SHOW_IP));
255	<	++ServerStats.is_ref;
256	<	exit_client(source_p, &me, "No more connections allowed on that IP");
257	<	break;
249	>	const struct ClassItem *const class = conf->class;
250	>	bool a_limit_reached = false;
251
252	<	case I_LINE_FULL:
253	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
254	<	"auth{} block is full for %s (%s).",
255	<	get_client_name(source_p, SHOW_IP),
256	<	source_p->sockhost);
257	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
258	<	get_client_name(source_p, SHOW_IP));
259	<	++ServerStats.is_ref;
260	<	exit_client(source_p, &me,
261	<	"No more connections allowed in your connection class");
262	<	break;
252	>	struct ip_entry *ipcache = ipcache_record_find_or_add(&client->ip);
253	>	++ipcache->count_local;
254	>	AddFlag(client, FLAGS_IPHASH);
255	>
256	>	if (class->max_total && class->ref_count >= class->max_total)
257	>	a_limit_reached = true;
258	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
259	>	a_limit_reached = true;
260	>	else if (class->max_perip_global &&
261	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
262	>	a_limit_reached = true;
263
264	<	case NOT_AUTHORIZED:
265	<	++ServerStats.is_ref;
266	<	/* jdc - lists server name & port connections are on */
267	<	/*       a purely cosmetical change */
275	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
276	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
277	<	get_client_name(source_p, SHOW_IP),
278	<	source_p->sockhost,
279	<	source_p->localClient->listener->name,
280	<	source_p->localClient->listener->port);
281	<	ilog(LOG_TYPE_IRCD,
282	<	"Unauthorized client connection from %s on [%s/%u].",
283	<	get_client_name(source_p, SHOW_IP),
284	<	source_p->localClient->listener->name,
285	<	source_p->localClient->listener->port);
286	<
287	<	exit_client(source_p, &me, "You are not authorized to use this server");
288	<	break;
289	<
290	<	case BANNED_CLIENT:
291	<	exit_client(source_p, &me, "Banned");
292	<	++ServerStats.is_ref;
293	<	break;
264	>	if (a_limit_reached == true)
265	>	{
266	>	if (!IsConfExemptLimits(conf))
267	>	return TOO_MANY;   /* Already at maximum allowed */
268
269	<	case 0:
270	<	default:
297	<	break;
269	>	sendto_one_notice(client, &me, ":*** Your connection class is full, "
270	>	"but you have exceed_limit = yes;");
271		}
272
273	<	return (i < 0 ? 0 : 1);
273	>	return conf_attach(client, conf);
274		}
275
276		/* verify_access()
277		*
278	<	* inputs       - pointer to client to verify
279	<	* output       - 0 if success -'ve if not
280	<	* side effect  - find the first (best) I line to attach.
278	>	* inputs       - pointer to client to verify
279	>	* output       - 0 if success -'ve if not
280	>	* side effect  - find the first (best) I line to attach.
281		*/
282		static int
283	<	verify_access(struct Client *client_p)
283	>	verify_access(struct Client *client)
284		{
285	<	struct MaskItem *conf = NULL;
313	<	char non_ident[USERLEN + 1] = { '~', '\0' };
285	>	struct MaskItem *conf;
286
287	<	if (IsGotId(client_p))
288	<	{
289	<	conf = find_address_conf(client_p->host, client_p->username,
318	<	&client_p->localClient->ip,
319	<	client_p->localClient->aftype,
320	<	client_p->localClient->passwd);
321	<	}
287	>	if (HasFlag(client, FLAGS_GOTID))
288	>	conf = find_address_conf(client->host, client->username, &client->ip,
289	>	client->connection->password);
290		else
291		{
292	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
325	<	conf = find_address_conf(client_p->host,non_ident,
326	<	&client_p->localClient->ip,
327	<	client_p->localClient->aftype,
328	<	client_p->localClient->passwd);
329	<	}
330	<
331	<	if (conf != NULL)
332	<	{
333	<	if (IsConfClient(conf))
334	<	{
335	<	if (IsConfRedir(conf))
336	<	{
337	<	sendto_one(client_p, form_str(RPL_REDIR),
338	<	me.name, client_p->name,
339	<	conf->name ? conf->name : "",
340	<	conf->port);
341	<	return NOT_AUTHORIZED;
342	<	}
343	<
344	<	if (IsConfDoIdentd(conf))
345	<	SetNeedId(client_p);
346	<
347	<	/* Thanks for spoof idea amm */
348	<	if (IsConfDoSpoofIp(conf))
349	<	{
350	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
351	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
352	<	"%s spoofing: %s as %s",
353	<	client_p->name, client_p->host, conf->name);
354	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
355	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
356	<	}
292	>	char non_ident[USERLEN + 1] = "~";
293
294	<	return attach_iline(client_p, conf);
295	<	}
296	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
361	<	{
362	<	if (IsConfGline(conf))
363	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
364	<	client_p->name);
365	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
366	<	me.name, client_p->name, conf->reason);
367	<	return BANNED_CLIENT;
368	<	}
294	>	strlcpy(non_ident + 1, client->username, sizeof(non_ident) - 1);
295	>	conf = find_address_conf(client->host, non_ident, &client->ip,
296	>	client->connection->password);
297		}
298
299	<	return NOT_AUTHORIZED;
300	<	}
299	>	if (conf == NULL)
300	>	return NOT_AUTHORIZED;
301
302	<	/* attach_iline()
375	<	*
376	<	* inputs       - client pointer
377	<	*              - conf pointer
378	<	* output       -
379	<	* side effects - do actual attach
380	<	*/
381	<	static int
382	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
383	<	{
384	<	struct ClassItem *class = NULL;
385	<	struct ip_entry *ip_found;
386	<	int a_limit_reached = 0;
387	<	unsigned int local = 0, global = 0, ident = 0;
388	<
389	<	assert(conf->class);
390	<
391	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
392	<	ip_found->count++;
393	<	SetIpHash(client_p);
394	<
395	<	class = conf->class;
396	<
397	<	count_user_host(client_p->username, client_p->host,
398	<	&global, &local, &ident);
302	>	assert(IsConfClient(conf) || IsConfKill(conf));
303
304	<	/* XXX blah. go down checking the various silly limits
401	<	* setting a_limit_reached if any limit is reached.
402	<	* - Dianora
403	<	*/
404	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
405	<	a_limit_reached = 1;
406	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
407	<	a_limit_reached = 1;
408	<	else if (class->max_local != 0 && local >= class->max_local)
409	<	a_limit_reached = 1;
410	<	else if (class->max_global != 0 && global >= class->max_global)
411	<	a_limit_reached = 1;
412	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
413	<	client_p->username[0] != '~')
414	<	a_limit_reached = 1;
415	<
416	<	if (a_limit_reached)
304	>	if (IsConfKill(conf))
305		{
306	<	if (!IsConfExemptLimits(conf))
307	<	return TOO_MANY;   /* Already at maximum allowed */
420	<
421	<	sendto_one(client_p,
422	<	":%s NOTICE %s :*** Your connection class is full, "
423	<	"but you have exceed_limit = yes;", me.name, client_p->name);
306	>	sendto_one_notice(client, &me, ":*** Banned: %s", conf->reason);
307	>	return BANNED_CLIENT;
308		}
309
310	<	return attach_conf(client_p, conf);
427	<	}
428	<
429	<	/* init_ip_hash_table()
430	<	*
431	<	* inputs               - NONE
432	<	* output               - NONE
433	<	* side effects         - allocate memory for ip_entry(s)
434	<	*                      - clear the ip hash table
435	<	*/
436	<	void
437	<	init_ip_hash_table(void)
438	<	{
439	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
440	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
441	<	}
442	<
443	<	/* find_or_add_ip()
444	<	*
445	<	* inputs       - pointer to struct irc_ssaddr
446	<	* output       - pointer to a struct ip_entry
447	<	* side effects -
448	<	*
449	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
450	<	* count set to 0.
451	<	*/
452	<	static struct ip_entry *
453	<	find_or_add_ip(struct irc_ssaddr *ip_in)
454	<	{
455	<	struct ip_entry *ptr, *newptr;
456	<	int hash_index = hash_ip(ip_in), res;
457	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
458	<	#ifdef IPV6
459	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
460	<	#endif
461	<
462	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
310	>	if (IsConfRedir(conf))
311		{
312	<	#ifdef IPV6
313	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
314	<	continue;
315	<	if (ip_in->ss.ss_family == AF_INET6)
468	<	{
469	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
470	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
471	<	}
472	<	else
473	<	#endif
474	<	{
475	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
476	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
477	<	}
478	<	if (res == 0)
479	<	{
480	<	/* Found entry already in hash, return it. */
481	<	return ptr;
482	<	}
312	>	sendto_one_numeric(client, &me, RPL_REDIR,
313	>	conf->name ? conf->name : "",
314	>	conf->port);
315	>	return NOT_AUTHORIZED;
316		}
317
318	<	if (ip_entries_count >= 2 * hard_fdlimit)
319	<	garbage_collect_ip_entries();
487	<
488	<	newptr = mp_pool_get(ip_entry_pool);
489	<	memset(newptr, 0, sizeof(*newptr));
490	<	ip_entries_count++;
491	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
492	<
493	<	newptr->next = ip_hash_table[hash_index];
494	<	ip_hash_table[hash_index] = newptr;
495	<
496	<	return newptr;
497	<	}
498	<
499	<	/* remove_one_ip()
500	<	*
501	<	* inputs        - unsigned long IP address value
502	<	* output        - NONE
503	<	* side effects  - The ip address given, is looked up in ip hash table
504	<	*                 and number of ip#'s for that ip decremented.
505	<	*                 If ip # count reaches 0 and has expired,
506	<	*                 the struct ip_entry is returned to the ip_entry_heap
507	<	*/
508	<	void
509	<	remove_one_ip(struct irc_ssaddr *ip_in)
510	<	{
511	<	struct ip_entry *ptr;
512	<	struct ip_entry *last_ptr = NULL;
513	<	int hash_index = hash_ip(ip_in), res;
514	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
515	<	#ifdef IPV6
516	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
517	<	#endif
318	>	/* Preserve x->host in x->realhost before it gets overwritten. */
319	>	strlcpy(client->realhost, client->host, sizeof(client->realhost));
320
321	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
322	<	{
521	<	#ifdef IPV6
522	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
523	<	continue;
524	<	if (ip_in->ss.ss_family == AF_INET6)
525	<	{
526	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
527	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
528	<	}
529	<	else
530	<	#endif
531	<	{
532	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
533	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
534	<	}
535	<	if (res)
536	<	continue;
537	<	if (ptr->count > 0)
538	<	ptr->count--;
539	<	if (ptr->count == 0 &&
540	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
541	<	{
542	<	if (last_ptr != NULL)
543	<	last_ptr->next = ptr->next;
544	<	else
545	<	ip_hash_table[hash_index] = ptr->next;
321	>	if (IsConfDoSpoofIp(conf))
322	>	strlcpy(client->host, conf->name, sizeof(client->host));
323
324	<	mp_pool_release(ptr);
548	<	ip_entries_count--;
549	<	return;
550	<	}
551	<	last_ptr = ptr;
552	<	}
324	>	return attach_iline(client, conf);
325		}
326
327	<	/* hash_ip()
556	<	*
557	<	* input        - pointer to an irc_inaddr
558	<	* output       - integer value used as index into hash table
559	<	* side effects - hopefully, none
560	<	*/
561	<	static int
562	<	hash_ip(struct irc_ssaddr *addr)
563	<	{
564	<	if (addr->ss.ss_family == AF_INET)
565	<	{
566	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
567	<	int hash;
568	<	uint32_t ip;
569	<
570	<	ip   = ntohl(v4->sin_addr.s_addr);
571	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
572	<	return hash;
573	<	}
574	<	#ifdef IPV6
575	<	else
576	<	{
577	<	int hash;
578	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
579	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
580	<
581	<	hash  = ip[0] ^ ip[3];
582	<	hash ^= hash >> 16;
583	<	hash ^= hash >> 8;
584	<	hash  = hash & (IP_HASH_SIZE - 1);
585	<	return hash;
586	<	}
587	<	#else
588	<	return 0;
589	<	#endif
590	<	}
591	<
592	<	/* count_ip_hash()
593	<	*
594	<	* inputs        - pointer to counter of number of ips hashed
595	<	*               - pointer to memory used for ip hash
596	<	* output        - returned via pointers input
597	<	* side effects  - NONE
327	>	/* check_client()
328		*
329	<	* number of hashed ip #'s is counted up, plus the amount of memory
330	<	* used in the hash.
329	>	* inputs       - pointer to client
330	>	* output       - 0 = Success
331	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
332	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
333	>	*                I_LINE_FULL       (-3) = I-line is full
334	>	*                TOO_MANY          (-4) = Too many connections from hostname
335	>	*                BANNED_CLIENT     (-5) = K-lined
336	>	* side effects - Ordinary client access check.
337	>	*                Look for conf lines which have the same
338	>	*                status as the flags passed.
339		*/
340	<	void
341	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
340	>	bool
341	>	conf_check_client(struct Client *client)
342		{
605	–	struct ip_entry *ptr;
343		int i;
344
345	<	*number_ips_stored = 0;
346	<	*mem_ips_stored    = 0;
345	>	if ((i = verify_access(client)))
346	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
347	>	client->name, client->sockhost);
348
349	<	for (i = 0; i < IP_HASH_SIZE; i++)
349	>	switch (i)
350		{
351	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
352	<	{
353	<	*number_ips_stored += 1;
354	<	*mem_ips_stored += sizeof(struct ip_entry);
355	<	}
356	<	}
357	<	}
351	>	case TOO_MANY:
352	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
353	>	"Too many on IP for %s (%s).",
354	>	client_get_name(client, SHOW_IP),
355	>	client->sockhost);
356	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
357	>	client_get_name(client, SHOW_IP));
358	>	++ServerStats.is_ref;
359	>	exit_client(client, "No more connections allowed on that IP");
360	>	break;
361
362	<	/* garbage_collect_ip_entries()
363	<	*
364	<	* input        - NONE
365	<	* output       - NONE
366	<	* side effects - free up all ip entries with no connections
367	<	*/
368	<	static void
369	<	garbage_collect_ip_entries(void)
370	<	{
371	<	struct ip_entry *ptr;
631	<	struct ip_entry *last_ptr;
632	<	struct ip_entry *next_ptr;
633	<	int i;
362	>	case I_LINE_FULL:
363	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
364	>	"auth {} block is full for %s (%s).",
365	>	client_get_name(client, SHOW_IP),
366	>	client->sockhost);
367	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
368	>	client_get_name(client, SHOW_IP));
369	>	++ServerStats.is_ref;
370	>	exit_client(client, "No more connections allowed in your connection class");
371	>	break;
372
373	<	for (i = 0; i < IP_HASH_SIZE; i++)
374	<	{
375	<	last_ptr = NULL;
373	>	case NOT_AUTHORIZED:
374	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
375	>	"Unauthorized client connection from %s.",
376	>	client_get_name(client, SHOW_IP));
377	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s.",
378	>	client_get_name(client, SHOW_IP));
379	>	++ServerStats.is_ref;
380	>	exit_client(client, "You are not authorized to use this server");
381	>	break;
382
383	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
384	<	{
385	<	next_ptr = ptr->next;
383	>	case BANNED_CLIENT:
384	>	++ServerStats.is_ref;
385	>	exit_client(client, "Banned");
386	>	break;
387
388	<	if (ptr->count == 0 &&
389	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
390	<	{
646	<	if (last_ptr != NULL)
647	<	last_ptr->next = ptr->next;
648	<	else
649	<	ip_hash_table[i] = ptr->next;
650	<	mp_pool_release(ptr);
651	<	ip_entries_count--;
652	<	}
653	<	else
654	<	last_ptr = ptr;
655	<	}
388	>	case 0:
389	>	default:
390	>	break;
391		}
392	+
393	+	if (i < 0)
394	+	return false;
395	+	return true;
396		}
397
398	<	/* detach_conf()
399	<	*
400	<	* inputs       - pointer to client to detach
401	<	*              - type of conf to detach
663	<	* output       - 0 for success, -1 for failure
664	<	* side effects - Disassociate configuration from the client.
665	<	*                Also removes a class from the list if marked for deleting.
398	>	/*! \brief Disassociate configuration from the client. Also removes a class
399	>	*         from the list if marked for deleting.
400	>	* \param client Client to operate on
401	>	* \param type     Type of conf to detach
402		*/
403		void
404	<	detach_conf(struct Client *client_p, enum maskitem_type type)
404	>	conf_detach(struct Client *client, enum maskitem_type type)
405		{
406	<	dlink_node *ptr = NULL, *next_ptr = NULL;
406	>	dlink_node *node, *node_next;
407
408	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
408	>	DLINK_FOREACH_SAFE(node, node_next, client->connection->confs.head)
409		{
410	<	struct MaskItem *conf = ptr->data;
410	>	struct MaskItem *conf = node->data;
411
412		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
413		assert(conf->ref_count > 0);
#	Line 680 | Line 416 | detach_conf(struct Client *client_p, enu
416		if (!(conf->type & type))
417		continue;
418
419	<	dlinkDelete(ptr, &client_p->localClient->confs);
420	<	free_dlink_node(ptr);
419	>	dlinkDelete(node, &client->connection->confs);
420	>	free_dlink_node(node);
421
422		if (conf->type == CONF_CLIENT)
423	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
423	>	class_ip_limit_remove(conf->class, &client->ip);
424
425	<	if (--conf->class->ref_count == 0 && conf->class->active == 0)
425	>	if (--conf->class->ref_count == 0 && conf->class->active == false)
426		{
427		class_free(conf->class);
428		conf->class = NULL;
429		}
430
431	<	if (--conf->ref_count == 0 && conf->active == 0)
431	>	if (--conf->ref_count == 0 && conf->active == false)
432		conf_free(conf);
433		}
434		}
435
436	<	/* attach_conf()
437	<	*
438	<	* inputs       - client pointer
439	<	*              - conf pointer
440	<	* output       -
705	<	* side effects - Associate a specific configuration entry to a *local*
706	<	*                client (this is the one which used in accepting the
707	<	*                connection). Note, that this automatically changes the
708	<	*                attachment if there was an old one...
436	>	/*! \brief Associate a specific configuration entry to a *local* client (this
437	>	*         is the one which used in accepting the connection). Note, that this
438	>	*         automatically changes the attachment if there was an old one.
439	>	* \param client Client to attach the conf to
440	>	* \param conf Configuration record to attach
441		*/
442		int
443	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
443	>	conf_attach(struct Client *client, struct MaskItem *conf)
444		{
445	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
445	>	if (dlinkFind(&client->connection->confs, conf))
446		return 1;
447
448		if (conf->type == CONF_CLIENT)
449	<	if (cidr_limit_reached(IsConfExemptLimits(conf),
718	<	&client_p->localClient->ip, conf->class))
449	>	if (class_ip_limit_add(conf->class, &client->ip, IsConfExemptLimits(conf)) == true)
450		return TOO_MANY;    /* Already at maximum allowed */
451
452		conf->class->ref_count++;
453		conf->ref_count++;
454
455	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
725	<
726	<	return 0;
727	<	}
728	<
729	<	/* attach_connect_block()
730	<	*
731	<	* inputs       - pointer to server to attach
732	<	*              - name of server
733	<	*              - hostname of server
734	<	* output       - true (1) if both are found, otherwise return false (0)
735	<	* side effects - find connect block and attach them to connecting client
736	<	*/
737	<	int
738	<	attach_connect_block(struct Client *client_p, const char *name,
739	<	const char *host)
740	<	{
741	<	dlink_node *ptr;
742	<	struct MaskItem *conf = NULL;
743	<
744	<	assert(client_p != NULL);
745	<	assert(host != NULL);
746	<
747	<	if (client_p == NULL || host == NULL)
748	<	return 0;
749	<
750	<	DLINK_FOREACH(ptr, server_items.head)
751	<	{
752	<	conf = ptr->data;
753	<
754	<	if (match(conf->name, name) || match(conf->host, host))
755	<	continue;
756	<
757	<	attach_conf(client_p, conf);
758	<	return -1;
759	<	}
455	>	dlinkAdd(conf, make_dlink_node(), &client->connection->confs);
456
457		return 0;
458		}
#	Line 773 | Line 469 | attach_connect_block(struct Client *clie
469		struct MaskItem *
470		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
471		{
472	<	dlink_node *ptr;
777	<	struct MaskItem* conf;
472	>	dlink_node *node = NULL;
473
474	<	DLINK_FOREACH(ptr, list->head)
474	>	DLINK_FOREACH(node, list->head)
475		{
476	<	conf = ptr->data;
477	<
476	>	struct MaskItem *conf = node->data;
477	>
478		if (conf->type == type)
479		{
480	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
481	<	!match(conf->name, name)))
787	<	return conf;
480	>	if (conf->name && !irccmp(conf->name, name))
481	>	return conf;
482		}
483		}
484
485		return NULL;
486		}
487
488	<	/* map_to_list()
489	<	*
490	<	* inputs       - ConfType conf
797	<	* output       - pointer to dlink_list to use
798	<	* side effects - none
799	<	*/
800	<	static dlink_list *
801	<	map_to_list(enum maskitem_type type)
802	<	{
803	<	switch(type)
804	<	{
805	<	case CONF_XLINE:
806	<	return(&xconf_items);
807	<	break;
808	<	case CONF_ULINE:
809	<	return(&uconf_items);
810	<	break;
811	<	case CONF_NRESV:
812	<	return(&nresv_items);
813	<	break;
814	<	case CONF_CRESV:
815	<	return(&cresv_items);
816	<	case CONF_OPER:
817	<	return(&oconf_items);
818	<	break;
819	<	case CONF_SERVER:
820	<	return(&server_items);
821	<	break;
822	<	case CONF_SERVICE:
823	<	return(&service_items);
824	<	break;
825	<	case CONF_CLUSTER:
826	<	return(&cluster_items);
827	<	break;
828	<	default:
829	<	return NULL;
830	<	}
831	<	}
832	<
833	<	/* find_matching_name_conf()
834	<	*
835	<	* inputs       - type of link list to look in
836	<	*              - pointer to name string to find
837	<	*              - pointer to user
838	<	*              - pointer to host
839	<	*              - optional flags to match on as well
840	<	* output       - NULL or pointer to found struct MaskItem
841	<	* side effects - looks for a match on name field
488	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
489	>	* \param name Name to match
490	>	* \param compare Pointer to function to be used for string matching
491		*/
492		struct MaskItem *
493	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
845	<	const char *host, unsigned int flags)
493	>	connect_find(const char *name, int (*compare)(const char *, const char *))
494		{
495	<	dlink_node *ptr=NULL;
848	<	struct MaskItem *conf=NULL;
849	<	dlink_list *list_p = map_to_list(type);
495	>	dlink_node *node;
496
497	<	switch (type)
497	>	DLINK_FOREACH(node, connect_items.head)
498		{
499	<	case CONF_SERVICE:
854	<	DLINK_FOREACH(ptr, list_p->head)
855	<	{
856	<	conf = ptr->data;
857	<
858	<	if (EmptyString(conf->name))
859	<	continue;
860	<	if ((name != NULL) && !irccmp(name, conf->name))
861	<	return conf;
862	<	}
863	<	break;
864	<
865	<	case CONF_XLINE:
866	<	case CONF_ULINE:
867	<	case CONF_NRESV:
868	<	case CONF_CRESV:
869	<	DLINK_FOREACH(ptr, list_p->head)
870	<	{
871	<	conf = ptr->data;
872	<
873	<	if (EmptyString(conf->name))
874	<	continue;
875	<	if ((name != NULL) && !match(conf->name, name))
876	<	{
877	<	if ((user == NULL && (host == NULL)))
878	<	return conf;
879	<	if ((conf->flags & flags) != flags)
880	<	continue;
881	<	if (EmptyString(conf->user) || EmptyString(conf->host))
882	<	return conf;
883	<	if (!match(conf->user, user) && !match(conf->host, host))
884	<	return conf;
885	<	}
886	<	}
887	<	break;
888	<
889	<	case CONF_SERVER:
890	<	DLINK_FOREACH(ptr, list_p->head)
891	<	{
892	<	conf = ptr->data;
499	>	struct MaskItem *conf = node->data;
500
501	<	if ((name != NULL) && !match(name, conf->name))
502	<	return conf;
896	<	else if ((host != NULL) && !match(host, conf->host))
897	<	return conf;
898	<	}
899	<	break;
900	<
901	<	default:
902	<	break;
501	>	if (compare(name, conf->name) == 0)
502	>	return conf;
503		}
504	+
505		return NULL;
506		}
507
#	Line 914 | Line 515 | find_matching_name_conf(enum maskitem_ty
515		* side effects - looks for an exact match on name field
516		*/
517		struct MaskItem *
518	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
918	<	const char *user, const char *host)
518	>	operator_find(const struct Client *client, const char *name)
519		{
520	<	dlink_node *ptr = NULL;
921	<	struct MaskItem *conf;
922	<	dlink_list *list_p = map_to_list(type);
520	>	dlink_node *node;
521
522	<	switch(type)
522	>	DLINK_FOREACH(node, operator_items.head)
523		{
524	<	case CONF_XLINE:
927	<	case CONF_ULINE:
928	<	case CONF_NRESV:
929	<	case CONF_CRESV:
524	>	struct MaskItem *conf = node->data;
525
526	<	DLINK_FOREACH(ptr, list_p->head)
526	>	if (irccmp(conf->name, name) == 0)
527		{
528	<	conf = ptr->data;
529	<
935	<	if (EmptyString(conf->name))
936	<	continue;
937	<
938	<	if (irccmp(conf->name, name) == 0)
939	<	{
940	<	if ((user == NULL && (host == NULL)))
941	<	return conf;
942	<	if (EmptyString(conf->user) || EmptyString(conf->host))
943	<	return conf;
944	<	if (!match(conf->user, user) && !match(conf->host, host))
945	<	return conf;
946	<	}
947	<	}
948	<	break;
949	<
950	<	case CONF_OPER:
951	<	DLINK_FOREACH(ptr, list_p->head)
952	<	{
953	<	conf = ptr->data;
528	>	if (client == NULL)
529	>	return conf;
530
531	<	if (EmptyString(conf->name))
531	>	if (conf->class->max_total &&
532	>	conf->class->max_total <= conf->class->ref_count)
533		continue;
534
535	<	if (!irccmp(conf->name, name))
535	>	if (match(conf->user, client->username) == 0)
536		{
537	<	if (!who)
961	<	return conf;
962	<	if (EmptyString(conf->user) || EmptyString(conf->host))
963	<	return NULL;
964	<	if (!match(conf->user, who->username))
537	>	switch (conf->htype)
538		{
539	<	switch (conf->htype)
540	<	{
541	<	case HM_HOST:
542	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
543	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
544	<	return conf;
545	<	break;
546	<	case HM_IPV4:
547	<	if (who->localClient->aftype == AF_INET)
548	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
549	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
550	<	return conf;
978	<	break;
979	<	#ifdef IPV6
980	<	case HM_IPV6:
981	<	if (who->localClient->aftype == AF_INET6)
982	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
983	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
984	<	return conf;
985	<	break;
986	<	#endif
987	<	default:
988	<	assert(0);
989	<	}
539	>	case HM_HOST:
540	>	if (match(conf->host, client->realhost) == 0 ||
541	>	match(conf->host, client->sockhost) == 0 || match(conf->host, client->host) == 0)
542	>	return conf;
543	>	break;
544	>	case HM_IPV6:
545	>	case HM_IPV4:
546	>	if (address_compare(&client->ip, conf->addr, false, false, conf->bits) == true)
547	>	return conf;
548	>	break;
549	>	default:
550	>	assert(0);
551		}
552		}
553		}
993	–
994	–	break;
995	–
996	–	case CONF_SERVER:
997	–	DLINK_FOREACH(ptr, list_p->head)
998	–	{
999	–	conf = ptr->data;
1000	–
1001	–	if (EmptyString(conf->name))
1002	–	continue;
1003	–
1004	–	if (name == NULL)
1005	–	{
1006	–	if (EmptyString(conf->host))
1007	–	continue;
1008	–	if (irccmp(conf->host, host) == 0)
1009	–	return conf;
1010	–	}
1011	–	else if (irccmp(conf->name, name) == 0)
1012	–	return conf;
1013	–	}
1014	–
1015	–	break;
1016	–
1017	–	default:
1018	–	break;
554		}
555
556		return NULL;
557		}
558
559	<	/* rehash()
1025	<	*
1026	<	* Actual REHASH service routine. Called with sig == 0 if it has been called
1027	<	* as a result of an operator issuing this command, else assume it has been
1028	<	* called as a result of the server receiving a HUP signal.
1029	<	*/
1030	<	int
1031	<	rehash(int sig)
1032	<	{
1033	<	if (sig != 0)
1034	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1035	<	"Got signal SIGHUP, reloading configuration file(s)");
1036	<
1037	<	restart_resolver();
1038	<
1039	<	/* don't close listeners until we know we can go ahead with the rehash */
1040	<
1041	<	/* Check to see if we magically got(or lost) IPv6 support */
1042	<	check_can_use_v6();
1043	<
1044	<	read_conf_files(0);
1045	<
1046	<	if (ServerInfo.description != NULL)
1047	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1048	<
1049	<	load_conf_modules();
1050	<
1051	<	rehashed_klines = 1;
1052	<
1053	<	return 0;
1054	<	}
1055	<
1056	<	/* set_default_conf()
559	>	/* conf_set_defaults()
560		*
561		* inputs       - NONE
562		* output       - NONE
#	Line 1063 | Line 566 | rehash(int sig)
566		*                of values later, put them in validate_conf().
567		*/
568		static void
569	<	set_default_conf(void)
569	>	conf_set_defaults(void)
570		{
571	<	/* verify init_class() ran, this should be an unnecessary check
572	<	* but its not much work.
571	>	/*
572	>	* Verify init_class() ran, this should be an unnecessary check
573	>	* but it's not much work.
574		*/
575		assert(class_default == class_get_list()->tail->data);
576
577	<	#ifdef HAVE_LIBCRYPTO
578	<	ServerInfo.rsa_private_key = NULL;
579	<	ServerInfo.rsa_private_key_file = NULL;
580	<	#endif
581	<
582	<	/* ServerInfo.name is not rehashable */
1079	<	/* ServerInfo.name = ServerInfo.name; */
1080	<	ServerInfo.description = NULL;
1081	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1082	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1083	<
1084	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1085	<	ServerInfo.specific_ipv4_vhost = 0;
1086	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1087	<	ServerInfo.specific_ipv6_vhost = 0;
1088	<
1089	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1090	<	ServerInfo.max_nick_length = 9;
1091	<	ServerInfo.max_topic_length = 80;
1092	<
1093	<	ServerInfo.hub = 0;
1094	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1095	<	ServerInfo.dns_host.sin_port = 0;
1096	<	AdminInfo.name = NULL;
1097	<	AdminInfo.email = NULL;
1098	<	AdminInfo.description = NULL;
577	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
578	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
579	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
580	>	ConfigServerInfo.max_nick_length = 9;
581	>	ConfigServerInfo.max_topic_length = 80;
582	>	ConfigServerInfo.hub = 0;
583
584	<	log_del_all();
584	>	log_iterate(log_free);
585
586	<	ConfigLoggingEntry.use_logging = 1;
586	>	ConfigLog.use_logging = 1;
587
588	+	ConfigChannel.enable_extbans = 0;
589		ConfigChannel.disable_fake_channels = 0;
590	<	ConfigChannel.knock_delay = 300;
590	>	ConfigChannel.invite_client_count = 10;
591	>	ConfigChannel.invite_client_time = 300;
592	>	ConfigChannel.invite_delay_channel = 5;
593	>	ConfigChannel.invite_expire_time = 1800;
594	>	ConfigChannel.knock_client_count = 1;
595	>	ConfigChannel.knock_client_time = 300;
596		ConfigChannel.knock_delay_channel = 60;
597	<	ConfigChannel.max_chans_per_user = 25;
598	<	ConfigChannel.max_chans_per_oper = 50;
599	<	ConfigChannel.max_bans = 25;
600	<	ConfigChannel.default_split_user_count = 0;
601	<	ConfigChannel.default_split_server_count = 0;
602	<	ConfigChannel.no_join_on_split = 0;
1113	<	ConfigChannel.no_create_on_split = 0;
597	>	ConfigChannel.max_channels = 25;
598	>	ConfigChannel.max_invites = 20;
599	>	ConfigChannel.max_bans = 100;
600	>	ConfigChannel.max_bans_large = 500;
601	>	ConfigChannel.default_join_flood_count = 18;
602	>	ConfigChannel.default_join_flood_time = 6;
603
604		ConfigServerHide.flatten_links = 0;
605	<	ConfigServerHide.links_delay = 300;
605	>	ConfigServerHide.flatten_links_delay = 300;
606		ConfigServerHide.hidden = 0;
607		ConfigServerHide.hide_servers = 0;
608		ConfigServerHide.hide_services = 0;
#	Line 1121 | Line 610 | set_default_conf(void)
610		ConfigServerHide.hide_server_ips = 0;
611		ConfigServerHide.disable_remote_commands = 0;
612
613	<
614	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
615	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
616	<	ConfigFileEntry.cycle_on_host_change = 1;
617	<	ConfigFileEntry.glines = 0;
618	<	ConfigFileEntry.gline_time = 12 * 3600;
619	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
620	<	ConfigFileEntry.gline_min_cidr = 16;
621	<	ConfigFileEntry.gline_min_cidr6 = 48;
622	<	ConfigFileEntry.invisible_on_connect = 1;
623	<	ConfigFileEntry.tkline_expire_notices = 1;
624	<	ConfigFileEntry.hide_spoof_ips = 1;
625	<	ConfigFileEntry.ignore_bogus_ts = 0;
626	<	ConfigFileEntry.disable_auth = 0;
627	<	ConfigFileEntry.kill_chase_time_limit = 90;
628	<	ConfigFileEntry.default_floodcount = 8;
629	<	ConfigFileEntry.failed_oper_notice = 1;
630	<	ConfigFileEntry.dots_in_ident = 0;
631	<	ConfigFileEntry.min_nonwildcard = 4;
632	<	ConfigFileEntry.min_nonwildcard_simple = 3;
633	<	ConfigFileEntry.max_accept = 20;
634	<	ConfigFileEntry.anti_nick_flood = 0;
635	<	ConfigFileEntry.max_nick_time = 20;
636	<	ConfigFileEntry.max_nick_changes = 5;
637	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
638	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
639	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
640	<	ConfigFileEntry.warn_no_nline = 1;
641	<	ConfigFileEntry.stats_o_oper_only = 0;
642	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
643	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
644	<	ConfigFileEntry.stats_P_oper_only = 0;
645	<	ConfigFileEntry.stats_u_oper_only = 0;
646	<	ConfigFileEntry.caller_id_wait = 60;
647	<	ConfigFileEntry.opers_bypass_callerid = 0;
648	<	ConfigFileEntry.pace_wait = 10;
649	<	ConfigFileEntry.pace_wait_simple = 1;
650	<	ConfigFileEntry.short_motd = 0;
651	<	ConfigFileEntry.ping_cookie = 0;
652	<	ConfigFileEntry.no_oper_flood = 0;
653	<	ConfigFileEntry.true_no_oper_flood = 0;
654	<	ConfigFileEntry.oper_pass_resv = 1;
655	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
656	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
657	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
658	<	UMODE_OPERWALL | UMODE_WALLOP;
659	<	ConfigFileEntry.use_egd = 0;
1171	<	ConfigFileEntry.egdpool_path = NULL;
1172	<	ConfigFileEntry.throttle_time = 10;
613	>	ConfigGeneral.away_count = 2;
614	>	ConfigGeneral.away_time = 10;
615	>	ConfigGeneral.max_watch = 50;
616	>	ConfigGeneral.whowas_history_length = 15000;
617	>	ConfigGeneral.cycle_on_host_change = 1;
618	>	ConfigGeneral.dline_min_cidr = 16;
619	>	ConfigGeneral.dline_min_cidr6 = 48;
620	>	ConfigGeneral.kline_min_cidr = 16;
621	>	ConfigGeneral.kline_min_cidr6 = 48;
622	>	ConfigGeneral.invisible_on_connect = 1;
623	>	ConfigGeneral.disable_auth = 0;
624	>	ConfigGeneral.kill_chase_time_limit = 90;
625	>	ConfigGeneral.default_floodcount = 8;
626	>	ConfigGeneral.default_floodtime = 1;
627	>	ConfigGeneral.failed_oper_notice = 1;
628	>	ConfigGeneral.dots_in_ident = 0;
629	>	ConfigGeneral.min_nonwildcard = 4;
630	>	ConfigGeneral.min_nonwildcard_simple = 3;
631	>	ConfigGeneral.max_accept = 50;
632	>	ConfigGeneral.anti_nick_flood = 0;
633	>	ConfigGeneral.max_nick_time = 20;
634	>	ConfigGeneral.max_nick_changes = 5;
635	>	ConfigGeneral.anti_spam_exit_message_time = 0;
636	>	ConfigGeneral.ts_warn_delta = 30;
637	>	ConfigGeneral.ts_max_delta = 600;
638	>	ConfigGeneral.warn_no_connect_block = 1;
639	>	ConfigGeneral.stats_e_disabled = 0;
640	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
641	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
642	>	ConfigGeneral.stats_o_oper_only = 1;
643	>	ConfigGeneral.stats_m_oper_only = 1;
644	>	ConfigGeneral.stats_P_oper_only = 0;
645	>	ConfigGeneral.stats_u_oper_only = 0;
646	>	ConfigGeneral.caller_id_wait = 60;
647	>	ConfigGeneral.opers_bypass_callerid = 1;
648	>	ConfigGeneral.pace_wait = 10;
649	>	ConfigGeneral.pace_wait_simple = 1;
650	>	ConfigGeneral.short_motd = 0;
651	>	ConfigGeneral.ping_cookie = 0;
652	>	ConfigGeneral.no_oper_flood = 0;
653	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
654	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
655	>	UMODE_EXTERNAL | UMODE_FLOOD | UMODE_NCHANGE |
656	>	UMODE_SPY | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
657	>	ConfigGeneral.oper_umodes = UMODE_FLOOD | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
658	>	ConfigGeneral.throttle_count = 1;
659	>	ConfigGeneral.throttle_time = 1;
660		}
661
662		static void
663	<	validate_conf(void)
663	>	conf_validate(void)
664		{
665	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
666	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1180	<
1181	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1182	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1183	<
1184	<	if (ServerInfo.network_name == NULL)
1185	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1186	<
1187	<	if (ServerInfo.network_desc == NULL)
1188	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1189	<
1190	<	if (ConfigFileEntry.service_name == NULL)
1191	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
665	>	if (EmptyString(ConfigServerInfo.network_name))
666	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
667
668	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
668	>	if (EmptyString(ConfigServerInfo.network_desc))
669	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
670		}
671
672	<	/* read_conf()
672	>	/* conf_read()
673		*
674		* inputs       - file descriptor pointing to config file to use
675		* output       - None
676		* side effects - Read configuration file.
677		*/
678		static void
679	<	read_conf(FILE *file)
679	>	conf_read(FILE *file)
680		{
681	<	lineno = 0;
681	>	lineno = 1;
682
683	<	set_default_conf(); /* Set default values prior to conf parsing */
683	>	conf_set_defaults();  /* Set default values prior to conf parsing */
684		conf_parser_ctx.pass = 1;
685	<	yyparse();          /* pick up the classes first */
685	>	yyparse();  /* Pick up the classes first */
686
687		rewind(file);
688
689		conf_parser_ctx.pass = 2;
690	<	yyparse();          /* Load the values from the conf */
691	<	validate_conf();    /* Check to make sure some values are still okay. */
692	<	/* Some global values are also loaded here. */
693	<	class_delete_marked();      /* Make sure classes are valid */
690	>	yyparse();  /* Load the values from the conf */
691	>	conf_validate();  /* Check to make sure some values are still okay. */
692	>	/* Some global values are also loaded here. */
693	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
694	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
695		}
696
697	<	/* lookup_confhost()
697	>	/* conf_rehash()
698		*
699	<	* start DNS lookups of all hostnames in the conf
700	<	* line and convert an IP addresses in a.b.c.d number for to IP#s.
699	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
700	>	* as a result of an operator issuing this command, else assume it has been
701	>	* called as a result of the server receiving a HUP signal.
702		*/
703		void
704	<	lookup_confhost(struct MaskItem *conf)
704	>	conf_rehash(bool sig)
705		{
706	<	struct addrinfo hints, *res;
1229	<
1230	<	/* Do name lookup now on hostnames given and store the
1231	<	* ip numbers in conf structure.
1232	<	*/
1233	<	memset(&hints, 0, sizeof(hints));
1234	<
1235	<	hints.ai_family   = AF_UNSPEC;
1236	<	hints.ai_socktype = SOCK_STREAM;
1237	<
1238	<	/* Get us ready for a bind() and don't bother doing dns lookup */
1239	<	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1240	<
1241	<	if (getaddrinfo(conf->host, NULL, &hints, &res))
706	>	if (sig == true)
707		{
708	<	conf_dns_lookup(conf);
709	<	return;
708	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
709	>	"Got signal SIGHUP, reloading configuration file(s)");
710	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
711		}
712
713	<	assert(res != NULL);
713	>	restart_resolver();
714
715	<	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1250	<	conf->addr.ss_len = res->ai_addrlen;
1251	<	conf->addr.ss.ss_family = res->ai_family;
715	>	/* don't close listeners until we know we can go ahead with the rehash */
716
717	<	freeaddrinfo(res);
717	>	conf_read_files(false);
718	>
719	>	load_conf_modules();
720	>	check_conf_klines();
721		}
722
723		/* conf_connect_allowed()
#	Line 1261 | Line 728 | lookup_confhost(struct MaskItem *conf)
728		* side effects - none
729		*/
730		int
731	<	conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
731	>	conf_connect_allowed(struct irc_ssaddr *addr)
732		{
733	<	struct ip_entry *ip_found;
1267	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
1268	<
1269	<	/* DLINE exempt also gets you out of static limits/pacing... */
1270	<	if (conf && (conf->type == CONF_EXEMPT))
1271	<	return 0;
733	>	const struct MaskItem *conf = find_dline_conf(addr);
734
735	<	if (conf != NULL)
735	>	if (conf)
736	>	{
737	>	/* DLINE exempt also gets you out of static limits/pacing... */
738	>	if (conf->type == CONF_EXEMPT)
739	>	return 0;
740		return BANNED_CLIENT;
741	+	}
742
743	<	ip_found = find_or_add_ip(addr);
744	<
1278	<	if ((CurrentTime - ip_found->last_attempt) <
1279	<	ConfigFileEntry.throttle_time)
743	>	struct ip_entry *ip_found = ipcache_record_find_or_add(addr);
744	>	if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
745		{
746	<	ip_found->last_attempt = CurrentTime;
747	<	return TOO_FAST;
746	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
747	>	return TOO_FAST;
748	>
749	>	++ip_found->connection_count;
750		}
751	+	else
752	+	ip_found->connection_count = 1;
753
754	<	ip_found->last_attempt = CurrentTime;
754	>	ip_found->last_attempt = event_base->time.sec_monotonic;
755		return 0;
756		}
757
#	Line 1294 | Line 763 | conf_connect_allowed(struct irc_ssaddr *
763		*                This is an event started off in ircd.c
764		*/
765		void
766	<	cleanup_tklines(void *notused)
766	>	cleanup_tklines(void *unused)
767		{
768		hostmask_expire_temporary();
769	<	expire_tklines(&xconf_items);
770	<	expire_tklines(&nresv_items);
1302	<	expire_tklines(&cresv_items);
769	>	gecos_expire();
770	>	resv_expire();
771		}
772
773	<	/* expire_tklines()
774	<	*
775	<	* inputs       - tkline list pointer
776	<	* output       - NONE
777	<	* side effects - expire tklines
773	>	/*
774	>	* Input: A client to find the active operator {} name for.
775	>	* Output: The nick!user@host{oper} of the oper.
776	>	*         "oper" is server name for remote opers
777	>	* Side effects: None.
778		*/
779	<	static void
780	<	expire_tklines(dlink_list *tklist)
779	>	const char *
780	>	get_oper_name(const struct Client *client)
781		{
782	<	dlink_node *ptr;
1315	<	dlink_node *next_ptr;
1316	<	struct MaskItem *conf;
782	>	static char buffer[IRCD_BUFSIZE];
783
784	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
785	<	{
1320	<	conf = ptr->data;
784	>	if (IsServer(client))
785	>	return client->name;
786
787	<	if (!conf->until || conf->until > CurrentTime)
788	<	continue;
787	>	if (MyConnect(client))
788	>	{
789	>	const dlink_node *const node = client->connection->confs.head;
790
791	<	if (conf->type == CONF_XLINE)
1326	<	{
1327	<	if (ConfigFileEntry.tkline_expire_notices)
1328	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1329	<	"Temporary X-line for [%s] expired", conf->name);
1330	<	conf_free(conf);
1331	<	}
1332	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
791	>	if (node)
792		{
793	<	if (ConfigFileEntry.tkline_expire_notices)
794	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
795	<	"Temporary RESV for [%s] expired", conf->name);
796	<	conf_free(conf);
793	>	const struct MaskItem *const conf = node->data;
794	>
795	>	if (conf->type == CONF_OPER)
796	>	{
797	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
798	>	client->username, client->host, conf->name);
799	>	return buffer;
800	>	}
801		}
802	+
803	+	/*
804	+	* Probably should assert here for now. If there is an oper out there
805	+	* with no operator {} conf attached, it would be good for us to know...
806	+	*/
807	+	assert(0);  /* Oper without oper conf! */
808		}
809	+
810	+	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
811	+	client->username, client->host, client->servptr->name);
812	+	return buffer;
813		}
814
815	<	/* oper_privs_as_string()
815	>	/* conf_clear()
816		*
817	<	* inputs        - pointer to client_p
818	<	* output        - pointer to static string showing oper privs
819	<	* side effects  - return as string, the oper privs as derived from port
820	<	*/
821	<	static const struct oper_privs
822	<	{
823	<	const unsigned int flag;
824	<	const unsigned char c;
825	<	} flag_list[] = {
826	<	{ OPER_FLAG_ADMIN,          'A' },
827	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1355	<	{ OPER_FLAG_DIE,            'D' },
1356	<	{ OPER_FLAG_GLINE,          'G' },
1357	<	{ OPER_FLAG_REHASH,         'H' },
1358	<	{ OPER_FLAG_K,              'K' },
1359	<	{ OPER_FLAG_OPERWALL,       'L' },
1360	<	{ OPER_FLAG_KILL,           'N' },
1361	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1362	<	{ OPER_FLAG_CONNECT,        'P' },
1363	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1364	<	{ OPER_FLAG_SQUIT,          'R' },
1365	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1366	<	{ OPER_FLAG_UNKLINE,        'U' },
1367	<	{ OPER_FLAG_X,              'X' },
1368	<	{ 0, '\0' }
1369	<	};
1370	<
1371	<	char *
1372	<	oper_privs_as_string(const unsigned int port)
1373	<	{
1374	<	static char privs_out[IRCD_BUFSIZE];
1375	<	char *privs_ptr = privs_out;
1376	<	const struct oper_privs *opriv = flag_list;
817	>	* inputs       - none
818	>	* output       - none
819	>	* side effects - Clear out the old configuration
820	>	*/
821	>	static void
822	>	conf_clear(void)
823	>	{
824	>	dlink_node *node = NULL, *node_next = NULL;
825	>	dlink_list *free_items [] = {
826	>	&connect_items, &operator_items, NULL
827	>	};
828
829	<	for (; opriv->flag; ++opriv)
829	>	dlink_list ** iterator = free_items; /* C is dumb */
830	>
831	>	/* We only need to free anything allocated by yyparse() here.
832	>	* Resetting structs, etc, is taken care of by conf_set_defaults().
833	>	*/
834	>
835	>	for (; *iterator; iterator++)
836		{
837	<	if (port & opriv->flag)
838	<	*privs_ptr++ = opriv->c;
839	<	else
840	<	*privs_ptr++ = ToLower(opriv->c);
837	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
838	>	{
839	>	struct MaskItem *conf = node->data;
840	>
841	>	conf->active = false;
842	>	dlinkDelete(&conf->node, *iterator);
843	>
844	>	if (!conf->ref_count)
845	>	conf_free(conf);
846	>	}
847		}
848
849	<	*privs_ptr = '\0';
849	>	/*
850	>	* Don't delete the class table, rather mark all entries for deletion.
851	>	* The table is cleaned up by class_delete_marked. - avalon
852	>	*/
853	>	class_mark_for_deletion();
854	>
855	>	clear_out_address_conf();
856	>
857	>	modules_conf_clear();  /* Clear modules {} items */
858	>
859	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
860
861	<	return privs_out;
861	>	cluster_clear();  /* Clear cluster {} items */
862	>
863	>	gecos_clear();  /* Clear gecos {} items */
864	>
865	>	resv_clear();  /* Clear resv {} items */
866	>
867	>	service_clear();  /* Clear service {} items */
868	>
869	>	shared_clear();  /* Clear shared {} items */
870	>
871	>	pseudo_clear();  /* Clear pseudo {} items */
872	>
873	>	/* Clean out ConfigServerInfo */
874	>	xfree(ConfigServerInfo.description);
875	>	ConfigServerInfo.description = NULL;
876	>	xfree(ConfigServerInfo.network_name);
877	>	ConfigServerInfo.network_name = NULL;
878	>	xfree(ConfigServerInfo.network_desc);
879	>	ConfigServerInfo.network_desc = NULL;
880	>	xfree(ConfigServerInfo.rsa_private_key_file);
881	>	ConfigServerInfo.rsa_private_key_file = NULL;
882	>	xfree(ConfigServerInfo.tls_certificate_file);
883	>	ConfigServerInfo.tls_certificate_file = NULL;
884	>	xfree(ConfigServerInfo.tls_dh_param_file);
885	>	ConfigServerInfo.tls_dh_param_file = NULL;
886	>	xfree(ConfigServerInfo.tls_supported_groups);
887	>	ConfigServerInfo.tls_supported_groups = NULL;
888	>	xfree(ConfigServerInfo.tls_cipher_list);
889	>	ConfigServerInfo.tls_cipher_list = NULL;
890	>	xfree(ConfigServerInfo.tls_cipher_suites);
891	>	ConfigServerInfo.tls_cipher_suites = NULL;
892	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
893	>	ConfigServerInfo.tls_message_digest_algorithm = NULL;
894	>
895	>	/* Clean out ConfigAdminInfo */
896	>	xfree(ConfigAdminInfo.name);
897	>	ConfigAdminInfo.name = NULL;
898	>	xfree(ConfigAdminInfo.email);
899	>	ConfigAdminInfo.email = NULL;
900	>	xfree(ConfigAdminInfo.description);
901	>	ConfigAdminInfo.description = NULL;
902	>
903	>	/* Clean out ConfigServerHide */
904	>	xfree(ConfigServerHide.flatten_links_file);
905	>	ConfigServerHide.flatten_links_file = NULL;
906	>	xfree(ConfigServerHide.hidden_name);
907	>	ConfigServerHide.hidden_name = NULL;
908	>
909	>	/* Clean out listeners */
910	>	listener_close_marked();
911		}
912
913	<	/*
914	<	* Input: A client to find the active oper{} name for.
1393	<	* Output: The nick!user@host{oper} of the oper.
1394	<	*         "oper" is server name for remote opers
1395	<	* Side effects: None.
1396	<	*/
1397	<	const char *
1398	<	get_oper_name(const struct Client *client_p)
913	>	static void
914	>	conf_handle_tls(bool cold)
915		{
916	<	dlink_node *cnode = NULL;
1401	<	/* +5 for !,@,{,} and null */
1402	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1403	<
1404	<	if (MyConnect(client_p))
916	>	if (tls_new_credentials() == false)
917		{
918	<	if ((cnode = client_p->localClient->confs.head))
918	>	if (cold == true)
919		{
920	<	struct MaskItem *conf = cnode->data;
921	<
922	<	if (IsConfOperator(conf))
923	<	{
924	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
925	<	client_p->username, client_p->host, conf->name);
926	<	return buffer;
927	<	}
920	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
921	>	exit(EXIT_FAILURE);
922	>	}
923	>	else
924	>	{
925	>	/* Failed to load new settings/certs, old ones remain active */
926	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
927	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
928		}
1417	–
1418	–	/* Probably should assert here for now. If there is an oper out there
1419	–	* with no oper{} conf attached, it would be good for us to know...
1420	–	*/
1421	–	assert(0); /* Oper without oper conf! */
929		}
1423	–
1424	–	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1425	–	client_p->username, client_p->host, client_p->servptr->name);
1426	–	return buffer;
930		}
931
932		/* read_conf_files()
#	Line 1433 | Line 936 | get_oper_name(const struct Client *clien
936		* side effects - read all conf files needed, ircd.conf kline.conf etc.
937		*/
938		void
939	<	read_conf_files(int cold)
939	>	conf_read_files(bool cold)
940		{
941	<	const char *filename;
1439	<	char chanmodes[IRCD_BUFSIZE];
1440	<	char chanlimit[IRCD_BUFSIZE];
941	>	char buf[IRCD_BUFSIZE];
942
943		conf_parser_ctx.boot = cold;
944	<	filename = ConfigFileEntry.configfile;
1444	<
1445	<	/* We need to know the initial filename for the yyerror() to report
1446	<	FIXME: The full path is in conffilenamebuf first time since we
1447	<	dont know anything else
944	>	conf_parser_ctx.conf_file = fopen(ConfigGeneral.configfile, "r");
945
946	<	- Gozem 2002-07-21
1450	<	*/
1451	<	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1452	<
1453	<	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
946	>	if (conf_parser_ctx.conf_file == NULL)
947		{
948	<	if (cold)
948	>	if (cold == true)
949		{
950		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
951	<	filename, strerror(errno));
952	<	exit(-1);
951	>	ConfigGeneral.configfile, strerror(errno));
952	>	exit(EXIT_FAILURE);
953		}
954		else
955		{
956	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
956	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
957		"Unable to read configuration file '%s': %s",
958	<	filename, strerror(errno));
958	>	ConfigGeneral.configfile, strerror(errno));
959		return;
960		}
961		}
962
1470	–	if (!cold)
1471	–	clear_out_old_conf();
1472	–
1473	–	read_conf(conf_parser_ctx.conf_file);
1474	–	fclose(conf_parser_ctx.conf_file);
1475	–
1476	–	log_reopen_all();
1477	–
1478	–	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1479	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1480	–
1481	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1482	–	add_isupport("MAXLIST", chanmodes, -1);
1483	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1484	–	add_isupport("CHANTYPES", "#", -1);
1485	–
1486	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1487	–	ConfigChannel.max_chans_per_user);
1488	–	add_isupport("CHANLIMIT", chanlimit, -1);
1489	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1490	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1491	–	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1492	–	add_isupport("CHANMODES", chanmodes, -1);
1493	–
963		/*
964	<	* message_locale may have changed.  rebuild isupport since it relies
965	<	* on strlen(form_str(RPL_ISUPPORT))
964	>	* We need to know the initial filename for the yyerror() to report
965	>	*
966	>	*  FIXME: The full path is in conffilenamebuf first time since we
967	>	*          don't know anything else
968	>	*
969	>	*  - Gozem 2002-07-21
970		*/
971	<	rebuild_isupport_message_line();
1499	<	}
971	>	strlcpy(conffilebuf, ConfigGeneral.configfile, sizeof(conffilebuf));
972
973	<	/* clear_out_old_conf()
974	<	*
1503	<	* inputs       - none
1504	<	* output       - none
1505	<	* side effects - Clear out the old configuration
1506	<	*/
1507	<	static void
1508	<	clear_out_old_conf(void)
1509	<	{
1510	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1511	<	struct MaskItem *conf;
1512	<	dlink_list *free_items [] = {
1513	<	&server_items,   &oconf_items,
1514	<	&uconf_items,   &xconf_items,
1515	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1516	<	};
973	>	if (cold == false)
974	>	conf_clear();
975
976	<	dlink_list ** iterator = free_items; /* C is dumb */
977	<
1520	<	/* We only need to free anything allocated by yyparse() here.
1521	<	* Resetting structs, etc, is taken care of by set_default_conf().
1522	<	*/
1523	<
1524	<	for (; *iterator != NULL; iterator++)
1525	<	{
1526	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1527	<	{
1528	<	conf = ptr->data;
976	>	conf_read(conf_parser_ctx.conf_file);
977	>	fclose(conf_parser_ctx.conf_file);
978
979	<	dlinkDelete(&conf->node, map_to_list(conf->type));
979	>	log_iterate(log_reopen);
980	>	conf_handle_tls(cold);
981
982	<	/* XXX This is less than pretty */
983	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1534	<	{
1535	<	if (!conf->ref_count)
1536	<	conf_free(conf);
1537	<	}
1538	<	else if (conf->type == CONF_XLINE)
1539	<	{
1540	<	if (!conf->until)
1541	<	conf_free(conf);
1542	<	}
1543	<	else
1544	<	conf_free(conf);
1545	<	}
1546	<	}
982	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
983	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
984
985	<	motd_clear();
985	>	snprintf(buf, sizeof(buf), "beI:%u", ConfigChannel.max_bans);
986	>	isupport_add("MAXLIST", buf, -1);
987
988	<	/*
989	<	* don't delete the class table, rather mark all entries
1552	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1553	<	*/
1554	<	class_mark_for_deletion();
988	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
989	>	isupport_add("CHANTYPES", "#", -1);
990
991	<	clear_out_address_conf();
991	>	snprintf(buf, sizeof(buf), "#:%u", ConfigChannel.max_channels);
992	>	isupport_add("CHANLIMIT", buf, -1);
993
994	<	/* clean out module paths */
995	<	mod_clear_paths();
994	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
995	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
996
997	<	/* clean out ServerInfo */
998	<	MyFree(ServerInfo.description);
1563	<	ServerInfo.description = NULL;
1564	<	MyFree(ServerInfo.network_name);
1565	<	ServerInfo.network_name = NULL;
1566	<	MyFree(ServerInfo.network_desc);
1567	<	ServerInfo.network_desc = NULL;
1568	<	MyFree(ConfigFileEntry.egdpool_path);
1569	<	ConfigFileEntry.egdpool_path = NULL;
1570	<	#ifdef HAVE_LIBCRYPTO
1571	<	if (ServerInfo.rsa_private_key != NULL)
1572	<	{
1573	<	RSA_free(ServerInfo.rsa_private_key);
1574	<	ServerInfo.rsa_private_key = NULL;
1575	<	}
1576	<
1577	<	MyFree(ServerInfo.rsa_private_key_file);
1578	<	ServerInfo.rsa_private_key_file = NULL;
1579	<
1580	<	if (ServerInfo.server_ctx)
1581	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1582	<	SSL_OP_NO_SSLv3|
1583	<	SSL_OP_NO_TLSv1);
1584	<	if (ServerInfo.client_ctx)
1585	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1586	<	SSL_OP_NO_SSLv3|
1587	<	SSL_OP_NO_TLSv1);
1588	<	#endif
1589	<
1590	<	/* clean out AdminInfo */
1591	<	MyFree(AdminInfo.name);
1592	<	AdminInfo.name = NULL;
1593	<	MyFree(AdminInfo.email);
1594	<	AdminInfo.email = NULL;
1595	<	MyFree(AdminInfo.description);
1596	<	AdminInfo.description = NULL;
1597	<
1598	<	/* clean out listeners */
1599	<	close_listeners();
1600	<
1601	<	/* clean out general */
1602	<	MyFree(ConfigFileEntry.service_name);
1603	<	ConfigFileEntry.service_name = NULL;
997	>	snprintf(buf, sizeof(buf), "%s", "beI,k,l,cimnprstuCKLMNORST");
998	>	isupport_add("CHANMODES", buf, -1);
999		}
1000
1001		/* conf_add_class_to_conf()
1002		*
1003		* inputs       - pointer to config item
1004		* output       - NONE
1005	<	* side effects - Add a class pointer to a conf
1005	>	* side effects - Add a class pointer to a conf
1006		*/
1007		void
1008	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1008	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1009		{
1010	<	if (class_name == NULL)
1010	>	if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1011		{
1012		conf->class = class_default;
1013
1014	<	if (conf->type == CONF_CLIENT)
1015	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1014	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1015	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1016		"Warning *** Defaulting to default class for %s@%s",
1017		conf->user, conf->host);
1018		else
1019	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1019	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1020		"Warning *** Defaulting to default class for %s",
1021		conf->name);
1022		}
1628	–	else
1629	–	conf->class = class_find(class_name, 1);
1630	–
1631	–	if (conf->class == NULL)
1632	–	{
1633	–	if (conf->type == CONF_CLIENT)
1634	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1635	–	"Warning *** Defaulting to default class for %s@%s",
1636	–	conf->user, conf->host);
1637	–	else
1638	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1639	–	"Warning *** Defaulting to default class for %s",
1640	–	conf->name);
1641	–	conf->class = class_default;
1642	–	}
1023		}
1024
1025		/* yyerror()
#	Line 1651 | Line 1031 | conf_add_class_to_conf(struct MaskItem *
1031		void
1032		yyerror(const char *msg)
1033		{
1654	–	char newlinebuf[IRCD_BUFSIZE];
1655	–
1034		if (conf_parser_ctx.pass != 1)
1035		return;
1036
1037	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1038	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1037	>	const char *p = stripws(linebuf);
1038	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1039		"\"%s\", line %u: %s: %s",
1040	<	conffilebuf, lineno + 1, msg, newlinebuf);
1040	>	conffilebuf, lineno, msg, p);
1041		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1042	<	conffilebuf, lineno + 1, msg, newlinebuf);
1042	>	conffilebuf, lineno, msg, p);
1043		}
1044
1045		void
1046		conf_error_report(const char *msg)
1047		{
1048	<	char newlinebuf[IRCD_BUFSIZE];
1049	<
1672	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1673	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1048	>	const char *p = stripws(linebuf);
1049	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1050		"\"%s\", line %u: %s: %s",
1051	<	conffilebuf, lineno + 1, msg, newlinebuf);
1051	>	conffilebuf, lineno, msg, p);
1052		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1053	<	conffilebuf, lineno + 1, msg, newlinebuf);
1053	>	conffilebuf, lineno, msg, p);
1054		}
1055
1056		/*
1057		* valid_tkline()
1058	<	*
1058	>	*
1059		* inputs       - pointer to ascii string to check
1060		*              - whether the specified time is in seconds or minutes
1061		* output       - -1 not enough parameters
#	Line 1687 | Line 1063 | conf_error_report(const char *msg)
1063		* side effects - none
1064		* Originally written by Dianora (Diane, db@db.net)
1065		*/
1066	<	time_t
1066	>	uintmax_t
1067		valid_tkline(const char *data, const int minutes)
1068		{
1069		const unsigned char *p = (const unsigned char *)data;
1070		unsigned char tmpch = '\0';
1071	<	time_t result = 0;
1071	>	uintmax_t result = 0;
1072
1073		while ((tmpch = *p++))
1074		{
#	Line 1704 | Line 1080 | valid_tkline(const char *data, const int
1080		}
1081
1082		/*
1083	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1084	<	* i.e. they specifically use 0, I am going to return 1 instead
1085	<	* as a return value of non-zero is used to flag it as a temporary kline
1083	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1084	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1085	>	* value of non-zero is used to flag it as a temporary kline
1086		*/
1087		if (result == 0)
1088		result = 1;
1089
1090	<	/*
1090	>	/*
1091		* If the incoming time is in seconds convert it to minutes for the purpose
1092		* of this calculation
1093		*/
1094	<	if (!minutes)
1095	<	result = result / 60;
1094	>	if (minutes == 0)
1095	>	result = result / 60;
1096
1097		if (result > MAX_TDKLINE_TIME)
1098		result = MAX_TDKLINE_TIME;
1099
1100	<	result = result * 60;  /* turn it into seconds */
1100	>	result = result * 60;  /* Turn it into seconds */
1101
1102		return result;
1103		}
#	Line 1732 | Line 1108 | valid_tkline(const char *data, const int
1108		* outputs      - 1 if valid, else 0
1109		* side effects - none
1110		*/
1111	<	int
1111	>	bool
1112		valid_wild_card_simple(const char *data)
1113		{
1114		const unsigned char *p = (const unsigned char *)data;
1115		unsigned char tmpch = '\0';
1116	<	int nonwild = 0;
1116	>	unsigned int nonwild = 0, wild = 0;
1117
1118		while ((tmpch = *p++))
1119		{
1120	<	if (tmpch == '\\')
1120	>	if (tmpch == '\\' && *p)
1121		{
1122		++p;
1123	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1124	<	return 1;
1123	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1124	>	return true;
1125		}
1126		else if (!IsMWildChar(tmpch))
1127		{
1128	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1129	<	return 1;
1128	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1129	>	return true;
1130		}
1131	+	else
1132	+	++wild;
1133		}
1134
1135	<	return 0;
1135	>	return wild == 0;
1136		}
1137
1138		/* valid_wild_card()
#	Line 1763 | Line 1141 | valid_wild_card_simple(const char *data)
1141		*              - int flag, 0 for no warning oper 1 for warning oper
1142		*              - count of following varargs to check
1143		* output       - 0 if not valid, 1 if valid
1144	<	* side effects - NOTICE is given to source_p if warn is 1
1144	>	* side effects - NOTICE is given to client if warn is 1
1145		*/
1146	<	int
1147	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1146	>	bool
1147	>	valid_wild_card(int count, ...)
1148		{
1149	<	char tmpch;
1150	<	int nonwild = 0;
1149	>	unsigned char tmpch = '\0';
1150	>	unsigned int nonwild = 0;
1151		va_list args;
1152
1153		/*
#	Line 1788 | Line 1166 | valid_wild_card(struct Client *source_p,
1166
1167		while (count--)
1168		{
1169	<	const char *p = va_arg(args, const char *);
1169	>	const unsigned char *p = va_arg(args, const unsigned char *);
1170		if (p == NULL)
1171		continue;
1172
#	Line 1800 | Line 1178 | valid_wild_card(struct Client *source_p,
1178		* If we find enough non-wild characters, we can
1179		* break - no point in searching further.
1180		*/
1181	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1181	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1182		{
1183		va_end(args);
1184	<	return 1;
1184	>	return true;
1185		}
1186		}
1187		}
1188		}
1189
1812	–	if (warn)
1813	–	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1814	–	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1190		va_end(args);
1191	<	return 0;
1191	>	return false;
1192		}
1193
1194		/* XXX should this go into a separate file ? -Dianora */
#	Line 1826 | Line 1201 | valid_wild_card(struct Client *source_p,
1201		*              - parse_flags bit map of things to test
1202		*              - pointer to user or string to parse into
1203		*              - pointer to host or NULL to parse into if non NULL
1204	<	*              - pointer to optional tkline time or NULL
1204	>	*              - pointer to optional tkline time or NULL
1205		*              - pointer to target_server to parse into if non NULL
1206		*              - pointer to reason to parse into
1207		*
1208	<	* output       - 1 if valid, -1 if not valid
1208	>	* output       - 1 if valid, 0 if not valid
1209		* side effects - A generalised k/d/x etc. line parser,
1210		*               "ALINE [time] user@host|string [ON] target :reason"
1211		*                will parse returning a parsed user, host if
#	Line 1846 | Line 1221 | valid_wild_card(struct Client *source_p,
1221		*
1222		* - Dianora
1223		*/
1224	<	int
1225	<	parse_aline(const char *cmd, struct Client *source_p,
1851	<	int parc, char **parv,
1852	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1853	<	char **target_server, char **reason)
1224	>	bool
1225	>	parse_aline(const char *cmd, struct Client *client, int parc, char **parv, struct aline_ctx *aline)
1226		{
1227	<	int found_tkline_time=0;
1228	<	static char def_reason[] = "No Reason";
1229	<	static char user[USERLEN*4+1];
1858	<	static char host[HOSTLEN*4+1];
1859	<
1860	<	parv++;
1861	<	parc--;
1227	>	static char default_reason[] = CONF_NOREASON;
1228	>	static char user[USERLEN * 2 + 1];
1229	>	static char host[HOSTLEN * 2 + 1];
1230
1231	<	found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1231	>	++parv;
1232	>	--parc;
1233
1234	<	if (found_tkline_time != 0)
1234	>	if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1235		{
1236	<	parv++;
1237	<	parc--;
1869	<
1870	<	if (tkline_time != NULL)
1871	<	*tkline_time = found_tkline_time;
1872	<	else
1873	<	{
1874	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1875	<	me.name, source_p->name, cmd);
1876	<	return -1;
1877	<	}
1236	>	++parv;
1237	>	--parc;
1238		}
1239
1240		if (parc == 0)
1241		{
1242	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1243	<	me.name, source_p->name, cmd);
1884	<	return -1;
1242	>	sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1243	>	return false;
1244		}
1245
1246	<	if (h_p == NULL)
1247	<	*up_p = *parv;
1246	>	if (aline->simple_mask == true)
1247	>	{
1248	>	aline->mask = *parv;
1249	>	aline->user = NULL;
1250	>	aline->host = NULL;
1251	>	}
1252		else
1253		{
1254	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1255	<	return -1;
1254	>	struct split_nuh_item nuh;
1255	>
1256	>	nuh.nuhmask  = *parv;
1257	>	nuh.nickptr  = NULL;
1258	>	nuh.userptr  = user;
1259	>	nuh.hostptr  = host;
1260
1261	<	*up_p = user;
1262	<	*h_p = host;
1261	>	nuh.nicksize = 0;
1262	>	nuh.usersize = sizeof(user);
1263	>	nuh.hostsize = sizeof(host);
1264	>
1265	>	split_nuh(&nuh);
1266	>
1267	>	aline->mask = NULL;
1268	>	aline->user = user;
1269	>	aline->host = host;
1270		}
1897	–
1898	–	parc--;
1899	–	parv++;
1271
1272	<	if (parc != 0)
1272	>	++parv;
1273	>	--parc;
1274	>
1275	>	if (parc)
1276		{
1277		if (irccmp(*parv, "ON") == 0)
1278		{
1279	<	parc--;
1280	<	parv++;
1279	>	++parv;
1280	>	--parc;
1281
1282	<	if (target_server == NULL)
1282	>	if (!HasOFlag(client, OPER_FLAG_REMOTEBAN))
1283		{
1284	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1285	<	me.name, source_p->name, cmd);
1912	<	return -1;
1913	<	}
1914	<
1915	<	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1916	<	{
1917	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1918	<	me.name, source_p->name, "remoteban");
1919	<	return -1;
1284	>	sendto_one_numeric(client, &me, ERR_NOPRIVS, "remoteban");
1285	>	return false;
1286		}
1287
1288		if (parc == 0 || EmptyString(*parv))
1289		{
1290	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1291	<	me.name, source_p->name, cmd);
1926	<	return -1;
1290	>	sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1291	>	return false;
1292		}
1293
1294	<	*target_server = *parv;
1295	<	parc--;
1296	<	parv++;
1932	<	}
1933	<	else
1934	<	{
1935	<	/* Make sure target_server *is* NULL if no ON server found
1936	<	* caller probably NULL'd it first, but no harm to do it again -db
1937	<	*/
1938	<	if (target_server != NULL)
1939	<	*target_server = NULL;
1940	<	}
1941	<	}
1942	<
1943	<	if (h_p != NULL)
1944	<	{
1945	<	if (strchr(user, '!') != NULL)
1946	<	{
1947	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1948	<	me.name, source_p->name);
1949	<	return -1;
1950	<	}
1951	<
1952	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1953	<	return -1;
1954	<	}
1955	<	else
1956	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1957	<	return -1;
1958	<
1959	<	if (reason != NULL)
1960	<	{
1961	<	if (parc != 0 && !EmptyString(*parv))
1962	<	{
1963	<	*reason = *parv;
1964	<	if (!valid_comment(source_p, *reason, 1))
1965	<	return -1;
1294	>	aline->server = *parv;
1295	>	++parv;
1296	>	--parc;
1297		}
1298		else
1299	<	*reason = def_reason;
1299	>	aline->server = NULL;
1300		}
1301
1302	<	return 1;
1972	<	}
1973	<
1974	<	/* find_user_host()
1975	<	*
1976	<	* inputs       - pointer to client placing kline
1977	<	*              - pointer to user_host_or_nick
1978	<	*              - pointer to user buffer
1979	<	*              - pointer to host buffer
1980	<	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1981	<	* side effects -
1982	<	*/
1983	<	static int
1984	<	find_user_host(struct Client *source_p, char *user_host_or_nick,
1985	<	char *luser, char *lhost, unsigned int flags)
1986	<	{
1987	<	struct Client *target_p = NULL;
1988	<	char *hostp = NULL;
1989	<
1990	<	if (lhost == NULL)
1302	>	if (aline->add == true)
1303		{
1304	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1305	<	return 1;
1994	<	}
1995	<
1996	<	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1997	<	{
1998	<	/* Explicit user@host mask given */
1999	<
2000	<	if (hostp != NULL)                            /* I'm a little user@host */
2001	<	{
2002	<	*(hostp++) = '\0';                       /* short and squat */
2003	<	if (*user_host_or_nick)
2004	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2005	<	else
2006	<	strcpy(luser, "*");
2007	<
2008	<	if (*hostp)
2009	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2010	<	else
2011	<	strcpy(lhost, "*");
2012	<	}
1304	>	if (parc == 0 || EmptyString(*parv))
1305	>	aline->reason = default_reason;
1306		else
1307	<	{
2015	<	luser[0] = '*';             /* no @ found, assume its *@somehost */
2016	<	luser[1] = '\0';
2017	<	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2018	<	}
2019	<
2020	<	return 1;
1307	>	aline->reason = *parv;
1308		}
2022	–	else
2023	–	{
2024	–	/* Try to find user@host mask from nick */
2025	–	/* Okay to use source_p as the first param, because source_p == client_p */
2026	–	if ((target_p =
2027	–	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
2028	–	return 0;
1309
1310	<	if (IsExemptKline(target_p))
2031	<	{
2032	<	if (!IsServer(source_p))
2033	<	sendto_one(source_p,
2034	<	":%s NOTICE %s :%s is E-lined",
2035	<	me.name, source_p->name, target_p->name);
2036	<	return 0;
2037	<	}
2038	<
2039	<	/*
2040	<	* turn the "user" bit into "*user", blow away '~'
2041	<	* if found in original user name (non-idented)
2042	<	*/
2043	<	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2044	<
2045	<	if (target_p->username[0] == '~')
2046	<	luser[0] = '*';
2047	<
2048	<	if (target_p->sockhost[0] == '\0' ||
2049	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2050	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2051	<	else
2052	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2053	<	return 1;
2054	<	}
2055	<
2056	<	return 0;
2057	<	}
2058	<
2059	<	/* valid_comment()
2060	<	*
2061	<	* inputs       - pointer to client
2062	<	*              - pointer to comment
2063	<	* output       - 0 if no valid comment,
2064	<	*              - 1 if valid
2065	<	* side effects - truncates reason where necessary
2066	<	*/
2067	<	int
2068	<	valid_comment(struct Client *source_p, char *comment, int warn)
2069	<	{
2070	<	if (strlen(comment) > REASONLEN)
2071	<	comment[REASONLEN-1] = '\0';
2072	<
2073	<	return 1;
1310	>	return true;
1311		}
1312
1313		/* match_conf_password()
#	Line 2080 | Line 1317 | valid_comment(struct Client *source_p, c
1317		* output       - 1 or 0 if match
1318		* side effects - none
1319		*/
1320	<	int
1320	>	bool
1321		match_conf_password(const char *password, const struct MaskItem *conf)
1322		{
1323		const char *encr = NULL;
1324
1325		if (EmptyString(password) || EmptyString(conf->passwd))
1326	<	return 0;
1326	>	return false;
1327
1328		if (conf->flags & CONF_FLAGS_ENCRYPTED)
1329		encr = crypt(password, conf->passwd);
1330		else
1331		encr = password;
1332
1333	<	return !strcmp(encr, conf->passwd);
2097	<	}
2098	<
2099	<	/*
2100	<	* cluster_a_line
2101	<	*
2102	<	* inputs       - client sending the cluster
2103	<	*              - command name "KLINE" "XLINE" etc.
2104	<	*              - capab -- CAP_KLN etc. from s_serv.h
2105	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2106	<	*              - pattern and args to send along
2107	<	* output       - none
2108	<	* side effects - Take source_p send the pattern with args given
2109	<	*                along to all servers that match capab and cluster type
2110	<	*/
2111	<	void
2112	<	cluster_a_line(struct Client *source_p, const char *command,
2113	<	int capab, int cluster_type, const char *pattern, ...)
2114	<	{
2115	<	va_list args;
2116	<	char buffer[IRCD_BUFSIZE];
2117	<	const dlink_node *ptr = NULL;
2118	<
2119	<	va_start(args, pattern);
2120	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
2121	<	va_end(args);
2122	<
2123	<	DLINK_FOREACH(ptr, cluster_items.head)
2124	<	{
2125	<	const struct MaskItem *conf = ptr->data;
2126	<
2127	<	if (conf->flags & cluster_type)
2128	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2129	<	"%s %s %s", command, conf->name, buffer);
2130	<	}
1333	>	return encr && strcmp(encr, conf->passwd) == 0;
1334		}
1335
1336		/*
#	Line 2165 | Line 1368 | split_nuh(struct split_nuh_item *const i
1368
1369		if (iptr->nickptr)
1370		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1371	+
1372		if (iptr->userptr)
1373		strlcpy(iptr->userptr, "*", iptr->usersize);
1374	+
1375		if (iptr->hostptr)
1376		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1377
#	Line 2174 | Line 1379 | split_nuh(struct split_nuh_item *const i
1379		{
1380		*p = '\0';
1381
1382	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1382	>	if (iptr->nickptr && *iptr->nuhmask)
1383		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1384
1385		if ((q = strchr(++p, '@')))
1386		{
1387		*q++ = '\0';
1388
1389	<	if (*p != '\0')
1389	>	if (*p)
1390		strlcpy(iptr->userptr, p, iptr->usersize);
1391
1392	<	if (*q != '\0')
1392	>	if (*q)
1393		strlcpy(iptr->hostptr, q, iptr->hostsize);
1394		}
1395		else
1396		{
1397	<	if (*p != '\0')
1397	>	if (*p)
1398		strlcpy(iptr->userptr, p, iptr->usersize);
1399		}
1400		}
#	Line 2201 | Line 1406 | split_nuh(struct split_nuh_item *const i
1406		/* if found a @ */
1407		*p++ = '\0';
1408
1409	<	if (*iptr->nuhmask != '\0')
1409	>	if (*iptr->nuhmask)
1410		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1411
1412	<	if (*p != '\0')
1412	>	if (*p)
1413		strlcpy(iptr->hostptr, p, iptr->hostsize);
1414		}
1415		else
1416		{
1417	<	/* no @ found */
1418	<	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1417	>	/* No @ found */
1418	>	if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1419		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1420		else
1421		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);

Comparing ircd-hybrid/trunk/src/conf.c (property svn:keywords):
Revision 2830 by michael, Thu Jan 16 15:23:07 2014 UTC vs.
Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

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

Diff Legend

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