From 0fb485e4344ec77f6bc49cb26e0816b8c34c8c1c Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 8 Oct 2021 15:28:38 +0100
Subject: [PATCH] Raise the client timeout value from 25 seconds

When coldplugging expensive servers with a huge number of Redfish
devices it takes about 30 seconds to start fwupd while we wait for the
BMC to return results.
---
 libfwupd/fwupd-client.c | 50 +++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/libfwupd/fwupd-client.c b/libfwupd/fwupd-client.c
index f418a4c65..27160e145 100644
--- a/libfwupd/fwupd-client.c
+++ b/libfwupd/fwupd-client.c
@@ -36,6 +36,8 @@
 
 typedef GObject *(*FwupdClientObjectNewFunc)(void);
 
+#define FWUPD_CLIENT_DBUS_PROXY_TIMEOUT 180000 /* ms */
+
 /**
  * FwupdClient:
  *
@@ -805,7 +807,7 @@ fwupd_client_get_host_security_attrs_async(FwupdClient *self,
 			  "GetHostSecurityAttrs",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_host_security_attrs_cb,
 			  g_steal_pointer(&task));
@@ -906,7 +908,7 @@ fwupd_client_get_report_metadata_async(FwupdClient *self,
 			  "GetReportMetadata",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_report_metadata_cb,
 			  g_steal_pointer(&task));
@@ -986,7 +988,7 @@ fwupd_client_get_devices_async(FwupdClient *self,
 			  "GetDevices",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_devices_cb,
 			  g_steal_pointer(&task));
@@ -1066,7 +1068,7 @@ fwupd_client_get_plugins_async(FwupdClient *self,
 			  "GetPlugins",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_plugins_cb,
 			  g_steal_pointer(&task));
@@ -1146,7 +1148,7 @@ fwupd_client_get_history_async(FwupdClient *self,
 			  "GetHistory",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_history_cb,
 			  g_steal_pointer(&task));
@@ -1421,7 +1423,7 @@ fwupd_client_get_releases_async(FwupdClient *self,
 			  "GetReleases",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_releases_cb,
 			  g_steal_pointer(&task));
@@ -1504,7 +1506,7 @@ fwupd_client_get_downgrades_async(FwupdClient *self,
 			  "GetDowngrades",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_downgrades_cb,
 			  g_steal_pointer(&task));
@@ -1587,7 +1589,7 @@ fwupd_client_get_upgrades_async(FwupdClient *self,
 			  "GetUpgrades",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_upgrades_cb,
 			  g_steal_pointer(&task));
@@ -1669,7 +1671,7 @@ fwupd_client_modify_config_async(FwupdClient *self,
 			  "ModifyConfig",
 			  g_variant_new("(ss)", key, value),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_modify_config_cb,
 			  g_steal_pointer(&task));
@@ -1748,7 +1750,7 @@ fwupd_client_activate_async(FwupdClient *self,
 			  "Activate",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_activate_cb,
 			  g_steal_pointer(&task));
@@ -1826,7 +1828,7 @@ fwupd_client_verify_async(FwupdClient *self,
 			  "Verify",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_verify_cb,
 			  g_steal_pointer(&task));
@@ -1904,7 +1906,7 @@ fwupd_client_verify_update_async(FwupdClient *self,
 			  "VerifyUpdate",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_verify_update_cb,
 			  g_steal_pointer(&task));
@@ -1982,7 +1984,7 @@ fwupd_client_unlock_async(FwupdClient *self,
 			  "Unlock",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_unlock_cb,
 			  g_steal_pointer(&task));
@@ -2060,7 +2062,7 @@ fwupd_client_clear_results_async(FwupdClient *self,
 			  "ClearResults",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_clear_results_cb,
 			  g_steal_pointer(&task));
@@ -2143,7 +2145,7 @@ fwupd_client_get_results_async(FwupdClient *self,
 			  "GetResults",
 			  g_variant_new("(s)", device_id),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_results_cb,
 			  g_steal_pointer(&task));
@@ -3458,7 +3460,7 @@ fwupd_client_get_remotes_async(FwupdClient *self,
 			  "GetRemotes",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_remotes_cb,
 			  g_steal_pointer(&task));
@@ -3542,7 +3544,7 @@ fwupd_client_get_approved_firmware_async(FwupdClient *self,
 			  "GetApprovedFirmware",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_approved_firmware_cb,
 			  g_steal_pointer(&task));
@@ -3625,7 +3627,7 @@ fwupd_client_set_approved_firmware_async(FwupdClient *self,
 			  "SetApprovedFirmware",
 			  g_variant_new("(^as)", strv),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_set_approved_firmware_cb,
 			  g_steal_pointer(&task));
@@ -3709,7 +3711,7 @@ fwupd_client_get_blocked_firmware_async(FwupdClient *self,
 			  "GetBlockedFirmware",
 			  NULL,
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_get_blocked_firmware_cb,
 			  g_steal_pointer(&task));
@@ -3792,7 +3794,7 @@ fwupd_client_set_blocked_firmware_async(FwupdClient *self,
 			  "SetBlockedFirmware",
 			  g_variant_new("(^as)", strv),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_set_blocked_firmware_cb,
 			  g_steal_pointer(&task));
@@ -3871,7 +3873,7 @@ fwupd_client_set_feature_flags_async(FwupdClient *self,
 			  "SetFeatureFlags",
 			  g_variant_new("(t)", (guint64)feature_flags),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_set_feature_flags_cb,
 			  g_steal_pointer(&task));
@@ -3969,7 +3971,7 @@ fwupd_client_self_sign_async(FwupdClient *self,
 			  "SelfSign",
 			  g_variant_new("(sa{sv})", value, &builder),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_self_sign_cb,
 			  g_steal_pointer(&task));
@@ -4053,7 +4055,7 @@ fwupd_client_modify_remote_async(FwupdClient *self,
 			  "ModifyRemote",
 			  g_variant_new("(sss)", remote_id, key, value),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_modify_remote_cb,
 			  g_steal_pointer(&task));
@@ -4138,7 +4140,7 @@ fwupd_client_modify_device_async(FwupdClient *self,
 			  "ModifyDevice",
 			  g_variant_new("(sss)", device_id, key, value),
 			  G_DBUS_CALL_FLAGS_NONE,
-			  -1,
+			  FWUPD_CLIENT_DBUS_PROXY_TIMEOUT,
 			  cancellable,
 			  fwupd_client_modify_device_cb,
 			  g_steal_pointer(&task));