ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf.c

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC vs.
Revision 8510 by michael, Fri Apr 6 12:55:22 2018 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-2018 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 27 | Line 27
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	+	#include "parse.h"
31		#include "conf.h"
32	+	#include "conf_cluster.h"
33	+	#include "conf_gecos.h"
34	+	#include "conf_pseudo.h"
35	+	#include "conf_resv.h"
36	+	#include "conf_service.h"
37	+	#include "conf_shared.h"
38		#include "server.h"
32	–	#include "resv.h"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
#	Line 44 | Line 50
50		#include "log.h"
51		#include "send.h"
52		#include "memory.h"
47	–	#include "mempool.h"
53		#include "res.h"
49	–	#include "userhost.h"
54		#include "user.h"
55		#include "channel_mode.h"
52	–	#include "parse.h"
56		#include "misc.h"
57		#include "conf_db.h"
58		#include "conf_class.h"
59		#include "motd.h"
60	+	#include "ipcache.h"
61	+	#include "isupport.h"
62	+	#include "whowas.h"
63
64
65		struct config_channel_entry ConfigChannel;
66	<	struct config_server_hide ConfigServerHide;
67	<	struct config_file_entry ConfigFileEntry;
68	<	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
69	<	struct server_info ServerInfo;
70	<	struct admin_info AdminInfo;
66	>	struct config_serverhide_entry ConfigServerHide;
67	>	struct config_general_entry ConfigGeneral;
68	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
69	>	struct config_serverinfo_entry ConfigServerInfo;
70	>	struct config_admin_entry ConfigAdminInfo;
71	>	struct conf_parser_context conf_parser_ctx;
72
73		/* general conf items link list root, other than k lines etc. */
74	<	dlink_list service_items = { NULL, NULL, 0 };
75	<	dlink_list server_items  = { NULL, NULL, 0 };
69	<	dlink_list cluster_items = { NULL, NULL, 0 };
70	<	dlink_list oconf_items   = { NULL, NULL, 0 };
71	<	dlink_list uconf_items   = { NULL, NULL, 0 };
72	<	dlink_list xconf_items   = { NULL, NULL, 0 };
73	<	dlink_list nresv_items   = { NULL, NULL, 0 };
74	<	dlink_list cresv_items = { NULL, NULL, 0 };
74	>	dlink_list connect_items;
75	>	dlink_list operator_items;
76
77		extern unsigned int lineno;
78		extern char linebuf[];
79		extern char conffilebuf[IRCD_BUFSIZE];
80		extern int yyparse(); /* defined in y.tab.c */
81
81	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
82	–
83	–	/* internally defined functions */
84	–	static void read_conf(FILE *);
85	–	static void clear_out_old_conf(void);
86	–	static void expire_tklines(dlink_list *);
87	–	static void garbage_collect_ip_entries(void);
88	–	static int hash_ip(struct irc_ssaddr *);
89	–	static int verify_access(struct Client *);
90	–	static int attach_iline(struct Client *, struct MaskItem *);
91	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
92	–	static dlink_list *map_to_list(enum maskitem_type);
93	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
94	–
95	–
96	–	/* usually, with hash tables, you use a prime number...
97	–	* but in this case I am dealing with ip addresses,
98	–	* not ascii strings.
99	–	*/
100	–	#define IP_HASH_SIZE 0x1000
101	–
102	–	struct ip_entry
103	–	{
104	–	struct irc_ssaddr ip;
105	–	unsigned int count;
106	–	time_t last_attempt;
107	–	struct ip_entry *next;
108	–	};
109	–
110	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
111	–	static mp_pool_t *ip_entry_pool = NULL;
112	–	static int ip_entries_count = 0;
113	–
82
83		/* conf_dns_callback()
84		*
#	Line 123 | Line 91 | static int ip_entries_count = 0;
91		* if successful save hp in the conf item it was called with
92		*/
93		static void
94	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
94	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
95		{
96	<	struct MaskItem *conf = vptr;
96	>	struct MaskItem *const conf = vptr;
97
98		conf->dns_pending = 0;
99
#	Line 144 | Line 112 | conf_dns_callback(void *vptr, const stru
112		static void
113		conf_dns_lookup(struct MaskItem *conf)
114		{
115	<	if (!conf->dns_pending)
115	>	if (conf->dns_pending)
116	>	return;
117	>
118	>	conf->dns_pending = 1;
119	>
120	>	if (conf->aftype == AF_INET)
121	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
122	>	else
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
124	>	}
125	>
126	>	/* map_to_list()
127	>	*
128	>	* inputs       - ConfType conf
129	>	* output       - pointer to dlink_list to use
130	>	* side effects - none
131	>	*/
132	>	static dlink_list *
133	>	map_to_list(enum maskitem_type type)
134	>	{
135	>	switch (type)
136		{
137	<	conf->dns_pending = 1;
138	<	gethost_byname(conf_dns_callback, conf, conf->host);
137	>	case CONF_OPER:
138	>	return &operator_items;
139	>	break;
140	>	case CONF_SERVER:
141	>	return &connect_items;
142	>	break;
143	>	default:
144	>	return NULL;
145		}
146		}
147
148		struct MaskItem *
149		conf_make(enum maskitem_type type)
150		{
151	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
151	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
152		dlink_list *list = NULL;
153
154		conf->type   = type;
#	Line 169 | Line 163 | conf_make(enum maskitem_type type)
163		void
164		conf_free(struct MaskItem *conf)
165		{
166	<	dlink_node *ptr = NULL, *ptr_next = NULL;
166	>	dlink_node *node = NULL, *node_next = NULL;
167		dlink_list *list = NULL;
168
169	<	if (conf->node.next)
170	<	if ((list = map_to_list(conf->type)))
177	<	dlinkDelete(&conf->node, list);
169	>	if ((list = map_to_list(conf->type)))
170	>	dlinkFindDelete(list, conf);
171
172	<	MyFree(conf->name);
172	>	xfree(conf->name);
173
174		if (conf->dns_pending)
175		delete_resolver_queries(conf);
#	Line 187 | Line 180 | conf_free(struct MaskItem *conf)
180
181		conf->class = NULL;
182
183	<	MyFree(conf->passwd);
184	<	MyFree(conf->spasswd);
185	<	MyFree(conf->reason);
186	<	MyFree(conf->certfp);
187	<	MyFree(conf->user);
188	<	MyFree(conf->host);
189	<	#ifdef HAVE_LIBCRYPTO
190	<	MyFree(conf->cipher_list);
198	<
199	<	if (conf->rsa_public_key)
200	<	RSA_free(conf->rsa_public_key);
201	<	#endif
202	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
203	<	{
204	<	MyFree(ptr->data);
205	<	dlinkDelete(ptr, &conf->hub_list);
206	<	free_dlink_node(ptr);
207	<	}
208	<
209	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
210	<	{
211	<	MyFree(ptr->data);
212	<	dlinkDelete(ptr, &conf->leaf_list);
213	<	free_dlink_node(ptr);
214	<	}
215	<
216	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
217	<	{
218	<	struct exempt *exptr = ptr->data;
219	<
220	<	dlinkDelete(ptr, &conf->exempt_list);
221	<	MyFree(exptr->name);
222	<	MyFree(exptr->user);
223	<	MyFree(exptr->host);
224	<	MyFree(exptr);
225	<	}
226	<
227	<	MyFree(conf);
228	<	}
229	<
230	<	/* check_client()
231	<	*
232	<	* inputs       - pointer to client
233	<	* output       - 0 = Success
234	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
235	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
236	<	*                I_LINE_FULL       (-3) = I-line is full
237	<	*                TOO_MANY          (-4) = Too many connections from hostname
238	<	*                BANNED_CLIENT     (-5) = K-lined
239	<	* side effects - Ordinary client access check.
240	<	*                Look for conf lines which have the same
241	<	*                status as the flags passed.
242	<	*/
243	<	int
244	<	check_client(struct Client *source_p)
245	<	{
246	<	int i;
247	<
248	<	if ((i = verify_access(source_p)))
249	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
250	<	source_p->name, source_p->sockhost);
251	<
252	<	switch (i)
253	<	{
254	<	case TOO_MANY:
255	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
256	<	"Too many on IP for %s (%s).",
257	<	get_client_name(source_p, SHOW_IP),
258	<	source_p->sockhost);
259	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
260	<	get_client_name(source_p, SHOW_IP));
261	<	++ServerStats.is_ref;
262	<	exit_client(source_p, "No more connections allowed on that IP");
263	<	break;
264	<
265	<	case I_LINE_FULL:
266	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
267	<	"auth{} block is full for %s (%s).",
268	<	get_client_name(source_p, SHOW_IP),
269	<	source_p->sockhost);
270	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
271	<	get_client_name(source_p, SHOW_IP));
272	<	++ServerStats.is_ref;
273	<	exit_client(source_p, "No more connections allowed in your connection class");
274	<	break;
275	<
276	<	case NOT_AUTHORIZED:
277	<	++ServerStats.is_ref;
278	<	/* jdc - lists server name & port connections are on */
279	<	/*       a purely cosmetical change */
280	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
281	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
282	<	get_client_name(source_p, SHOW_IP),
283	<	source_p->sockhost,
284	<	source_p->localClient->listener->name,
285	<	source_p->localClient->listener->port);
286	<	ilog(LOG_TYPE_IRCD,
287	<	"Unauthorized client connection from %s on [%s/%u].",
288	<	get_client_name(source_p, SHOW_IP),
289	<	source_p->localClient->listener->name,
290	<	source_p->localClient->listener->port);
291	<
292	<	exit_client(source_p, "You are not authorized to use this server");
293	<	break;
294	<
295	<	case BANNED_CLIENT:
296	<	exit_client(source_p, "Banned");
297	<	++ServerStats.is_ref;
298	<	break;
299	<
300	<	case 0:
301	<	default:
302	<	break;
303	<	}
304	<
305	<	return (i < 0 ? 0 : 1);
306	<	}
307	<
308	<	/* verify_access()
309	<	*
310	<	* inputs       - pointer to client to verify
311	<	* output       - 0 if success -'ve if not
312	<	* side effect  - find the first (best) I line to attach.
313	<	*/
314	<	static int
315	<	verify_access(struct Client *client_p)
316	<	{
317	<	struct MaskItem *conf = NULL;
318	<	char non_ident[USERLEN + 1] = "~";
183	>	xfree(conf->passwd);
184	>	xfree(conf->spasswd);
185	>	xfree(conf->reason);
186	>	xfree(conf->certfp);
187	>	xfree(conf->whois);
188	>	xfree(conf->user);
189	>	xfree(conf->host);
190	>	xfree(conf->cipher_list);
191
192	<	if (IsGotId(client_p))
192	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
193		{
194	<	conf = find_address_conf(client_p->host, client_p->username,
195	<	&client_p->localClient->ip,
196	<	client_p->localClient->aftype,
325	<	client_p->localClient->passwd);
326	<	}
327	<	else
328	<	{
329	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
330	<	conf = find_address_conf(client_p->host,non_ident,
331	<	&client_p->localClient->ip,
332	<	client_p->localClient->aftype,
333	<	client_p->localClient->passwd);
194	>	xfree(node->data);
195	>	dlinkDelete(node, &conf->hub_list);
196	>	free_dlink_node(node);
197		}
198
199	<	if (conf)
199	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
200		{
201	<	if (IsConfClient(conf))
202	<	{
203	<	if (IsConfRedir(conf))
341	<	{
342	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
343	<	conf->name ? conf->name : "",
344	<	conf->port);
345	<	return NOT_AUTHORIZED;
346	<	}
347	<
348	<	if (IsConfDoIdentd(conf))
349	<	SetNeedId(client_p);
350	<
351	<	/* Thanks for spoof idea amm */
352	<	if (IsConfDoSpoofIp(conf))
353	<	{
354	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
355	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
356	<	"%s spoofing: %s as %s",
357	<	client_p->name, client_p->host, conf->name);
358	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
359	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
360	<	}
361	<
362	<	return attach_iline(client_p, conf);
363	<	}
364	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
365	<	{
366	<	if (IsConfGline(conf))
367	<	sendto_one_notice(client_p, &me, ":*** G-lined");
368	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
369	<	return BANNED_CLIENT;
370	<	}
201	>	xfree(node->data);
202	>	dlinkDelete(node, &conf->leaf_list);
203	>	free_dlink_node(node);
204		}
205
206	<	return NOT_AUTHORIZED;
206	>	xfree(conf);
207		}
208
209		/* attach_iline()
210		*
211	<	* inputs       - client pointer
212	<	*              - conf pointer
213	<	* output       -
214	<	* side effects - do actual attach
211	>	* inputs       - client pointer
212	>	*              - conf pointer
213	>	* output       -
214	>	* side effects - do actual attach
215		*/
216		static int
217		attach_iline(struct Client *client_p, struct MaskItem *conf)
218		{
219	<	struct ClassItem *class = NULL;
387	<	struct ip_entry *ip_found;
219	>	const struct ClassItem *const class = conf->class;
220		int a_limit_reached = 0;
389	–	unsigned int local = 0, global = 0, ident = 0;
221
222	<	assert(conf->class);
222	>	struct ip_entry *ipcache = ipcache_find_or_add_address(&client_p->ip);
223	>	++ipcache->count_local;
224	>	AddFlag(client_p, FLAGS_IPHASH);
225
226	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
394	<	ip_found->count++;
395	<	SetIpHash(client_p);
396	<
397	<	class = conf->class;
398	<
399	<	count_user_host(client_p->username, client_p->host,
400	<	&global, &local, &ident);
401	<
402	<	/* XXX blah. go down checking the various silly limits
403	<	* setting a_limit_reached if any limit is reached.
404	<	* - Dianora
405	<	*/
406	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
407	<	a_limit_reached = 1;
408	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
226	>	if (class->max_total && class->ref_count >= class->max_total)
227		a_limit_reached = 1;
228	<	else if (class->max_local != 0 && local >= class->max_local)
228	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
229		a_limit_reached = 1;
230	<	else if (class->max_global != 0 && global >= class->max_global)
231	<	a_limit_reached = 1;
414	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
415	<	client_p->username[0] != '~')
230	>	else if (class->max_perip_global &&
231	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
232		a_limit_reached = 1;
233
234		if (a_limit_reached)
#	Line 424 | Line 240 | attach_iline(struct Client *client_p, st
240		"but you have exceed_limit = yes;");
241		}
242
243	<	return attach_conf(client_p, conf);
243	>	return conf_attach(client_p, conf);
244		}
245
246	<	/* init_ip_hash_table()
431	<	*
432	<	* inputs               - NONE
433	<	* output               - NONE
434	<	* side effects         - allocate memory for ip_entry(s)
435	<	*                      - clear the ip hash table
436	<	*/
437	<	void
438	<	init_ip_hash_table(void)
439	<	{
440	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
441	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
442	<	}
443	<
444	<	/* find_or_add_ip()
445	<	*
446	<	* inputs       - pointer to struct irc_ssaddr
447	<	* output       - pointer to a struct ip_entry
448	<	* side effects -
246	>	/* verify_access()
247		*
248	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
249	<	* count set to 0.
248	>	* inputs       - pointer to client to verify
249	>	* output       - 0 if success -'ve if not
250	>	* side effect  - find the first (best) I line to attach.
251		*/
252	<	static struct ip_entry *
253	<	find_or_add_ip(struct irc_ssaddr *ip_in)
252	>	static int
253	>	verify_access(struct Client *client_p)
254		{
255	<	struct ip_entry *ptr, *newptr;
457	<	int hash_index = hash_ip(ip_in), res;
458	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
459	<	#ifdef IPV6
460	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
461	<	#endif
255	>	struct MaskItem *conf = NULL;
256
257	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
257	>	if (HasFlag(client_p, FLAGS_GOTID))
258		{
259	<	#ifdef IPV6
260	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
261	<	continue;
262	<	if (ip_in->ss.ss_family == AF_INET6)
469	<	{
470	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
471	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
472	<	}
473	<	else
474	<	#endif
475	<	{
476	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
477	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
478	<	}
479	<	if (res == 0)
480	<	{
481	<	/* Found entry already in hash, return it. */
482	<	return ptr;
483	<	}
259	>	conf = find_address_conf(client_p->host, client_p->username,
260	>	&client_p->ip,
261	>	client_p->ip.ss.ss_family,
262	>	client_p->connection->password);
263		}
264	+	else
265	+	{
266	+	char non_ident[USERLEN + 1] = "~";
267
268	<	if (ip_entries_count >= 2 * hard_fdlimit)
269	<	garbage_collect_ip_entries();
270	<
271	<	newptr = mp_pool_get(ip_entry_pool);
272	<	memset(newptr, 0, sizeof(*newptr));
273	<	ip_entries_count++;
492	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
268	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
269	>	conf = find_address_conf(client_p->host, non_ident,
270	>	&client_p->ip,
271	>	client_p->ip.ss.ss_family,
272	>	client_p->connection->password);
273	>	}
274
275	<	newptr->next = ip_hash_table[hash_index];
276	<	ip_hash_table[hash_index] = newptr;
275	>	if (!conf)
276	>	return NOT_AUTHORIZED;
277
278	<	return newptr;
498	<	}
499	<
500	<	/* remove_one_ip()
501	<	*
502	<	* inputs        - unsigned long IP address value
503	<	* output        - NONE
504	<	* side effects  - The ip address given, is looked up in ip hash table
505	<	*                 and number of ip#'s for that ip decremented.
506	<	*                 If ip # count reaches 0 and has expired,
507	<	*                 the struct ip_entry is returned to the ip_entry_heap
508	<	*/
509	<	void
510	<	remove_one_ip(struct irc_ssaddr *ip_in)
511	<	{
512	<	struct ip_entry *ptr;
513	<	struct ip_entry *last_ptr = NULL;
514	<	int hash_index = hash_ip(ip_in), res;
515	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
516	<	#ifdef IPV6
517	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
518	<	#endif
278	>	assert(IsConfClient(conf) || IsConfKill(conf));
279
280	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
280	>	if (IsConfClient(conf))
281		{
282	<	#ifdef IPV6
523	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
524	<	continue;
525	<	if (ip_in->ss.ss_family == AF_INET6)
526	<	{
527	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
528	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
529	<	}
530	<	else
531	<	#endif
282	>	if (IsConfRedir(conf))
283		{
284	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
285	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
284	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
285	>	conf->name ? conf->name : "",
286	>	conf->port);
287	>	return NOT_AUTHORIZED;
288		}
289	<	if (res)
290	<	continue;
538	<	if (ptr->count > 0)
539	<	ptr->count--;
540	<	if (ptr->count == 0 &&
541	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
289	>
290	>	if (IsConfDoSpoofIp(conf))
291		{
292	<	if (last_ptr != NULL)
293	<	last_ptr->next = ptr->next;
294	<	else
546	<	ip_hash_table[hash_index] = ptr->next;
292	>	if (IsConfSpoofNotice(conf))
293	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
294	>	client_p->name, client_p->host, conf->name);
295
296	<	mp_pool_release(ptr);
549	<	ip_entries_count--;
550	<	return;
296	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
297		}
552	–	last_ptr = ptr;
553	–	}
554	–	}
298
299	<	/* hash_ip()
557	<	*
558	<	* input        - pointer to an irc_inaddr
559	<	* output       - integer value used as index into hash table
560	<	* side effects - hopefully, none
561	<	*/
562	<	static int
563	<	hash_ip(struct irc_ssaddr *addr)
564	<	{
565	<	if (addr->ss.ss_family == AF_INET)
566	<	{
567	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
568	<	int hash;
569	<	uint32_t ip;
570	<
571	<	ip   = ntohl(v4->sin_addr.s_addr);
572	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
573	<	return hash;
299	>	return attach_iline(client_p, conf);
300		}
301	<	#ifdef IPV6
302	<	else
303	<	{
578	<	int hash;
579	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
580	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
581	<
582	<	hash  = ip[0] ^ ip[3];
583	<	hash ^= hash >> 16;
584	<	hash ^= hash >> 8;
585	<	hash  = hash & (IP_HASH_SIZE - 1);
586	<	return hash;
587	<	}
588	<	#else
589	<	return 0;
590	<	#endif
301	>
302	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
303	>	return BANNED_CLIENT;
304		}
305
306	<	/* count_ip_hash()
594	<	*
595	<	* inputs        - pointer to counter of number of ips hashed
596	<	*               - pointer to memory used for ip hash
597	<	* output        - returned via pointers input
598	<	* side effects  - NONE
306	>	/* check_client()
307		*
308	<	* number of hashed ip #'s is counted up, plus the amount of memory
309	<	* used in the hash.
308	>	* inputs       - pointer to client
309	>	* output       - 0 = Success
310	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
311	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
312	>	*                I_LINE_FULL       (-3) = I-line is full
313	>	*                TOO_MANY          (-4) = Too many connections from hostname
314	>	*                BANNED_CLIENT     (-5) = K-lined
315	>	* side effects - Ordinary client access check.
316	>	*                Look for conf lines which have the same
317	>	*                status as the flags passed.
318		*/
319	<	void
320	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
319	>	int
320	>	check_client(struct Client *source_p)
321		{
606	–	struct ip_entry *ptr;
322		int i;
323
324	<	*number_ips_stored = 0;
325	<	*mem_ips_stored    = 0;
324	>	if ((i = verify_access(source_p)))
325	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
326	>	source_p->name, source_p->sockhost);
327
328	<	for (i = 0; i < IP_HASH_SIZE; i++)
328	>	switch (i)
329		{
330	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
331	<	{
332	<	*number_ips_stored += 1;
333	<	*mem_ips_stored += sizeof(struct ip_entry);
334	<	}
335	<	}
336	<	}
330	>	case TOO_MANY:
331	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
332	>	"Too many on IP for %s (%s).",
333	>	client_get_name(source_p, SHOW_IP),
334	>	source_p->sockhost);
335	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
336	>	client_get_name(source_p, SHOW_IP));
337	>	++ServerStats.is_ref;
338	>	exit_client(source_p, "No more connections allowed on that IP");
339	>	break;
340
341	<	/* garbage_collect_ip_entries()
342	<	*
343	<	* input        - NONE
344	<	* output       - NONE
345	<	* side effects - free up all ip entries with no connections
346	<	*/
347	<	static void
348	<	garbage_collect_ip_entries(void)
349	<	{
350	<	struct ip_entry *ptr;
632	<	struct ip_entry *last_ptr;
633	<	struct ip_entry *next_ptr;
634	<	int i;
341	>	case I_LINE_FULL:
342	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
343	>	"auth {} block is full for %s (%s).",
344	>	client_get_name(source_p, SHOW_IP),
345	>	source_p->sockhost);
346	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
347	>	client_get_name(source_p, SHOW_IP));
348	>	++ServerStats.is_ref;
349	>	exit_client(source_p, "No more connections allowed in your connection class");
350	>	break;
351
352	<	for (i = 0; i < IP_HASH_SIZE; i++)
353	<	{
354	<	last_ptr = NULL;
352	>	case NOT_AUTHORIZED:
353	>	/* jdc - lists server name & port connections are on */
354	>	/*       a purely cosmetical change */
355	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
356	>	"Unauthorized client connection from %s on [%s/%u].",
357	>	client_get_name(source_p, SHOW_IP),
358	>	source_p->connection->listener->name,
359	>	source_p->connection->listener->port);
360	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
361	>	client_get_name(source_p, SHOW_IP),
362	>	source_p->connection->listener->name,
363	>	source_p->connection->listener->port);
364
365	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
366	<	{
367	<	next_ptr = ptr->next;
365	>	++ServerStats.is_ref;
366	>	exit_client(source_p, "You are not authorized to use this server");
367	>	break;
368
369	<	if (ptr->count == 0 &&
370	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
371	<	{
372	<	if (last_ptr != NULL)
373	<	last_ptr->next = ptr->next;
374	<	else
375	<	ip_hash_table[i] = ptr->next;
376	<	mp_pool_release(ptr);
652	<	ip_entries_count--;
653	<	}
654	<	else
655	<	last_ptr = ptr;
656	<	}
369	>	case BANNED_CLIENT:
370	>	++ServerStats.is_ref;
371	>	exit_client(source_p, "Banned");
372	>	break;
373	>
374	>	case 0:
375	>	default:
376	>	break;
377		}
378	+
379	+	return !(i < 0);
380		}
381
382	<	/* detach_conf()
383	<	*
384	<	* inputs       - pointer to client to detach
385	<	*              - type of conf to detach
664	<	* output       - 0 for success, -1 for failure
665	<	* side effects - Disassociate configuration from the client.
666	<	*                Also removes a class from the list if marked for deleting.
382	>	/*! \brief Disassociate configuration from the client. Also removes a class
383	>	*         from the list if marked for deleting.
384	>	* \param client_p Client to operate on
385	>	* \param type     Type of conf to detach
386		*/
387		void
388	<	detach_conf(struct Client *client_p, enum maskitem_type type)
388	>	conf_detach(struct Client *client_p, enum maskitem_type type)
389		{
390	<	dlink_node *ptr = NULL, *ptr_next = NULL;
390	>	dlink_node *node, *node_next;
391
392	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
392	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
393		{
394	<	struct MaskItem *conf = ptr->data;
394	>	struct MaskItem *conf = node->data;
395
396		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
397		assert(conf->ref_count > 0);
#	Line 681 | Line 400 | detach_conf(struct Client *client_p, enu
400		if (!(conf->type & type))
401		continue;
402
403	<	dlinkDelete(ptr, &client_p->localClient->confs);
404	<	free_dlink_node(ptr);
403	>	dlinkDelete(node, &client_p->connection->confs);
404	>	free_dlink_node(node);
405
406		if (conf->type == CONF_CLIENT)
407	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
407	>	remove_from_cidr_check(&client_p->ip, conf->class);
408
409		if (--conf->class->ref_count == 0 && conf->class->active == 0)
410		{
#	Line 698 | Line 417 | detach_conf(struct Client *client_p, enu
417		}
418		}
419
420	<	/* attach_conf()
421	<	*
422	<	* inputs       - client pointer
423	<	*              - conf pointer
424	<	* output       -
706	<	* side effects - Associate a specific configuration entry to a *local*
707	<	*                client (this is the one which used in accepting the
708	<	*                connection). Note, that this automatically changes the
709	<	*                attachment if there was an old one...
420	>	/*! \brief Associate a specific configuration entry to a *local* client (this
421	>	*         is the one which used in accepting the connection). Note, that this
422	>	*         automatically changes the attachment if there was an old one.
423	>	* \param client_p Client to attach the conf to
424	>	* \param conf Configuration record to attach
425		*/
426		int
427	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
427	>	conf_attach(struct Client *client_p, struct MaskItem *conf)
428		{
429	<	if (dlinkFind(&client_p->localClient->confs, conf))
429	>	if (dlinkFind(&client_p->connection->confs, conf))
430		return 1;
431
432		if (conf->type == CONF_CLIENT)
433		if (cidr_limit_reached(IsConfExemptLimits(conf),
434	<	&client_p->localClient->ip, conf->class))
434	>	&client_p->ip, conf->class))
435		return TOO_MANY;    /* Already at maximum allowed */
436
437		conf->class->ref_count++;
438		conf->ref_count++;
439
440	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
726	<
727	<	return 0;
728	<	}
729	<
730	<	/* attach_connect_block()
731	<	*
732	<	* inputs       - pointer to server to attach
733	<	*              - name of server
734	<	*              - hostname of server
735	<	* output       - true (1) if both are found, otherwise return false (0)
736	<	* side effects - find connect block and attach them to connecting client
737	<	*/
738	<	int
739	<	attach_connect_block(struct Client *client_p, const char *name,
740	<	const char *host)
741	<	{
742	<	dlink_node *ptr;
743	<	struct MaskItem *conf = NULL;
744	<
745	<	assert(client_p != NULL);
746	<	assert(host != NULL);
747	<
748	<	if (client_p == NULL || host == NULL)
749	<	return 0;
750	<
751	<	DLINK_FOREACH(ptr, server_items.head)
752	<	{
753	<	conf = ptr->data;
754	<
755	<	if (match(conf->name, name) || match(conf->host, host))
756	<	continue;
757	<
758	<	attach_conf(client_p, conf);
759	<	return -1;
760	<	}
440	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
441
442		return 0;
443		}
#	Line 774 | Line 454 | attach_connect_block(struct Client *clie
454		struct MaskItem *
455		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
456		{
457	<	dlink_node *ptr;
778	<	struct MaskItem* conf;
457	>	dlink_node *node = NULL;
458
459	<	DLINK_FOREACH(ptr, list->head)
459	>	DLINK_FOREACH(node, list->head)
460		{
461	<	conf = ptr->data;
461	>	struct MaskItem *conf = node->data;
462
463		if (conf->type == type)
464		{
465	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
466	<	!match(conf->name, name)))
788	<	return conf;
465	>	if (conf->name && !irccmp(conf->name, name))
466	>	return conf;
467		}
468		}
469
470		return NULL;
471		}
472
473	<	/* map_to_list()
474	<	*
475	<	* inputs       - ConfType conf
798	<	* output       - pointer to dlink_list to use
799	<	* side effects - none
800	<	*/
801	<	static dlink_list *
802	<	map_to_list(enum maskitem_type type)
803	<	{
804	<	switch(type)
805	<	{
806	<	case CONF_XLINE:
807	<	return(&xconf_items);
808	<	break;
809	<	case CONF_ULINE:
810	<	return(&uconf_items);
811	<	break;
812	<	case CONF_NRESV:
813	<	return(&nresv_items);
814	<	break;
815	<	case CONF_CRESV:
816	<	return(&cresv_items);
817	<	case CONF_OPER:
818	<	return(&oconf_items);
819	<	break;
820	<	case CONF_SERVER:
821	<	return(&server_items);
822	<	break;
823	<	case CONF_SERVICE:
824	<	return(&service_items);
825	<	break;
826	<	case CONF_CLUSTER:
827	<	return(&cluster_items);
828	<	break;
829	<	default:
830	<	return NULL;
831	<	}
832	<	}
833	<
834	<	/* find_matching_name_conf()
835	<	*
836	<	* inputs       - type of link list to look in
837	<	*              - pointer to name string to find
838	<	*              - pointer to user
839	<	*              - pointer to host
840	<	*              - optional flags to match on as well
841	<	* output       - NULL or pointer to found struct MaskItem
842	<	* side effects - looks for a match on name field
473	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
474	>	* \param name Name to match
475	>	* \param compare Pointer to function to be used for string matching
476		*/
477		struct MaskItem *
478	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
846	<	const char *host, unsigned int flags)
478	>	connect_find(const char *name, int (*compare)(const char *, const char *))
479		{
480	<	dlink_node *ptr=NULL;
849	<	struct MaskItem *conf=NULL;
850	<	dlink_list *list_p = map_to_list(type);
480	>	dlink_node *node;
481
482	<	switch (type)
482	>	DLINK_FOREACH(node, connect_items.head)
483		{
484	<	case CONF_SERVICE:
855	<	DLINK_FOREACH(ptr, list_p->head)
856	<	{
857	<	conf = ptr->data;
858	<
859	<	if (EmptyString(conf->name))
860	<	continue;
861	<	if ((name != NULL) && !irccmp(name, conf->name))
862	<	return conf;
863	<	}
864	<	break;
865	<
866	<	case CONF_XLINE:
867	<	case CONF_ULINE:
868	<	case CONF_NRESV:
869	<	case CONF_CRESV:
870	<	DLINK_FOREACH(ptr, list_p->head)
871	<	{
872	<	conf = ptr->data;
873	<
874	<	if (EmptyString(conf->name))
875	<	continue;
876	<	if ((name != NULL) && !match(conf->name, name))
877	<	{
878	<	if ((user == NULL && (host == NULL)))
879	<	return conf;
880	<	if ((conf->flags & flags) != flags)
881	<	continue;
882	<	if (EmptyString(conf->user) || EmptyString(conf->host))
883	<	return conf;
884	<	if (!match(conf->user, user) && !match(conf->host, host))
885	<	return conf;
886	<	}
887	<	}
888	<	break;
889	<
890	<	case CONF_SERVER:
891	<	DLINK_FOREACH(ptr, list_p->head)
892	<	{
893	<	conf = ptr->data;
484	>	struct MaskItem *conf = node->data;
485
486	<	if ((name != NULL) && !match(name, conf->name))
487	<	return conf;
897	<	else if ((host != NULL) && !match(host, conf->host))
898	<	return conf;
899	<	}
900	<	break;
901	<
902	<	default:
903	<	break;
486	>	if (!compare(name, conf->name))
487	>	return conf;
488		}
489	+
490		return NULL;
491		}
492
#	Line 915 | Line 500 | find_matching_name_conf(enum maskitem_ty
500		* side effects - looks for an exact match on name field
501		*/
502		struct MaskItem *
503	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
919	<	const char *user, const char *host)
503	>	operator_find(const struct Client *who, const char *name)
504		{
505	<	dlink_node *ptr = NULL;
922	<	struct MaskItem *conf;
923	<	dlink_list *list_p = map_to_list(type);
505	>	dlink_node *node = NULL;
506
507	<	switch(type)
507	>	DLINK_FOREACH(node, operator_items.head)
508		{
509	<	case CONF_XLINE:
928	<	case CONF_ULINE:
929	<	case CONF_NRESV:
930	<	case CONF_CRESV:
931	<
932	<	DLINK_FOREACH(ptr, list_p->head)
933	<	{
934	<	conf = ptr->data;
935	<
936	<	if (EmptyString(conf->name))
937	<	continue;
938	<
939	<	if (irccmp(conf->name, name) == 0)
940	<	{
941	<	if ((user == NULL && (host == NULL)))
942	<	return conf;
943	<	if (EmptyString(conf->user) || EmptyString(conf->host))
944	<	return conf;
945	<	if (!match(conf->user, user) && !match(conf->host, host))
946	<	return conf;
947	<	}
948	<	}
949	<	break;
509	>	struct MaskItem *conf = node->data;
510
511	<	case CONF_OPER:
952	<	DLINK_FOREACH(ptr, list_p->head)
511	>	if (!irccmp(conf->name, name))
512		{
513	<	conf = ptr->data;
514	<
956	<	if (EmptyString(conf->name))
957	<	continue;
513	>	if (!who)
514	>	return conf;
515
516	<	if (!irccmp(conf->name, name))
516	>	if (!match(conf->user, who->username))
517		{
518	<	if (!who)
962	<	return conf;
963	<	if (EmptyString(conf->user) || EmptyString(conf->host))
964	<	return NULL;
965	<	if (!match(conf->user, who->username))
518	>	switch (conf->htype)
519		{
520	<	switch (conf->htype)
521	<	{
522	<	case HM_HOST:
523	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
520	>	case HM_HOST:
521	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
522	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
523	>	return conf;
524	>	break;
525	>	case HM_IPV4:
526	>	if (who->ip.ss.ss_family == AF_INET)
527	>	if (match_ipv4(&who->ip, &conf->addr, conf->bits))
528		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
529		return conf;
530	<	break;
531	<	case HM_IPV4:
532	<	if (who->localClient->aftype == AF_INET)
533	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
534	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
535	<	return conf;
536	<	break;
537	<	#ifdef IPV6
538	<	case HM_IPV6:
982	<	if (who->localClient->aftype == AF_INET6)
983	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
984	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
985	<	return conf;
986	<	break;
987	<	#endif
988	<	default:
989	<	assert(0);
990	<	}
530	>	break;
531	>	case HM_IPV6:
532	>	if (who->ip.ss.ss_family == AF_INET6)
533	>	if (match_ipv6(&who->ip, &conf->addr, conf->bits))
534	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
535	>	return conf;
536	>	break;
537	>	default:
538	>	assert(0);
539		}
540		}
541		}
994	–
995	–	break;
996	–
997	–	case CONF_SERVER:
998	–	DLINK_FOREACH(ptr, list_p->head)
999	–	{
1000	–	conf = ptr->data;
1001	–
1002	–	if (EmptyString(conf->name))
1003	–	continue;
1004	–
1005	–	if (name == NULL)
1006	–	{
1007	–	if (EmptyString(conf->host))
1008	–	continue;
1009	–	if (irccmp(conf->host, host) == 0)
1010	–	return conf;
1011	–	}
1012	–	else if (irccmp(conf->name, name) == 0)
1013	–	return conf;
1014	–	}
1015	–
1016	–	break;
1017	–
1018	–	default:
1019	–	break;
542		}
543
544		return NULL;
545		}
546
1025	–	/* rehash()
1026	–	*
1027	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1028	–	* as a result of an operator issuing this command, else assume it has been
1029	–	* called as a result of the server receiving a HUP signal.
1030	–	*/
1031	–	int
1032	–	rehash(int sig)
1033	–	{
1034	–	if (sig)
1035	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1036	–	"Got signal SIGHUP, reloading configuration file(s)");
1037	–
1038	–	restart_resolver();
1039	–
1040	–	/* don't close listeners until we know we can go ahead with the rehash */
1041	–
1042	–	/* Check to see if we magically got(or lost) IPv6 support */
1043	–	check_can_use_v6();
1044	–
1045	–	read_conf_files(0);
1046	–
1047	–	if (ServerInfo.description)
1048	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1049	–
1050	–	load_conf_modules();
1051	–
1052	–	rehashed_klines = 1;
1053	–
1054	–	return 0;
1055	–	}
1056	–
547		/* set_default_conf()
548		*
549		* inputs       - NONE
#	Line 1071 | Line 561 | set_default_conf(void)
561		*/
562		assert(class_default == class_get_list()->tail->data);
563
564	<	#ifdef HAVE_LIBCRYPTO
565	<	ServerInfo.rsa_private_key = NULL;
566	<	ServerInfo.rsa_private_key_file = NULL;
567	<	#endif
568	<
569	<	/* ServerInfo.name is not rehashable */
570	<	/* ServerInfo.name = ServerInfo.name; */
571	<	ServerInfo.description = NULL;
572	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
573	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
574	<
575	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1086	<	ServerInfo.specific_ipv4_vhost = 0;
1087	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1088	<	ServerInfo.specific_ipv6_vhost = 0;
1089	<
1090	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1091	<	ServerInfo.max_nick_length = 9;
1092	<	ServerInfo.max_topic_length = 80;
1093	<
1094	<	ServerInfo.hub = 0;
1095	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1096	<	ServerInfo.dns_host.sin_port = 0;
1097	<	AdminInfo.name = NULL;
1098	<	AdminInfo.email = NULL;
1099	<	AdminInfo.description = NULL;
564	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
565	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
566	>
567	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
568	>	ConfigServerInfo.specific_ipv4_vhost = 0;
569	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
570	>	ConfigServerInfo.specific_ipv6_vhost = 0;
571	>
572	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
573	>	ConfigServerInfo.max_nick_length = 9;
574	>	ConfigServerInfo.max_topic_length = 80;
575	>	ConfigServerInfo.hub = 0;
576
577	<	log_del_all();
577	>	log_iterate(log_free);
578
579	<	ConfigLoggingEntry.use_logging = 1;
579	>	ConfigLog.use_logging = 1;
580
581		ConfigChannel.disable_fake_channels = 0;
582	<	ConfigChannel.knock_delay = 300;
582	>	ConfigChannel.invite_client_count = 10;
583	>	ConfigChannel.invite_client_time = 300;
584	>	ConfigChannel.invite_delay_channel = 5;
585	>	ConfigChannel.invite_expire_time = 1800;
586	>	ConfigChannel.knock_client_count = 1;
587	>	ConfigChannel.knock_client_time = 300;
588		ConfigChannel.knock_delay_channel = 60;
589	<	ConfigChannel.max_chans_per_user = 25;
590	<	ConfigChannel.max_chans_per_oper = 50;
591	<	ConfigChannel.max_bans = 25;
592	<	ConfigChannel.default_split_user_count = 0;
593	<	ConfigChannel.default_split_server_count = 0;
594	<	ConfigChannel.no_join_on_split = 0;
1114	<	ConfigChannel.no_create_on_split = 0;
589	>	ConfigChannel.max_channels = 25;
590	>	ConfigChannel.max_invites = 20;
591	>	ConfigChannel.max_bans = 100;
592	>	ConfigChannel.max_bans_large = 500;
593	>	ConfigChannel.default_join_flood_count = 18;
594	>	ConfigChannel.default_join_flood_time = 6;
595
596		ConfigServerHide.flatten_links = 0;
597	<	ConfigServerHide.links_delay = 300;
597	>	ConfigServerHide.flatten_links_delay = 300;
598		ConfigServerHide.hidden = 0;
599		ConfigServerHide.hide_servers = 0;
600		ConfigServerHide.hide_services = 0;
#	Line 1122 | Line 602 | set_default_conf(void)
602		ConfigServerHide.hide_server_ips = 0;
603		ConfigServerHide.disable_remote_commands = 0;
604
605	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
606	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
607	<	ConfigFileEntry.cycle_on_host_change = 1;
608	<	ConfigFileEntry.glines = 0;
609	<	ConfigFileEntry.gline_time = 12 * 3600;
610	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
611	<	ConfigFileEntry.gline_min_cidr = 16;
612	<	ConfigFileEntry.gline_min_cidr6 = 48;
613	<	ConfigFileEntry.invisible_on_connect = 1;
614	<	ConfigFileEntry.tkline_expire_notices = 1;
615	<	ConfigFileEntry.hide_spoof_ips = 1;
616	<	ConfigFileEntry.ignore_bogus_ts = 0;
617	<	ConfigFileEntry.disable_auth = 0;
618	<	ConfigFileEntry.kill_chase_time_limit = 90;
619	<	ConfigFileEntry.default_floodcount = 8;
620	<	ConfigFileEntry.failed_oper_notice = 1;
621	<	ConfigFileEntry.dots_in_ident = 0;
622	<	ConfigFileEntry.min_nonwildcard = 4;
623	<	ConfigFileEntry.min_nonwildcard_simple = 3;
624	<	ConfigFileEntry.max_accept = 20;
625	<	ConfigFileEntry.anti_nick_flood = 0;
626	<	ConfigFileEntry.max_nick_time = 20;
627	<	ConfigFileEntry.max_nick_changes = 5;
628	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
629	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
630	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
631	<	ConfigFileEntry.warn_no_nline = 1;
632	<	ConfigFileEntry.stats_o_oper_only = 0;
633	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
634	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
635	<	ConfigFileEntry.stats_P_oper_only = 0;
636	<	ConfigFileEntry.stats_u_oper_only = 0;
637	<	ConfigFileEntry.caller_id_wait = 60;
638	<	ConfigFileEntry.opers_bypass_callerid = 0;
639	<	ConfigFileEntry.pace_wait = 10;
640	<	ConfigFileEntry.pace_wait_simple = 1;
641	<	ConfigFileEntry.short_motd = 0;
642	<	ConfigFileEntry.ping_cookie = 0;
643	<	ConfigFileEntry.no_oper_flood = 0;
644	<	ConfigFileEntry.true_no_oper_flood = 0;
645	<	ConfigFileEntry.oper_pass_resv = 1;
646	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
647	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
648	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
649	<	UMODE_OPERWALL | UMODE_WALLOP;
650	<	ConfigFileEntry.use_egd = 0;
651	<	ConfigFileEntry.egdpool_path = NULL;
652	<	ConfigFileEntry.throttle_time = 10;
605	>	ConfigGeneral.away_count = 2;
606	>	ConfigGeneral.away_time = 10;
607	>	ConfigGeneral.max_watch = 50;
608	>	ConfigGeneral.whowas_history_length = 15000;
609	>	ConfigGeneral.cycle_on_host_change = 1;
610	>	ConfigGeneral.dline_min_cidr = 16;
611	>	ConfigGeneral.dline_min_cidr6 = 48;
612	>	ConfigGeneral.kline_min_cidr = 16;
613	>	ConfigGeneral.kline_min_cidr6 = 48;
614	>	ConfigGeneral.invisible_on_connect = 1;
615	>	ConfigGeneral.tkline_expire_notices = 1;
616	>	ConfigGeneral.ignore_bogus_ts = 0;
617	>	ConfigGeneral.disable_auth = 0;
618	>	ConfigGeneral.kill_chase_time_limit = 90;
619	>	ConfigGeneral.default_floodcount = 8;
620	>	ConfigGeneral.default_floodtime = 1;
621	>	ConfigGeneral.failed_oper_notice = 1;
622	>	ConfigGeneral.dots_in_ident = 0;
623	>	ConfigGeneral.min_nonwildcard = 4;
624	>	ConfigGeneral.min_nonwildcard_simple = 3;
625	>	ConfigGeneral.max_accept = 50;
626	>	ConfigGeneral.anti_nick_flood = 0;
627	>	ConfigGeneral.max_nick_time = 20;
628	>	ConfigGeneral.max_nick_changes = 5;
629	>	ConfigGeneral.anti_spam_exit_message_time = 0;
630	>	ConfigGeneral.ts_warn_delta = 30;
631	>	ConfigGeneral.ts_max_delta = 600;
632	>	ConfigGeneral.warn_no_connect_block = 1;
633	>	ConfigGeneral.stats_e_disabled = 0;
634	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
635	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
636	>	ConfigGeneral.stats_o_oper_only = 1;
637	>	ConfigGeneral.stats_m_oper_only = 1;
638	>	ConfigGeneral.stats_P_oper_only = 0;
639	>	ConfigGeneral.stats_u_oper_only = 0;
640	>	ConfigGeneral.caller_id_wait = 60;
641	>	ConfigGeneral.opers_bypass_callerid = 1;
642	>	ConfigGeneral.pace_wait = 10;
643	>	ConfigGeneral.pace_wait_simple = 1;
644	>	ConfigGeneral.short_motd = 0;
645	>	ConfigGeneral.ping_cookie = 0;
646	>	ConfigGeneral.no_oper_flood = 0;
647	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
648	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
649	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
650	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
651	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
652	>	ConfigGeneral.throttle_count = 1;
653	>	ConfigGeneral.throttle_time = 1;
654		}
655
656		static void
657		validate_conf(void)
658		{
659	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
660	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1180	<
1181	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1182	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1183	<
1184	<	if (ServerInfo.network_name == NULL)
1185	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1186	<
1187	<	if (ServerInfo.network_desc == NULL)
1188	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
659	>	if (EmptyString(ConfigServerInfo.network_name))
660	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
661
662	<	if (ConfigFileEntry.service_name == NULL)
663	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1192	<
1193	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
662	>	if (EmptyString(ConfigServerInfo.network_desc))
663	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
664		}
665
666		/* read_conf()
#	Line 1202 | Line 672 | validate_conf(void)
672		static void
673		read_conf(FILE *file)
674		{
675	<	lineno = 0;
675	>	lineno = 1;
676
677	<	set_default_conf(); /* Set default values prior to conf parsing */
677	>	set_default_conf();  /* Set default values prior to conf parsing */
678		conf_parser_ctx.pass = 1;
679	<	yyparse();          /* pick up the classes first */
679	>	yyparse();  /* Pick up the classes first */
680
681		rewind(file);
682
683		conf_parser_ctx.pass = 2;
684	<	yyparse();          /* Load the values from the conf */
685	<	validate_conf();    /* Check to make sure some values are still okay. */
686	<	/* Some global values are also loaded here. */
687	<	class_delete_marked();      /* Make sure classes are valid */
684	>	yyparse();  /* Load the values from the conf */
685	>	validate_conf();  /* Check to make sure some values are still okay. */
686	>	/* Some global values are also loaded here. */
687	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
688	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
689	>	}
690	>
691	>	/* conf_rehash()
692	>	*
693	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
694	>	* as a result of an operator issuing this command, else assume it has been
695	>	* called as a result of the server receiving a HUP signal.
696	>	*/
697	>	void
698	>	conf_rehash(int sig)
699	>	{
700	>	if (sig)
701	>	{
702	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
703	>	"Got signal SIGHUP, reloading configuration file(s)");
704	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
705	>	}
706	>
707	>	restart_resolver();
708	>
709	>	/* don't close listeners until we know we can go ahead with the rehash */
710	>
711	>	read_conf_files(0);
712	>
713	>	load_conf_modules();
714	>	check_conf_klines();
715		}
716
717		/* lookup_confhost()
#	Line 1227 | Line 724 | lookup_confhost(struct MaskItem *conf)
724		{
725		struct addrinfo hints, *res;
726
727	<	/* Do name lookup now on hostnames given and store the
727	>	/*
728	>	* Do name lookup now on hostnames given and store the
729		* ip numbers in conf structure.
730		*/
731		memset(&hints, 0, sizeof(hints));
#	Line 1263 | Line 761 | lookup_confhost(struct MaskItem *conf)
761		int
762		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
763		{
764	<	struct ip_entry *ip_found;
765	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
1268	<
1269	<	/* DLINE exempt also gets you out of static limits/pacing... */
1270	<	if (conf && (conf->type == CONF_EXEMPT))
1271	<	return 0;
764	>	struct ip_entry *ip_found = NULL;
765	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
766
767		if (conf)
768	+	{
769	+	/* DLINE exempt also gets you out of static limits/pacing... */
770	+	if (conf->type == CONF_EXEMPT)
771	+	return 0;
772		return BANNED_CLIENT;
773	+	}
774
775	<	ip_found = find_or_add_ip(addr);
775	>	ip_found = ipcache_find_or_add_address(addr);
776
777	<	if ((CurrentTime - ip_found->last_attempt) <
1279	<	ConfigFileEntry.throttle_time)
777	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
778		{
779	<	ip_found->last_attempt = CurrentTime;
780	<	return TOO_FAST;
779	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
780	>	return TOO_FAST;
781	>
782	>	++ip_found->connection_count;
783		}
784	+	else
785	+	ip_found->connection_count = 1;
786
787		ip_found->last_attempt = CurrentTime;
788		return 0;
#	Line 1294 | Line 796 | conf_connect_allowed(struct irc_ssaddr *
796		*                This is an event started off in ircd.c
797		*/
798		void
799	<	cleanup_tklines(void *notused)
799	>	cleanup_tklines(void *unused)
800		{
801		hostmask_expire_temporary();
802	<	expire_tklines(&xconf_items);
803	<	expire_tklines(&nresv_items);
1302	<	expire_tklines(&cresv_items);
1303	<	}
1304	<
1305	<	/* expire_tklines()
1306	<	*
1307	<	* inputs       - tkline list pointer
1308	<	* output       - NONE
1309	<	* side effects - expire tklines
1310	<	*/
1311	<	static void
1312	<	expire_tklines(dlink_list *tklist)
1313	<	{
1314	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1315	<	struct MaskItem *conf = NULL;
1316	<
1317	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1318	<	{
1319	<	conf = ptr->data;
1320	<
1321	<	if (!conf->until || conf->until > CurrentTime)
1322	<	continue;
1323	<
1324	<	if (conf->type == CONF_XLINE)
1325	<	{
1326	<	if (ConfigFileEntry.tkline_expire_notices)
1327	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1328	<	"Temporary X-line for [%s] expired", conf->name);
1329	<	conf_free(conf);
1330	<	}
1331	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1332	<	{
1333	<	if (ConfigFileEntry.tkline_expire_notices)
1334	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1335	<	"Temporary RESV for [%s] expired", conf->name);
1336	<	conf_free(conf);
1337	<	}
1338	<	}
802	>	gecos_expire();
803	>	resv_expire();
804		}
805
806		/* oper_privs_as_string()
#	Line 1344 | Line 809 | expire_tklines(dlink_list *tklist)
809		* output        - pointer to static string showing oper privs
810		* side effects  - return as string, the oper privs as derived from port
811		*/
812	<	static const struct oper_privs
812	>	static const struct oper_flags
813		{
814		const unsigned int flag;
815		const unsigned char c;
816	<	} flag_list[] = {
816	>	} flag_table[] = {
817		{ OPER_FLAG_ADMIN,          'A' },
818	<	{ OPER_FLAG_REMOTEBAN,      'B' },
819	<	{ OPER_FLAG_DIE,            'D' },
820	<	{ OPER_FLAG_GLINE,          'G' },
821	<	{ OPER_FLAG_REHASH,         'H' },
822	<	{ OPER_FLAG_K,              'K' },
823	<	{ OPER_FLAG_OPERWALL,       'L' },
824	<	{ OPER_FLAG_KILL,           'N' },
825	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
826	<	{ OPER_FLAG_CONNECT,        'P' },
827	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
828	<	{ OPER_FLAG_SQUIT,          'R' },
829	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
830	<	{ OPER_FLAG_UNKLINE,        'U' },
831	<	{ OPER_FLAG_XLINE,          'X' },
818	>	{ OPER_FLAG_CLOSE,          'B' },
819	>	{ OPER_FLAG_CONNECT,        'C' },
820	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
821	>	{ OPER_FLAG_DIE,            'E' },
822	>	{ OPER_FLAG_DLINE,          'F' },
823	>	{ OPER_FLAG_GLOBOPS,        'G' },
824	>	{ OPER_FLAG_JOIN_RESV,      'H' },
825	>	{ OPER_FLAG_KILL,           'I' },
826	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
827	>	{ OPER_FLAG_KLINE,          'K' },
828	>	{ OPER_FLAG_LOCOPS,         'L' },
829	>	{ OPER_FLAG_MODULE,         'M' },
830	>	{ OPER_FLAG_NICK_RESV,      'N' },
831	>	{ OPER_FLAG_OPME,           'O' },
832	>	{ OPER_FLAG_REHASH,         'P' },
833	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
834	>	{ OPER_FLAG_RESTART,        'R' },
835	>	{ OPER_FLAG_RESV,           'S' },
836	>	{ OPER_FLAG_SET,            'T' },
837	>	{ OPER_FLAG_SQUIT,          'U' },
838	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
839	>	{ OPER_FLAG_UNDLINE,        'W' },
840	>	{ OPER_FLAG_UNKLINE,        'X' },
841	>	{ OPER_FLAG_UNRESV,         'Y' },
842	>	{ OPER_FLAG_UNXLINE,        'Z' },
843	>	{ OPER_FLAG_WALLOPS,        'a' },
844	>	{ OPER_FLAG_XLINE,          'b' },
845		{ 0, '\0' }
846		};
847
848	<	char *
849	<	oper_privs_as_string(const unsigned int port)
848	>	const char *
849	>	oper_privs_as_string(const unsigned int flags)
850		{
851	<	static char privs_out[IRCD_BUFSIZE];
852	<	char *privs_ptr = privs_out;
851	>	static char buf[sizeof(flag_table) / sizeof(flag_table[0])];
852	>	char *p = buf;
853
854	<	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
855	<	{
856	<	if (port & opriv->flag)
857	<	*privs_ptr++ = opriv->c;
858	<	else
859	<	*privs_ptr++ = ToLower(opriv->c);
1382	<	}
854	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
855	>	if (flags & tab->flag)
856	>	*p++ = tab->c;
857	>
858	>	if (p == buf)
859	>	*p++ = '0';
860
861	<	*privs_ptr = '\0';
861	>	*p = '\0';
862
863	<	return privs_out;
863	>	return buf;
864		}
865
866		/*
867	<	* Input: A client to find the active oper{} name for.
867	>	* Input: A client to find the active operator {} name for.
868		* Output: The nick!user@host{oper} of the oper.
869		*         "oper" is server name for remote opers
870		* Side effects: None.
#	Line 1395 | Line 872 | oper_privs_as_string(const unsigned int
872		const char *
873		get_oper_name(const struct Client *client_p)
874		{
875	<	const dlink_node *cnode = NULL;
876	<	/* +5 for !,@,{,} and null */
877	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
875	>	static char buffer[IRCD_BUFSIZE];
876	>
877	>	if (IsServer(client_p))
878	>	return client_p->name;
879
880		if (MyConnect(client_p))
881		{
882	<	if ((cnode = client_p->localClient->confs.head))
882	>	const dlink_node *const node = client_p->connection->confs.head;
883	>
884	>	if (node)
885		{
886	<	const struct MaskItem *conf = cnode->data;
886	>	const struct MaskItem *const conf = node->data;
887
888	<	if (IsConfOperator(conf))
888	>	if (conf->type == CONF_OPER)
889		{
890		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
891		client_p->username, client_p->host, conf->name);
#	Line 1413 | Line 893 | get_oper_name(const struct Client *clien
893		}
894		}
895
896	<	/* Probably should assert here for now. If there is an oper out there
897	<	* with no oper{} conf attached, it would be good for us to know...
896	>	/*
897	>	* Probably should assert here for now. If there is an oper out there
898	>	* with no operator {} conf attached, it would be good for us to know...
899		*/
900	<	assert(0); /* Oper without oper conf! */
900	>	assert(0);  /* Oper without oper conf! */
901		}
902
903		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1424 | Line 905 | get_oper_name(const struct Client *clien
905		return buffer;
906		}
907
908	+	/* clear_out_old_conf()
909	+	*
910	+	* inputs       - none
911	+	* output       - none
912	+	* side effects - Clear out the old configuration
913	+	*/
914	+	static void
915	+	clear_out_old_conf(void)
916	+	{
917	+	dlink_node *node = NULL, *node_next = NULL;
918	+	dlink_list *free_items [] = {
919	+	&connect_items, &operator_items, NULL
920	+	};
921	+
922	+	dlink_list ** iterator = free_items; /* C is dumb */
923	+
924	+	/* We only need to free anything allocated by yyparse() here.
925	+	* Resetting structs, etc, is taken care of by set_default_conf().
926	+	*/
927	+
928	+	for (; *iterator; iterator++)
929	+	{
930	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
931	+	{
932	+	struct MaskItem *conf = node->data;
933	+
934	+	conf->active = 0;
935	+	dlinkDelete(&conf->node, *iterator);
936	+
937	+	if (!conf->ref_count)
938	+	conf_free(conf);
939	+	}
940	+	}
941	+
942	+	/*
943	+	* Don't delete the class table, rather mark all entries for deletion.
944	+	* The table is cleaned up by class_delete_marked. - avalon
945	+	*/
946	+	class_mark_for_deletion();
947	+
948	+	clear_out_address_conf();
949	+
950	+	modules_conf_clear();  /* Clear modules {} items */
951	+
952	+	motd_clear();  /* Clear motd {} items and re-cache default motd */
953	+
954	+	cluster_clear();  /* Clear cluster {} items */
955	+
956	+	gecos_clear();  /* Clear gecos {} items */
957	+
958	+	resv_clear();  /* Clear resv {} items */
959	+
960	+	service_clear();  /* Clear service {} items */
961	+
962	+	shared_clear();  /* Clear shared {} items */
963	+
964	+	pseudo_clear();  /* Clear pseudo {} items */
965	+
966	+	/* Clean out ConfigServerInfo */
967	+	xfree(ConfigServerInfo.description);
968	+	ConfigServerInfo.description = NULL;
969	+	xfree(ConfigServerInfo.network_name);
970	+	ConfigServerInfo.network_name = NULL;
971	+	xfree(ConfigServerInfo.network_desc);
972	+	ConfigServerInfo.network_desc = NULL;
973	+	xfree(ConfigServerInfo.rsa_private_key_file);
974	+	ConfigServerInfo.rsa_private_key_file = NULL;
975	+	xfree(ConfigServerInfo.ssl_certificate_file);
976	+	ConfigServerInfo.ssl_certificate_file = NULL;
977	+	xfree(ConfigServerInfo.ssl_dh_param_file);
978	+	ConfigServerInfo.ssl_dh_param_file = NULL;
979	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
980	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
981	+	xfree(ConfigServerInfo.ssl_cipher_list);
982	+	ConfigServerInfo.ssl_cipher_list = NULL;
983	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
984	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
985	+
986	+	/* Clean out ConfigAdminInfo */
987	+	xfree(ConfigAdminInfo.name);
988	+	ConfigAdminInfo.name = NULL;
989	+	xfree(ConfigAdminInfo.email);
990	+	ConfigAdminInfo.email = NULL;
991	+	xfree(ConfigAdminInfo.description);
992	+	ConfigAdminInfo.description = NULL;
993	+
994	+	/* Clean out ConfigServerHide */
995	+	xfree(ConfigServerHide.flatten_links_file);
996	+	ConfigServerHide.flatten_links_file = NULL;
997	+	xfree(ConfigServerHide.hidden_name);
998	+	ConfigServerHide.hidden_name = NULL;
999	+
1000	+	/* Clean out listeners */
1001	+	listener_close_marked();
1002	+	}
1003	+
1004	+	static void
1005	+	conf_handle_tls(int cold)
1006	+	{
1007	+	if (!tls_new_cred())
1008	+	{
1009	+	if (cold)
1010	+	{
1011	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1012	+	exit(EXIT_FAILURE);
1013	+	}
1014	+	else
1015	+	{
1016	+	/* Failed to load new settings/certs, old ones remain active */
1017	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1018	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1019	+	}
1020	+	}
1021	+	}
1022	+
1023		/* read_conf_files()
1024		*
1025		* inputs       - cold start YES or NO
#	Line 1433 | Line 1029 | get_oper_name(const struct Client *clien
1029		void
1030		read_conf_files(int cold)
1031		{
1032	<	const char *filename;
1033	<	char chanmodes[IRCD_BUFSIZE];
1034	<	char chanlimit[IRCD_BUFSIZE];
1032	>	const char *filename = NULL;
1033	>	char chanmodes[IRCD_BUFSIZE] = "";
1034	>	char chanlimit[IRCD_BUFSIZE] = "";
1035
1036		conf_parser_ctx.boot = cold;
1037	<	filename = ConfigFileEntry.configfile;
1037	>	filename = ConfigGeneral.configfile;
1038
1039		/* We need to know the initial filename for the yyerror() to report
1040		FIXME: The full path is in conffilenamebuf first time since we
1041	<	dont know anything else
1041	>	don't know anything else
1042
1043		- Gozem 2002-07-21
1044		*/
#	Line 1454 | Line 1050 | read_conf_files(int cold)
1050		{
1051		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1052		filename, strerror(errno));
1053	<	exit(-1);
1053	>	exit(EXIT_FAILURE);
1054		}
1055		else
1056		{
1057	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1057	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1058		"Unable to read configuration file '%s': %s",
1059		filename, strerror(errno));
1060		return;
#	Line 1471 | Line 1067 | read_conf_files(int cold)
1067		read_conf(conf_parser_ctx.conf_file);
1068		fclose(conf_parser_ctx.conf_file);
1069
1070	<	log_reopen_all();
1070	>	log_iterate(log_reopen);
1071	>	conf_handle_tls(cold);
1072
1073	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1074	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1073	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1074	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1075
1076	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1077	<	add_isupport("MAXLIST", chanmodes, -1);
1078	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1079	<	add_isupport("CHANTYPES", "#", -1);
1080	<
1081	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1082	<	ConfigChannel.max_chans_per_user);
1083	<	add_isupport("CHANLIMIT", chanlimit, -1);
1084	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1085	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1086	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1087	<	add_isupport("CHANMODES", chanmodes, -1);
1491	<
1492	<	/*
1493	<	* message_locale may have changed.  rebuild isupport since it relies
1494	<	* on strlen(form_str(RPL_ISUPPORT))
1495	<	*/
1496	<	rebuild_isupport_message_line();
1497	<	}
1498	<
1499	<	/* clear_out_old_conf()
1500	<	*
1501	<	* inputs       - none
1502	<	* output       - none
1503	<	* side effects - Clear out the old configuration
1504	<	*/
1505	<	static void
1506	<	clear_out_old_conf(void)
1507	<	{
1508	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1509	<	struct MaskItem *conf;
1510	<	dlink_list *free_items [] = {
1511	<	&server_items,   &oconf_items,
1512	<	&uconf_items,   &xconf_items,
1513	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1514	<	};
1515	<
1516	<	dlink_list ** iterator = free_items; /* C is dumb */
1517	<
1518	<	/* We only need to free anything allocated by yyparse() here.
1519	<	* Resetting structs, etc, is taken care of by set_default_conf().
1520	<	*/
1521	<
1522	<	for (; *iterator != NULL; iterator++)
1523	<	{
1524	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1525	<	{
1526	<	conf = ptr->data;
1527	<
1528	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1529	<
1530	<	/* XXX This is less than pretty */
1531	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1532	<	{
1533	<	if (!conf->ref_count)
1534	<	conf_free(conf);
1535	<	}
1536	<	else if (conf->type == CONF_XLINE)
1537	<	{
1538	<	if (!conf->until)
1539	<	conf_free(conf);
1540	<	}
1541	<	else
1542	<	conf_free(conf);
1543	<	}
1544	<	}
1545	<
1546	<	motd_clear();
1547	<
1548	<	/*
1549	<	* don't delete the class table, rather mark all entries
1550	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1551	<	*/
1552	<	class_mark_for_deletion();
1553	<
1554	<	clear_out_address_conf();
1555	<
1556	<	/* clean out module paths */
1557	<	mod_clear_paths();
1558	<
1559	<	/* clean out ServerInfo */
1560	<	MyFree(ServerInfo.description);
1561	<	ServerInfo.description = NULL;
1562	<	MyFree(ServerInfo.network_name);
1563	<	ServerInfo.network_name = NULL;
1564	<	MyFree(ServerInfo.network_desc);
1565	<	ServerInfo.network_desc = NULL;
1566	<	MyFree(ConfigFileEntry.egdpool_path);
1567	<	ConfigFileEntry.egdpool_path = NULL;
1568	<	#ifdef HAVE_LIBCRYPTO
1569	<	if (ServerInfo.rsa_private_key)
1570	<	{
1571	<	RSA_free(ServerInfo.rsa_private_key);
1572	<	ServerInfo.rsa_private_key = NULL;
1573	<	}
1574	<
1575	<	MyFree(ServerInfo.rsa_private_key_file);
1576	<	ServerInfo.rsa_private_key_file = NULL;
1577	<
1578	<	if (ServerInfo.server_ctx)
1579	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1580	<	SSL_OP_NO_SSLv3|
1581	<	SSL_OP_NO_TLSv1);
1582	<	if (ServerInfo.client_ctx)
1583	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1584	<	SSL_OP_NO_SSLv3|
1585	<	SSL_OP_NO_TLSv1);
1586	<	#endif
1587	<
1588	<	/* clean out AdminInfo */
1589	<	MyFree(AdminInfo.name);
1590	<	AdminInfo.name = NULL;
1591	<	MyFree(AdminInfo.email);
1592	<	AdminInfo.email = NULL;
1593	<	MyFree(AdminInfo.description);
1594	<	AdminInfo.description = NULL;
1595	<
1596	<	/* clean out listeners */
1597	<	close_listeners();
1598	<
1599	<	/* clean out general */
1600	<	MyFree(ConfigFileEntry.service_name);
1601	<	ConfigFileEntry.service_name = NULL;
1076	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1077	>	isupport_add("MAXLIST", chanmodes, -1);
1078	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1079	>	isupport_add("CHANTYPES", "#", -1);
1080	>
1081	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1082	>	ConfigChannel.max_channels);
1083	>	isupport_add("CHANLIMIT", chanlimit, -1);
1084	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstuCLMNORST");
1085	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1086	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1087	>	isupport_add("CHANMODES", chanmodes, -1);
1088		}
1089
1090		/* conf_add_class_to_conf()
#	Line 1608 | Line 1094 | clear_out_old_conf(void)
1094		* side effects - Add a class pointer to a conf
1095		*/
1096		void
1097	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1097	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1098		{
1099	<	if (class_name == NULL)
1099	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1100		{
1101		conf->class = class_default;
1102
1103	<	if (conf->type == CONF_CLIENT)
1104	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1103	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1104	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1105		"Warning *** Defaulting to default class for %s@%s",
1106		conf->user, conf->host);
1107		else
1108	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1108	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1109		"Warning *** Defaulting to default class for %s",
1110		conf->name);
1111		}
1626	–	else
1627	–	conf->class = class_find(class_name, 1);
1628	–
1629	–	if (conf->class == NULL)
1630	–	{
1631	–	if (conf->type == CONF_CLIENT)
1632	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1633	–	"Warning *** Defaulting to default class for %s@%s",
1634	–	conf->user, conf->host);
1635	–	else
1636	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1637	–	"Warning *** Defaulting to default class for %s",
1638	–	conf->name);
1639	–	conf->class = class_default;
1640	–	}
1112		}
1113
1114		/* yyerror()
#	Line 1649 | Line 1120 | conf_add_class_to_conf(struct MaskItem *
1120		void
1121		yyerror(const char *msg)
1122		{
1652	–	char newlinebuf[IRCD_BUFSIZE];
1653	–
1123		if (conf_parser_ctx.pass != 1)
1124		return;
1125
1126	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1127	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1126	>	const char *p = stripws(linebuf);
1127	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1128		"\"%s\", line %u: %s: %s",
1129	<	conffilebuf, lineno + 1, msg, newlinebuf);
1129	>	conffilebuf, lineno, msg, p);
1130		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1131	<	conffilebuf, lineno + 1, msg, newlinebuf);
1131	>	conffilebuf, lineno, msg, p);
1132		}
1133
1134		void
1135		conf_error_report(const char *msg)
1136		{
1137	<	char newlinebuf[IRCD_BUFSIZE];
1138	<
1670	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1671	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1137	>	const char *p = stripws(linebuf);
1138	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1139		"\"%s\", line %u: %s: %s",
1140	<	conffilebuf, lineno + 1, msg, newlinebuf);
1140	>	conffilebuf, lineno, msg, p);
1141		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1142	<	conffilebuf, lineno + 1, msg, newlinebuf);
1142	>	conffilebuf, lineno, msg, p);
1143		}
1144
1145		/*
#	Line 1685 | Line 1152 | conf_error_report(const char *msg)
1152		* side effects - none
1153		* Originally written by Dianora (Diane, db@db.net)
1154		*/
1155	<	time_t
1155	>	uintmax_t
1156		valid_tkline(const char *data, const int minutes)
1157		{
1158		const unsigned char *p = (const unsigned char *)data;
1159		unsigned char tmpch = '\0';
1160	<	time_t result = 0;
1160	>	uintmax_t result = 0;
1161
1162		while ((tmpch = *p++))
1163		{
#	Line 1703 | Line 1170 | valid_tkline(const char *data, const int
1170
1171		/*
1172		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1173	<	* i.e. they specifically use 0, I am going to return 1 instead
1174	<	* as a return value of non-zero is used to flag it as a temporary kline
1173	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1174	>	* value of non-zero is used to flag it as a temporary kline
1175		*/
1176		if (result == 0)
1177		result = 1;
#	Line 1719 | Line 1186 | valid_tkline(const char *data, const int
1186		if (result > MAX_TDKLINE_TIME)
1187		result = MAX_TDKLINE_TIME;
1188
1189	<	result = result * 60;  /* turn it into seconds */
1189	>	result = result * 60;  /* Turn it into seconds */
1190
1191		return result;
1192		}
#	Line 1735 | Line 1202 | valid_wild_card_simple(const char *data)
1202		{
1203		const unsigned char *p = (const unsigned char *)data;
1204		unsigned char tmpch = '\0';
1205	<	int nonwild = 0;
1205	>	unsigned int nonwild = 0, wild = 0;
1206
1207		while ((tmpch = *p++))
1208		{
1209	<	if (tmpch == '\\')
1209	>	if (tmpch == '\\' && *p)
1210		{
1211		++p;
1212	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1212	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1213		return 1;
1214		}
1215		else if (!IsMWildChar(tmpch))
1216		{
1217	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1217	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1218		return 1;
1219		}
1220	+	else
1221	+	++wild;
1222		}
1223
1224	<	return 0;
1224	>	return !wild;
1225		}
1226
1227		/* valid_wild_card()
#	Line 1764 | Line 1233 | valid_wild_card_simple(const char *data)
1233		* side effects - NOTICE is given to source_p if warn is 1
1234		*/
1235		int
1236	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1236	>	valid_wild_card(int count, ...)
1237		{
1238	<	char tmpch;
1239	<	int nonwild = 0;
1238	>	unsigned char tmpch = '\0';
1239	>	unsigned int nonwild = 0;
1240		va_list args;
1241
1242		/*
#	Line 1786 | Line 1255 | valid_wild_card(struct Client *source_p,
1255
1256		while (count--)
1257		{
1258	<	const char *p = va_arg(args, const char *);
1258	>	const unsigned char *p = va_arg(args, const unsigned char *);
1259		if (p == NULL)
1260		continue;
1261
#	Line 1798 | Line 1267 | valid_wild_card(struct Client *source_p,
1267		* If we find enough non-wild characters, we can
1268		* break - no point in searching further.
1269		*/
1270	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1270	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1271		{
1272		va_end(args);
1273		return 1;
#	Line 1807 | Line 1276 | valid_wild_card(struct Client *source_p,
1276		}
1277		}
1278
1810	–	if (warn)
1811	–	sendto_one_notice(source_p, &me,
1812	–	":Please include at least %d non-wildcard characters with the mask",
1813	–	ConfigFileEntry.min_nonwildcard);
1279		va_end(args);
1280		return 0;
1281		}
1282
1283	+	/* find_user_host()
1284	+	*
1285	+	* inputs       - pointer to client placing kline
1286	+	*              - pointer to user_host_or_nick
1287	+	*              - pointer to user buffer
1288	+	*              - pointer to host buffer
1289	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1290	+	* side effects -
1291	+	*/
1292	+	static int
1293	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1294	+	char *luser, char *lhost)
1295	+	{
1296	+	struct Client *target_p = NULL;
1297	+	char *hostp = NULL;
1298	+
1299	+	if (lhost == NULL)
1300	+	{
1301	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1302	+	return 1;
1303	+	}
1304	+
1305	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1306	+	{
1307	+	/* Explicit user@host mask given */
1308	+	if (hostp)                            /* I'm a little user@host */
1309	+	{
1310	+	*(hostp++) = '\0';                       /* short and squat */
1311	+
1312	+	if (*user_host_or_nick)
1313	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1314	+	else
1315	+	strcpy(luser, "*");
1316	+
1317	+	if (*hostp)
1318	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1319	+	else
1320	+	strcpy(lhost, "*");
1321	+	}
1322	+	else
1323	+	{
1324	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1325	+	luser[1] = '\0';
1326	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1327	+	}
1328	+
1329	+	return 1;
1330	+	}
1331	+	else
1332	+	{
1333	+	/* Try to find user@host mask from nick */
1334	+	/* Okay to use source_p as the first param, because source_p == client_p */
1335	+	if ((target_p =
1336	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1337	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1338	+
1339	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1340	+	{
1341	+	if (IsClient(source_p))
1342	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1343	+	return 0;
1344	+	}
1345	+
1346	+	/*
1347	+	* Turn the "user" bit into "*user", blow away '~'
1348	+	* if found in original user name (non-idented)
1349	+	*/
1350	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1351	+
1352	+	if (target_p->username[0] == '~')
1353	+	luser[0] = '*';
1354	+
1355	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1356	+	return 1;
1357	+	}
1358	+
1359	+	return 0;
1360	+	}
1361	+
1362		/* XXX should this go into a separate file ? -Dianora */
1363		/* parse_aline
1364		*
#	Line 1829 | Line 1373 | valid_wild_card(struct Client *source_p,
1373		*              - pointer to target_server to parse into if non NULL
1374		*              - pointer to reason to parse into
1375		*
1376	<	* output       - 1 if valid, -1 if not valid
1376	>	* output       - 1 if valid, 0 if not valid
1377		* side effects - A generalised k/d/x etc. line parser,
1378		*               "ALINE [time] user@host|string [ON] target :reason"
1379		*                will parse returning a parsed user, host if
#	Line 1848 | Line 1392 | valid_wild_card(struct Client *source_p,
1392		int
1393		parse_aline(const char *cmd, struct Client *source_p,
1394		int parc, char **parv,
1395	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1395	>	char **up_p, char **h_p, uintmax_t *tkline_time,
1396		char **target_server, char **reason)
1397		{
1398	<	int found_tkline_time=0;
1399	<	static char def_reason[] = "No Reason";
1398	>	uintmax_t found_tkline_time=0;
1399	>	static char default_reason[] = CONF_NOREASON;
1400		static char user[USERLEN*4+1];
1401		static char host[HOSTLEN*4+1];
1402
#	Line 1861 | Line 1405 | parse_aline(const char *cmd, struct Clie
1405
1406		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1407
1408	<	if (found_tkline_time != 0)
1408	>	if (found_tkline_time)
1409		{
1410		parv++;
1411		parc--;
1412
1413	<	if (tkline_time != NULL)
1413	>	if (tkline_time)
1414		*tkline_time = found_tkline_time;
1415		else
1416		{
1417		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1418	<	return -1;
1418	>	return 0;
1419		}
1420		}
1421
1422		if (parc == 0)
1423		{
1424		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1425	<	return -1;
1425	>	return 0;
1426		}
1427
1428		if (h_p == NULL)
1429		*up_p = *parv;
1430		else
1431		{
1432	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1433	<	return -1;
1432	>	if (find_user_host(source_p, *parv, user, host) == 0)
1433	>	return 0;
1434
1435		*up_p = user;
1436		*h_p = host;
#	Line 1895 | Line 1439 | parse_aline(const char *cmd, struct Clie
1439		parc--;
1440		parv++;
1441
1442	<	if (parc != 0)
1442	>	if (parc)
1443		{
1444		if (irccmp(*parv, "ON") == 0)
1445		{
1446		parc--;
1447		parv++;
1448
1905	–	if (target_server == NULL)
1906	–	{
1907	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1908	–	return -1;
1909	–	}
1910	–
1449		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1450		{
1451		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1452	<	return -1;
1452	>	return 0;
1453		}
1454
1455		if (parc == 0 || EmptyString(*parv))
1456		{
1457		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1458	<	return -1;
1458	>	return 0;
1459		}
1460
1461		*target_server = *parv;
#	Line 1929 | Line 1467 | parse_aline(const char *cmd, struct Clie
1467		/* Make sure target_server *is* NULL if no ON server found
1468		* caller probably NULL'd it first, but no harm to do it again -db
1469		*/
1470	<	if (target_server != NULL)
1470	>	if (target_server)
1471		*target_server = NULL;
1472		}
1473		}
1474
1475	<	if (h_p != NULL)
1475	>	if (reason)
1476		{
1477	<	if (strchr(user, '!') != NULL)
1940	<	{
1941	<	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1942	<	return -1;
1943	<	}
1944	<
1945	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1946	<	return -1;
1947	<	}
1948	<	else
1949	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1950	<	return -1;
1951	<
1952	<	if (reason != NULL)
1953	<	{
1954	<	if (parc != 0 && !EmptyString(*parv))
1955	<	{
1477	>	if (parc && !EmptyString(*parv))
1478		*reason = *parv;
1957	–	if (!valid_comment(source_p, *reason, 1))
1958	–	return -1;
1959	–	}
1479		else
1480	<	*reason = def_reason;
1480	>	*reason = default_reason;
1481		}
1482
1483		return 1;
1484		}
1485
1967	–	/* find_user_host()
1968	–	*
1969	–	* inputs       - pointer to client placing kline
1970	–	*              - pointer to user_host_or_nick
1971	–	*              - pointer to user buffer
1972	–	*              - pointer to host buffer
1973	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1974	–	* side effects -
1975	–	*/
1976	–	static int
1977	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1978	–	char *luser, char *lhost, unsigned int flags)
1979	–	{
1980	–	struct Client *target_p = NULL;
1981	–	char *hostp = NULL;
1982	–
1983	–	if (lhost == NULL)
1984	–	{
1985	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1986	–	return 1;
1987	–	}
1988	–
1989	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1990	–	{
1991	–	/* Explicit user@host mask given */
1992	–
1993	–	if (hostp != NULL)                            /* I'm a little user@host */
1994	–	{
1995	–	*(hostp++) = '\0';                       /* short and squat */
1996	–	if (*user_host_or_nick)
1997	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1998	–	else
1999	–	strcpy(luser, "*");
2000	–
2001	–	if (*hostp)
2002	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2003	–	else
2004	–	strcpy(lhost, "*");
2005	–	}
2006	–	else
2007	–	{
2008	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2009	–	luser[1] = '\0';
2010	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2011	–	}
2012	–
2013	–	return 1;
2014	–	}
2015	–	else
2016	–	{
2017	–	/* Try to find user@host mask from nick */
2018	–	/* Okay to use source_p as the first param, because source_p == client_p */
2019	–	if ((target_p =
2020	–	find_chasing(source_p, user_host_or_nick)) == NULL)
2021	–	return 0;
2022	–
2023	–	if (IsExemptKline(target_p))
2024	–	{
2025	–	if (!IsServer(source_p))
2026	–	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2027	–	return 0;
2028	–	}
2029	–
2030	–	/*
2031	–	* turn the "user" bit into "*user", blow away '~'
2032	–	* if found in original user name (non-idented)
2033	–	*/
2034	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2035	–
2036	–	if (target_p->username[0] == '~')
2037	–	luser[0] = '*';
2038	–
2039	–	if (target_p->sockhost[0] == '\0' ||
2040	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2041	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2042	–	else
2043	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2044	–	return 1;
2045	–	}
2046	–
2047	–	return 0;
2048	–	}
2049	–
2050	–	/* valid_comment()
2051	–	*
2052	–	* inputs       - pointer to client
2053	–	*              - pointer to comment
2054	–	* output       - 0 if no valid comment,
2055	–	*              - 1 if valid
2056	–	* side effects - truncates reason where necessary
2057	–	*/
2058	–	int
2059	–	valid_comment(struct Client *source_p, char *comment, int warn)
2060	–	{
2061	–	if (strlen(comment) > REASONLEN)
2062	–	comment[REASONLEN-1] = '\0';
2063	–
2064	–	return 1;
2065	–	}
2066	–
1486		/* match_conf_password()
1487		*
1488		* inputs       - pointer to given password
#	Line 2088 | Line 1507 | match_conf_password(const char *password
1507		}
1508
1509		/*
2091	–	* cluster_a_line
2092	–	*
2093	–	* inputs       - client sending the cluster
2094	–	*              - command name "KLINE" "XLINE" etc.
2095	–	*              - capab -- CAP_KLN etc. from server.h
2096	–	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2097	–	*              - pattern and args to send along
2098	–	* output       - none
2099	–	* side effects - Take source_p send the pattern with args given
2100	–	*                along to all servers that match capab and cluster type
2101	–	*/
2102	–	void
2103	–	cluster_a_line(struct Client *source_p, const char *command,
2104	–	int capab, int cluster_type, const char *pattern, ...)
2105	–	{
2106	–	va_list args;
2107	–	char buffer[IRCD_BUFSIZE];
2108	–	const dlink_node *ptr = NULL;
2109	–
2110	–	va_start(args, pattern);
2111	–	vsnprintf(buffer, sizeof(buffer), pattern, args);
2112	–	va_end(args);
2113	–
2114	–	DLINK_FOREACH(ptr, cluster_items.head)
2115	–	{
2116	–	const struct MaskItem *conf = ptr->data;
2117	–
2118	–	if (conf->flags & cluster_type)
2119	–	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2120	–	"%s %s %s", command, conf->name, buffer);
2121	–	}
2122	–	}
2123	–
2124	–	/*
1510		* split_nuh
1511		*
1512		* inputs       - pointer to original mask (modified in place)
#	Line 2156 | Line 1541 | split_nuh(struct split_nuh_item *const i
1541
1542		if (iptr->nickptr)
1543		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1544	+
1545		if (iptr->userptr)
1546		strlcpy(iptr->userptr, "*", iptr->usersize);
1547	+
1548		if (iptr->hostptr)
1549		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1550
#	Line 2165 | Line 1552 | split_nuh(struct split_nuh_item *const i
1552		{
1553		*p = '\0';
1554
1555	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1555	>	if (iptr->nickptr && *iptr->nuhmask)
1556		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1557
1558		if ((q = strchr(++p, '@')))
1559		{
1560		*q++ = '\0';
1561
1562	<	if (*p != '\0')
1562	>	if (*p)
1563		strlcpy(iptr->userptr, p, iptr->usersize);
1564
1565	<	if (*q != '\0')
1565	>	if (*q)
1566		strlcpy(iptr->hostptr, q, iptr->hostsize);
1567		}
1568		else
1569		{
1570	<	if (*p != '\0')
1570	>	if (*p)
1571		strlcpy(iptr->userptr, p, iptr->usersize);
1572		}
1573		}
#	Line 2192 | Line 1579 | split_nuh(struct split_nuh_item *const i
1579		/* if found a @ */
1580		*p++ = '\0';
1581
1582	<	if (*iptr->nuhmask != '\0')
1582	>	if (*iptr->nuhmask)
1583		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1584
1585	<	if (*p != '\0')
1585	>	if (*p)
1586		strlcpy(iptr->hostptr, p, iptr->hostsize);
1587		}
1588		else
1589		{
1590	<	/* no @ found */
1590	>	/* No @ found */
1591		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1592		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1593		else

Comparing ircd-hybrid/trunk/src/conf.c (property svn:keywords):
Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC vs.
Revision 8510 by michael, Fri Apr 6 12:55:22 2018 UTC

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

Diff Legend

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