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 3109 by michael, Thu Mar 6 19:25:12 2014 UTC vs.
Revision 5039 by michael, Sat Dec 13 16:08:37 2014 UTC

#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 28 | Line 28
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	<	#include "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"
36	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 44 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
47	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "mempool.h"
50	<	#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
59
61	–	struct config_channel_entry ConfigChannel;
62	–	struct config_server_hide ConfigServerHide;
63	–	struct config_file_entry ConfigFileEntry;
64	–	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
65	–	struct server_info ServerInfo;
66	–	struct admin_info AdminInfo;
67	–
60		/* general conf items link list root, other than k lines etc. */
61	<	dlink_list service_items = { NULL, NULL, 0 };
62	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list oconf_items   = { NULL, NULL, 0 };
65	<	dlink_list uconf_items   = { NULL, NULL, 0 };
66	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list cresv_items = { NULL, NULL, 0 };
61	>	dlink_list service_items;
62	>	dlink_list server_items;
63	>	dlink_list cluster_items;
64	>	dlink_list oconf_items;
65	>	dlink_list uconf_items;
66	>	dlink_list xconf_items;
67	>	dlink_list nresv_items;
68	>	dlink_list cresv_items;
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
73		extern int yyparse(); /* defined in y.tab.c */
74
83	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
84	–
85	–	/* internally defined functions */
86	–	static void read_conf(FILE *);
87	–	static void clear_out_old_conf(void);
88	–	static void expire_tklines(dlink_list *);
89	–	static void garbage_collect_ip_entries(void);
90	–	static int hash_ip(struct irc_ssaddr *);
91	–	static int verify_access(struct Client *);
92	–	static int attach_iline(struct Client *, struct MaskItem *);
93	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
94	–	static dlink_list *map_to_list(enum maskitem_type);
95	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
96	–
97	–
98	–	/* usually, with hash tables, you use a prime number...
99	–	* but in this case I am dealing with ip addresses,
100	–	* not ascii strings.
101	–	*/
102	–	#define IP_HASH_SIZE 0x1000
103	–
104	–	struct ip_entry
105	–	{
106	–	struct irc_ssaddr ip;
107	–	unsigned int count;
108	–	time_t last_attempt;
109	–	struct ip_entry *next;
110	–	};
111	–
112	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
113	–	static mp_pool_t *ip_entry_pool = NULL;
114	–	static int ip_entries_count = 0;
115	–
75
76		/* conf_dns_callback()
77		*
#	Line 125 | Line 84 | static int ip_entries_count = 0;
84		* if successful save hp in the conf item it was called with
85		*/
86		static void
87	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
87	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
88		{
89	<	struct MaskItem *conf = vptr;
89	>	struct MaskItem *const conf = vptr;
90
91		conf->dns_pending = 0;
92
93	<	if (addr != NULL)
93	>	if (addr)
94		memcpy(&conf->addr, addr, sizeof(conf->addr));
95		else
96		conf->dns_failed = 1;
#	Line 146 | Line 105 | conf_dns_callback(void *vptr, const stru
105		static void
106		conf_dns_lookup(struct MaskItem *conf)
107		{
108	<	if (!conf->dns_pending)
108	>	if (conf->dns_pending)
109	>	return;
110	>
111	>	conf->dns_pending = 1;
112	>
113	>	if (conf->aftype == AF_INET)
114	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
115	>	else
116	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
117	>	}
118	>
119	>	/* map_to_list()
120	>	*
121	>	* inputs       - ConfType conf
122	>	* output       - pointer to dlink_list to use
123	>	* side effects - none
124	>	*/
125	>	static dlink_list *
126	>	map_to_list(enum maskitem_type type)
127	>	{
128	>	switch (type)
129		{
130	<	conf->dns_pending = 1;
131	<	gethost_byname(conf_dns_callback, conf, conf->host);
130	>	case CONF_XLINE:
131	>	return &xconf_items;
132	>	break;
133	>	case CONF_ULINE:
134	>	return &uconf_items;
135	>	break;
136	>	case CONF_NRESV:
137	>	return &nresv_items;
138	>	break;
139	>	case CONF_CRESV:
140	>	return &cresv_items;
141	>	break;
142	>	case CONF_OPER:
143	>	return &oconf_items;
144	>	break;
145	>	case CONF_SERVER:
146	>	return &server_items;
147	>	break;
148	>	case CONF_SERVICE:
149	>	return &service_items;
150	>	break;
151	>	case CONF_CLUSTER:
152	>	return &cluster_items;
153	>	break;
154	>	default:
155	>	return NULL;
156		}
157		}
158
159		struct MaskItem *
160		conf_make(enum maskitem_type type)
161		{
162	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
162	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
163		dlink_list *list = NULL;
164
165		conf->type   = type;
#	Line 171 | Line 174 | conf_make(enum maskitem_type type)
174		void
175		conf_free(struct MaskItem *conf)
176		{
177	<	dlink_node *ptr = NULL, *ptr_next = NULL;
177	>	dlink_node *node = NULL, *node_next = NULL;
178		dlink_list *list = NULL;
179
180	<	if (conf->node.next)
181	<	if ((list = map_to_list(conf->type)))
179	<	dlinkDelete(&conf->node, list);
180	>	if ((list = map_to_list(conf->type)))
181	>	dlinkFindDelete(list, conf);
182
183		MyFree(conf->name);
184
185		if (conf->dns_pending)
186		delete_resolver_queries(conf);
187	<	if (conf->passwd != NULL)
187	>	if (conf->passwd)
188		memset(conf->passwd, 0, strlen(conf->passwd));
189	<	if (conf->spasswd != NULL)
189	>	if (conf->spasswd)
190		memset(conf->spasswd, 0, strlen(conf->spasswd));
191
192		conf->class = NULL;
#	Line 201 | Line 203 | conf_free(struct MaskItem *conf)
203		if (conf->rsa_public_key)
204		RSA_free(conf->rsa_public_key);
205		#endif
206	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207		{
208	<	MyFree(ptr->data);
209	<	dlinkDelete(ptr, &conf->hub_list);
210	<	free_dlink_node(ptr);
208	>	MyFree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211		}
212
213	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	MyFree(ptr->data);
216	<	dlinkDelete(ptr, &conf->leaf_list);
217	<	free_dlink_node(ptr);
215	>	MyFree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
219
220	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	struct exempt *exptr = ptr->data;
222	>	struct exempt *exptr = node->data;
223
224	<	dlinkDelete(ptr, &conf->exempt_list);
224	>	dlinkDelete(node, &conf->exempt_list);
225		MyFree(exptr->name);
226		MyFree(exptr->user);
227		MyFree(exptr->host);
#	Line 229 | Line 231 | conf_free(struct MaskItem *conf)
231		MyFree(conf);
232		}
233
234	<	/* check_client()
234	>	/* attach_iline()
235		*
236	<	* inputs       - pointer to client
237	<	* output       - 0 = Success
238	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
239	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
238	<	*                I_LINE_FULL       (-3) = I-line is full
239	<	*                TOO_MANY          (-4) = Too many connections from hostname
240	<	*                BANNED_CLIENT     (-5) = K-lined
241	<	* side effects - Ordinary client access check.
242	<	*                Look for conf lines which have the same
243	<	*                status as the flags passed.
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240		*/
241	<	int
242	<	check_client(struct Client *source_p)
241	>	static int
242	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
243		{
244	<	int i;
245	<
246	<	if ((i = verify_access(source_p)))
247	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
252	<	source_p->name, source_p->sockhost);
253	<
254	<	switch (i)
255	<	{
256	<	case TOO_MANY:
257	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
258	<	"Too many on IP for %s (%s).",
259	<	get_client_name(source_p, SHOW_IP),
260	<	source_p->sockhost);
261	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
262	<	get_client_name(source_p, SHOW_IP));
263	<	++ServerStats.is_ref;
264	<	exit_client(source_p, &me, "No more connections allowed on that IP");
265	<	break;
244	>	const struct ClassItem *const class = conf->class;
245	>	struct ip_entry *ip_found;
246	>	int a_limit_reached = 0;
247	>	unsigned int local = 0, global = 0, ident = 0;
248
249	<	case I_LINE_FULL:
250	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
251	<	"auth{} block is full for %s (%s).",
270	<	get_client_name(source_p, SHOW_IP),
271	<	source_p->sockhost);
272	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
273	<	get_client_name(source_p, SHOW_IP));
274	<	++ServerStats.is_ref;
275	<	exit_client(source_p, &me,
276	<	"No more connections allowed in your connection class");
277	<	break;
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250	>	ip_found->count++;
251	>	AddFlag(client_p, FLAGS_IPHASH);
252
253	<	case NOT_AUTHORIZED:
254	<	++ServerStats.is_ref;
281	<	/* jdc - lists server name & port connections are on */
282	<	/*       a purely cosmetical change */
283	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
284	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
285	<	get_client_name(source_p, SHOW_IP),
286	<	source_p->sockhost,
287	<	source_p->localClient->listener->name,
288	<	source_p->localClient->listener->port);
289	<	ilog(LOG_TYPE_IRCD,
290	<	"Unauthorized client connection from %s on [%s/%u].",
291	<	get_client_name(source_p, SHOW_IP),
292	<	source_p->localClient->listener->name,
293	<	source_p->localClient->listener->port);
253	>	count_user_host(client_p->username, client_p->host,
254	>	&global, &local, &ident);
255
256	<	exit_client(source_p, &me, "You are not authorized to use this server");
257	<	break;
256	>	/* XXX blah. go down checking the various silly limits
257	>	* setting a_limit_reached if any limit is reached.
258	>	* - Dianora
259	>	*/
260	>	if (class->max_total && class->ref_count >= class->max_total)
261	>	a_limit_reached = 1;
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263	>	a_limit_reached = 1;
264	>	else if (class->max_local && local >= class->max_local)
265	>	a_limit_reached = 1;
266	>	else if (class->max_global && global >= class->max_global)
267	>	a_limit_reached = 1;
268	>	else if (class->max_ident && ident >= class->max_ident &&
269	>	client_p->username[0] != '~')
270	>	a_limit_reached = 1;
271
272	<	case BANNED_CLIENT:
273	<	exit_client(source_p, &me, "Banned");
274	<	++ServerStats.is_ref;
275	<	break;
272	>	if (a_limit_reached)
273	>	{
274	>	if (!IsConfExemptLimits(conf))
275	>	return TOO_MANY;   /* Already at maximum allowed */
276
277	<	case 0:
278	<	default:
305	<	break;
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281	<	return (i < 0 ? 0 : 1);
281	>	return attach_conf(client_p, conf);
282		}
283
284		/* verify_access()
285		*
286	<	* inputs       - pointer to client to verify
287	<	* output       - 0 if success -'ve if not
288	<	* side effect  - find the first (best) I line to attach.
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289		*/
290		static int
291		verify_access(struct Client *client_p)
292		{
293		struct MaskItem *conf = NULL;
294	<	char non_ident[USERLEN + 1] = { '~', '\0' };
294	>	char non_ident[USERLEN + 1] = "~";
295
296		if (IsGotId(client_p))
297		{
298		conf = find_address_conf(client_p->host, client_p->username,
299	<	&client_p->localClient->ip,
300	<	client_p->localClient->aftype,
301	<	client_p->localClient->passwd);
299	>	&client_p->connection->ip,
300	>	client_p->connection->aftype,
301	>	client_p->connection->password);
302		}
303		else
304		{
305		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
306	<	conf = find_address_conf(client_p->host,non_ident,
307	<	&client_p->localClient->ip,
308	<	client_p->localClient->aftype,
309	<	client_p->localClient->passwd);
306	>	conf = find_address_conf(client_p->host, non_ident,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311
312	<	if (conf != NULL)
312	>	if (conf)
313		{
314		if (IsConfClient(conf))
315		{
#	Line 348 | Line 321 | verify_access(struct Client *client_p)
321		return NOT_AUTHORIZED;
322		}
323
351	–	if (IsConfDoIdentd(conf))
352	–	SetNeedId(client_p);
353	–
324		/* Thanks for spoof idea amm */
325		if (IsConfDoSpoofIp(conf))
326		{
327	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
328	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
359	<	"%s spoofing: %s as %s",
327	>	if (IsConfSpoofNotice(conf))
328	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329		client_p->name, client_p->host, conf->name);
330	+
331		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
362	–	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
332		}
333
334		return attach_iline(client_p, conf);
335		}
336	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
336	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337		{
338		if (IsConfGline(conf))
339	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
340	<	client_p->name);
341	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
373	<	me.name, client_p->name, conf->reason);
339	>	sendto_one_notice(client_p, &me, ":*** G-lined");
340	>
341	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342		return BANNED_CLIENT;
343		}
344		}
#	Line 378 | Line 346 | verify_access(struct Client *client_p)
346		return NOT_AUTHORIZED;
347		}
348
349	<	/* attach_iline()
382	<	*
383	<	* inputs       - client pointer
384	<	*              - conf pointer
385	<	* output       -
386	<	* side effects - do actual attach
387	<	*/
388	<	static int
389	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
390	<	{
391	<	struct ClassItem *class = NULL;
392	<	struct ip_entry *ip_found;
393	<	int a_limit_reached = 0;
394	<	unsigned int local = 0, global = 0, ident = 0;
395	<
396	<	assert(conf->class);
397	<
398	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
399	<	ip_found->count++;
400	<	SetIpHash(client_p);
401	<
402	<	class = conf->class;
403	<
404	<	count_user_host(client_p->username, client_p->host,
405	<	&global, &local, &ident);
406	<
407	<	/* XXX blah. go down checking the various silly limits
408	<	* setting a_limit_reached if any limit is reached.
409	<	* - Dianora
410	<	*/
411	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
412	<	a_limit_reached = 1;
413	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
414	<	a_limit_reached = 1;
415	<	else if (class->max_local != 0 && local >= class->max_local)
416	<	a_limit_reached = 1;
417	<	else if (class->max_global != 0 && global >= class->max_global)
418	<	a_limit_reached = 1;
419	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
420	<	client_p->username[0] != '~')
421	<	a_limit_reached = 1;
422	<
423	<	if (a_limit_reached)
424	<	{
425	<	if (!IsConfExemptLimits(conf))
426	<	return TOO_MANY;   /* Already at maximum allowed */
427	<
428	<	sendto_one(client_p,
429	<	":%s NOTICE %s :*** Your connection class is full, "
430	<	"but you have exceed_limit = yes;", me.name, client_p->name);
431	<	}
432	<
433	<	return attach_conf(client_p, conf);
434	<	}
435	<
436	<	/* init_ip_hash_table()
437	<	*
438	<	* inputs               - NONE
439	<	* output               - NONE
440	<	* side effects         - allocate memory for ip_entry(s)
441	<	*                      - clear the ip hash table
442	<	*/
443	<	void
444	<	init_ip_hash_table(void)
445	<	{
446	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
447	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
448	<	}
449	<
450	<	/* find_or_add_ip()
451	<	*
452	<	* inputs       - pointer to struct irc_ssaddr
453	<	* output       - pointer to a struct ip_entry
454	<	* side effects -
349	>	/* check_client()
350		*
351	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
352	<	* count set to 0.
351	>	* inputs       - pointer to client
352	>	* output       - 0 = Success
353	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
354	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
355	>	*                I_LINE_FULL       (-3) = I-line is full
356	>	*                TOO_MANY          (-4) = Too many connections from hostname
357	>	*                BANNED_CLIENT     (-5) = K-lined
358	>	* side effects - Ordinary client access check.
359	>	*                Look for conf lines which have the same
360	>	*                status as the flags passed.
361		*/
362	<	static struct ip_entry *
363	<	find_or_add_ip(struct irc_ssaddr *ip_in)
362	>	int
363	>	check_client(struct Client *source_p)
364		{
365	<	struct ip_entry *ptr, *newptr;
463	<	int hash_index = hash_ip(ip_in), res;
464	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
465	<	#ifdef IPV6
466	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
467	<	#endif
468	<
469	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
470	<	{
471	<	#ifdef IPV6
472	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
473	<	continue;
474	<	if (ip_in->ss.ss_family == AF_INET6)
475	<	{
476	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
477	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
478	<	}
479	<	else
480	<	#endif
481	<	{
482	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
483	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
484	<	}
485	<	if (res == 0)
486	<	{
487	<	/* Found entry already in hash, return it. */
488	<	return ptr;
489	<	}
490	<	}
491	<
492	<	if (ip_entries_count >= 2 * hard_fdlimit)
493	<	garbage_collect_ip_entries();
494	<
495	<	newptr = mp_pool_get(ip_entry_pool);
496	<	memset(newptr, 0, sizeof(*newptr));
497	<	ip_entries_count++;
498	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
499	<
500	<	newptr->next = ip_hash_table[hash_index];
501	<	ip_hash_table[hash_index] = newptr;
502	<
503	<	return newptr;
504	<	}
365	>	int i;
366
367	<	/* remove_one_ip()
368	<	*
369	<	* inputs        - unsigned long IP address value
509	<	* output        - NONE
510	<	* side effects  - The ip address given, is looked up in ip hash table
511	<	*                 and number of ip#'s for that ip decremented.
512	<	*                 If ip # count reaches 0 and has expired,
513	<	*                 the struct ip_entry is returned to the ip_entry_heap
514	<	*/
515	<	void
516	<	remove_one_ip(struct irc_ssaddr *ip_in)
517	<	{
518	<	struct ip_entry *ptr;
519	<	struct ip_entry *last_ptr = NULL;
520	<	int hash_index = hash_ip(ip_in), res;
521	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
522	<	#ifdef IPV6
523	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
524	<	#endif
367	>	if ((i = verify_access(source_p)))
368	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
369	>	source_p->name, source_p->sockhost);
370
371	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
371	>	switch (i)
372		{
373	<	#ifdef IPV6
374	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
375	<	continue;
376	<	if (ip_in->ss.ss_family == AF_INET6)
377	<	{
378	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
379	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
380	<	}
381	<	else
382	<	#endif
538	<	{
539	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
540	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
541	<	}
542	<	if (res)
543	<	continue;
544	<	if (ptr->count > 0)
545	<	ptr->count--;
546	<	if (ptr->count == 0 &&
547	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
548	<	{
549	<	if (last_ptr != NULL)
550	<	last_ptr->next = ptr->next;
551	<	else
552	<	ip_hash_table[hash_index] = ptr->next;
553	<
554	<	mp_pool_release(ptr);
555	<	ip_entries_count--;
556	<	return;
557	<	}
558	<	last_ptr = ptr;
559	<	}
560	<	}
373	>	case TOO_MANY:
374	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
375	>	"Too many on IP for %s (%s).",
376	>	get_client_name(source_p, SHOW_IP),
377	>	source_p->sockhost);
378	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
379	>	get_client_name(source_p, SHOW_IP));
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "No more connections allowed on that IP");
382	>	break;
383
384	<	/* hash_ip()
385	<	*
386	<	* input        - pointer to an irc_inaddr
387	<	* output       - integer value used as index into hash table
388	<	* side effects - hopefully, none
389	<	*/
390	<	static int
391	<	hash_ip(struct irc_ssaddr *addr)
392	<	{
393	<	if (addr->ss.ss_family == AF_INET)
572	<	{
573	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
574	<	int hash;
575	<	uint32_t ip;
384	>	case I_LINE_FULL:
385	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
386	>	"auth {} block is full for %s (%s).",
387	>	get_client_name(source_p, SHOW_IP),
388	>	source_p->sockhost);
389	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
390	>	get_client_name(source_p, SHOW_IP));
391	>	++ServerStats.is_ref;
392	>	exit_client(source_p, "No more connections allowed in your connection class");
393	>	break;
394
395	<	ip   = ntohl(v4->sin_addr.s_addr);
396	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
397	<	return hash;
398	<	}
399	<	#ifdef IPV6
400	<	else
401	<	{
402	<	int hash;
403	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
404	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
405	<
406	<	hash  = ip[0] ^ ip[3];
407	<	hash ^= hash >> 16;
590	<	hash ^= hash >> 8;
591	<	hash  = hash & (IP_HASH_SIZE - 1);
592	<	return hash;
593	<	}
594	<	#else
595	<	return 0;
596	<	#endif
597	<	}
395	>	case NOT_AUTHORIZED:
396	>	/* jdc - lists server name & port connections are on */
397	>	/*       a purely cosmetical change */
398	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
399	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
400	>	get_client_name(source_p, SHOW_IP),
401	>	source_p->sockhost,
402	>	source_p->connection->listener->name,
403	>	source_p->connection->listener->port);
404	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->connection->listener->name,
407	>	source_p->connection->listener->port);
408
409	<	/* count_ip_hash()
410	<	*
411	<	* inputs        - pointer to counter of number of ips hashed
602	<	*               - pointer to memory used for ip hash
603	<	* output        - returned via pointers input
604	<	* side effects  - NONE
605	<	*
606	<	* number of hashed ip #'s is counted up, plus the amount of memory
607	<	* used in the hash.
608	<	*/
609	<	void
610	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
611	<	{
612	<	struct ip_entry *ptr;
613	<	int i;
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "You are not authorized to use this server");
411	>	break;
412
413	<	*number_ips_stored = 0;
414	<	*mem_ips_stored    = 0;
413	>	case BANNED_CLIENT:
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "Banned");
416	>	break;
417
418	<	for (i = 0; i < IP_HASH_SIZE; i++)
419	<	{
420	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
621	<	{
622	<	*number_ips_stored += 1;
623	<	*mem_ips_stored += sizeof(struct ip_entry);
624	<	}
418	>	case 0:
419	>	default:
420	>	break;
421		}
626	–	}
422
423	<	/* garbage_collect_ip_entries()
629	<	*
630	<	* input        - NONE
631	<	* output       - NONE
632	<	* side effects - free up all ip entries with no connections
633	<	*/
634	<	static void
635	<	garbage_collect_ip_entries(void)
636	<	{
637	<	struct ip_entry *ptr;
638	<	struct ip_entry *last_ptr;
639	<	struct ip_entry *next_ptr;
640	<	int i;
641	<
642	<	for (i = 0; i < IP_HASH_SIZE; i++)
643	<	{
644	<	last_ptr = NULL;
645	<
646	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
647	<	{
648	<	next_ptr = ptr->next;
649	<
650	<	if (ptr->count == 0 &&
651	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
652	<	{
653	<	if (last_ptr != NULL)
654	<	last_ptr->next = ptr->next;
655	<	else
656	<	ip_hash_table[i] = ptr->next;
657	<	mp_pool_release(ptr);
658	<	ip_entries_count--;
659	<	}
660	<	else
661	<	last_ptr = ptr;
662	<	}
663	<	}
423	>	return !(i < 0);
424		}
425
426		/* detach_conf()
#	Line 674 | Line 434 | garbage_collect_ip_entries(void)
434		void
435		detach_conf(struct Client *client_p, enum maskitem_type type)
436		{
437	<	dlink_node *ptr = NULL, *next_ptr = NULL;
437	>	dlink_node *node = NULL, *node_next = NULL;
438
439	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
439	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
440		{
441	<	struct MaskItem *conf = ptr->data;
441	>	struct MaskItem *conf = node->data;
442
443		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
444		assert(conf->ref_count > 0);
#	Line 687 | Line 447 | detach_conf(struct Client *client_p, enu
447		if (!(conf->type & type))
448		continue;
449
450	<	dlinkDelete(ptr, &client_p->localClient->confs);
451	<	free_dlink_node(ptr);
450	>	dlinkDelete(node, &client_p->connection->confs);
451	>	free_dlink_node(node);
452
453		if (conf->type == CONF_CLIENT)
454	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
454	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
455
456		if (--conf->class->ref_count == 0 && conf->class->active == 0)
457		{
#	Line 717 | Line 477 | detach_conf(struct Client *client_p, enu
477		int
478		attach_conf(struct Client *client_p, struct MaskItem *conf)
479		{
480	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
480	>	if (dlinkFind(&client_p->connection->confs, conf))
481		return 1;
482
483		if (conf->type == CONF_CLIENT)
484		if (cidr_limit_reached(IsConfExemptLimits(conf),
485	<	&client_p->localClient->ip, conf->class))
485	>	&client_p->connection->ip, conf->class))
486		return TOO_MANY;    /* Already at maximum allowed */
487
488		conf->class->ref_count++;
489		conf->ref_count++;
490
491	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
491	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
492
493		return 0;
494		}
#	Line 745 | Line 505 | int
505		attach_connect_block(struct Client *client_p, const char *name,
506		const char *host)
507		{
508	<	dlink_node *ptr;
749	<	struct MaskItem *conf = NULL;
750	<
751	<	assert(client_p != NULL);
752	<	assert(host != NULL);
508	>	dlink_node *node = NULL;
509
510	<	if (client_p == NULL || host == NULL)
755	<	return 0;
510	>	assert(host);
511
512	<	DLINK_FOREACH(ptr, server_items.head)
512	>	DLINK_FOREACH(node, server_items.head)
513		{
514	<	conf = ptr->data;
514	>	struct MaskItem *conf = node->data;
515
516		if (match(conf->name, name) || match(conf->host, host))
517		continue;
#	Line 780 | Line 535 | attach_connect_block(struct Client *clie
535		struct MaskItem *
536		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
537		{
538	<	dlink_node *ptr;
784	<	struct MaskItem* conf;
538	>	dlink_node *node = NULL;
539
540	<	DLINK_FOREACH(ptr, list->head)
540	>	DLINK_FOREACH(node, list->head)
541		{
542	<	conf = ptr->data;
542	>	struct MaskItem *conf = node->data;
543
544		if (conf->type == type)
545		{
546	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
547	<	!match(conf->name, name)))
794	<	return conf;
546	>	if (conf->name && !irccmp(conf->name, name))
547	>	return conf;
548		}
549		}
550
551		return NULL;
552		}
553
801	–	/* map_to_list()
802	–	*
803	–	* inputs       - ConfType conf
804	–	* output       - pointer to dlink_list to use
805	–	* side effects - none
806	–	*/
807	–	static dlink_list *
808	–	map_to_list(enum maskitem_type type)
809	–	{
810	–	switch(type)
811	–	{
812	–	case CONF_XLINE:
813	–	return(&xconf_items);
814	–	break;
815	–	case CONF_ULINE:
816	–	return(&uconf_items);
817	–	break;
818	–	case CONF_NRESV:
819	–	return(&nresv_items);
820	–	break;
821	–	case CONF_CRESV:
822	–	return(&cresv_items);
823	–	case CONF_OPER:
824	–	return(&oconf_items);
825	–	break;
826	–	case CONF_SERVER:
827	–	return(&server_items);
828	–	break;
829	–	case CONF_SERVICE:
830	–	return(&service_items);
831	–	break;
832	–	case CONF_CLUSTER:
833	–	return(&cluster_items);
834	–	break;
835	–	default:
836	–	return NULL;
837	–	}
838	–	}
839	–
554		/* find_matching_name_conf()
555		*
556		* inputs       - type of link list to look in
#	Line 851 | Line 565 | struct MaskItem *
565		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
566		const char *host, unsigned int flags)
567		{
568	<	dlink_node *ptr=NULL;
569	<	struct MaskItem *conf=NULL;
570	<	dlink_list *list_p = map_to_list(type);
568	>	dlink_node *node = NULL;
569	>	dlink_list *list = map_to_list(type);
570	>	struct MaskItem *conf = NULL;
571
572		switch (type)
573		{
574		case CONF_SERVICE:
575	<	DLINK_FOREACH(ptr, list_p->head)
575	>	DLINK_FOREACH(node, list->head)
576		{
577	<	conf = ptr->data;
577	>	conf = node->data;
578
579		if (EmptyString(conf->name))
580		continue;
581	<	if ((name != NULL) && !irccmp(name, conf->name))
581	>	if (name && !irccmp(name, conf->name))
582		return conf;
583		}
584		break;
#	Line 873 | Line 587 | find_matching_name_conf(enum maskitem_ty
587		case CONF_ULINE:
588		case CONF_NRESV:
589		case CONF_CRESV:
590	<	DLINK_FOREACH(ptr, list_p->head)
590	>	DLINK_FOREACH(node, list->head)
591		{
592	<	conf = ptr->data;
592	>	conf = node->data;
593
594		if (EmptyString(conf->name))
595		continue;
596	<	if ((name != NULL) && !match(conf->name, name))
596	>	if (name && !match(conf->name, name))
597		{
598		if ((user == NULL && (host == NULL)))
599		return conf;
#	Line 894 | Line 608 | find_matching_name_conf(enum maskitem_ty
608		break;
609
610		case CONF_SERVER:
611	<	DLINK_FOREACH(ptr, list_p->head)
611	>	DLINK_FOREACH(node, list->head)
612		{
613	<	conf = ptr->data;
613	>	conf = node->data;
614
615	<	if ((name != NULL) && !match(name, conf->name))
615	>	if (name && !match(name, conf->name))
616		return conf;
617	<	else if ((host != NULL) && !match(host, conf->host))
617	>	if (host && !match(host, conf->host))
618		return conf;
619		}
620		break;
#	Line 924 | Line 638 | struct MaskItem *
638		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
639		const char *user, const char *host)
640		{
641	<	dlink_node *ptr = NULL;
642	<	struct MaskItem *conf;
643	<	dlink_list *list_p = map_to_list(type);
641	>	dlink_node *node = NULL;
642	>	dlink_list *list = map_to_list(type);
643	>	struct MaskItem *conf = NULL;
644
645		switch(type)
646		{
#	Line 935 | Line 649 | find_exact_name_conf(enum maskitem_type
649		case CONF_NRESV:
650		case CONF_CRESV:
651
652	<	DLINK_FOREACH(ptr, list_p->head)
652	>	DLINK_FOREACH(node, list->head)
653		{
654	<	conf = ptr->data;
654	>	conf = node->data;
655
656		if (EmptyString(conf->name))
657		continue;
#	Line 955 | Line 669 | find_exact_name_conf(enum maskitem_type
669		break;
670
671		case CONF_OPER:
672	<	DLINK_FOREACH(ptr, list_p->head)
672	>	DLINK_FOREACH(node, list->head)
673		{
674	<	conf = ptr->data;
674	>	conf = node->data;
675
676		if (EmptyString(conf->name))
677		continue;
#	Line 978 | Line 692 | find_exact_name_conf(enum maskitem_type
692		return conf;
693		break;
694		case HM_IPV4:
695	<	if (who->localClient->aftype == AF_INET)
696	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
695	>	if (who->connection->aftype == AF_INET)
696	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
697		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
698		return conf;
699		break;
986	–	#ifdef IPV6
700		case HM_IPV6:
701	<	if (who->localClient->aftype == AF_INET6)
702	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
701	>	if (who->connection->aftype == AF_INET6)
702	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
703		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
704		return conf;
705		break;
993	–	#endif
706		default:
707		assert(0);
708		}
#	Line 1001 | Line 713 | find_exact_name_conf(enum maskitem_type
713		break;
714
715		case CONF_SERVER:
716	<	DLINK_FOREACH(ptr, list_p->head)
716	>	DLINK_FOREACH(node, list->head)
717		{
718	<	conf = ptr->data;
718	>	conf = node->data;
719
720		if (EmptyString(conf->name))
721		continue;
#	Line 1028 | Line 740 | find_exact_name_conf(enum maskitem_type
740		return NULL;
741		}
742
1031	–	/* rehash()
1032	–	*
1033	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1034	–	* as a result of an operator issuing this command, else assume it has been
1035	–	* called as a result of the server receiving a HUP signal.
1036	–	*/
1037	–	int
1038	–	rehash(int sig)
1039	–	{
1040	–	if (sig != 0)
1041	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1042	–	"Got signal SIGHUP, reloading configuration file(s)");
1043	–
1044	–	restart_resolver();
1045	–
1046	–	/* don't close listeners until we know we can go ahead with the rehash */
1047	–
1048	–	/* Check to see if we magically got(or lost) IPv6 support */
1049	–	check_can_use_v6();
1050	–
1051	–	read_conf_files(0);
1052	–
1053	–	if (ServerInfo.description != NULL)
1054	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1055	–
1056	–	load_conf_modules();
1057	–
1058	–	rehashed_klines = 1;
1059	–
1060	–	return 0;
1061	–	}
1062	–
743		/* set_default_conf()
744		*
745		* inputs       - NONE
#	Line 1078 | Line 758 | set_default_conf(void)
758		assert(class_default == class_get_list()->tail->data);
759
760		#ifdef HAVE_LIBCRYPTO
761	<	ServerInfo.rsa_private_key = NULL;
762	<	ServerInfo.rsa_private_key_file = NULL;
761	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
762	>	{
763	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
764	>
765	>	if (key)
766	>	{
767	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
768	>	EC_KEY_free(key);
769	>	}
770	>	}
771	>
772	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
773	>	#endif
774	>
775	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
776	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
777	>	ConfigServerInfo.rsa_private_key = NULL;
778	>	ConfigServerInfo.rsa_private_key_file = NULL;
779		#endif
780
781	<	/* ServerInfo.name is not rehashable */
782	<	/* ServerInfo.name = ServerInfo.name; */
783	<	ServerInfo.description = NULL;
784	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	<
787	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
788	<	ServerInfo.specific_ipv4_vhost = 0;
789	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
790	<	ServerInfo.specific_ipv6_vhost = 0;
791	<
792	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
793	<	ServerInfo.max_nick_length = 9;
794	<	ServerInfo.max_topic_length = 80;
795	<
796	<	ServerInfo.hub = 0;
797	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
798	<	ServerInfo.dns_host.sin_port = 0;
799	<	AdminInfo.name = NULL;
1104	<	AdminInfo.email = NULL;
1105	<	AdminInfo.description = NULL;
781	>	/* ConfigServerInfo.name is not rehashable */
782	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
783	>	ConfigServerInfo.description = NULL;
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796	>
797	>	ConfigAdminInfo.name = NULL;
798	>	ConfigAdminInfo.email = NULL;
799	>	ConfigAdminInfo.description = NULL;
800
801		log_del_all();
802
803	<	ConfigLoggingEntry.use_logging = 1;
803	>	ConfigLog.use_logging = 1;
804
805		ConfigChannel.disable_fake_channels = 0;
806	<	ConfigChannel.knock_delay = 300;
806	>	ConfigChannel.invite_client_count = 10;
807	>	ConfigChannel.invite_client_time = 300;
808	>	ConfigChannel.knock_client_count = 1;
809	>	ConfigChannel.knock_client_time = 300;
810		ConfigChannel.knock_delay_channel = 60;
811	<	ConfigChannel.max_chans_per_user = 25;
1115	<	ConfigChannel.max_chans_per_oper = 50;
811	>	ConfigChannel.max_channels = 25;
812		ConfigChannel.max_bans = 25;
813		ConfigChannel.default_split_user_count = 0;
814		ConfigChannel.default_split_server_count = 0;
#	Line 1128 | Line 824 | set_default_conf(void)
824		ConfigServerHide.hide_server_ips = 0;
825		ConfigServerHide.disable_remote_commands = 0;
826
827	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
828	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
829	<	ConfigFileEntry.cycle_on_host_change = 1;
830	<	ConfigFileEntry.glines = 0;
831	<	ConfigFileEntry.gline_time = 12 * 3600;
832	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
833	<	ConfigFileEntry.gline_min_cidr = 16;
834	<	ConfigFileEntry.gline_min_cidr6 = 48;
835	<	ConfigFileEntry.invisible_on_connect = 1;
836	<	ConfigFileEntry.tkline_expire_notices = 1;
837	<	ConfigFileEntry.hide_spoof_ips = 1;
838	<	ConfigFileEntry.ignore_bogus_ts = 0;
839	<	ConfigFileEntry.disable_auth = 0;
840	<	ConfigFileEntry.kill_chase_time_limit = 90;
841	<	ConfigFileEntry.default_floodcount = 8;
842	<	ConfigFileEntry.failed_oper_notice = 1;
843	<	ConfigFileEntry.dots_in_ident = 0;
844	<	ConfigFileEntry.min_nonwildcard = 4;
845	<	ConfigFileEntry.min_nonwildcard_simple = 3;
846	<	ConfigFileEntry.max_accept = 20;
847	<	ConfigFileEntry.anti_nick_flood = 0;
848	<	ConfigFileEntry.max_nick_time = 20;
849	<	ConfigFileEntry.max_nick_changes = 5;
850	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
851	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
852	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
853	<	ConfigFileEntry.warn_no_nline = 1;
854	<	ConfigFileEntry.stats_o_oper_only = 0;
855	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
856	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
857	<	ConfigFileEntry.stats_P_oper_only = 0;
858	<	ConfigFileEntry.stats_u_oper_only = 0;
859	<	ConfigFileEntry.caller_id_wait = 60;
860	<	ConfigFileEntry.opers_bypass_callerid = 0;
861	<	ConfigFileEntry.pace_wait = 10;
862	<	ConfigFileEntry.pace_wait_simple = 1;
863	<	ConfigFileEntry.short_motd = 0;
864	<	ConfigFileEntry.ping_cookie = 0;
865	<	ConfigFileEntry.no_oper_flood = 0;
866	<	ConfigFileEntry.true_no_oper_flood = 0;
867	<	ConfigFileEntry.oper_pass_resv = 1;
868	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
869	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
870	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
871	<	UMODE_OPERWALL | UMODE_WALLOP;
872	<	ConfigFileEntry.use_egd = 0;
873	<	ConfigFileEntry.egdpool_path = NULL;
1178	<	ConfigFileEntry.throttle_time = 10;
827	>	ConfigGeneral.away_count = 2;
828	>	ConfigGeneral.away_time = 10;
829	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
830	>	ConfigGeneral.cycle_on_host_change = 1;
831	>	ConfigGeneral.glines = 0;
832	>	ConfigGeneral.gline_time = 12 * 3600;
833	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
834	>	ConfigGeneral.gline_min_cidr = 16;
835	>	ConfigGeneral.gline_min_cidr6 = 48;
836	>	ConfigGeneral.invisible_on_connect = 1;
837	>	ConfigGeneral.tkline_expire_notices = 1;
838	>	ConfigGeneral.ignore_bogus_ts = 0;
839	>	ConfigGeneral.disable_auth = 0;
840	>	ConfigGeneral.kill_chase_time_limit = 90;
841	>	ConfigGeneral.default_floodcount = 8;
842	>	ConfigGeneral.failed_oper_notice = 1;
843	>	ConfigGeneral.dots_in_ident = 0;
844	>	ConfigGeneral.min_nonwildcard = 4;
845	>	ConfigGeneral.min_nonwildcard_simple = 3;
846	>	ConfigGeneral.max_accept = 20;
847	>	ConfigGeneral.anti_nick_flood = 0;
848	>	ConfigGeneral.max_nick_time = 20;
849	>	ConfigGeneral.max_nick_changes = 5;
850	>	ConfigGeneral.anti_spam_exit_message_time = 0;
851	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
852	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
853	>	ConfigGeneral.warn_no_connect_block = 1;
854	>	ConfigGeneral.stats_e_disabled = 0;
855	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
856	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
857	>	ConfigGeneral.stats_o_oper_only = 1;
858	>	ConfigGeneral.stats_m_oper_only = 1;
859	>	ConfigGeneral.stats_P_oper_only = 0;
860	>	ConfigGeneral.stats_u_oper_only = 0;
861	>	ConfigGeneral.caller_id_wait = 60;
862	>	ConfigGeneral.opers_bypass_callerid = 0;
863	>	ConfigGeneral.pace_wait = 10;
864	>	ConfigGeneral.pace_wait_simple = 1;
865	>	ConfigGeneral.short_motd = 0;
866	>	ConfigGeneral.ping_cookie = 0;
867	>	ConfigGeneral.no_oper_flood = 0;
868	>	ConfigGeneral.oper_pass_resv = 1;
869	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
870	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
871	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
872	>	ConfigGeneral.throttle_count = 1;
873	>	ConfigGeneral.throttle_time = 1;
874		}
875
876		static void
877		validate_conf(void)
878		{
879	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
880	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
879	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
880	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
881
882	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
883	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
882	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
883	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
884
885	<	if (ServerInfo.network_name == NULL)
886	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
885	>	if (EmptyString(ConfigServerInfo.network_name))
886	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
887
888	<	if (ServerInfo.network_desc == NULL)
889	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
888	>	if (EmptyString(ConfigServerInfo.network_desc))
889	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
890
891	<	if (ConfigFileEntry.service_name == NULL)
1197	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1198	<
1199	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
891	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
892		}
893
894		/* read_conf()
#	Line 1210 | Line 902 | read_conf(FILE *file)
902		{
903		lineno = 0;
904
905	<	set_default_conf(); /* Set default values prior to conf parsing */
905	>	set_default_conf();  /* Set default values prior to conf parsing */
906		conf_parser_ctx.pass = 1;
907	<	yyparse();          /* pick up the classes first */
907	>	yyparse();  /* Pick up the classes first */
908
909		rewind(file);
910
911		conf_parser_ctx.pass = 2;
912	<	yyparse();          /* Load the values from the conf */
913	<	validate_conf();    /* Check to make sure some values are still okay. */
914	<	/* Some global values are also loaded here. */
915	<	class_delete_marked();      /* Make sure classes are valid */
912	>	yyparse();  /* Load the values from the conf */
913	>	validate_conf();  /* Check to make sure some values are still okay. */
914	>	/* Some global values are also loaded here. */
915	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
916	>	}
917	>
918	>	/* conf_rehash()
919	>	*
920	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
921	>	* as a result of an operator issuing this command, else assume it has been
922	>	* called as a result of the server receiving a HUP signal.
923	>	*/
924	>	int
925	>	conf_rehash(int sig)
926	>	{
927	>	if (sig)
928	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
929	>	"Got signal SIGHUP, reloading configuration file(s)");
930	>
931	>	restart_resolver();
932	>
933	>	/* don't close listeners until we know we can go ahead with the rehash */
934	>
935	>	read_conf_files(0);
936	>
937	>	load_conf_modules();
938	>	check_conf_klines();
939	>
940	>	return 0;
941		}
942
943		/* lookup_confhost()
#	Line 1233 | Line 950 | lookup_confhost(struct MaskItem *conf)
950		{
951		struct addrinfo hints, *res;
952
953	<	/* Do name lookup now on hostnames given and store the
953	>	/*
954	>	* Do name lookup now on hostnames given and store the
955		* ip numbers in conf structure.
956		*/
957		memset(&hints, 0, sizeof(hints));
#	Line 1250 | Line 968 | lookup_confhost(struct MaskItem *conf)
968		return;
969		}
970
971	<	assert(res != NULL);
971	>	assert(res);
972
973		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
974		conf->addr.ss_len = res->ai_addrlen;
#	Line 1269 | Line 987 | lookup_confhost(struct MaskItem *conf)
987		int
988		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
989		{
990	<	struct ip_entry *ip_found;
991	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
990	>	struct ip_entry *ip_found = NULL;
991	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
992
993		/* DLINE exempt also gets you out of static limits/pacing... */
994		if (conf && (conf->type == CONF_EXEMPT))
995		return 0;
996
997	<	if (conf != NULL)
997	>	if (conf)
998		return BANNED_CLIENT;
999
1000	<	ip_found = find_or_add_ip(addr);
1000	>	ip_found = ipcache_find_or_add_address(addr);
1001
1002	<	if ((CurrentTime - ip_found->last_attempt) <
1285	<	ConfigFileEntry.throttle_time)
1002	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1003		{
1004	<	ip_found->last_attempt = CurrentTime;
1005	<	return TOO_FAST;
1004	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1005	>	return TOO_FAST;
1006	>
1007	>	++ip_found->connection_count;
1008		}
1009	+	else
1010	+	ip_found->connection_count = 1;
1011
1012		ip_found->last_attempt = CurrentTime;
1013		return 0;
1014		}
1015
1295	–	/* cleanup_tklines()
1296	–	*
1297	–	* inputs       - NONE
1298	–	* output       - NONE
1299	–	* side effects - call function to expire temporary k/d lines
1300	–	*                This is an event started off in ircd.c
1301	–	*/
1302	–	void
1303	–	cleanup_tklines(void *notused)
1304	–	{
1305	–	hostmask_expire_temporary();
1306	–	expire_tklines(&xconf_items);
1307	–	expire_tklines(&nresv_items);
1308	–	expire_tklines(&cresv_items);
1309	–	}
1310	–
1016		/* expire_tklines()
1017		*
1018		* inputs       - tkline list pointer
#	Line 1315 | Line 1020 | cleanup_tklines(void *notused)
1020		* side effects - expire tklines
1021		*/
1022		static void
1023	<	expire_tklines(dlink_list *tklist)
1023	>	expire_tklines(dlink_list *list)
1024		{
1025	<	dlink_node *ptr;
1321	<	dlink_node *next_ptr;
1322	<	struct MaskItem *conf;
1025	>	dlink_node *node = NULL, *node_next = NULL;
1026
1027	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1027	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1028		{
1029	<	conf = ptr->data;
1029	>	struct MaskItem *conf = node->data;
1030
1031		if (!conf->until || conf->until > CurrentTime)
1032		continue;
1033
1034		if (conf->type == CONF_XLINE)
1035		{
1036	<	if (ConfigFileEntry.tkline_expire_notices)
1036	>	if (ConfigGeneral.tkline_expire_notices)
1037		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038		"Temporary X-line for [%s] expired", conf->name);
1039		conf_free(conf);
1040		}
1041		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1042		{
1043	<	if (ConfigFileEntry.tkline_expire_notices)
1043	>	if (ConfigGeneral.tkline_expire_notices)
1044		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1045		"Temporary RESV for [%s] expired", conf->name);
1046		conf_free(conf);
#	Line 1345 | Line 1048 | expire_tklines(dlink_list *tklist)
1048		}
1049		}
1050
1051	+	/* cleanup_tklines()
1052	+	*
1053	+	* inputs       - NONE
1054	+	* output       - NONE
1055	+	* side effects - call function to expire temporary k/d lines
1056	+	*                This is an event started off in ircd.c
1057	+	*/
1058	+	void
1059	+	cleanup_tklines(void *unused)
1060	+	{
1061	+	hostmask_expire_temporary();
1062	+	expire_tklines(&xconf_items);
1063	+	expire_tklines(&nresv_items);
1064	+	expire_tklines(&cresv_items);
1065	+	}
1066	+
1067		/* oper_privs_as_string()
1068		*
1069		* inputs        - pointer to client_p
#	Line 1361 | Line 1080 | static const struct oper_privs
1080		{ OPER_FLAG_DIE,            'D' },
1081		{ OPER_FLAG_GLINE,          'G' },
1082		{ OPER_FLAG_REHASH,         'H' },
1083	<	{ OPER_FLAG_K,              'K' },
1365	<	{ OPER_FLAG_OPERWALL,       'L' },
1083	>	{ OPER_FLAG_KLINE,          'K' },
1084		{ OPER_FLAG_KILL,           'N' },
1085		{ OPER_FLAG_KILL_REMOTE,    'O' },
1086		{ OPER_FLAG_CONNECT,        'P' },
#	Line 1379 | Line 1097 | oper_privs_as_string(const unsigned int
1097		{
1098		static char privs_out[IRCD_BUFSIZE];
1099		char *privs_ptr = privs_out;
1382	–	const struct oper_privs *opriv = flag_list;
1100
1101	<	for (; opriv->flag; ++opriv)
1101	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1102		{
1103		if (port & opriv->flag)
1104		*privs_ptr++ = opriv->c;
#	Line 1395 | Line 1112 | oper_privs_as_string(const unsigned int
1112		}
1113
1114		/*
1115	<	* Input: A client to find the active oper{} name for.
1115	>	* Input: A client to find the active operator {} name for.
1116		* Output: The nick!user@host{oper} of the oper.
1117		*         "oper" is server name for remote opers
1118		* Side effects: None.
#	Line 1403 | Line 1120 | oper_privs_as_string(const unsigned int
1120		const char *
1121		get_oper_name(const struct Client *client_p)
1122		{
1406	–	const dlink_node *cnode = NULL;
1123		/* +5 for !,@,{,} and null */
1124		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1125
1126	+	if (IsServer(client_p))
1127	+	return client_p->name;
1128	+
1129		if (MyConnect(client_p))
1130		{
1131	<	if ((cnode = client_p->localClient->confs.head))
1131	>	const dlink_node *const node = client_p->connection->confs.head;
1132	>
1133	>	if (node)
1134		{
1135	<	const struct MaskItem *conf = cnode->data;
1135	>	const struct MaskItem *const conf = node->data;
1136
1137	<	if (IsConfOperator(conf))
1137	>	if (conf->type == CONF_OPER)
1138		{
1139		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1140		client_p->username, client_p->host, conf->name);
#	Line 1421 | Line 1142 | get_oper_name(const struct Client *clien
1142		}
1143		}
1144
1145	<	/* Probably should assert here for now. If there is an oper out there
1146	<	* with no oper{} conf attached, it would be good for us to know...
1145	>	/*
1146	>	* Probably should assert here for now. If there is an oper out there
1147	>	* with no operator {} conf attached, it would be good for us to know...
1148		*/
1149	<	assert(0); /* Oper without oper conf! */
1149	>	assert(0);  /* Oper without oper conf! */
1150		}
1151
1152		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1432 | Line 1154 | get_oper_name(const struct Client *clien
1154		return buffer;
1155		}
1156
1435	–	/* read_conf_files()
1436	–	*
1437	–	* inputs       - cold start YES or NO
1438	–	* output       - none
1439	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1440	–	*/
1441	–	void
1442	–	read_conf_files(int cold)
1443	–	{
1444	–	const char *filename;
1445	–	char chanmodes[IRCD_BUFSIZE];
1446	–	char chanlimit[IRCD_BUFSIZE];
1447	–
1448	–	conf_parser_ctx.boot = cold;
1449	–	filename = ConfigFileEntry.configfile;
1450	–
1451	–	/* We need to know the initial filename for the yyerror() to report
1452	–	FIXME: The full path is in conffilenamebuf first time since we
1453	–	dont know anything else
1454	–
1455	–	- Gozem 2002-07-21
1456	–	*/
1457	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1458	–
1459	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1460	–	{
1461	–	if (cold)
1462	–	{
1463	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1464	–	filename, strerror(errno));
1465	–	exit(-1);
1466	–	}
1467	–	else
1468	–	{
1469	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1470	–	"Unable to read configuration file '%s': %s",
1471	–	filename, strerror(errno));
1472	–	return;
1473	–	}
1474	–	}
1475	–
1476	–	if (!cold)
1477	–	clear_out_old_conf();
1478	–
1479	–	read_conf(conf_parser_ctx.conf_file);
1480	–	fclose(conf_parser_ctx.conf_file);
1481	–
1482	–	log_reopen_all();
1483	–
1484	–	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1485	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1486	–
1487	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1488	–	add_isupport("MAXLIST", chanmodes, -1);
1489	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1490	–	add_isupport("CHANTYPES", "#", -1);
1491	–
1492	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1493	–	ConfigChannel.max_chans_per_user);
1494	–	add_isupport("CHANLIMIT", chanlimit, -1);
1495	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1496	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1497	–	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1498	–	add_isupport("CHANMODES", chanmodes, -1);
1499	–
1500	–	/*
1501	–	* message_locale may have changed.  rebuild isupport since it relies
1502	–	* on strlen(form_str(RPL_ISUPPORT))
1503	–	*/
1504	–	rebuild_isupport_message_line();
1505	–	}
1506	–
1157		/* clear_out_old_conf()
1158		*
1159		* inputs       - none
#	Line 1513 | Line 1163 | read_conf_files(int cold)
1163		static void
1164		clear_out_old_conf(void)
1165		{
1166	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1517	<	struct MaskItem *conf;
1166	>	dlink_node *node = NULL, *node_next = NULL;
1167		dlink_list *free_items [] = {
1168		&server_items,   &oconf_items,
1169		&uconf_items,   &xconf_items,
#	Line 1527 | Line 1176 | clear_out_old_conf(void)
1176		* Resetting structs, etc, is taken care of by set_default_conf().
1177		*/
1178
1179	<	for (; *iterator != NULL; iterator++)
1179	>	for (; *iterator; iterator++)
1180		{
1181	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1181	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1182		{
1183	<	conf = ptr->data;
1183	>	struct MaskItem *conf = node->data;
1184
1185	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1185	>	conf->active = 0;
1186	>	dlinkDelete(&conf->node, *iterator);
1187
1188		/* XXX This is less than pretty */
1189		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
#	Line 1564 | Line 1214 | clear_out_old_conf(void)
1214		/* clean out module paths */
1215		mod_clear_paths();
1216
1217	<	/* clean out ServerInfo */
1218	<	MyFree(ServerInfo.description);
1219	<	ServerInfo.description = NULL;
1220	<	MyFree(ServerInfo.network_name);
1221	<	ServerInfo.network_name = NULL;
1222	<	MyFree(ServerInfo.network_desc);
1223	<	ServerInfo.network_desc = NULL;
1224	<	MyFree(ConfigFileEntry.egdpool_path);
1225	<	ConfigFileEntry.egdpool_path = NULL;
1217	>	pseudo_clear();
1218	>
1219	>	/* clean out ConfigServerInfo */
1220	>	MyFree(ConfigServerInfo.description);
1221	>	ConfigServerInfo.description = NULL;
1222	>	MyFree(ConfigServerInfo.network_name);
1223	>	ConfigServerInfo.network_name = NULL;
1224	>	MyFree(ConfigServerInfo.network_desc);
1225	>	ConfigServerInfo.network_desc = NULL;
1226		#ifdef HAVE_LIBCRYPTO
1227	<	if (ServerInfo.rsa_private_key != NULL)
1227	>	if (ConfigServerInfo.rsa_private_key)
1228		{
1229	<	RSA_free(ServerInfo.rsa_private_key);
1230	<	ServerInfo.rsa_private_key = NULL;
1229	>	RSA_free(ConfigServerInfo.rsa_private_key);
1230	>	ConfigServerInfo.rsa_private_key = NULL;
1231		}
1232
1233	<	MyFree(ServerInfo.rsa_private_key_file);
1234	<	ServerInfo.rsa_private_key_file = NULL;
1585	<
1586	<	if (ServerInfo.server_ctx)
1587	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1588	<	SSL_OP_NO_SSLv3|
1589	<	SSL_OP_NO_TLSv1);
1590	<	if (ServerInfo.client_ctx)
1591	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1592	<	SSL_OP_NO_SSLv3|
1593	<	SSL_OP_NO_TLSv1);
1233	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1234	>	ConfigServerInfo.rsa_private_key_file = NULL;
1235		#endif
1236
1237	<	/* clean out AdminInfo */
1238	<	MyFree(AdminInfo.name);
1239	<	AdminInfo.name = NULL;
1240	<	MyFree(AdminInfo.email);
1241	<	AdminInfo.email = NULL;
1242	<	MyFree(AdminInfo.description);
1243	<	AdminInfo.description = NULL;
1237	>	/* clean out ConfigAdminInfo */
1238	>	MyFree(ConfigAdminInfo.name);
1239	>	ConfigAdminInfo.name = NULL;
1240	>	MyFree(ConfigAdminInfo.email);
1241	>	ConfigAdminInfo.email = NULL;
1242	>	MyFree(ConfigAdminInfo.description);
1243	>	ConfigAdminInfo.description = NULL;
1244
1245		/* clean out listeners */
1246		close_listeners();
1247	+	}
1248	+
1249	+	/* read_conf_files()
1250	+	*
1251	+	* inputs       - cold start YES or NO
1252	+	* output       - none
1253	+	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1254	+	*/
1255	+	void
1256	+	read_conf_files(int cold)
1257	+	{
1258	+	const char *filename = NULL;
1259	+	char chanmodes[IRCD_BUFSIZE] = "";
1260	+	char chanlimit[IRCD_BUFSIZE] = "";
1261	+
1262	+	conf_parser_ctx.boot = cold;
1263	+	filename = ConfigGeneral.configfile;
1264	+
1265	+	/* We need to know the initial filename for the yyerror() to report
1266	+	FIXME: The full path is in conffilenamebuf first time since we
1267	+	don't know anything else
1268	+
1269	+	- Gozem 2002-07-21
1270	+	*/
1271	+	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1272	+
1273	+	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1274	+	{
1275	+	if (cold)
1276	+	{
1277	+	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1278	+	filename, strerror(errno));
1279	+	exit(-1);
1280	+	}
1281	+	else
1282	+	{
1283	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1284	+	"Unable to read configuration file '%s': %s",
1285	+	filename, strerror(errno));
1286	+	return;
1287	+	}
1288	+	}
1289	+
1290	+	if (!cold)
1291	+	clear_out_old_conf();
1292	+
1293	+	read_conf(conf_parser_ctx.conf_file);
1294	+	fclose(conf_parser_ctx.conf_file);
1295	+
1296	+	log_reopen_all();
1297
1298	<	/* clean out general */
1299	<	MyFree(ConfigFileEntry.service_name);
1300	<	ConfigFileEntry.service_name = NULL;
1298	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1299	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1300	>
1301	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1302	>	add_isupport("MAXLIST", chanmodes, -1);
1303	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1304	>	add_isupport("CHANTYPES", "#", -1);
1305	>
1306	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1307	>	ConfigChannel.max_channels);
1308	>	add_isupport("CHANLIMIT", chanlimit, -1);
1309	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1310	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1311	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1312	>	add_isupport("CHANMODES", chanmodes, -1);
1313	>
1314	>	/*
1315	>	* message_locale may have changed.  rebuild isupport since it relies
1316	>	* on strlen(form_str(RPL_ISUPPORT))
1317	>	*/
1318	>	rebuild_isupport_message_line();
1319		}
1320
1321		/* conf_add_class_to_conf()
#	Line 1622 | Line 1331 | conf_add_class_to_conf(struct MaskItem *
1331		{
1332		conf->class = class_default;
1333
1334	<	if (conf->type == CONF_CLIENT)
1334	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1335		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1336		"Warning *** Defaulting to default class for %s@%s",
1337		conf->user, conf->host);
#	Line 1636 | Line 1345 | conf_add_class_to_conf(struct MaskItem *
1345
1346		if (conf->class == NULL)
1347		{
1348	<	if (conf->type == CONF_CLIENT)
1348	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1349		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1350		"Warning *** Defaulting to default class for %s@%s",
1351		conf->user, conf->host);
#	Line 1743 | Line 1452 | valid_wild_card_simple(const char *data)
1452		{
1453		const unsigned char *p = (const unsigned char *)data;
1454		unsigned char tmpch = '\0';
1455	<	int nonwild = 0;
1455	>	unsigned int nonwild = 0;
1456
1457		while ((tmpch = *p++))
1458		{
1459	<	if (tmpch == '\\')
1459	>	if (tmpch == '\\' && *p)
1460		{
1461		++p;
1462	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1462	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1463		return 1;
1464		}
1465		else if (!IsMWildChar(tmpch))
1466		{
1467	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1467	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1468		return 1;
1469		}
1470		}
#	Line 1774 | Line 1483 | valid_wild_card_simple(const char *data)
1483		int
1484		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1485		{
1486	<	char tmpch;
1487	<	int nonwild = 0;
1486	>	unsigned char tmpch = '\0';
1487	>	unsigned int nonwild = 0;
1488		va_list args;
1489
1490		/*
#	Line 1794 | Line 1503 | valid_wild_card(struct Client *source_p,
1503
1504		while (count--)
1505		{
1506	<	const char *p = va_arg(args, const char *);
1506	>	const unsigned char *p = va_arg(args, const unsigned char *);
1507		if (p == NULL)
1508		continue;
1509
#	Line 1806 | Line 1515 | valid_wild_card(struct Client *source_p,
1515		* If we find enough non-wild characters, we can
1516		* break - no point in searching further.
1517		*/
1518	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1518	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1519		{
1520		va_end(args);
1521		return 1;
#	Line 1816 | Line 1525 | valid_wild_card(struct Client *source_p,
1525		}
1526
1527		if (warn)
1528	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1529	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1528	>	sendto_one_notice(source_p, &me,
1529	>	":Please include at least %u non-wildcard characters with the mask",
1530	>	ConfigGeneral.min_nonwildcard);
1531		va_end(args);
1532		return 0;
1533		}
1534
1535	+	/* find_user_host()
1536	+	*
1537	+	* inputs       - pointer to client placing kline
1538	+	*              - pointer to user_host_or_nick
1539	+	*              - pointer to user buffer
1540	+	*              - pointer to host buffer
1541	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1542	+	* side effects -
1543	+	*/
1544	+	static int
1545	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1546	+	char *luser, char *lhost, unsigned int flags)
1547	+	{
1548	+	struct Client *target_p = NULL;
1549	+	char *hostp = NULL;
1550	+
1551	+	if (lhost == NULL)
1552	+	{
1553	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1554	+	return 1;
1555	+	}
1556	+
1557	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1558	+	{
1559	+	/* Explicit user@host mask given */
1560	+	if (hostp)                            /* I'm a little user@host */
1561	+	{
1562	+	*(hostp++) = '\0';                       /* short and squat */
1563	+
1564	+	if (*user_host_or_nick)
1565	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1566	+	else
1567	+	strcpy(luser, "*");
1568	+
1569	+	if (*hostp)
1570	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1571	+	else
1572	+	strcpy(lhost, "*");
1573	+	}
1574	+	else
1575	+	{
1576	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1577	+	luser[1] = '\0';
1578	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1579	+	}
1580	+
1581	+	return 1;
1582	+	}
1583	+	else
1584	+	{
1585	+	/* Try to find user@host mask from nick */
1586	+	/* Okay to use source_p as the first param, because source_p == client_p */
1587	+	if ((target_p =
1588	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1589	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1590	+
1591	+	if (IsExemptKline(target_p))
1592	+	{
1593	+	if (IsClient(source_p))
1594	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1595	+	return 0;
1596	+	}
1597	+
1598	+	/*
1599	+	* turn the "user" bit into "*user", blow away '~'
1600	+	* if found in original user name (non-idented)
1601	+	*/
1602	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1603	+
1604	+	if (target_p->username[0] == '~')
1605	+	luser[0] = '*';
1606	+
1607	+	if (!strcmp(target_p->sockhost, "0"))
1608	+	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1609	+	else
1610	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1611	+	return 1;
1612	+	}
1613	+
1614	+	return 0;
1615	+	}
1616	+
1617		/* XXX should this go into a separate file ? -Dianora */
1618		/* parse_aline
1619		*
#	Line 1859 | Line 1651 | parse_aline(const char *cmd, struct Clie
1651		char **target_server, char **reason)
1652		{
1653		int found_tkline_time=0;
1654	<	static char def_reason[] = "No Reason";
1654	>	static char def_reason[] = CONF_NOREASON;
1655		static char user[USERLEN*4+1];
1656		static char host[HOSTLEN*4+1];
1657
#	Line 1868 | Line 1660 | parse_aline(const char *cmd, struct Clie
1660
1661		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1662
1663	<	if (found_tkline_time != 0)
1663	>	if (found_tkline_time)
1664		{
1665		parv++;
1666		parc--;
1667
1668	<	if (tkline_time != NULL)
1668	>	if (tkline_time)
1669		*tkline_time = found_tkline_time;
1670		else
1671		{
1672	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1881	<	me.name, source_p->name, cmd);
1672	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1673		return -1;
1674		}
1675		}
#	Line 1903 | Line 1694 | parse_aline(const char *cmd, struct Clie
1694		parc--;
1695		parv++;
1696
1697	<	if (parc != 0)
1697	>	if (parc)
1698		{
1699		if (irccmp(*parv, "ON") == 0)
1700		{
#	Line 1912 | Line 1703 | parse_aline(const char *cmd, struct Clie
1703
1704		if (target_server == NULL)
1705		{
1706	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1916	<	me.name, source_p->name, cmd);
1706	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1707		return -1;
1708		}
1709
#	Line 1938 | Line 1728 | parse_aline(const char *cmd, struct Clie
1728		/* Make sure target_server *is* NULL if no ON server found
1729		* caller probably NULL'd it first, but no harm to do it again -db
1730		*/
1731	<	if (target_server != NULL)
1731	>	if (target_server)
1732		*target_server = NULL;
1733		}
1734		}
1735
1736	<	if (h_p != NULL)
1736	>	if (h_p)
1737		{
1738	<	if (strchr(user, '!') != NULL)
1738	>	if (strchr(user, '!'))
1739		{
1740	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1951	<	me.name, source_p->name);
1740	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1741		return -1;
1742		}
1743
#	Line 1959 | Line 1748 | parse_aline(const char *cmd, struct Clie
1748		if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1749		return -1;
1750
1751	<	if (reason != NULL)
1751	>	if (reason)
1752		{
1753	<	if (parc != 0 && !EmptyString(*parv))
1753	>	if (parc && !EmptyString(*parv))
1754		{
1755		*reason = *parv;
1756	+
1757		if (!valid_comment(source_p, *reason, 1))
1758		return -1;
1759		}
#	Line 1974 | Line 1764 | parse_aline(const char *cmd, struct Clie
1764		return 1;
1765		}
1766
1977	–	/* find_user_host()
1978	–	*
1979	–	* inputs       - pointer to client placing kline
1980	–	*              - pointer to user_host_or_nick
1981	–	*              - pointer to user buffer
1982	–	*              - pointer to host buffer
1983	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1984	–	* side effects -
1985	–	*/
1986	–	static int
1987	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1988	–	char *luser, char *lhost, unsigned int flags)
1989	–	{
1990	–	struct Client *target_p = NULL;
1991	–	char *hostp = NULL;
1992	–
1993	–	if (lhost == NULL)
1994	–	{
1995	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1996	–	return 1;
1997	–	}
1998	–
1999	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2000	–	{
2001	–	/* Explicit user@host mask given */
2002	–
2003	–	if (hostp != NULL)                            /* I'm a little user@host */
2004	–	{
2005	–	*(hostp++) = '\0';                       /* short and squat */
2006	–	if (*user_host_or_nick)
2007	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2008	–	else
2009	–	strcpy(luser, "*");
2010	–
2011	–	if (*hostp)
2012	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2013	–	else
2014	–	strcpy(lhost, "*");
2015	–	}
2016	–	else
2017	–	{
2018	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2019	–	luser[1] = '\0';
2020	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2021	–	}
2022	–
2023	–	return 1;
2024	–	}
2025	–	else
2026	–	{
2027	–	/* Try to find user@host mask from nick */
2028	–	/* Okay to use source_p as the first param, because source_p == client_p */
2029	–	if ((target_p =
2030	–	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
2031	–	return 0;
2032	–
2033	–	if (IsExemptKline(target_p))
2034	–	{
2035	–	if (!IsServer(source_p))
2036	–	sendto_one(source_p,
2037	–	":%s NOTICE %s :%s is E-lined",
2038	–	me.name, source_p->name, target_p->name);
2039	–	return 0;
2040	–	}
2041	–
2042	–	/*
2043	–	* turn the "user" bit into "*user", blow away '~'
2044	–	* if found in original user name (non-idented)
2045	–	*/
2046	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2047	–
2048	–	if (target_p->username[0] == '~')
2049	–	luser[0] = '*';
2050	–
2051	–	if (target_p->sockhost[0] == '\0' ||
2052	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2053	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2054	–	else
2055	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2056	–	return 1;
2057	–	}
2058	–
2059	–	return 0;
2060	–	}
2061	–
1767		/* valid_comment()
1768		*
1769		* inputs       - pointer to client
#	Line 2096 | Line 1801 | match_conf_password(const char *password
1801		else
1802		encr = password;
1803
1804	<	return !strcmp(encr, conf->passwd);
1804	>	return encr && !strcmp(encr, conf->passwd);
1805		}
1806
1807		/*
#	Line 2104 | Line 1809 | match_conf_password(const char *password
1809		*
1810		* inputs       - client sending the cluster
1811		*              - command name "KLINE" "XLINE" etc.
1812	<	*              - capab -- CAP_KLN etc. from s_serv.h
1812	>	*              - capab -- CAP_KLN etc. from server.h
1813		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1814		*              - pattern and args to send along
1815		* output       - none
#	Line 2116 | Line 1821 | cluster_a_line(struct Client *source_p,
1821		int capab, int cluster_type, const char *pattern, ...)
1822		{
1823		va_list args;
1824	<	char buffer[IRCD_BUFSIZE];
1825	<	const dlink_node *ptr = NULL;
1824	>	char buffer[IRCD_BUFSIZE] = "";
1825	>	const dlink_node *node = NULL;
1826
1827		va_start(args, pattern);
1828		vsnprintf(buffer, sizeof(buffer), pattern, args);
1829		va_end(args);
1830
1831	<	DLINK_FOREACH(ptr, cluster_items.head)
1831	>	DLINK_FOREACH(node, cluster_items.head)
1832		{
1833	<	const struct MaskItem *conf = ptr->data;
1833	>	const struct MaskItem *conf = node->data;
1834
1835		if (conf->flags & cluster_type)
1836		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
#	Line 2168 | Line 1873 | split_nuh(struct split_nuh_item *const i
1873
1874		if (iptr->nickptr)
1875		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1876	+
1877		if (iptr->userptr)
1878		strlcpy(iptr->userptr, "*", iptr->usersize);
1879	+
1880		if (iptr->hostptr)
1881		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1882
#	Line 2177 | Line 1884 | split_nuh(struct split_nuh_item *const i
1884		{
1885		*p = '\0';
1886
1887	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1887	>	if (iptr->nickptr && *iptr->nuhmask)
1888		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1889
1890		if ((q = strchr(++p, '@')))
1891		{
1892		*q++ = '\0';
1893
1894	<	if (*p != '\0')
1894	>	if (*p)
1895		strlcpy(iptr->userptr, p, iptr->usersize);
1896
1897	<	if (*q != '\0')
1897	>	if (*q)
1898		strlcpy(iptr->hostptr, q, iptr->hostsize);
1899		}
1900		else
1901		{
1902	<	if (*p != '\0')
1902	>	if (*p)
1903		strlcpy(iptr->userptr, p, iptr->usersize);
1904		}
1905		}
#	Line 2204 | Line 1911 | split_nuh(struct split_nuh_item *const i
1911		/* if found a @ */
1912		*p++ = '\0';
1913
1914	<	if (*iptr->nuhmask != '\0')
1914	>	if (*iptr->nuhmask)
1915		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1916
1917	<	if (*p != '\0')
1917	>	if (*p)
1918		strlcpy(iptr->hostptr, p, iptr->hostsize);
1919		}
1920		else

Diff Legend

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