config-file: use gint64 for download_speed_limit

Signed-off-by: Ben Prisby <ben@prisby.com>

Author: benprisby

include/config-file.h

@@ -31,7 +31,7 @@ typedef struct Config_ {
         int retry_wait;                   /**< wait between retries */
         int low_speed_time;               /**< time to be below the speed to trigger low speed abort */
         int low_speed_rate;               /**< low speed limit to abort transfer */
-        int download_speed_limit;         /**< average download speed cap for rate limiting */
+        gint64 download_speed_limit;      /**< average download speed cap for rate limiting */
         GLogLevelFlags log_level;         /**< log level */
         GHashTable* device;               /**< Additional attributes sent to hawkBit */
         gboolean send_download_authentication; /**< Send security header in download requests */

src/config-file.c

@@ -152,6 +152,46 @@ static gboolean get_key_int(GKeyFile *key_file, const gchar *group, const gchar
         return TRUE;
 }
 
+/**
+ * @brief Get 64-bit integer value from key_file for key in group, default_value must be specified,
+ * returned in case key not found in group.
+ *
+ * @param[in]  key_file      GKeyFile to look value up
+ * @param[in]  group         A group name
+ * @param[in]  key           A key
+ * @param[out] value         Output 64-bit integer value
+ * @param[in]  default_value Return this value in case no value found
+ * @param[out] error         Error
+ * @return FALSE on error (error is set), TRUE otherwise. Note that TRUE is returned if key in
+ *         group is not found, value is set to default_value in this case.
+ */
+static gboolean get_key_int64(GKeyFile *key_file, const gchar *group, const gchar *key, gint64 *value,
+                              const gint64 default_value, GError **error)
+{
+        GError *ierror = NULL;
+        gint64 val;
+
+        g_return_val_if_fail(key_file, FALSE);
+        g_return_val_if_fail(group, FALSE);
+        g_return_val_if_fail(key, FALSE);
+        g_return_val_if_fail(value, FALSE);
+        g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
+
+        val = g_key_file_get_int64(key_file, group, key, &ierror);
+
+        if (g_error_matches(ierror, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+                g_clear_error(&ierror);
+                *value = default_value;
+                return TRUE;
+        } else if (ierror) {
+                g_propagate_error(error, ierror);
+                return FALSE;
+        }
+
+        *value = val;
+        return TRUE;
+}
+
 /**
  * @brief Get GHashTable containing keys/values from group in key_file.
  *
@@ -328,7 +368,7 @@ Config* load_config_file(const gchar *config_file, GError **error)
                 return NULL;
         if (!get_key_int(ini_file, "client", "low_speed_time", &config->low_speed_time, 60, error))
                 return NULL;
-        if (!get_key_int(ini_file, "client", "download_speed_limit", &config->download_speed_limit, 0, error))
+        if (!get_key_int64(ini_file, "client", "download_speed_limit", &config->download_speed_limit, 0, error))
                 return NULL;
         if (!get_key_bool(ini_file, "client", "resume_downloads", &config->resume_downloads, FALSE,
                           error))