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 2174 by michael, Mon Jun 3 19:45:38 2013 UTC vs.
Revision 7159 by michael, Thu Jan 28 11:26:51 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
34	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 42 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
45	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "mempool.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54		#include "conf_db.h"
55		#include "conf_class.h"
56		#include "motd.h"
57	+	#include "ipcache.h"
58	+	#include "isupport.h"
59
60	<	struct config_server_hide ConfigServerHide;
60	>
61	>	struct config_channel_entry ConfigChannel;
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 operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_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
75	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
76	–
77	–	/* internally defined functions */
78	–	static void read_conf(FILE *);
79	–	static void clear_out_old_conf(void);
80	–	static void expire_tklines(dlink_list *);
81	–	static void garbage_collect_ip_entries(void);
82	–	static int hash_ip(struct irc_ssaddr *);
83	–	static int verify_access(struct Client *);
84	–	static int attach_iline(struct Client *, struct MaskItem *);
85	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
86	–	static dlink_list *map_to_list(enum maskitem_type);
87	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
88	–
89	–
90	–	/* usually, with hash tables, you use a prime number...
91	–	* but in this case I am dealing with ip addresses,
92	–	* not ascii strings.
93	–	*/
94	–	#define IP_HASH_SIZE 0x1000
95	–
96	–	struct ip_entry
97	–	{
98	–	struct irc_ssaddr ip;
99	–	unsigned int count;
100	–	time_t last_attempt;
101	–	struct ip_entry *next;
102	–	};
103	–
104	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
105	–	static mp_pool_t *ip_entry_pool = NULL;
106	–	static int ip_entries_count = 0;
107	–
84
85		/* conf_dns_callback()
86		*
#	Line 117 | 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
102	<	if (addr != NULL)
102	>	if (addr)
103		memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105		conf->dns_failed = 1;
#	Line 138 | 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 &gecos_items;
141	>	break;
142	>	case CONF_SHARED:
143	>	return &shared_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 &operator_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 = MyMalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 163 | 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)))
171	<	dlinkDelete(&conf->node, list);
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192	<	MyFree(conf->name);
192	>	xfree(conf->name);
193
194		if (conf->dns_pending)
195		delete_resolver_queries(conf);
196	<	if (conf->passwd != NULL)
196	>	if (conf->passwd)
197		memset(conf->passwd, 0, strlen(conf->passwd));
198	<	if (conf->spasswd != NULL)
198	>	if (conf->spasswd)
199		memset(conf->spasswd, 0, strlen(conf->spasswd));
200
201		conf->class = NULL;
202
203	<	MyFree(conf->passwd);
204	<	MyFree(conf->spasswd);
205	<	MyFree(conf->reason);
206	<	MyFree(conf->user);
207	<	MyFree(conf->host);
208	<	#ifdef HAVE_LIBCRYPTO
209	<	MyFree(conf->cipher_list);
203	>	xfree(conf->passwd);
204	>	xfree(conf->spasswd);
205	>	xfree(conf->reason);
206	>	xfree(conf->certfp);
207	>	xfree(conf->whois);
208	>	xfree(conf->user);
209	>	xfree(conf->host);
210	>	xfree(conf->cipher_list);
211
212	<	if (conf->rsa_public_key)
193	<	RSA_free(conf->rsa_public_key);
194	<	#endif
195	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
212	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
213		{
214	<	MyFree(ptr->data);
215	<	free_dlink_node(ptr);
214	>	xfree(node->data);
215	>	dlinkDelete(node, &conf->hub_list);
216	>	free_dlink_node(node);
217		}
218
219	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
219	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
220		{
221	<	MyFree(ptr->data);
222	<	free_dlink_node(ptr);
221	>	xfree(node->data);
222	>	dlinkDelete(node, &conf->leaf_list);
223	>	free_dlink_node(node);
224		}
225
226	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
208	<	{
209	<	struct exempt *exptr = ptr->data;
210	<
211	<	MyFree(exptr->name);
212	<	MyFree(exptr->user);
213	<	MyFree(exptr->host);
214	<	MyFree(exptr);
215	<	}
216	<
217	<	MyFree(conf);
218	<	}
219	<
220	<	/* check_client()
221	<	*
222	<	* inputs       - pointer to client
223	<	* output       - 0 = Success
224	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
225	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
226	<	*                I_LINE_FULL       (-3) = I-line is full
227	<	*                TOO_MANY          (-4) = Too many connections from hostname
228	<	*                BANNED_CLIENT     (-5) = K-lined
229	<	* side effects - Ordinary client access check.
230	<	*                Look for conf lines which have the same
231	<	*                status as the flags passed.
232	<	*/
233	<	int
234	<	check_client(struct Client *source_p)
235	<	{
236	<	int i;
237	<
238	<	if ((i = verify_access(source_p)))
239	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
240	<	source_p->name, source_p->sockhost);
241	<
242	<	switch (i)
226	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
227		{
228	<	case TOO_MANY:
245	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
246	<	"Too many on IP for %s (%s).",
247	<	get_client_name(source_p, SHOW_IP),
248	<	source_p->sockhost);
249	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
250	<	get_client_name(source_p, SHOW_IP));
251	<	++ServerStats.is_ref;
252	<	exit_client(source_p, &me, "No more connections allowed on that IP");
253	<	break;
254	<
255	<	case I_LINE_FULL:
256	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
257	<	"auth{} block is full for %s (%s).",
258	<	get_client_name(source_p, SHOW_IP),
259	<	source_p->sockhost);
260	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
261	<	get_client_name(source_p, SHOW_IP));
262	<	++ServerStats.is_ref;
263	<	exit_client(source_p, &me,
264	<	"No more connections allowed in your connection class");
265	<	break;
266	<
267	<	case NOT_AUTHORIZED:
268	<	++ServerStats.is_ref;
269	<	/* jdc - lists server name & port connections are on */
270	<	/*       a purely cosmetical change */
271	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
272	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
273	<	get_client_name(source_p, SHOW_IP),
274	<	source_p->sockhost,
275	<	source_p->localClient->listener->name,
276	<	source_p->localClient->listener->port);
277	<	ilog(LOG_TYPE_IRCD,
278	<	"Unauthorized client connection from %s on [%s/%u].",
279	<	get_client_name(source_p, SHOW_IP),
280	<	source_p->localClient->listener->name,
281	<	source_p->localClient->listener->port);
282	<
283	<	exit_client(source_p, &me, "You are not authorized to use this server");
284	<	break;
285	<
286	<	case BANNED_CLIENT:
287	<	exit_client(source_p, &me, "Banned");
288	<	++ServerStats.is_ref;
289	<	break;
228	>	struct exempt *exptr = node->data;
229
230	<	case 0:
231	<	default:
232	<	break;
230	>	dlinkDelete(node, &conf->exempt_list);
231	>	xfree(exptr->name);
232	>	xfree(exptr->user);
233	>	xfree(exptr->host);
234	>	xfree(exptr);
235		}
236
237	<	return (i < 0 ? 0 : 1);
297	<	}
298	<
299	<	/* verify_access()
300	<	*
301	<	* inputs       - pointer to client to verify
302	<	* output       - 0 if success -'ve if not
303	<	* side effect  - find the first (best) I line to attach.
304	<	*/
305	<	static int
306	<	verify_access(struct Client *client_p)
307	<	{
308	<	struct MaskItem *conf = NULL;
309	<	char non_ident[USERLEN + 1] = { '~', '\0' };
310	<
311	<	if (IsGotId(client_p))
312	<	{
313	<	conf = find_address_conf(client_p->host, client_p->username,
314	<	&client_p->localClient->ip,
315	<	client_p->localClient->aftype,
316	<	client_p->localClient->passwd);
317	<	}
318	<	else
319	<	{
320	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
321	<	conf = find_address_conf(client_p->host,non_ident,
322	<	&client_p->localClient->ip,
323	<	client_p->localClient->aftype,
324	<	client_p->localClient->passwd);
325	<	}
326	<
327	<	if (conf != NULL)
328	<	{
329	<	if (IsConfClient(conf))
330	<	{
331	<	if (IsConfRedir(conf))
332	<	{
333	<	sendto_one(client_p, form_str(RPL_REDIR),
334	<	me.name, client_p->name,
335	<	conf->name ? conf->name : "",
336	<	conf->port);
337	<	return(NOT_AUTHORIZED);
338	<	}
339	<
340	<	if (IsConfDoIdentd(conf))
341	<	SetNeedId(client_p);
342	<
343	<	/* Thanks for spoof idea amm */
344	<	if (IsConfDoSpoofIp(conf))
345	<	{
346	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
347	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
348	<	"%s spoofing: %s as %s",
349	<	client_p->name, client_p->host, conf->name);
350	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
351	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
352	<	}
353	<
354	<	return(attach_iline(client_p, conf));
355	<	}
356	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
357	<	{
358	<	if (IsConfGline(conf))
359	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
360	<	client_p->name);
361	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
362	<	me.name, client_p->name, conf->reason);
363	<	return(BANNED_CLIENT);
364	<	}
365	<	}
366	<
367	<	return(NOT_AUTHORIZED);
237	>	xfree(conf);
238		}
239
240		/* attach_iline()
241		*
242	<	* inputs       - client pointer
243	<	*              - conf pointer
244	<	* output       -
245	<	* side effects - do actual attach
242	>	* inputs       - client pointer
243	>	*              - conf pointer
244	>	* output       -
245	>	* side effects - do actual attach
246		*/
247		static int
248		attach_iline(struct Client *client_p, struct MaskItem *conf)
249		{
250	<	struct ClassItem *class = NULL;
250	>	const struct ClassItem *const class = conf->class;
251		struct ip_entry *ip_found;
252		int a_limit_reached = 0;
253		unsigned int local = 0, global = 0, ident = 0;
254
255	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
255	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
256		ip_found->count++;
257	<	SetIpHash(client_p);
388	<
389	<	if (conf->class == NULL)
390	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
257	>	AddFlag(client_p, FLAGS_IPHASH);
258
259	<	class = conf->class;
260	<
394	<	count_user_host(client_p->username, client_p->host,
395	<	&global, &local, &ident);
259	>	userhost_count(client_p->username, client_p->host,
260	>	&global, &local, &ident);
261
262		/* XXX blah. go down checking the various silly limits
263		* setting a_limit_reached if any limit is reached.
264		* - Dianora
265		*/
266	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
266	>	if (class->max_total && class->ref_count >= class->max_total)
267		a_limit_reached = 1;
268	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
268	>	else if (class->max_perip && ip_found->count > class->max_perip)
269		a_limit_reached = 1;
270	<	else if (class->max_local != 0 && local >= class->max_local)
270	>	else if (class->max_local && local >= class->max_local)
271		a_limit_reached = 1;
272	<	else if (class->max_global != 0 && global >= class->max_global)
272	>	else if (class->max_global && global >= class->max_global)
273		a_limit_reached = 1;
274	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
274	>	else if (class->max_ident && ident >= class->max_ident &&
275		client_p->username[0] != '~')
276		a_limit_reached = 1;
277
#	Line 415 | Line 280 | attach_iline(struct Client *client_p, st
280		if (!IsConfExemptLimits(conf))
281		return TOO_MANY;   /* Already at maximum allowed */
282
283	<	sendto_one(client_p,
284	<	":%s NOTICE %s :*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;", me.name, client_p->name);
283	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
284	>	"but you have exceed_limit = yes;");
285		}
286
287		return attach_conf(client_p, conf);
288		}
289
290	<	/* init_ip_hash_table()
427	<	*
428	<	* inputs               - NONE
429	<	* output               - NONE
430	<	* side effects         - allocate memory for ip_entry(s)
431	<	*                      - clear the ip hash table
432	<	*/
433	<	void
434	<	init_ip_hash_table(void)
435	<	{
436	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
437	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
438	<	}
439	<
440	<	/* find_or_add_ip()
441	<	*
442	<	* inputs       - pointer to struct irc_ssaddr
443	<	* output       - pointer to a struct ip_entry
444	<	* side effects -
290	>	/* verify_access()
291		*
292	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
293	<	* count set to 0.
292	>	* inputs       - pointer to client to verify
293	>	* output       - 0 if success -'ve if not
294	>	* side effect  - find the first (best) I line to attach.
295		*/
296	<	static struct ip_entry *
297	<	find_or_add_ip(struct irc_ssaddr *ip_in)
296	>	static int
297	>	verify_access(struct Client *client_p)
298		{
299	<	struct ip_entry *ptr, *newptr;
453	<	int hash_index = hash_ip(ip_in), res;
454	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
455	<	#ifdef IPV6
456	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
457	<	#endif
299	>	struct MaskItem *conf = NULL;
300
301	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
301	>	if (HasFlag(client_p, FLAGS_GOTID))
302		{
303	<	#ifdef IPV6
304	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
305	<	continue;
306	<	if (ip_in->ss.ss_family == AF_INET6)
465	<	{
466	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
467	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
468	<	}
469	<	else
470	<	#endif
471	<	{
472	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
473	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
474	<	}
475	<	if (res == 0)
476	<	{
477	<	/* Found entry already in hash, return it. */
478	<	return ptr;
479	<	}
303	>	conf = find_address_conf(client_p->host, client_p->username,
304	>	&client_p->connection->ip,
305	>	client_p->connection->aftype,
306	>	client_p->connection->password);
307		}
308	+	else
309	+	{
310	+	char non_ident[USERLEN + 1] = "~";
311
312	<	if (ip_entries_count >= 2 * hard_fdlimit)
313	<	garbage_collect_ip_entries();
314	<
315	<	newptr = mp_pool_get(ip_entry_pool);
316	<	memset(newptr, 0, sizeof(*newptr));
317	<	ip_entries_count++;
488	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
489	<
490	<	newptr->next = ip_hash_table[hash_index];
491	<	ip_hash_table[hash_index] = newptr;
312	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
313	>	conf = find_address_conf(client_p->host, non_ident,
314	>	&client_p->connection->ip,
315	>	client_p->connection->aftype,
316	>	client_p->connection->password);
317	>	}
318
319	<	return newptr;
320	<	}
319	>	if (!conf)
320	>	return NOT_AUTHORIZED;
321
322	<	/* remove_one_ip()
497	<	*
498	<	* inputs        - unsigned long IP address value
499	<	* output        - NONE
500	<	* side effects  - The ip address given, is looked up in ip hash table
501	<	*                 and number of ip#'s for that ip decremented.
502	<	*                 If ip # count reaches 0 and has expired,
503	<	*                 the struct ip_entry is returned to the ip_entry_heap
504	<	*/
505	<	void
506	<	remove_one_ip(struct irc_ssaddr *ip_in)
507	<	{
508	<	struct ip_entry *ptr;
509	<	struct ip_entry *last_ptr = NULL;
510	<	int hash_index = hash_ip(ip_in), res;
511	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
512	<	#ifdef IPV6
513	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
514	<	#endif
322	>	assert(IsConfClient(conf) || IsConfKill(conf));
323
324	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
324	>	if (IsConfClient(conf))
325		{
326	<	#ifdef IPV6
519	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
520	<	continue;
521	<	if (ip_in->ss.ss_family == AF_INET6)
522	<	{
523	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
524	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
525	<	}
526	<	else
527	<	#endif
326	>	if (IsConfRedir(conf))
327		{
328	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
329	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
328	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
329	>	conf->name ? conf->name : "",
330	>	conf->port);
331	>	return NOT_AUTHORIZED;
332		}
333	<	if (res)
334	<	continue;
534	<	if (ptr->count > 0)
535	<	ptr->count--;
536	<	if (ptr->count == 0 &&
537	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
333	>
334	>	if (IsConfDoSpoofIp(conf))
335		{
336	<	if (last_ptr != NULL)
337	<	last_ptr->next = ptr->next;
338	<	else
542	<	ip_hash_table[hash_index] = ptr->next;
336	>	if (IsConfSpoofNotice(conf))
337	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
338	>	client_p->name, client_p->host, conf->name);
339
340	<	mp_pool_release(ptr);
545	<	ip_entries_count--;
546	<	return;
340	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
341		}
548	–	last_ptr = ptr;
549	–	}
550	–	}
551	–
552	–	/* hash_ip()
553	–	*
554	–	* input        - pointer to an irc_inaddr
555	–	* output       - integer value used as index into hash table
556	–	* side effects - hopefully, none
557	–	*/
558	–	static int
559	–	hash_ip(struct irc_ssaddr *addr)
560	–	{
561	–	if (addr->ss.ss_family == AF_INET)
562	–	{
563	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
564	–	int hash;
565	–	uint32_t ip;
342
343	<	ip   = ntohl(v4->sin_addr.s_addr);
568	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
569	<	return hash;
343	>	return attach_iline(client_p, conf);
344		}
345	<	#ifdef IPV6
346	<	else
347	<	{
574	<	int hash;
575	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
576	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
577	<
578	<	hash  = ip[0] ^ ip[3];
579	<	hash ^= hash >> 16;
580	<	hash ^= hash >> 8;
581	<	hash  = hash & (IP_HASH_SIZE - 1);
582	<	return hash;
583	<	}
584	<	#else
585	<	return 0;
586	<	#endif
345	>
346	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
347	>	return BANNED_CLIENT;
348		}
349
350	<	/* count_ip_hash()
590	<	*
591	<	* inputs        - pointer to counter of number of ips hashed
592	<	*               - pointer to memory used for ip hash
593	<	* output        - returned via pointers input
594	<	* side effects  - NONE
350	>	/* check_client()
351		*
352	<	* number of hashed ip #'s is counted up, plus the amount of memory
353	<	* used in the hash.
352	>	* inputs       - pointer to client
353	>	* output       - 0 = Success
354	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
355	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
356	>	*                I_LINE_FULL       (-3) = I-line is full
357	>	*                TOO_MANY          (-4) = Too many connections from hostname
358	>	*                BANNED_CLIENT     (-5) = K-lined
359	>	* side effects - Ordinary client access check.
360	>	*                Look for conf lines which have the same
361	>	*                status as the flags passed.
362		*/
363	<	void
364	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
363	>	int
364	>	check_client(struct Client *source_p)
365		{
602	–	struct ip_entry *ptr;
366		int i;
367
368	<	*number_ips_stored = 0;
369	<	*mem_ips_stored    = 0;
368	>	if ((i = verify_access(source_p)))
369	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
370	>	source_p->name, source_p->sockhost);
371
372	<	for (i = 0; i < IP_HASH_SIZE; i++)
372	>	switch (i)
373		{
374	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
375	<	{
376	<	*number_ips_stored += 1;
377	<	*mem_ips_stored += sizeof(struct ip_entry);
378	<	}
379	<	}
380	<	}
374	>	case TOO_MANY:
375	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
376	>	"Too many on IP for %s (%s).",
377	>	get_client_name(source_p, SHOW_IP),
378	>	source_p->sockhost);
379	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
380	>	get_client_name(source_p, SHOW_IP));
381	>	++ServerStats.is_ref;
382	>	exit_client(source_p, "No more connections allowed on that IP");
383	>	break;
384
385	<	/* garbage_collect_ip_entries()
386	<	*
387	<	* input        - NONE
388	<	* output       - NONE
389	<	* side effects - free up all ip entries with no connections
390	<	*/
391	<	static void
392	<	garbage_collect_ip_entries(void)
393	<	{
394	<	struct ip_entry *ptr;
628	<	struct ip_entry *last_ptr;
629	<	struct ip_entry *next_ptr;
630	<	int i;
385	>	case I_LINE_FULL:
386	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
387	>	"auth {} block is full for %s (%s).",
388	>	get_client_name(source_p, SHOW_IP),
389	>	source_p->sockhost);
390	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
391	>	get_client_name(source_p, SHOW_IP));
392	>	++ServerStats.is_ref;
393	>	exit_client(source_p, "No more connections allowed in your connection class");
394	>	break;
395
396	<	for (i = 0; i < IP_HASH_SIZE; i++)
397	<	{
398	<	last_ptr = NULL;
396	>	case NOT_AUTHORIZED:
397	>	/* jdc - lists server name & port connections are on */
398	>	/*       a purely cosmetical change */
399	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
400	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
401	>	get_client_name(source_p, SHOW_IP),
402	>	source_p->sockhost,
403	>	source_p->connection->listener->name,
404	>	source_p->connection->listener->port);
405	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
406	>	get_client_name(source_p, SHOW_IP),
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409
410	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
411	<	{
412	<	next_ptr = ptr->next;
410	>	++ServerStats.is_ref;
411	>	exit_client(source_p, "You are not authorized to use this server");
412	>	break;
413
414	<	if (ptr->count == 0 &&
415	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
416	<	{
417	<	if (last_ptr != NULL)
418	<	last_ptr->next = ptr->next;
419	<	else
420	<	ip_hash_table[i] = ptr->next;
421	<	mp_pool_release(ptr);
648	<	ip_entries_count--;
649	<	}
650	<	else
651	<	last_ptr = ptr;
652	<	}
414	>	case BANNED_CLIENT:
415	>	++ServerStats.is_ref;
416	>	exit_client(source_p, "Banned");
417	>	break;
418	>
419	>	case 0:
420	>	default:
421	>	break;
422		}
423	+
424	+	return !(i < 0);
425		}
426
427		/* detach_conf()
#	Line 664 | Line 435 | garbage_collect_ip_entries(void)
435		void
436		detach_conf(struct Client *client_p, enum maskitem_type type)
437		{
438	<	dlink_node *ptr = NULL, *next_ptr = NULL;
438	>	dlink_node *node = NULL, *node_next = NULL;
439
440	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
440	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
441		{
442	<	struct MaskItem *conf = ptr->data;
442	>	struct MaskItem *conf = node->data;
443
444		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
445		assert(conf->ref_count > 0);
#	Line 677 | Line 448 | detach_conf(struct Client *client_p, enu
448		if (!(conf->type & type))
449		continue;
450
451	<	dlinkDelete(ptr, &client_p->localClient->confs);
452	<	free_dlink_node(ptr);
451	>	dlinkDelete(node, &client_p->connection->confs);
452	>	free_dlink_node(node);
453
454		if (conf->type == CONF_CLIENT)
455	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
455	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
456
457		if (--conf->class->ref_count == 0 && conf->class->active == 0)
458		{
#	Line 707 | Line 478 | detach_conf(struct Client *client_p, enu
478		int
479		attach_conf(struct Client *client_p, struct MaskItem *conf)
480		{
481	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
481	>	if (dlinkFind(&client_p->connection->confs, conf))
482		return 1;
483
484		if (conf->type == CONF_CLIENT)
485		if (cidr_limit_reached(IsConfExemptLimits(conf),
486	<	&client_p->localClient->ip, conf->class))
486	>	&client_p->connection->ip, conf->class))
487		return TOO_MANY;    /* Already at maximum allowed */
488
489		conf->class->ref_count++;
490		conf->ref_count++;
491
492	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
492	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
493
494		return 0;
495		}
#	Line 735 | Line 506 | int
506		attach_connect_block(struct Client *client_p, const char *name,
507		const char *host)
508		{
509	<	dlink_node *ptr;
739	<	struct MaskItem *conf = NULL;
740	<
741	<	assert(client_p != NULL);
742	<	assert(host != NULL);
509	>	dlink_node *node = NULL;
510
511	<	if (client_p == NULL || host == NULL)
745	<	return 0;
511	>	assert(host);
512
513	<	DLINK_FOREACH(ptr, server_items.head)
513	>	DLINK_FOREACH(node, server_items.head)
514		{
515	<	conf = ptr->data;
515	>	struct MaskItem *conf = node->data;
516
517		if (match(conf->name, name) || match(conf->host, host))
518		continue;
519
520		attach_conf(client_p, conf);
521	<	return -1;
521	>	return 1;
522		}
523
524		return 0;
#	Line 770 | Line 536 | attach_connect_block(struct Client *clie
536		struct MaskItem *
537		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
538		{
539	<	dlink_node *ptr;
774	<	struct MaskItem* conf;
539	>	dlink_node *node = NULL;
540
541	<	DLINK_FOREACH(ptr, list->head)
541	>	DLINK_FOREACH(node, list->head)
542		{
543	<	conf = ptr->data;
544	<
543	>	struct MaskItem *conf = node->data;
544	>
545		if (conf->type == type)
546		{
547	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
548	<	!match(conf->name, name)))
784	<	return conf;
547	>	if (conf->name && !irccmp(conf->name, name))
548	>	return conf;
549		}
550		}
551
552		return NULL;
553		}
554
791	–	/* map_to_list()
792	–	*
793	–	* inputs       - ConfType conf
794	–	* output       - pointer to dlink_list to use
795	–	* side effects - none
796	–	*/
797	–	static dlink_list *
798	–	map_to_list(enum maskitem_type type)
799	–	{
800	–	switch(type)
801	–	{
802	–	case CONF_XLINE:
803	–	return(&xconf_items);
804	–	break;
805	–	case CONF_ULINE:
806	–	return(&uconf_items);
807	–	break;
808	–	case CONF_NRESV:
809	–	return(&nresv_items);
810	–	break;
811	–	case CONF_CRESV:
812	–	return(&cresv_items);
813	–	case CONF_OPER:
814	–	return(&oconf_items);
815	–	break;
816	–	case CONF_SERVER:
817	–	return(&server_items);
818	–	break;
819	–	case CONF_SERVICE:
820	–	return(&service_items);
821	–	break;
822	–	case CONF_CLUSTER:
823	–	return(&cluster_items);
824	–	break;
825	–	default:
826	–	return NULL;
827	–	}
828	–	}
829	–
555		/* find_matching_name_conf()
556		*
557		* inputs       - type of link list to look in
#	Line 841 | Line 566 | struct MaskItem *
566		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
567		const char *host, unsigned int flags)
568		{
569	<	dlink_node *ptr=NULL;
570	<	struct MaskItem *conf=NULL;
571	<	dlink_list *list_p = map_to_list(type);
569	>	dlink_node *node = NULL;
570	>	dlink_list *list = map_to_list(type);
571	>	struct MaskItem *conf = NULL;
572
573		switch (type)
574		{
575		case CONF_SERVICE:
576	<	DLINK_FOREACH(ptr, list_p->head)
576	>	DLINK_FOREACH(node, list->head)
577		{
578	<	conf = ptr->data;
578	>	conf = node->data;
579
580		if (EmptyString(conf->name))
581		continue;
582	<	if ((name != NULL) && !irccmp(name, conf->name))
582	>	if (name && !irccmp(name, conf->name))
583		return conf;
584		}
585		break;
586
587		case CONF_XLINE:
588	<	case CONF_ULINE:
588	>	case CONF_SHARED:
589		case CONF_NRESV:
590		case CONF_CRESV:
591	<	DLINK_FOREACH(ptr, list_p->head)
591	>	DLINK_FOREACH(node, list->head)
592		{
593	<	conf = ptr->data;
593	>	conf = node->data;
594
595		if (EmptyString(conf->name))
596	<	continue;
597	<	if ((name != NULL) && !match(conf->name, name))
596	>	continue;
597	>	if (name && !match(conf->name, name))
598		{
599	<	if ((user == NULL && (host == NULL)))
600	<	return conf;
601	<	if ((conf->flags & flags) != flags)
599	>	if ((user == NULL && (host == NULL)))
600	>	return conf;
601	>	if ((conf->modes & flags) != flags)
602		continue;
603	<	if (EmptyString(conf->user) || EmptyString(conf->host))
604	<	return conf;
605	<	if (!match(conf->user, user) && !match(conf->host, host))
606	<	return conf;
603	>	if (EmptyString(conf->user) || EmptyString(conf->host))
604	>	return conf;
605	>	if (!match(conf->user, user) && !match(conf->host, host))
606	>	return conf;
607		}
608		}
609		break;
610
611		case CONF_SERVER:
612	<	DLINK_FOREACH(ptr, list_p->head)
612	>	DLINK_FOREACH(node, list->head)
613		{
614	<	conf = ptr->data;
614	>	conf = node->data;
615
616	<	if ((name != NULL) && !match(name, conf->name))
616	>	if (name && !match(name, conf->name))
617		return conf;
618	<	else if ((host != NULL) && !match(host, conf->host))
618	>	if (host && !match(host, conf->host))
619		return conf;
620		}
621		break;
622	<
622	>
623		default:
624		break;
625		}
#	Line 914 | Line 639 | struct MaskItem *
639		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
640		const char *user, const char *host)
641		{
642	<	dlink_node *ptr = NULL;
643	<	struct MaskItem *conf;
644	<	dlink_list *list_p = map_to_list(type);
642	>	dlink_node *node = NULL;
643	>	dlink_list *list = map_to_list(type);
644	>	struct MaskItem *conf = NULL;
645
646		switch(type)
647		{
648		case CONF_XLINE:
649	<	case CONF_ULINE:
649	>	case CONF_SHARED:
650		case CONF_NRESV:
651		case CONF_CRESV:
652
653	<	DLINK_FOREACH(ptr, list_p->head)
653	>	DLINK_FOREACH(node, list->head)
654		{
655	<	conf = ptr->data;
655	>	conf = node->data;
656
657		if (EmptyString(conf->name))
658	<	continue;
659	<
658	>	continue;
659	>
660		if (irccmp(conf->name, name) == 0)
661		{
662	<	if ((user == NULL && (host == NULL)))
663	<	return (conf);
664	<	if (EmptyString(conf->user) || EmptyString(conf->host))
665	<	return (conf);
666	<	if (!match(conf->user, user) && !match(conf->host, host))
667	<	return (conf);
662	>	if ((user == NULL && (host == NULL)))
663	>	return conf;
664	>	if (EmptyString(conf->user) || EmptyString(conf->host))
665	>	return conf;
666	>	if (!match(conf->user, user) && !match(conf->host, host))
667	>	return conf;
668		}
669		}
670		break;
671
672		case CONF_OPER:
673	<	DLINK_FOREACH(ptr, list_p->head)
673	>	DLINK_FOREACH(node, list->head)
674		{
675	<	conf = ptr->data;
675	>	conf = node->data;
676
677		if (EmptyString(conf->name))
678		continue;
#	Line 968 | Line 693 | find_exact_name_conf(enum maskitem_type
693		return conf;
694		break;
695		case HM_IPV4:
696	<	if (who->localClient->aftype == AF_INET)
697	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
696	>	if (who->connection->aftype == AF_INET)
697	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
698		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
699		return conf;
700		break;
976	–	#ifdef IPV6
701		case HM_IPV6:
702	<	if (who->localClient->aftype == AF_INET6)
703	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
702	>	if (who->connection->aftype == AF_INET6)
703	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
704		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
705		return conf;
706		break;
983	–	#endif
707		default:
708		assert(0);
709		}
#	Line 991 | Line 714 | find_exact_name_conf(enum maskitem_type
714		break;
715
716		case CONF_SERVER:
717	<	DLINK_FOREACH(ptr, list_p->head)
717	>	DLINK_FOREACH(node, list->head)
718		{
719	<	conf = ptr->data;
719	>	conf = node->data;
720
721		if (EmptyString(conf->name))
722	<	continue;
723	<
722	>	continue;
723	>
724		if (name == NULL)
725		{
726	<	if (EmptyString(conf->host))
727	<	continue;
728	<	if (irccmp(conf->host, host) == 0)
729	<	return(conf);
726	>	if (EmptyString(conf->host))
727	>	continue;
728	>	if (irccmp(conf->host, host) == 0)
729	>	return conf;
730		}
731		else if (irccmp(conf->name, name) == 0)
732	<	{
1010	<	return (conf);
1011	<	}
732	>	return conf;
733		}
734	+
735		break;
736
737		default:
738		break;
739		}
1018	–	return(NULL);
1019	–	}
1020	–
1021	–	/* rehash()
1022	–	*
1023	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1024	–	* as a result of an operator issuing this command, else assume it has been
1025	–	* called as a result of the server receiving a HUP signal.
1026	–	*/
1027	–	int
1028	–	rehash(int sig)
1029	–	{
1030	–	if (sig != 0)
1031	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1032	–	"Got signal SIGHUP, reloading ircd.conf file");
740
741	<	restart_resolver();
1035	<
1036	<	/* don't close listeners until we know we can go ahead with the rehash */
1037	<
1038	<	/* Check to see if we magically got(or lost) IPv6 support */
1039	<	check_can_use_v6();
1040	<
1041	<	read_conf_files(0);
1042	<
1043	<	if (ServerInfo.description != NULL)
1044	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1045	<
1046	<	load_conf_modules();
1047	<
1048	<	rehashed_klines = 1;
1049	<
1050	<	return 0;
741	>	return NULL;
742		}
743
744		/* set_default_conf()
#	Line 1067 | Line 758 | set_default_conf(void)
758		*/
759		assert(class_default == class_get_list()->tail->data);
760
761	<	#ifdef HAVE_LIBCRYPTO
762	<	ServerInfo.rsa_private_key = NULL;
763	<	ServerInfo.rsa_private_key_file = NULL;
764	<	#endif
765	<
766	<	/* ServerInfo.name is not rehashable */
767	<	/* ServerInfo.name = ServerInfo.name; */
768	<	ServerInfo.description = NULL;
769	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
770	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
771	<
772	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1082	<	ServerInfo.specific_ipv4_vhost = 0;
1083	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1084	<	ServerInfo.specific_ipv6_vhost = 0;
1085	<
1086	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1087	<	ServerInfo.max_nick_length = 9;
1088	<	ServerInfo.max_topic_length = 80;
1089	<
1090	<	ServerInfo.hub = 0;
1091	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1092	<	ServerInfo.dns_host.sin_port = 0;
1093	<	AdminInfo.name = NULL;
1094	<	AdminInfo.email = NULL;
1095	<	AdminInfo.description = NULL;
761	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
762	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
763	>
764	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
765	>	ConfigServerInfo.specific_ipv4_vhost = 0;
766	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
767	>	ConfigServerInfo.specific_ipv6_vhost = 0;
768	>
769	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
770	>	ConfigServerInfo.max_nick_length = 9;
771	>	ConfigServerInfo.max_topic_length = 80;
772	>	ConfigServerInfo.hub = 0;
773
774		log_del_all();
775
776	<	ConfigLoggingEntry.use_logging = 1;
776	>	ConfigLog.use_logging = 1;
777
778		ConfigChannel.disable_fake_channels = 0;
779	<	ConfigChannel.knock_delay = 300;
779	>	ConfigChannel.invite_client_count = 10;
780	>	ConfigChannel.invite_client_time = 300;
781	>	ConfigChannel.invite_delay_channel = 5;
782	>	ConfigChannel.knock_client_count = 1;
783	>	ConfigChannel.knock_client_time = 300;
784		ConfigChannel.knock_delay_channel = 60;
785	<	ConfigChannel.max_chans_per_user = 25;
1105	<	ConfigChannel.max_chans_per_oper = 50;
785	>	ConfigChannel.max_channels = 25;
786		ConfigChannel.max_bans = 25;
787	<	ConfigChannel.default_split_user_count = 0;
788	<	ConfigChannel.default_split_server_count = 0;
1109	<	ConfigChannel.no_join_on_split = 0;
1110	<	ConfigChannel.no_create_on_split = 0;
787	>	ConfigChannel.default_join_flood_count = 18;
788	>	ConfigChannel.default_join_flood_time = 6;
789
790		ConfigServerHide.flatten_links = 0;
791	<	ConfigServerHide.links_delay = 300;
791	>	ConfigServerHide.flatten_links_delay = 300;
792		ConfigServerHide.hidden = 0;
793		ConfigServerHide.hide_servers = 0;
794		ConfigServerHide.hide_services = 0;
795		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
796		ConfigServerHide.hide_server_ips = 0;
797	+	ConfigServerHide.disable_remote_commands = 0;
798
799	<
800	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
801	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
802	<	ConfigFileEntry.glines = 0;
803	<	ConfigFileEntry.gline_time = 12 * 3600;
804	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
805	<	ConfigFileEntry.gline_min_cidr = 16;
806	<	ConfigFileEntry.gline_min_cidr6 = 48;
807	<	ConfigFileEntry.invisible_on_connect = 1;
808	<	ConfigFileEntry.tkline_expire_notices = 1;
809	<	ConfigFileEntry.hide_spoof_ips = 1;
810	<	ConfigFileEntry.ignore_bogus_ts = 0;
811	<	ConfigFileEntry.disable_auth = 0;
812	<	ConfigFileEntry.disable_remote = 0;
813	<	ConfigFileEntry.kill_chase_time_limit = 90;
814	<	ConfigFileEntry.default_floodcount = 8;
815	<	ConfigFileEntry.failed_oper_notice = 1;
816	<	ConfigFileEntry.dots_in_ident = 0;
817	<	ConfigFileEntry.min_nonwildcard = 4;
818	<	ConfigFileEntry.min_nonwildcard_simple = 3;
819	<	ConfigFileEntry.max_accept = 20;
820	<	ConfigFileEntry.anti_nick_flood = 0;
821	<	ConfigFileEntry.max_nick_time = 20;
822	<	ConfigFileEntry.max_nick_changes = 5;
823	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
824	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
825	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
826	<	ConfigFileEntry.warn_no_nline = 1;
827	<	ConfigFileEntry.stats_o_oper_only = 0;
828	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
829	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
830	<	ConfigFileEntry.stats_P_oper_only = 0;
831	<	ConfigFileEntry.caller_id_wait = 60;
832	<	ConfigFileEntry.opers_bypass_callerid = 0;
833	<	ConfigFileEntry.pace_wait = 10;
834	<	ConfigFileEntry.pace_wait_simple = 1;
835	<	ConfigFileEntry.short_motd = 0;
836	<	ConfigFileEntry.ping_cookie = 0;
837	<	ConfigFileEntry.no_oper_flood = 0;
838	<	ConfigFileEntry.true_no_oper_flood = 0;
839	<	ConfigFileEntry.oper_pass_resv = 1;
840	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
841	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
842	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
843	<	UMODE_OPERWALL | UMODE_WALLOP;
844	<	ConfigFileEntry.use_egd = 0;
845	<	ConfigFileEntry.egdpool_path = NULL;
1167	<	ConfigFileEntry.throttle_time = 10;
799	>	ConfigGeneral.away_count = 2;
800	>	ConfigGeneral.away_time = 10;
801	>	ConfigGeneral.max_watch = 50;
802	>	ConfigGeneral.cycle_on_host_change = 1;
803	>	ConfigGeneral.dline_min_cidr = 16;
804	>	ConfigGeneral.dline_min_cidr6 = 48;
805	>	ConfigGeneral.kline_min_cidr = 16;
806	>	ConfigGeneral.kline_min_cidr6 = 48;
807	>	ConfigGeneral.invisible_on_connect = 1;
808	>	ConfigGeneral.tkline_expire_notices = 1;
809	>	ConfigGeneral.ignore_bogus_ts = 0;
810	>	ConfigGeneral.disable_auth = 0;
811	>	ConfigGeneral.kill_chase_time_limit = 90;
812	>	ConfigGeneral.default_floodcount = 8;
813	>	ConfigGeneral.failed_oper_notice = 1;
814	>	ConfigGeneral.dots_in_ident = 0;
815	>	ConfigGeneral.min_nonwildcard = 4;
816	>	ConfigGeneral.min_nonwildcard_simple = 3;
817	>	ConfigGeneral.max_accept = 50;
818	>	ConfigGeneral.anti_nick_flood = 0;
819	>	ConfigGeneral.max_nick_time = 20;
820	>	ConfigGeneral.max_nick_changes = 5;
821	>	ConfigGeneral.anti_spam_exit_message_time = 0;
822	>	ConfigGeneral.ts_warn_delta = 30;
823	>	ConfigGeneral.ts_max_delta = 600;
824	>	ConfigGeneral.warn_no_connect_block = 1;
825	>	ConfigGeneral.stats_e_disabled = 0;
826	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
827	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
828	>	ConfigGeneral.stats_o_oper_only = 1;
829	>	ConfigGeneral.stats_m_oper_only = 1;
830	>	ConfigGeneral.stats_P_oper_only = 0;
831	>	ConfigGeneral.stats_u_oper_only = 0;
832	>	ConfigGeneral.caller_id_wait = 60;
833	>	ConfigGeneral.opers_bypass_callerid = 0;
834	>	ConfigGeneral.pace_wait = 10;
835	>	ConfigGeneral.pace_wait_simple = 1;
836	>	ConfigGeneral.short_motd = 0;
837	>	ConfigGeneral.ping_cookie = 0;
838	>	ConfigGeneral.no_oper_flood = 0;
839	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
840	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
841	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
842	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
843	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
844	>	ConfigGeneral.throttle_count = 1;
845	>	ConfigGeneral.throttle_time = 1;
846		}
847
848		static void
849		validate_conf(void)
850		{
851	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
852	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1175	<
1176	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1177	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
851	>	if (EmptyString(ConfigServerInfo.network_name))
852	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
853
854	<	if (ServerInfo.network_name == NULL)
855	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1181	<
1182	<	if (ServerInfo.network_desc == NULL)
1183	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1184	<
1185	<	if (ConfigFileEntry.service_name == NULL)
1186	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1187	<
1188	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
854	>	if (EmptyString(ConfigServerInfo.network_desc))
855	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
856		}
857
858	<	/* read_conf()
858	>	/* read_conf()
859		*
860		* inputs       - file descriptor pointing to config file to use
861		* output       - None
#	Line 1199 | Line 866 | read_conf(FILE *file)
866		{
867		lineno = 0;
868
869	<	set_default_conf(); /* Set default values prior to conf parsing */
869	>	set_default_conf();  /* Set default values prior to conf parsing */
870		conf_parser_ctx.pass = 1;
871	<	yyparse();          /* pick up the classes first */
871	>	yyparse();  /* Pick up the classes first */
872
873		rewind(file);
874
875		conf_parser_ctx.pass = 2;
876	<	yyparse();          /* Load the values from the conf */
877	<	validate_conf();    /* Check to make sure some values are still okay. */
878	<	/* Some global values are also loaded here. */
879	<	class_delete_marked();      /* Make sure classes are valid */
876	>	yyparse();  /* Load the values from the conf */
877	>	validate_conf();  /* Check to make sure some values are still okay. */
878	>	/* Some global values are also loaded here. */
879	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
880	>	}
881	>
882	>	/* conf_rehash()
883	>	*
884	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
885	>	* as a result of an operator issuing this command, else assume it has been
886	>	* called as a result of the server receiving a HUP signal.
887	>	*/
888	>	void
889	>	conf_rehash(int sig)
890	>	{
891	>	if (sig)
892	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
893	>	"Got signal SIGHUP, reloading configuration file(s)");
894	>
895	>	restart_resolver();
896	>
897	>	/* don't close listeners until we know we can go ahead with the rehash */
898	>
899	>	read_conf_files(0);
900	>
901	>	load_conf_modules();
902	>	check_conf_klines();
903		}
904
905		/* lookup_confhost()
#	Line 1222 | Line 912 | lookup_confhost(struct MaskItem *conf)
912		{
913		struct addrinfo hints, *res;
914
915	<	/* Do name lookup now on hostnames given and store the
915	>	/*
916	>	* Do name lookup now on hostnames given and store the
917		* ip numbers in conf structure.
918		*/
919		memset(&hints, 0, sizeof(hints));
#	Line 1239 | Line 930 | lookup_confhost(struct MaskItem *conf)
930		return;
931		}
932
933	<	assert(res != NULL);
933	>	assert(res);
934
935		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
936		conf->addr.ss_len = res->ai_addrlen;
#	Line 1258 | Line 949 | lookup_confhost(struct MaskItem *conf)
949		int
950		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
951		{
952	<	struct ip_entry *ip_found;
953	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
952	>	struct ip_entry *ip_found = NULL;
953	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
954
955	<	/* DLINE exempt also gets you out of static limits/pacing... */
956	<	if (conf && (conf->type == CONF_EXEMPT))
957	<	return 0;
958	<
959	<	if (conf != NULL)
955	>	if (conf)
956	>	{
957	>	/* DLINE exempt also gets you out of static limits/pacing... */
958	>	if (conf->type == CONF_EXEMPT)
959	>	return 0;
960		return BANNED_CLIENT;
961	+	}
962
963	<	ip_found = find_or_add_ip(addr);
963	>	ip_found = ipcache_find_or_add_address(addr);
964
965	<	if ((CurrentTime - ip_found->last_attempt) <
1274	<	ConfigFileEntry.throttle_time)
965	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
966		{
967	<	ip_found->last_attempt = CurrentTime;
968	<	return TOO_FAST;
967	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
968	>	return TOO_FAST;
969	>
970	>	++ip_found->connection_count;
971		}
972	+	else
973	+	ip_found->connection_count = 1;
974
975		ip_found->last_attempt = CurrentTime;
976		return 0;
977		}
978
979	<	/* find_kill()
979	>	/* expire_tklines()
980		*
981	<	* inputs       - pointer to client structure
982	<	* output       - pointer to struct MaskItem if found
983	<	* side effects - See if this user is klined already,
1289	<	*                and if so, return struct MaskItem pointer
981	>	* inputs       - tkline list pointer
982	>	* output       - NONE
983	>	* side effects - expire tklines
984		*/
985	<	struct MaskItem *
986	<	find_kill(struct Client *client_p)
985	>	static void
986	>	expire_tklines(dlink_list *list)
987		{
988	<	struct MaskItem *conf = NULL;
988	>	dlink_node *node = NULL, *node_next = NULL;
989
990	<	assert(client_p != NULL);
991	<
992	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1299	<	CONF_KLINE, client_p->localClient->aftype,
1300	<	client_p->username, NULL, 1);
1301	<	return conf;
1302	<	}
1303	<
1304	<	struct MaskItem *
1305	<	find_gline(struct Client *client_p)
1306	<	{
1307	<	struct MaskItem *conf;
990	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
991	>	{
992	>	struct MaskItem *conf = node->data;
993
994	<	assert(client_p != NULL);
994	>	if (!conf->until || conf->until > CurrentTime)
995	>	continue;
996
997	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
998	<	CONF_GLINE, client_p->localClient->aftype,
999	<	client_p->username, NULL, 1);
1000	<	return conf;
997	>	if (ConfigGeneral.tkline_expire_notices)
998	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
999	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1000	>	conf_free(conf);
1001	>	}
1002		}
1003
1004		/* cleanup_tklines()
#	Line 1322 | Line 1009 | find_gline(struct Client *client_p)
1009		*                This is an event started off in ircd.c
1010		*/
1011		void
1012	<	cleanup_tklines(void *notused)
1012	>	cleanup_tklines(void *unused)
1013		{
1014		hostmask_expire_temporary();
1015	<	expire_tklines(&xconf_items);
1015	>	expire_tklines(&gecos_items);
1016		expire_tklines(&nresv_items);
1017		expire_tklines(&cresv_items);
1018		}
1019
1333	–	/* expire_tklines()
1334	–	*
1335	–	* inputs       - tkline list pointer
1336	–	* output       - NONE
1337	–	* side effects - expire tklines
1338	–	*/
1339	–	static void
1340	–	expire_tklines(dlink_list *tklist)
1341	–	{
1342	–	dlink_node *ptr;
1343	–	dlink_node *next_ptr;
1344	–	struct MaskItem *conf;
1345	–
1346	–	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1347	–	{
1348	–	conf = ptr->data;
1349	–
1350	–	if (!conf->until || conf->until > CurrentTime)
1351	–	continue;
1352	–
1353	–	if (conf->type == CONF_XLINE)
1354	–	{
1355	–	if (ConfigFileEntry.tkline_expire_notices)
1356	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	–	"Temporary X-line for [%s] expired", conf->name);
1358	–	conf_free(conf);
1359	–	}
1360	–	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1361	–	{
1362	–	if (ConfigFileEntry.tkline_expire_notices)
1363	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1364	–	"Temporary RESV for [%s] expired", conf->name);
1365	–	conf_free(conf);
1366	–	}
1367	–	}
1368	–	}
1369	–
1020		/* oper_privs_as_string()
1021		*
1022		* inputs        - pointer to client_p
#	Line 1379 | Line 1029 | static const struct oper_privs
1029		const unsigned char c;
1030		} flag_list[] = {
1031		{ OPER_FLAG_ADMIN,          'A' },
1032	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1033	<	{ OPER_FLAG_DIE,            'D' },
1034	<	{ OPER_FLAG_GLINE,          'G' },
1035	<	{ OPER_FLAG_REHASH,         'H' },
1036	<	{ OPER_FLAG_K,              'K' },
1037	<	{ OPER_FLAG_OPERWALL,       'L' },
1038	<	{ OPER_FLAG_KILL,           'N' },
1039	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1040	<	{ OPER_FLAG_CONNECT,        'P' },
1041	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1042	<	{ OPER_FLAG_SQUIT,          'R' },
1043	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1044	<	{ OPER_FLAG_UNKLINE,        'U' },
1045	<	{ OPER_FLAG_X,              'X' },
1032	>	{ OPER_FLAG_CLOSE,          'B' },
1033	>	{ OPER_FLAG_CONNECT,        'C' },
1034	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1035	>	{ OPER_FLAG_DIE,            'E' },
1036	>	{ OPER_FLAG_DLINE,          'F' },
1037	>	{ OPER_FLAG_GLOBOPS,        'G' },
1038	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1039	>	{ OPER_FLAG_KILL,           'I' },
1040	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1041	>	{ OPER_FLAG_KLINE,          'K' },
1042	>	{ OPER_FLAG_LOCOPS,         'L' },
1043	>	{ OPER_FLAG_MODULE,         'M' },
1044	>	{ OPER_FLAG_NICK_RESV,      'N' },
1045	>	{ OPER_FLAG_OPME,           'O' },
1046	>	{ OPER_FLAG_REHASH,         'P' },
1047	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1048	>	{ OPER_FLAG_RESTART,        'R' },
1049	>	{ OPER_FLAG_RESV,           'S' },
1050	>	{ OPER_FLAG_SET,            'T' },
1051	>	{ OPER_FLAG_SQUIT,          'U' },
1052	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1053	>	{ OPER_FLAG_UNDLINE,        'W' },
1054	>	{ OPER_FLAG_UNKLINE,        'X' },
1055	>	{ OPER_FLAG_UNRESV,         'Y' },
1056	>	{ OPER_FLAG_UNXLINE,        'Z' },
1057	>	{ OPER_FLAG_WALLOPS,        'a' },
1058	>	{ OPER_FLAG_XLINE,          'b' },
1059		{ 0, '\0' }
1060		};
1061
1062	<	char *
1062	>	const char *
1063		oper_privs_as_string(const unsigned int port)
1064		{
1065	<	static char privs_out[16];
1065	>	static char privs_out[IRCD_BUFSIZE];
1066		char *privs_ptr = privs_out;
1404	–	const struct oper_privs *opriv = flag_list;
1067
1068	<	for (; opriv->flag; ++opriv)
1407	<	{
1068	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1069		if (port & opriv->flag)
1070		*privs_ptr++ = opriv->c;
1071	<	else
1072	<	*privs_ptr++ = ToLower(opriv->c);
1073	<	}
1071	>
1072	>	if (privs_ptr == privs_out)
1073	>	*privs_ptr++ = '0';
1074
1075		*privs_ptr = '\0';
1076
#	Line 1417 | Line 1078 | oper_privs_as_string(const unsigned int
1078		}
1079
1080		/*
1081	<	* Input: A client to find the active oper{} name for.
1081	>	* Input: A client to find the active operator {} name for.
1082		* Output: The nick!user@host{oper} of the oper.
1083		*         "oper" is server name for remote opers
1084		* Side effects: None.
#	Line 1425 | Line 1086 | oper_privs_as_string(const unsigned int
1086		const char *
1087		get_oper_name(const struct Client *client_p)
1088		{
1089	<	dlink_node *cnode = NULL;
1090	<	/* +5 for !,@,{,} and null */
1091	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1089	>	static char buffer[IRCD_BUFSIZE];
1090	>
1091	>	if (IsServer(client_p))
1092	>	return client_p->name;
1093
1094		if (MyConnect(client_p))
1095		{
1096	<	if ((cnode = client_p->localClient->confs.head))
1096	>	const dlink_node *const node = client_p->connection->confs.head;
1097	>
1098	>	if (node)
1099		{
1100	<	struct MaskItem *conf = cnode->data;
1100	>	const struct MaskItem *const conf = node->data;
1101
1102	<	if (IsConfOperator(conf))
1102	>	if (conf->type == CONF_OPER)
1103		{
1104	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1104	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1105		client_p->username, client_p->host, conf->name);
1106	<	return buffer;
1106	>	return buffer;
1107		}
1108		}
1109
1110	<	/* Probably should assert here for now. If there is an oper out there
1111	<	* with no oper{} conf attached, it would be good for us to know...
1110	>	/*
1111	>	* Probably should assert here for now. If there is an oper out there
1112	>	* with no operator {} conf attached, it would be good for us to know...
1113		*/
1114	<	assert(0); /* Oper without oper conf! */
1114	>	assert(0);  /* Oper without oper conf! */
1115		}
1116
1117		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1118	<	client_p->username, client_p->host, client_p->servptr->name);
1118	>	client_p->username, client_p->host, client_p->servptr->name);
1119		return buffer;
1120		}
1121
1122	+	/* clear_out_old_conf()
1123	+	*
1124	+	* inputs       - none
1125	+	* output       - none
1126	+	* side effects - Clear out the old configuration
1127	+	*/
1128	+	static void
1129	+	clear_out_old_conf(void)
1130	+	{
1131	+	dlink_node *node = NULL, *node_next = NULL;
1132	+	dlink_list *free_items [] = {
1133	+	&server_items,   &operator_items,
1134	+	&shared_items,   &gecos_items,
1135	+	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1136	+	};
1137	+
1138	+	dlink_list ** iterator = free_items; /* C is dumb */
1139	+
1140	+	/* We only need to free anything allocated by yyparse() here.
1141	+	* Resetting structs, etc, is taken care of by set_default_conf().
1142	+	*/
1143	+
1144	+	for (; *iterator; iterator++)
1145	+	{
1146	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1147	+	{
1148	+	struct MaskItem *conf = node->data;
1149	+
1150	+	conf->active = 0;
1151	+
1152	+	if (!IsConfDatabase(conf))
1153	+	{
1154	+	dlinkDelete(&conf->node, *iterator);
1155	+
1156	+	if (!conf->ref_count)
1157	+	conf_free(conf);
1158	+	}
1159	+	}
1160	+	}
1161	+
1162	+	motd_clear();
1163	+
1164	+	/*
1165	+	* Don't delete the class table, rather mark all entries for deletion.
1166	+	* The table is cleaned up by class_delete_marked. - avalon
1167	+	*/
1168	+	class_mark_for_deletion();
1169	+
1170	+	clear_out_address_conf();
1171	+
1172	+	/* Clean out module paths */
1173	+	mod_clear_paths();
1174	+
1175	+	pseudo_clear();
1176	+
1177	+	/* Clean out ConfigServerInfo */
1178	+	xfree(ConfigServerInfo.description);
1179	+	ConfigServerInfo.description = NULL;
1180	+	xfree(ConfigServerInfo.network_name);
1181	+	ConfigServerInfo.network_name = NULL;
1182	+	xfree(ConfigServerInfo.network_desc);
1183	+	ConfigServerInfo.network_desc = NULL;
1184	+
1185	+	xfree(ConfigServerInfo.rsa_private_key_file);
1186	+	ConfigServerInfo.rsa_private_key_file = NULL;
1187	+	xfree(ConfigServerInfo.ssl_certificate_file);
1188	+	ConfigServerInfo.ssl_certificate_file = NULL;
1189	+	xfree(ConfigServerInfo.ssl_dh_param_file);
1190	+	ConfigServerInfo.ssl_dh_param_file = NULL;
1191	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1192	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1193	+	xfree(ConfigServerInfo.ssl_cipher_list);
1194	+	ConfigServerInfo.ssl_cipher_list = NULL;
1195	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1196	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1197	+
1198	+	/* Clean out ConfigAdminInfo */
1199	+	xfree(ConfigAdminInfo.name);
1200	+	ConfigAdminInfo.name = NULL;
1201	+	xfree(ConfigAdminInfo.email);
1202	+	ConfigAdminInfo.email = NULL;
1203	+	xfree(ConfigAdminInfo.description);
1204	+	ConfigAdminInfo.description = NULL;
1205	+
1206	+	xfree(ConfigServerHide.flatten_links_file);
1207	+	ConfigServerHide.flatten_links_file = NULL;
1208	+
1209	+	/* Clean out listeners */
1210	+	listener_close_marked();
1211	+	}
1212	+
1213	+	static void
1214	+	conf_handle_tls(int cold)
1215	+	{
1216	+	if (!tls_new_cred())
1217	+	{
1218	+	if (cold)
1219	+	{
1220	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1221	+	exit(-1);
1222	+	}
1223	+	else
1224	+	{
1225	+	/* Failed to load new settings/certs, old ones remain active */
1226	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1227	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1228	+	}
1229	+	}
1230	+	}
1231	+
1232		/* read_conf_files()
1233		*
1234		* inputs       - cold start YES or NO
#	Line 1463 | Line 1238 | get_oper_name(const struct Client *clien
1238		void
1239		read_conf_files(int cold)
1240		{
1241	<	const char *filename;
1242	<	char chanmodes[32];
1243	<	char chanlimit[32];
1241	>	const char *filename = NULL;
1242	>	char chanmodes[IRCD_BUFSIZE] = "";
1243	>	char chanlimit[IRCD_BUFSIZE] = "";
1244
1245		conf_parser_ctx.boot = cold;
1246	<	filename = ConfigFileEntry.configfile;
1246	>	filename = ConfigGeneral.configfile;
1247
1248		/* We need to know the initial filename for the yyerror() to report
1249		FIXME: The full path is in conffilenamebuf first time since we
1250	<	dont know anything else
1250	>	don't know anything else
1251
1252	<	- Gozem 2002-07-21
1252	>	- Gozem 2002-07-21
1253		*/
1254		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1255
#	Line 1484 | Line 1259 | read_conf_files(int cold)
1259		{
1260		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1261		filename, strerror(errno));
1262	<	exit(-1);
1262	>	exit(EXIT_FAILURE);
1263		}
1264		else
1265		{
1266	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1267	<	"Unable to read configuration file '%s': %s",
1268	<	filename, strerror(errno));
1266	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1267	>	"Unable to read configuration file '%s': %s",
1268	>	filename, strerror(errno));
1269		return;
1270		}
1271		}
#	Line 1502 | Line 1277 | read_conf_files(int cold)
1277		fclose(conf_parser_ctx.conf_file);
1278
1279		log_reopen_all();
1280	+	conf_handle_tls(cold);
1281
1282	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1283	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284
1285	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1286	<	add_isupport("MAXLIST", chanmodes, -1);
1287	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1288	<	add_isupport("CHANTYPES", "#", -1);
1289	<
1290	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1291	<	ConfigChannel.max_chans_per_user);
1292	<	add_isupport("CHANLIMIT", chanlimit, -1);
1293	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1294	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1295	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1296	<	add_isupport("EXCEPTS", "e", -1);
1521	<	add_isupport("INVEX", "I", -1);
1522	<	add_isupport("CHANMODES", chanmodes, -1);
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289	>
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291	>	ConfigChannel.max_channels);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297
1298		/*
1299		* message_locale may have changed.  rebuild isupport since it relies
1300		* on strlen(form_str(RPL_ISUPPORT))
1301		*/
1302	<	rebuild_isupport_message_line();
1529	<	}
1530	<
1531	<	/* clear_out_old_conf()
1532	<	*
1533	<	* inputs       - none
1534	<	* output       - none
1535	<	* side effects - Clear out the old configuration
1536	<	*/
1537	<	static void
1538	<	clear_out_old_conf(void)
1539	<	{
1540	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1541	<	struct MaskItem *conf;
1542	<	dlink_list *free_items [] = {
1543	<	&server_items,   &oconf_items,
1544	<	&uconf_items,   &xconf_items,
1545	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1546	<	};
1547	<
1548	<	dlink_list ** iterator = free_items; /* C is dumb */
1549	<
1550	<	/* We only need to free anything allocated by yyparse() here.
1551	<	* Resetting structs, etc, is taken care of by set_default_conf().
1552	<	*/
1553	<
1554	<	for (; *iterator != NULL; iterator++)
1555	<	{
1556	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1557	<	{
1558	<	conf = ptr->data;
1559	<
1560	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1561	<
1562	<	/* XXX This is less than pretty */
1563	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1564	<	{
1565	<	if (!conf->ref_count)
1566	<	conf_free(conf);
1567	<	}
1568	<	else if (conf->type == CONF_XLINE)
1569	<	{
1570	<	if (!conf->until)
1571	<	conf_free(conf);
1572	<	}
1573	<	else
1574	<	conf_free(conf);
1575	<	}
1576	<	}
1577	<
1578	<	motd_clear();
1579	<
1580	<	/*
1581	<	* don't delete the class table, rather mark all entries
1582	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1583	<	*/
1584	<	class_mark_for_deletion();
1585	<
1586	<	clear_out_address_conf();
1587	<
1588	<	/* clean out module paths */
1589	<	mod_clear_paths();
1590	<
1591	<	/* clean out ServerInfo */
1592	<	MyFree(ServerInfo.description);
1593	<	ServerInfo.description = NULL;
1594	<	MyFree(ServerInfo.network_name);
1595	<	ServerInfo.network_name = NULL;
1596	<	MyFree(ServerInfo.network_desc);
1597	<	ServerInfo.network_desc = NULL;
1598	<	MyFree(ConfigFileEntry.egdpool_path);
1599	<	ConfigFileEntry.egdpool_path = NULL;
1600	<	#ifdef HAVE_LIBCRYPTO
1601	<	if (ServerInfo.rsa_private_key != NULL)
1602	<	{
1603	<	RSA_free(ServerInfo.rsa_private_key);
1604	<	ServerInfo.rsa_private_key = NULL;
1605	<	}
1606	<
1607	<	MyFree(ServerInfo.rsa_private_key_file);
1608	<	ServerInfo.rsa_private_key_file = NULL;
1609	<
1610	<	if (ServerInfo.server_ctx)
1611	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1612	<	SSL_OP_NO_SSLv3|
1613	<	SSL_OP_NO_TLSv1);
1614	<	if (ServerInfo.client_ctx)
1615	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1616	<	SSL_OP_NO_SSLv3|
1617	<	SSL_OP_NO_TLSv1);
1618	<	#endif
1619	<
1620	<	/* clean out AdminInfo */
1621	<	MyFree(AdminInfo.name);
1622	<	AdminInfo.name = NULL;
1623	<	MyFree(AdminInfo.email);
1624	<	AdminInfo.email = NULL;
1625	<	MyFree(AdminInfo.description);
1626	<	AdminInfo.description = NULL;
1627	<
1628	<	/* clean out listeners */
1629	<	close_listeners();
1630	<
1631	<	/* clean out general */
1632	<	MyFree(ConfigFileEntry.service_name);
1633	<	ConfigFileEntry.service_name = NULL;
1634	<
1635	<	delete_isupport("INVEX");
1636	<	delete_isupport("EXCEPTS");
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
1306		*
1307		* inputs       - pointer to config item
1308		* output       - NONE
1309	<	* side effects - Add a class pointer to a conf
1309	>	* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316		conf->class = class_default;
1317
1318	<	if (conf->type == CONF_CLIENT)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1320	<	"Warning *** Defaulting to default class for %s@%s",
1321	<	conf->user, conf->host);
1318	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320	>	"Warning *** Defaulting to default class for %s@%s",
1321	>	conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1324	<	"Warning *** Defaulting to default class for %s",
1325	<	conf->name);
1660	<	}
1661	<	else
1662	<	conf->class = class_find(class_name, 1);
1663	<
1664	<	if (conf->class == NULL)
1665	<	{
1666	<	if (conf->type == CONF_CLIENT)
1667	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1668	<	"Warning *** Defaulting to default class for %s@%s",
1669	<	conf->user, conf->host);
1670	<	else
1671	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1672	<	"Warning *** Defaulting to default class for %s",
1673	<	conf->name);
1674	<	conf->class = class_default;
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324	>	"Warning *** Defaulting to default class for %s",
1325	>	conf->name);
1326		}
1327		}
1328
#	Line 1690 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345		"\"%s\", line %u: %s: %s",
1346		conffilebuf, lineno + 1, msg, newlinebuf);
1347		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1703 | Line 1354 | conf_error_report(const char *msg)
1354		char newlinebuf[IRCD_BUFSIZE];
1355
1356		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358		"\"%s\", line %u: %s: %s",
1359		conffilebuf, lineno + 1, msg, newlinebuf);
1360		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1712 | Line 1363 | conf_error_report(const char *msg)
1363
1364		/*
1365		* valid_tkline()
1366	<	*
1366	>	*
1367		* inputs       - pointer to ascii string to check
1368		*              - whether the specified time is in seconds or minutes
1369		* output       - -1 not enough parameters
#	Line 1721 | Line 1372 | conf_error_report(const char *msg)
1372		* Originally written by Dianora (Diane, db@db.net)
1373		*/
1374		time_t
1375	<	valid_tkline(const char *p, int minutes)
1375	>	valid_tkline(const char *data, const int minutes)
1376		{
1377	+	const unsigned char *p = (const unsigned char *)data;
1378	+	unsigned char tmpch = '\0';
1379		time_t result = 0;
1380
1381	<	for (; *p; ++p)
1381	>	while ((tmpch = *p++))
1382		{
1383	<	if (!IsDigit(*p))
1383	>	if (!IsDigit(tmpch))
1384		return 0;
1385
1386		result *= 10;
1387	<	result += ((*p) & 0xF);
1387	>	result += (tmpch & 0xF);
1388		}
1389
1390		/*
1391	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	<	* i.e. they specifically use 0, I am going to return 1 instead
1393	<	* as a return value of non-zero is used to flag it as a temporary kline
1391	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1393	>	* value of non-zero is used to flag it as a temporary kline
1394		*/
1395		if (result == 0)
1396		result = 1;
1397
1398	<	/*
1398	>	/*
1399		* If the incoming time is in seconds convert it to minutes for the purpose
1400		* of this calculation
1401		*/
1402		if (!minutes)
1403	<	result = result / (time_t)60;
1403	>	result = result / 60;
1404
1405		if (result > MAX_TDKLINE_TIME)
1406		result = MAX_TDKLINE_TIME;
1407
1408	<	result = result * (time_t)60;  /* turn it into seconds */
1408	>	result = result * 60;  /* Turn it into seconds */
1409
1410		return result;
1411		}
#	Line 1768 | Line 1421 | valid_wild_card_simple(const char *data)
1421		{
1422		const unsigned char *p = (const unsigned char *)data;
1423		unsigned char tmpch = '\0';
1424	<	int nonwild = 0;
1424	>	unsigned int nonwild = 0, wild = 0;
1425
1426		while ((tmpch = *p++))
1427		{
1428	<	if (tmpch == '\\')
1428	>	if (tmpch == '\\' && *p)
1429		{
1430		++p;
1431	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1431	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1432		return 1;
1433		}
1434		else if (!IsMWildChar(tmpch))
1435		{
1436	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1436	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437		return 1;
1438		}
1439	+	else
1440	+	++wild;
1441		}
1442
1443	<	return 0;
1443	>	return !wild;
1444		}
1445
1446		/* valid_wild_card()
#	Line 1797 | Line 1452 | valid_wild_card_simple(const char *data)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457	<	char tmpch;
1458	<	int nonwild = 0;
1457	>	unsigned char tmpch = '\0';
1458	>	unsigned int nonwild = 0;
1459		va_list args;
1460
1461		/*
#	Line 1819 | Line 1474 | valid_wild_card(struct Client *source_p,
1474
1475		while (count--)
1476		{
1477	<	const char *p = va_arg(args, const char *);
1477	>	const unsigned char *p = va_arg(args, const unsigned char *);
1478		if (p == NULL)
1479		continue;
1480
#	Line 1831 | Line 1486 | valid_wild_card(struct Client *source_p,
1486		* If we find enough non-wild characters, we can
1487		* break - no point in searching further.
1488		*/
1489	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1489	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1490	>	{
1491	>	va_end(args);
1492		return 1;
1493	+	}
1494		}
1495		}
1496		}
1497
1498	<	if (warn)
1499	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1500	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1498	>	if (IsClient(source_p))
1499	>	sendto_one_notice(source_p, &me,
1500	>	":Please include at least %u non-wildcard characters with the mask",
1501	>	ConfigGeneral.min_nonwildcard);
1502	>	va_end(args);
1503	>	return 0;
1504	>	}
1505	>
1506	>	/* find_user_host()
1507	>	*
1508	>	* inputs       - pointer to client placing kline
1509	>	*              - pointer to user_host_or_nick
1510	>	*              - pointer to user buffer
1511	>	*              - pointer to host buffer
1512	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1513	>	* side effects -
1514	>	*/
1515	>	static int
1516	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	>	char *luser, char *lhost)
1518	>	{
1519	>	struct Client *target_p = NULL;
1520	>	char *hostp = NULL;
1521	>
1522	>	if (lhost == NULL)
1523	>	{
1524	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1525	>	return 1;
1526	>	}
1527	>
1528	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1529	>	{
1530	>	/* Explicit user@host mask given */
1531	>	if (hostp)                            /* I'm a little user@host */
1532	>	{
1533	>	*(hostp++) = '\0';                       /* short and squat */
1534	>
1535	>	if (*user_host_or_nick)
1536	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1537	>	else
1538	>	strcpy(luser, "*");
1539	>
1540	>	if (*hostp)
1541	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1542	>	else
1543	>	strcpy(lhost, "*");
1544	>	}
1545	>	else
1546	>	{
1547	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1548	>	luser[1] = '\0';
1549	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1550	>	}
1551	>
1552	>	return 1;
1553	>	}
1554	>	else
1555	>	{
1556	>	/* Try to find user@host mask from nick */
1557	>	/* Okay to use source_p as the first param, because source_p == client_p */
1558	>	if ((target_p =
1559	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1560	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561	>
1562	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563	>	{
1564	>	if (IsClient(source_p))
1565	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1566	>	return 0;
1567	>	}
1568	>
1569	>	/*
1570	>	* Turn the "user" bit into "*user", blow away '~'
1571	>	* if found in original user name (non-idented)
1572	>	*/
1573	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1574	>
1575	>	if (target_p->username[0] == '~')
1576	>	luser[0] = '*';
1577	>
1578	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579	>	return 1;
1580	>	}
1581	>
1582		return 0;
1583		}
1584
#	Line 1853 | Line 1592 | valid_wild_card(struct Client *source_p,
1592		*              - parse_flags bit map of things to test
1593		*              - pointer to user or string to parse into
1594		*              - pointer to host or NULL to parse into if non NULL
1595	<	*              - pointer to optional tkline time or NULL
1595	>	*              - pointer to optional tkline time or NULL
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 1875 | Line 1614 | valid_wild_card(struct Client *source_p,
1614		*/
1615		int
1616		parse_aline(const char *cmd, struct Client *source_p,
1617	<	int parc, char **parv,
1618	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1619	<	char **target_server, char **reason)
1617	>	int parc, char **parv,
1618	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1619	>	char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = "No Reason";
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 1889 | Line 1628 | parse_aline(const char *cmd, struct Clie
1628
1629		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1630
1631	<	if (found_tkline_time != 0)
1631	>	if (found_tkline_time)
1632		{
1633		parv++;
1634		parc--;
1635
1636	<	if (tkline_time != NULL)
1636	>	if (tkline_time)
1637		*tkline_time = found_tkline_time;
1638		else
1639		{
1640	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1641	<	me.name, source_p->name, cmd);
1903	<	return -1;
1640	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1648	<	me.name, source_p->name, cmd);
1911	<	return -1;
1647	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
1660		}
1661	<
1661	>
1662		parc--;
1663		parv++;
1664
1665	<	if (parc != 0)
1665	>	if (parc)
1666		{
1667		if (irccmp(*parv, "ON") == 0)
1668		{
1669		parc--;
1670		parv++;
1671
1935	–	if (target_server == NULL)
1936	–	{
1937	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1938	–	me.name, source_p->name, cmd);
1939	–	return -1;
1940	–	}
1941	–
1672		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1675	<	me.name, source_p->name, "remoteban");
1946	<	return -1;
1674	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1681	<	me.name, source_p->name, cmd);
1953	<	return -1;
1680	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 1962 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		/* Make sure target_server *is* NULL if no ON server found
1691		* caller probably NULL'd it first, but no harm to do it again -db
1692		*/
1693	<	if (target_server != NULL)
1694	<	*target_server = NULL;
1693	>	if (target_server)
1694	>	*target_server = NULL;
1695		}
1696		}
1697
1698	<	if (h_p != NULL)
1698	>	if (h_p)
1699		{
1700	<	if (strchr(user, '!') != NULL)
1700	>	if (strchr(user, '!'))
1701		{
1702	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1703	<	me.name, source_p->name);
1976	<	return -1;
1702	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713	<	if (reason != NULL)
1713	>	if (reason)
1714		{
1715	<	if (parc != 0 && !EmptyString(*parv))
1989	<	{
1715	>	if (parc && !EmptyString(*parv))
1716		*reason = *parv;
1991	–	if (!valid_comment(source_p, *reason, 1))
1992	–	return -1;
1993	–	}
1717		else
1718	<	*reason = def_reason;
1718	>	*reason = default_reason;
1719		}
1720
1721		return 1;
1722		}
1723
2001	–	/* find_user_host()
2002	–	*
2003	–	* inputs       - pointer to client placing kline
2004	–	*              - pointer to user_host_or_nick
2005	–	*              - pointer to user buffer
2006	–	*              - pointer to host buffer
2007	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
2008	–	* side effects -
2009	–	*/
2010	–	static int
2011	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
2012	–	char *luser, char *lhost, unsigned int flags)
2013	–	{
2014	–	struct Client *target_p = NULL;
2015	–	char *hostp = NULL;
2016	–
2017	–	if (lhost == NULL)
2018	–	{
2019	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
2020	–	return 1;
2021	–	}
2022	–
2023	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2024	–	{
2025	–	/* Explicit user@host mask given */
2026	–
2027	–	if (hostp != NULL)                            /* I'm a little user@host */
2028	–	{
2029	–	*(hostp++) = '\0';                       /* short and squat */
2030	–	if (*user_host_or_nick)
2031	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2032	–	else
2033	–	strcpy(luser, "*");
2034	–	if (*hostp)
2035	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2036	–	else
2037	–	strcpy(lhost, "*");
2038	–	}
2039	–	else
2040	–	{
2041	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2042	–	luser[1] = '\0';
2043	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2044	–	}
2045	–
2046	–	return 1;
2047	–	}
2048	–	else
2049	–	{
2050	–	/* Try to find user@host mask from nick */
2051	–	/* Okay to use source_p as the first param, because source_p == client_p */
2052	–	if ((target_p =
2053	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2054	–	return 0;
2055	–
2056	–	if (IsExemptKline(target_p))
2057	–	{
2058	–	if (!IsServer(source_p))
2059	–	sendto_one(source_p,
2060	–	":%s NOTICE %s :%s is E-lined",
2061	–	me.name, source_p->name, target_p->name);
2062	–	return 0;
2063	–	}
2064	–
2065	–	/*
2066	–	* turn the "user" bit into "*user", blow away '~'
2067	–	* if found in original user name (non-idented)
2068	–	*/
2069	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2070	–
2071	–	if (target_p->username[0] == '~')
2072	–	luser[0] = '*';
2073	–
2074	–	if (target_p->sockhost[0] == '\0' ||
2075	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2076	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2077	–	else
2078	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2079	–	return 1;
2080	–	}
2081	–
2082	–	return 0;
2083	–	}
2084	–
2085	–	/* valid_comment()
2086	–	*
2087	–	* inputs       - pointer to client
2088	–	*              - pointer to comment
2089	–	* output       - 0 if no valid comment,
2090	–	*              - 1 if valid
2091	–	* side effects - truncates reason where necessary
2092	–	*/
2093	–	int
2094	–	valid_comment(struct Client *source_p, char *comment, int warn)
2095	–	{
2096	–	if (strlen(comment) > REASONLEN)
2097	–	comment[REASONLEN-1] = '\0';
2098	–
2099	–	return 1;
2100	–	}
2101	–
1724		/* match_conf_password()
1725		*
1726		* inputs       - pointer to given password
#	Line 2119 | Line 1741 | match_conf_password(const char *password
1741		else
1742		encr = password;
1743
1744	<	return !strcmp(encr, conf->passwd);
1744	>	return encr && !strcmp(encr, conf->passwd);
1745		}
1746
1747		/*
#	Line 2127 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from s_serv.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
#	Line 2135 | Line 1757 | match_conf_password(const char *password
1757		*                along to all servers that match capab and cluster type
1758		*/
1759		void
1760	<	cluster_a_line(struct Client *source_p, const char *command,
1761	<	int capab, int cluster_type, const char *pattern, ...)
1760	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1761	>	unsigned int cluster_type, const char *pattern, ...)
1762		{
1763		va_list args;
1764	<	char buffer[IRCD_BUFSIZE];
1765	<	const dlink_node *ptr = NULL;
1764	>	char buffer[IRCD_BUFSIZE] = "";
1765	>	const dlink_node *node = NULL;
1766
1767		va_start(args, pattern);
1768		vsnprintf(buffer, sizeof(buffer), pattern, args);
1769		va_end(args);
1770
1771	<	DLINK_FOREACH(ptr, cluster_items.head)
1771	>	DLINK_FOREACH(node, cluster_items.head)
1772		{
1773	<	const struct MaskItem *conf = ptr->data;
1773	>	const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1777	<	"%s %s %s", command, conf->name, buffer);
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777	>	"%s %s %s", command, conf->name, buffer);
1778		}
1779		}
1780
#	Line 2191 | Line 1813 | split_nuh(struct split_nuh_item *const i
1813
1814		if (iptr->nickptr)
1815		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1816	+
1817		if (iptr->userptr)
1818		strlcpy(iptr->userptr, "*", iptr->usersize);
1819	+
1820		if (iptr->hostptr)
1821		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1822
#	Line 2200 | Line 1824 | split_nuh(struct split_nuh_item *const i
1824		{
1825		*p = '\0';
1826
1827	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1827	>	if (iptr->nickptr && *iptr->nuhmask)
1828		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1829
1830	<	if ((q = strchr(++p, '@'))) {
1830	>	if ((q = strchr(++p, '@')))
1831	>	{
1832		*q++ = '\0';
1833
1834	<	if (*p != '\0')
1834	>	if (*p)
1835		strlcpy(iptr->userptr, p, iptr->usersize);
1836
1837	<	if (*q != '\0')
1837	>	if (*q)
1838		strlcpy(iptr->hostptr, q, iptr->hostsize);
1839		}
1840		else
1841		{
1842	<	if (*p != '\0')
1842	>	if (*p)
1843		strlcpy(iptr->userptr, p, iptr->usersize);
1844		}
1845		}
#	Line 2226 | Line 1851 | split_nuh(struct split_nuh_item *const i
1851		/* if found a @ */
1852		*p++ = '\0';
1853
1854	<	if (*iptr->nuhmask != '\0')
1854	>	if (*iptr->nuhmask)
1855		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1856
1857	<	if (*p != '\0')
1857	>	if (*p)
1858		strlcpy(iptr->hostptr, p, iptr->hostsize);
1859		}
1860		else
1861		{
1862	<	/* no @ found */
1862	>	/* No @ found */
1863		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1864		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1865		else

Diff Legend

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