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 4989 by michael, Mon Dec 8 20:07:36 2014 UTC vs.
Revision 6956 by michael, Thu Dec 17 10:54:07 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 55 | Line 55
55		#include "conf_class.h"
56		#include "motd.h"
57		#include "ipcache.h"
58	+	#include "isupport.h"
59
60
61	+	struct config_channel_entry ConfigChannel;
62	+	struct config_serverhide_entry ConfigServerHide;
63	+	struct config_general_entry ConfigGeneral;
64	+	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	+	struct config_serverinfo_entry ConfigServerInfo;
66	+	struct config_admin_entry ConfigAdminInfo;
67	+	struct conf_parser_context conf_parser_ctx;
68	+
69		/* general conf items link list root, other than k lines etc. */
70		dlink_list service_items;
71		dlink_list server_items;
72		dlink_list cluster_items;
73	<	dlink_list oconf_items;
74	<	dlink_list uconf_items;
75	<	dlink_list xconf_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_items;
76		dlink_list nresv_items;
77		dlink_list cresv_items;
78
#	Line 128 | Line 137 | map_to_list(enum maskitem_type type)
137		switch (type)
138		{
139		case CONF_XLINE:
140	<	return &xconf_items;
140	>	return &gecos_items;
141		break;
142	<	case CONF_ULINE:
143	<	return &uconf_items;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144		break;
145		case CONF_NRESV:
146		return &nresv_items;
#	Line 140 | Line 149 | map_to_list(enum maskitem_type type)
149		return &cresv_items;
150		break;
151		case CONF_OPER:
152	<	return &oconf_items;
152	>	return &operator_items;
153		break;
154		case CONF_SERVER:
155		return &server_items;
#	Line 195 | Line 204 | conf_free(struct MaskItem *conf)
204		MyFree(conf->spasswd);
205		MyFree(conf->reason);
206		MyFree(conf->certfp);
207	+	MyFree(conf->whois);
208		MyFree(conf->user);
209		MyFree(conf->host);
210		#ifdef HAVE_LIBCRYPTO
#	Line 250 | Line 260 | attach_iline(struct Client *client_p, st
260		ip_found->count++;
261		AddFlag(client_p, FLAGS_IPHASH);
262
263	<	count_user_host(client_p->username, client_p->host,
264	<	&global, &local, &ident);
263	>	userhost_count(client_p->username, client_p->host,
264	>	&global, &local, &ident);
265
266		/* XXX blah. go down checking the various silly limits
267		* setting a_limit_reached if any limit is reached.
#	Line 291 | Line 301 | static int
301		verify_access(struct Client *client_p)
302		{
303		struct MaskItem *conf = NULL;
294	–	char non_ident[USERLEN + 1] = "~";
304
305	<	if (IsGotId(client_p))
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307		conf = find_address_conf(client_p->host, client_p->username,
308		&client_p->connection->ip,
#	Line 302 | Line 311 | verify_access(struct Client *client_p)
311		}
312		else
313		{
314	+	char non_ident[USERLEN + 1] = "~";
315	+
316		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317		conf = find_address_conf(client_p->host, non_ident,
318		&client_p->connection->ip,
#	Line 309 | Line 320 | verify_access(struct Client *client_p)
320		client_p->connection->password);
321		}
322
323	<	if (conf)
324	<	{
314	<	if (IsConfClient(conf))
315	<	{
316	<	if (IsConfRedir(conf))
317	<	{
318	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
319	<	conf->name ? conf->name : "",
320	<	conf->port);
321	<	return NOT_AUTHORIZED;
322	<	}
323	<
324	<	/* Thanks for spoof idea amm */
325	<	if (IsConfDoSpoofIp(conf))
326	<	{
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);
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332	<	}
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	return attach_iline(client_p, conf);
328	>	if (IsConfClient(conf))
329	>	{
330	>	if (IsConfRedir(conf))
331	>	{
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (IsConfGline(conf))
341	<	sendto_one_notice(client_p, &me, ":*** G-lined");
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342	<	return BANNED_CLIENT;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
346	+
347	+	return attach_iline(client_p, conf);
348		}
349
350	<	return NOT_AUTHORIZED;
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354		/* check_client()
#	Line 507 | Line 512 | attach_connect_block(struct Client *clie
512		{
513		dlink_node *node = NULL;
514
515	<	assert(client_p != NULL);
511	<	assert(host != NULL);
512	<
513	<	if (client_p == NULL || host == NULL)
514	<	return 0;
515	>	assert(host);
516
517		DLINK_FOREACH(node, server_items.head)
518		{
#	Line 521 | Line 522 | attach_connect_block(struct Client *clie
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
#	Line 582 | Line 583 | find_matching_name_conf(enum maskitem_ty
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
590
591		case CONF_XLINE:
592	<	case CONF_ULINE:
592	>	case CONF_SHARED:
593		case CONF_NRESV:
594		case CONF_CRESV:
595		DLINK_FOREACH(node, list->head)
#	Line 597 | Line 598 | find_matching_name_conf(enum maskitem_ty
598
599		if (EmptyString(conf->name))
600		continue;
601	<	if ((name != NULL) && !match(conf->name, name))
601	>	if (name && !match(conf->name, name))
602		{
603		if ((user == NULL && (host == NULL)))
604		return conf;
#	Line 616 | Line 617 | find_matching_name_conf(enum maskitem_ty
617		{
618		conf = node->data;
619
620	<	if ((name != NULL) && !match(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && !match(host, conf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
#	Line 649 | Line 650 | find_exact_name_conf(enum maskitem_type
650		switch(type)
651		{
652		case CONF_XLINE:
653	<	case CONF_ULINE:
653	>	case CONF_SHARED:
654		case CONF_NRESV:
655		case CONF_CRESV:
656
#	Line 778 | Line 779 | set_default_conf(void)
779
780		SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781		ConfigServerInfo.message_digest_algorithm = EVP_sha256();
781	–	ConfigServerInfo.rsa_private_key = NULL;
782	–	ConfigServerInfo.rsa_private_key_file = NULL;
782		#endif
783
785	–	/* ConfigServerInfo.name is not rehashable */
786	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
787	–	ConfigServerInfo.description = NULL;
784		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786
#	Line 793 | Line 789 | set_default_conf(void)
789		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790		ConfigServerInfo.specific_ipv6_vhost = 0;
791
792	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
792	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
793		ConfigServerInfo.max_nick_length = 9;
794		ConfigServerInfo.max_topic_length = 80;
795		ConfigServerInfo.hub = 0;
796
801	–	ConfigAdminInfo.name = NULL;
802	–	ConfigAdminInfo.email = NULL;
803	–	ConfigAdminInfo.description = NULL;
804	–
797		log_del_all();
798
799		ConfigLog.use_logging = 1;
#	Line 809 | Line 801 | set_default_conf(void)
801		ConfigChannel.disable_fake_channels = 0;
802		ConfigChannel.invite_client_count = 10;
803		ConfigChannel.invite_client_time = 300;
804	+	ConfigChannel.invite_delay_channel = 5;
805		ConfigChannel.knock_client_count = 1;
806		ConfigChannel.knock_client_time = 300;
807		ConfigChannel.knock_delay_channel = 60;
808		ConfigChannel.max_channels = 25;
809		ConfigChannel.max_bans = 25;
810	<	ConfigChannel.default_split_user_count = 0;
811	<	ConfigChannel.default_split_server_count = 0;
819	<	ConfigChannel.no_join_on_split = 0;
820	<	ConfigChannel.no_create_on_split = 0;
810	>	ConfigChannel.default_join_flood_count = 18;
811	>	ConfigChannel.default_join_flood_time = 6;
812
813		ConfigServerHide.flatten_links = 0;
814	<	ConfigServerHide.links_delay = 300;
814	>	ConfigServerHide.flatten_links_delay = 300;
815		ConfigServerHide.hidden = 0;
816		ConfigServerHide.hide_servers = 0;
817		ConfigServerHide.hide_services = 0;
#	Line 830 | Line 821 | set_default_conf(void)
821
822		ConfigGeneral.away_count = 2;
823		ConfigGeneral.away_time = 10;
824	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
824	>	ConfigGeneral.max_watch = 50;
825		ConfigGeneral.cycle_on_host_change = 1;
826	<	ConfigGeneral.glines = 0;
827	<	ConfigGeneral.gline_time = 12 * 3600;
828	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
829	<	ConfigGeneral.gline_min_cidr = 16;
839	<	ConfigGeneral.gline_min_cidr6 = 48;
826	>	ConfigGeneral.dline_min_cidr = 16;
827	>	ConfigGeneral.dline_min_cidr6 = 48;
828	>	ConfigGeneral.kline_min_cidr = 16;
829	>	ConfigGeneral.kline_min_cidr6 = 48;
830		ConfigGeneral.invisible_on_connect = 1;
831		ConfigGeneral.tkline_expire_notices = 1;
832		ConfigGeneral.ignore_bogus_ts = 0;
#	Line 847 | Line 837 | set_default_conf(void)
837		ConfigGeneral.dots_in_ident = 0;
838		ConfigGeneral.min_nonwildcard = 4;
839		ConfigGeneral.min_nonwildcard_simple = 3;
840	<	ConfigGeneral.max_accept = 20;
840	>	ConfigGeneral.max_accept = 50;
841		ConfigGeneral.anti_nick_flood = 0;
842		ConfigGeneral.max_nick_time = 20;
843		ConfigGeneral.max_nick_changes = 5;
844		ConfigGeneral.anti_spam_exit_message_time = 0;
845	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
846	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
845	>	ConfigGeneral.ts_warn_delta = 30;
846	>	ConfigGeneral.ts_max_delta = 600;
847		ConfigGeneral.warn_no_connect_block = 1;
848		ConfigGeneral.stats_e_disabled = 0;
859	–	ConfigGeneral.stats_o_oper_only = 0;
860	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
849		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
850	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
851	+	ConfigGeneral.stats_o_oper_only = 1;
852	+	ConfigGeneral.stats_m_oper_only = 1;
853		ConfigGeneral.stats_P_oper_only = 0;
854		ConfigGeneral.stats_u_oper_only = 0;
855		ConfigGeneral.caller_id_wait = 60;
#	Line 868 | Line 859 | set_default_conf(void)
859		ConfigGeneral.short_motd = 0;
860		ConfigGeneral.ping_cookie = 0;
861		ConfigGeneral.no_oper_flood = 0;
871	–	ConfigGeneral.oper_pass_resv = 1;
862		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
863	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
863	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
864	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
865	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
866		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
867		ConfigGeneral.throttle_count = 1;
868		ConfigGeneral.throttle_time = 1;
#	Line 879 | Line 871 | set_default_conf(void)
871		static void
872		validate_conf(void)
873		{
874	<	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
883	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
884	<
885	<	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
886	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
887	<
888	<	if (ConfigServerInfo.network_name == NULL)
874	>	if (EmptyString(ConfigServerInfo.network_name))
875		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
876
877	<	if (ConfigServerInfo.network_desc == NULL)
877	>	if (EmptyString(ConfigServerInfo.network_desc))
878		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
893	–
894	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
879		}
880
881		/* read_conf()
#	Line 924 | Line 908 | read_conf(FILE *file)
908		* as a result of an operator issuing this command, else assume it has been
909		* called as a result of the server receiving a HUP signal.
910		*/
911	<	int
911	>	void
912		conf_rehash(int sig)
913		{
914		if (sig)
915	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
915	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
916		"Got signal SIGHUP, reloading configuration file(s)");
917
918		restart_resolver();
#	Line 939 | Line 923 | conf_rehash(int sig)
923
924		load_conf_modules();
925		check_conf_klines();
942	–
943	–	return 0;
926		}
927
928		/* lookup_confhost()
#	Line 991 | Line 973 | int
973		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
974		{
975		struct ip_entry *ip_found = NULL;
976	<	struct MaskItem *const conf = find_dline_conf(addr, aftype);
995	<
996	<	/* DLINE exempt also gets you out of static limits/pacing... */
997	<	if (conf && (conf->type == CONF_EXEMPT))
998	<	return 0;
976	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
977
978		if (conf)
979	+	{
980	+	/* DLINE exempt also gets you out of static limits/pacing... */
981	+	if (conf->type == CONF_EXEMPT)
982	+	return 0;
983		return BANNED_CLIENT;
984	+	}
985
986		ip_found = ipcache_find_or_add_address(addr);
987
#	Line 1034 | Line 1017 | expire_tklines(dlink_list *list)
1017		if (!conf->until || conf->until > CurrentTime)
1018		continue;
1019
1020	<	if (conf->type == CONF_XLINE)
1021	<	{
1022	<	if (ConfigGeneral.tkline_expire_notices)
1023	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1041	<	"Temporary X-line for [%s] expired", conf->name);
1042	<	conf_free(conf);
1043	<	}
1044	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1045	<	{
1046	<	if (ConfigGeneral.tkline_expire_notices)
1047	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1048	<	"Temporary RESV for [%s] expired", conf->name);
1049	<	conf_free(conf);
1050	<	}
1020	>	if (ConfigGeneral.tkline_expire_notices)
1021	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1022	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1023	>	conf_free(conf);
1024		}
1025		}
1026
#	Line 1062 | Line 1035 | void
1035		cleanup_tklines(void *unused)
1036		{
1037		hostmask_expire_temporary();
1038	<	expire_tklines(&xconf_items);
1038	>	expire_tklines(&gecos_items);
1039		expire_tklines(&nresv_items);
1040		expire_tklines(&cresv_items);
1041		}
#	Line 1079 | Line 1052 | static const struct oper_privs
1052		const unsigned char c;
1053		} flag_list[] = {
1054		{ OPER_FLAG_ADMIN,          'A' },
1055	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1056	<	{ OPER_FLAG_DIE,            'D' },
1057	<	{ OPER_FLAG_GLINE,          'G' },
1058	<	{ OPER_FLAG_REHASH,         'H' },
1055	>	{ OPER_FLAG_CLOSE,          'B' },
1056	>	{ OPER_FLAG_CONNECT,        'C' },
1057	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1058	>	{ OPER_FLAG_DIE,            'E' },
1059	>	{ OPER_FLAG_DLINE,          'F' },
1060	>	{ OPER_FLAG_GLOBOPS,        'G' },
1061	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1062	>	{ OPER_FLAG_KILL,           'I' },
1063	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1064		{ OPER_FLAG_KLINE,          'K' },
1065	<	{ OPER_FLAG_KILL,           'N' },
1066	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1067	<	{ OPER_FLAG_CONNECT,        'P' },
1068	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1069	<	{ OPER_FLAG_SQUIT,          'R' },
1070	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1071	<	{ OPER_FLAG_UNKLINE,        'U' },
1072	<	{ OPER_FLAG_XLINE,          'X' },
1065	>	{ OPER_FLAG_LOCOPS,         'L' },
1066	>	{ OPER_FLAG_MODULE,         'M' },
1067	>	{ OPER_FLAG_NICK_RESV,      'N' },
1068	>	{ OPER_FLAG_OPME,           'O' },
1069	>	{ OPER_FLAG_REHASH,         'P' },
1070	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1071	>	{ OPER_FLAG_RESTART,        'R' },
1072	>	{ OPER_FLAG_RESV,           'S' },
1073	>	{ OPER_FLAG_SET,            'T' },
1074	>	{ OPER_FLAG_SQUIT,          'U' },
1075	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1076	>	{ OPER_FLAG_UNDLINE,        'W' },
1077	>	{ OPER_FLAG_UNKLINE,        'X' },
1078	>	{ OPER_FLAG_UNRESV,         'Y' },
1079	>	{ OPER_FLAG_UNXLINE,        'Z' },
1080	>	{ OPER_FLAG_WALLOPS,        'a' },
1081	>	{ OPER_FLAG_XLINE,          'b' },
1082		{ 0, '\0' }
1083		};
1084
1085	<	char *
1085	>	const char *
1086		oper_privs_as_string(const unsigned int port)
1087		{
1088		static char privs_out[IRCD_BUFSIZE];
1089		char *privs_ptr = privs_out;
1090
1091		for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1105	–	{
1092		if (port & opriv->flag)
1093		*privs_ptr++ = opriv->c;
1094	<	else
1095	<	*privs_ptr++ = ToLower(opriv->c);
1096	<	}
1094	>
1095	>	if (privs_ptr == privs_out)
1096	>	*privs_ptr++ = '0';
1097
1098		*privs_ptr = '\0';
1099
#	Line 1123 | Line 1109 | oper_privs_as_string(const unsigned int
1109		const char *
1110		get_oper_name(const struct Client *client_p)
1111		{
1112	<	/* +5 for !,@,{,} and null */
1127	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1112	>	static char buffer[IRCD_BUFSIZE];
1113
1114		if (IsServer(client_p))
1115		return client_p->name;
#	Line 1168 | Line 1153 | clear_out_old_conf(void)
1153		{
1154		dlink_node *node = NULL, *node_next = NULL;
1155		dlink_list *free_items [] = {
1156	<	&server_items,   &oconf_items,
1157	<	&uconf_items,   &xconf_items,
1156	>	&server_items,   &operator_items,
1157	>	&shared_items,   &gecos_items,
1158		&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1159		};
1160
#	Line 1179 | Line 1164 | clear_out_old_conf(void)
1164		* Resetting structs, etc, is taken care of by set_default_conf().
1165		*/
1166
1167	<	for (; *iterator != NULL; iterator++)
1167	>	for (; *iterator; iterator++)
1168		{
1169		DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1170		{
1171		struct MaskItem *conf = node->data;
1172
1173		conf->active = 0;
1189	–	dlinkDelete(&conf->node, *iterator);
1174
1175	<	/* XXX This is less than pretty */
1192	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1175	>	if (!IsConfDatabase(conf))
1176		{
1177	+	dlinkDelete(&conf->node, *iterator);
1178	+
1179		if (!conf->ref_count)
1180		conf_free(conf);
1181		}
1197	–	else if (conf->type == CONF_XLINE)
1198	–	{
1199	–	if (!conf->until)
1200	–	conf_free(conf);
1201	–	}
1202	–	else
1203	–	conf_free(conf);
1182		}
1183		}
1184
1185		motd_clear();
1186
1187		/*
1188	<	* don't delete the class table, rather mark all entries
1189	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1188	>	* Don't delete the class table, rather mark all entries for deletion.
1189	>	* The table is cleaned up by class_delete_marked. - avalon
1190		*/
1191		class_mark_for_deletion();
1192
1193		clear_out_address_conf();
1194
1195	<	/* clean out module paths */
1195	>	/* Clean out module paths */
1196		mod_clear_paths();
1197
1198		pseudo_clear();
1199
1200	<	/* clean out ConfigServerInfo */
1200	>	/* Clean out ConfigServerInfo */
1201		MyFree(ConfigServerInfo.description);
1202		ConfigServerInfo.description = NULL;
1203		MyFree(ConfigServerInfo.network_name);
#	Line 1237 | Line 1215 | clear_out_old_conf(void)
1215		ConfigServerInfo.rsa_private_key_file = NULL;
1216		#endif
1217
1218	<	/* clean out ConfigAdminInfo */
1218	>	/* Clean out ConfigAdminInfo */
1219		MyFree(ConfigAdminInfo.name);
1220		ConfigAdminInfo.name = NULL;
1221		MyFree(ConfigAdminInfo.email);
#	Line 1245 | Line 1223 | clear_out_old_conf(void)
1223		MyFree(ConfigAdminInfo.description);
1224		ConfigAdminInfo.description = NULL;
1225
1226	<	/* clean out listeners */
1227	<	close_listeners();
1226	>	MyFree(ConfigServerHide.flatten_links_file);
1227	>	ConfigServerHide.flatten_links_file = NULL;
1228	>
1229	>	/* Clean out listeners */
1230	>	listener_close_marked();
1231		}
1232
1233		/* read_conf_files()
#	Line 1279 | Line 1260 | read_conf_files(int cold)
1260		{
1261		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1262		filename, strerror(errno));
1263	<	exit(-1);
1263	>	exit(EXIT_FAILURE);
1264		}
1265		else
1266		{
1267	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1267	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1268		"Unable to read configuration file '%s': %s",
1269		filename, strerror(errno));
1270		return;
#	Line 1298 | Line 1279 | read_conf_files(int cold)
1279
1280		log_reopen_all();
1281
1282	<	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	<	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284
1285	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1286	<	add_isupport("MAXLIST", chanmodes, -1);
1287	<	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	<	add_isupport("CHANTYPES", "#", -1);
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289
1290	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291		ConfigChannel.max_channels);
1292	<	add_isupport("CHANLIMIT", chanlimit, -1);
1293	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1294	<	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1295	<	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	<	add_isupport("CHANMODES", chanmodes, -1);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297
1298		/*
1299		* message_locale may have changed.  rebuild isupport since it relies
1300		* on strlen(form_str(RPL_ISUPPORT))
1301		*/
1302	<	rebuild_isupport_message_line();
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
#	Line 1328 | Line 1309 | read_conf_files(int cold)
1309		* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316		conf->class = class_default;
1317
1318		if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320		"Warning *** Defaulting to default class for %s@%s",
1321		conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324		"Warning *** Defaulting to default class for %s",
1325		conf->name);
1326		}
1346	–	else
1347	–	conf->class = class_find(class_name, 1);
1348	–
1349	–	if (conf->class == NULL)
1350	–	{
1351	–	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1352	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1353	–	"Warning *** Defaulting to default class for %s@%s",
1354	–	conf->user, conf->host);
1355	–	else
1356	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	–	"Warning *** Defaulting to default class for %s",
1358	–	conf->name);
1359	–	conf->class = class_default;
1360	–	}
1327		}
1328
1329		/* yyerror()
#	Line 1375 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345		"\"%s\", line %u: %s: %s",
1346		conffilebuf, lineno + 1, msg, newlinebuf);
1347		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1388 | Line 1354 | conf_error_report(const char *msg)
1354		char newlinebuf[IRCD_BUFSIZE];
1355
1356		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358		"\"%s\", line %u: %s: %s",
1359		conffilebuf, lineno + 1, msg, newlinebuf);
1360		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1423 | Line 1389 | valid_tkline(const char *data, const int
1389
1390		/*
1391		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	<	* i.e. they specifically use 0, I am going to return 1 instead
1393	<	* as a return value of non-zero is used to flag it as a temporary kline
1392	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1393	>	* value of non-zero is used to flag it as a temporary kline
1394		*/
1395		if (result == 0)
1396		result = 1;
#	Line 1439 | Line 1405 | valid_tkline(const char *data, const int
1405		if (result > MAX_TDKLINE_TIME)
1406		result = MAX_TDKLINE_TIME;
1407
1408	<	result = result * 60;  /* turn it into seconds */
1408	>	result = result * 60;  /* Turn it into seconds */
1409
1410		return result;
1411		}
#	Line 1455 | Line 1421 | valid_wild_card_simple(const char *data)
1421		{
1422		const unsigned char *p = (const unsigned char *)data;
1423		unsigned char tmpch = '\0';
1424	<	unsigned int nonwild = 0;
1424	>	unsigned int nonwild = 0, wild = 0;
1425
1426		while ((tmpch = *p++))
1427		{
#	Line 1470 | Line 1436 | valid_wild_card_simple(const char *data)
1436		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437		return 1;
1438		}
1439	+	else
1440	+	++wild;
1441		}
1442
1443	<	return 0;
1443	>	return !wild;
1444		}
1445
1446		/* valid_wild_card()
#	Line 1484 | Line 1452 | valid_wild_card_simple(const char *data)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457		unsigned char tmpch = '\0';
1458		unsigned int nonwild = 0;
#	Line 1527 | Line 1495 | valid_wild_card(struct Client *source_p,
1495		}
1496		}
1497
1498	<	if (warn)
1498	>	if (IsClient(source_p))
1499		sendto_one_notice(source_p, &me,
1500		":Please include at least %u non-wildcard characters with the mask",
1501		ConfigGeneral.min_nonwildcard);
#	Line 1546 | Line 1514 | valid_wild_card(struct Client *source_p,
1514		*/
1515		static int
1516		find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	<	char *luser, char *lhost, unsigned int flags)
1517	>	char *luser, char *lhost)
1518		{
1519		struct Client *target_p = NULL;
1520		char *hostp = NULL;
#	Line 1591 | Line 1559 | find_user_host(struct Client *source_p,
1559		find_chasing(source_p, user_host_or_nick)) == NULL)
1560		return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561
1562	<	if (IsExemptKline(target_p))
1562	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563		{
1564		if (IsClient(source_p))
1565		sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
#	Line 1599 | Line 1567 | find_user_host(struct Client *source_p,
1567		}
1568
1569		/*
1570	<	* turn the "user" bit into "*user", blow away '~'
1570	>	* Turn the "user" bit into "*user", blow away '~'
1571		* if found in original user name (non-idented)
1572		*/
1573		strlcpy(luser, target_p->username, USERLEN*4 + 1);
#	Line 1607 | Line 1575 | find_user_host(struct Client *source_p,
1575		if (target_p->username[0] == '~')
1576		luser[0] = '*';
1577
1578	<	if (!strcmp(target_p->sockhost, "0"))
1611	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1612	<	else
1613	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1578	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579		return 1;
1580		}
1581
#	Line 1631 | Line 1596 | find_user_host(struct Client *source_p,
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 1654 | Line 1619 | parse_aline(const char *cmd, struct Clie
1619		char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = CONF_NOREASON;
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 1673 | Line 1638 | parse_aline(const char *cmd, struct Clie
1638		else
1639		{
1640		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	<	return -1;
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	<	return -1;
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
#	Line 1704 | Line 1669 | parse_aline(const char *cmd, struct Clie
1669		parc--;
1670		parv++;
1671
1707	–	if (target_server == NULL)
1708	–	{
1709	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1710	–	return -1;
1711	–	}
1712	–
1672		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	<	return -1;
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	<	return -1;
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 1741 | Line 1700 | parse_aline(const char *cmd, struct Clie
1700		if (strchr(user, '!'))
1701		{
1702		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	<	return -1;
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713		if (reason)
1714		{
1715		if (parc && !EmptyString(*parv))
1757	–	{
1716		*reason = *parv;
1759	–
1760	–	if (!valid_comment(source_p, *reason, 1))
1761	–	return -1;
1762	–	}
1717		else
1718	<	*reason = def_reason;
1718	>	*reason = default_reason;
1719		}
1720
1721		return 1;
1722		}
1723
1770	–	/* valid_comment()
1771	–	*
1772	–	* inputs       - pointer to client
1773	–	*              - pointer to comment
1774	–	* output       - 0 if no valid comment,
1775	–	*              - 1 if valid
1776	–	* side effects - truncates reason where necessary
1777	–	*/
1778	–	int
1779	–	valid_comment(struct Client *source_p, char *comment, int warn)
1780	–	{
1781	–	if (strlen(comment) > REASONLEN)
1782	–	comment[REASONLEN-1] = '\0';
1783	–
1784	–	return 1;
1785	–	}
1786	–
1724		/* match_conf_password()
1725		*
1726		* inputs       - pointer to given password
#	Line 1812 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from server.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
#	Line 1820 | Line 1757 | match_conf_password(const char *password
1757		*                along to all servers that match capab and cluster type
1758		*/
1759		void
1760	<	cluster_a_line(struct Client *source_p, const char *command,
1761	<	int capab, int cluster_type, const char *pattern, ...)
1760	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1761	>	unsigned int cluster_type, const char *pattern, ...)
1762		{
1763		va_list args;
1764		char buffer[IRCD_BUFSIZE] = "";
#	Line 1836 | Line 1773 | cluster_a_line(struct Client *source_p,
1773		const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777		"%s %s %s", command, conf->name, buffer);
1778		}
1779		}
#	Line 1922 | Line 1859 | split_nuh(struct split_nuh_item *const i
1859		}
1860		else
1861		{
1862	<	/* no @ found */
1862	>	/* No @ found */
1863		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1864		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1865		else

Diff Legend

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