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 4162 by michael, Thu Jul 3 19:39:31 2014 UTC vs.
Revision 5506 by michael, Mon Feb 9 19:11:43 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
59
60		/* general conf items link list root, other than k lines etc. */
61	<	dlink_list service_items = { NULL, NULL, 0 };
62	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list oconf_items   = { NULL, NULL, 0 };
65	<	dlink_list uconf_items   = { NULL, NULL, 0 };
66	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list cresv_items   = { NULL, NULL, 0 };
61	>	dlink_list service_items;
62	>	dlink_list server_items;
63	>	dlink_list cluster_items;
64	>	dlink_list oconf_items;
65	>	dlink_list uconf_items;
66	>	dlink_list xconf_items;
67	>	dlink_list nresv_items;
68	>	dlink_list cresv_items;
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
73		extern int yyparse(); /* defined in y.tab.c */
74
74	–	/* internally defined functions */
75	–	static void read_conf(FILE *);
76	–	static void clear_out_old_conf(void);
77	–	static void expire_tklines(dlink_list *);
78	–	static void garbage_collect_ip_entries(void);
79	–	static int hash_ip(struct irc_ssaddr *);
80	–	static int verify_access(struct Client *);
81	–	static int attach_iline(struct Client *, struct MaskItem *);
82	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
83	–	static dlink_list *map_to_list(enum maskitem_type);
84	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
85	–
86	–
87	–	/* usually, with hash tables, you use a prime number...
88	–	* but in this case I am dealing with ip addresses,
89	–	* not ascii strings.
90	–	*/
91	–	#define IP_HASH_SIZE 0x1000
92	–
93	–	struct ip_entry
94	–	{
95	–	struct irc_ssaddr ip;
96	–	unsigned int count;  /**< Number of registered users using this IP */
97	–	unsigned int connection_count;  /**< Number of connections from this IP in the last throttle_time duration */
98	–	time_t last_attempt;  /**< The last time someone connected from this IP */
99	–	struct ip_entry *next;
100	–	};
101	–
102	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
103	–	static mp_pool_t *ip_entry_pool = NULL;
104	–	static int ip_entries_count = 0;
105	–
75
76		/* conf_dns_callback()
77		*
#	Line 115 | Line 84 | static int ip_entries_count = 0;
84		* if successful save hp in the conf item it was called with
85		*/
86		static void
87	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
87	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
88		{
89	<	struct MaskItem *conf = vptr;
89	>	struct MaskItem *const conf = vptr;
90
91		conf->dns_pending = 0;
92
#	Line 136 | Line 105 | conf_dns_callback(void *vptr, const stru
105		static void
106		conf_dns_lookup(struct MaskItem *conf)
107		{
108	<	if (!conf->dns_pending)
108	>	if (conf->dns_pending)
109	>	return;
110	>
111	>	conf->dns_pending = 1;
112	>
113	>	if (conf->aftype == AF_INET)
114	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
115	>	else
116	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
117	>	}
118	>
119	>	/* map_to_list()
120	>	*
121	>	* inputs       - ConfType conf
122	>	* output       - pointer to dlink_list to use
123	>	* side effects - none
124	>	*/
125	>	static dlink_list *
126	>	map_to_list(enum maskitem_type type)
127	>	{
128	>	switch (type)
129		{
130	<	conf->dns_pending = 1;
131	<	gethost_byname(conf_dns_callback, conf, conf->host);
130	>	case CONF_XLINE:
131	>	return &xconf_items;
132	>	break;
133	>	case CONF_ULINE:
134	>	return &uconf_items;
135	>	break;
136	>	case CONF_NRESV:
137	>	return &nresv_items;
138	>	break;
139	>	case CONF_CRESV:
140	>	return &cresv_items;
141	>	break;
142	>	case CONF_OPER:
143	>	return &oconf_items;
144	>	break;
145	>	case CONF_SERVER:
146	>	return &server_items;
147	>	break;
148	>	case CONF_SERVICE:
149	>	return &service_items;
150	>	break;
151	>	case CONF_CLUSTER:
152	>	return &cluster_items;
153	>	break;
154	>	default:
155	>	return NULL;
156		}
157		}
158
159		struct MaskItem *
160		conf_make(enum maskitem_type type)
161		{
162	<	struct MaskItem *conf = MyCalloc(sizeof(*conf));
162	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
163		dlink_list *list = NULL;
164
165		conf->type   = type;
#	Line 161 | Line 174 | conf_make(enum maskitem_type type)
174		void
175		conf_free(struct MaskItem *conf)
176		{
177	<	dlink_node *ptr = NULL, *ptr_next = NULL;
177	>	dlink_node *node = NULL, *node_next = NULL;
178		dlink_list *list = NULL;
179
180	<	if (conf->node.next)
181	<	if ((list = map_to_list(conf->type)))
169	<	dlinkDelete(&conf->node, list);
180	>	if ((list = map_to_list(conf->type)))
181	>	dlinkFindDelete(list, conf);
182
183		MyFree(conf->name);
184
#	Line 191 | Line 203 | conf_free(struct MaskItem *conf)
203		if (conf->rsa_public_key)
204		RSA_free(conf->rsa_public_key);
205		#endif
206	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207		{
208	<	MyFree(ptr->data);
209	<	dlinkDelete(ptr, &conf->hub_list);
210	<	free_dlink_node(ptr);
208	>	MyFree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211		}
212
213	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	MyFree(ptr->data);
216	<	dlinkDelete(ptr, &conf->leaf_list);
217	<	free_dlink_node(ptr);
215	>	MyFree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
219
220	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	struct exempt *exptr = ptr->data;
222	>	struct exempt *exptr = node->data;
223
224	<	dlinkDelete(ptr, &conf->exempt_list);
224	>	dlinkDelete(node, &conf->exempt_list);
225		MyFree(exptr->name);
226		MyFree(exptr->user);
227		MyFree(exptr->host);
#	Line 219 | Line 231 | conf_free(struct MaskItem *conf)
231		MyFree(conf);
232		}
233
234	<	/* check_client()
234	>	/* attach_iline()
235		*
236	<	* inputs       - pointer to client
237	<	* output       - 0 = Success
238	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
239	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
228	<	*                I_LINE_FULL       (-3) = I-line is full
229	<	*                TOO_MANY          (-4) = Too many connections from hostname
230	<	*                BANNED_CLIENT     (-5) = K-lined
231	<	* side effects - Ordinary client access check.
232	<	*                Look for conf lines which have the same
233	<	*                status as the flags passed.
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240		*/
241	<	int
242	<	check_client(struct Client *source_p)
241	>	static int
242	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
243		{
244	<	int i;
245	<
246	<	if ((i = verify_access(source_p)))
247	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
242	<	source_p->name, source_p->sockhost);
243	<
244	<	switch (i)
245	<	{
246	<	case TOO_MANY:
247	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
248	<	"Too many on IP for %s (%s).",
249	<	get_client_name(source_p, SHOW_IP),
250	<	source_p->sockhost);
251	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
252	<	get_client_name(source_p, SHOW_IP));
253	<	++ServerStats.is_ref;
254	<	exit_client(source_p, "No more connections allowed on that IP");
255	<	break;
244	>	const struct ClassItem *const class = conf->class;
245	>	struct ip_entry *ip_found;
246	>	int a_limit_reached = 0;
247	>	unsigned int local = 0, global = 0, ident = 0;
248
249	<	case I_LINE_FULL:
250	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
251	<	"auth{} block is full for %s (%s).",
260	<	get_client_name(source_p, SHOW_IP),
261	<	source_p->sockhost);
262	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
263	<	get_client_name(source_p, SHOW_IP));
264	<	++ServerStats.is_ref;
265	<	exit_client(source_p, "No more connections allowed in your connection class");
266	<	break;
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250	>	ip_found->count++;
251	>	AddFlag(client_p, FLAGS_IPHASH);
252
253	<	case NOT_AUTHORIZED:
254	<	++ServerStats.is_ref;
270	<	/* jdc - lists server name & port connections are on */
271	<	/*       a purely cosmetical change */
272	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
273	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
274	<	get_client_name(source_p, SHOW_IP),
275	<	source_p->sockhost,
276	<	source_p->localClient->listener->name,
277	<	source_p->localClient->listener->port);
278	<	ilog(LOG_TYPE_IRCD,
279	<	"Unauthorized client connection from %s on [%s/%u].",
280	<	get_client_name(source_p, SHOW_IP),
281	<	source_p->localClient->listener->name,
282	<	source_p->localClient->listener->port);
253	>	count_user_host(client_p->username, client_p->host,
254	>	&global, &local, &ident);
255
256	<	exit_client(source_p, "You are not authorized to use this server");
257	<	break;
256	>	/* XXX blah. go down checking the various silly limits
257	>	* setting a_limit_reached if any limit is reached.
258	>	* - Dianora
259	>	*/
260	>	if (class->max_total && class->ref_count >= class->max_total)
261	>	a_limit_reached = 1;
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263	>	a_limit_reached = 1;
264	>	else if (class->max_local && local >= class->max_local)
265	>	a_limit_reached = 1;
266	>	else if (class->max_global && global >= class->max_global)
267	>	a_limit_reached = 1;
268	>	else if (class->max_ident && ident >= class->max_ident &&
269	>	client_p->username[0] != '~')
270	>	a_limit_reached = 1;
271
272	<	case BANNED_CLIENT:
273	<	exit_client(source_p, "Banned");
274	<	++ServerStats.is_ref;
275	<	break;
272	>	if (a_limit_reached)
273	>	{
274	>	if (!IsConfExemptLimits(conf))
275	>	return TOO_MANY;   /* Already at maximum allowed */
276
277	<	case 0:
278	<	default:
294	<	break;
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281	<	return (i < 0 ? 0 : 1);
281	>	return attach_conf(client_p, conf);
282		}
283
284		/* verify_access()
285		*
286	<	* inputs       - pointer to client to verify
287	<	* output       - 0 if success -'ve if not
288	<	* side effect  - find the first (best) I line to attach.
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289		*/
290		static int
291		verify_access(struct Client *client_p)
#	Line 312 | Line 296 | verify_access(struct Client *client_p)
296		if (IsGotId(client_p))
297		{
298		conf = find_address_conf(client_p->host, client_p->username,
299	<	&client_p->localClient->ip,
300	<	client_p->localClient->aftype,
301	<	client_p->localClient->passwd);
299	>	&client_p->connection->ip,
300	>	client_p->connection->aftype,
301	>	client_p->connection->password);
302		}
303		else
304		{
305		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
306	<	conf = find_address_conf(client_p->host,non_ident,
307	<	&client_p->localClient->ip,
308	<	client_p->localClient->aftype,
309	<	client_p->localClient->passwd);
306	>	conf = find_address_conf(client_p->host, non_ident,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311
312		if (conf)
#	Line 337 | Line 321 | verify_access(struct Client *client_p)
321		return NOT_AUTHORIZED;
322		}
323
340	–	if (IsConfDoIdentd(conf))
341	–	SetNeedId(client_p);
342	–
324		/* Thanks for spoof idea amm */
325		if (IsConfDoSpoofIp(conf))
326		{
327	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
328	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
348	<	"%s spoofing: %s as %s",
327	>	if (IsConfSpoofNotice(conf))
328	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329		client_p->name, client_p->host, conf->name);
330	+
331		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
351	–	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
332		}
333
334		return attach_iline(client_p, conf);
335		}
336	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
336	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337		{
338		if (IsConfGline(conf))
339		sendto_one_notice(client_p, &me, ":*** G-lined");
340	+
341		sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342		return BANNED_CLIENT;
343		}
#	Line 365 | Line 346 | verify_access(struct Client *client_p)
346		return NOT_AUTHORIZED;
347		}
348
349	<	/* attach_iline()
369	<	*
370	<	* inputs       - client pointer
371	<	*              - conf pointer
372	<	* output       -
373	<	* side effects - do actual attach
374	<	*/
375	<	static int
376	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
377	<	{
378	<	struct ClassItem *class = NULL;
379	<	struct ip_entry *ip_found;
380	<	int a_limit_reached = 0;
381	<	unsigned int local = 0, global = 0, ident = 0;
382	<
383	<	assert(conf->class);
384	<
385	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
386	<	ip_found->count++;
387	<	SetIpHash(client_p);
388	<
389	<	class = conf->class;
390	<
391	<	count_user_host(client_p->username, client_p->host,
392	<	&global, &local, &ident);
393	<
394	<	/* XXX blah. go down checking the various silly limits
395	<	* setting a_limit_reached if any limit is reached.
396	<	* - Dianora
397	<	*/
398	<	if (class->max_total && class->ref_count >= class->max_total)
399	<	a_limit_reached = 1;
400	<	else if (class->max_perip && ip_found->count > class->max_perip)
401	<	a_limit_reached = 1;
402	<	else if (class->max_local && local >= class->max_local)
403	<	a_limit_reached = 1;
404	<	else if (class->max_global && global >= class->max_global)
405	<	a_limit_reached = 1;
406	<	else if (class->max_ident && ident >= class->max_ident &&
407	<	client_p->username[0] != '~')
408	<	a_limit_reached = 1;
409	<
410	<	if (a_limit_reached)
411	<	{
412	<	if (!IsConfExemptLimits(conf))
413	<	return TOO_MANY;   /* Already at maximum allowed */
414	<
415	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
416	<	"but you have exceed_limit = yes;");
417	<	}
418	<
419	<	return attach_conf(client_p, conf);
420	<	}
421	<
422	<	/* init_ip_hash_table()
423	<	*
424	<	* inputs               - NONE
425	<	* output               - NONE
426	<	* side effects         - allocate memory for ip_entry(s)
427	<	*                      - clear the ip hash table
428	<	*/
429	<	void
430	<	init_ip_hash_table(void)
431	<	{
432	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
433	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
434	<	}
435	<
436	<	/* find_or_add_ip()
437	<	*
438	<	* inputs       - pointer to struct irc_ssaddr
439	<	* output       - pointer to a struct ip_entry
440	<	* side effects -
349	>	/* check_client()
350		*
351	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
352	<	* count set to 0.
351	>	* inputs       - pointer to client
352	>	* output       - 0 = Success
353	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
354	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
355	>	*                I_LINE_FULL       (-3) = I-line is full
356	>	*                TOO_MANY          (-4) = Too many connections from hostname
357	>	*                BANNED_CLIENT     (-5) = K-lined
358	>	* side effects - Ordinary client access check.
359	>	*                Look for conf lines which have the same
360	>	*                status as the flags passed.
361		*/
362	<	static struct ip_entry *
363	<	find_or_add_ip(struct irc_ssaddr *ip_in)
362	>	int
363	>	check_client(struct Client *source_p)
364		{
365	<	struct ip_entry *ptr, *newptr;
449	<	int hash_index = hash_ip(ip_in), res;
450	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
451	<	#ifdef IPV6
452	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
453	<	#endif
454	<
455	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
456	<	{
457	<	#ifdef IPV6
458	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
459	<	continue;
460	<	if (ip_in->ss.ss_family == AF_INET6)
461	<	{
462	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
463	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
464	<	}
465	<	else
466	<	#endif
467	<	{
468	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
469	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
470	<	}
471	<	if (res == 0)
472	<	{
473	<	/* Found entry already in hash, return it. */
474	<	return ptr;
475	<	}
476	<	}
477	<
478	<	if (ip_entries_count >= 2 * hard_fdlimit)
479	<	garbage_collect_ip_entries();
480	<
481	<	newptr = mp_pool_get(ip_entry_pool);
482	<
483	<	ip_entries_count++;
484	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
485	<
486	<	newptr->next = ip_hash_table[hash_index];
487	<	ip_hash_table[hash_index] = newptr;
488	<
489	<	return newptr;
490	<	}
365	>	int i;
366
367	<	/* remove_one_ip()
368	<	*
369	<	* inputs        - unsigned long IP address value
495	<	* output        - NONE
496	<	* side effects  - The ip address given, is looked up in ip hash table
497	<	*                 and number of ip#'s for that ip decremented.
498	<	*                 If ip # count reaches 0 and has expired,
499	<	*                 the struct ip_entry is returned to the ip_entry_heap
500	<	*/
501	<	void
502	<	remove_one_ip(struct irc_ssaddr *ip_in)
503	<	{
504	<	struct ip_entry *ptr;
505	<	struct ip_entry *last_ptr = NULL;
506	<	int hash_index = hash_ip(ip_in), res;
507	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
508	<	#ifdef IPV6
509	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
510	<	#endif
367	>	if ((i = verify_access(source_p)))
368	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
369	>	source_p->name, source_p->sockhost);
370
371	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
371	>	switch (i)
372		{
373	<	#ifdef IPV6
374	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
375	<	continue;
376	<	if (ip_in->ss.ss_family == AF_INET6)
377	<	{
378	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
379	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
380	<	}
381	<	else
382	<	#endif
524	<	{
525	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
526	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
527	<	}
528	<	if (res)
529	<	continue;
530	<	if (ptr->count > 0)
531	<	ptr->count--;
532	<	if (ptr->count == 0 &&
533	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
534	<	{
535	<	if (last_ptr != NULL)
536	<	last_ptr->next = ptr->next;
537	<	else
538	<	ip_hash_table[hash_index] = ptr->next;
539	<
540	<	mp_pool_release(ptr);
541	<	ip_entries_count--;
542	<	return;
543	<	}
544	<	last_ptr = ptr;
545	<	}
546	<	}
373	>	case TOO_MANY:
374	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
375	>	"Too many on IP for %s (%s).",
376	>	get_client_name(source_p, SHOW_IP),
377	>	source_p->sockhost);
378	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
379	>	get_client_name(source_p, SHOW_IP));
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "No more connections allowed on that IP");
382	>	break;
383
384	<	/* hash_ip()
385	<	*
386	<	* input        - pointer to an irc_inaddr
387	<	* output       - integer value used as index into hash table
388	<	* side effects - hopefully, none
389	<	*/
390	<	static int
391	<	hash_ip(struct irc_ssaddr *addr)
392	<	{
393	<	if (addr->ss.ss_family == AF_INET)
558	<	{
559	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
560	<	int hash;
561	<	uint32_t ip;
384	>	case I_LINE_FULL:
385	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
386	>	"auth {} block is full for %s (%s).",
387	>	get_client_name(source_p, SHOW_IP),
388	>	source_p->sockhost);
389	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
390	>	get_client_name(source_p, SHOW_IP));
391	>	++ServerStats.is_ref;
392	>	exit_client(source_p, "No more connections allowed in your connection class");
393	>	break;
394
395	<	ip   = ntohl(v4->sin_addr.s_addr);
396	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
397	<	return hash;
398	<	}
399	<	#ifdef IPV6
400	<	else
401	<	{
402	<	int hash;
403	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
404	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
405	<
406	<	hash  = ip[0] ^ ip[3];
407	<	hash ^= hash >> 16;
576	<	hash ^= hash >> 8;
577	<	hash  = hash & (IP_HASH_SIZE - 1);
578	<	return hash;
579	<	}
580	<	#else
581	<	return 0;
582	<	#endif
583	<	}
395	>	case NOT_AUTHORIZED:
396	>	/* jdc - lists server name & port connections are on */
397	>	/*       a purely cosmetical change */
398	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
399	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
400	>	get_client_name(source_p, SHOW_IP),
401	>	source_p->sockhost,
402	>	source_p->connection->listener->name,
403	>	source_p->connection->listener->port);
404	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->connection->listener->name,
407	>	source_p->connection->listener->port);
408
409	<	/* count_ip_hash()
410	<	*
411	<	* inputs        - pointer to counter of number of ips hashed
588	<	*               - pointer to memory used for ip hash
589	<	* output        - returned via pointers input
590	<	* side effects  - NONE
591	<	*
592	<	* number of hashed ip #'s is counted up, plus the amount of memory
593	<	* used in the hash.
594	<	*/
595	<	void
596	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
597	<	{
598	<	struct ip_entry *ptr;
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "You are not authorized to use this server");
411	>	break;
412
413	<	*number_ips_stored = 0;
414	<	*mem_ips_stored    = 0;
413	>	case BANNED_CLIENT:
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "Banned");
416	>	break;
417
418	<	for (unsigned int i = 0; i < IP_HASH_SIZE; ++i)
419	<	{
420	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
606	<	{
607	<	*number_ips_stored += 1;
608	<	*mem_ips_stored += sizeof(struct ip_entry);
609	<	}
418	>	case 0:
419	>	default:
420	>	break;
421		}
611	–	}
422
423	<	/* garbage_collect_ip_entries()
614	<	*
615	<	* input        - NONE
616	<	* output       - NONE
617	<	* side effects - free up all ip entries with no connections
618	<	*/
619	<	static void
620	<	garbage_collect_ip_entries(void)
621	<	{
622	<	struct ip_entry *ptr;
623	<	struct ip_entry *last_ptr;
624	<	struct ip_entry *next_ptr;
625	<
626	<	for (unsigned int i = 0; i < IP_HASH_SIZE; ++i)
627	<	{
628	<	last_ptr = NULL;
629	<
630	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
631	<	{
632	<	next_ptr = ptr->next;
633	<
634	<	if (ptr->count == 0 &&
635	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
636	<	{
637	<	if (last_ptr != NULL)
638	<	last_ptr->next = ptr->next;
639	<	else
640	<	ip_hash_table[i] = ptr->next;
641	<	mp_pool_release(ptr);
642	<	ip_entries_count--;
643	<	}
644	<	else
645	<	last_ptr = ptr;
646	<	}
647	<	}
423	>	return !(i < 0);
424		}
425
426		/* detach_conf()
#	Line 658 | Line 434 | garbage_collect_ip_entries(void)
434		void
435		detach_conf(struct Client *client_p, enum maskitem_type type)
436		{
437	<	dlink_node *ptr = NULL, *ptr_next = NULL;
437	>	dlink_node *node = NULL, *node_next = NULL;
438
439	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
439	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
440		{
441	<	struct MaskItem *conf = ptr->data;
441	>	struct MaskItem *conf = node->data;
442
443		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
444		assert(conf->ref_count > 0);
#	Line 671 | Line 447 | detach_conf(struct Client *client_p, enu
447		if (!(conf->type & type))
448		continue;
449
450	<	dlinkDelete(ptr, &client_p->localClient->confs);
451	<	free_dlink_node(ptr);
450	>	dlinkDelete(node, &client_p->connection->confs);
451	>	free_dlink_node(node);
452
453		if (conf->type == CONF_CLIENT)
454	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
454	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
455
456		if (--conf->class->ref_count == 0 && conf->class->active == 0)
457		{
#	Line 701 | Line 477 | detach_conf(struct Client *client_p, enu
477		int
478		attach_conf(struct Client *client_p, struct MaskItem *conf)
479		{
480	<	if (dlinkFind(&client_p->localClient->confs, conf))
480	>	if (dlinkFind(&client_p->connection->confs, conf))
481		return 1;
482
483		if (conf->type == CONF_CLIENT)
484		if (cidr_limit_reached(IsConfExemptLimits(conf),
485	<	&client_p->localClient->ip, conf->class))
485	>	&client_p->connection->ip, conf->class))
486		return TOO_MANY;    /* Already at maximum allowed */
487
488		conf->class->ref_count++;
489		conf->ref_count++;
490
491	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
491	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
492
493		return 0;
494		}
#	Line 729 | Line 505 | int
505		attach_connect_block(struct Client *client_p, const char *name,
506		const char *host)
507		{
508	<	dlink_node *ptr;
733	<	struct MaskItem *conf = NULL;
508	>	dlink_node *node = NULL;
509
510	<	assert(client_p != NULL);
736	<	assert(host != NULL);
510	>	assert(host);
511
512	<	if (client_p == NULL || host == NULL)
739	<	return 0;
740	<
741	<	DLINK_FOREACH(ptr, server_items.head)
512	>	DLINK_FOREACH(node, server_items.head)
513		{
514	<	conf = ptr->data;
514	>	struct MaskItem *conf = node->data;
515
516		if (match(conf->name, name) || match(conf->host, host))
517		continue;
#	Line 764 | Line 535 | attach_connect_block(struct Client *clie
535		struct MaskItem *
536		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
537		{
538	<	dlink_node *ptr;
768	<	struct MaskItem* conf;
538	>	dlink_node *node = NULL;
539
540	<	DLINK_FOREACH(ptr, list->head)
540	>	DLINK_FOREACH(node, list->head)
541		{
542	<	conf = ptr->data;
542	>	struct MaskItem *conf = node->data;
543
544		if (conf->type == type)
545		{
546	<	if (conf->name && (!irccmp(conf->name, name) ||
547	<	!match(conf->name, name)))
778	<	return conf;
546	>	if (conf->name && !irccmp(conf->name, name))
547	>	return conf;
548		}
549		}
550
551		return NULL;
552		}
553
785	–	/* map_to_list()
786	–	*
787	–	* inputs       - ConfType conf
788	–	* output       - pointer to dlink_list to use
789	–	* side effects - none
790	–	*/
791	–	static dlink_list *
792	–	map_to_list(enum maskitem_type type)
793	–	{
794	–	switch(type)
795	–	{
796	–	case CONF_XLINE:
797	–	return(&xconf_items);
798	–	break;
799	–	case CONF_ULINE:
800	–	return(&uconf_items);
801	–	break;
802	–	case CONF_NRESV:
803	–	return(&nresv_items);
804	–	break;
805	–	case CONF_CRESV:
806	–	return(&cresv_items);
807	–	case CONF_OPER:
808	–	return(&oconf_items);
809	–	break;
810	–	case CONF_SERVER:
811	–	return(&server_items);
812	–	break;
813	–	case CONF_SERVICE:
814	–	return(&service_items);
815	–	break;
816	–	case CONF_CLUSTER:
817	–	return(&cluster_items);
818	–	break;
819	–	default:
820	–	return NULL;
821	–	}
822	–	}
823	–
554		/* find_matching_name_conf()
555		*
556		* inputs       - type of link list to look in
#	Line 835 | Line 565 | struct MaskItem *
565		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
566		const char *host, unsigned int flags)
567		{
568	<	dlink_node *ptr=NULL;
569	<	struct MaskItem *conf=NULL;
570	<	dlink_list *list_p = map_to_list(type);
568	>	dlink_node *node = NULL;
569	>	dlink_list *list = map_to_list(type);
570	>	struct MaskItem *conf = NULL;
571
572		switch (type)
573		{
574		case CONF_SERVICE:
575	<	DLINK_FOREACH(ptr, list_p->head)
575	>	DLINK_FOREACH(node, list->head)
576		{
577	<	conf = ptr->data;
577	>	conf = node->data;
578
579		if (EmptyString(conf->name))
580		continue;
581	<	if ((name != NULL) && !irccmp(name, conf->name))
581	>	if (name && !irccmp(name, conf->name))
582		return conf;
583		}
584		break;
#	Line 857 | Line 587 | find_matching_name_conf(enum maskitem_ty
587		case CONF_ULINE:
588		case CONF_NRESV:
589		case CONF_CRESV:
590	<	DLINK_FOREACH(ptr, list_p->head)
590	>	DLINK_FOREACH(node, list->head)
591		{
592	<	conf = ptr->data;
592	>	conf = node->data;
593
594		if (EmptyString(conf->name))
595		continue;
596	<	if ((name != NULL) && !match(conf->name, name))
596	>	if (name && !match(conf->name, name))
597		{
598		if ((user == NULL && (host == NULL)))
599		return conf;
#	Line 878 | Line 608 | find_matching_name_conf(enum maskitem_ty
608		break;
609
610		case CONF_SERVER:
611	<	DLINK_FOREACH(ptr, list_p->head)
611	>	DLINK_FOREACH(node, list->head)
612		{
613	<	conf = ptr->data;
613	>	conf = node->data;
614
615	<	if ((name != NULL) && !match(name, conf->name))
615	>	if (name && !match(name, conf->name))
616		return conf;
617	<	else if ((host != NULL) && !match(host, conf->host))
617	>	if (host && !match(host, conf->host))
618		return conf;
619		}
620		break;
#	Line 908 | Line 638 | struct MaskItem *
638		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
639		const char *user, const char *host)
640		{
641	<	dlink_node *ptr = NULL;
642	<	struct MaskItem *conf;
643	<	dlink_list *list_p = map_to_list(type);
641	>	dlink_node *node = NULL;
642	>	dlink_list *list = map_to_list(type);
643	>	struct MaskItem *conf = NULL;
644
645		switch(type)
646		{
#	Line 919 | Line 649 | find_exact_name_conf(enum maskitem_type
649		case CONF_NRESV:
650		case CONF_CRESV:
651
652	<	DLINK_FOREACH(ptr, list_p->head)
652	>	DLINK_FOREACH(node, list->head)
653		{
654	<	conf = ptr->data;
654	>	conf = node->data;
655
656		if (EmptyString(conf->name))
657		continue;
#	Line 939 | Line 669 | find_exact_name_conf(enum maskitem_type
669		break;
670
671		case CONF_OPER:
672	<	DLINK_FOREACH(ptr, list_p->head)
672	>	DLINK_FOREACH(node, list->head)
673		{
674	<	conf = ptr->data;
674	>	conf = node->data;
675
676		if (EmptyString(conf->name))
677		continue;
#	Line 962 | Line 692 | find_exact_name_conf(enum maskitem_type
692		return conf;
693		break;
694		case HM_IPV4:
695	<	if (who->localClient->aftype == AF_INET)
696	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
695	>	if (who->connection->aftype == AF_INET)
696	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
697		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
698		return conf;
699		break;
970	–	#ifdef IPV6
700		case HM_IPV6:
701	<	if (who->localClient->aftype == AF_INET6)
702	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
701	>	if (who->connection->aftype == AF_INET6)
702	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
703		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
704		return conf;
705		break;
977	–	#endif
706		default:
707		assert(0);
708		}
#	Line 985 | Line 713 | find_exact_name_conf(enum maskitem_type
713		break;
714
715		case CONF_SERVER:
716	<	DLINK_FOREACH(ptr, list_p->head)
716	>	DLINK_FOREACH(node, list->head)
717		{
718	<	conf = ptr->data;
718	>	conf = node->data;
719
720		if (EmptyString(conf->name))
721		continue;
#	Line 1012 | Line 740 | find_exact_name_conf(enum maskitem_type
740		return NULL;
741		}
742
1015	–	/* rehash()
1016	–	*
1017	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1018	–	* as a result of an operator issuing this command, else assume it has been
1019	–	* called as a result of the server receiving a HUP signal.
1020	–	*/
1021	–	int
1022	–	rehash(int sig)
1023	–	{
1024	–	if (sig)
1025	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1026	–	"Got signal SIGHUP, reloading configuration file(s)");
1027	–
1028	–	restart_resolver();
1029	–
1030	–	/* don't close listeners until we know we can go ahead with the rehash */
1031	–
1032	–	/* Check to see if we magically got(or lost) IPv6 support */
1033	–	check_can_use_v6();
1034	–
1035	–	read_conf_files(0);
1036	–
1037	–	if (ServerInfo.description)
1038	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1039	–
1040	–	load_conf_modules();
1041	–	check_conf_klines();
1042	–
1043	–	return 0;
1044	–	}
1045	–
743		/* set_default_conf()
744		*
745		* inputs       - NONE
#	Line 1061 | Line 758 | set_default_conf(void)
758		assert(class_default == class_get_list()->tail->data);
759
760		#ifdef HAVE_LIBCRYPTO
761	<	ServerInfo.message_digest_algorithm = EVP_sha256();
762	<	ServerInfo.rsa_private_key = NULL;
763	<	ServerInfo.rsa_private_key_file = NULL;
761	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
762	>	{
763	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
764	>
765	>	if (key)
766	>	{
767	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
768	>	EC_KEY_free(key);
769	>	}
770	>	}
771	>
772	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
773		#endif
774
775	<	/* ServerInfo.name is not rehashable */
776	<	/* ServerInfo.name = ServerInfo.name; */
777	<	ServerInfo.description = NULL;
778	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
779	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
780	<
781	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
782	<	ServerInfo.specific_ipv4_vhost = 0;
783	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
784	<	ServerInfo.specific_ipv6_vhost = 0;
785	<
786	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
787	<	ServerInfo.max_nick_length = 9;
788	<	ServerInfo.max_topic_length = 80;
789	<
790	<	ServerInfo.hub = 0;
791	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
792	<	ServerInfo.dns_host.sin_port = 0;
793	<	AdminInfo.name = NULL;
794	<	AdminInfo.email = NULL;
795	<	AdminInfo.description = NULL;
775	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
776	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
777	>	ConfigServerInfo.rsa_private_key = NULL;
778	>	ConfigServerInfo.rsa_private_key_file = NULL;
779	>	#endif
780	>
781	>	/* ConfigServerInfo.name is not rehashable */
782	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
783	>	ConfigServerInfo.description = NULL;
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796	>
797	>	ConfigAdminInfo.name = NULL;
798	>	ConfigAdminInfo.email = NULL;
799	>	ConfigAdminInfo.description = NULL;
800
801		log_del_all();
802
803	<	ConfigLoggingEntry.use_logging = 1;
803	>	ConfigLog.use_logging = 1;
804
805		ConfigChannel.disable_fake_channels = 0;
806		ConfigChannel.invite_client_count = 10;
#	Line 1100 | Line 810 | set_default_conf(void)
810		ConfigChannel.knock_delay_channel = 60;
811		ConfigChannel.max_channels = 25;
812		ConfigChannel.max_bans = 25;
813	+	ConfigChannel.default_join_flood_count = 18;
814	+	ConfigChannel.default_join_flood_time = 6;
815		ConfigChannel.default_split_user_count = 0;
816		ConfigChannel.default_split_server_count = 0;
817		ConfigChannel.no_join_on_split = 0;
#	Line 1114 | Line 826 | set_default_conf(void)
826		ConfigServerHide.hide_server_ips = 0;
827		ConfigServerHide.disable_remote_commands = 0;
828
829	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
830	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
831	<	ConfigFileEntry.cycle_on_host_change = 1;
832	<	ConfigFileEntry.glines = 0;
833	<	ConfigFileEntry.gline_time = 12 * 3600;
834	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
835	<	ConfigFileEntry.gline_min_cidr = 16;
836	<	ConfigFileEntry.gline_min_cidr6 = 48;
837	<	ConfigFileEntry.invisible_on_connect = 1;
838	<	ConfigFileEntry.tkline_expire_notices = 1;
839	<	ConfigFileEntry.hide_spoof_ips = 1;
840	<	ConfigFileEntry.ignore_bogus_ts = 0;
841	<	ConfigFileEntry.disable_auth = 0;
842	<	ConfigFileEntry.kill_chase_time_limit = 90;
843	<	ConfigFileEntry.default_floodcount = 8;
844	<	ConfigFileEntry.failed_oper_notice = 1;
845	<	ConfigFileEntry.dots_in_ident = 0;
846	<	ConfigFileEntry.min_nonwildcard = 4;
847	<	ConfigFileEntry.min_nonwildcard_simple = 3;
848	<	ConfigFileEntry.max_accept = 20;
849	<	ConfigFileEntry.anti_nick_flood = 0;
850	<	ConfigFileEntry.max_nick_time = 20;
851	<	ConfigFileEntry.max_nick_changes = 5;
852	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
853	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
854	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
855	<	ConfigFileEntry.warn_no_connect_block = 1;
856	<	ConfigFileEntry.stats_e_disabled = 0;
857	<	ConfigFileEntry.stats_o_oper_only = 0;
858	<	ConfigFileEntry.stats_k_oper_only = 1;  /* 1 = masked */
859	<	ConfigFileEntry.stats_i_oper_only = 1;  /* 1 = masked */
860	<	ConfigFileEntry.stats_P_oper_only = 0;
861	<	ConfigFileEntry.stats_u_oper_only = 0;
862	<	ConfigFileEntry.caller_id_wait = 60;
863	<	ConfigFileEntry.opers_bypass_callerid = 0;
864	<	ConfigFileEntry.pace_wait = 10;
865	<	ConfigFileEntry.pace_wait_simple = 1;
866	<	ConfigFileEntry.short_motd = 0;
867	<	ConfigFileEntry.ping_cookie = 0;
868	<	ConfigFileEntry.no_oper_flood = 0;
869	<	ConfigFileEntry.true_no_oper_flood = 0;
870	<	ConfigFileEntry.oper_pass_resv = 1;
871	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
872	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
873	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
874	<	ConfigFileEntry.use_egd = 0;
875	<	ConfigFileEntry.egdpool_path = NULL;
876	<	ConfigFileEntry.throttle_count = 1;
877	<	ConfigFileEntry.throttle_time = 1;
829	>	ConfigGeneral.away_count = 2;
830	>	ConfigGeneral.away_time = 10;
831	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
832	>	ConfigGeneral.cycle_on_host_change = 1;
833	>	ConfigGeneral.glines = 0;
834	>	ConfigGeneral.gline_time = 12 * 3600;
835	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
836	>	ConfigGeneral.gline_min_cidr = 16;
837	>	ConfigGeneral.gline_min_cidr6 = 48;
838	>	ConfigGeneral.invisible_on_connect = 1;
839	>	ConfigGeneral.tkline_expire_notices = 1;
840	>	ConfigGeneral.ignore_bogus_ts = 0;
841	>	ConfigGeneral.disable_auth = 0;
842	>	ConfigGeneral.kill_chase_time_limit = 90;
843	>	ConfigGeneral.default_floodcount = 8;
844	>	ConfigGeneral.failed_oper_notice = 1;
845	>	ConfigGeneral.dots_in_ident = 0;
846	>	ConfigGeneral.min_nonwildcard = 4;
847	>	ConfigGeneral.min_nonwildcard_simple = 3;
848	>	ConfigGeneral.max_accept = 20;
849	>	ConfigGeneral.anti_nick_flood = 0;
850	>	ConfigGeneral.max_nick_time = 20;
851	>	ConfigGeneral.max_nick_changes = 5;
852	>	ConfigGeneral.anti_spam_exit_message_time = 0;
853	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
854	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
855	>	ConfigGeneral.warn_no_connect_block = 1;
856	>	ConfigGeneral.stats_e_disabled = 0;
857	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
858	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
859	>	ConfigGeneral.stats_o_oper_only = 1;
860	>	ConfigGeneral.stats_m_oper_only = 1;
861	>	ConfigGeneral.stats_P_oper_only = 0;
862	>	ConfigGeneral.stats_u_oper_only = 0;
863	>	ConfigGeneral.caller_id_wait = 60;
864	>	ConfigGeneral.opers_bypass_callerid = 0;
865	>	ConfigGeneral.pace_wait = 10;
866	>	ConfigGeneral.pace_wait_simple = 1;
867	>	ConfigGeneral.short_motd = 0;
868	>	ConfigGeneral.ping_cookie = 0;
869	>	ConfigGeneral.no_oper_flood = 0;
870	>	ConfigGeneral.oper_pass_resv = 1;
871	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
872	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
873	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
874	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
875	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
876	>	ConfigGeneral.throttle_count = 1;
877	>	ConfigGeneral.throttle_time = 1;
878		}
879
880		static void
881		validate_conf(void)
882		{
883	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
884	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1173	<
1174	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1175	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
883	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
884	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
885
886	<	if (ServerInfo.network_name == NULL)
887	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
886	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
887	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
888
889	<	if (ServerInfo.network_desc == NULL)
890	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
889	>	if (EmptyString(ConfigServerInfo.network_name))
890	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
891
892	<	if (ConfigFileEntry.service_name == NULL)
893	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
892	>	if (EmptyString(ConfigServerInfo.network_desc))
893	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
894
895	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
895	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
896		}
897
898		/* read_conf()
#	Line 1210 | Line 919 | read_conf(FILE *file)
919		class_delete_marked();  /* Delete unused classes that are marked for deletion */
920		}
921
922	+	/* conf_rehash()
923	+	*
924	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
925	+	* as a result of an operator issuing this command, else assume it has been
926	+	* called as a result of the server receiving a HUP signal.
927	+	*/
928	+	int
929	+	conf_rehash(int sig)
930	+	{
931	+	if (sig)
932	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
933	+	"Got signal SIGHUP, reloading configuration file(s)");
934	+
935	+	restart_resolver();
936	+
937	+	/* don't close listeners until we know we can go ahead with the rehash */
938	+
939	+	read_conf_files(0);
940	+
941	+	load_conf_modules();
942	+	check_conf_klines();
943	+
944	+	return 0;
945	+	}
946	+
947		/* lookup_confhost()
948		*
949		* start DNS lookups of all hostnames in the conf
#	Line 1258 | Line 992 | int
992		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
993		{
994		struct ip_entry *ip_found = NULL;
995	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
995	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
996
997		/* DLINE exempt also gets you out of static limits/pacing... */
998		if (conf && (conf->type == CONF_EXEMPT))
#	Line 1267 | Line 1001 | conf_connect_allowed(struct irc_ssaddr *
1001		if (conf)
1002		return BANNED_CLIENT;
1003
1004	<	ip_found = find_or_add_ip(addr);
1004	>	ip_found = ipcache_find_or_add_address(addr);
1005
1006	<	if ((CurrentTime - ip_found->last_attempt) < ConfigFileEntry.throttle_time)
1006	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1007		{
1008	<	if (ip_found->connection_count >= ConfigFileEntry.throttle_count)
1008	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1009		return TOO_FAST;
1010
1011		++ip_found->connection_count;
#	Line 1283 | Line 1017 | conf_connect_allowed(struct irc_ssaddr *
1017		return 0;
1018		}
1019
1286	–	/* cleanup_tklines()
1287	–	*
1288	–	* inputs       - NONE
1289	–	* output       - NONE
1290	–	* side effects - call function to expire temporary k/d lines
1291	–	*                This is an event started off in ircd.c
1292	–	*/
1293	–	void
1294	–	cleanup_tklines(void *notused)
1295	–	{
1296	–	hostmask_expire_temporary();
1297	–	expire_tklines(&xconf_items);
1298	–	expire_tklines(&nresv_items);
1299	–	expire_tklines(&cresv_items);
1300	–	}
1301	–
1020		/* expire_tklines()
1021		*
1022		* inputs       - tkline list pointer
#	Line 1306 | Line 1024 | cleanup_tklines(void *notused)
1024		* side effects - expire tklines
1025		*/
1026		static void
1027	<	expire_tklines(dlink_list *tklist)
1027	>	expire_tklines(dlink_list *list)
1028		{
1029	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1312	<	struct MaskItem *conf = NULL;
1029	>	dlink_node *node = NULL, *node_next = NULL;
1030
1031	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1031	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1032		{
1033	<	conf = ptr->data;
1033	>	struct MaskItem *conf = node->data;
1034
1035		if (!conf->until || conf->until > CurrentTime)
1036		continue;
1037
1038		if (conf->type == CONF_XLINE)
1039		{
1040	<	if (ConfigFileEntry.tkline_expire_notices)
1040	>	if (ConfigGeneral.tkline_expire_notices)
1041		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1042		"Temporary X-line for [%s] expired", conf->name);
1043		conf_free(conf);
1044		}
1045		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1046		{
1047	<	if (ConfigFileEntry.tkline_expire_notices)
1047	>	if (ConfigGeneral.tkline_expire_notices)
1048		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1049		"Temporary RESV for [%s] expired", conf->name);
1050		conf_free(conf);
#	Line 1335 | Line 1052 | expire_tklines(dlink_list *tklist)
1052		}
1053		}
1054
1055	+	/* cleanup_tklines()
1056	+	*
1057	+	* inputs       - NONE
1058	+	* output       - NONE
1059	+	* side effects - call function to expire temporary k/d lines
1060	+	*                This is an event started off in ircd.c
1061	+	*/
1062	+	void
1063	+	cleanup_tklines(void *unused)
1064	+	{
1065	+	hostmask_expire_temporary();
1066	+	expire_tklines(&xconf_items);
1067	+	expire_tklines(&nresv_items);
1068	+	expire_tklines(&cresv_items);
1069	+	}
1070	+
1071		/* oper_privs_as_string()
1072		*
1073		* inputs        - pointer to client_p
#	Line 1383 | Line 1116 | oper_privs_as_string(const unsigned int
1116		}
1117
1118		/*
1119	<	* Input: A client to find the active oper{} name for.
1119	>	* Input: A client to find the active operator {} name for.
1120		* Output: The nick!user@host{oper} of the oper.
1121		*         "oper" is server name for remote opers
1122		* Side effects: None.
#	Line 1391 | Line 1124 | oper_privs_as_string(const unsigned int
1124		const char *
1125		get_oper_name(const struct Client *client_p)
1126		{
1394	–	const dlink_node *cnode = NULL;
1127		/* +5 for !,@,{,} and null */
1128		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1129
1130	+	if (IsServer(client_p))
1131	+	return client_p->name;
1132	+
1133		if (MyConnect(client_p))
1134		{
1135	<	if ((cnode = client_p->localClient->confs.head))
1135	>	const dlink_node *const node = client_p->connection->confs.head;
1136	>
1137	>	if (node)
1138		{
1139	<	const struct MaskItem *conf = cnode->data;
1139	>	const struct MaskItem *const conf = node->data;
1140
1141	<	if (IsConfOperator(conf))
1141	>	if (conf->type == CONF_OPER)
1142		{
1143		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1144		client_p->username, client_p->host, conf->name);
#	Line 1409 | Line 1146 | get_oper_name(const struct Client *clien
1146		}
1147		}
1148
1149	<	/* Probably should assert here for now. If there is an oper out there
1150	<	* with no oper{} conf attached, it would be good for us to know...
1149	>	/*
1150	>	* Probably should assert here for now. If there is an oper out there
1151	>	* with no operator {} conf attached, it would be good for us to know...
1152		*/
1153	<	assert(0); /* Oper without oper conf! */
1153	>	assert(0);  /* Oper without oper conf! */
1154		}
1155
1156		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1420 | Line 1158 | get_oper_name(const struct Client *clien
1158		return buffer;
1159		}
1160
1423	–	/* read_conf_files()
1424	–	*
1425	–	* inputs       - cold start YES or NO
1426	–	* output       - none
1427	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1428	–	*/
1429	–	void
1430	–	read_conf_files(int cold)
1431	–	{
1432	–	const char *filename = NULL;
1433	–	char chanmodes[IRCD_BUFSIZE] = "";
1434	–	char chanlimit[IRCD_BUFSIZE] = "";
1435	–
1436	–	conf_parser_ctx.boot = cold;
1437	–	filename = ConfigFileEntry.configfile;
1438	–
1439	–	/* We need to know the initial filename for the yyerror() to report
1440	–	FIXME: The full path is in conffilenamebuf first time since we
1441	–	dont know anything else
1442	–
1443	–	- Gozem 2002-07-21
1444	–	*/
1445	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1446	–
1447	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1448	–	{
1449	–	if (cold)
1450	–	{
1451	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1452	–	filename, strerror(errno));
1453	–	exit(-1);
1454	–	}
1455	–	else
1456	–	{
1457	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1458	–	"Unable to read configuration file '%s': %s",
1459	–	filename, strerror(errno));
1460	–	return;
1461	–	}
1462	–	}
1463	–
1464	–	if (!cold)
1465	–	clear_out_old_conf();
1466	–
1467	–	read_conf(conf_parser_ctx.conf_file);
1468	–	fclose(conf_parser_ctx.conf_file);
1469	–
1470	–	log_reopen_all();
1471	–
1472	–	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1473	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1474	–
1475	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1476	–	add_isupport("MAXLIST", chanmodes, -1);
1477	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1478	–	add_isupport("CHANTYPES", "#", -1);
1479	–
1480	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1481	–	ConfigChannel.max_channels);
1482	–	add_isupport("CHANLIMIT", chanlimit, -1);
1483	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1484	–	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1485	–	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1486	–	add_isupport("CHANMODES", chanmodes, -1);
1487	–
1488	–	/*
1489	–	* message_locale may have changed.  rebuild isupport since it relies
1490	–	* on strlen(form_str(RPL_ISUPPORT))
1491	–	*/
1492	–	rebuild_isupport_message_line();
1493	–	}
1494	–
1161		/* clear_out_old_conf()
1162		*
1163		* inputs       - none
#	Line 1501 | Line 1167 | read_conf_files(int cold)
1167		static void
1168		clear_out_old_conf(void)
1169		{
1170	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1505	<	struct MaskItem *conf;
1170	>	dlink_node *node = NULL, *node_next = NULL;
1171		dlink_list *free_items [] = {
1172		&server_items,   &oconf_items,
1173		&uconf_items,   &xconf_items,
#	Line 1515 | Line 1180 | clear_out_old_conf(void)
1180		* Resetting structs, etc, is taken care of by set_default_conf().
1181		*/
1182
1183	<	for (; *iterator != NULL; iterator++)
1183	>	for (; *iterator; iterator++)
1184		{
1185	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1185	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1186		{
1187	<	conf = ptr->data;
1187	>	struct MaskItem *conf = node->data;
1188
1189	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1189	>	conf->active = 0;
1190	>	dlinkDelete(&conf->node, *iterator);
1191
1192		/* XXX This is less than pretty */
1193		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
#	Line 1552 | Line 1218 | clear_out_old_conf(void)
1218		/* clean out module paths */
1219		mod_clear_paths();
1220
1221	<	/* clean out ServerInfo */
1222	<	MyFree(ServerInfo.description);
1223	<	ServerInfo.description = NULL;
1224	<	MyFree(ServerInfo.network_name);
1225	<	ServerInfo.network_name = NULL;
1226	<	MyFree(ServerInfo.network_desc);
1227	<	ServerInfo.network_desc = NULL;
1228	<	MyFree(ConfigFileEntry.egdpool_path);
1229	<	ConfigFileEntry.egdpool_path = NULL;
1221	>	pseudo_clear();
1222	>
1223	>	/* clean out ConfigServerInfo */
1224	>	MyFree(ConfigServerInfo.description);
1225	>	ConfigServerInfo.description = NULL;
1226	>	MyFree(ConfigServerInfo.network_name);
1227	>	ConfigServerInfo.network_name = NULL;
1228	>	MyFree(ConfigServerInfo.network_desc);
1229	>	ConfigServerInfo.network_desc = NULL;
1230		#ifdef HAVE_LIBCRYPTO
1231	<	if (ServerInfo.rsa_private_key)
1231	>	if (ConfigServerInfo.rsa_private_key)
1232		{
1233	<	RSA_free(ServerInfo.rsa_private_key);
1234	<	ServerInfo.rsa_private_key = NULL;
1233	>	RSA_free(ConfigServerInfo.rsa_private_key);
1234	>	ConfigServerInfo.rsa_private_key = NULL;
1235		}
1236
1237	<	MyFree(ServerInfo.rsa_private_key_file);
1238	<	ServerInfo.rsa_private_key_file = NULL;
1237	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1238	>	ConfigServerInfo.rsa_private_key_file = NULL;
1239		#endif
1240
1241	<	/* clean out AdminInfo */
1242	<	MyFree(AdminInfo.name);
1243	<	AdminInfo.name = NULL;
1244	<	MyFree(AdminInfo.email);
1245	<	AdminInfo.email = NULL;
1246	<	MyFree(AdminInfo.description);
1247	<	AdminInfo.description = NULL;
1241	>	/* clean out ConfigAdminInfo */
1242	>	MyFree(ConfigAdminInfo.name);
1243	>	ConfigAdminInfo.name = NULL;
1244	>	MyFree(ConfigAdminInfo.email);
1245	>	ConfigAdminInfo.email = NULL;
1246	>	MyFree(ConfigAdminInfo.description);
1247	>	ConfigAdminInfo.description = NULL;
1248
1249		/* clean out listeners */
1250		close_listeners();
1251	+	}
1252	+
1253	+	/* read_conf_files()
1254	+	*
1255	+	* inputs       - cold start YES or NO
1256	+	* output       - none
1257	+	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1258	+	*/
1259	+	void
1260	+	read_conf_files(int cold)
1261	+	{
1262	+	const char *filename = NULL;
1263	+	char chanmodes[IRCD_BUFSIZE] = "";
1264	+	char chanlimit[IRCD_BUFSIZE] = "";
1265	+
1266	+	conf_parser_ctx.boot = cold;
1267	+	filename = ConfigGeneral.configfile;
1268	+
1269	+	/* We need to know the initial filename for the yyerror() to report
1270	+	FIXME: The full path is in conffilenamebuf first time since we
1271	+	don't know anything else
1272	+
1273	+	- Gozem 2002-07-21
1274	+	*/
1275	+	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1276	+
1277	+	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1278	+	{
1279	+	if (cold)
1280	+	{
1281	+	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1282	+	filename, strerror(errno));
1283	+	exit(-1);
1284	+	}
1285	+	else
1286	+	{
1287	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1288	+	"Unable to read configuration file '%s': %s",
1289	+	filename, strerror(errno));
1290	+	return;
1291	+	}
1292	+	}
1293	+
1294	+	if (!cold)
1295	+	clear_out_old_conf();
1296	+
1297	+	read_conf(conf_parser_ctx.conf_file);
1298	+	fclose(conf_parser_ctx.conf_file);
1299	+
1300	+	log_reopen_all();
1301	+
1302	+	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1303	+	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1304	+
1305	+	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1306	+	add_isupport("MAXLIST", chanmodes, -1);
1307	+	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1308	+	add_isupport("CHANTYPES", "#", -1);
1309
1310	<	/* clean out general */
1311	<	MyFree(ConfigFileEntry.service_name);
1312	<	ConfigFileEntry.service_name = NULL;
1310	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1311	>	ConfigChannel.max_channels);
1312	>	add_isupport("CHANLIMIT", chanlimit, -1);
1313	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1314	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1315	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1316	>	add_isupport("CHANMODES", chanmodes, -1);
1317	>
1318	>	/*
1319	>	* message_locale may have changed.  rebuild isupport since it relies
1320	>	* on strlen(form_str(RPL_ISUPPORT))
1321	>	*/
1322	>	rebuild_isupport_message_line();
1323		}
1324
1325		/* conf_add_class_to_conf()
#	Line 1601 | Line 1335 | conf_add_class_to_conf(struct MaskItem *
1335		{
1336		conf->class = class_default;
1337
1338	<	if (conf->type == CONF_CLIENT)
1338	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1339		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1340		"Warning *** Defaulting to default class for %s@%s",
1341		conf->user, conf->host);
#	Line 1615 | Line 1349 | conf_add_class_to_conf(struct MaskItem *
1349
1350		if (conf->class == NULL)
1351		{
1352	<	if (conf->type == CONF_CLIENT)
1352	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1353		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1354		"Warning *** Defaulting to default class for %s@%s",
1355		conf->user, conf->host);
#	Line 1726 | Line 1460 | valid_wild_card_simple(const char *data)
1460
1461		while ((tmpch = *p++))
1462		{
1463	<	if (tmpch == '\\')
1463	>	if (tmpch == '\\' && *p)
1464		{
1465		++p;
1466	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1466	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1467		return 1;
1468		}
1469		else if (!IsMWildChar(tmpch))
1470		{
1471	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1471	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1472		return 1;
1473		}
1474		}
#	Line 1785 | Line 1519 | valid_wild_card(struct Client *source_p,
1519		* If we find enough non-wild characters, we can
1520		* break - no point in searching further.
1521		*/
1522	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1522	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1523		{
1524		va_end(args);
1525		return 1;
#	Line 1797 | Line 1531 | valid_wild_card(struct Client *source_p,
1531		if (warn)
1532		sendto_one_notice(source_p, &me,
1533		":Please include at least %u non-wildcard characters with the mask",
1534	<	ConfigFileEntry.min_nonwildcard);
1534	>	ConfigGeneral.min_nonwildcard);
1535		va_end(args);
1536		return 0;
1537		}
1538
1539	+	/* find_user_host()
1540	+	*
1541	+	* inputs       - pointer to client placing kline
1542	+	*              - pointer to user_host_or_nick
1543	+	*              - pointer to user buffer
1544	+	*              - pointer to host buffer
1545	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1546	+	* side effects -
1547	+	*/
1548	+	static int
1549	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1550	+	char *luser, char *lhost, unsigned int flags)
1551	+	{
1552	+	struct Client *target_p = NULL;
1553	+	char *hostp = NULL;
1554	+
1555	+	if (lhost == NULL)
1556	+	{
1557	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1558	+	return 1;
1559	+	}
1560	+
1561	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1562	+	{
1563	+	/* Explicit user@host mask given */
1564	+	if (hostp)                            /* I'm a little user@host */
1565	+	{
1566	+	*(hostp++) = '\0';                       /* short and squat */
1567	+
1568	+	if (*user_host_or_nick)
1569	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1570	+	else
1571	+	strcpy(luser, "*");
1572	+
1573	+	if (*hostp)
1574	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1575	+	else
1576	+	strcpy(lhost, "*");
1577	+	}
1578	+	else
1579	+	{
1580	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1581	+	luser[1] = '\0';
1582	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1583	+	}
1584	+
1585	+	return 1;
1586	+	}
1587	+	else
1588	+	{
1589	+	/* Try to find user@host mask from nick */
1590	+	/* Okay to use source_p as the first param, because source_p == client_p */
1591	+	if ((target_p =
1592	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1593	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1594	+
1595	+	if (IsExemptKline(target_p))
1596	+	{
1597	+	if (IsClient(source_p))
1598	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1599	+	return 0;
1600	+	}
1601	+
1602	+	/*
1603	+	* turn the "user" bit into "*user", blow away '~'
1604	+	* if found in original user name (non-idented)
1605	+	*/
1606	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1607	+
1608	+	if (target_p->username[0] == '~')
1609	+	luser[0] = '*';
1610	+
1611	+	if (!strcmp(target_p->sockhost, "0"))
1612	+	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1613	+	else
1614	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1615	+	return 1;
1616	+	}
1617	+
1618	+	return 0;
1619	+	}
1620	+
1621		/* XXX should this go into a separate file ? -Dianora */
1622		/* parse_aline
1623		*
#	Line 1848 | Line 1664 | parse_aline(const char *cmd, struct Clie
1664
1665		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1666
1667	<	if (found_tkline_time != 0)
1667	>	if (found_tkline_time)
1668		{
1669		parv++;
1670		parc--;
1671
1672	<	if (tkline_time != NULL)
1672	>	if (tkline_time)
1673		*tkline_time = found_tkline_time;
1674		else
1675		{
#	Line 1882 | Line 1698 | parse_aline(const char *cmd, struct Clie
1698		parc--;
1699		parv++;
1700
1701	<	if (parc != 0)
1701	>	if (parc)
1702		{
1703		if (irccmp(*parv, "ON") == 0)
1704		{
#	Line 1916 | Line 1732 | parse_aline(const char *cmd, struct Clie
1732		/* Make sure target_server *is* NULL if no ON server found
1733		* caller probably NULL'd it first, but no harm to do it again -db
1734		*/
1735	<	if (target_server != NULL)
1735	>	if (target_server)
1736		*target_server = NULL;
1737		}
1738		}
1739
1740	<	if (h_p != NULL)
1740	>	if (h_p)
1741		{
1742	<	if (strchr(user, '!') != NULL)
1742	>	if (strchr(user, '!'))
1743		{
1744		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1745		return -1;
#	Line 1936 | Line 1752 | parse_aline(const char *cmd, struct Clie
1752		if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1753		return -1;
1754
1755	<	if (reason != NULL)
1755	>	if (reason)
1756		{
1757	<	if (parc != 0 && !EmptyString(*parv))
1757	>	if (parc && !EmptyString(*parv))
1758		{
1759		*reason = *parv;
1760	+
1761		if (!valid_comment(source_p, *reason, 1))
1762		return -1;
1763		}
#	Line 1951 | Line 1768 | parse_aline(const char *cmd, struct Clie
1768		return 1;
1769		}
1770
1954	–	/* find_user_host()
1955	–	*
1956	–	* inputs       - pointer to client placing kline
1957	–	*              - pointer to user_host_or_nick
1958	–	*              - pointer to user buffer
1959	–	*              - pointer to host buffer
1960	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1961	–	* side effects -
1962	–	*/
1963	–	static int
1964	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1965	–	char *luser, char *lhost, unsigned int flags)
1966	–	{
1967	–	struct Client *target_p = NULL;
1968	–	char *hostp = NULL;
1969	–
1970	–	if (lhost == NULL)
1971	–	{
1972	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1973	–	return 1;
1974	–	}
1975	–
1976	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1977	–	{
1978	–	/* Explicit user@host mask given */
1979	–
1980	–	if (hostp != NULL)                            /* I'm a little user@host */
1981	–	{
1982	–	*(hostp++) = '\0';                       /* short and squat */
1983	–	if (*user_host_or_nick)
1984	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1985	–	else
1986	–	strcpy(luser, "*");
1987	–
1988	–	if (*hostp)
1989	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1990	–	else
1991	–	strcpy(lhost, "*");
1992	–	}
1993	–	else
1994	–	{
1995	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
1996	–	luser[1] = '\0';
1997	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1998	–	}
1999	–
2000	–	return 1;
2001	–	}
2002	–	else
2003	–	{
2004	–	/* Try to find user@host mask from nick */
2005	–	/* Okay to use source_p as the first param, because source_p == client_p */
2006	–	if ((target_p =
2007	–	find_chasing(source_p, user_host_or_nick)) == NULL)
2008	–	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
2009	–
2010	–	if (IsExemptKline(target_p))
2011	–	{
2012	–	if (!IsServer(source_p))
2013	–	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2014	–	return 0;
2015	–	}
2016	–
2017	–	/*
2018	–	* turn the "user" bit into "*user", blow away '~'
2019	–	* if found in original user name (non-idented)
2020	–	*/
2021	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2022	–
2023	–	if (target_p->username[0] == '~')
2024	–	luser[0] = '*';
2025	–
2026	–	if (target_p->sockhost[0] == '\0' ||
2027	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2028	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2029	–	else
2030	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2031	–	return 1;
2032	–	}
2033	–
2034	–	return 0;
2035	–	}
2036	–
1771		/* valid_comment()
1772		*
1773		* inputs       - pointer to client
#	Line 2092 | Line 1826 | cluster_a_line(struct Client *source_p,
1826		{
1827		va_list args;
1828		char buffer[IRCD_BUFSIZE] = "";
1829	<	const dlink_node *ptr = NULL;
1829	>	const dlink_node *node = NULL;
1830
1831		va_start(args, pattern);
1832		vsnprintf(buffer, sizeof(buffer), pattern, args);
1833		va_end(args);
1834
1835	<	DLINK_FOREACH(ptr, cluster_items.head)
1835	>	DLINK_FOREACH(node, cluster_items.head)
1836		{
1837	<	const struct MaskItem *conf = ptr->data;
1837	>	const struct MaskItem *conf = node->data;
1838
1839		if (conf->flags & cluster_type)
1840		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
#	Line 2143 | Line 1877 | split_nuh(struct split_nuh_item *const i
1877
1878		if (iptr->nickptr)
1879		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1880	+
1881		if (iptr->userptr)
1882		strlcpy(iptr->userptr, "*", iptr->usersize);
1883	+
1884		if (iptr->hostptr)
1885		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1886

Diff Legend

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