system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 12:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnm: fix NMVpnConnectionStateReason for glib-mkenums

Browse source 
The previous form was confusing glib-mkenums parser. Simplify
it.

Fixes: 5022e3b8ee ('libnm: revert coercing NMVpnConnectionStateReason to NMActiveConnectionStateReason')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/646
This commit is contained in:
Thomas Haller 2021-02-01 09:27:08 +01:00
parent 484b699c78
commit 087a3b4955
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 53 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libnm-core/nm-vpn-dbus-interface.h
View file

@ -141,26 +141,18 @@ typedef enum {
*/
NM_DEPRECATED_IN_1_8_FOR(NMActiveConnectionStateReason)
typedef enum {
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN,
NM_VPN_CONNECTION_STATE_REASON_NONE = NM_ACTIVE_CONNECTION_STATE_REASON_NONE,
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED =
NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED,
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED =
NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED =
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED,
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID =
NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID,
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT =
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT =
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED =
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS,
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED,
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED =
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED,
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
NM_VPN_CONNECTION_STATE_REASON_NONE = 1,
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2,
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4,
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5,
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7,
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8,
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9,
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10,
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11,
} NMVpnConnectionStateReason;
/**

41
libnm-core/tests/test-general.c
View file

@ -10273,6 +10273,45 @@ test_nm_utils_wifi_ghz_freqs(void)
/*****************************************************************************/
static void
test_vpn_connection_state_reason(void)
{
#define ASSERT(v1, v2) \
G_STMT_START \
{ \
G_STATIC_ASSERT((gint64)(v1) == v2); \
G_STATIC_ASSERT((gint64)(v2) == v1); \
\
nm_assert(((NMActiveConnectionStateReason)(int) (v1)) == v2); \
nm_assert(((NMVpnConnectionStateReason)(int) (v2)) == v1); \
} \
G_STMT_END
ASSERT(NM_VPN_CONNECTION_STATE_REASON_UNKNOWN, NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_NONE, NM_ACTIVE_CONNECTION_STATE_REASON_NONE);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED,
NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED,
NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED,
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID,
NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS, NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED,
NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED);
ASSERT(NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED,
NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED);
}
/*****************************************************************************/
NMTST_DEFINE();
int
@ -10603,6 +10642,8 @@ main(int argc, char **argv)
g_test_add_func("/core/general/test_nm_utils_wifi_ghz_freqs", test_nm_utils_wifi_ghz_freqs);
g_test_add_func("/core/general/test_strsplit_quoted", test_strsplit_quoted);
g_test_add_func("/core/general/test_vpn_connection_state_reason",
test_vpn_connection_state_reason);
return g_test_run();
}