From 984e94f01d8e2febba79b0624cdb2576fe329cd7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 11 Feb 2020 21:06:02 +0100 Subject: [PATCH] supplicant: expose nm_supplicant_driver_to_string() helper function Will be useful later. --- src/supplicant/nm-supplicant-interface.c | 14 ++------------ src/supplicant/nm-supplicant-manager.c | 10 ++++++++++ src/supplicant/nm-supplicant-types.h | 3 +++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index 4b6b4f6e1e..e25928c14d 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -1805,19 +1805,9 @@ on_wpas_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_d */ if (priv->dev != NULL) { - const char *driver_name = NULL; + const char *driver_name; - switch (priv->driver) { - case NM_SUPPLICANT_DRIVER_WIRELESS: - driver_name = NM_WPAS_DEFAULT_WIFI_DRIVER; - break; - case NM_SUPPLICANT_DRIVER_WIRED: - driver_name = "wired"; - break; - case NM_SUPPLICANT_DRIVER_MACSEC: - driver_name = "macsec_linux"; - break; - } + driver_name = nm_supplicant_driver_to_string (priv->driver); g_return_if_fail (driver_name); diff --git a/src/supplicant/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c index 65b910cade..08bed98cf3 100644 --- a/src/supplicant/nm-supplicant-manager.c +++ b/src/supplicant/nm-supplicant-manager.c @@ -48,6 +48,16 @@ NM_CACHED_QUARK_FCN ("nm-supplicant-error-quark", nm_supplicant_error_quark) /*****************************************************************************/ +NM_UTILS_LOOKUP_STR_DEFINE (nm_supplicant_driver_to_string, NMSupplicantDriver, + NM_UTILS_LOOKUP_DEFAULT_WARN (NULL), + NM_UTILS_LOOKUP_ITEM (NM_SUPPLICANT_DRIVER_UNKNOWN, "???"), + NM_UTILS_LOOKUP_ITEM (NM_SUPPLICANT_DRIVER_WIRELESS, NM_WPAS_DEFAULT_WIFI_DRIVER), + NM_UTILS_LOOKUP_ITEM (NM_SUPPLICANT_DRIVER_WIRED, "wired"), + NM_UTILS_LOOKUP_ITEM (NM_SUPPLICANT_DRIVER_MACSEC, "macsec_linux"), +); + +/*****************************************************************************/ + static void _caps_set (NMSupplicantManagerPrivate *priv, NMSupplCapType type, diff --git a/src/supplicant/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h index de0283b24a..17fbc0c009 100644 --- a/src/supplicant/nm-supplicant-types.h +++ b/src/supplicant/nm-supplicant-types.h @@ -127,11 +127,14 @@ typedef enum { } NMSupplicantError; typedef enum { + NM_SUPPLICANT_DRIVER_UNKNOWN, NM_SUPPLICANT_DRIVER_WIRELESS, NM_SUPPLICANT_DRIVER_WIRED, NM_SUPPLICANT_DRIVER_MACSEC, } NMSupplicantDriver; +const char *nm_supplicant_driver_to_string (NMSupplicantDriver driver); + #define NM_SUPPLICANT_ERROR (nm_supplicant_error_quark ()) GQuark nm_supplicant_error_quark (void);