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 3931 by michael, Mon Jun 9 15:24:54 2014 UTC vs.
Revision 6367 by michael, Wed Aug 19 10:25:00 2015 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-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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 28 | Line 28
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	+	#include "conf_pseudo.h"
32		#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
#	Line 44 | Line 45
45		#include "log.h"
46		#include "send.h"
47		#include "memory.h"
47	–	#include "mempool.h"
48		#include "res.h"
49		#include "userhost.h"
50		#include "user.h"
#	Line 54 | Line 54
54		#include "conf_db.h"
55		#include "conf_class.h"
56		#include "motd.h"
57	+	#include "ipcache.h"
58	+	#include "isupport.h"
59
60
61		struct config_channel_entry ConfigChannel;
62	<	struct config_server_hide ConfigServerHide;
63	<	struct config_file_entry ConfigFileEntry;
64	<	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
65	<	struct server_info ServerInfo;
66	<	struct admin_info AdminInfo;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list service_items = { NULL, NULL, 0 };
71	<	dlink_list server_items  = { NULL, NULL, 0 };
72	<	dlink_list cluster_items = { NULL, NULL, 0 };
73	<	dlink_list oconf_items   = { NULL, NULL, 0 };
74	<	dlink_list uconf_items   = { NULL, NULL, 0 };
75	<	dlink_list xconf_items   = { NULL, NULL, 0 };
76	<	dlink_list nresv_items   = { NULL, NULL, 0 };
77	<	dlink_list cresv_items = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list oconf_items;
74	>	dlink_list uconf_items;
75	>	dlink_list xconf_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
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;  /**< Number of registered users using this IP */
106	–	unsigned int connection_count;  /**< Number of connections from this IP in the last throttle_time duration */
107	–	time_t last_attempt;  /**< The last time someone connected from this IP */
108	–	struct ip_entry *next;
109	–	};
110	–
111	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
112	–	static mp_pool_t *ip_entry_pool = NULL;
113	–	static int ip_entries_count = 0;
114	–
84
85		/* conf_dns_callback()
86		*
#	Line 124 | Line 93 | static int ip_entries_count = 0;
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct MaskItem *conf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100		conf->dns_pending = 0;
101
#	Line 145 | Line 114 | conf_dns_callback(void *vptr, const stru
114		static void
115		conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!conf->dns_pending)
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126	>	}
127	>
128	>	/* map_to_list()
129	>	*
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133	>	*/
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136	>	{
137	>	switch (type)
138		{
139	<	conf->dns_pending = 1;
140	<	gethost_byname(conf_dns_callback, conf, conf->host);
139	>	case CONF_XLINE:
140	>	return &xconf_items;
141	>	break;
142	>	case CONF_ULINE:
143	>	return &uconf_items;
144	>	break;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147	>	break;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150	>	break;
151	>	case CONF_OPER:
152	>	return &oconf_items;
153	>	break;
154	>	case CONF_SERVER:
155	>	return &server_items;
156	>	break;
157	>	case CONF_SERVICE:
158	>	return &service_items;
159	>	break;
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162	>	break;
163	>	default:
164	>	return NULL;
165		}
166		}
167
168		struct MaskItem *
169		conf_make(enum maskitem_type type)
170		{
171	<	struct MaskItem *conf = MyCalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 170 | Line 183 | conf_make(enum maskitem_type type)
183		void
184		conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL, *ptr_next = NULL;
186	>	dlink_node *node = NULL, *node_next = NULL;
187		dlink_list *list = NULL;
188
189	<	if (conf->node.next)
190	<	if ((list = map_to_list(conf->type)))
178	<	dlinkDelete(&conf->node, list);
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192		MyFree(conf->name);
193
#	Line 192 | Line 204 | conf_free(struct MaskItem *conf)
204		MyFree(conf->spasswd);
205		MyFree(conf->reason);
206		MyFree(conf->certfp);
207	+	MyFree(conf->whois);
208		MyFree(conf->user);
209		MyFree(conf->host);
210		#ifdef HAVE_LIBCRYPTO
#	Line 200 | Line 213 | conf_free(struct MaskItem *conf)
213		if (conf->rsa_public_key)
214		RSA_free(conf->rsa_public_key);
215		#endif
216	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	MyFree(ptr->data);
219	<	dlinkDelete(ptr, &conf->hub_list);
220	<	free_dlink_node(ptr);
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	MyFree(ptr->data);
226	<	dlinkDelete(ptr, &conf->leaf_list);
227	<	free_dlink_node(ptr);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	struct exempt *exptr = ptr->data;
232	>	struct exempt *exptr = node->data;
233
234	<	dlinkDelete(ptr, &conf->exempt_list);
234	>	dlinkDelete(node, &conf->exempt_list);
235		MyFree(exptr->name);
236		MyFree(exptr->user);
237		MyFree(exptr->host);
#	Line 228 | Line 241 | conf_free(struct MaskItem *conf)
241		MyFree(conf);
242		}
243
231	–	/* check_client()
232	–	*
233	–	* inputs       - pointer to client
234	–	* output       - 0 = Success
235	–	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
236	–	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
237	–	*                I_LINE_FULL       (-3) = I-line is full
238	–	*                TOO_MANY          (-4) = Too many connections from hostname
239	–	*                BANNED_CLIENT     (-5) = K-lined
240	–	* side effects - Ordinary client access check.
241	–	*                Look for conf lines which have the same
242	–	*                status as the flags passed.
243	–	*/
244	–	int
245	–	check_client(struct Client *source_p)
246	–	{
247	–	int i;
248	–
249	–	if ((i = verify_access(source_p)))
250	–	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
251	–	source_p->name, source_p->sockhost);
252	–
253	–	switch (i)
254	–	{
255	–	case TOO_MANY:
256	–	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
257	–	"Too many on IP for %s (%s).",
258	–	get_client_name(source_p, SHOW_IP),
259	–	source_p->sockhost);
260	–	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
261	–	get_client_name(source_p, SHOW_IP));
262	–	++ServerStats.is_ref;
263	–	exit_client(source_p, "No more connections allowed on that IP");
264	–	break;
265	–
266	–	case I_LINE_FULL:
267	–	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
268	–	"auth{} block is full for %s (%s).",
269	–	get_client_name(source_p, SHOW_IP),
270	–	source_p->sockhost);
271	–	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
272	–	get_client_name(source_p, SHOW_IP));
273	–	++ServerStats.is_ref;
274	–	exit_client(source_p, "No more connections allowed in your connection class");
275	–	break;
276	–
277	–	case NOT_AUTHORIZED:
278	–	++ServerStats.is_ref;
279	–	/* jdc - lists server name & port connections are on */
280	–	/*       a purely cosmetical change */
281	–	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
282	–	"Unauthorized client connection from %s [%s] on [%s/%u].",
283	–	get_client_name(source_p, SHOW_IP),
284	–	source_p->sockhost,
285	–	source_p->localClient->listener->name,
286	–	source_p->localClient->listener->port);
287	–	ilog(LOG_TYPE_IRCD,
288	–	"Unauthorized client connection from %s on [%s/%u].",
289	–	get_client_name(source_p, SHOW_IP),
290	–	source_p->localClient->listener->name,
291	–	source_p->localClient->listener->port);
292	–
293	–	exit_client(source_p, "You are not authorized to use this server");
294	–	break;
295	–
296	–	case BANNED_CLIENT:
297	–	exit_client(source_p, "Banned");
298	–	++ServerStats.is_ref;
299	–	break;
300	–
301	–	case 0:
302	–	default:
303	–	break;
304	–	}
305	–
306	–	return (i < 0 ? 0 : 1);
307	–	}
308	–
309	–	/* verify_access()
310	–	*
311	–	* inputs       - pointer to client to verify
312	–	* output       - 0 if success -'ve if not
313	–	* side effect  - find the first (best) I line to attach.
314	–	*/
315	–	static int
316	–	verify_access(struct Client *client_p)
317	–	{
318	–	struct MaskItem *conf = NULL;
319	–	char non_ident[USERLEN + 1] = "~";
320	–
321	–	if (IsGotId(client_p))
322	–	{
323	–	conf = find_address_conf(client_p->host, client_p->username,
324	–	&client_p->localClient->ip,
325	–	client_p->localClient->aftype,
326	–	client_p->localClient->passwd);
327	–	}
328	–	else
329	–	{
330	–	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
331	–	conf = find_address_conf(client_p->host,non_ident,
332	–	&client_p->localClient->ip,
333	–	client_p->localClient->aftype,
334	–	client_p->localClient->passwd);
335	–	}
336	–
337	–	if (conf)
338	–	{
339	–	if (IsConfClient(conf))
340	–	{
341	–	if (IsConfRedir(conf))
342	–	{
343	–	sendto_one_numeric(client_p, &me, RPL_REDIR,
344	–	conf->name ? conf->name : "",
345	–	conf->port);
346	–	return NOT_AUTHORIZED;
347	–	}
348	–
349	–	if (IsConfDoIdentd(conf))
350	–	SetNeedId(client_p);
351	–
352	–	/* Thanks for spoof idea amm */
353	–	if (IsConfDoSpoofIp(conf))
354	–	{
355	–	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
356	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
357	–	"%s spoofing: %s as %s",
358	–	client_p->name, client_p->host, conf->name);
359	–	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
360	–	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
361	–	}
362	–
363	–	return attach_iline(client_p, conf);
364	–	}
365	–	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
366	–	{
367	–	if (IsConfGline(conf))
368	–	sendto_one_notice(client_p, &me, ":*** G-lined");
369	–	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
370	–	return BANNED_CLIENT;
371	–	}
372	–	}
373	–
374	–	return NOT_AUTHORIZED;
375	–	}
376	–
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252		attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct ClassItem *class = NULL;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257		unsigned int local = 0, global = 0, ident = 0;
258
259	<	assert(conf->class);
393	<
394	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
397	<
398	<	class = conf->class;
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263		count_user_host(client_p->username, client_p->host,
264		&global, &local, &ident);
#	Line 428 | Line 291 | attach_iline(struct Client *client_p, st
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* init_ip_hash_table()
432	<	*
433	<	* inputs               - NONE
434	<	* output               - NONE
435	<	* side effects         - allocate memory for ip_entry(s)
436	<	*                      - clear the ip hash table
437	<	*/
438	<	void
439	<	init_ip_hash_table(void)
440	<	{
441	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
442	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
443	<	}
444	<
445	<	/* find_or_add_ip()
446	<	*
447	<	* inputs       - pointer to struct irc_ssaddr
448	<	* output       - pointer to a struct ip_entry
449	<	* side effects -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	struct ip_entry *ptr, *newptr;
458	<	int hash_index = hash_ip(ip_in), res;
459	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
460	<	#ifdef IPV6
461	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
462	<	#endif
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	if (ip_in->ss.ss_family == AF_INET6)
470	<	{
471	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
472	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
473	<	}
474	<	else
475	<	#endif
476	<	{
477	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
478	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
479	<	}
480	<	if (res == 0)
481	<	{
482	<	/* Found entry already in hash, return it. */
483	<	return ptr;
484	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	newptr = mp_pool_get(ip_entry_pool);
324	<	memset(newptr, 0, sizeof(*newptr));
492	<	ip_entries_count++;
493	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	newptr->next = ip_hash_table[hash_index];
496	<	ip_hash_table[hash_index] = newptr;
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	return newptr;
499	<	}
500	<
501	<	/* remove_one_ip()
502	<	*
503	<	* inputs        - unsigned long IP address value
504	<	* output        - NONE
505	<	* side effects  - The ip address given, is looked up in ip hash table
506	<	*                 and number of ip#'s for that ip decremented.
507	<	*                 If ip # count reaches 0 and has expired,
508	<	*                 the struct ip_entry is returned to the ip_entry_heap
509	<	*/
510	<	void
511	<	remove_one_ip(struct irc_ssaddr *ip_in)
512	<	{
513	<	struct ip_entry *ptr;
514	<	struct ip_entry *last_ptr = NULL;
515	<	int hash_index = hash_ip(ip_in), res;
516	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
517	<	#ifdef IPV6
518	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
519	<	#endif
520	<
521	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#ifdef IPV6
524	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
525	<	continue;
526	<	if (ip_in->ss.ss_family == AF_INET6)
527	<	{
528	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
529	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
530	<	}
531	<	else
532	<	#endif
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
539	<	if (ptr->count > 0)
540	<	ptr->count--;
541	<	if (ptr->count == 0 &&
542	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
547	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	mp_pool_release(ptr);
550	<	ip_entries_count--;
551	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
553	–	last_ptr = ptr;
554	–	}
555	–	}
346
347	<	/* hash_ip()
558	<	*
559	<	* input        - pointer to an irc_inaddr
560	<	* output       - integer value used as index into hash table
561	<	* side effects - hopefully, none
562	<	*/
563	<	static int
564	<	hash_ip(struct irc_ssaddr *addr)
565	<	{
566	<	if (addr->ss.ss_family == AF_INET)
567	<	{
568	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
569	<	int hash;
570	<	uint32_t ip;
571	<
572	<	ip   = ntohl(v4->sin_addr.s_addr);
573	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
574	<	return hash;
575	<	}
576	<	#ifdef IPV6
577	<	else
578	<	{
579	<	int hash;
580	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
581	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
582	<
583	<	hash  = ip[0] ^ ip[3];
584	<	hash ^= hash >> 16;
585	<	hash ^= hash >> 8;
586	<	hash  = hash & (IP_HASH_SIZE - 1);
587	<	return hash;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#else
350	<	return 0;
351	<	#endif
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* count_ip_hash()
595	<	*
596	<	* inputs        - pointer to counter of number of ips hashed
597	<	*               - pointer to memory used for ip hash
598	<	* output        - returned via pointers input
599	<	* side effects  - NONE
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
370	<	struct ip_entry *ptr;
370	>	int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (unsigned int i = 0; i < IP_HASH_SIZE; ++i)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
632	<	struct ip_entry *last_ptr;
633	<	struct ip_entry *next_ptr;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (unsigned int i = 0; i < IP_HASH_SIZE; ++i)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	mp_pool_release(ptr);
651	<	ip_entries_count--;
652	<	}
653	<	else
654	<	last_ptr = ptr;
655	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 667 | Line 439 | garbage_collect_ip_entries(void)
439		void
440		detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr = NULL, *ptr_next = NULL;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	struct MaskItem *conf = ptr->data;
446	>	struct MaskItem *conf = node->data;
447
448		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449		assert(conf->ref_count > 0);
#	Line 680 | Line 452 | detach_conf(struct Client *client_p, enu
452		if (!(conf->type & type))
453		continue;
454
455	<	dlinkDelete(ptr, &client_p->localClient->confs);
456	<	free_dlink_node(ptr);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458		if (conf->type == CONF_CLIENT)
459	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461		if (--conf->class->ref_count == 0 && conf->class->active == 0)
462		{
#	Line 710 | Line 482 | detach_conf(struct Client *client_p, enu
482		int
483		attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf))
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488		if (conf->type == CONF_CLIENT)
489		if (cidr_limit_reached(IsConfExemptLimits(conf),
490	<	&client_p->localClient->ip, conf->class))
490	>	&client_p->connection->ip, conf->class))
491		return TOO_MANY;    /* Already at maximum allowed */
492
493		conf->class->ref_count++;
494		conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 738 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
742	<	struct MaskItem *conf = NULL;
743	<
744	<	assert(client_p != NULL);
745	<	assert(host != NULL);
513	>	dlink_node *node = NULL;
514
515	<	if (client_p == NULL || host == NULL)
748	<	return 0;
515	>	assert(host);
516
517	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
519	>	struct MaskItem *conf = node->data;
520
521		if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
#	Line 773 | Line 540 | attach_connect_block(struct Client *clie
540		struct MaskItem *
541		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
777	<	struct MaskItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
547	>	struct MaskItem *conf = node->data;
548
549		if (conf->type == type)
550		{
551	<	if (conf->name && (!irccmp(conf->name, name) ||
552	<	!match(conf->name, name)))
787	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
794	–	/* map_to_list()
795	–	*
796	–	* inputs       - ConfType conf
797	–	* output       - pointer to dlink_list to use
798	–	* side effects - none
799	–	*/
800	–	static dlink_list *
801	–	map_to_list(enum maskitem_type type)
802	–	{
803	–	switch(type)
804	–	{
805	–	case CONF_XLINE:
806	–	return(&xconf_items);
807	–	break;
808	–	case CONF_ULINE:
809	–	return(&uconf_items);
810	–	break;
811	–	case CONF_NRESV:
812	–	return(&nresv_items);
813	–	break;
814	–	case CONF_CRESV:
815	–	return(&cresv_items);
816	–	case CONF_OPER:
817	–	return(&oconf_items);
818	–	break;
819	–	case CONF_SERVER:
820	–	return(&server_items);
821	–	break;
822	–	case CONF_SERVICE:
823	–	return(&service_items);
824	–	break;
825	–	case CONF_CLUSTER:
826	–	return(&cluster_items);
827	–	break;
828	–	default:
829	–	return NULL;
830	–	}
831	–	}
832	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
#	Line 844 | Line 570 | struct MaskItem *
570		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571		const char *host, unsigned int flags)
572		{
573	<	dlink_node *ptr=NULL;
574	<	struct MaskItem *conf=NULL;
575	<	dlink_list *list_p = map_to_list(type);
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579		case CONF_SERVICE:
580	<	DLINK_FOREACH(ptr, list_p->head)
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
#	Line 866 | Line 592 | find_matching_name_conf(enum maskitem_ty
592		case CONF_ULINE:
593		case CONF_NRESV:
594		case CONF_CRESV:
595	<	DLINK_FOREACH(ptr, list_p->head)
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
599		if (EmptyString(conf->name))
600		continue;
601	<	if ((name != NULL) && !match(conf->name, name))
601	>	if (name && !match(conf->name, name))
602		{
603		if ((user == NULL && (host == NULL)))
604		return conf;
#	Line 887 | Line 613 | find_matching_name_conf(enum maskitem_ty
613		break;
614
615		case CONF_SERVER:
616	<	DLINK_FOREACH(ptr, list_p->head)
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
618	>	conf = node->data;
619
620	<	if ((name != NULL) && !match(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && !match(host, conf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
#	Line 917 | Line 643 | struct MaskItem *
643		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct MaskItem *conf;
648	<	dlink_list *list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
#	Line 928 | Line 654 | find_exact_name_conf(enum maskitem_type
654		case CONF_NRESV:
655		case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
659	>	conf = node->data;
660
661		if (EmptyString(conf->name))
662		continue;
#	Line 948 | Line 674 | find_exact_name_conf(enum maskitem_type
674		break;
675
676		case CONF_OPER:
677	<	DLINK_FOREACH(ptr, list_p->head)
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 971 | Line 697 | find_exact_name_conf(enum maskitem_type
697		return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703		return conf;
704		break;
979	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709		return conf;
710		break;
986	–	#endif
711		default:
712		assert(0);
713		}
#	Line 994 | Line 718 | find_exact_name_conf(enum maskitem_type
718		break;
719
720		case CONF_SERVER:
721	<	DLINK_FOREACH(ptr, list_p->head)
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
723	>	conf = node->data;
724
725		if (EmptyString(conf->name))
726		continue;
#	Line 1021 | Line 745 | find_exact_name_conf(enum maskitem_type
745		return NULL;
746		}
747
1024	–	/* rehash()
1025	–	*
1026	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1027	–	* as a result of an operator issuing this command, else assume it has been
1028	–	* called as a result of the server receiving a HUP signal.
1029	–	*/
1030	–	int
1031	–	rehash(int sig)
1032	–	{
1033	–	if (sig)
1034	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1035	–	"Got signal SIGHUP, reloading configuration file(s)");
1036	–
1037	–	restart_resolver();
1038	–
1039	–	/* don't close listeners until we know we can go ahead with the rehash */
1040	–
1041	–	/* Check to see if we magically got(or lost) IPv6 support */
1042	–	check_can_use_v6();
1043	–
1044	–	read_conf_files(0);
1045	–
1046	–	if (ServerInfo.description)
1047	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1048	–
1049	–	load_conf_modules();
1050	–	check_conf_klines();
1051	–
1052	–	return 0;
1053	–	}
1054	–
748		/* set_default_conf()
749		*
750		* inputs       - NONE
#	Line 1070 | Line 763 | set_default_conf(void)
763		assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778	>	#endif
779	>
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	>	ConfigServerInfo.rsa_private_key = NULL;
783	>	ConfigServerInfo.rsa_private_key_file = NULL;
784		#endif
785
786	<	/* ServerInfo.name is not rehashable */
787	<	/* ServerInfo.name = ServerInfo.name; */
788	<	ServerInfo.description = NULL;
789	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
790	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
791	<
792	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
793	<	ServerInfo.specific_ipv4_vhost = 0;
794	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
795	<	ServerInfo.specific_ipv6_vhost = 0;
796	<
797	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
798	<	ServerInfo.max_nick_length = 9;
799	<	ServerInfo.max_topic_length = 80;
800	<
801	<	ServerInfo.hub = 0;
802	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
803	<	ServerInfo.dns_host.sin_port = 0;
804	<	AdminInfo.name = NULL;
1096	<	AdminInfo.email = NULL;
1097	<	AdminInfo.description = NULL;
786	>	/* ConfigServerInfo.name is not rehashable */
787	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
788	>	ConfigServerInfo.description = NULL;
789	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
790	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
791	>
792	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
793	>	ConfigServerInfo.specific_ipv4_vhost = 0;
794	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
795	>	ConfigServerInfo.specific_ipv6_vhost = 0;
796	>
797	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
798	>	ConfigServerInfo.max_nick_length = 9;
799	>	ConfigServerInfo.max_topic_length = 80;
800	>	ConfigServerInfo.hub = 0;
801	>
802	>	ConfigAdminInfo.name = NULL;
803	>	ConfigAdminInfo.email = NULL;
804	>	ConfigAdminInfo.description = NULL;
805
806		log_del_all();
807
808	<	ConfigLoggingEntry.use_logging = 1;
808	>	ConfigLog.use_logging = 1;
809
810		ConfigChannel.disable_fake_channels = 0;
811		ConfigChannel.invite_client_count = 10;
#	Line 1106 | Line 813 | set_default_conf(void)
813		ConfigChannel.knock_client_count = 1;
814		ConfigChannel.knock_client_time = 300;
815		ConfigChannel.knock_delay_channel = 60;
816	<	ConfigChannel.max_chans_per_user = 25;
1110	<	ConfigChannel.max_chans_per_oper = 50;
816	>	ConfigChannel.max_channels = 25;
817		ConfigChannel.max_bans = 25;
818	+	ConfigChannel.default_join_flood_count = 18;
819	+	ConfigChannel.default_join_flood_time = 6;
820		ConfigChannel.default_split_user_count = 0;
821		ConfigChannel.default_split_server_count = 0;
822		ConfigChannel.no_join_on_split = 0;
#	Line 1123 | Line 831 | set_default_conf(void)
831		ConfigServerHide.hide_server_ips = 0;
832		ConfigServerHide.disable_remote_commands = 0;
833
834	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
835	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
836	<	ConfigFileEntry.cycle_on_host_change = 1;
837	<	ConfigFileEntry.glines = 0;
838	<	ConfigFileEntry.gline_time = 12 * 3600;
839	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
840	<	ConfigFileEntry.gline_min_cidr = 16;
841	<	ConfigFileEntry.gline_min_cidr6 = 48;
842	<	ConfigFileEntry.invisible_on_connect = 1;
843	<	ConfigFileEntry.tkline_expire_notices = 1;
844	<	ConfigFileEntry.hide_spoof_ips = 1;
845	<	ConfigFileEntry.ignore_bogus_ts = 0;
846	<	ConfigFileEntry.disable_auth = 0;
847	<	ConfigFileEntry.kill_chase_time_limit = 90;
848	<	ConfigFileEntry.default_floodcount = 8;
849	<	ConfigFileEntry.failed_oper_notice = 1;
850	<	ConfigFileEntry.dots_in_ident = 0;
851	<	ConfigFileEntry.min_nonwildcard = 4;
852	<	ConfigFileEntry.min_nonwildcard_simple = 3;
853	<	ConfigFileEntry.max_accept = 20;
854	<	ConfigFileEntry.anti_nick_flood = 0;
855	<	ConfigFileEntry.max_nick_time = 20;
856	<	ConfigFileEntry.max_nick_changes = 5;
857	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
858	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
859	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
860	<	ConfigFileEntry.warn_no_connect_block = 1;
861	<	ConfigFileEntry.stats_e_disabled = 0;
862	<	ConfigFileEntry.stats_o_oper_only = 0;
863	<	ConfigFileEntry.stats_k_oper_only = 1;  /* 1 = masked */
864	<	ConfigFileEntry.stats_i_oper_only = 1;  /* 1 = masked */
865	<	ConfigFileEntry.stats_P_oper_only = 0;
866	<	ConfigFileEntry.stats_u_oper_only = 0;
867	<	ConfigFileEntry.caller_id_wait = 60;
868	<	ConfigFileEntry.opers_bypass_callerid = 0;
869	<	ConfigFileEntry.pace_wait = 10;
870	<	ConfigFileEntry.pace_wait_simple = 1;
871	<	ConfigFileEntry.short_motd = 0;
872	<	ConfigFileEntry.ping_cookie = 0;
873	<	ConfigFileEntry.no_oper_flood = 0;
874	<	ConfigFileEntry.true_no_oper_flood = 0;
875	<	ConfigFileEntry.oper_pass_resv = 1;
876	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
877	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
878	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
879	<	ConfigFileEntry.use_egd = 0;
880	<	ConfigFileEntry.egdpool_path = NULL;
881	<	ConfigFileEntry.throttle_count = 0;
1174	<	ConfigFileEntry.throttle_time = 10;
834	>	ConfigGeneral.away_count = 2;
835	>	ConfigGeneral.away_time = 10;
836	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
837	>	ConfigGeneral.cycle_on_host_change = 1;
838	>	ConfigGeneral.dline_min_cidr = 16;
839	>	ConfigGeneral.dline_min_cidr6 = 48;
840	>	ConfigGeneral.kline_min_cidr = 16;
841	>	ConfigGeneral.kline_min_cidr6 = 48;
842	>	ConfigGeneral.invisible_on_connect = 1;
843	>	ConfigGeneral.tkline_expire_notices = 1;
844	>	ConfigGeneral.ignore_bogus_ts = 0;
845	>	ConfigGeneral.disable_auth = 0;
846	>	ConfigGeneral.kill_chase_time_limit = 90;
847	>	ConfigGeneral.default_floodcount = 8;
848	>	ConfigGeneral.failed_oper_notice = 1;
849	>	ConfigGeneral.dots_in_ident = 0;
850	>	ConfigGeneral.min_nonwildcard = 4;
851	>	ConfigGeneral.min_nonwildcard_simple = 3;
852	>	ConfigGeneral.max_accept = 20;
853	>	ConfigGeneral.anti_nick_flood = 0;
854	>	ConfigGeneral.max_nick_time = 20;
855	>	ConfigGeneral.max_nick_changes = 5;
856	>	ConfigGeneral.anti_spam_exit_message_time = 0;
857	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
858	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
859	>	ConfigGeneral.warn_no_connect_block = 1;
860	>	ConfigGeneral.stats_e_disabled = 0;
861	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
862	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
863	>	ConfigGeneral.stats_o_oper_only = 1;
864	>	ConfigGeneral.stats_m_oper_only = 1;
865	>	ConfigGeneral.stats_P_oper_only = 0;
866	>	ConfigGeneral.stats_u_oper_only = 0;
867	>	ConfigGeneral.caller_id_wait = 60;
868	>	ConfigGeneral.opers_bypass_callerid = 0;
869	>	ConfigGeneral.pace_wait = 10;
870	>	ConfigGeneral.pace_wait_simple = 1;
871	>	ConfigGeneral.short_motd = 0;
872	>	ConfigGeneral.ping_cookie = 0;
873	>	ConfigGeneral.no_oper_flood = 0;
874	>	ConfigGeneral.oper_pass_resv = 1;
875	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
876	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
877	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
878	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
879	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
880	>	ConfigGeneral.throttle_count = 1;
881	>	ConfigGeneral.throttle_time = 1;
882		}
883
884		static void
885		validate_conf(void)
886		{
887	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
888	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
887	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
888	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
889
890	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
891	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
890	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
891	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
892
893	<	if (ServerInfo.network_name == NULL)
894	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
893	>	if (EmptyString(ConfigServerInfo.network_name))
894	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
895
896	<	if (ServerInfo.network_desc == NULL)
897	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
896	>	if (EmptyString(ConfigServerInfo.network_desc))
897	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
898
899	<	if (ConfigFileEntry.service_name == NULL)
1193	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1194	<
1195	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
899	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
900		}
901
902		/* read_conf()
#	Line 1219 | Line 923 | read_conf(FILE *file)
923		class_delete_marked();  /* Delete unused classes that are marked for deletion */
924		}
925
926	+	/* conf_rehash()
927	+	*
928	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
929	+	* as a result of an operator issuing this command, else assume it has been
930	+	* called as a result of the server receiving a HUP signal.
931	+	*/
932	+	void
933	+	conf_rehash(int sig)
934	+	{
935	+	if (sig)
936	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
937	+	"Got signal SIGHUP, reloading configuration file(s)");
938	+
939	+	restart_resolver();
940	+
941	+	/* don't close listeners until we know we can go ahead with the rehash */
942	+
943	+	read_conf_files(0);
944	+
945	+	load_conf_modules();
946	+	check_conf_klines();
947	+	}
948	+
949		/* lookup_confhost()
950		*
951		* start DNS lookups of all hostnames in the conf
#	Line 1267 | Line 994 | int
994		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
995		{
996		struct ip_entry *ip_found = NULL;
997	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
997	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
998
999		/* DLINE exempt also gets you out of static limits/pacing... */
1000		if (conf && (conf->type == CONF_EXEMPT))
#	Line 1276 | Line 1003 | conf_connect_allowed(struct irc_ssaddr *
1003		if (conf)
1004		return BANNED_CLIENT;
1005
1006	<	ip_found = find_or_add_ip(addr);
1280	<	++ip_found->connection_count;
1006	>	ip_found = ipcache_find_or_add_address(addr);
1007
1008	<	if ((CurrentTime - ip_found->last_attempt) < ConfigFileEntry.throttle_time)
1008	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1009		{
1010	<	if (ip_found->connection_count >= ConfigFileEntry.throttle_count)
1285	<	{
1286	<	ip_found->last_attempt = CurrentTime;
1010	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1011		return TOO_FAST;
1012	<	}
1012	>
1013	>	++ip_found->connection_count;
1014		}
1015		else
1016		ip_found->connection_count = 1;
#	Line 1294 | Line 1019 | conf_connect_allowed(struct irc_ssaddr *
1019		return 0;
1020		}
1021
1297	–	/* cleanup_tklines()
1298	–	*
1299	–	* inputs       - NONE
1300	–	* output       - NONE
1301	–	* side effects - call function to expire temporary k/d lines
1302	–	*                This is an event started off in ircd.c
1303	–	*/
1304	–	void
1305	–	cleanup_tklines(void *notused)
1306	–	{
1307	–	hostmask_expire_temporary();
1308	–	expire_tklines(&xconf_items);
1309	–	expire_tklines(&nresv_items);
1310	–	expire_tklines(&cresv_items);
1311	–	}
1312	–
1022		/* expire_tklines()
1023		*
1024		* inputs       - tkline list pointer
#	Line 1317 | Line 1026 | cleanup_tklines(void *notused)
1026		* side effects - expire tklines
1027		*/
1028		static void
1029	<	expire_tklines(dlink_list *tklist)
1029	>	expire_tklines(dlink_list *list)
1030		{
1031	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1323	<	struct MaskItem *conf = NULL;
1031	>	dlink_node *node = NULL, *node_next = NULL;
1032
1033	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1033	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1034		{
1035	<	conf = ptr->data;
1035	>	struct MaskItem *conf = node->data;
1036
1037		if (!conf->until || conf->until > CurrentTime)
1038		continue;
1039
1040	<	if (conf->type == CONF_XLINE)
1041	<	{
1042	<	if (ConfigFileEntry.tkline_expire_notices)
1043	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1336	<	"Temporary X-line for [%s] expired", conf->name);
1337	<	conf_free(conf);
1338	<	}
1339	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1340	<	{
1341	<	if (ConfigFileEntry.tkline_expire_notices)
1342	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1343	<	"Temporary RESV for [%s] expired", conf->name);
1344	<	conf_free(conf);
1345	<	}
1040	>	if (ConfigGeneral.tkline_expire_notices)
1041	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1042	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1043	>	conf_free(conf);
1044		}
1045		}
1046
1047	+	/* cleanup_tklines()
1048	+	*
1049	+	* inputs       - NONE
1050	+	* output       - NONE
1051	+	* side effects - call function to expire temporary k/d lines
1052	+	*                This is an event started off in ircd.c
1053	+	*/
1054	+	void
1055	+	cleanup_tklines(void *unused)
1056	+	{
1057	+	hostmask_expire_temporary();
1058	+	expire_tklines(&xconf_items);
1059	+	expire_tklines(&nresv_items);
1060	+	expire_tklines(&cresv_items);
1061	+	}
1062	+
1063		/* oper_privs_as_string()
1064		*
1065		* inputs        - pointer to client_p
#	Line 1360 | Line 1074 | static const struct oper_privs
1074		{ OPER_FLAG_ADMIN,          'A' },
1075		{ OPER_FLAG_REMOTEBAN,      'B' },
1076		{ OPER_FLAG_DIE,            'D' },
1363	–	{ OPER_FLAG_GLINE,          'G' },
1077		{ OPER_FLAG_REHASH,         'H' },
1078	<	{ OPER_FLAG_K,              'K' },
1078	>	{ OPER_FLAG_KLINE,          'K' },
1079		{ OPER_FLAG_KILL,           'N' },
1080		{ OPER_FLAG_KILL_REMOTE,    'O' },
1081		{ OPER_FLAG_CONNECT,        'P' },
#	Line 1374 | Line 1087 | static const struct oper_privs
1087		{ 0, '\0' }
1088		};
1089
1090	<	char *
1090	>	const char *
1091		oper_privs_as_string(const unsigned int port)
1092		{
1093		static char privs_out[IRCD_BUFSIZE];
#	Line 1394 | Line 1107 | oper_privs_as_string(const unsigned int
1107		}
1108
1109		/*
1110	<	* Input: A client to find the active oper{} name for.
1110	>	* Input: A client to find the active operator {} name for.
1111		* Output: The nick!user@host{oper} of the oper.
1112		*         "oper" is server name for remote opers
1113		* Side effects: None.
#	Line 1402 | Line 1115 | oper_privs_as_string(const unsigned int
1115		const char *
1116		get_oper_name(const struct Client *client_p)
1117		{
1118	<	const dlink_node *cnode = NULL;
1119	<	/* +5 for !,@,{,} and null */
1120	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1118	>	static char buffer[IRCD_BUFSIZE];
1119	>
1120	>	if (IsServer(client_p))
1121	>	return client_p->name;
1122
1123		if (MyConnect(client_p))
1124		{
1125	<	if ((cnode = client_p->localClient->confs.head))
1125	>	const dlink_node *const node = client_p->connection->confs.head;
1126	>
1127	>	if (node)
1128		{
1129	<	const struct MaskItem *conf = cnode->data;
1129	>	const struct MaskItem *const conf = node->data;
1130
1131	<	if (IsConfOperator(conf))
1131	>	if (conf->type == CONF_OPER)
1132		{
1133		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1134		client_p->username, client_p->host, conf->name);
#	Line 1420 | Line 1136 | get_oper_name(const struct Client *clien
1136		}
1137		}
1138
1139	<	/* Probably should assert here for now. If there is an oper out there
1140	<	* with no oper{} conf attached, it would be good for us to know...
1139	>	/*
1140	>	* Probably should assert here for now. If there is an oper out there
1141	>	* with no operator {} conf attached, it would be good for us to know...
1142		*/
1143	<	assert(0); /* Oper without oper conf! */
1143	>	assert(0);  /* Oper without oper conf! */
1144		}
1145
1146		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1431 | Line 1148 | get_oper_name(const struct Client *clien
1148		return buffer;
1149		}
1150
1151	+	/* clear_out_old_conf()
1152	+	*
1153	+	* inputs       - none
1154	+	* output       - none
1155	+	* side effects - Clear out the old configuration
1156	+	*/
1157	+	static void
1158	+	clear_out_old_conf(void)
1159	+	{
1160	+	dlink_node *node = NULL, *node_next = NULL;
1161	+	dlink_list *free_items [] = {
1162	+	&server_items,   &oconf_items,
1163	+	&uconf_items,   &xconf_items,
1164	+	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1165	+	};
1166	+
1167	+	dlink_list ** iterator = free_items; /* C is dumb */
1168	+
1169	+	/* We only need to free anything allocated by yyparse() here.
1170	+	* Resetting structs, etc, is taken care of by set_default_conf().
1171	+	*/
1172	+
1173	+	for (; *iterator; iterator++)
1174	+	{
1175	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1176	+	{
1177	+	struct MaskItem *conf = node->data;
1178	+
1179	+	conf->active = 0;
1180	+
1181	+	if (!IsConfDatabase(conf))
1182	+	{
1183	+	dlinkDelete(&conf->node, *iterator);
1184	+
1185	+	if (!conf->ref_count)
1186	+	conf_free(conf);
1187	+	}
1188	+	}
1189	+	}
1190	+
1191	+	motd_clear();
1192	+
1193	+	/*
1194	+	* Don't delete the class table, rather mark all entries for deletion.
1195	+	* The table is cleaned up by class_delete_marked. - avalon
1196	+	*/
1197	+	class_mark_for_deletion();
1198	+
1199	+	clear_out_address_conf();
1200	+
1201	+	/* Clean out module paths */
1202	+	mod_clear_paths();
1203	+
1204	+	pseudo_clear();
1205	+
1206	+	/* Clean out ConfigServerInfo */
1207	+	MyFree(ConfigServerInfo.description);
1208	+	ConfigServerInfo.description = NULL;
1209	+	MyFree(ConfigServerInfo.network_name);
1210	+	ConfigServerInfo.network_name = NULL;
1211	+	MyFree(ConfigServerInfo.network_desc);
1212	+	ConfigServerInfo.network_desc = NULL;
1213	+	#ifdef HAVE_LIBCRYPTO
1214	+	if (ConfigServerInfo.rsa_private_key)
1215	+	{
1216	+	RSA_free(ConfigServerInfo.rsa_private_key);
1217	+	ConfigServerInfo.rsa_private_key = NULL;
1218	+	}
1219	+
1220	+	MyFree(ConfigServerInfo.rsa_private_key_file);
1221	+	ConfigServerInfo.rsa_private_key_file = NULL;
1222	+	#endif
1223	+
1224	+	/* Clean out ConfigAdminInfo */
1225	+	MyFree(ConfigAdminInfo.name);
1226	+	ConfigAdminInfo.name = NULL;
1227	+	MyFree(ConfigAdminInfo.email);
1228	+	ConfigAdminInfo.email = NULL;
1229	+	MyFree(ConfigAdminInfo.description);
1230	+	ConfigAdminInfo.description = NULL;
1231	+
1232	+	/* Clean out listeners */
1233	+	listener_close_marked();
1234	+	}
1235	+
1236		/* read_conf_files()
1237		*
1238		* inputs       - cold start YES or NO
#	Line 1445 | Line 1247 | read_conf_files(int cold)
1247		char chanlimit[IRCD_BUFSIZE] = "";
1248
1249		conf_parser_ctx.boot = cold;
1250	<	filename = ConfigFileEntry.configfile;
1250	>	filename = ConfigGeneral.configfile;
1251
1252		/* We need to know the initial filename for the yyerror() to report
1253		FIXME: The full path is in conffilenamebuf first time since we
1254	<	dont know anything else
1254	>	don't know anything else
1255
1256		- Gozem 2002-07-21
1257		*/
#	Line 1465 | Line 1267 | read_conf_files(int cold)
1267		}
1268		else
1269		{
1270	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1270	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1271		"Unable to read configuration file '%s': %s",
1272		filename, strerror(errno));
1273		return;
#	Line 1480 | Line 1282 | read_conf_files(int cold)
1282
1283		log_reopen_all();
1284
1285	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1286	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1285	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1286	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1287
1288		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1289	<	add_isupport("MAXLIST", chanmodes, -1);
1290	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1291	<	add_isupport("CHANTYPES", "#", -1);
1289	>	isupport_add("MAXLIST", chanmodes, -1);
1290	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1291	>	isupport_add("CHANTYPES", "#", -1);
1292
1293		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1294	<	ConfigChannel.max_chans_per_user);
1295	<	add_isupport("CHANLIMIT", chanlimit, -1);
1296	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1297	<	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1298	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1299	<	add_isupport("CHANMODES", chanmodes, -1);
1294	>	ConfigChannel.max_channels);
1295	>	isupport_add("CHANLIMIT", chanlimit, -1);
1296	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1297	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1298	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1299	>	isupport_add("CHANMODES", chanmodes, -1);
1300
1301		/*
1302		* message_locale may have changed.  rebuild isupport since it relies
1303		* on strlen(form_str(RPL_ISUPPORT))
1304		*/
1305	<	rebuild_isupport_message_line();
1504	<	}
1505	<
1506	<	/* clear_out_old_conf()
1507	<	*
1508	<	* inputs       - none
1509	<	* output       - none
1510	<	* side effects - Clear out the old configuration
1511	<	*/
1512	<	static void
1513	<	clear_out_old_conf(void)
1514	<	{
1515	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1516	<	struct MaskItem *conf;
1517	<	dlink_list *free_items [] = {
1518	<	&server_items,   &oconf_items,
1519	<	&uconf_items,   &xconf_items,
1520	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1521	<	};
1522	<
1523	<	dlink_list ** iterator = free_items; /* C is dumb */
1524	<
1525	<	/* We only need to free anything allocated by yyparse() here.
1526	<	* Resetting structs, etc, is taken care of by set_default_conf().
1527	<	*/
1528	<
1529	<	for (; *iterator != NULL; iterator++)
1530	<	{
1531	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1532	<	{
1533	<	conf = ptr->data;
1534	<
1535	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1536	<
1537	<	/* XXX This is less than pretty */
1538	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1539	<	{
1540	<	if (!conf->ref_count)
1541	<	conf_free(conf);
1542	<	}
1543	<	else if (conf->type == CONF_XLINE)
1544	<	{
1545	<	if (!conf->until)
1546	<	conf_free(conf);
1547	<	}
1548	<	else
1549	<	conf_free(conf);
1550	<	}
1551	<	}
1552	<
1553	<	motd_clear();
1554	<
1555	<	/*
1556	<	* don't delete the class table, rather mark all entries
1557	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1558	<	*/
1559	<	class_mark_for_deletion();
1560	<
1561	<	clear_out_address_conf();
1562	<
1563	<	/* clean out module paths */
1564	<	mod_clear_paths();
1565	<
1566	<	/* clean out ServerInfo */
1567	<	MyFree(ServerInfo.description);
1568	<	ServerInfo.description = NULL;
1569	<	MyFree(ServerInfo.network_name);
1570	<	ServerInfo.network_name = NULL;
1571	<	MyFree(ServerInfo.network_desc);
1572	<	ServerInfo.network_desc = NULL;
1573	<	MyFree(ConfigFileEntry.egdpool_path);
1574	<	ConfigFileEntry.egdpool_path = NULL;
1575	<	#ifdef HAVE_LIBCRYPTO
1576	<	if (ServerInfo.rsa_private_key)
1577	<	{
1578	<	RSA_free(ServerInfo.rsa_private_key);
1579	<	ServerInfo.rsa_private_key = NULL;
1580	<	}
1581	<
1582	<	MyFree(ServerInfo.rsa_private_key_file);
1583	<	ServerInfo.rsa_private_key_file = NULL;
1584	<
1585	<	if (ServerInfo.server_ctx)
1586	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1587	<	SSL_OP_NO_SSLv3|
1588	<	SSL_OP_NO_TLSv1);
1589	<	if (ServerInfo.client_ctx)
1590	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1591	<	SSL_OP_NO_SSLv3|
1592	<	SSL_OP_NO_TLSv1);
1593	<	#endif
1594	<
1595	<	/* clean out AdminInfo */
1596	<	MyFree(AdminInfo.name);
1597	<	AdminInfo.name = NULL;
1598	<	MyFree(AdminInfo.email);
1599	<	AdminInfo.email = NULL;
1600	<	MyFree(AdminInfo.description);
1601	<	AdminInfo.description = NULL;
1602	<
1603	<	/* clean out listeners */
1604	<	close_listeners();
1605	<
1606	<	/* clean out general */
1607	<	MyFree(ConfigFileEntry.service_name);
1608	<	ConfigFileEntry.service_name = NULL;
1305	>	isupport_rebuild();
1306		}
1307
1308		/* conf_add_class_to_conf()
#	Line 1615 | Line 1312 | clear_out_old_conf(void)
1312		* side effects - Add a class pointer to a conf
1313		*/
1314		void
1315	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1315	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1316		{
1317	<	if (class_name == NULL)
1317	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1318		{
1319		conf->class = class_default;
1320
1321	<	if (conf->type == CONF_CLIENT)
1322	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1321	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1322	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1323		"Warning *** Defaulting to default class for %s@%s",
1324		conf->user, conf->host);
1325		else
1326	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1326	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1327		"Warning *** Defaulting to default class for %s",
1328		conf->name);
1329		}
1633	–	else
1634	–	conf->class = class_find(class_name, 1);
1635	–
1636	–	if (conf->class == NULL)
1637	–	{
1638	–	if (conf->type == CONF_CLIENT)
1639	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1640	–	"Warning *** Defaulting to default class for %s@%s",
1641	–	conf->user, conf->host);
1642	–	else
1643	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1644	–	"Warning *** Defaulting to default class for %s",
1645	–	conf->name);
1646	–	conf->class = class_default;
1647	–	}
1330		}
1331
1332		/* yyerror()
#	Line 1662 | Line 1344 | yyerror(const char *msg)
1344		return;
1345
1346		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1347	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1347	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1348		"\"%s\", line %u: %s: %s",
1349		conffilebuf, lineno + 1, msg, newlinebuf);
1350		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1675 | Line 1357 | conf_error_report(const char *msg)
1357		char newlinebuf[IRCD_BUFSIZE];
1358
1359		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1360	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1360	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1361		"\"%s\", line %u: %s: %s",
1362		conffilebuf, lineno + 1, msg, newlinebuf);
1363		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1710 | Line 1392 | valid_tkline(const char *data, const int
1392
1393		/*
1394		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	<	* i.e. they specifically use 0, I am going to return 1 instead
1396	<	* as a return value of non-zero is used to flag it as a temporary kline
1395	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1396	>	* value of non-zero is used to flag it as a temporary kline
1397		*/
1398		if (result == 0)
1399		result = 1;
#	Line 1726 | Line 1408 | valid_tkline(const char *data, const int
1408		if (result > MAX_TDKLINE_TIME)
1409		result = MAX_TDKLINE_TIME;
1410
1411	<	result = result * 60;  /* turn it into seconds */
1411	>	result = result * 60;  /* Turn it into seconds */
1412
1413		return result;
1414		}
#	Line 1742 | Line 1424 | valid_wild_card_simple(const char *data)
1424		{
1425		const unsigned char *p = (const unsigned char *)data;
1426		unsigned char tmpch = '\0';
1427	<	unsigned int nonwild = 0;
1427	>	unsigned int nonwild = 0, wild = 0;
1428
1429		while ((tmpch = *p++))
1430		{
1431	<	if (tmpch == '\\')
1431	>	if (tmpch == '\\' && *p)
1432		{
1433		++p;
1434	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1434	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1435		return 1;
1436		}
1437		else if (!IsMWildChar(tmpch))
1438		{
1439	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1439	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1440		return 1;
1441		}
1442	+	else
1443	+	++wild;
1444		}
1445
1446	<	return 0;
1446	>	return !wild;
1447		}
1448
1449		/* valid_wild_card()
#	Line 1771 | Line 1455 | valid_wild_card_simple(const char *data)
1455		* side effects - NOTICE is given to source_p if warn is 1
1456		*/
1457		int
1458	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1458	>	valid_wild_card(struct Client *source_p, int count, ...)
1459		{
1460		unsigned char tmpch = '\0';
1461		unsigned int nonwild = 0;
#	Line 1805 | Line 1489 | valid_wild_card(struct Client *source_p,
1489		* If we find enough non-wild characters, we can
1490		* break - no point in searching further.
1491		*/
1492	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1492	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1493		{
1494		va_end(args);
1495		return 1;
#	Line 1814 | Line 1498 | valid_wild_card(struct Client *source_p,
1498		}
1499		}
1500
1501	<	if (warn)
1501	>	if (IsClient(source_p))
1502		sendto_one_notice(source_p, &me,
1503	<	":Please include at least %d non-wildcard characters with the mask",
1504	<	ConfigFileEntry.min_nonwildcard);
1503	>	":Please include at least %u non-wildcard characters with the mask",
1504	>	ConfigGeneral.min_nonwildcard);
1505		va_end(args);
1506		return 0;
1507		}
1508
1509	+	/* find_user_host()
1510	+	*
1511	+	* inputs       - pointer to client placing kline
1512	+	*              - pointer to user_host_or_nick
1513	+	*              - pointer to user buffer
1514	+	*              - pointer to host buffer
1515	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1516	+	* side effects -
1517	+	*/
1518	+	static int
1519	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1520	+	char *luser, char *lhost)
1521	+	{
1522	+	struct Client *target_p = NULL;
1523	+	char *hostp = NULL;
1524	+
1525	+	if (lhost == NULL)
1526	+	{
1527	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1528	+	return 1;
1529	+	}
1530	+
1531	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1532	+	{
1533	+	/* Explicit user@host mask given */
1534	+	if (hostp)                            /* I'm a little user@host */
1535	+	{
1536	+	*(hostp++) = '\0';                       /* short and squat */
1537	+
1538	+	if (*user_host_or_nick)
1539	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1540	+	else
1541	+	strcpy(luser, "*");
1542	+
1543	+	if (*hostp)
1544	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1545	+	else
1546	+	strcpy(lhost, "*");
1547	+	}
1548	+	else
1549	+	{
1550	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1551	+	luser[1] = '\0';
1552	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1553	+	}
1554	+
1555	+	return 1;
1556	+	}
1557	+	else
1558	+	{
1559	+	/* Try to find user@host mask from nick */
1560	+	/* Okay to use source_p as the first param, because source_p == client_p */
1561	+	if ((target_p =
1562	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1563	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1564	+
1565	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1566	+	{
1567	+	if (IsClient(source_p))
1568	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1569	+	return 0;
1570	+	}
1571	+
1572	+	/*
1573	+	* Turn the "user" bit into "*user", blow away '~'
1574	+	* if found in original user name (non-idented)
1575	+	*/
1576	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1577	+
1578	+	if (target_p->username[0] == '~')
1579	+	luser[0] = '*';
1580	+
1581	+	if (!strcmp(target_p->sockhost, "0"))
1582	+	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1583	+	else
1584	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1585	+	return 1;
1586	+	}
1587	+
1588	+	return 0;
1589	+	}
1590	+
1591		/* XXX should this go into a separate file ? -Dianora */
1592		/* parse_aline
1593		*
#	Line 1836 | Line 1602 | valid_wild_card(struct Client *source_p,
1602		*              - pointer to target_server to parse into if non NULL
1603		*              - pointer to reason to parse into
1604		*
1605	<	* output       - 1 if valid, -1 if not valid
1605	>	* output       - 1 if valid, 0 if not valid
1606		* side effects - A generalised k/d/x etc. line parser,
1607		*               "ALINE [time] user@host|string [ON] target :reason"
1608		*                will parse returning a parsed user, host if
#	Line 1859 | Line 1625 | parse_aline(const char *cmd, struct Clie
1625		char **target_server, char **reason)
1626		{
1627		int found_tkline_time=0;
1628	<	static char def_reason[] = CONF_NOREASON;
1628	>	static char default_reason[] = CONF_NOREASON;
1629		static char user[USERLEN*4+1];
1630		static char host[HOSTLEN*4+1];
1631
#	Line 1868 | Line 1634 | parse_aline(const char *cmd, struct Clie
1634
1635		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1636
1637	<	if (found_tkline_time != 0)
1637	>	if (found_tkline_time)
1638		{
1639		parv++;
1640		parc--;
1641
1642	<	if (tkline_time != NULL)
1642	>	if (tkline_time)
1643		*tkline_time = found_tkline_time;
1644		else
1645		{
1646		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1647	<	return -1;
1647	>	return 0;
1648		}
1649		}
1650
1651		if (parc == 0)
1652		{
1653		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1654	<	return -1;
1654	>	return 0;
1655		}
1656
1657		if (h_p == NULL)
1658		*up_p = *parv;
1659		else
1660		{
1661	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1662	<	return -1;
1661	>	if (find_user_host(source_p, *parv, user, host) == 0)
1662	>	return 0;
1663
1664		*up_p = user;
1665		*h_p = host;
#	Line 1902 | Line 1668 | parse_aline(const char *cmd, struct Clie
1668		parc--;
1669		parv++;
1670
1671	<	if (parc != 0)
1671	>	if (parc)
1672		{
1673		if (irccmp(*parv, "ON") == 0)
1674		{
1675		parc--;
1676		parv++;
1677
1912	–	if (target_server == NULL)
1913	–	{
1914	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1915	–	return -1;
1916	–	}
1917	–
1678		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1679		{
1680		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1681	<	return -1;
1681	>	return 0;
1682		}
1683
1684		if (parc == 0 || EmptyString(*parv))
1685		{
1686		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1687	<	return -1;
1687	>	return 0;
1688		}
1689
1690		*target_server = *parv;
#	Line 1936 | Line 1696 | parse_aline(const char *cmd, struct Clie
1696		/* Make sure target_server *is* NULL if no ON server found
1697		* caller probably NULL'd it first, but no harm to do it again -db
1698		*/
1699	<	if (target_server != NULL)
1699	>	if (target_server)
1700		*target_server = NULL;
1701		}
1702		}
1703
1704	<	if (h_p != NULL)
1704	>	if (h_p)
1705		{
1706	<	if (strchr(user, '!') != NULL)
1706	>	if (strchr(user, '!'))
1707		{
1708		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1709	<	return -1;
1709	>	return 0;
1710		}
1711
1712	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1713	<	return -1;
1712	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1713	>	return 0;
1714		}
1715		else
1716	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1717	<	return -1;
1716	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1717	>	return 0;
1718
1719	<	if (reason != NULL)
1719	>	if (reason)
1720		{
1721	<	if (parc != 0 && !EmptyString(*parv))
1962	<	{
1721	>	if (parc && !EmptyString(*parv))
1722		*reason = *parv;
1964	–	if (!valid_comment(source_p, *reason, 1))
1965	–	return -1;
1966	–	}
1723		else
1724	<	*reason = def_reason;
1724	>	*reason = default_reason;
1725		}
1726
1727		return 1;
1728		}
1729
1974	–	/* find_user_host()
1975	–	*
1976	–	* inputs       - pointer to client placing kline
1977	–	*              - pointer to user_host_or_nick
1978	–	*              - pointer to user buffer
1979	–	*              - pointer to host buffer
1980	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1981	–	* side effects -
1982	–	*/
1983	–	static int
1984	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1985	–	char *luser, char *lhost, unsigned int flags)
1986	–	{
1987	–	struct Client *target_p = NULL;
1988	–	char *hostp = NULL;
1989	–
1990	–	if (lhost == NULL)
1991	–	{
1992	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1993	–	return 1;
1994	–	}
1995	–
1996	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1997	–	{
1998	–	/* Explicit user@host mask given */
1999	–
2000	–	if (hostp != NULL)                            /* I'm a little user@host */
2001	–	{
2002	–	*(hostp++) = '\0';                       /* short and squat */
2003	–	if (*user_host_or_nick)
2004	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2005	–	else
2006	–	strcpy(luser, "*");
2007	–
2008	–	if (*hostp)
2009	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2010	–	else
2011	–	strcpy(lhost, "*");
2012	–	}
2013	–	else
2014	–	{
2015	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2016	–	luser[1] = '\0';
2017	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2018	–	}
2019	–
2020	–	return 1;
2021	–	}
2022	–	else
2023	–	{
2024	–	/* Try to find user@host mask from nick */
2025	–	/* Okay to use source_p as the first param, because source_p == client_p */
2026	–	if ((target_p =
2027	–	find_chasing(source_p, user_host_or_nick)) == NULL)
2028	–	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
2029	–
2030	–	if (IsExemptKline(target_p))
2031	–	{
2032	–	if (!IsServer(source_p))
2033	–	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2034	–	return 0;
2035	–	}
2036	–
2037	–	/*
2038	–	* turn the "user" bit into "*user", blow away '~'
2039	–	* if found in original user name (non-idented)
2040	–	*/
2041	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2042	–
2043	–	if (target_p->username[0] == '~')
2044	–	luser[0] = '*';
2045	–
2046	–	if (target_p->sockhost[0] == '\0' ||
2047	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2048	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2049	–	else
2050	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2051	–	return 1;
2052	–	}
2053	–
2054	–	return 0;
2055	–	}
2056	–
2057	–	/* valid_comment()
2058	–	*
2059	–	* inputs       - pointer to client
2060	–	*              - pointer to comment
2061	–	* output       - 0 if no valid comment,
2062	–	*              - 1 if valid
2063	–	* side effects - truncates reason where necessary
2064	–	*/
2065	–	int
2066	–	valid_comment(struct Client *source_p, char *comment, int warn)
2067	–	{
2068	–	if (strlen(comment) > REASONLEN)
2069	–	comment[REASONLEN-1] = '\0';
2070	–
2071	–	return 1;
2072	–	}
2073	–
1730		/* match_conf_password()
1731		*
1732		* inputs       - pointer to given password
#	Line 2099 | Line 1755 | match_conf_password(const char *password
1755		*
1756		* inputs       - client sending the cluster
1757		*              - command name "KLINE" "XLINE" etc.
1758	<	*              - capab -- CAP_KLN etc. from server.h
1758	>	*              - capab -- CAPAB_KLN etc. from server.h
1759		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1760		*              - pattern and args to send along
1761		* output       - none
#	Line 2107 | Line 1763 | match_conf_password(const char *password
1763		*                along to all servers that match capab and cluster type
1764		*/
1765		void
1766	<	cluster_a_line(struct Client *source_p, const char *command,
1767	<	int capab, int cluster_type, const char *pattern, ...)
1766	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1767	>	unsigned int cluster_type, const char *pattern, ...)
1768		{
1769		va_list args;
1770		char buffer[IRCD_BUFSIZE] = "";
1771	<	const dlink_node *ptr = NULL;
1771	>	const dlink_node *node = NULL;
1772
1773		va_start(args, pattern);
1774		vsnprintf(buffer, sizeof(buffer), pattern, args);
1775		va_end(args);
1776
1777	<	DLINK_FOREACH(ptr, cluster_items.head)
1777	>	DLINK_FOREACH(node, cluster_items.head)
1778		{
1779	<	const struct MaskItem *conf = ptr->data;
1779	>	const struct MaskItem *conf = node->data;
1780
1781		if (conf->flags & cluster_type)
1782	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1782	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1783		"%s %s %s", command, conf->name, buffer);
1784		}
1785		}
#	Line 2163 | Line 1819 | split_nuh(struct split_nuh_item *const i
1819
1820		if (iptr->nickptr)
1821		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1822	+
1823		if (iptr->userptr)
1824		strlcpy(iptr->userptr, "*", iptr->usersize);
1825	+
1826		if (iptr->hostptr)
1827		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1828
#	Line 2207 | Line 1865 | split_nuh(struct split_nuh_item *const i
1865		}
1866		else
1867		{
1868	<	/* no @ found */
1868	>	/* No @ found */
1869		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1870		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1871		else

Diff Legend

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