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 4254 by michael, Fri Jul 18 19:07:27 2014 UTC vs.
Revision 4744 by michael, Thu Oct 16 11:46:19 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 "conf_pseudo.h"
32		#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
#	Line 44 | Line 45
45		#include "log.h"
46		#include "send.h"
47		#include "memory.h"
47	–	#include "mempool.h"
48		#include "res.h"
49		#include "userhost.h"
50		#include "user.h"
#	Line 54 | Line 54
54		#include "conf_db.h"
55		#include "conf_class.h"
56		#include "motd.h"
57	+	#include "ipcache.h"
58
59
60		/* general conf items link list root, other than k lines etc. */
#	Line 75 | Line 76 | extern int yyparse(); /* defined in y.ta
76		static void read_conf(FILE *);
77		static void clear_out_old_conf(void);
78		static void expire_tklines(dlink_list *);
78	–	static void garbage_collect_ip_entries(void);
79	–	static int hash_ip(struct irc_ssaddr *);
79		static int verify_access(struct Client *);
80		static int attach_iline(struct Client *, struct MaskItem *);
82	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
81		static dlink_list *map_to_list(enum maskitem_type);
82		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
83
84
87	–	/* usually, with hash tables, you use a prime number...
88	–	* but in this case I am dealing with ip addresses,
89	–	* not ascii strings.
90	–	*/
91	–	#define IP_HASH_SIZE 0x1000
92	–
93	–	struct ip_entry
94	–	{
95	–	struct irc_ssaddr ip;
96	–	unsigned int count;  /**< Number of registered users using this IP */
97	–	unsigned int connection_count;  /**< Number of connections from this IP in the last throttle_time duration */
98	–	time_t last_attempt;  /**< The last time someone connected from this IP */
99	–	struct ip_entry *next;
100	–	};
101	–
102	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
103	–	static mp_pool_t *ip_entry_pool = NULL;
104	–	static int ip_entries_count = 0;
105	–
106	–
85		/* conf_dns_callback()
86		*
87		* inputs       - pointer to struct MaskItem
#	Line 115 | Line 93 | static int ip_entries_count = 0;
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98		struct MaskItem *conf = vptr;
99
#	Line 139 | Line 117 | conf_dns_lookup(struct MaskItem *conf)
117		if (!conf->dns_pending)
118		{
119		conf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, conf, conf->host);
120	>
121	>	if (conf->aftype == AF_INET)
122	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
123	>	else
124	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
125		}
126		}
127
#	Line 164 | Line 146 | conf_free(struct MaskItem *conf)
146		dlink_node *ptr = NULL, *ptr_next = NULL;
147		dlink_list *list = NULL;
148
149	<	if (conf->node.next)
150	<	if ((list = map_to_list(conf->type)))
169	<	dlinkDelete(&conf->node, list);
149	>	if ((list = map_to_list(conf->type)))
150	>	dlinkFindDelete(list, conf);
151
152		MyFree(conf->name);
153
#	Line 273 | Line 254 | check_client(struct Client *source_p)
254		"Unauthorized client connection from %s [%s] on [%s/%u].",
255		get_client_name(source_p, SHOW_IP),
256		source_p->sockhost,
257	<	source_p->localClient->listener->name,
258	<	source_p->localClient->listener->port);
257	>	source_p->connection->listener->name,
258	>	source_p->connection->listener->port);
259		ilog(LOG_TYPE_IRCD,
260		"Unauthorized client connection from %s on [%s/%u].",
261		get_client_name(source_p, SHOW_IP),
262	<	source_p->localClient->listener->name,
263	<	source_p->localClient->listener->port);
262	>	source_p->connection->listener->name,
263	>	source_p->connection->listener->port);
264
265		exit_client(source_p, "You are not authorized to use this server");
266		break;
#	Line 312 | Line 293 | verify_access(struct Client *client_p)
293		if (IsGotId(client_p))
294		{
295		conf = find_address_conf(client_p->host, client_p->username,
296	<	&client_p->localClient->ip,
297	<	client_p->localClient->aftype,
298	<	client_p->localClient->passwd);
296	>	&client_p->connection->ip,
297	>	client_p->connection->aftype,
298	>	client_p->connection->password);
299		}
300		else
301		{
302		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
303		conf = find_address_conf(client_p->host,non_ident,
304	<	&client_p->localClient->ip,
305	<	client_p->localClient->aftype,
306	<	client_p->localClient->passwd);
304	>	&client_p->connection->ip,
305	>	client_p->connection->aftype,
306	>	client_p->connection->password);
307		}
308
309		if (conf)
#	Line 343 | Line 324 | verify_access(struct Client *client_p)
324		/* Thanks for spoof idea amm */
325		if (IsConfDoSpoofIp(conf))
326		{
327	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
327	>	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
328		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
329		"%s spoofing: %s as %s",
330		client_p->name, client_p->host, conf->name);
#	Line 353 | Line 334 | verify_access(struct Client *client_p)
334
335		return attach_iline(client_p, conf);
336		}
337	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
337	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
338		{
339		if (IsConfGline(conf))
340		sendto_one_notice(client_p, &me, ":*** G-lined");
#	Line 375 | Line 356 | verify_access(struct Client *client_p)
356		static int
357		attach_iline(struct Client *client_p, struct MaskItem *conf)
358		{
359	<	struct ClassItem *class = NULL;
359	>	const struct ClassItem *class = conf->class;
360		struct ip_entry *ip_found;
361		int a_limit_reached = 0;
362		unsigned int local = 0, global = 0, ident = 0;
363
364	<	assert(conf->class);
384	<
385	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
364	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
365		ip_found->count++;
366	<	SetIpHash(client_p);
388	<
389	<	class = conf->class;
366	>	AddFlag(client_p, FLAGS_IPHASH);
367
368		count_user_host(client_p->username, client_p->host,
369		&global, &local, &ident);
#	Line 419 | Line 396 | attach_iline(struct Client *client_p, st
396		return attach_conf(client_p, conf);
397		}
398
422	–	/* init_ip_hash_table()
423	–	*
424	–	* inputs               - NONE
425	–	* output               - NONE
426	–	* side effects         - allocate memory for ip_entry(s)
427	–	*                      - clear the ip hash table
428	–	*/
429	–	void
430	–	init_ip_hash_table(void)
431	–	{
432	–	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
433	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
434	–	}
435	–
436	–	/* find_or_add_ip()
437	–	*
438	–	* inputs       - pointer to struct irc_ssaddr
439	–	* output       - pointer to a struct ip_entry
440	–	* side effects -
441	–	*
442	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
443	–	* count set to 0.
444	–	*/
445	–	static struct ip_entry *
446	–	find_or_add_ip(struct irc_ssaddr *ip_in)
447	–	{
448	–	struct ip_entry *ptr, *newptr;
449	–	int hash_index = hash_ip(ip_in), res;
450	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
451	–	#ifdef IPV6
452	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
453	–	#endif
454	–
455	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
456	–	{
457	–	#ifdef IPV6
458	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
459	–	continue;
460	–	if (ip_in->ss.ss_family == AF_INET6)
461	–	{
462	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
463	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
464	–	}
465	–	else
466	–	#endif
467	–	{
468	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
469	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
470	–	}
471	–	if (res == 0)
472	–	{
473	–	/* Found entry already in hash, return it. */
474	–	return ptr;
475	–	}
476	–	}
477	–
478	–	if (ip_entries_count >= 2 * hard_fdlimit)
479	–	garbage_collect_ip_entries();
480	–
481	–	newptr = mp_pool_get(ip_entry_pool);
482	–
483	–	ip_entries_count++;
484	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
485	–
486	–	newptr->next = ip_hash_table[hash_index];
487	–	ip_hash_table[hash_index] = newptr;
488	–
489	–	return newptr;
490	–	}
491	–
492	–	/* remove_one_ip()
493	–	*
494	–	* inputs        - unsigned long IP address value
495	–	* output        - NONE
496	–	* side effects  - The ip address given, is looked up in ip hash table
497	–	*                 and number of ip#'s for that ip decremented.
498	–	*                 If ip # count reaches 0 and has expired,
499	–	*                 the struct ip_entry is returned to the ip_entry_heap
500	–	*/
501	–	void
502	–	remove_one_ip(struct irc_ssaddr *ip_in)
503	–	{
504	–	struct ip_entry *ptr;
505	–	struct ip_entry *last_ptr = NULL;
506	–	int hash_index = hash_ip(ip_in), res;
507	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
508	–	#ifdef IPV6
509	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
510	–	#endif
511	–
512	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
513	–	{
514	–	#ifdef IPV6
515	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
516	–	continue;
517	–	if (ip_in->ss.ss_family == AF_INET6)
518	–	{
519	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
520	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
521	–	}
522	–	else
523	–	#endif
524	–	{
525	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
526	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
527	–	}
528	–	if (res)
529	–	continue;
530	–	if (ptr->count > 0)
531	–	ptr->count--;
532	–	if (ptr->count == 0 &&
533	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
534	–	{
535	–	if (last_ptr != NULL)
536	–	last_ptr->next = ptr->next;
537	–	else
538	–	ip_hash_table[hash_index] = ptr->next;
539	–
540	–	mp_pool_release(ptr);
541	–	ip_entries_count--;
542	–	return;
543	–	}
544	–	last_ptr = ptr;
545	–	}
546	–	}
547	–
548	–	/* hash_ip()
549	–	*
550	–	* input        - pointer to an irc_inaddr
551	–	* output       - integer value used as index into hash table
552	–	* side effects - hopefully, none
553	–	*/
554	–	static int
555	–	hash_ip(struct irc_ssaddr *addr)
556	–	{
557	–	if (addr->ss.ss_family == AF_INET)
558	–	{
559	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
560	–	int hash;
561	–	uint32_t ip;
562	–
563	–	ip   = ntohl(v4->sin_addr.s_addr);
564	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
565	–	return hash;
566	–	}
567	–	#ifdef IPV6
568	–	else
569	–	{
570	–	int hash;
571	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
572	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
573	–
574	–	hash  = ip[0] ^ ip[3];
575	–	hash ^= hash >> 16;
576	–	hash ^= hash >> 8;
577	–	hash  = hash & (IP_HASH_SIZE - 1);
578	–	return hash;
579	–	}
580	–	#else
581	–	return 0;
582	–	#endif
583	–	}
584	–
585	–	/* count_ip_hash()
586	–	*
587	–	* inputs        - pointer to counter of number of ips hashed
588	–	*               - pointer to memory used for ip hash
589	–	* output        - returned via pointers input
590	–	* side effects  - NONE
591	–	*
592	–	* number of hashed ip #'s is counted up, plus the amount of memory
593	–	* used in the hash.
594	–	*/
595	–	void
596	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
597	–	{
598	–	struct ip_entry *ptr;
599	–
600	–	*number_ips_stored = 0;
601	–	*mem_ips_stored    = 0;
602	–
603	–	for (unsigned int i = 0; i < IP_HASH_SIZE; ++i)
604	–	{
605	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
606	–	{
607	–	*number_ips_stored += 1;
608	–	*mem_ips_stored += sizeof(struct ip_entry);
609	–	}
610	–	}
611	–	}
612	–
613	–	/* garbage_collect_ip_entries()
614	–	*
615	–	* input        - NONE
616	–	* output       - NONE
617	–	* side effects - free up all ip entries with no connections
618	–	*/
619	–	static void
620	–	garbage_collect_ip_entries(void)
621	–	{
622	–	struct ip_entry *ptr;
623	–	struct ip_entry *last_ptr;
624	–	struct ip_entry *next_ptr;
625	–
626	–	for (unsigned int i = 0; i < IP_HASH_SIZE; ++i)
627	–	{
628	–	last_ptr = NULL;
629	–
630	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
631	–	{
632	–	next_ptr = ptr->next;
633	–
634	–	if (ptr->count == 0 &&
635	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
636	–	{
637	–	if (last_ptr != NULL)
638	–	last_ptr->next = ptr->next;
639	–	else
640	–	ip_hash_table[i] = ptr->next;
641	–	mp_pool_release(ptr);
642	–	ip_entries_count--;
643	–	}
644	–	else
645	–	last_ptr = ptr;
646	–	}
647	–	}
648	–	}
649	–
399		/* detach_conf()
400		*
401		* inputs       - pointer to client to detach
#	Line 660 | Line 409 | detach_conf(struct Client *client_p, enu
409		{
410		dlink_node *ptr = NULL, *ptr_next = NULL;
411
412	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
412	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->connection->confs.head)
413		{
414		struct MaskItem *conf = ptr->data;
415
#	Line 671 | Line 420 | detach_conf(struct Client *client_p, enu
420		if (!(conf->type & type))
421		continue;
422
423	<	dlinkDelete(ptr, &client_p->localClient->confs);
423	>	dlinkDelete(ptr, &client_p->connection->confs);
424		free_dlink_node(ptr);
425
426		if (conf->type == CONF_CLIENT)
427	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
427	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
428
429		if (--conf->class->ref_count == 0 && conf->class->active == 0)
430		{
#	Line 701 | Line 450 | detach_conf(struct Client *client_p, enu
450		int
451		attach_conf(struct Client *client_p, struct MaskItem *conf)
452		{
453	<	if (dlinkFind(&client_p->localClient->confs, conf))
453	>	if (dlinkFind(&client_p->connection->confs, conf))
454		return 1;
455
456		if (conf->type == CONF_CLIENT)
457		if (cidr_limit_reached(IsConfExemptLimits(conf),
458	<	&client_p->localClient->ip, conf->class))
458	>	&client_p->connection->ip, conf->class))
459		return TOO_MANY;    /* Already at maximum allowed */
460
461		conf->class->ref_count++;
462		conf->ref_count++;
463
464	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
464	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
465
466		return 0;
467		}
#	Line 773 | Line 522 | find_conf_name(dlink_list *list, const c
522
523		if (conf->type == type)
524		{
525	<	if (conf->name && (!irccmp(conf->name, name) ||
526	<	!match(conf->name, name)))
778	<	return conf;
525	>	if (conf->name && !irccmp(conf->name, name))
526	>	return conf;
527		}
528		}
529
#	Line 962 | Line 710 | find_exact_name_conf(enum maskitem_type
710		return conf;
711		break;
712		case HM_IPV4:
713	<	if (who->localClient->aftype == AF_INET)
714	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
713	>	if (who->connection->aftype == AF_INET)
714	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
715		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
716		return conf;
717		break;
970	–	#ifdef IPV6
718		case HM_IPV6:
719	<	if (who->localClient->aftype == AF_INET6)
720	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
719	>	if (who->connection->aftype == AF_INET6)
720	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
721		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
722		return conf;
723		break;
977	–	#endif
724		default:
725		assert(0);
726		}
#	Line 1029 | Line 775 | rehash(int sig)
775
776		/* don't close listeners until we know we can go ahead with the rehash */
777
1032	–	/* Check to see if we magically got(or lost) IPv6 support */
1033	–	check_can_use_v6();
1034	–
778		read_conf_files(0);
779
1037	–	if (ServerInfo.description)
1038	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1039	–
780		load_conf_modules();
781		check_conf_klines();
782
#	Line 1061 | Line 801 | set_default_conf(void)
801		assert(class_default == class_get_list()->tail->data);
802
803		#ifdef HAVE_LIBCRYPTO
804	<	ServerInfo.message_digest_algorithm = EVP_sha256();
805	<	ServerInfo.rsa_private_key = NULL;
806	<	ServerInfo.rsa_private_key_file = NULL;
804	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
805	>	{
806	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
807	>
808	>	if (key)
809	>	{
810	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
811	>	EC_KEY_free(key);
812	>	}
813	>	}
814	>
815	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
816	>	#endif
817	>
818	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
819	>	ConfigServerInfo.rsa_private_key = NULL;
820	>	ConfigServerInfo.rsa_private_key_file = NULL;
821		#endif
822
823	<	/* ServerInfo.name is not rehashable */
824	<	/* ServerInfo.name = ServerInfo.name; */
825	<	ServerInfo.description = NULL;
826	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
827	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
828	<
829	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
830	<	ServerInfo.specific_ipv4_vhost = 0;
831	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
832	<	ServerInfo.specific_ipv6_vhost = 0;
833	<
834	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
835	<	ServerInfo.max_nick_length = 9;
836	<	ServerInfo.max_topic_length = 80;
837	<
838	<	ServerInfo.hub = 0;
839	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
840	<	ServerInfo.dns_host.sin_port = 0;
841	<	AdminInfo.name = NULL;
1088	<	AdminInfo.email = NULL;
1089	<	AdminInfo.description = NULL;
823	>	/* ConfigServerInfo.name is not rehashable */
824	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
825	>	ConfigServerInfo.description = NULL;
826	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
827	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
828	>
829	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
830	>	ConfigServerInfo.specific_ipv4_vhost = 0;
831	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
832	>	ConfigServerInfo.specific_ipv6_vhost = 0;
833	>
834	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
835	>	ConfigServerInfo.max_nick_length = 9;
836	>	ConfigServerInfo.max_topic_length = 80;
837	>	ConfigServerInfo.hub = 0;
838	>
839	>	ConfigAdminInfo.name = NULL;
840	>	ConfigAdminInfo.email = NULL;
841	>	ConfigAdminInfo.description = NULL;
842
843		log_del_all();
844
845	<	ConfigLoggingEntry.use_logging = 1;
845	>	ConfigLog.use_logging = 1;
846
847		ConfigChannel.disable_fake_channels = 0;
848		ConfigChannel.invite_client_count = 10;
#	Line 1114 | Line 866 | set_default_conf(void)
866		ConfigServerHide.hide_server_ips = 0;
867		ConfigServerHide.disable_remote_commands = 0;
868
869	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
870	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
871	<	ConfigFileEntry.cycle_on_host_change = 1;
872	<	ConfigFileEntry.glines = 0;
873	<	ConfigFileEntry.gline_time = 12 * 3600;
874	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
875	<	ConfigFileEntry.gline_min_cidr = 16;
876	<	ConfigFileEntry.gline_min_cidr6 = 48;
877	<	ConfigFileEntry.invisible_on_connect = 1;
878	<	ConfigFileEntry.tkline_expire_notices = 1;
879	<	ConfigFileEntry.hide_spoof_ips = 1;
880	<	ConfigFileEntry.ignore_bogus_ts = 0;
881	<	ConfigFileEntry.disable_auth = 0;
882	<	ConfigFileEntry.kill_chase_time_limit = 90;
883	<	ConfigFileEntry.default_floodcount = 8;
884	<	ConfigFileEntry.failed_oper_notice = 1;
885	<	ConfigFileEntry.dots_in_ident = 0;
886	<	ConfigFileEntry.min_nonwildcard = 4;
887	<	ConfigFileEntry.min_nonwildcard_simple = 3;
888	<	ConfigFileEntry.max_accept = 20;
889	<	ConfigFileEntry.anti_nick_flood = 0;
890	<	ConfigFileEntry.max_nick_time = 20;
891	<	ConfigFileEntry.max_nick_changes = 5;
892	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
893	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
894	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
895	<	ConfigFileEntry.warn_no_connect_block = 1;
896	<	ConfigFileEntry.stats_e_disabled = 0;
897	<	ConfigFileEntry.stats_o_oper_only = 0;
898	<	ConfigFileEntry.stats_k_oper_only = 1;  /* 1 = masked */
899	<	ConfigFileEntry.stats_i_oper_only = 1;  /* 1 = masked */
900	<	ConfigFileEntry.stats_P_oper_only = 0;
901	<	ConfigFileEntry.stats_u_oper_only = 0;
902	<	ConfigFileEntry.caller_id_wait = 60;
903	<	ConfigFileEntry.opers_bypass_callerid = 0;
904	<	ConfigFileEntry.pace_wait = 10;
905	<	ConfigFileEntry.pace_wait_simple = 1;
906	<	ConfigFileEntry.short_motd = 0;
907	<	ConfigFileEntry.ping_cookie = 0;
908	<	ConfigFileEntry.no_oper_flood = 0;
909	<	ConfigFileEntry.true_no_oper_flood = 0;
910	<	ConfigFileEntry.oper_pass_resv = 1;
911	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
912	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
913	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
914	<	ConfigFileEntry.throttle_count = 1;
915	<	ConfigFileEntry.throttle_time = 1;
869	>	ConfigGeneral.away_count = 2;
870	>	ConfigGeneral.away_time = 10;
871	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
872	>	ConfigGeneral.cycle_on_host_change = 1;
873	>	ConfigGeneral.glines = 0;
874	>	ConfigGeneral.gline_time = 12 * 3600;
875	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
876	>	ConfigGeneral.gline_min_cidr = 16;
877	>	ConfigGeneral.gline_min_cidr6 = 48;
878	>	ConfigGeneral.invisible_on_connect = 1;
879	>	ConfigGeneral.tkline_expire_notices = 1;
880	>	ConfigGeneral.hide_spoof_ips = 1;
881	>	ConfigGeneral.ignore_bogus_ts = 0;
882	>	ConfigGeneral.disable_auth = 0;
883	>	ConfigGeneral.kill_chase_time_limit = 90;
884	>	ConfigGeneral.default_floodcount = 8;
885	>	ConfigGeneral.failed_oper_notice = 1;
886	>	ConfigGeneral.dots_in_ident = 0;
887	>	ConfigGeneral.min_nonwildcard = 4;
888	>	ConfigGeneral.min_nonwildcard_simple = 3;
889	>	ConfigGeneral.max_accept = 20;
890	>	ConfigGeneral.anti_nick_flood = 0;
891	>	ConfigGeneral.max_nick_time = 20;
892	>	ConfigGeneral.max_nick_changes = 5;
893	>	ConfigGeneral.anti_spam_exit_message_time = 0;
894	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
896	>	ConfigGeneral.warn_no_connect_block = 1;
897	>	ConfigGeneral.stats_e_disabled = 0;
898	>	ConfigGeneral.stats_o_oper_only = 0;
899	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
900	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
901	>	ConfigGeneral.stats_P_oper_only = 0;
902	>	ConfigGeneral.stats_u_oper_only = 0;
903	>	ConfigGeneral.caller_id_wait = 60;
904	>	ConfigGeneral.opers_bypass_callerid = 0;
905	>	ConfigGeneral.pace_wait = 10;
906	>	ConfigGeneral.pace_wait_simple = 1;
907	>	ConfigGeneral.short_motd = 0;
908	>	ConfigGeneral.ping_cookie = 0;
909	>	ConfigGeneral.no_oper_flood = 0;
910	>	ConfigGeneral.true_no_oper_flood = 0;
911	>	ConfigGeneral.oper_pass_resv = 1;
912	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
913	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
914	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
915	>	ConfigGeneral.throttle_count = 1;
916	>	ConfigGeneral.throttle_time = 1;
917		}
918
919		static void
920		validate_conf(void)
921		{
922	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
923	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
922	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
923	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
924
925	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
926	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
925	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
926	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
927
928	<	if (ServerInfo.network_name == NULL)
929	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
928	>	if (ConfigServerInfo.network_name == NULL)
929	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
930
931	<	if (ServerInfo.network_desc == NULL)
932	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
931	>	if (ConfigServerInfo.network_desc == NULL)
932	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
933
934	<	if (ConfigFileEntry.service_name == NULL)
1182	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1183	<
1184	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
934	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
935		}
936
937		/* read_conf()
#	Line 1265 | Line 1015 | conf_connect_allowed(struct irc_ssaddr *
1015		if (conf)
1016		return BANNED_CLIENT;
1017
1018	<	ip_found = find_or_add_ip(addr);
1018	>	ip_found = ipcache_find_or_add_address(addr);
1019
1020	<	if ((CurrentTime - ip_found->last_attempt) < ConfigFileEntry.throttle_time)
1020	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1021		{
1022	<	if (ip_found->connection_count >= ConfigFileEntry.throttle_count)
1022	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1023		return TOO_FAST;
1024
1025		++ip_found->connection_count;
#	Line 1289 | Line 1039 | conf_connect_allowed(struct irc_ssaddr *
1039		*                This is an event started off in ircd.c
1040		*/
1041		void
1042	<	cleanup_tklines(void *notused)
1042	>	cleanup_tklines(void *unused)
1043		{
1044		hostmask_expire_temporary();
1045		expire_tklines(&xconf_items);
#	Line 1318 | Line 1068 | expire_tklines(dlink_list *tklist)
1068
1069		if (conf->type == CONF_XLINE)
1070		{
1071	<	if (ConfigFileEntry.tkline_expire_notices)
1071	>	if (ConfigGeneral.tkline_expire_notices)
1072		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073		"Temporary X-line for [%s] expired", conf->name);
1074		conf_free(conf);
1075		}
1076		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1077		{
1078	<	if (ConfigFileEntry.tkline_expire_notices)
1078	>	if (ConfigGeneral.tkline_expire_notices)
1079		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1080		"Temporary RESV for [%s] expired", conf->name);
1081		conf_free(conf);
#	Line 1381 | Line 1131 | oper_privs_as_string(const unsigned int
1131		}
1132
1133		/*
1134	<	* Input: A client to find the active oper{} name for.
1134	>	* Input: A client to find the active operator {} name for.
1135		* Output: The nick!user@host{oper} of the oper.
1136		*         "oper" is server name for remote opers
1137		* Side effects: None.
#	Line 1393 | Line 1143 | get_oper_name(const struct Client *clien
1143		/* +5 for !,@,{,} and null */
1144		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1145
1146	+	if (IsServer(client_p))
1147	+	return client_p->name;
1148	+
1149		if (MyConnect(client_p))
1150		{
1151	<	if ((cnode = client_p->localClient->confs.head))
1151	>	if ((cnode = client_p->connection->confs.head))
1152		{
1153		const struct MaskItem *conf = cnode->data;
1154
#	Line 1407 | Line 1160 | get_oper_name(const struct Client *clien
1160		}
1161		}
1162
1163	<	/* Probably should assert here for now. If there is an oper out there
1164	<	* with no oper{} conf attached, it would be good for us to know...
1163	>	/*
1164	>	* Probably should assert here for now. If there is an oper out there
1165	>	* with no operator {} conf attached, it would be good for us to know...
1166		*/
1167	<	assert(0); /* Oper without oper conf! */
1167	>	assert(0);  /* Oper without oper conf! */
1168		}
1169
1170		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1432 | Line 1186 | read_conf_files(int cold)
1186		char chanlimit[IRCD_BUFSIZE] = "";
1187
1188		conf_parser_ctx.boot = cold;
1189	<	filename = ConfigFileEntry.configfile;
1189	>	filename = ConfigGeneral.configfile;
1190
1191		/* We need to know the initial filename for the yyerror() to report
1192		FIXME: The full path is in conffilenamebuf first time since we
1193	<	dont know anything else
1193	>	don't know anything else
1194
1195		- Gozem 2002-07-21
1196		*/
#	Line 1467 | Line 1221 | read_conf_files(int cold)
1221
1222		log_reopen_all();
1223
1224	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1225	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1224	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1225	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1226
1227		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1228		add_isupport("MAXLIST", chanmodes, -1);
1229	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1229	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1230		add_isupport("CHANTYPES", "#", -1);
1231
1232		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
#	Line 1480 | Line 1234 | read_conf_files(int cold)
1234		add_isupport("CHANLIMIT", chanlimit, -1);
1235		snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1236		add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1237	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1237	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1238		add_isupport("CHANMODES", chanmodes, -1);
1239
1240		/*
#	Line 1500 | Line 1254 | static void
1254		clear_out_old_conf(void)
1255		{
1256		dlink_node *ptr = NULL, *next_ptr = NULL;
1503	–	struct MaskItem *conf;
1257		dlink_list *free_items [] = {
1258		&server_items,   &oconf_items,
1259		&uconf_items,   &xconf_items,
#	Line 1517 | Line 1270 | clear_out_old_conf(void)
1270		{
1271		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1272		{
1273	<	conf = ptr->data;
1273	>	struct MaskItem *conf = ptr->data;
1274
1275	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1275	>	conf->active = 0;
1276	>	dlinkDelete(&conf->node, *iterator);
1277
1278		/* XXX This is less than pretty */
1279		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
#	Line 1550 | Line 1304 | clear_out_old_conf(void)
1304		/* clean out module paths */
1305		mod_clear_paths();
1306
1307	<	/* clean out ServerInfo */
1308	<	MyFree(ServerInfo.description);
1309	<	ServerInfo.description = NULL;
1310	<	MyFree(ServerInfo.network_name);
1311	<	ServerInfo.network_name = NULL;
1312	<	MyFree(ServerInfo.network_desc);
1313	<	ServerInfo.network_desc = NULL;
1307	>	pseudo_clear();
1308	>
1309	>	/* clean out ConfigServerInfo */
1310	>	MyFree(ConfigServerInfo.description);
1311	>	ConfigServerInfo.description = NULL;
1312	>	MyFree(ConfigServerInfo.network_name);
1313	>	ConfigServerInfo.network_name = NULL;
1314	>	MyFree(ConfigServerInfo.network_desc);
1315	>	ConfigServerInfo.network_desc = NULL;
1316		#ifdef HAVE_LIBCRYPTO
1317	<	if (ServerInfo.rsa_private_key)
1317	>	if (ConfigServerInfo.rsa_private_key)
1318		{
1319	<	RSA_free(ServerInfo.rsa_private_key);
1320	<	ServerInfo.rsa_private_key = NULL;
1319	>	RSA_free(ConfigServerInfo.rsa_private_key);
1320	>	ConfigServerInfo.rsa_private_key = NULL;
1321		}
1322
1323	<	MyFree(ServerInfo.rsa_private_key_file);
1324	<	ServerInfo.rsa_private_key_file = NULL;
1323	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1324	>	ConfigServerInfo.rsa_private_key_file = NULL;
1325		#endif
1326
1327	<	/* clean out AdminInfo */
1328	<	MyFree(AdminInfo.name);
1329	<	AdminInfo.name = NULL;
1330	<	MyFree(AdminInfo.email);
1331	<	AdminInfo.email = NULL;
1332	<	MyFree(AdminInfo.description);
1333	<	AdminInfo.description = NULL;
1327	>	/* clean out ConfigAdminInfo */
1328	>	MyFree(ConfigAdminInfo.name);
1329	>	ConfigAdminInfo.name = NULL;
1330	>	MyFree(ConfigAdminInfo.email);
1331	>	ConfigAdminInfo.email = NULL;
1332	>	MyFree(ConfigAdminInfo.description);
1333	>	ConfigAdminInfo.description = NULL;
1334
1335		/* clean out listeners */
1336		close_listeners();
1581	–
1582	–	/* clean out general */
1583	–	MyFree(ConfigFileEntry.service_name);
1584	–	ConfigFileEntry.service_name = NULL;
1337		}
1338
1339		/* conf_add_class_to_conf()
#	Line 1722 | Line 1474 | valid_wild_card_simple(const char *data)
1474
1475		while ((tmpch = *p++))
1476		{
1477	<	if (tmpch == '\\')
1477	>	if (tmpch == '\\' && *p)
1478		{
1479		++p;
1480	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1480	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1481		return 1;
1482		}
1483		else if (!IsMWildChar(tmpch))
1484		{
1485	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1485	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1486		return 1;
1487		}
1488		}
#	Line 1781 | Line 1533 | valid_wild_card(struct Client *source_p,
1533		* If we find enough non-wild characters, we can
1534		* break - no point in searching further.
1535		*/
1536	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1536	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1537		{
1538		va_end(args);
1539		return 1;
#	Line 1793 | Line 1545 | valid_wild_card(struct Client *source_p,
1545		if (warn)
1546		sendto_one_notice(source_p, &me,
1547		":Please include at least %u non-wildcard characters with the mask",
1548	<	ConfigFileEntry.min_nonwildcard);
1548	>	ConfigGeneral.min_nonwildcard);
1549		va_end(args);
1550		return 0;
1551		}
#	Line 2005 | Line 1757 | find_user_host(struct Client *source_p,
1757
1758		if (IsExemptKline(target_p))
1759		{
1760	<	if (!IsServer(source_p))
1760	>	if (IsClient(source_p))
1761		sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1762		return 0;
1763		}
#	Line 2019 | Line 1771 | find_user_host(struct Client *source_p,
1771		if (target_p->username[0] == '~')
1772		luser[0] = '*';
1773
1774	<	if (target_p->sockhost[0] == '\0' ||
2023	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
1774	>	if (!strcmp(target_p->sockhost, "0"))
1775		strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1776		else
1777		strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);

Diff Legend

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