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 6691 by michael, Thu Oct 29 12:48:48 2015 UTC vs.
Revision 7159 by michael, Thu Jan 28 11:26:51 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 72 | Line 72 | dlink_list server_items;
72		dlink_list cluster_items;
73		dlink_list operator_items;
74		dlink_list shared_items;
75	<	dlink_list xconf_items;
75	>	dlink_list gecos_items;
76		dlink_list nresv_items;
77		dlink_list cresv_items;
78
#	Line 137 | 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_SHARED:
143		return &shared_items;
#	Line 168 | Line 168 | map_to_list(enum maskitem_type type)
168		struct MaskItem *
169		conf_make(enum maskitem_type type)
170		{
171	<	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 189 | Line 189 | conf_free(struct MaskItem *conf)
189		if ((list = map_to_list(conf->type)))
190		dlinkFindDelete(list, conf);
191
192	<	MyFree(conf->name);
192	>	xfree(conf->name);
193
194		if (conf->dns_pending)
195		delete_resolver_queries(conf);
#	Line 200 | Line 200 | conf_free(struct MaskItem *conf)
200
201		conf->class = NULL;
202
203	<	MyFree(conf->passwd);
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
211	<	MyFree(conf->cipher_list);
212	<
213	<	if (conf->rsa_public_key)
214	<	RSA_free(conf->rsa_public_key);
215	<	#endif
203	>	xfree(conf->passwd);
204	>	xfree(conf->spasswd);
205	>	xfree(conf->reason);
206	>	xfree(conf->certfp);
207	>	xfree(conf->whois);
208	>	xfree(conf->user);
209	>	xfree(conf->host);
210	>	xfree(conf->cipher_list);
211	>
212		DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
213		{
214	<	MyFree(node->data);
214	>	xfree(node->data);
215		dlinkDelete(node, &conf->hub_list);
216		free_dlink_node(node);
217		}
218
219		DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
220		{
221	<	MyFree(node->data);
221	>	xfree(node->data);
222		dlinkDelete(node, &conf->leaf_list);
223		free_dlink_node(node);
224		}
#	Line 232 | Line 228 | conf_free(struct MaskItem *conf)
228		struct exempt *exptr = node->data;
229
230		dlinkDelete(node, &conf->exempt_list);
231	<	MyFree(exptr->name);
232	<	MyFree(exptr->user);
233	<	MyFree(exptr->host);
234	<	MyFree(exptr);
231	>	xfree(exptr->name);
232	>	xfree(exptr->user);
233	>	xfree(exptr->host);
234	>	xfree(exptr);
235		}
236
237	<	MyFree(conf);
237	>	xfree(conf);
238		}
239
240		/* attach_iline()
#	Line 602 | Line 598 | find_matching_name_conf(enum maskitem_ty
598		{
599		if ((user == NULL && (host == NULL)))
600		return conf;
601	<	if ((conf->flags & flags) != flags)
601	>	if ((conf->modes & flags) != flags)
602		continue;
603		if (EmptyString(conf->user) || EmptyString(conf->host))
604		return conf;
#	Line 762 | Line 758 | set_default_conf(void)
758		*/
759		assert(class_default == class_get_list()->tail->data);
760
765	–	#ifdef HAVE_LIBCRYPTO
766	–	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	–	{
768	–	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	–
770	–	if (key)
771	–	{
772	–	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	–	EC_KEY_free(key);
774	–	}
775	–	}
776	–
777	–	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778	–	#endif
779	–
780	–	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	–	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	–	#endif
783	–
761		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
762		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
763
#	Line 801 | Line 778 | set_default_conf(void)
778		ConfigChannel.disable_fake_channels = 0;
779		ConfigChannel.invite_client_count = 10;
780		ConfigChannel.invite_client_time = 300;
781	+	ConfigChannel.invite_delay_channel = 5;
782		ConfigChannel.knock_client_count = 1;
783		ConfigChannel.knock_client_time = 300;
784		ConfigChannel.knock_delay_channel = 60;
#	Line 820 | Line 798 | set_default_conf(void)
798
799		ConfigGeneral.away_count = 2;
800		ConfigGeneral.away_time = 10;
801	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
801	>	ConfigGeneral.max_watch = 50;
802		ConfigGeneral.cycle_on_host_change = 1;
803		ConfigGeneral.dline_min_cidr = 16;
804		ConfigGeneral.dline_min_cidr6 = 48;
#	Line 836 | Line 814 | set_default_conf(void)
814		ConfigGeneral.dots_in_ident = 0;
815		ConfigGeneral.min_nonwildcard = 4;
816		ConfigGeneral.min_nonwildcard_simple = 3;
817	<	ConfigGeneral.max_accept = 20;
817	>	ConfigGeneral.max_accept = 50;
818		ConfigGeneral.anti_nick_flood = 0;
819		ConfigGeneral.max_nick_time = 20;
820		ConfigGeneral.max_nick_changes = 5;
821		ConfigGeneral.anti_spam_exit_message_time = 0;
822	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
823	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
822	>	ConfigGeneral.ts_warn_delta = 30;
823	>	ConfigGeneral.ts_max_delta = 600;
824		ConfigGeneral.warn_no_connect_block = 1;
825		ConfigGeneral.stats_e_disabled = 0;
826		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
#	Line 870 | Line 848 | set_default_conf(void)
848		static void
849		validate_conf(void)
850		{
873	–	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
874	–	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
875	–
876	–	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
877	–	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
878	–
851		if (EmptyString(ConfigServerInfo.network_name))
852		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
853
854		if (EmptyString(ConfigServerInfo.network_desc))
855		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
884	–
885	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
856		}
857
858		/* read_conf()
#	Line 1042 | Line 1012 | void
1012		cleanup_tklines(void *unused)
1013		{
1014		hostmask_expire_temporary();
1015	<	expire_tklines(&xconf_items);
1015	>	expire_tklines(&gecos_items);
1016		expire_tklines(&nresv_items);
1017		expire_tklines(&cresv_items);
1018		}
#	Line 1096 | Line 1066 | oper_privs_as_string(const unsigned int
1066		char *privs_ptr = privs_out;
1067
1068		for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1069	<	*privs_ptr++ = opriv->c;
1069	>	if (port & opriv->flag)
1070	>	*privs_ptr++ = opriv->c;
1071	>
1072	>	if (privs_ptr == privs_out)
1073	>	*privs_ptr++ = '0';
1074
1075		*privs_ptr = '\0';
1076
#	Line 1157 | Line 1131 | clear_out_old_conf(void)
1131		dlink_node *node = NULL, *node_next = NULL;
1132		dlink_list *free_items [] = {
1133		&server_items,   &operator_items,
1134	<	&shared_items,   &xconf_items,
1134	>	&shared_items,   &gecos_items,
1135		&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1136		};
1137
#	Line 1201 | Line 1175 | clear_out_old_conf(void)
1175		pseudo_clear();
1176
1177		/* Clean out ConfigServerInfo */
1178	<	MyFree(ConfigServerInfo.description);
1178	>	xfree(ConfigServerInfo.description);
1179		ConfigServerInfo.description = NULL;
1180	<	MyFree(ConfigServerInfo.network_name);
1180	>	xfree(ConfigServerInfo.network_name);
1181		ConfigServerInfo.network_name = NULL;
1182	<	MyFree(ConfigServerInfo.network_desc);
1182	>	xfree(ConfigServerInfo.network_desc);
1183		ConfigServerInfo.network_desc = NULL;
1210	–	#ifdef HAVE_LIBCRYPTO
1211	–	if (ConfigServerInfo.rsa_private_key)
1212	–	{
1213	–	RSA_free(ConfigServerInfo.rsa_private_key);
1214	–	ConfigServerInfo.rsa_private_key = NULL;
1215	–	}
1184
1185	<	MyFree(ConfigServerInfo.rsa_private_key_file);
1185	>	xfree(ConfigServerInfo.rsa_private_key_file);
1186		ConfigServerInfo.rsa_private_key_file = NULL;
1187	<	#endif
1187	>	xfree(ConfigServerInfo.ssl_certificate_file);
1188	>	ConfigServerInfo.ssl_certificate_file = NULL;
1189	>	xfree(ConfigServerInfo.ssl_dh_param_file);
1190	>	ConfigServerInfo.ssl_dh_param_file = NULL;
1191	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1192	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1193	>	xfree(ConfigServerInfo.ssl_cipher_list);
1194	>	ConfigServerInfo.ssl_cipher_list = NULL;
1195	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1196	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1197
1198		/* Clean out ConfigAdminInfo */
1199	<	MyFree(ConfigAdminInfo.name);
1199	>	xfree(ConfigAdminInfo.name);
1200		ConfigAdminInfo.name = NULL;
1201	<	MyFree(ConfigAdminInfo.email);
1201	>	xfree(ConfigAdminInfo.email);
1202		ConfigAdminInfo.email = NULL;
1203	<	MyFree(ConfigAdminInfo.description);
1203	>	xfree(ConfigAdminInfo.description);
1204		ConfigAdminInfo.description = NULL;
1205
1206	<	MyFree(ConfigServerHide.flatten_links_file);
1206	>	xfree(ConfigServerHide.flatten_links_file);
1207		ConfigServerHide.flatten_links_file = NULL;
1208
1209		/* Clean out listeners */
1210		listener_close_marked();
1211		}
1212
1213	+	static void
1214	+	conf_handle_tls(int cold)
1215	+	{
1216	+	if (!tls_new_cred())
1217	+	{
1218	+	if (cold)
1219	+	{
1220	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1221	+	exit(-1);
1222	+	}
1223	+	else
1224	+	{
1225	+	/* Failed to load new settings/certs, old ones remain active */
1226	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1227	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1228	+	}
1229	+	}
1230	+	}
1231	+
1232		/* read_conf_files()
1233		*
1234		* inputs       - cold start YES or NO
#	Line 1281 | Line 1277 | read_conf_files(int cold)
1277		fclose(conf_parser_ctx.conf_file);
1278
1279		log_reopen_all();
1280	+	conf_handle_tls(cold);
1281
1282		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);
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		isupport_add("CHANLIMIT", chanlimit, -1);
1293	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
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);
#	Line 1578 | 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"))
1582	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1583	<	else
1584	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1578	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579		return 1;
1580		}
1581

Diff Legend

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