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 3347 by michael, Sun Apr 20 14:03:06 2014 UTC vs.
Revision 9220 by michael, Sun Jan 26 11:18:56 2020 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
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 15 | 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
#	Line 27 | Line 27
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	+	#include "parse.h"
31		#include "conf.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"
32	–	#include "resv.h"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
#	Line 44 | Line 50
50		#include "log.h"
51		#include "send.h"
52		#include "memory.h"
47	–	#include "mempool.h"
53		#include "res.h"
49	–	#include "userhost.h"
54		#include "user.h"
55		#include "channel_mode.h"
52	–	#include "parse.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
65		struct config_channel_entry ConfigChannel;
66	<	struct config_server_hide ConfigServerHide;
67	<	struct config_file_entry ConfigFileEntry;
68	<	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
69	<	struct server_info ServerInfo;
70	<	struct admin_info AdminInfo;
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 };
69	<	dlink_list cluster_items = { NULL, NULL, 0 };
70	<	dlink_list oconf_items   = { NULL, NULL, 0 };
71	<	dlink_list uconf_items   = { NULL, NULL, 0 };
72	<	dlink_list xconf_items   = { NULL, NULL, 0 };
73	<	dlink_list nresv_items   = { NULL, NULL, 0 };
74	<	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
81	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
82	–
83	–	/* internally defined functions */
84	–	static void read_conf(FILE *);
85	–	static void clear_out_old_conf(void);
86	–	static void expire_tklines(dlink_list *);
87	–	static void garbage_collect_ip_entries(void);
88	–	static int hash_ip(struct irc_ssaddr *);
89	–	static int verify_access(struct Client *);
90	–	static int attach_iline(struct Client *, struct MaskItem *);
91	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
92	–	static dlink_list *map_to_list(enum maskitem_type);
93	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
94	–
95	–
96	–	/* usually, with hash tables, you use a prime number...
97	–	* but in this case I am dealing with ip addresses,
98	–	* not ascii strings.
99	–	*/
100	–	#define IP_HASH_SIZE 0x1000
101	–
102	–	struct ip_entry
103	–	{
104	–	struct irc_ssaddr ip;
105	–	unsigned int count;
106	–	time_t last_attempt;
107	–	struct ip_entry *next;
108	–	};
109	–
110	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
111	–	static mp_pool_t *ip_entry_pool = NULL;
112	–	static int ip_entries_count = 0;
113	–
82
83		/* conf_dns_callback()
84		*
#	Line 123 | 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)
101	<	memcpy(&conf->addr, addr, sizeof(conf->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
142	<	* 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 169 | 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)))
177	<	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)
205		memset(conf->passwd, 0, strlen(conf->passwd));
#	Line 187 | Line 208 | conf_free(struct MaskItem *conf)
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)
200	<	RSA_free(conf->rsa_public_key);
201	<	#endif
202	<	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)
236	>	xfree(conf);
237	>	}
238	>
239	>	/* attach_iline()
240	>	*
241	>	* inputs       - client pointer
242	>	*              - conf pointer
243	>	* output       -
244	>	* side effects - do actual attach
245	>	*/
246	>	static int
247	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
248	>	{
249	>	const struct ClassItem *const class = conf->class;
250	>	bool a_limit_reached = false;
251	>
252	>	struct ip_entry *ipcache = ipcache_record_find_or_add(&client_p->ip);
253	>	++ipcache->count_local;
254	>	AddFlag(client_p, 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	>	if (a_limit_reached == true)
265		{
266	<	struct exempt *exptr = ptr->data;
266	>	if (!IsConfExemptLimits(conf))
267	>	return TOO_MANY;   /* Already at maximum allowed */
268
269	<	dlinkDelete(ptr, &conf->exempt_list);
270	<	MyFree(exptr->name);
222	<	MyFree(exptr->user);
223	<	MyFree(exptr->host);
224	<	MyFree(exptr);
269	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
270	>	"but you have exceed_limit = yes;");
271		}
272
273	<	MyFree(conf);
273	>	return conf_attach(client_p, 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.
281	>	*/
282	>	static int
283	>	verify_access(struct Client *client_p)
284	>	{
285	>	struct MaskItem *conf;
286	>
287	>	if (HasFlag(client_p, FLAGS_GOTID))
288	>	conf = find_address_conf(client_p->host, client_p->username, &client_p->ip,
289	>	client_p->connection->password);
290	>	else
291	>	{
292	>	char non_ident[USERLEN + 1] = "~";
293	>
294	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
295	>	conf = find_address_conf(client_p->host, non_ident, &client_p->ip,
296	>	client_p->connection->password);
297	>	}
298	>
299	>	if (conf == NULL)
300	>	return NOT_AUTHORIZED;
301	>
302	>	assert(IsConfClient(conf) || IsConfKill(conf));
303	>
304	>	if (IsConfKill(conf))
305	>	{
306	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
307	>	return BANNED_CLIENT;
308	>	}
309	>
310	>	if (IsConfRedir(conf))
311	>	{
312	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
313	>	conf->name ? conf->name : "",
314	>	conf->port);
315	>	return NOT_AUTHORIZED;
316	>	}
317	>
318	>	if (IsConfDoSpoofIp(conf))
319	>	{
320	>	if (IsConfSpoofNotice(conf))
321	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
322	>	client_p->name, client_p->host, conf->name);
323	>
324	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
325	>	}
326	>
327	>	return attach_iline(client_p, conf);
328		}
329
330		/* check_client()
#	Line 240 | Line 340 | conf_free(struct MaskItem *conf)
340		*                Look for conf lines which have the same
341		*                status as the flags passed.
342		*/
343	<	int
344	<	check_client(struct Client *source_p)
343	>	bool
344	>	conf_check_client(struct Client *source_p)
345		{
346		int i;
347
#	Line 254 | Line 354 | check_client(struct Client *source_p)
354		case TOO_MANY:
355		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
356		"Too many on IP for %s (%s).",
357	<	get_client_name(source_p, SHOW_IP),
357	>	client_get_name(source_p, SHOW_IP),
358		source_p->sockhost);
359		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
360	<	get_client_name(source_p, SHOW_IP));
360	>	client_get_name(source_p, SHOW_IP));
361		++ServerStats.is_ref;
362		exit_client(source_p, "No more connections allowed on that IP");
363		break;
364
365		case I_LINE_FULL:
366		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
367	<	"auth{} block is full for %s (%s).",
368	<	get_client_name(source_p, SHOW_IP),
367	>	"auth {} block is full for %s (%s).",
368	>	client_get_name(source_p, SHOW_IP),
369		source_p->sockhost);
370		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
371	<	get_client_name(source_p, SHOW_IP));
371	>	client_get_name(source_p, SHOW_IP));
372		++ServerStats.is_ref;
373		exit_client(source_p, "No more connections allowed in your connection class");
374		break;
375
376		case NOT_AUTHORIZED:
277	–	++ServerStats.is_ref;
377		/* jdc - lists server name & port connections are on */
378		/*       a purely cosmetical change */
379		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
380	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
381	<	get_client_name(source_p, SHOW_IP),
382	<	source_p->sockhost,
383	<	source_p->localClient->listener->name,
384	<	source_p->localClient->listener->port);
385	<	ilog(LOG_TYPE_IRCD,
386	<	"Unauthorized client connection from %s on [%s/%u].",
387	<	get_client_name(source_p, SHOW_IP),
289	<	source_p->localClient->listener->name,
290	<	source_p->localClient->listener->port);
380	>	"Unauthorized client connection from %s on [%s/%u].",
381	>	client_get_name(source_p, SHOW_IP),
382	>	source_p->connection->listener->name,
383	>	source_p->connection->listener->port);
384	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
385	>	client_get_name(source_p, SHOW_IP),
386	>	source_p->connection->listener->name,
387	>	source_p->connection->listener->port);
388
389	+	++ServerStats.is_ref;
390		exit_client(source_p, "You are not authorized to use this server");
391		break;
392
393	<	case BANNED_CLIENT:
394	<	exit_client(source_p, "Banned");
395	<	++ServerStats.is_ref;
396	<	break;
299	<
300	<	case 0:
301	<	default:
302	<	break;
303	<	}
304	<
305	<	return (i < 0 ? 0 : 1);
306	<	}
307	<
308	<	/* verify_access()
309	<	*
310	<	* inputs       - pointer to client to verify
311	<	* output       - 0 if success -'ve if not
312	<	* side effect  - find the first (best) I line to attach.
313	<	*/
314	<	static int
315	<	verify_access(struct Client *client_p)
316	<	{
317	<	struct MaskItem *conf = NULL;
318	<	char non_ident[USERLEN + 1] = "~";
319	<
320	<	if (IsGotId(client_p))
321	<	{
322	<	conf = find_address_conf(client_p->host, client_p->username,
323	<	&client_p->localClient->ip,
324	<	client_p->localClient->aftype,
325	<	client_p->localClient->passwd);
326	<	}
327	<	else
328	<	{
329	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
330	<	conf = find_address_conf(client_p->host,non_ident,
331	<	&client_p->localClient->ip,
332	<	client_p->localClient->aftype,
333	<	client_p->localClient->passwd);
334	<	}
335	<
336	<	if (conf)
337	<	{
338	<	if (IsConfClient(conf))
339	<	{
340	<	if (IsConfRedir(conf))
341	<	{
342	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
343	<	conf->name ? conf->name : "",
344	<	conf->port);
345	<	return NOT_AUTHORIZED;
346	<	}
347	<
348	<	if (IsConfDoIdentd(conf))
349	<	SetNeedId(client_p);
350	<
351	<	/* Thanks for spoof idea amm */
352	<	if (IsConfDoSpoofIp(conf))
353	<	{
354	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
355	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
356	<	"%s spoofing: %s as %s",
357	<	client_p->name, client_p->host, conf->name);
358	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
359	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
360	<	}
361	<
362	<	return attach_iline(client_p, conf);
363	<	}
364	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
365	<	{
366	<	if (IsConfGline(conf))
367	<	sendto_one_notice(client_p, &me, ":*** G-lined");
368	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
369	<	return BANNED_CLIENT;
370	<	}
371	<	}
372	<
373	<	return NOT_AUTHORIZED;
374	<	}
375	<
376	<	/* attach_iline()
377	<	*
378	<	* inputs       - client pointer
379	<	*              - conf pointer
380	<	* output       -
381	<	* side effects - do actual attach
382	<	*/
383	<	static int
384	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
385	<	{
386	<	struct ClassItem *class = NULL;
387	<	struct ip_entry *ip_found;
388	<	int a_limit_reached = 0;
389	<	unsigned int local = 0, global = 0, ident = 0;
390	<
391	<	assert(conf->class);
392	<
393	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
394	<	ip_found->count++;
395	<	SetIpHash(client_p);
396	<
397	<	class = conf->class;
398	<
399	<	count_user_host(client_p->username, client_p->host,
400	<	&global, &local, &ident);
401	<
402	<	/* XXX blah. go down checking the various silly limits
403	<	* setting a_limit_reached if any limit is reached.
404	<	* - Dianora
405	<	*/
406	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
407	<	a_limit_reached = 1;
408	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
409	<	a_limit_reached = 1;
410	<	else if (class->max_local != 0 && local >= class->max_local)
411	<	a_limit_reached = 1;
412	<	else if (class->max_global != 0 && global >= class->max_global)
413	<	a_limit_reached = 1;
414	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
415	<	client_p->username[0] != '~')
416	<	a_limit_reached = 1;
417	<
418	<	if (a_limit_reached)
419	<	{
420	<	if (!IsConfExemptLimits(conf))
421	<	return TOO_MANY;   /* Already at maximum allowed */
422	<
423	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
424	<	"but you have exceed_limit = yes;");
425	<	}
426	<
427	<	return attach_conf(client_p, conf);
428	<	}
429	<
430	<	/* init_ip_hash_table()
431	<	*
432	<	* inputs               - NONE
433	<	* output               - NONE
434	<	* side effects         - allocate memory for ip_entry(s)
435	<	*                      - clear the ip hash table
436	<	*/
437	<	void
438	<	init_ip_hash_table(void)
439	<	{
440	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
441	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
442	<	}
443	<
444	<	/* find_or_add_ip()
445	<	*
446	<	* inputs       - pointer to struct irc_ssaddr
447	<	* output       - pointer to a struct ip_entry
448	<	* side effects -
449	<	*
450	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
451	<	* count set to 0.
452	<	*/
453	<	static struct ip_entry *
454	<	find_or_add_ip(struct irc_ssaddr *ip_in)
455	<	{
456	<	struct ip_entry *ptr, *newptr;
457	<	int hash_index = hash_ip(ip_in), res;
458	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
459	<	#ifdef IPV6
460	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
461	<	#endif
462	<
463	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
464	<	{
465	<	#ifdef IPV6
466	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
467	<	continue;
468	<	if (ip_in->ss.ss_family == AF_INET6)
469	<	{
470	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
471	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
472	<	}
473	<	else
474	<	#endif
475	<	{
476	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
477	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
478	<	}
479	<	if (res == 0)
480	<	{
481	<	/* Found entry already in hash, return it. */
482	<	return ptr;
483	<	}
484	<	}
485	<
486	<	if (ip_entries_count >= 2 * hard_fdlimit)
487	<	garbage_collect_ip_entries();
488	<
489	<	newptr = mp_pool_get(ip_entry_pool);
490	<	memset(newptr, 0, sizeof(*newptr));
491	<	ip_entries_count++;
492	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
493	<
494	<	newptr->next = ip_hash_table[hash_index];
495	<	ip_hash_table[hash_index] = newptr;
496	<
497	<	return newptr;
498	<	}
499	<
500	<	/* remove_one_ip()
501	<	*
502	<	* inputs        - unsigned long IP address value
503	<	* output        - NONE
504	<	* side effects  - The ip address given, is looked up in ip hash table
505	<	*                 and number of ip#'s for that ip decremented.
506	<	*                 If ip # count reaches 0 and has expired,
507	<	*                 the struct ip_entry is returned to the ip_entry_heap
508	<	*/
509	<	void
510	<	remove_one_ip(struct irc_ssaddr *ip_in)
511	<	{
512	<	struct ip_entry *ptr;
513	<	struct ip_entry *last_ptr = NULL;
514	<	int hash_index = hash_ip(ip_in), res;
515	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
516	<	#ifdef IPV6
517	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
518	<	#endif
519	<
520	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
521	<	{
522	<	#ifdef IPV6
523	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
524	<	continue;
525	<	if (ip_in->ss.ss_family == AF_INET6)
526	<	{
527	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
528	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
529	<	}
530	<	else
531	<	#endif
532	<	{
533	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
534	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
535	<	}
536	<	if (res)
537	<	continue;
538	<	if (ptr->count > 0)
539	<	ptr->count--;
540	<	if (ptr->count == 0 &&
541	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
542	<	{
543	<	if (last_ptr != NULL)
544	<	last_ptr->next = ptr->next;
545	<	else
546	<	ip_hash_table[hash_index] = ptr->next;
547	<
548	<	mp_pool_release(ptr);
549	<	ip_entries_count--;
550	<	return;
551	<	}
552	<	last_ptr = ptr;
553	<	}
554	<	}
555	<
556	<	/* hash_ip()
557	<	*
558	<	* input        - pointer to an irc_inaddr
559	<	* output       - integer value used as index into hash table
560	<	* side effects - hopefully, none
561	<	*/
562	<	static int
563	<	hash_ip(struct irc_ssaddr *addr)
564	<	{
565	<	if (addr->ss.ss_family == AF_INET)
566	<	{
567	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
568	<	int hash;
569	<	uint32_t ip;
570	<
571	<	ip   = ntohl(v4->sin_addr.s_addr);
572	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
573	<	return hash;
574	<	}
575	<	#ifdef IPV6
576	<	else
577	<	{
578	<	int hash;
579	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
580	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
581	<
582	<	hash  = ip[0] ^ ip[3];
583	<	hash ^= hash >> 16;
584	<	hash ^= hash >> 8;
585	<	hash  = hash & (IP_HASH_SIZE - 1);
586	<	return hash;
587	<	}
588	<	#else
589	<	return 0;
590	<	#endif
591	<	}
592	<
593	<	/* count_ip_hash()
594	<	*
595	<	* inputs        - pointer to counter of number of ips hashed
596	<	*               - pointer to memory used for ip hash
597	<	* output        - returned via pointers input
598	<	* side effects  - NONE
599	<	*
600	<	* number of hashed ip #'s is counted up, plus the amount of memory
601	<	* used in the hash.
602	<	*/
603	<	void
604	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
605	<	{
606	<	struct ip_entry *ptr;
607	<	int i;
608	<
609	<	*number_ips_stored = 0;
610	<	*mem_ips_stored    = 0;
393	>	case BANNED_CLIENT:
394	>	++ServerStats.is_ref;
395	>	exit_client(source_p, "Banned");
396	>	break;
397
398	<	for (i = 0; i < IP_HASH_SIZE; i++)
399	<	{
400	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
615	<	{
616	<	*number_ips_stored += 1;
617	<	*mem_ips_stored += sizeof(struct ip_entry);
618	<	}
398	>	case 0:
399	>	default:
400	>	break;
401		}
620	–	}
621	–
622	–	/* garbage_collect_ip_entries()
623	–	*
624	–	* input        - NONE
625	–	* output       - NONE
626	–	* side effects - free up all ip entries with no connections
627	–	*/
628	–	static void
629	–	garbage_collect_ip_entries(void)
630	–	{
631	–	struct ip_entry *ptr;
632	–	struct ip_entry *last_ptr;
633	–	struct ip_entry *next_ptr;
634	–	int i;
402
403	<	for (i = 0; i < IP_HASH_SIZE; i++)
404	<	{
405	<	last_ptr = NULL;
639	<
640	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
641	<	{
642	<	next_ptr = ptr->next;
643	<
644	<	if (ptr->count == 0 &&
645	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
646	<	{
647	<	if (last_ptr != NULL)
648	<	last_ptr->next = ptr->next;
649	<	else
650	<	ip_hash_table[i] = ptr->next;
651	<	mp_pool_release(ptr);
652	<	ip_entries_count--;
653	<	}
654	<	else
655	<	last_ptr = ptr;
656	<	}
657	<	}
403	>	if (i < 0)
404	>	return false;
405	>	return true;
406		}
407
408	<	/* detach_conf()
409	<	*
410	<	* inputs       - pointer to client to detach
411	<	*              - type of conf to detach
664	<	* output       - 0 for success, -1 for failure
665	<	* side effects - Disassociate configuration from the client.
666	<	*                Also removes a class from the list if marked for deleting.
408	>	/*! \brief Disassociate configuration from the client. Also removes a class
409	>	*         from the list if marked for deleting.
410	>	* \param client_p Client to operate on
411	>	* \param type     Type of conf to detach
412		*/
413		void
414	<	detach_conf(struct Client *client_p, enum maskitem_type type)
414	>	conf_detach(struct Client *client_p, enum maskitem_type type)
415		{
416	<	dlink_node *ptr = NULL, *ptr_next = NULL;
416	>	dlink_node *node, *node_next;
417
418	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
418	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
419		{
420	<	struct MaskItem *conf = ptr->data;
420	>	struct MaskItem *conf = node->data;
421
422		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
423		assert(conf->ref_count > 0);
#	Line 681 | Line 426 | detach_conf(struct Client *client_p, enu
426		if (!(conf->type & type))
427		continue;
428
429	<	dlinkDelete(ptr, &client_p->localClient->confs);
430	<	free_dlink_node(ptr);
429	>	dlinkDelete(node, &client_p->connection->confs);
430	>	free_dlink_node(node);
431
432		if (conf->type == CONF_CLIENT)
433	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
433	>	class_ip_limit_remove(conf->class, &client_p->ip);
434
435	<	if (--conf->class->ref_count == 0 && conf->class->active == 0)
435	>	if (--conf->class->ref_count == 0 && conf->class->active == false)
436		{
437		class_free(conf->class);
438		conf->class = NULL;
439		}
440
441	<	if (--conf->ref_count == 0 && conf->active == 0)
441	>	if (--conf->ref_count == 0 && conf->active == false)
442		conf_free(conf);
443		}
444		}
445
446	<	/* attach_conf()
447	<	*
448	<	* inputs       - client pointer
449	<	*              - conf pointer
450	<	* output       -
706	<	* side effects - Associate a specific configuration entry to a *local*
707	<	*                client (this is the one which used in accepting the
708	<	*                connection). Note, that this automatically changes the
709	<	*                attachment if there was an old one...
446	>	/*! \brief Associate a specific configuration entry to a *local* client (this
447	>	*         is the one which used in accepting the connection). Note, that this
448	>	*         automatically changes the attachment if there was an old one.
449	>	* \param client_p Client to attach the conf to
450	>	* \param conf Configuration record to attach
451		*/
452		int
453	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
453	>	conf_attach(struct Client *client_p, struct MaskItem *conf)
454		{
455	<	if (dlinkFind(&client_p->localClient->confs, conf))
455	>	if (dlinkFind(&client_p->connection->confs, conf))
456		return 1;
457
458		if (conf->type == CONF_CLIENT)
459	<	if (cidr_limit_reached(IsConfExemptLimits(conf),
719	<	&client_p->localClient->ip, conf->class))
459	>	if (class_ip_limit_add(conf->class, &client_p->ip, IsConfExemptLimits(conf)) == true)
460		return TOO_MANY;    /* Already at maximum allowed */
461
462		conf->class->ref_count++;
463		conf->ref_count++;
464
465	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
726	<
727	<	return 0;
728	<	}
729	<
730	<	/* attach_connect_block()
731	<	*
732	<	* inputs       - pointer to server to attach
733	<	*              - name of server
734	<	*              - hostname of server
735	<	* output       - true (1) if both are found, otherwise return false (0)
736	<	* side effects - find connect block and attach them to connecting client
737	<	*/
738	<	int
739	<	attach_connect_block(struct Client *client_p, const char *name,
740	<	const char *host)
741	<	{
742	<	dlink_node *ptr;
743	<	struct MaskItem *conf = NULL;
744	<
745	<	assert(client_p != NULL);
746	<	assert(host != NULL);
747	<
748	<	if (client_p == NULL || host == NULL)
749	<	return 0;
750	<
751	<	DLINK_FOREACH(ptr, server_items.head)
752	<	{
753	<	conf = ptr->data;
754	<
755	<	if (match(conf->name, name) || match(conf->host, host))
756	<	continue;
757	<
758	<	attach_conf(client_p, conf);
759	<	return -1;
760	<	}
465	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
466
467		return 0;
468		}
#	Line 774 | Line 479 | attach_connect_block(struct Client *clie
479		struct MaskItem *
480		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
481		{
482	<	dlink_node *ptr;
778	<	struct MaskItem* conf;
482	>	dlink_node *node = NULL;
483
484	<	DLINK_FOREACH(ptr, list->head)
484	>	DLINK_FOREACH(node, list->head)
485		{
486	<	conf = ptr->data;
486	>	struct MaskItem *conf = node->data;
487
488		if (conf->type == type)
489		{
490	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
491	<	!match(conf->name, name)))
788	<	return conf;
490	>	if (conf->name && !irccmp(conf->name, name))
491	>	return conf;
492		}
493		}
494
495		return NULL;
496		}
497
498	<	/* map_to_list()
499	<	*
500	<	* inputs       - ConfType conf
798	<	* output       - pointer to dlink_list to use
799	<	* side effects - none
800	<	*/
801	<	static dlink_list *
802	<	map_to_list(enum maskitem_type type)
803	<	{
804	<	switch(type)
805	<	{
806	<	case CONF_XLINE:
807	<	return(&xconf_items);
808	<	break;
809	<	case CONF_ULINE:
810	<	return(&uconf_items);
811	<	break;
812	<	case CONF_NRESV:
813	<	return(&nresv_items);
814	<	break;
815	<	case CONF_CRESV:
816	<	return(&cresv_items);
817	<	case CONF_OPER:
818	<	return(&oconf_items);
819	<	break;
820	<	case CONF_SERVER:
821	<	return(&server_items);
822	<	break;
823	<	case CONF_SERVICE:
824	<	return(&service_items);
825	<	break;
826	<	case CONF_CLUSTER:
827	<	return(&cluster_items);
828	<	break;
829	<	default:
830	<	return NULL;
831	<	}
832	<	}
833	<
834	<	/* find_matching_name_conf()
835	<	*
836	<	* inputs       - type of link list to look in
837	<	*              - pointer to name string to find
838	<	*              - pointer to user
839	<	*              - pointer to host
840	<	*              - optional flags to match on as well
841	<	* output       - NULL or pointer to found struct MaskItem
842	<	* side effects - looks for a match on name field
498	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
499	>	* \param name Name to match
500	>	* \param compare Pointer to function to be used for string matching
501		*/
502		struct MaskItem *
503	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
846	<	const char *host, unsigned int flags)
503	>	connect_find(const char *name, int (*compare)(const char *, const char *))
504		{
505	<	dlink_node *ptr=NULL;
849	<	struct MaskItem *conf=NULL;
850	<	dlink_list *list_p = map_to_list(type);
505	>	dlink_node *node;
506
507	<	switch (type)
507	>	DLINK_FOREACH(node, connect_items.head)
508		{
509	<	case CONF_SERVICE:
855	<	DLINK_FOREACH(ptr, list_p->head)
856	<	{
857	<	conf = ptr->data;
858	<
859	<	if (EmptyString(conf->name))
860	<	continue;
861	<	if ((name != NULL) && !irccmp(name, conf->name))
862	<	return conf;
863	<	}
864	<	break;
865	<
866	<	case CONF_XLINE:
867	<	case CONF_ULINE:
868	<	case CONF_NRESV:
869	<	case CONF_CRESV:
870	<	DLINK_FOREACH(ptr, list_p->head)
871	<	{
872	<	conf = ptr->data;
873	<
874	<	if (EmptyString(conf->name))
875	<	continue;
876	<	if ((name != NULL) && !match(conf->name, name))
877	<	{
878	<	if ((user == NULL && (host == NULL)))
879	<	return conf;
880	<	if ((conf->flags & flags) != flags)
881	<	continue;
882	<	if (EmptyString(conf->user) || EmptyString(conf->host))
883	<	return conf;
884	<	if (!match(conf->user, user) && !match(conf->host, host))
885	<	return conf;
886	<	}
887	<	}
888	<	break;
889	<
890	<	case CONF_SERVER:
891	<	DLINK_FOREACH(ptr, list_p->head)
892	<	{
893	<	conf = ptr->data;
509	>	struct MaskItem *conf = node->data;
510
511	<	if ((name != NULL) && !match(name, conf->name))
512	<	return conf;
897	<	else if ((host != NULL) && !match(host, conf->host))
898	<	return conf;
899	<	}
900	<	break;
901	<
902	<	default:
903	<	break;
511	>	if (compare(name, conf->name) == 0)
512	>	return conf;
513		}
514	+
515		return NULL;
516		}
517
#	Line 915 | Line 525 | find_matching_name_conf(enum maskitem_ty
525		* side effects - looks for an exact match on name field
526		*/
527		struct MaskItem *
528	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
919	<	const char *user, const char *host)
528	>	operator_find(const struct Client *who, const char *name)
529		{
530	<	dlink_node *ptr = NULL;
922	<	struct MaskItem *conf;
923	<	dlink_list *list_p = map_to_list(type);
530	>	dlink_node *node;
531
532	<	switch(type)
532	>	DLINK_FOREACH(node, operator_items.head)
533		{
534	<	case CONF_XLINE:
928	<	case CONF_ULINE:
929	<	case CONF_NRESV:
930	<	case CONF_CRESV:
534	>	struct MaskItem *conf = node->data;
535
536	<	DLINK_FOREACH(ptr, list_p->head)
536	>	if (irccmp(conf->name, name) == 0)
537		{
538	<	conf = ptr->data;
539	<
936	<	if (EmptyString(conf->name))
937	<	continue;
938	<
939	<	if (irccmp(conf->name, name) == 0)
940	<	{
941	<	if ((user == NULL && (host == NULL)))
942	<	return conf;
943	<	if (EmptyString(conf->user) || EmptyString(conf->host))
944	<	return conf;
945	<	if (!match(conf->user, user) && !match(conf->host, host))
946	<	return conf;
947	<	}
948	<	}
949	<	break;
950	<
951	<	case CONF_OPER:
952	<	DLINK_FOREACH(ptr, list_p->head)
953	<	{
954	<	conf = ptr->data;
955	<
956	<	if (EmptyString(conf->name))
957	<	continue;
538	>	if (who == NULL)
539	>	return conf;
540
541	<	if (!irccmp(conf->name, name))
541	>	if (match(conf->user, who->username) == 0)
542		{
543	<	if (!who)
962	<	return conf;
963	<	if (EmptyString(conf->user) || EmptyString(conf->host))
964	<	return NULL;
965	<	if (!match(conf->user, who->username))
543	>	switch (conf->htype)
544		{
545	<	switch (conf->htype)
546	<	{
547	<	case HM_HOST:
548	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
549	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
545	>	case HM_HOST:
546	>	if (match(conf->host, who->host) == 0 || match(conf->host, who->sockhost) == 0)
547	>	if (conf->class->max_total == 0 || conf->class->ref_count < conf->class->max_total)
548	>	return conf;
549	>	break;
550	>	case HM_IPV4:
551	>	if (who->ip.ss.ss_family == AF_INET)
552	>	if (match_ipv4(&who->ip, conf->addr, conf->bits))
553	>	if (conf->class->max_total == 0 || conf->class->ref_count < conf->class->max_total)
554		return conf;
555	<	break;
556	<	case HM_IPV4:
557	<	if (who->localClient->aftype == AF_INET)
558	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
559	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
560	<	return conf;
561	<	break;
562	<	#ifdef IPV6
563	<	case HM_IPV6:
982	<	if (who->localClient->aftype == AF_INET6)
983	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
984	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
985	<	return conf;
986	<	break;
987	<	#endif
988	<	default:
989	<	assert(0);
990	<	}
555	>	break;
556	>	case HM_IPV6:
557	>	if (who->ip.ss.ss_family == AF_INET6)
558	>	if (match_ipv6(&who->ip, conf->addr, conf->bits))
559	>	if (conf->class->max_total == 0 || conf->class->ref_count < conf->class->max_total)
560	>	return conf;
561	>	break;
562	>	default:
563	>	assert(0);
564		}
565		}
566		}
994	–
995	–	break;
996	–
997	–	case CONF_SERVER:
998	–	DLINK_FOREACH(ptr, list_p->head)
999	–	{
1000	–	conf = ptr->data;
1001	–
1002	–	if (EmptyString(conf->name))
1003	–	continue;
1004	–
1005	–	if (name == NULL)
1006	–	{
1007	–	if (EmptyString(conf->host))
1008	–	continue;
1009	–	if (irccmp(conf->host, host) == 0)
1010	–	return conf;
1011	–	}
1012	–	else if (irccmp(conf->name, name) == 0)
1013	–	return conf;
1014	–	}
1015	–
1016	–	break;
1017	–
1018	–	default:
1019	–	break;
567		}
568
569		return NULL;
570		}
571
572	<	/* rehash()
1026	<	*
1027	<	* Actual REHASH service routine. Called with sig == 0 if it has been called
1028	<	* as a result of an operator issuing this command, else assume it has been
1029	<	* called as a result of the server receiving a HUP signal.
1030	<	*/
1031	<	int
1032	<	rehash(int sig)
1033	<	{
1034	<	if (sig)
1035	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1036	<	"Got signal SIGHUP, reloading configuration file(s)");
1037	<
1038	<	restart_resolver();
1039	<
1040	<	/* don't close listeners until we know we can go ahead with the rehash */
1041	<
1042	<	/* Check to see if we magically got(or lost) IPv6 support */
1043	<	check_can_use_v6();
1044	<
1045	<	read_conf_files(0);
1046	<
1047	<	if (ServerInfo.description)
1048	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1049	<
1050	<	load_conf_modules();
1051	<
1052	<	rehashed_klines = 1;
1053	<
1054	<	return 0;
1055	<	}
1056	<
1057	<	/* set_default_conf()
572	>	/* conf_set_defaults()
573		*
574		* inputs       - NONE
575		* output       - NONE
#	Line 1064 | Line 579 | rehash(int sig)
579		*                of values later, put them in validate_conf().
580		*/
581		static void
582	<	set_default_conf(void)
582	>	conf_set_defaults(void)
583		{
584	<	/* verify init_class() ran, this should be an unnecessary check
585	<	* but its not much work.
584	>	/*
585	>	* Verify init_class() ran, this should be an unnecessary check
586	>	* but it's not much work.
587		*/
588		assert(class_default == class_get_list()->tail->data);
589
590	<	#ifdef HAVE_LIBCRYPTO
591	<	ServerInfo.rsa_private_key = NULL;
592	<	ServerInfo.rsa_private_key_file = NULL;
593	<	#endif
594	<
595	<	/* ServerInfo.name is not rehashable */
1080	<	/* ServerInfo.name = ServerInfo.name; */
1081	<	ServerInfo.description = NULL;
1082	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1083	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1084	<
1085	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1086	<	ServerInfo.specific_ipv4_vhost = 0;
1087	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1088	<	ServerInfo.specific_ipv6_vhost = 0;
1089	<
1090	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1091	<	ServerInfo.max_nick_length = 9;
1092	<	ServerInfo.max_topic_length = 80;
1093	<
1094	<	ServerInfo.hub = 0;
1095	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1096	<	ServerInfo.dns_host.sin_port = 0;
1097	<	AdminInfo.name = NULL;
1098	<	AdminInfo.email = NULL;
1099	<	AdminInfo.description = NULL;
590	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
591	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
592	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
593	>	ConfigServerInfo.max_nick_length = 9;
594	>	ConfigServerInfo.max_topic_length = 80;
595	>	ConfigServerInfo.hub = 0;
596
597	<	log_del_all();
597	>	log_iterate(log_free);
598
599	<	ConfigLoggingEntry.use_logging = 1;
599	>	ConfigLog.use_logging = 1;
600
601		ConfigChannel.disable_fake_channels = 0;
602	<	ConfigChannel.knock_delay = 300;
602	>	ConfigChannel.invite_client_count = 10;
603	>	ConfigChannel.invite_client_time = 300;
604	>	ConfigChannel.invite_delay_channel = 5;
605	>	ConfigChannel.invite_expire_time = 1800;
606	>	ConfigChannel.knock_client_count = 1;
607	>	ConfigChannel.knock_client_time = 300;
608		ConfigChannel.knock_delay_channel = 60;
609	<	ConfigChannel.max_chans_per_user = 25;
610	<	ConfigChannel.max_chans_per_oper = 50;
611	<	ConfigChannel.max_bans = 25;
612	<	ConfigChannel.default_split_user_count = 0;
613	<	ConfigChannel.default_split_server_count = 0;
614	<	ConfigChannel.no_join_on_split = 0;
1114	<	ConfigChannel.no_create_on_split = 0;
609	>	ConfigChannel.max_channels = 25;
610	>	ConfigChannel.max_invites = 20;
611	>	ConfigChannel.max_bans = 100;
612	>	ConfigChannel.max_bans_large = 500;
613	>	ConfigChannel.default_join_flood_count = 18;
614	>	ConfigChannel.default_join_flood_time = 6;
615
616		ConfigServerHide.flatten_links = 0;
617	<	ConfigServerHide.links_delay = 300;
617	>	ConfigServerHide.flatten_links_delay = 300;
618		ConfigServerHide.hidden = 0;
619		ConfigServerHide.hide_servers = 0;
620		ConfigServerHide.hide_services = 0;
#	Line 1122 | Line 622 | set_default_conf(void)
622		ConfigServerHide.hide_server_ips = 0;
623		ConfigServerHide.disable_remote_commands = 0;
624
625	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
626	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
627	<	ConfigFileEntry.cycle_on_host_change = 1;
628	<	ConfigFileEntry.glines = 0;
629	<	ConfigFileEntry.gline_time = 12 * 3600;
630	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
631	<	ConfigFileEntry.gline_min_cidr = 16;
632	<	ConfigFileEntry.gline_min_cidr6 = 48;
633	<	ConfigFileEntry.invisible_on_connect = 1;
634	<	ConfigFileEntry.tkline_expire_notices = 1;
635	<	ConfigFileEntry.hide_spoof_ips = 1;
636	<	ConfigFileEntry.ignore_bogus_ts = 0;
637	<	ConfigFileEntry.disable_auth = 0;
638	<	ConfigFileEntry.kill_chase_time_limit = 90;
639	<	ConfigFileEntry.default_floodcount = 8;
640	<	ConfigFileEntry.failed_oper_notice = 1;
641	<	ConfigFileEntry.dots_in_ident = 0;
642	<	ConfigFileEntry.min_nonwildcard = 4;
643	<	ConfigFileEntry.min_nonwildcard_simple = 3;
644	<	ConfigFileEntry.max_accept = 20;
645	<	ConfigFileEntry.anti_nick_flood = 0;
646	<	ConfigFileEntry.max_nick_time = 20;
647	<	ConfigFileEntry.max_nick_changes = 5;
648	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
649	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
650	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
651	<	ConfigFileEntry.warn_no_nline = 1;
652	<	ConfigFileEntry.stats_o_oper_only = 0;
653	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
654	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
655	<	ConfigFileEntry.stats_P_oper_only = 0;
656	<	ConfigFileEntry.stats_u_oper_only = 0;
657	<	ConfigFileEntry.caller_id_wait = 60;
658	<	ConfigFileEntry.opers_bypass_callerid = 0;
659	<	ConfigFileEntry.pace_wait = 10;
660	<	ConfigFileEntry.pace_wait_simple = 1;
661	<	ConfigFileEntry.short_motd = 0;
662	<	ConfigFileEntry.ping_cookie = 0;
663	<	ConfigFileEntry.no_oper_flood = 0;
664	<	ConfigFileEntry.true_no_oper_flood = 0;
665	<	ConfigFileEntry.oper_pass_resv = 1;
666	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
667	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
668	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
669	<	UMODE_OPERWALL | UMODE_WALLOP;
670	<	ConfigFileEntry.use_egd = 0;
671	<	ConfigFileEntry.egdpool_path = NULL;
1172	<	ConfigFileEntry.throttle_time = 10;
625	>	ConfigGeneral.away_count = 2;
626	>	ConfigGeneral.away_time = 10;
627	>	ConfigGeneral.max_watch = 50;
628	>	ConfigGeneral.whowas_history_length = 15000;
629	>	ConfigGeneral.cycle_on_host_change = 1;
630	>	ConfigGeneral.dline_min_cidr = 16;
631	>	ConfigGeneral.dline_min_cidr6 = 48;
632	>	ConfigGeneral.kline_min_cidr = 16;
633	>	ConfigGeneral.kline_min_cidr6 = 48;
634	>	ConfigGeneral.invisible_on_connect = 1;
635	>	ConfigGeneral.disable_auth = 0;
636	>	ConfigGeneral.kill_chase_time_limit = 90;
637	>	ConfigGeneral.default_floodcount = 8;
638	>	ConfigGeneral.default_floodtime = 1;
639	>	ConfigGeneral.failed_oper_notice = 1;
640	>	ConfigGeneral.dots_in_ident = 0;
641	>	ConfigGeneral.min_nonwildcard = 4;
642	>	ConfigGeneral.min_nonwildcard_simple = 3;
643	>	ConfigGeneral.max_accept = 50;
644	>	ConfigGeneral.anti_nick_flood = 0;
645	>	ConfigGeneral.max_nick_time = 20;
646	>	ConfigGeneral.max_nick_changes = 5;
647	>	ConfigGeneral.anti_spam_exit_message_time = 0;
648	>	ConfigGeneral.ts_warn_delta = 30;
649	>	ConfigGeneral.ts_max_delta = 600;
650	>	ConfigGeneral.warn_no_connect_block = 1;
651	>	ConfigGeneral.stats_e_disabled = 0;
652	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
653	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
654	>	ConfigGeneral.stats_o_oper_only = 1;
655	>	ConfigGeneral.stats_m_oper_only = 1;
656	>	ConfigGeneral.stats_P_oper_only = 0;
657	>	ConfigGeneral.stats_u_oper_only = 0;
658	>	ConfigGeneral.caller_id_wait = 60;
659	>	ConfigGeneral.opers_bypass_callerid = 1;
660	>	ConfigGeneral.pace_wait = 10;
661	>	ConfigGeneral.pace_wait_simple = 1;
662	>	ConfigGeneral.short_motd = 0;
663	>	ConfigGeneral.ping_cookie = 0;
664	>	ConfigGeneral.no_oper_flood = 0;
665	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
666	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
667	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
668	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
669	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
670	>	ConfigGeneral.throttle_count = 1;
671	>	ConfigGeneral.throttle_time = 1;
672		}
673
674		static void
675	<	validate_conf(void)
675	>	conf_validate(void)
676		{
677	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
678	<	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);
677	>	if (EmptyString(ConfigServerInfo.network_name))
678	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
679
680	<	if (ConfigFileEntry.service_name == NULL)
681	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1192	<
1193	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
680	>	if (EmptyString(ConfigServerInfo.network_desc))
681	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
682		}
683
684	<	/* read_conf()
684	>	/* conf_read()
685		*
686		* inputs       - file descriptor pointing to config file to use
687		* output       - None
688		* side effects - Read configuration file.
689		*/
690		static void
691	<	read_conf(FILE *file)
691	>	conf_read(FILE *file)
692		{
693	<	lineno = 0;
693	>	lineno = 1;
694
695	<	set_default_conf(); /* Set default values prior to conf parsing */
695	>	conf_set_defaults();  /* Set default values prior to conf parsing */
696		conf_parser_ctx.pass = 1;
697	<	yyparse();          /* pick up the classes first */
697	>	yyparse();  /* Pick up the classes first */
698
699		rewind(file);
700
701		conf_parser_ctx.pass = 2;
702	<	yyparse();          /* Load the values from the conf */
703	<	validate_conf();    /* Check to make sure some values are still okay. */
704	<	/* Some global values are also loaded here. */
705	<	class_delete_marked();      /* Make sure classes are valid */
702	>	yyparse();  /* Load the values from the conf */
703	>	conf_validate();  /* Check to make sure some values are still okay. */
704	>	/* Some global values are also loaded here. */
705	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
706	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
707		}
708
709	<	/* lookup_confhost()
709	>	/* conf_rehash()
710		*
711	<	* start DNS lookups of all hostnames in the conf
712	<	* line and convert an IP addresses in a.b.c.d number for to IP#s.
711	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
712	>	* as a result of an operator issuing this command, else assume it has been
713	>	* called as a result of the server receiving a HUP signal.
714		*/
715		void
716	<	lookup_confhost(struct MaskItem *conf)
716	>	conf_rehash(bool sig)
717		{
718	<	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))
718	>	if (sig == true)
719		{
720	<	conf_dns_lookup(conf);
721	<	return;
720	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
721	>	"Got signal SIGHUP, reloading configuration file(s)");
722	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
723		}
724
725	<	assert(res);
725	>	restart_resolver();
726
727	<	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;
727	>	/* don't close listeners until we know we can go ahead with the rehash */
728
729	<	freeaddrinfo(res);
729	>	conf_read_files(false);
730	>
731	>	load_conf_modules();
732	>	check_conf_klines();
733		}
734
735		/* conf_connect_allowed()
#	Line 1261 | Line 740 | lookup_confhost(struct MaskItem *conf)
740		* side effects - none
741		*/
742		int
743	<	conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
743	>	conf_connect_allowed(struct irc_ssaddr *addr)
744		{
745	<	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;
745	>	const struct MaskItem *conf = find_dline_conf(addr);
746
747		if (conf)
748	+	{
749	+	/* DLINE exempt also gets you out of static limits/pacing... */
750	+	if (conf->type == CONF_EXEMPT)
751	+	return 0;
752		return BANNED_CLIENT;
753	+	}
754
755	<	ip_found = find_or_add_ip(addr);
756	<
1278	<	if ((CurrentTime - ip_found->last_attempt) <
1279	<	ConfigFileEntry.throttle_time)
755	>	struct ip_entry *ip_found = ipcache_record_find_or_add(addr);
756	>	if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
757		{
758	<	ip_found->last_attempt = CurrentTime;
759	<	return TOO_FAST;
758	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
759	>	return TOO_FAST;
760	>
761	>	++ip_found->connection_count;
762		}
763	+	else
764	+	ip_found->connection_count = 1;
765
766	<	ip_found->last_attempt = CurrentTime;
766	>	ip_found->last_attempt = event_base->time.sec_monotonic;
767		return 0;
768		}
769
#	Line 1294 | Line 775 | conf_connect_allowed(struct irc_ssaddr *
775		*                This is an event started off in ircd.c
776		*/
777		void
778	<	cleanup_tklines(void *notused)
778	>	cleanup_tklines(void *unused)
779		{
780		hostmask_expire_temporary();
781	<	expire_tklines(&xconf_items);
782	<	expire_tklines(&nresv_items);
1302	<	expire_tklines(&cresv_items);
1303	<	}
1304	<
1305	<	/* expire_tklines()
1306	<	*
1307	<	* inputs       - tkline list pointer
1308	<	* output       - NONE
1309	<	* side effects - expire tklines
1310	<	*/
1311	<	static void
1312	<	expire_tklines(dlink_list *tklist)
1313	<	{
1314	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1315	<	struct MaskItem *conf = NULL;
1316	<
1317	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1318	<	{
1319	<	conf = ptr->data;
1320	<
1321	<	if (!conf->until || conf->until > CurrentTime)
1322	<	continue;
1323	<
1324	<	if (conf->type == CONF_XLINE)
1325	<	{
1326	<	if (ConfigFileEntry.tkline_expire_notices)
1327	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1328	<	"Temporary X-line for [%s] expired", conf->name);
1329	<	conf_free(conf);
1330	<	}
1331	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1332	<	{
1333	<	if (ConfigFileEntry.tkline_expire_notices)
1334	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1335	<	"Temporary RESV for [%s] expired", conf->name);
1336	<	conf_free(conf);
1337	<	}
1338	<	}
1339	<	}
1340	<
1341	<	/* oper_privs_as_string()
1342	<	*
1343	<	* inputs        - pointer to client_p
1344	<	* output        - pointer to static string showing oper privs
1345	<	* side effects  - return as string, the oper privs as derived from port
1346	<	*/
1347	<	static const struct oper_privs
1348	<	{
1349	<	const unsigned int flag;
1350	<	const unsigned char c;
1351	<	} flag_list[] = {
1352	<	{ OPER_FLAG_ADMIN,          'A' },
1353	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1354	<	{ OPER_FLAG_DIE,            'D' },
1355	<	{ OPER_FLAG_GLINE,          'G' },
1356	<	{ OPER_FLAG_REHASH,         'H' },
1357	<	{ OPER_FLAG_K,              'K' },
1358	<	{ OPER_FLAG_OPERWALL,       'L' },
1359	<	{ OPER_FLAG_KILL,           'N' },
1360	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1361	<	{ OPER_FLAG_CONNECT,        'P' },
1362	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1363	<	{ OPER_FLAG_SQUIT,          'R' },
1364	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1365	<	{ OPER_FLAG_UNKLINE,        'U' },
1366	<	{ OPER_FLAG_XLINE,          'X' },
1367	<	{ 0, '\0' }
1368	<	};
1369	<
1370	<	char *
1371	<	oper_privs_as_string(const unsigned int port)
1372	<	{
1373	<	static char privs_out[IRCD_BUFSIZE];
1374	<	char *privs_ptr = privs_out;
1375	<
1376	<	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1377	<	{
1378	<	if (port & opriv->flag)
1379	<	*privs_ptr++ = opriv->c;
1380	<	else
1381	<	*privs_ptr++ = ToLower(opriv->c);
1382	<	}
1383	<
1384	<	*privs_ptr = '\0';
1385	<
1386	<	return privs_out;
781	>	gecos_expire();
782	>	resv_expire();
783		}
784
785		/*
786	<	* Input: A client to find the active oper{} name for.
786	>	* Input: A client to find the active operator {} name for.
787		* Output: The nick!user@host{oper} of the oper.
788		*         "oper" is server name for remote opers
789		* Side effects: None.
#	Line 1395 | Line 791 | oper_privs_as_string(const unsigned int
791		const char *
792		get_oper_name(const struct Client *client_p)
793		{
794	<	const dlink_node *cnode = NULL;
795	<	/* +5 for !,@,{,} and null */
796	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
794	>	static char buffer[IRCD_BUFSIZE];
795	>
796	>	if (IsServer(client_p))
797	>	return client_p->name;
798
799		if (MyConnect(client_p))
800		{
801	<	if ((cnode = client_p->localClient->confs.head))
801	>	const dlink_node *const node = client_p->connection->confs.head;
802	>
803	>	if (node)
804		{
805	<	const struct MaskItem *conf = cnode->data;
805	>	const struct MaskItem *const conf = node->data;
806
807	<	if (IsConfOperator(conf))
807	>	if (conf->type == CONF_OPER)
808		{
809		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
810		client_p->username, client_p->host, conf->name);
#	Line 1413 | Line 812 | get_oper_name(const struct Client *clien
812		}
813		}
814
815	<	/* Probably should assert here for now. If there is an oper out there
816	<	* with no oper{} conf attached, it would be good for us to know...
815	>	/*
816	>	* Probably should assert here for now. If there is an oper out there
817	>	* with no operator {} conf attached, it would be good for us to know...
818		*/
819	<	assert(0); /* Oper without oper conf! */
819	>	assert(0);  /* Oper without oper conf! */
820		}
821
822		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1424 | Line 824 | get_oper_name(const struct Client *clien
824		return buffer;
825		}
826
827	+	/* conf_clear()
828	+	*
829	+	* inputs       - none
830	+	* output       - none
831	+	* side effects - Clear out the old configuration
832	+	*/
833	+	static void
834	+	conf_clear(void)
835	+	{
836	+	dlink_node *node = NULL, *node_next = NULL;
837	+	dlink_list *free_items [] = {
838	+	&connect_items, &operator_items, NULL
839	+	};
840	+
841	+	dlink_list ** iterator = free_items; /* C is dumb */
842	+
843	+	/* We only need to free anything allocated by yyparse() here.
844	+	* Resetting structs, etc, is taken care of by conf_set_defaults().
845	+	*/
846	+
847	+	for (; *iterator; iterator++)
848	+	{
849	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
850	+	{
851	+	struct MaskItem *conf = node->data;
852	+
853	+	conf->active = false;
854	+	dlinkDelete(&conf->node, *iterator);
855	+
856	+	if (!conf->ref_count)
857	+	conf_free(conf);
858	+	}
859	+	}
860	+
861	+	/*
862	+	* Don't delete the class table, rather mark all entries for deletion.
863	+	* The table is cleaned up by class_delete_marked. - avalon
864	+	*/
865	+	class_mark_for_deletion();
866	+
867	+	clear_out_address_conf();
868	+
869	+	modules_conf_clear();  /* Clear modules {} items */
870	+
871	+	motd_clear();  /* Clear motd {} items and re-cache default motd */
872	+
873	+	cluster_clear();  /* Clear cluster {} items */
874	+
875	+	gecos_clear();  /* Clear gecos {} items */
876	+
877	+	resv_clear();  /* Clear resv {} items */
878	+
879	+	service_clear();  /* Clear service {} items */
880	+
881	+	shared_clear();  /* Clear shared {} items */
882	+
883	+	pseudo_clear();  /* Clear pseudo {} items */
884	+
885	+	/* Clean out ConfigServerInfo */
886	+	xfree(ConfigServerInfo.description);
887	+	ConfigServerInfo.description = NULL;
888	+	xfree(ConfigServerInfo.network_name);
889	+	ConfigServerInfo.network_name = NULL;
890	+	xfree(ConfigServerInfo.network_desc);
891	+	ConfigServerInfo.network_desc = NULL;
892	+	xfree(ConfigServerInfo.rsa_private_key_file);
893	+	ConfigServerInfo.rsa_private_key_file = NULL;
894	+	xfree(ConfigServerInfo.tls_certificate_file);
895	+	ConfigServerInfo.tls_certificate_file = NULL;
896	+	xfree(ConfigServerInfo.tls_dh_param_file);
897	+	ConfigServerInfo.tls_dh_param_file = NULL;
898	+	xfree(ConfigServerInfo.tls_supported_groups);
899	+	ConfigServerInfo.tls_supported_groups = NULL;
900	+	xfree(ConfigServerInfo.tls_cipher_list);
901	+	ConfigServerInfo.tls_cipher_list = NULL;
902	+	xfree(ConfigServerInfo.tls_cipher_suites);
903	+	ConfigServerInfo.tls_cipher_suites = NULL;
904	+	xfree(ConfigServerInfo.tls_message_digest_algorithm);
905	+	ConfigServerInfo.tls_message_digest_algorithm = NULL;
906	+
907	+	/* Clean out ConfigAdminInfo */
908	+	xfree(ConfigAdminInfo.name);
909	+	ConfigAdminInfo.name = NULL;
910	+	xfree(ConfigAdminInfo.email);
911	+	ConfigAdminInfo.email = NULL;
912	+	xfree(ConfigAdminInfo.description);
913	+	ConfigAdminInfo.description = NULL;
914	+
915	+	/* Clean out ConfigServerHide */
916	+	xfree(ConfigServerHide.flatten_links_file);
917	+	ConfigServerHide.flatten_links_file = NULL;
918	+	xfree(ConfigServerHide.hidden_name);
919	+	ConfigServerHide.hidden_name = NULL;
920	+
921	+	/* Clean out listeners */
922	+	listener_close_marked();
923	+	}
924	+
925	+	static void
926	+	conf_handle_tls(bool cold)
927	+	{
928	+	if (tls_new_cred() == false)
929	+	{
930	+	if (cold == true)
931	+	{
932	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
933	+	exit(EXIT_FAILURE);
934	+	}
935	+	else
936	+	{
937	+	/* Failed to load new settings/certs, old ones remain active */
938	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
939	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
940	+	}
941	+	}
942	+	}
943	+
944		/* read_conf_files()
945		*
946		* inputs       - cold start YES or NO
#	Line 1431 | Line 948 | get_oper_name(const struct Client *clien
948		* side effects - read all conf files needed, ircd.conf kline.conf etc.
949		*/
950		void
951	<	read_conf_files(int cold)
951	>	conf_read_files(bool cold)
952		{
953	<	const char *filename;
954	<	char chanmodes[IRCD_BUFSIZE];
1438	<	char chanlimit[IRCD_BUFSIZE];
953	>	const char *filename = NULL;
954	>	char buf[IRCD_BUFSIZE];
955
956		conf_parser_ctx.boot = cold;
957	<	filename = ConfigFileEntry.configfile;
957	>	filename = ConfigGeneral.configfile;
958
959		/* We need to know the initial filename for the yyerror() to report
960		FIXME: The full path is in conffilenamebuf first time since we
961	<	dont know anything else
961	>	don't know anything else
962
963		- Gozem 2002-07-21
964		*/
#	Line 1450 | Line 966 | read_conf_files(int cold)
966
967		if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
968		{
969	<	if (cold)
969	>	if (cold == true)
970		{
971		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
972		filename, strerror(errno));
973	<	exit(-1);
973	>	exit(EXIT_FAILURE);
974		}
975		else
976		{
977	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
977	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
978		"Unable to read configuration file '%s': %s",
979		filename, strerror(errno));
980		return;
981		}
982		}
983
984	<	if (!cold)
985	<	clear_out_old_conf();
984	>	if (cold == false)
985	>	conf_clear();
986
987	<	read_conf(conf_parser_ctx.conf_file);
987	>	conf_read(conf_parser_ctx.conf_file);
988		fclose(conf_parser_ctx.conf_file);
989
990	<	log_reopen_all();
991	<
1476	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1477	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1478	<
1479	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1480	<	add_isupport("MAXLIST", chanmodes, -1);
1481	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1482	<	add_isupport("CHANTYPES", "#", -1);
1483	<
1484	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1485	<	ConfigChannel.max_chans_per_user);
1486	<	add_isupport("CHANLIMIT", chanlimit, -1);
1487	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1488	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1489	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1490	<	add_isupport("CHANMODES", chanmodes, -1);
1491	<
1492	<	/*
1493	<	* message_locale may have changed.  rebuild isupport since it relies
1494	<	* on strlen(form_str(RPL_ISUPPORT))
1495	<	*/
1496	<	rebuild_isupport_message_line();
1497	<	}
1498	<
1499	<	/* clear_out_old_conf()
1500	<	*
1501	<	* inputs       - none
1502	<	* output       - none
1503	<	* side effects - Clear out the old configuration
1504	<	*/
1505	<	static void
1506	<	clear_out_old_conf(void)
1507	<	{
1508	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1509	<	struct MaskItem *conf;
1510	<	dlink_list *free_items [] = {
1511	<	&server_items,   &oconf_items,
1512	<	&uconf_items,   &xconf_items,
1513	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1514	<	};
1515	<
1516	<	dlink_list ** iterator = free_items; /* C is dumb */
1517	<
1518	<	/* We only need to free anything allocated by yyparse() here.
1519	<	* Resetting structs, etc, is taken care of by set_default_conf().
1520	<	*/
990	>	log_iterate(log_reopen);
991	>	conf_handle_tls(cold);
992
993	<	for (; *iterator != NULL; iterator++)
994	<	{
1524	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1525	<	{
1526	<	conf = ptr->data;
993	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
994	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
995
996	<	dlinkDelete(&conf->node, map_to_list(conf->type));
996	>	snprintf(buf, sizeof(buf), "beI:%u", ConfigChannel.max_bans);
997	>	isupport_add("MAXLIST", buf, -1);
998
999	<	/* XXX This is less than pretty */
1000	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1532	<	{
1533	<	if (!conf->ref_count)
1534	<	conf_free(conf);
1535	<	}
1536	<	else if (conf->type == CONF_XLINE)
1537	<	{
1538	<	if (!conf->until)
1539	<	conf_free(conf);
1540	<	}
1541	<	else
1542	<	conf_free(conf);
1543	<	}
1544	<	}
1545	<
1546	<	motd_clear();
1547	<
1548	<	/*
1549	<	* don't delete the class table, rather mark all entries
1550	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1551	<	*/
1552	<	class_mark_for_deletion();
999	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1000	>	isupport_add("CHANTYPES", "#", -1);
1001
1002	<	clear_out_address_conf();
1002	>	snprintf(buf, sizeof(buf), "#:%u", ConfigChannel.max_channels);
1003	>	isupport_add("CHANLIMIT", buf, -1);
1004
1005	<	/* clean out module paths */
1006	<	mod_clear_paths();
1005	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1006	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1007
1008	<	/* clean out ServerInfo */
1009	<	MyFree(ServerInfo.description);
1561	<	ServerInfo.description = NULL;
1562	<	MyFree(ServerInfo.network_name);
1563	<	ServerInfo.network_name = NULL;
1564	<	MyFree(ServerInfo.network_desc);
1565	<	ServerInfo.network_desc = NULL;
1566	<	MyFree(ConfigFileEntry.egdpool_path);
1567	<	ConfigFileEntry.egdpool_path = NULL;
1568	<	#ifdef HAVE_LIBCRYPTO
1569	<	if (ServerInfo.rsa_private_key)
1570	<	{
1571	<	RSA_free(ServerInfo.rsa_private_key);
1572	<	ServerInfo.rsa_private_key = NULL;
1573	<	}
1574	<
1575	<	MyFree(ServerInfo.rsa_private_key_file);
1576	<	ServerInfo.rsa_private_key_file = NULL;
1577	<
1578	<	if (ServerInfo.server_ctx)
1579	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1580	<	SSL_OP_NO_SSLv3|
1581	<	SSL_OP_NO_TLSv1);
1582	<	if (ServerInfo.client_ctx)
1583	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1584	<	SSL_OP_NO_SSLv3|
1585	<	SSL_OP_NO_TLSv1);
1586	<	#endif
1587	<
1588	<	/* clean out AdminInfo */
1589	<	MyFree(AdminInfo.name);
1590	<	AdminInfo.name = NULL;
1591	<	MyFree(AdminInfo.email);
1592	<	AdminInfo.email = NULL;
1593	<	MyFree(AdminInfo.description);
1594	<	AdminInfo.description = NULL;
1595	<
1596	<	/* clean out listeners */
1597	<	close_listeners();
1598	<
1599	<	/* clean out general */
1600	<	MyFree(ConfigFileEntry.service_name);
1601	<	ConfigFileEntry.service_name = NULL;
1008	>	snprintf(buf, sizeof(buf), "%s", "beI,k,l,cimnprstuCLMNORST");
1009	>	isupport_add("CHANMODES", buf, -1);
1010		}
1011
1012		/* conf_add_class_to_conf()
#	Line 1608 | Line 1016 | clear_out_old_conf(void)
1016		* side effects - Add a class pointer to a conf
1017		*/
1018		void
1019	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1019	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1020		{
1021	<	if (class_name == NULL)
1021	>	if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1022		{
1023		conf->class = class_default;
1024
1025	<	if (conf->type == CONF_CLIENT)
1026	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1025	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1026	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1027		"Warning *** Defaulting to default class for %s@%s",
1028		conf->user, conf->host);
1029		else
1030	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1030	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1031		"Warning *** Defaulting to default class for %s",
1032		conf->name);
1033		}
1626	–	else
1627	–	conf->class = class_find(class_name, 1);
1628	–
1629	–	if (conf->class == NULL)
1630	–	{
1631	–	if (conf->type == CONF_CLIENT)
1632	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1633	–	"Warning *** Defaulting to default class for %s@%s",
1634	–	conf->user, conf->host);
1635	–	else
1636	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1637	–	"Warning *** Defaulting to default class for %s",
1638	–	conf->name);
1639	–	conf->class = class_default;
1640	–	}
1034		}
1035
1036		/* yyerror()
#	Line 1649 | Line 1042 | conf_add_class_to_conf(struct MaskItem *
1042		void
1043		yyerror(const char *msg)
1044		{
1652	–	char newlinebuf[IRCD_BUFSIZE];
1653	–
1045		if (conf_parser_ctx.pass != 1)
1046		return;
1047
1048	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1049	<	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		void
1057		conf_error_report(const char *msg)
1058		{
1059	<	char newlinebuf[IRCD_BUFSIZE];
1060	<
1670	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1671	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1059	>	const char *p = stripws(linebuf);
1060	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1061		"\"%s\", line %u: %s: %s",
1062	<	conffilebuf, lineno + 1, msg, newlinebuf);
1062	>	conffilebuf, lineno, msg, p);
1063		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1064	<	conffilebuf, lineno + 1, msg, newlinebuf);
1064	>	conffilebuf, lineno, msg, p);
1065		}
1066
1067		/*
#	Line 1685 | Line 1074 | conf_error_report(const char *msg)
1074		* side effects - none
1075		* Originally written by Dianora (Diane, db@db.net)
1076		*/
1077	<	time_t
1077	>	uintmax_t
1078		valid_tkline(const char *data, const int minutes)
1079		{
1080		const unsigned char *p = (const unsigned char *)data;
1081		unsigned char tmpch = '\0';
1082	<	time_t result = 0;
1082	>	uintmax_t result = 0;
1083
1084		while ((tmpch = *p++))
1085		{
#	Line 1703 | Line 1092 | valid_tkline(const char *data, const int
1092
1093		/*
1094		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1095	<	* i.e. they specifically use 0, I am going to return 1 instead
1096	<	* as a return value of non-zero is used to flag it as a temporary kline
1095	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1096	>	* value of non-zero is used to flag it as a temporary kline
1097		*/
1098		if (result == 0)
1099		result = 1;
#	Line 1713 | Line 1102 | valid_tkline(const char *data, const int
1102		* If the incoming time is in seconds convert it to minutes for the purpose
1103		* of this calculation
1104		*/
1105	<	if (!minutes)
1105	>	if (minutes == 0)
1106		result = result / 60;
1107
1108		if (result > MAX_TDKLINE_TIME)
1109		result = MAX_TDKLINE_TIME;
1110
1111	<	result = result * 60;  /* turn it into seconds */
1111	>	result = result * 60;  /* Turn it into seconds */
1112
1113		return result;
1114		}
#	Line 1730 | Line 1119 | valid_tkline(const char *data, const int
1119		* outputs      - 1 if valid, else 0
1120		* side effects - none
1121		*/
1122	<	int
1122	>	bool
1123		valid_wild_card_simple(const char *data)
1124		{
1125		const unsigned char *p = (const unsigned char *)data;
1126		unsigned char tmpch = '\0';
1127	<	int nonwild = 0;
1127	>	unsigned int nonwild = 0, wild = 0;
1128
1129		while ((tmpch = *p++))
1130		{
1131	<	if (tmpch == '\\')
1131	>	if (tmpch == '\\' && *p)
1132		{
1133		++p;
1134	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1135	<	return 1;
1134	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1135	>	return true;
1136		}
1137		else if (!IsMWildChar(tmpch))
1138		{
1139	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1140	<	return 1;
1139	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1140	>	return true;
1141		}
1142	+	else
1143	+	++wild;
1144		}
1145
1146	<	return 0;
1146	>	return wild == 0;
1147		}
1148
1149		/* valid_wild_card()
#	Line 1763 | Line 1154 | valid_wild_card_simple(const char *data)
1154		* output       - 0 if not valid, 1 if valid
1155		* side effects - NOTICE is given to source_p if warn is 1
1156		*/
1157	<	int
1158	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1157	>	bool
1158	>	valid_wild_card(int count, ...)
1159		{
1160	<	char tmpch;
1161	<	int nonwild = 0;
1160	>	unsigned char tmpch = '\0';
1161	>	unsigned int nonwild = 0;
1162		va_list args;
1163
1164		/*
#	Line 1786 | Line 1177 | valid_wild_card(struct Client *source_p,
1177
1178		while (count--)
1179		{
1180	<	const char *p = va_arg(args, const char *);
1180	>	const unsigned char *p = va_arg(args, const unsigned char *);
1181		if (p == NULL)
1182		continue;
1183
#	Line 1798 | Line 1189 | valid_wild_card(struct Client *source_p,
1189		* If we find enough non-wild characters, we can
1190		* break - no point in searching further.
1191		*/
1192	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1192	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1193		{
1194		va_end(args);
1195	<	return 1;
1195	>	return true;
1196		}
1197		}
1198		}
1199		}
1200
1810	–	if (warn)
1811	–	sendto_one_notice(source_p, &me,
1812	–	":Please include at least %d non-wildcard characters with the mask",
1813	–	ConfigFileEntry.min_nonwildcard);
1201		va_end(args);
1202	<	return 0;
1202	>	return false;
1203		}
1204
1205		/* XXX should this go into a separate file ? -Dianora */
#	Line 1829 | Line 1216 | valid_wild_card(struct Client *source_p,
1216		*              - pointer to target_server to parse into if non NULL
1217		*              - pointer to reason to parse into
1218		*
1219	<	* output       - 1 if valid, -1 if not valid
1219	>	* output       - 1 if valid, 0 if not valid
1220		* side effects - A generalised k/d/x etc. line parser,
1221		*               "ALINE [time] user@host|string [ON] target :reason"
1222		*                will parse returning a parsed user, host if
#	Line 1845 | Line 1232 | valid_wild_card(struct Client *source_p,
1232		*
1233		* - Dianora
1234		*/
1235	<	int
1236	<	parse_aline(const char *cmd, struct Client *source_p,
1850	<	int parc, char **parv,
1851	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1852	<	char **target_server, char **reason)
1235	>	bool
1236	>	parse_aline(const char *cmd, struct Client *source_p, int parc, char **parv, struct aline_ctx *aline)
1237		{
1238	<	int found_tkline_time=0;
1239	<	static char def_reason[] = "No Reason";
1240	<	static char user[USERLEN*4+1];
1857	<	static char host[HOSTLEN*4+1];
1238	>	static char default_reason[] = CONF_NOREASON;
1239	>	static char user[USERLEN * 2 + 1];
1240	>	static char host[HOSTLEN * 2 + 1];
1241
1242	<	parv++;
1243	<	parc--;
1242	>	++parv;
1243	>	--parc;
1244
1245	<	found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1863	<
1864	<	if (found_tkline_time != 0)
1245	>	if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1246		{
1247	<	parv++;
1248	<	parc--;
1868	<
1869	<	if (tkline_time != NULL)
1870	<	*tkline_time = found_tkline_time;
1871	<	else
1872	<	{
1873	<	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1874	<	return -1;
1875	<	}
1247	>	++parv;
1248	>	--parc;
1249		}
1250
1251		if (parc == 0)
1252		{
1253		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1254	<	return -1;
1254	>	return false;
1255		}
1256
1257	<	if (h_p == NULL)
1258	<	*up_p = *parv;
1257	>	if (aline->simple_mask == true)
1258	>	{
1259	>	aline->mask = *parv;
1260	>	aline->user = NULL;
1261	>	aline->host = NULL;
1262	>	}
1263		else
1264		{
1265	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1266	<	return -1;
1265	>	struct split_nuh_item nuh;
1266	>
1267	>	nuh.nuhmask  = *parv;
1268	>	nuh.nickptr  = NULL;
1269	>	nuh.userptr  = user;
1270	>	nuh.hostptr  = host;
1271	>
1272	>	nuh.nicksize = 0;
1273	>	nuh.usersize = sizeof(user);
1274	>	nuh.hostsize = sizeof(host);
1275	>
1276	>	split_nuh(&nuh);
1277
1278	<	*up_p = user;
1279	<	*h_p = host;
1278	>	aline->mask = NULL;
1279	>	aline->user = user;
1280	>	aline->host = host;
1281		}
1282
1283	<	parc--;
1284	<	parv++;
1283	>	++parv;
1284	>	--parc;
1285
1286	<	if (parc != 0)
1286	>	if (parc)
1287		{
1288		if (irccmp(*parv, "ON") == 0)
1289		{
1290	<	parc--;
1291	<	parv++;
1904	<
1905	<	if (target_server == NULL)
1906	<	{
1907	<	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1908	<	return -1;
1909	<	}
1290	>	++parv;
1291	>	--parc;
1292
1293		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1294		{
1295		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1296	<	return -1;
1296	>	return false;
1297		}
1298
1299		if (parc == 0 || EmptyString(*parv))
1300		{
1301		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1302	<	return -1;
1302	>	return false;
1303		}
1304
1305	<	*target_server = *parv;
1306	<	parc--;
1307	<	parv++;
1926	<	}
1927	<	else
1928	<	{
1929	<	/* Make sure target_server *is* NULL if no ON server found
1930	<	* caller probably NULL'd it first, but no harm to do it again -db
1931	<	*/
1932	<	if (target_server != NULL)
1933	<	*target_server = NULL;
1934	<	}
1935	<	}
1936	<
1937	<	if (h_p != NULL)
1938	<	{
1939	<	if (strchr(user, '!') != NULL)
1940	<	{
1941	<	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1942	<	return -1;
1943	<	}
1944	<
1945	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1946	<	return -1;
1947	<	}
1948	<	else
1949	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1950	<	return -1;
1951	<
1952	<	if (reason != NULL)
1953	<	{
1954	<	if (parc != 0 && !EmptyString(*parv))
1955	<	{
1956	<	*reason = *parv;
1957	<	if (!valid_comment(source_p, *reason, 1))
1958	<	return -1;
1305	>	aline->server = *parv;
1306	>	++parv;
1307	>	--parc;
1308		}
1309		else
1310	<	*reason = def_reason;
1962	<	}
1963	<
1964	<	return 1;
1965	<	}
1966	<
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;
1310	>	aline->server = NULL;
1311		}
1312
1313	<	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
1313	>	if (aline->add == true)
1314		{
1315	<	/* Try to find user@host mask from nick */
1316	<	/* 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)
2021	<	return 0;
2022	<
2023	<	if (IsExemptKline(target_p))
2024	<	{
2025	<	if (!IsServer(source_p))
2026	<	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2027	<	return 0;
2028	<	}
2029	<
2030	<	/*
2031	<	* turn the "user" bit into "*user", blow away '~'
2032	<	* if found in original user name (non-idented)
2033	<	*/
2034	<	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2035	<
2036	<	if (target_p->username[0] == '~')
2037	<	luser[0] = '*';
2038	<
2039	<	if (target_p->sockhost[0] == '\0' ||
2040	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2041	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1315	>	if (parc == 0 || EmptyString(*parv))
1316	>	aline->reason = default_reason;
1317		else
1318	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2044	<	return 1;
1318	>	aline->reason = *parv;
1319		}
1320
1321	<	return 0;
2048	<	}
2049	<
2050	<	/* valid_comment()
2051	<	*
2052	<	* inputs       - pointer to client
2053	<	*              - pointer to comment
2054	<	* output       - 0 if no valid comment,
2055	<	*              - 1 if valid
2056	<	* side effects - truncates reason where necessary
2057	<	*/
2058	<	int
2059	<	valid_comment(struct Client *source_p, char *comment, int warn)
2060	<	{
2061	<	if (strlen(comment) > REASONLEN)
2062	<	comment[REASONLEN-1] = '\0';
2063	<
2064	<	return 1;
1321	>	return true;
1322		}
1323
1324		/* match_conf_password()
#	Line 2071 | Line 1328 | valid_comment(struct Client *source_p, c
1328		* output       - 1 or 0 if match
1329		* side effects - none
1330		*/
1331	<	int
1331	>	bool
1332		match_conf_password(const char *password, const struct MaskItem *conf)
1333		{
1334		const char *encr = NULL;
1335
1336		if (EmptyString(password) || EmptyString(conf->passwd))
1337	<	return 0;
1337	>	return false;
1338
1339		if (conf->flags & CONF_FLAGS_ENCRYPTED)
1340		encr = crypt(password, conf->passwd);
1341		else
1342		encr = password;
1343
1344	<	return encr && !strcmp(encr, conf->passwd);
2088	<	}
2089	<
2090	<	/*
2091	<	* cluster_a_line
2092	<	*
2093	<	* inputs       - client sending the cluster
2094	<	*              - command name "KLINE" "XLINE" etc.
2095	<	*              - capab -- CAP_KLN etc. from server.h
2096	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2097	<	*              - pattern and args to send along
2098	<	* output       - none
2099	<	* side effects - Take source_p send the pattern with args given
2100	<	*                along to all servers that match capab and cluster type
2101	<	*/
2102	<	void
2103	<	cluster_a_line(struct Client *source_p, const char *command,
2104	<	int capab, int cluster_type, const char *pattern, ...)
2105	<	{
2106	<	va_list args;
2107	<	char buffer[IRCD_BUFSIZE];
2108	<	const dlink_node *ptr = NULL;
2109	<
2110	<	va_start(args, pattern);
2111	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
2112	<	va_end(args);
2113	<
2114	<	DLINK_FOREACH(ptr, cluster_items.head)
2115	<	{
2116	<	const struct MaskItem *conf = ptr->data;
2117	<
2118	<	if (conf->flags & cluster_type)
2119	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2120	<	"%s %s %s", command, conf->name, buffer);
2121	<	}
1344	>	return encr && strcmp(encr, conf->passwd) == 0;
1345		}
1346
1347		/*
#	Line 2156 | Line 1379 | split_nuh(struct split_nuh_item *const i
1379
1380		if (iptr->nickptr)
1381		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1382	+
1383		if (iptr->userptr)
1384		strlcpy(iptr->userptr, "*", iptr->usersize);
1385	+
1386		if (iptr->hostptr)
1387		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1388
#	Line 2165 | Line 1390 | split_nuh(struct split_nuh_item *const i
1390		{
1391		*p = '\0';
1392
1393	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1393	>	if (iptr->nickptr && *iptr->nuhmask)
1394		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1395
1396		if ((q = strchr(++p, '@')))
1397		{
1398		*q++ = '\0';
1399
1400	<	if (*p != '\0')
1400	>	if (*p)
1401		strlcpy(iptr->userptr, p, iptr->usersize);
1402
1403	<	if (*q != '\0')
1403	>	if (*q)
1404		strlcpy(iptr->hostptr, q, iptr->hostsize);
1405		}
1406		else
1407		{
1408	<	if (*p != '\0')
1408	>	if (*p)
1409		strlcpy(iptr->userptr, p, iptr->usersize);
1410		}
1411		}
#	Line 2192 | Line 1417 | split_nuh(struct split_nuh_item *const i
1417		/* if found a @ */
1418		*p++ = '\0';
1419
1420	<	if (*iptr->nuhmask != '\0')
1420	>	if (*iptr->nuhmask)
1421		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1422
1423	<	if (*p != '\0')
1423	>	if (*p)
1424		strlcpy(iptr->hostptr, p, iptr->hostsize);
1425		}
1426		else
1427		{
1428	<	/* no @ found */
1429	<	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1428	>	/* No @ found */
1429	>	if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1430		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1431		else
1432		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);

Comparing ircd-hybrid/trunk/src/conf.c (property svn:keywords):
Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC vs.
Revision 9220 by michael, Sun Jan 26 11:18:56 2020 UTC

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

Diff Legend

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