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 9101 by michael, Wed Jan 1 09:58:45 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	>	memcpy(conf->addr, addr, sizeof(*conf->addr));
102		else
103	<	conf->dns_failed = 1;
103	>	conf->dns_failed = true;
104		}
105
106		/* conf_dns_lookup()
#	Line 144 | Line 112 | conf_dns_callback(void *vptr, const stru
112		static void
113		conf_dns_lookup(struct MaskItem *conf)
114		{
115	<	if (!conf->dns_pending)
115	>	if (conf->dns_pending == true)
116	>	return;
117	>
118	>	conf->dns_pending = true;
119	>
120	>	if (conf->aftype == AF_INET)
121	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
122	>	else
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
124	>	}
125	>
126	>	/* map_to_list()
127	>	*
128	>	* inputs       - ConfType conf
129	>	* output       - pointer to dlink_list to use
130	>	* side effects - none
131	>	*/
132	>	static dlink_list *
133	>	map_to_list(enum maskitem_type type)
134	>	{
135	>	switch (type)
136		{
137	<	conf->dns_pending = 1;
138	<	gethost_byname(conf_dns_callback, conf, conf->host);
137	>	case CONF_OPER:
138	>	return &operator_items;
139	>	break;
140	>	case CONF_SERVER:
141	>	return &connect_items;
142	>	break;
143	>	default:
144	>	return NULL;
145		}
146		}
147
148		struct MaskItem *
149		conf_make(enum maskitem_type type)
150		{
151	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
151	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
152		dlink_list *list = NULL;
153
154		conf->type   = type;
155	<	conf->active = 1;
155	>	conf->active = true;
156		conf->aftype = AF_INET;
157
158		if ((list = map_to_list(type)))
#	Line 169 | Line 163 | conf_make(enum maskitem_type type)
163		void
164		conf_free(struct MaskItem *conf)
165		{
166	<	dlink_node *ptr = NULL, *ptr_next = NULL;
166	>	dlink_node *node = NULL, *node_next = NULL;
167		dlink_list *list = NULL;
168
169	<	if (conf->node.next)
170	<	if ((list = map_to_list(conf->type)))
177	<	dlinkDelete(&conf->node, list);
169	>	if ((list = map_to_list(conf->type)))
170	>	dlinkFindDelete(list, conf);
171
172	<	MyFree(conf->name);
172	>	xfree(conf->name);
173
174	<	if (conf->dns_pending)
174	>	if (conf->dns_pending == true)
175		delete_resolver_queries(conf);
176		if (conf->passwd)
177		memset(conf->passwd, 0, strlen(conf->passwd));
#	Line 187 | Line 180 | conf_free(struct MaskItem *conf)
180
181		conf->class = NULL;
182
183	<	MyFree(conf->passwd);
184	<	MyFree(conf->spasswd);
185	<	MyFree(conf->reason);
186	<	MyFree(conf->certfp);
187	<	MyFree(conf->user);
188	<	MyFree(conf->host);
189	<	#ifdef HAVE_LIBCRYPTO
190	<	MyFree(conf->cipher_list);
183	>	xfree(conf->passwd);
184	>	xfree(conf->spasswd);
185	>	xfree(conf->reason);
186	>	xfree(conf->certfp);
187	>	xfree(conf->whois);
188	>	xfree(conf->user);
189	>	xfree(conf->host);
190	>	xfree(conf->addr);
191	>	xfree(conf->bind);
192	>	xfree(conf->cipher_list);
193	>
194	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
195	>	{
196	>	xfree(node->data);
197	>	dlinkDelete(node, &conf->hub_list);
198	>	free_dlink_node(node);
199	>	}
200	>
201	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
202	>	{
203	>	xfree(node->data);
204	>	dlinkDelete(node, &conf->leaf_list);
205	>	free_dlink_node(node);
206	>	}
207	>
208	>	xfree(conf);
209	>	}
210	>
211	>	/* attach_iline()
212	>	*
213	>	* inputs       - client pointer
214	>	*              - conf pointer
215	>	* output       -
216	>	* side effects - do actual attach
217	>	*/
218	>	static int
219	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
220	>	{
221	>	const struct ClassItem *const class = conf->class;
222	>	bool a_limit_reached = false;
223	>
224	>	struct ip_entry *ipcache = ipcache_record_find_or_add(&client_p->ip);
225	>	++ipcache->count_local;
226	>	AddFlag(client_p, FLAGS_IPHASH);
227	>
228	>	if (class->max_total && class->ref_count >= class->max_total)
229	>	a_limit_reached = true;
230	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
231	>	a_limit_reached = true;
232	>	else if (class->max_perip_global &&
233	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
234	>	a_limit_reached = true;
235	>
236	>	if (a_limit_reached == true)
237	>	{
238	>	if (!IsConfExemptLimits(conf))
239	>	return TOO_MANY;   /* Already at maximum allowed */
240	>
241	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
242	>	"but you have exceed_limit = yes;");
243	>	}
244
245	<	if (conf->rsa_public_key)
246	<	RSA_free(conf->rsa_public_key);
247	<	#endif
248	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
245	>	return conf_attach(client_p, conf);
246	>	}
247	>
248	>	/* verify_access()
249	>	*
250	>	* inputs       - pointer to client to verify
251	>	* output       - 0 if success -'ve if not
252	>	* side effect  - find the first (best) I line to attach.
253	>	*/
254	>	static int
255	>	verify_access(struct Client *client_p)
256	>	{
257	>	struct MaskItem *conf;
258	>
259	>	if (HasFlag(client_p, FLAGS_GOTID))
260	>	conf = find_address_conf(client_p->host, client_p->username, &client_p->ip,
261	>	client_p->connection->password);
262	>	else
263		{
264	<	MyFree(ptr->data);
265	<	dlinkDelete(ptr, &conf->hub_list);
266	<	free_dlink_node(ptr);
264	>	char non_ident[USERLEN + 1] = "~";
265	>
266	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
267	>	conf = find_address_conf(client_p->host, non_ident, &client_p->ip,
268	>	client_p->connection->password);
269		}
270
271	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
271	>	if (conf == NULL)
272	>	return NOT_AUTHORIZED;
273	>
274	>	assert(IsConfClient(conf) || IsConfKill(conf));
275	>
276	>	if (IsConfKill(conf))
277		{
278	<	MyFree(ptr->data);
279	<	dlinkDelete(ptr, &conf->leaf_list);
213	<	free_dlink_node(ptr);
278	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
279	>	return BANNED_CLIENT;
280		}
281
282	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
282	>	if (IsConfRedir(conf))
283		{
284	<	struct exempt *exptr = ptr->data;
284	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
285	>	conf->name ? conf->name : "",
286	>	conf->port);
287	>	return NOT_AUTHORIZED;
288	>	}
289
290	<	dlinkDelete(ptr, &conf->exempt_list);
291	<	MyFree(exptr->name);
292	<	MyFree(exptr->user);
293	<	MyFree(exptr->host);
294	<	MyFree(exptr);
290	>	if (IsConfDoSpoofIp(conf))
291	>	{
292	>	if (IsConfSpoofNotice(conf))
293	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
294	>	client_p->name, client_p->host, conf->name);
295	>
296	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
297		}
298
299	<	MyFree(conf);
299	>	return attach_iline(client_p, conf);
300		}
301
302		/* check_client()
#	Line 254 | Line 326 | check_client(struct Client *source_p)
326		case TOO_MANY:
327		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
328		"Too many on IP for %s (%s).",
329	<	get_client_name(source_p, SHOW_IP),
329	>	client_get_name(source_p, SHOW_IP),
330		source_p->sockhost);
331		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
332	<	get_client_name(source_p, SHOW_IP));
332	>	client_get_name(source_p, SHOW_IP));
333		++ServerStats.is_ref;
334		exit_client(source_p, "No more connections allowed on that IP");
335		break;
336
337		case I_LINE_FULL:
338		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
339	<	"auth{} block is full for %s (%s).",
340	<	get_client_name(source_p, SHOW_IP),
339	>	"auth {} block is full for %s (%s).",
340	>	client_get_name(source_p, SHOW_IP),
341		source_p->sockhost);
342		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
343	<	get_client_name(source_p, SHOW_IP));
343	>	client_get_name(source_p, SHOW_IP));
344		++ServerStats.is_ref;
345		exit_client(source_p, "No more connections allowed in your connection class");
346		break;
347
348		case NOT_AUTHORIZED:
277	–	++ServerStats.is_ref;
349		/* jdc - lists server name & port connections are on */
350		/*       a purely cosmetical change */
351		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
352	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
353	<	get_client_name(source_p, SHOW_IP),
354	<	source_p->sockhost,
355	<	source_p->localClient->listener->name,
356	<	source_p->localClient->listener->port);
357	<	ilog(LOG_TYPE_IRCD,
358	<	"Unauthorized client connection from %s on [%s/%u].",
359	<	get_client_name(source_p, SHOW_IP),
289	<	source_p->localClient->listener->name,
290	<	source_p->localClient->listener->port);
352	>	"Unauthorized client connection from %s on [%s/%u].",
353	>	client_get_name(source_p, SHOW_IP),
354	>	source_p->connection->listener->name,
355	>	source_p->connection->listener->port);
356	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
357	>	client_get_name(source_p, SHOW_IP),
358	>	source_p->connection->listener->name,
359	>	source_p->connection->listener->port);
360
361	+	++ServerStats.is_ref;
362		exit_client(source_p, "You are not authorized to use this server");
363		break;
364
365	<	case BANNED_CLIENT:
366	<	exit_client(source_p, "Banned");
367	<	++ServerStats.is_ref;
368	<	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;
365	>	case BANNED_CLIENT:
366	>	++ServerStats.is_ref;
367	>	exit_client(source_p, "Banned");
368	>	break;
369
370	<	for (i = 0; i < IP_HASH_SIZE; i++)
371	<	{
372	<	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	<	}
370	>	case 0:
371	>	default:
372	>	break;
373		}
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;
374
375	<	for (i = 0; i < IP_HASH_SIZE; i++)
637	<	{
638	<	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	<	}
375	>	return !(i < 0);
376		}
377
378	<	/* detach_conf()
379	<	*
380	<	* inputs       - pointer to client to detach
381	<	*              - 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.
378	>	/*! \brief Disassociate configuration from the client. Also removes a class
379	>	*         from the list if marked for deleting.
380	>	* \param client_p Client to operate on
381	>	* \param type     Type of conf to detach
382		*/
383		void
384	<	detach_conf(struct Client *client_p, enum maskitem_type type)
384	>	conf_detach(struct Client *client_p, enum maskitem_type type)
385		{
386	<	dlink_node *ptr = NULL, *ptr_next = NULL;
386	>	dlink_node *node, *node_next;
387
388	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
388	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
389		{
390	<	struct MaskItem *conf = ptr->data;
390	>	struct MaskItem *conf = node->data;
391
392		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
393		assert(conf->ref_count > 0);
#	Line 681 | Line 396 | detach_conf(struct Client *client_p, enu
396		if (!(conf->type & type))
397		continue;
398
399	<	dlinkDelete(ptr, &client_p->localClient->confs);
400	<	free_dlink_node(ptr);
399	>	dlinkDelete(node, &client_p->connection->confs);
400	>	free_dlink_node(node);
401
402		if (conf->type == CONF_CLIENT)
403	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
403	>	class_ip_limit_remove(conf->class, &client_p->ip);
404
405	<	if (--conf->class->ref_count == 0 && conf->class->active == 0)
405	>	if (--conf->class->ref_count == 0 && conf->class->active == false)
406		{
407		class_free(conf->class);
408		conf->class = NULL;
409		}
410
411	<	if (--conf->ref_count == 0 && conf->active == 0)
411	>	if (--conf->ref_count == 0 && conf->active == false)
412		conf_free(conf);
413		}
414		}
415
416	<	/* attach_conf()
417	<	*
418	<	* inputs       - client pointer
419	<	*              - conf pointer
420	<	* 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...
416	>	/*! \brief Associate a specific configuration entry to a *local* client (this
417	>	*         is the one which used in accepting the connection). Note, that this
418	>	*         automatically changes the attachment if there was an old one.
419	>	* \param client_p Client to attach the conf to
420	>	* \param conf Configuration record to attach
421		*/
422		int
423	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
423	>	conf_attach(struct Client *client_p, struct MaskItem *conf)
424		{
425	<	if (dlinkFind(&client_p->localClient->confs, conf))
425	>	if (dlinkFind(&client_p->connection->confs, conf))
426		return 1;
427
428		if (conf->type == CONF_CLIENT)
429	<	if (cidr_limit_reached(IsConfExemptLimits(conf),
719	<	&client_p->localClient->ip, conf->class))
429	>	if (class_ip_limit_add(conf->class, &client_p->ip, IsConfExemptLimits(conf)) == true)
430		return TOO_MANY;    /* Already at maximum allowed */
431
432		conf->class->ref_count++;
433		conf->ref_count++;
434
435	<	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	<	}
435	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
436
437		return 0;
438		}
#	Line 774 | Line 449 | attach_connect_block(struct Client *clie
449		struct MaskItem *
450		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
451		{
452	<	dlink_node *ptr;
778	<	struct MaskItem* conf;
452	>	dlink_node *node = NULL;
453
454	<	DLINK_FOREACH(ptr, list->head)
454	>	DLINK_FOREACH(node, list->head)
455		{
456	<	conf = ptr->data;
456	>	struct MaskItem *conf = node->data;
457
458		if (conf->type == type)
459		{
460	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
461	<	!match(conf->name, name)))
788	<	return conf;
460	>	if (conf->name && !irccmp(conf->name, name))
461	>	return conf;
462		}
463		}
464
465		return NULL;
466		}
467
468	<	/* map_to_list()
469	<	*
470	<	* 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
468	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
469	>	* \param name Name to match
470	>	* \param compare Pointer to function to be used for string matching
471		*/
472		struct MaskItem *
473	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
846	<	const char *host, unsigned int flags)
473	>	connect_find(const char *name, int (*compare)(const char *, const char *))
474		{
475	<	dlink_node *ptr=NULL;
849	<	struct MaskItem *conf=NULL;
850	<	dlink_list *list_p = map_to_list(type);
475	>	dlink_node *node;
476
477	<	switch (type)
477	>	DLINK_FOREACH(node, connect_items.head)
478		{
479	<	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;
479	>	struct MaskItem *conf = node->data;
480
481	<	case CONF_XLINE:
482	<	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;
894	<
895	<	if ((name != NULL) && !match(name, conf->name))
896	<	return conf;
897	<	else if ((host != NULL) && !match(host, conf->host))
898	<	return conf;
899	<	}
900	<	break;
901	<
902	<	default:
903	<	break;
481	>	if (!compare(name, conf->name))
482	>	return conf;
483		}
484	+
485		return NULL;
486		}
487
#	Line 915 | Line 495 | find_matching_name_conf(enum maskitem_ty
495		* side effects - looks for an exact match on name field
496		*/
497		struct MaskItem *
498	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
919	<	const char *user, const char *host)
498	>	operator_find(const struct Client *who, const char *name)
499		{
500	<	dlink_node *ptr = NULL;
922	<	struct MaskItem *conf;
923	<	dlink_list *list_p = map_to_list(type);
500	>	dlink_node *node = NULL;
501
502	<	switch(type)
502	>	DLINK_FOREACH(node, operator_items.head)
503		{
504	<	case CONF_XLINE:
928	<	case CONF_ULINE:
929	<	case CONF_NRESV:
930	<	case CONF_CRESV:
931	<
932	<	DLINK_FOREACH(ptr, list_p->head)
933	<	{
934	<	conf = ptr->data;
504	>	struct MaskItem *conf = node->data;
505
506	<	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)
506	>	if (!irccmp(conf->name, name))
507		{
508	<	conf = ptr->data;
509	<
956	<	if (EmptyString(conf->name))
957	<	continue;
508	>	if (!who)
509	>	return conf;
510
511	<	if (!irccmp(conf->name, name))
511	>	if (!match(conf->user, who->username))
512		{
513	<	if (!who)
962	<	return conf;
963	<	if (EmptyString(conf->user) || EmptyString(conf->host))
964	<	return NULL;
965	<	if (!match(conf->user, who->username))
513	>	switch (conf->htype)
514		{
515	<	switch (conf->htype)
516	<	{
517	<	case HM_HOST:
518	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
515	>	case HM_HOST:
516	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
517	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
518	>	return conf;
519	>	break;
520	>	case HM_IPV4:
521	>	if (who->ip.ss.ss_family == AF_INET)
522	>	if (match_ipv4(&who->ip, conf->addr, conf->bits))
523	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
524	>	return conf;
525	>	break;
526	>	case HM_IPV6:
527	>	if (who->ip.ss.ss_family == AF_INET6)
528	>	if (match_ipv6(&who->ip, conf->addr, conf->bits))
529		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
530		return conf;
531	<	break;
532	<	case HM_IPV4:
533	<	if (who->localClient->aftype == AF_INET)
976	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
977	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
978	<	return conf;
979	<	break;
980	<	#ifdef IPV6
981	<	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	<	}
531	>	break;
532	>	default:
533	>	assert(0);
534		}
535		}
536		}
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;
537		}
538
539		return NULL;
540		}
541
1025	–	/* 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	–
542		/* set_default_conf()
543		*
544		* inputs       - NONE
#	Line 1071 | Line 556 | set_default_conf(void)
556		*/
557		assert(class_default == class_get_list()->tail->data);
558
559	<	#ifdef HAVE_LIBCRYPTO
560	<	ServerInfo.rsa_private_key = NULL;
561	<	ServerInfo.rsa_private_key_file = NULL;
562	<	#endif
563	<
564	<	/* 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;
559	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
560	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
561	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
562	>	ConfigServerInfo.max_nick_length = 9;
563	>	ConfigServerInfo.max_topic_length = 80;
564	>	ConfigServerInfo.hub = 0;
565
566	<	log_del_all();
566	>	log_iterate(log_free);
567
568	<	ConfigLoggingEntry.use_logging = 1;
568	>	ConfigLog.use_logging = 1;
569
570		ConfigChannel.disable_fake_channels = 0;
571	<	ConfigChannel.knock_delay = 300;
571	>	ConfigChannel.invite_client_count = 10;
572	>	ConfigChannel.invite_client_time = 300;
573	>	ConfigChannel.invite_delay_channel = 5;
574	>	ConfigChannel.invite_expire_time = 1800;
575	>	ConfigChannel.knock_client_count = 1;
576	>	ConfigChannel.knock_client_time = 300;
577		ConfigChannel.knock_delay_channel = 60;
578	<	ConfigChannel.max_chans_per_user = 25;
579	<	ConfigChannel.max_chans_per_oper = 50;
580	<	ConfigChannel.max_bans = 25;
581	<	ConfigChannel.default_split_user_count = 0;
582	<	ConfigChannel.default_split_server_count = 0;
583	<	ConfigChannel.no_join_on_split = 0;
1114	<	ConfigChannel.no_create_on_split = 0;
578	>	ConfigChannel.max_channels = 25;
579	>	ConfigChannel.max_invites = 20;
580	>	ConfigChannel.max_bans = 100;
581	>	ConfigChannel.max_bans_large = 500;
582	>	ConfigChannel.default_join_flood_count = 18;
583	>	ConfigChannel.default_join_flood_time = 6;
584
585		ConfigServerHide.flatten_links = 0;
586	<	ConfigServerHide.links_delay = 300;
586	>	ConfigServerHide.flatten_links_delay = 300;
587		ConfigServerHide.hidden = 0;
588		ConfigServerHide.hide_servers = 0;
589		ConfigServerHide.hide_services = 0;
#	Line 1122 | Line 591 | set_default_conf(void)
591		ConfigServerHide.hide_server_ips = 0;
592		ConfigServerHide.disable_remote_commands = 0;
593
594	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
595	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
596	<	ConfigFileEntry.cycle_on_host_change = 1;
597	<	ConfigFileEntry.glines = 0;
598	<	ConfigFileEntry.gline_time = 12 * 3600;
599	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
600	<	ConfigFileEntry.gline_min_cidr = 16;
601	<	ConfigFileEntry.gline_min_cidr6 = 48;
602	<	ConfigFileEntry.invisible_on_connect = 1;
603	<	ConfigFileEntry.tkline_expire_notices = 1;
604	<	ConfigFileEntry.hide_spoof_ips = 1;
605	<	ConfigFileEntry.ignore_bogus_ts = 0;
606	<	ConfigFileEntry.disable_auth = 0;
607	<	ConfigFileEntry.kill_chase_time_limit = 90;
608	<	ConfigFileEntry.default_floodcount = 8;
609	<	ConfigFileEntry.failed_oper_notice = 1;
610	<	ConfigFileEntry.dots_in_ident = 0;
611	<	ConfigFileEntry.min_nonwildcard = 4;
612	<	ConfigFileEntry.min_nonwildcard_simple = 3;
613	<	ConfigFileEntry.max_accept = 20;
614	<	ConfigFileEntry.anti_nick_flood = 0;
615	<	ConfigFileEntry.max_nick_time = 20;
616	<	ConfigFileEntry.max_nick_changes = 5;
617	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
618	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
619	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
620	<	ConfigFileEntry.warn_no_nline = 1;
621	<	ConfigFileEntry.stats_o_oper_only = 0;
622	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
623	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
624	<	ConfigFileEntry.stats_P_oper_only = 0;
625	<	ConfigFileEntry.stats_u_oper_only = 0;
626	<	ConfigFileEntry.caller_id_wait = 60;
627	<	ConfigFileEntry.opers_bypass_callerid = 0;
628	<	ConfigFileEntry.pace_wait = 10;
629	<	ConfigFileEntry.pace_wait_simple = 1;
630	<	ConfigFileEntry.short_motd = 0;
631	<	ConfigFileEntry.ping_cookie = 0;
632	<	ConfigFileEntry.no_oper_flood = 0;
633	<	ConfigFileEntry.true_no_oper_flood = 0;
634	<	ConfigFileEntry.oper_pass_resv = 1;
635	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
636	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
637	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
638	<	UMODE_OPERWALL | UMODE_WALLOP;
639	<	ConfigFileEntry.use_egd = 0;
640	<	ConfigFileEntry.egdpool_path = NULL;
1172	<	ConfigFileEntry.throttle_time = 10;
594	>	ConfigGeneral.away_count = 2;
595	>	ConfigGeneral.away_time = 10;
596	>	ConfigGeneral.max_watch = 50;
597	>	ConfigGeneral.whowas_history_length = 15000;
598	>	ConfigGeneral.cycle_on_host_change = 1;
599	>	ConfigGeneral.dline_min_cidr = 16;
600	>	ConfigGeneral.dline_min_cidr6 = 48;
601	>	ConfigGeneral.kline_min_cidr = 16;
602	>	ConfigGeneral.kline_min_cidr6 = 48;
603	>	ConfigGeneral.invisible_on_connect = 1;
604	>	ConfigGeneral.disable_auth = 0;
605	>	ConfigGeneral.kill_chase_time_limit = 90;
606	>	ConfigGeneral.default_floodcount = 8;
607	>	ConfigGeneral.default_floodtime = 1;
608	>	ConfigGeneral.failed_oper_notice = 1;
609	>	ConfigGeneral.dots_in_ident = 0;
610	>	ConfigGeneral.min_nonwildcard = 4;
611	>	ConfigGeneral.min_nonwildcard_simple = 3;
612	>	ConfigGeneral.max_accept = 50;
613	>	ConfigGeneral.anti_nick_flood = 0;
614	>	ConfigGeneral.max_nick_time = 20;
615	>	ConfigGeneral.max_nick_changes = 5;
616	>	ConfigGeneral.anti_spam_exit_message_time = 0;
617	>	ConfigGeneral.ts_warn_delta = 30;
618	>	ConfigGeneral.ts_max_delta = 600;
619	>	ConfigGeneral.warn_no_connect_block = 1;
620	>	ConfigGeneral.stats_e_disabled = 0;
621	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
622	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
623	>	ConfigGeneral.stats_o_oper_only = 1;
624	>	ConfigGeneral.stats_m_oper_only = 1;
625	>	ConfigGeneral.stats_P_oper_only = 0;
626	>	ConfigGeneral.stats_u_oper_only = 0;
627	>	ConfigGeneral.caller_id_wait = 60;
628	>	ConfigGeneral.opers_bypass_callerid = 1;
629	>	ConfigGeneral.pace_wait = 10;
630	>	ConfigGeneral.pace_wait_simple = 1;
631	>	ConfigGeneral.short_motd = 0;
632	>	ConfigGeneral.ping_cookie = 0;
633	>	ConfigGeneral.no_oper_flood = 0;
634	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
635	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
636	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
637	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
638	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
639	>	ConfigGeneral.throttle_count = 1;
640	>	ConfigGeneral.throttle_time = 1;
641		}
642
643		static void
644		validate_conf(void)
645		{
646	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
647	<	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);
646	>	if (EmptyString(ConfigServerInfo.network_name))
647	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
648
649	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
649	>	if (EmptyString(ConfigServerInfo.network_desc))
650	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
651		}
652
653		/* read_conf()
#	Line 1202 | Line 659 | validate_conf(void)
659		static void
660		read_conf(FILE *file)
661		{
662	<	lineno = 0;
662	>	lineno = 1;
663
664	<	set_default_conf(); /* Set default values prior to conf parsing */
664	>	set_default_conf();  /* Set default values prior to conf parsing */
665		conf_parser_ctx.pass = 1;
666	<	yyparse();          /* pick up the classes first */
666	>	yyparse();  /* Pick up the classes first */
667
668		rewind(file);
669
670		conf_parser_ctx.pass = 2;
671	<	yyparse();          /* Load the values from the conf */
672	<	validate_conf();    /* Check to make sure some values are still okay. */
673	<	/* Some global values are also loaded here. */
674	<	class_delete_marked();      /* Make sure classes are valid */
671	>	yyparse();  /* Load the values from the conf */
672	>	validate_conf();  /* Check to make sure some values are still okay. */
673	>	/* Some global values are also loaded here. */
674	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
675	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
676	>	}
677	>
678	>	/* conf_rehash()
679	>	*
680	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
681	>	* as a result of an operator issuing this command, else assume it has been
682	>	* called as a result of the server receiving a HUP signal.
683	>	*/
684	>	void
685	>	conf_rehash(bool sig)
686	>	{
687	>	if (sig == true)
688	>	{
689	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
690	>	"Got signal SIGHUP, reloading configuration file(s)");
691	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
692	>	}
693	>
694	>	restart_resolver();
695	>
696	>	/* don't close listeners until we know we can go ahead with the rehash */
697	>
698	>	read_conf_files(false);
699	>
700	>	load_conf_modules();
701	>	check_conf_klines();
702		}
703
704		/* lookup_confhost()
#	Line 1227 | Line 711 | lookup_confhost(struct MaskItem *conf)
711		{
712		struct addrinfo hints, *res;
713
714	<	/* Do name lookup now on hostnames given and store the
714	>	/*
715	>	* Do name lookup now on hostnames given and store the
716		* ip numbers in conf structure.
717		*/
718		memset(&hints, 0, sizeof(hints));
#	Line 1246 | Line 731 | lookup_confhost(struct MaskItem *conf)
731
732		assert(res);
733
734	<	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
735	<	conf->addr.ss_len = res->ai_addrlen;
1251	<	conf->addr.ss.ss_family = res->ai_family;
734	>	memcpy(conf->addr, res->ai_addr, res->ai_addrlen);
735	>	conf->addr->ss_len = res->ai_addrlen;
736
737		freeaddrinfo(res);
738		}
#	Line 1261 | Line 745 | lookup_confhost(struct MaskItem *conf)
745		* side effects - none
746		*/
747		int
748	<	conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
748	>	conf_connect_allowed(struct irc_ssaddr *addr)
749		{
750	<	struct ip_entry *ip_found;
751	<	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;
750	>	struct ip_entry *ip_found = NULL;
751	>	const struct MaskItem *conf = find_dline_conf(addr);
752
753		if (conf)
754	+	{
755	+	/* DLINE exempt also gets you out of static limits/pacing... */
756	+	if (conf->type == CONF_EXEMPT)
757	+	return 0;
758		return BANNED_CLIENT;
759	+	}
760
761	<	ip_found = find_or_add_ip(addr);
761	>	ip_found = ipcache_record_find_or_add(addr);
762
763	<	if ((CurrentTime - ip_found->last_attempt) <
1279	<	ConfigFileEntry.throttle_time)
763	>	if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
764		{
765	<	ip_found->last_attempt = CurrentTime;
766	<	return TOO_FAST;
765	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
766	>	return TOO_FAST;
767	>
768	>	++ip_found->connection_count;
769		}
770	+	else
771	+	ip_found->connection_count = 1;
772
773	<	ip_found->last_attempt = CurrentTime;
773	>	ip_found->last_attempt = event_base->time.sec_monotonic;
774		return 0;
775		}
776
#	Line 1294 | Line 782 | conf_connect_allowed(struct irc_ssaddr *
782		*                This is an event started off in ircd.c
783		*/
784		void
785	<	cleanup_tklines(void *notused)
785	>	cleanup_tklines(void *unused)
786		{
787		hostmask_expire_temporary();
788	<	expire_tklines(&xconf_items);
789	<	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;
788	>	gecos_expire();
789	>	resv_expire();
790		}
791
792		/*
793	<	* Input: A client to find the active oper{} name for.
793	>	* Input: A client to find the active operator {} name for.
794		* Output: The nick!user@host{oper} of the oper.
795		*         "oper" is server name for remote opers
796		* Side effects: None.
#	Line 1395 | Line 798 | oper_privs_as_string(const unsigned int
798		const char *
799		get_oper_name(const struct Client *client_p)
800		{
801	<	const dlink_node *cnode = NULL;
802	<	/* +5 for !,@,{,} and null */
803	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
801	>	static char buffer[IRCD_BUFSIZE];
802	>
803	>	if (IsServer(client_p))
804	>	return client_p->name;
805
806		if (MyConnect(client_p))
807		{
808	<	if ((cnode = client_p->localClient->confs.head))
808	>	const dlink_node *const node = client_p->connection->confs.head;
809	>
810	>	if (node)
811		{
812	<	const struct MaskItem *conf = cnode->data;
812	>	const struct MaskItem *const conf = node->data;
813
814	<	if (IsConfOperator(conf))
814	>	if (conf->type == CONF_OPER)
815		{
816		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
817		client_p->username, client_p->host, conf->name);
#	Line 1413 | Line 819 | get_oper_name(const struct Client *clien
819		}
820		}
821
822	<	/* Probably should assert here for now. If there is an oper out there
823	<	* with no oper{} conf attached, it would be good for us to know...
822	>	/*
823	>	* Probably should assert here for now. If there is an oper out there
824	>	* with no operator {} conf attached, it would be good for us to know...
825		*/
826	<	assert(0); /* Oper without oper conf! */
826	>	assert(0);  /* Oper without oper conf! */
827		}
828
829		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1424 | Line 831 | get_oper_name(const struct Client *clien
831		return buffer;
832		}
833
834	+	/* clear_out_old_conf()
835	+	*
836	+	* inputs       - none
837	+	* output       - none
838	+	* side effects - Clear out the old configuration
839	+	*/
840	+	static void
841	+	clear_out_old_conf(void)
842	+	{
843	+	dlink_node *node = NULL, *node_next = NULL;
844	+	dlink_list *free_items [] = {
845	+	&connect_items, &operator_items, NULL
846	+	};
847	+
848	+	dlink_list ** iterator = free_items; /* C is dumb */
849	+
850	+	/* We only need to free anything allocated by yyparse() here.
851	+	* Resetting structs, etc, is taken care of by set_default_conf().
852	+	*/
853	+
854	+	for (; *iterator; iterator++)
855	+	{
856	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
857	+	{
858	+	struct MaskItem *conf = node->data;
859	+
860	+	conf->active = false;
861	+	dlinkDelete(&conf->node, *iterator);
862	+
863	+	if (!conf->ref_count)
864	+	conf_free(conf);
865	+	}
866	+	}
867	+
868	+	/*
869	+	* Don't delete the class table, rather mark all entries for deletion.
870	+	* The table is cleaned up by class_delete_marked. - avalon
871	+	*/
872	+	class_mark_for_deletion();
873	+
874	+	clear_out_address_conf();
875	+
876	+	modules_conf_clear();  /* Clear modules {} items */
877	+
878	+	motd_clear();  /* Clear motd {} items and re-cache default motd */
879	+
880	+	cluster_clear();  /* Clear cluster {} items */
881	+
882	+	gecos_clear();  /* Clear gecos {} items */
883	+
884	+	resv_clear();  /* Clear resv {} items */
885	+
886	+	service_clear();  /* Clear service {} items */
887	+
888	+	shared_clear();  /* Clear shared {} items */
889	+
890	+	pseudo_clear();  /* Clear pseudo {} items */
891	+
892	+	/* Clean out ConfigServerInfo */
893	+	xfree(ConfigServerInfo.description);
894	+	ConfigServerInfo.description = NULL;
895	+	xfree(ConfigServerInfo.network_name);
896	+	ConfigServerInfo.network_name = NULL;
897	+	xfree(ConfigServerInfo.network_desc);
898	+	ConfigServerInfo.network_desc = NULL;
899	+	xfree(ConfigServerInfo.rsa_private_key_file);
900	+	ConfigServerInfo.rsa_private_key_file = NULL;
901	+	xfree(ConfigServerInfo.ssl_certificate_file);
902	+	ConfigServerInfo.ssl_certificate_file = NULL;
903	+	xfree(ConfigServerInfo.ssl_dh_param_file);
904	+	ConfigServerInfo.ssl_dh_param_file = NULL;
905	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
906	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
907	+	xfree(ConfigServerInfo.ssl_cipher_list);
908	+	ConfigServerInfo.ssl_cipher_list = NULL;
909	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
910	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
911	+
912	+	/* Clean out ConfigAdminInfo */
913	+	xfree(ConfigAdminInfo.name);
914	+	ConfigAdminInfo.name = NULL;
915	+	xfree(ConfigAdminInfo.email);
916	+	ConfigAdminInfo.email = NULL;
917	+	xfree(ConfigAdminInfo.description);
918	+	ConfigAdminInfo.description = NULL;
919	+
920	+	/* Clean out ConfigServerHide */
921	+	xfree(ConfigServerHide.flatten_links_file);
922	+	ConfigServerHide.flatten_links_file = NULL;
923	+	xfree(ConfigServerHide.hidden_name);
924	+	ConfigServerHide.hidden_name = NULL;
925	+
926	+	/* Clean out listeners */
927	+	listener_close_marked();
928	+	}
929	+
930	+	static void
931	+	conf_handle_tls(bool cold)
932	+	{
933	+	if (tls_new_cred() == false)
934	+	{
935	+	if (cold == true)
936	+	{
937	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
938	+	exit(EXIT_FAILURE);
939	+	}
940	+	else
941	+	{
942	+	/* Failed to load new settings/certs, old ones remain active */
943	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
944	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
945	+	}
946	+	}
947	+	}
948	+
949		/* read_conf_files()
950		*
951		* inputs       - cold start YES or NO
#	Line 1431 | Line 953 | get_oper_name(const struct Client *clien
953		* side effects - read all conf files needed, ircd.conf kline.conf etc.
954		*/
955		void
956	<	read_conf_files(int cold)
956	>	read_conf_files(bool cold)
957		{
958	<	const char *filename;
959	<	char chanmodes[IRCD_BUFSIZE];
960	<	char chanlimit[IRCD_BUFSIZE];
958	>	const char *filename = NULL;
959	>	char chanmodes[IRCD_BUFSIZE] = "";
960	>	char chanlimit[IRCD_BUFSIZE] = "";
961
962		conf_parser_ctx.boot = cold;
963	<	filename = ConfigFileEntry.configfile;
963	>	filename = ConfigGeneral.configfile;
964
965		/* We need to know the initial filename for the yyerror() to report
966		FIXME: The full path is in conffilenamebuf first time since we
967	<	dont know anything else
967	>	don't know anything else
968
969		- Gozem 2002-07-21
970		*/
#	Line 1450 | Line 972 | read_conf_files(int cold)
972
973		if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
974		{
975	<	if (cold)
975	>	if (cold == true)
976		{
977		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
978		filename, strerror(errno));
979	<	exit(-1);
979	>	exit(EXIT_FAILURE);
980		}
981		else
982		{
983	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
983	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
984		"Unable to read configuration file '%s': %s",
985		filename, strerror(errno));
986		return;
987		}
988		}
989
990	<	if (!cold)
990	>	if (cold == false)
991		clear_out_old_conf();
992
993		read_conf(conf_parser_ctx.conf_file);
994		fclose(conf_parser_ctx.conf_file);
995
996	<	log_reopen_all();
997	<
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 */
996	>	log_iterate(log_reopen);
997	>	conf_handle_tls(cold);
998
999	<	/* We only need to free anything allocated by yyparse() here.
1000	<	* Resetting structs, etc, is taken care of by set_default_conf().
1520	<	*/
999	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1000	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1001
1002	<	for (; *iterator != NULL; iterator++)
1003	<	{
1004	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1005	<	{
1006	<	conf = ptr->data;
1007	<
1008	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1009	<
1010	<	/* XXX This is less than pretty */
1011	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1012	<	{
1013	<	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();
1553	<
1554	<	clear_out_address_conf();
1555	<
1556	<	/* clean out module paths */
1557	<	mod_clear_paths();
1558	<
1559	<	/* clean out ServerInfo */
1560	<	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;
1002	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1003	>	isupport_add("MAXLIST", chanmodes, -1);
1004	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1005	>	isupport_add("CHANTYPES", "#", -1);
1006	>
1007	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1008	>	ConfigChannel.max_channels);
1009	>	isupport_add("CHANLIMIT", chanlimit, -1);
1010	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstuCLMNORST");
1011	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1012	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1013	>	isupport_add("CHANMODES", chanmodes, -1);
1014		}
1015
1016		/* conf_add_class_to_conf()
#	Line 1608 | Line 1020 | clear_out_old_conf(void)
1020		* side effects - Add a class pointer to a conf
1021		*/
1022		void
1023	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1023	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1024		{
1025	<	if (class_name == NULL)
1025	>	if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1026		{
1027		conf->class = class_default;
1028
1029	<	if (conf->type == CONF_CLIENT)
1030	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1029	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1030	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1031		"Warning *** Defaulting to default class for %s@%s",
1032		conf->user, conf->host);
1033		else
1034	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1034	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1035		"Warning *** Defaulting to default class for %s",
1036		conf->name);
1037		}
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	–	}
1038		}
1039
1040		/* yyerror()
#	Line 1649 | Line 1046 | conf_add_class_to_conf(struct MaskItem *
1046		void
1047		yyerror(const char *msg)
1048		{
1652	–	char newlinebuf[IRCD_BUFSIZE];
1653	–
1049		if (conf_parser_ctx.pass != 1)
1050		return;
1051
1052	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1053	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1052	>	const char *p = stripws(linebuf);
1053	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1054		"\"%s\", line %u: %s: %s",
1055	<	conffilebuf, lineno + 1, msg, newlinebuf);
1055	>	conffilebuf, lineno, msg, p);
1056		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1057	<	conffilebuf, lineno + 1, msg, newlinebuf);
1057	>	conffilebuf, lineno, msg, p);
1058		}
1059
1060		void
1061		conf_error_report(const char *msg)
1062		{
1063	<	char newlinebuf[IRCD_BUFSIZE];
1064	<
1670	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1671	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1063	>	const char *p = stripws(linebuf);
1064	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1065		"\"%s\", line %u: %s: %s",
1066	<	conffilebuf, lineno + 1, msg, newlinebuf);
1066	>	conffilebuf, lineno, msg, p);
1067		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1068	<	conffilebuf, lineno + 1, msg, newlinebuf);
1068	>	conffilebuf, lineno, msg, p);
1069		}
1070
1071		/*
#	Line 1685 | Line 1078 | conf_error_report(const char *msg)
1078		* side effects - none
1079		* Originally written by Dianora (Diane, db@db.net)
1080		*/
1081	<	time_t
1081	>	uintmax_t
1082		valid_tkline(const char *data, const int minutes)
1083		{
1084		const unsigned char *p = (const unsigned char *)data;
1085		unsigned char tmpch = '\0';
1086	<	time_t result = 0;
1086	>	uintmax_t result = 0;
1087
1088		while ((tmpch = *p++))
1089		{
#	Line 1703 | Line 1096 | valid_tkline(const char *data, const int
1096
1097		/*
1098		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1099	<	* i.e. they specifically use 0, I am going to return 1 instead
1100	<	* as a return value of non-zero is used to flag it as a temporary kline
1099	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1100	>	* value of non-zero is used to flag it as a temporary kline
1101		*/
1102		if (result == 0)
1103		result = 1;
#	Line 1713 | Line 1106 | valid_tkline(const char *data, const int
1106		* If the incoming time is in seconds convert it to minutes for the purpose
1107		* of this calculation
1108		*/
1109	<	if (!minutes)
1109	>	if (minutes == 0)
1110		result = result / 60;
1111
1112		if (result > MAX_TDKLINE_TIME)
1113		result = MAX_TDKLINE_TIME;
1114
1115	<	result = result * 60;  /* turn it into seconds */
1115	>	result = result * 60;  /* Turn it into seconds */
1116
1117		return result;
1118		}
#	Line 1730 | Line 1123 | valid_tkline(const char *data, const int
1123		* outputs      - 1 if valid, else 0
1124		* side effects - none
1125		*/
1126	<	int
1126	>	bool
1127		valid_wild_card_simple(const char *data)
1128		{
1129		const unsigned char *p = (const unsigned char *)data;
1130		unsigned char tmpch = '\0';
1131	<	int nonwild = 0;
1131	>	unsigned int nonwild = 0, wild = 0;
1132
1133		while ((tmpch = *p++))
1134		{
1135	<	if (tmpch == '\\')
1135	>	if (tmpch == '\\' && *p)
1136		{
1137		++p;
1138	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1139	<	return 1;
1138	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1139	>	return true;
1140		}
1141		else if (!IsMWildChar(tmpch))
1142		{
1143	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1144	<	return 1;
1143	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1144	>	return true;
1145		}
1146	+	else
1147	+	++wild;
1148		}
1149
1150	<	return 0;
1150	>	return wild == 0;
1151		}
1152
1153		/* valid_wild_card()
#	Line 1763 | Line 1158 | valid_wild_card_simple(const char *data)
1158		* output       - 0 if not valid, 1 if valid
1159		* side effects - NOTICE is given to source_p if warn is 1
1160		*/
1161	<	int
1162	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1161	>	bool
1162	>	valid_wild_card(int count, ...)
1163		{
1164	<	char tmpch;
1165	<	int nonwild = 0;
1164	>	unsigned char tmpch = '\0';
1165	>	unsigned int nonwild = 0;
1166		va_list args;
1167
1168		/*
#	Line 1786 | Line 1181 | valid_wild_card(struct Client *source_p,
1181
1182		while (count--)
1183		{
1184	<	const char *p = va_arg(args, const char *);
1184	>	const unsigned char *p = va_arg(args, const unsigned char *);
1185		if (p == NULL)
1186		continue;
1187
#	Line 1798 | Line 1193 | valid_wild_card(struct Client *source_p,
1193		* If we find enough non-wild characters, we can
1194		* break - no point in searching further.
1195		*/
1196	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1196	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1197		{
1198		va_end(args);
1199	<	return 1;
1199	>	return true;
1200		}
1201		}
1202		}
1203		}
1204
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);
1205		va_end(args);
1206	<	return 0;
1206	>	return false;
1207		}
1208
1209		/* XXX should this go into a separate file ? -Dianora */
#	Line 1829 | Line 1220 | valid_wild_card(struct Client *source_p,
1220		*              - pointer to target_server to parse into if non NULL
1221		*              - pointer to reason to parse into
1222		*
1223	<	* output       - 1 if valid, -1 if not valid
1223	>	* output       - 1 if valid, 0 if not valid
1224		* side effects - A generalised k/d/x etc. line parser,
1225		*               "ALINE [time] user@host|string [ON] target :reason"
1226		*                will parse returning a parsed user, host if
#	Line 1845 | Line 1236 | valid_wild_card(struct Client *source_p,
1236		*
1237		* - Dianora
1238		*/
1239	<	int
1240	<	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)
1239	>	bool
1240	>	parse_aline(const char *cmd, struct Client *source_p, int parc, char **parv, struct aline_ctx *aline)
1241		{
1242	<	int found_tkline_time=0;
1243	<	static char def_reason[] = "No Reason";
1244	<	static char user[USERLEN*4+1];
1857	<	static char host[HOSTLEN*4+1];
1858	<
1859	<	parv++;
1860	<	parc--;
1242	>	static char default_reason[] = CONF_NOREASON;
1243	>	static char user[USERLEN * 2 + 1];
1244	>	static char host[HOSTLEN * 2 + 1];
1245
1246	<	found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1246	>	++parv;
1247	>	--parc;
1248
1249	<	if (found_tkline_time != 0)
1249	>	if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1250		{
1251	<	parv++;
1252	<	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	<	}
1251	>	++parv;
1252	>	--parc;
1253		}
1254
1255		if (parc == 0)
1256		{
1257		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1258	<	return -1;
1258	>	return false;
1259		}
1260
1261	<	if (h_p == NULL)
1262	<	*up_p = *parv;
1261	>	if (aline->simple_mask == true)
1262	>	{
1263	>	aline->mask = *parv;
1264	>	aline->user = NULL;
1265	>	aline->host = NULL;
1266	>	}
1267		else
1268		{
1269	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1270	<	return -1;
1269	>	struct split_nuh_item nuh;
1270	>
1271	>	nuh.nuhmask  = *parv;
1272	>	nuh.nickptr  = NULL;
1273	>	nuh.userptr  = user;
1274	>	nuh.hostptr  = host;
1275
1276	<	*up_p = user;
1277	<	*h_p = host;
1276	>	nuh.nicksize = 0;
1277	>	nuh.usersize = sizeof(user);
1278	>	nuh.hostsize = sizeof(host);
1279	>
1280	>	split_nuh(&nuh);
1281	>
1282	>	aline->mask = NULL;
1283	>	aline->user = user;
1284	>	aline->host = host;
1285		}
1286
1287	<	parc--;
1288	<	parv++;
1287	>	++parv;
1288	>	--parc;
1289
1290	<	if (parc != 0)
1290	>	if (parc)
1291		{
1292		if (irccmp(*parv, "ON") == 0)
1293		{
1294	<	parc--;
1295	<	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	<	}
1294	>	++parv;
1295	>	--parc;
1296
1297		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1298		{
1299		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1300	<	return -1;
1300	>	return false;
1301		}
1302
1303		if (parc == 0 || EmptyString(*parv))
1304		{
1305		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1306	<	return -1;
1306	>	return false;
1307		}
1308
1309	<	*target_server = *parv;
1310	<	parc--;
1311	<	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;
1309	>	aline->server = *parv;
1310	>	++parv;
1311	>	--parc;
1312		}
1313		else
1314	<	*reason = def_reason;
1314	>	aline->server = NULL;
1315		}
1316
1317	<	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)
1317	>	if (aline->add == true)
1318		{
1319	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1320	<	return 1;
1987	<	}
1988	<
1989	<	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1990	<	{
1991	<	/* Explicit user@host mask given */
1992	<
1993	<	if (hostp != NULL)                            /* I'm a little user@host */
1994	<	{
1995	<	*(hostp++) = '\0';                       /* short and squat */
1996	<	if (*user_host_or_nick)
1997	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1998	<	else
1999	<	strcpy(luser, "*");
2000	<
2001	<	if (*hostp)
2002	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2003	<	else
2004	<	strcpy(lhost, "*");
2005	<	}
1319	>	if (parc == 0 || EmptyString(*parv))
1320	>	aline->reason = default_reason;
1321		else
1322	<	{
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;
1322	>	aline->reason = *parv;
1323		}
2015	–	else
2016	–	{
2017	–	/* Try to find user@host mask from nick */
2018	–	/* Okay to use source_p as the first param, because source_p == client_p */
2019	–	if ((target_p =
2020	–	find_chasing(source_p, user_host_or_nick)) == NULL)
2021	–	return 0;
1324
1325	<	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);
2042	<	else
2043	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2044	<	return 1;
2045	<	}
2046	<
2047	<	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;
1325	>	return true;
1326		}
1327
1328		/* match_conf_password()
#	Line 2071 | Line 1332 | valid_comment(struct Client *source_p, c
1332		* output       - 1 or 0 if match
1333		* side effects - none
1334		*/
1335	<	int
1335	>	bool
1336		match_conf_password(const char *password, const struct MaskItem *conf)
1337		{
1338		const char *encr = NULL;
1339
1340		if (EmptyString(password) || EmptyString(conf->passwd))
1341	<	return 0;
1341	>	return false;
1342
1343		if (conf->flags & CONF_FLAGS_ENCRYPTED)
1344		encr = crypt(password, conf->passwd);
1345		else
1346		encr = password;
1347
1348	<	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	<	}
1348	>	return encr && strcmp(encr, conf->passwd) == 0;
1349		}
1350
1351		/*
#	Line 2156 | Line 1383 | split_nuh(struct split_nuh_item *const i
1383
1384		if (iptr->nickptr)
1385		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1386	+
1387		if (iptr->userptr)
1388		strlcpy(iptr->userptr, "*", iptr->usersize);
1389	+
1390		if (iptr->hostptr)
1391		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1392
#	Line 2165 | Line 1394 | split_nuh(struct split_nuh_item *const i
1394		{
1395		*p = '\0';
1396
1397	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1397	>	if (iptr->nickptr && *iptr->nuhmask)
1398		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1399
1400		if ((q = strchr(++p, '@')))
1401		{
1402		*q++ = '\0';
1403
1404	<	if (*p != '\0')
1404	>	if (*p)
1405		strlcpy(iptr->userptr, p, iptr->usersize);
1406
1407	<	if (*q != '\0')
1407	>	if (*q)
1408		strlcpy(iptr->hostptr, q, iptr->hostsize);
1409		}
1410		else
1411		{
1412	<	if (*p != '\0')
1412	>	if (*p)
1413		strlcpy(iptr->userptr, p, iptr->usersize);
1414		}
1415		}
#	Line 2192 | Line 1421 | split_nuh(struct split_nuh_item *const i
1421		/* if found a @ */
1422		*p++ = '\0';
1423
1424	<	if (*iptr->nuhmask != '\0')
1424	>	if (*iptr->nuhmask)
1425		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1426
1427	<	if (*p != '\0')
1427	>	if (*p)
1428		strlcpy(iptr->hostptr, p, iptr->hostsize);
1429		}
1430		else
1431		{
1432	<	/* no @ found */
1433	<	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1432	>	/* No @ found */
1433	>	if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1434		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1435		else
1436		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 9101 by michael, Wed Jan 1 09:58:45 2020 UTC

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

Diff Legend

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