mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 10:14:41 +00:00
utils: move autoconnect_blocked_reason_to_string to NetworkManagerUtils
As this is going to be used by multiple components, let's move it to NetworkManagerUtils.[ch]
This commit is contained in:
parent
dc1cf48b86
commit
10c38eabb9
|
@ -1860,3 +1860,13 @@ nm_linux_platform_setup_with_tc_cache(void)
|
|||
{
|
||||
nm_platform_setup(nm_linux_platform_new(NULL, FALSE, FALSE, TRUE));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
NM_UTILS_FLAGS2STR_DEFINE(
|
||||
nm_settings_autoconnect_blocked_reason_to_string,
|
||||
NMSettingsAutoconnectBlockedReason,
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE, "none"),
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, "user-request"),
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, "failed"),
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, "no-secrets"), );
|
||||
|
|
|
@ -228,6 +228,26 @@ void nm_utils_ip_routes_to_dbus(int addr_family,
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
typedef enum _nm_packed {
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE = 0,
|
||||
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST = (1LL << 0),
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED = (1LL << 1),
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS = (1LL << 2),
|
||||
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL =
|
||||
(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST
|
||||
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED
|
||||
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS),
|
||||
} NMSettingsAutoconnectBlockedReason;
|
||||
|
||||
const char *
|
||||
nm_settings_autoconnect_blocked_reason_to_string(NMSettingsAutoconnectBlockedReason reason,
|
||||
char *buf,
|
||||
gsize len);
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
/* For now, all we track about a DHCP lease is the GHashTable with
|
||||
* the options.
|
||||
*
|
||||
|
|
|
@ -2592,14 +2592,6 @@ nm_settings_connection_autoconnect_retries_blocked_until(NMSettingsConnection *s
|
|||
return NM_SETTINGS_CONNECTION_GET_PRIVATE(self)->autoconnect_retries_blocked_until;
|
||||
}
|
||||
|
||||
static NM_UTILS_FLAGS2STR_DEFINE(
|
||||
_autoconnect_blocked_reason_to_string,
|
||||
NMSettingsAutoconnectBlockedReason,
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE, "none"),
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, "user-request"),
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, "failed"),
|
||||
NM_UTILS_FLAGS2STR(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS, "no-secrets"), );
|
||||
|
||||
NMSettingsAutoconnectBlockedReason
|
||||
nm_settings_connection_autoconnect_blocked_reason_get(NMSettingsConnection *self)
|
||||
{
|
||||
|
@ -2625,7 +2617,7 @@ nm_settings_connection_autoconnect_blocked_reason_set_full(NMSettingsConnection
|
|||
return FALSE;
|
||||
|
||||
_LOGT("autoconnect: blocked reason: %s",
|
||||
_autoconnect_blocked_reason_to_string(v, buf, sizeof(buf)));
|
||||
nm_settings_autoconnect_blocked_reason_to_string(v, buf, sizeof(buf)));
|
||||
priv->autoconnect_blocked_reason = v;
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
|
||||
#include "nm-dbus-object.h"
|
||||
#include "nm-connection.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
#include "nm-settings-storage.h"
|
||||
|
||||
|
@ -188,19 +189,6 @@ typedef enum _NMSettingsConnectionIntFlags {
|
|||
_NM_SETTINGS_CONNECTION_INT_FLAGS_ALL = ((_NM_SETTINGS_CONNECTION_INT_FLAGS_LAST - 1) << 1) - 1,
|
||||
} NMSettingsConnectionIntFlags;
|
||||
|
||||
typedef enum {
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE = 0,
|
||||
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST = (1LL << 0),
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED = (1LL << 1),
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS = (1LL << 2),
|
||||
|
||||
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL =
|
||||
(NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST
|
||||
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED
|
||||
| NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS),
|
||||
} NMSettingsAutoconnectBlockedReason;
|
||||
|
||||
typedef struct _NMSettingsConnectionCallId NMSettingsConnectionCallId;
|
||||
|
||||
typedef struct _NMSettingsConnectionClass NMSettingsConnectionClass;
|
||||
|
|
Loading…
Reference in a new issue