From 11ca4c7a91cd81a3462d79bc270ca160295257e9 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 17 Mar 2011 12:35:58 -0500 Subject: [PATCH] supplicant: add 'authenticating' state Caused a harmless warning, but lets add it anyway. --- src/supplicant-manager/nm-supplicant-interface.c | 5 +++++ src/supplicant-manager/nm-supplicant-interface.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index e46174c777..e9e58f39fe 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -259,6 +259,8 @@ wpas_state_string_to_enum (const char *str_state) return NM_SUPPLICANT_INTERFACE_STATE_INACTIVE; else if (!strcmp (str_state, "scanning")) return NM_SUPPLICANT_INTERFACE_STATE_SCANNING; + else if (!strcmp (str_state, "authenticating")) + return NM_SUPPLICANT_INTERFACE_STATE_AUTHENTICATING; else if (!strcmp (str_state, "associating")) return NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATING; else if (!strcmp (str_state, "associated")) @@ -270,6 +272,7 @@ wpas_state_string_to_enum (const char *str_state) else if (!strcmp (str_state, "completed")) return NM_SUPPLICANT_INTERFACE_STATE_COMPLETED; + nm_log_warn (LOGD_SUPPLICANT, "Unknown supplicant state '%s'", str_state); return -1; } @@ -959,6 +962,8 @@ nm_supplicant_interface_state_to_string (guint32 state) return "inactive"; case NM_SUPPLICANT_INTERFACE_STATE_SCANNING: return "scanning"; + case NM_SUPPLICANT_INTERFACE_STATE_AUTHENTICATING: + return "authenticating"; case NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATING: return "associating"; case NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATED: diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h index 44c92f19c6..e32411d7c1 100644 --- a/src/supplicant-manager/nm-supplicant-interface.h +++ b/src/supplicant-manager/nm-supplicant-interface.h @@ -37,6 +37,7 @@ enum { NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED, NM_SUPPLICANT_INTERFACE_STATE_INACTIVE, NM_SUPPLICANT_INTERFACE_STATE_SCANNING, + NM_SUPPLICANT_INTERFACE_STATE_AUTHENTICATING, NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATING, NM_SUPPLICANT_INTERFACE_STATE_ASSOCIATED, NM_SUPPLICANT_INTERFACE_STATE_4WAY_HANDSHAKE,