diff options
| author | Thomas Haller <thaller@redhat.com> | 2013-12-10 20:39:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-01-30 19:54:10 +0100 |
| commit | 16605be6b8589835dc1553808d10ff4bd86a526c (patch) | |
| tree | f6673787fc3f63a9db209df8ce11e868e63d2903 | |
| parent | 5aba4eaf6bbe257a110547692549725626a6566e (diff) | |
| download | NetworkManager-16605be6b8589835dc1553808d10ff4bd86a526c.tar.gz | |
core: use nm_utils_get_monotonic_timestamp_s for autoconnect_retry_time
https://bugzilla.gnome.org/show_bug.cgi?id=720833
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/nm-policy.c | 8 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.c | 6 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index bd1d58a4e6..34216c8717 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1252,13 +1252,13 @@ reset_connections_retries (gpointer user_data) NMPolicy *policy = (NMPolicy *) user_data; NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); GSList *connections, *iter; - time_t con_stamp, min_stamp, now; + gint32 con_stamp, min_stamp, now; gboolean changed = FALSE; priv->reset_retries_id = 0; min_stamp = 0; - now = time (NULL); + now = nm_utils_get_monotonic_timestamp_s (); connections = nm_settings_get_connections (priv->settings); for (iter = connections; iter; iter = g_slist_next (iter)) { NMSettingsConnection *connection = NM_SETTINGS_CONNECTION (iter->data); @@ -1429,10 +1429,10 @@ device_state_changed (NMDevice *device, nm_connection_get_id (NM_CONNECTION (connection))); /* Schedule a handler to reset retries count */ if (!priv->reset_retries_id) { - time_t retry_time = nm_settings_connection_get_autoconnect_retry_time (connection); + gint32 retry_time = nm_settings_connection_get_autoconnect_retry_time (connection); g_warn_if_fail (retry_time != 0); - priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - time (NULL)), reset_connections_retries, policy); + priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, policy); } } nm_connection_clear_secrets (NM_CONNECTION (connection)); diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 2a23396759..aac267e7a3 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -126,7 +126,7 @@ typedef struct { GHashTable *seen_bssids; /* Up-to-date BSSIDs that's been seen for the connection */ int autoconnect_retries; - time_t autoconnect_retry_time; + gint32 autoconnect_retry_time; NMDeviceStateReason autoconnect_blocked_reason; } NMSettingsConnectionPrivate; @@ -1923,7 +1923,7 @@ nm_settings_connection_set_autoconnect_retries (NMSettingsConnection *connection if (retries) priv->autoconnect_retry_time = 0; else - priv->autoconnect_retry_time = time (NULL) + AUTOCONNECT_RESET_RETRIES_TIMER; + priv->autoconnect_retry_time = nm_utils_get_monotonic_timestamp_s () + AUTOCONNECT_RESET_RETRIES_TIMER; } void @@ -1932,7 +1932,7 @@ nm_settings_connection_reset_autoconnect_retries (NMSettingsConnection *connecti nm_settings_connection_set_autoconnect_retries (connection, AUTOCONNECT_RETRIES_DEFAULT); } -time_t +gint32 nm_settings_connection_get_autoconnect_retry_time (NMSettingsConnection *connection) { return NM_SETTINGS_CONNECTION_GET_PRIVATE (connection)->autoconnect_retry_time; diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index d79c62d912..5a84349746 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -154,7 +154,7 @@ void nm_settings_connection_set_autoconnect_retries (NMSettingsConnection *conne int retries); void nm_settings_connection_reset_autoconnect_retries (NMSettingsConnection *connection); -time_t nm_settings_connection_get_autoconnect_retry_time (NMSettingsConnection *connection); +gint32 nm_settings_connection_get_autoconnect_retry_time (NMSettingsConnection *connection); NMDeviceStateReason nm_settings_connection_get_autoconnect_blocked_reason (NMSettingsConnection *connection); void nm_settings_connection_set_autoconnect_blocked_reason (NMSettingsConnection *connection, |