Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
NetworkManager
0008-Fallback.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0008-Fallback.patch of Package NetworkManager
From d772e728887d5ea158abd908a01567db57c20e40 Mon Sep 17 00:00:00 2001 From: Tambet Ingo <tambet@gmail.com> Date: Tue, 13 Jan 2009 12:36:11 +0200 Subject: [PATCH] Fallback. diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index 80453e1..45f8179 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -222,6 +222,7 @@ global: nm_setting_wireless_add_seen_bssid; nm_setting_wireless_get_num_seen_bssids; nm_setting_wireless_get_seen_bssid; + nm_setting_wireless_get_fallback; nm_setting_wireless_security_add_proto; nm_setting_wireless_security_add_pairwise; nm_setting_wireless_security_add_group; diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 0daf859..bc26c76 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -90,6 +90,7 @@ typedef struct { guint32 mtu; GSList *seen_bssids; char *security; + gboolean fallback; } NMSettingWirelessPrivate; enum { @@ -105,6 +106,7 @@ enum { PROP_MTU, PROP_SEEN_BSSIDS, PROP_SEC, + PROP_FALLBACK, LAST_PROP }; @@ -373,6 +375,14 @@ nm_setting_wireless_get_security (NMSettingWireless *setting) } gboolean +nm_setting_wireless_get_fallback (NMSettingWireless *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), FALSE); + + return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->fallback; +} + +gboolean nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting, const char *bssid) { @@ -626,6 +636,9 @@ set_property (GObject *object, guint prop_id, g_free (priv->security); priv->security = g_value_dup_string (value); break; + case PROP_FALLBACK: + priv->fallback = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -672,6 +685,9 @@ get_property (GObject *object, guint prop_id, case PROP_SEC: g_value_set_string (value, nm_setting_wireless_get_security (setting)); break; + case PROP_FALLBACK: + g_value_set_boolean (value, nm_setting_wireless_get_fallback (setting)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -780,4 +796,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "Security", NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + + g_object_class_install_property + (object_class, PROP_FALLBACK, + g_param_spec_boolean (NM_SETTING_WIRELESS_FALLBACK, + "Fallback", + "Fallback", + FALSE, + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); } diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h index 9758e65..68acfb2 100644 --- a/libnm-util/nm-setting-wireless.h +++ b/libnm-util/nm-setting-wireless.h @@ -66,6 +66,7 @@ GQuark nm_setting_wireless_error_quark (void); #define NM_SETTING_WIRELESS_MTU "mtu" #define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids" #define NM_SETTING_WIRELESS_SEC "security" +#define NM_SETTING_WIRELESS_FALLBACK "fallback" typedef struct { NMSetting parent; @@ -89,6 +90,7 @@ guint32 nm_setting_wireless_get_tx_power (NMSettingWireless const GByteArray *nm_setting_wireless_get_mac_address (NMSettingWireless *setting); guint32 nm_setting_wireless_get_mtu (NMSettingWireless *setting); const char *nm_setting_wireless_get_security (NMSettingWireless *setting); +gboolean nm_setting_wireless_get_fallback (NMSettingWireless *setting); gboolean nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting, const char *bssid); diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 38c49c4..4b76017 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -1154,6 +1154,7 @@ real_get_best_auto_connection (NMDevice *dev, NMDeviceWifi *self = NM_DEVICE_WIFI (dev); NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); GSList *iter, *ap_iter; + NMConnection *fallback = NULL; for (iter = connections; iter; iter = g_slist_next (iter)) { NMConnection *connection = NM_CONNECTION (iter->data); @@ -1196,8 +1197,12 @@ real_get_best_auto_connection (NMDevice *dev, return connection; } } + + if (!fallback && nm_setting_wireless_get_fallback (s_wireless)) + fallback = connection; } - return NULL; + + return fallback; } /* -- 1.6.0.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor