applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Fix WPA Enterprise connection not working

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=685207
This commit is contained in:
Bastien Nocera 2012-10-02 14:55:59 +02:00
parent 7e708ae52c
commit 75086eb149
1 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
panels/network/net-device-wifi.c
View file

@ -1080,6 +1080,28 @@ activate_connection (NetDeviceWifi *device_wifi,
connection_activate_cb, device_wifi); connection_activate_cb, device_wifi);
} }
static gboolean
is_8021x (NMDevice *device,
const char *ap_object_path)
{
NM80211ApSecurityFlags wpa_flags, rsn_flags;
NMAccessPoint *ap;
ap = nm_device_wifi_get_access_point_by_path (NM_DEVICE_WIFI (device),
ap_object_path);
if (!ap)
return FALSE;
rsn_flags = nm_access_point_get_rsn_flags (ap);
if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
return TRUE;
wpa_flags = nm_access_point_get_wpa_flags (ap);
if (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
return TRUE;
return FALSE;
}
static void static void
wireless_try_to_connect (NetDeviceWifi *device_wifi, wireless_try_to_connect (NetDeviceWifi *device_wifi,
const gchar *ssid_target, const gchar *ssid_target,
@ -1147,12 +1169,30 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
} }
/* create one, as it's missing */ /* create one, as it's missing */
g_debug ("no existing connection found for %s, creating", g_debug ("no existing connection found for %s, creating", ssid_target);
ssid_target);
nm_client_add_and_activate_connection (client, if (!is_8021x (device, ap_object_path)) {
NULL, g_debug ("no existing connection found for %s, creating and activating one", ssid_target);
device, ap_object_path, nm_client_add_and_activate_connection (client,
connection_add_activate_cb, device_wifi); NULL,
device, ap_object_path,
connection_add_activate_cb, device_wifi);
} else {
CcNetworkPanel *panel;
GPtrArray *array;
g_debug ("no existing connection found for %s, creating", ssid_target);
array = g_ptr_array_new ();
g_ptr_array_add (array, "connect-8021x-wifi");
g_ptr_array_add (array, (gpointer) nm_object_get_path (NM_OBJECT (device)));
g_ptr_array_add (array, (gpointer) ap_object_path);
g_ptr_array_add (array, NULL);
panel = net_object_get_panel (NET_OBJECT (device_wifi));
g_object_set (G_OBJECT (panel), "argv", array->pdata, NULL);
g_ptr_array_free (array, FALSE);
}
out: out:
return; return;
} }