From 3cebf963da32c610b5607dd5c9ca77054e4fa9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 19 Dec 2013 13:17:44 +0100 Subject: [PATCH] vpn: add code2string translation for NMVPNConnectionState and fix its logging --- src/vpn-manager/nm-vpn-connection.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index d0c82e4fec..500c72b831 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -477,7 +477,7 @@ plugin_failed (DBusGProxy *proxy, } static const char * -vpn_state_to_string (NMVPNServiceState state) +vpn_service_state_to_string (NMVPNServiceState state) { switch (state) { case NM_VPN_SERVICE_STATE_INIT: @@ -498,6 +498,30 @@ vpn_state_to_string (NMVPNServiceState state) return "unknown"; } +static const char * +vpn_state_to_string (NMVPNConnectionState state) +{ + switch (state) { + case NM_VPN_CONNECTION_STATE_PREPARE: + return "prepare"; + case NM_VPN_CONNECTION_STATE_NEED_AUTH: + return "need-auth"; + case NM_VPN_CONNECTION_STATE_CONNECT: + return "connect"; + case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: + return "ip-config-get"; + case NM_VPN_CONNECTION_STATE_ACTIVATED: + return "activated"; + case NM_VPN_CONNECTION_STATE_FAILED: + return "failed"; + case NM_VPN_CONNECTION_STATE_DISCONNECTED: + return "disconnected"; + default: + break; + } + return "unknown"; +} + static const char * vpn_reason_to_string (NMVPNConnectionStateReason reason) { @@ -539,7 +563,7 @@ plugin_state_changed (DBusGProxy *proxy, NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); nm_log_info (LOGD_VPN, "VPN plugin state changed: %s (%d)", - vpn_state_to_string (state), state); + vpn_service_state_to_string (state), state); if (state == NM_VPN_SERVICE_STATE_STOPPED) { /* Clear connection secrets to ensure secrets get requested each time the