cpp/openttd-patchpack/source Changeset - r27234:6aa56e39b0a4

Changeset - r27234:6aa56e39b0a4

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Patric Stout - 13 months ago 2023-05-04 20:46:02
truebrain@openttd.org

Fix: no_http_content_downloads and use_relay_service as private settings (#10762)

Basically, we don't need to know those values when people send in
crash reports.

3 files changed with 63 insertions and 25 deletions:

src/settings.cpp

src/table/settings/network_private_settings.ini

src/table/settings/network_settings.ini

0 comments (0 inline, 0 general)

src/settings.cpp

➞

Show inline comments

@@ @@ -155,10 +155,11 @@ public: @@
  * location. These versions assist with situations like that.
  */
 enum IniFileVersion : uint32 {
 	IFV_0,                 ///< 0  All versions prior to introduction.
 	IFV_PRIVATE_SECRETS,   ///< 1  PR#9298  Moving of settings from openttd.cfg to private.cfg / secrets.cfg.
 	IFV_GAME_TYPE,         ///< 2  PR#9515  Convert server_advertise to server_game_type.
 	IFV_LINKGRAPH_SECONDS, ///< 3  PR#10610 Store linkgraph update intervals in seconds instead of days.
 	IFV_0,                                                 ///< 0  All versions prior to introduction.
 	IFV_PRIVATE_SECRETS,                                   ///< 1  PR#9298  Moving of settings from openttd.cfg to private.cfg / secrets.cfg.
 	IFV_GAME_TYPE,                                         ///< 2  PR#9515  Convert server_advertise to server_game_type.
 	IFV_LINKGRAPH_SECONDS,                                 ///< 3  PR#10610 Store linkgraph update intervals in seconds instead of days.
 	IFV_NETWORK_PRIVATE_SETTINGS,                          ///< 4  PR#10762 Move no_http_content_downloads / use_relay_service to private settings.
 	IFV_MAX_VERSION,       ///< Highest possible ini-file version.
 };
@@ @@ -1243,6 +1244,31 @@ void LoadFromConfig(bool startup) @@
 			_settings_newgame.linkgraph.recalc_time     *= SECONDS_PER_DAY;
+		}
 		if (generic_version < IFV_NETWORK_PRIVATE_SETTINGS) {
 			IniGroup *network = generic_ini.GetGroup("network", false);
 			if (network != nullptr) {
 				IniItem *no_http_content_downloads = network->GetItem("no_http_content_downloads", false);
 				if (no_http_content_downloads != nullptr) {
 					if (no_http_content_downloads->value == "true") {
 						_settings_client.network.no_http_content_downloads = true;
 					} else if (no_http_content_downloads->value == "false") {
 						_settings_client.network.no_http_content_downloads = false;
+					}
+				}
 				IniItem *use_relay_service = network->GetItem("use_relay_service", false);
 				if (use_relay_service != nullptr) {
 					if (use_relay_service->value == "never") {
 						_settings_client.network.use_relay_service = UseRelayService::URS_NEVER;
 					} else if (use_relay_service->value == "ask") {
 						_settings_client.network.use_relay_service = UseRelayService::URS_ASK;
 					} else if (use_relay_service->value == "allow") {
 						_settings_client.network.use_relay_service = UseRelayService::URS_ALLOW;
+					}
+				}
+			}
+		}
 		_grfconfig_newgame = GRFLoadConfig(generic_ini, "newgrf", false);
 		_grfconfig_static  = GRFLoadConfig(generic_ini, "newgrf-static", true);
 		AILoadConfig(generic_ini, "ai_players");
@@ @@ -1304,6 +1330,13 @@ void SaveToConfig() @@
 			network->RemoveItem("server_advertise");
+		}
+	}
 	if (generic_version < IFV_NETWORK_PRIVATE_SETTINGS) {
 		IniGroup *network = generic_ini.GetGroup("network", false);
 		if (network != nullptr) {
 			network->RemoveItem("no_http_content_downloads");
 			network->RemoveItem("use_relay_service");
+		}
+	}
 	HandleSettingDescs(generic_ini, private_ini, secrets_ini, IniSaveSettings, IniSaveSettingList);
 	GRFSaveConfig(generic_ini, "newgrf", _grfconfig_newgame);

src/table/settings/network_private_settings.ini

➞

Show inline comments

@@ @@ -7,13 +7,19 @@ @@
 ; Network settings as stored in the private configuration file ("private.cfg").
 [pre-amble]
 static constexpr std::initializer_list<const char*> _use_relay_service{"never", "ask", "allow"};
 static const SettingVariant _network_private_settings_table[] = {
 [post-amble]
 };
 [templates]
 SDTC_SSTR  =  SDTC_SSTR(              $var, $type, $flags, $def,             $length,                                  $pre_cb, $post_cb, $from, $to,        $cat, $extra, $startup),
 SDTC_BOOL  =  SDTC_BOOL(              $var,        $flags, $def,                              $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to,        $cat, $extra, $startup),
 SDTC_OMANY = SDTC_OMANY(              $var, $type, $flags, $def,             $max, $full,     $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to,        $cat, $extra, $startup),
 SDTC_VAR   =   SDTC_VAR(              $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to,        $cat, $extra, $startup),
 [validation]
 SDTC_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
 SDTC_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds storage size");
 [defaults]
 flags    = SF_NONE
@@ @@ -66,3 +72,22 @@ length = 0 @@
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = """"
 cat      = SC_EXPERT
 [SDTC_BOOL]
 var      = network.no_http_content_downloads
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 cat      = SC_EXPERT
 [SDTC_OMANY]
 var      = network.use_relay_service
 type     = SLE_UINT8
 flags    = SF_GUI_DROPDOWN | SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = URS_ASK
 min      = URS_NO
 max      = URS_ALLOW
 full     = _use_relay_service
 str      = STR_CONFIG_SETTING_USE_RELAY_SERVICE
 strhelp  = STR_CONFIG_SETTING_USE_RELAY_SERVICE_HELPTEXT
 strval   = STR_CONFIG_SETTING_USE_RELAY_SERVICE_NEVER
 cat      = SC_BASIC

src/table/settings/network_settings.ini

➞

Show inline comments

@@ @@ -10,7 +10,6 @@ @@
 static void UpdateClientConfigValues();
 static constexpr std::initializer_list<const char*> _server_game_type{"local", "public", "invite-only"};
 static constexpr std::initializer_list<const char*> _use_relay_service{"never", "ask", "allow"};
 static const SettingVariant _network_settings_table[] = {
 [post-amble]
@@ @@ -246,22 +245,3 @@ var = network.reload_cfg @@
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_NETWORK_ONLY
 def      = false
 cat      = SC_EXPERT
 [SDTC_BOOL]
 var      = network.no_http_content_downloads
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = false
 cat      = SC_EXPERT
 [SDTC_OMANY]
 var      = network.use_relay_service
 type     = SLE_UINT8
 flags    = SF_GUI_DROPDOWN | SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 def      = URS_ASK
 min      = URS_NO
 max      = URS_ALLOW
 full     = _use_relay_service
 str      = STR_CONFIG_SETTING_USE_RELAY_SERVICE
 strhelp  = STR_CONFIG_SETTING_USE_RELAY_SERVICE_HELPTEXT
 strval   = STR_CONFIG_SETTING_USE_RELAY_SERVICE_NEVER
 cat      = SC_BASIC

0 comments (0 inline, 0 general)