diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-01-23 16:49:44 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-02-10 19:11:50 +0100 |
| commit | 837e71a374b479833e4baf5844011109d9724da1 (patch) | |
| tree | 06e1d0a5e4454a27c840f9ca90038ae21cd9df46 | |
| parent | bf9e016a1328bcf601d4cac55b4ebe8cb5747ebf (diff) | |
supplicant: move defines for supplicant D-Bus API to header
| -rw-r--r-- | src/supplicant/nm-supplicant-interface.c | 18 | ||||
| -rw-r--r-- | src/supplicant/nm-supplicant-types.h | 17 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index 6666befbce..099a8c306a 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -16,16 +16,6 @@ #include "nm-core-internal.h" #include "nm-std-aux/nm-dbus-compat.h" -#define NM_WPAS_DBUS_IFACE_INTERFACE NM_WPAS_DBUS_INTERFACE ".Interface" -#define NM_WPAS_DBUS_IFACE_INTERFACE_WPS NM_WPAS_DBUS_INTERFACE ".Interface.WPS" -#define NM_WPAS_DBUS_IFACE_INTERFACE_P2P_DEVICE NM_WPAS_DBUS_INTERFACE ".Interface.P2PDevice" -#define NM_WPAS_DBUS_IFACE_BSS NM_WPAS_DBUS_INTERFACE ".BSS" -#define NM_WPAS_DBUS_IFACE_PEER NM_WPAS_DBUS_INTERFACE ".Peer" -#define NM_WPAS_DBUS_IFACE_GROUP NM_WPAS_DBUS_INTERFACE ".Group" -#define NM_WPAS_DBUS_IFACE_NETWORK NM_WPAS_DBUS_INTERFACE ".Network" -#define NM_WPAS_ERROR_INVALID_IFACE NM_WPAS_DBUS_INTERFACE ".InvalidInterface" -#define NM_WPAS_ERROR_EXISTS_ERROR NM_WPAS_DBUS_INTERFACE ".InterfaceExists" - /*****************************************************************************/ typedef struct { @@ -1779,12 +1769,6 @@ interface_removed_cb (GDBusProxy *proxy, g_object_unref (self); } -#if HAVE_WEXT -#define DEFAULT_WIFI_DRIVER "nl80211,wext" -#else -#define DEFAULT_WIFI_DRIVER "nl80211" -#endif - static void on_wpas_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { @@ -1823,7 +1807,7 @@ on_wpas_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_d switch (priv->driver) { case NM_SUPPLICANT_DRIVER_WIRELESS: - driver_name = DEFAULT_WIFI_DRIVER; + driver_name = NM_WPAS_DEFAULT_WIFI_DRIVER; break; case NM_SUPPLICANT_DRIVER_WIRED: driver_name = "wired"; diff --git a/src/supplicant/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h index 85c51331a5..de0283b24a 100644 --- a/src/supplicant/nm-supplicant-types.h +++ b/src/supplicant/nm-supplicant-types.h @@ -10,6 +10,23 @@ #define NM_WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1" #define NM_WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1" +#if HAVE_WEXT +#define NM_WPAS_DEFAULT_WIFI_DRIVER "nl80211,wext" +#else +#define NM_WPAS_DEFAULT_WIFI_DRIVER "nl80211" +#endif + +#define NM_WPAS_DBUS_IFACE_INTERFACE NM_WPAS_DBUS_INTERFACE ".Interface" +#define NM_WPAS_DBUS_IFACE_INTERFACE_WPS NM_WPAS_DBUS_INTERFACE ".Interface.WPS" +#define NM_WPAS_DBUS_IFACE_INTERFACE_P2P_DEVICE NM_WPAS_DBUS_INTERFACE ".Interface.P2PDevice" +#define NM_WPAS_DBUS_IFACE_BSS NM_WPAS_DBUS_INTERFACE ".BSS" +#define NM_WPAS_DBUS_IFACE_PEER NM_WPAS_DBUS_INTERFACE ".Peer" +#define NM_WPAS_DBUS_IFACE_GROUP NM_WPAS_DBUS_INTERFACE ".Group" +#define NM_WPAS_DBUS_IFACE_NETWORK NM_WPAS_DBUS_INTERFACE ".Network" +#define NM_WPAS_ERROR_INVALID_IFACE NM_WPAS_DBUS_INTERFACE ".InvalidInterface" +#define NM_WPAS_ERROR_EXISTS_ERROR NM_WPAS_DBUS_INTERFACE ".InterfaceExists" +#define NM_WPAS_ERROR_UNKNOWN_IFACE NM_WPAS_DBUS_INTERFACE ".InterfaceUnknown" + typedef struct _NMSupplicantManager NMSupplicantManager; typedef struct _NMSupplicantInterface NMSupplicantInterface; typedef struct _NMSupplicantConfig NMSupplicantConfig; |