Re: [PATCH] support nl80211



On Wed, 2011-10-05 at 17:40 +0200, Johannes Berg wrote:
> This is on top of the nl80211 refactoring branch.

Applied with some fixes, thanks!

Dan

> johannes
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index aa14e8c..a225f89 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -124,6 +124,8 @@ NetworkManager_SOURCES = \
>  		wifi-utils-private.h \
>  		wifi-utils-wext.c \
>  		wifi-utils-wext.h \
> +		wifi-utils-nl80211.c \
> +		wifi-utils-nl80211.h \
>  		nm-device-wifi.c \
>  		nm-device-wifi.h \
>  		nm-device-olpc-mesh.c	\
> diff --git a/src/nm-netlink-compat.h b/src/nm-netlink-compat.h
> index af21fb9..a852928 100644
> --- a/src/nm-netlink-compat.h
> +++ b/src/nm-netlink-compat.h
> @@ -172,6 +172,16 @@ __nl_cache_include (struct nl_cache *cache, struct nl_object *obj, change_func_t
>  }
>  #define nl_cache_include __nl_cache_include
>  
> +static inline int __genl_ctrl_alloc_cache(struct nl_sock *h, struct nl_cache **cache)
> +{
> +	struct nl_cache *tmp = genl_ctrl_alloc_cache(h);
> +	if (!tmp)
> +		return -ENOMEM;
> +	*cache = tmp;
> +	return 0;
> +}
> +#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
> +
>  #define NLE_SUCCESS             0
>  #define NLE_FAILURE             1
>  #define NLE_INTR                2
> diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
> index 8bd1294..8b41a55 100644
> --- a/src/nm-udev-manager.c
> +++ b/src/nm-udev-manager.c
> @@ -347,6 +347,12 @@ is_wireless (GUdevDevice *device)
>  	char phy80211_path[255];
>  	struct stat s;
>  	const char *path;
> +	const char *tmp;
> +
> +	/* Check devtype, newer kernels (2.6.32+) have this */
> +	tmp = g_udev_device_get_property (device, "DEVTYPE");
> +	if (g_strcmp0 (tmp, "wlan") == 0)
> +		return TRUE;
>  
>  	/* Check for nl80211 sysfs paths */
>  	path = g_udev_device_get_sysfs_path (device);
> @@ -354,7 +360,7 @@ is_wireless (GUdevDevice *device)
>  	if ((stat (phy80211_path, &s) == 0 && (s.st_mode & S_IFDIR)))
>  		return TRUE;
>  
> -	/* Otherwise hit up WEXT/nl80211 directly */
> +	/* Otherwise hit up WEXT directly */
>  	return wifi_utils_is_wifi (g_udev_device_get_name (device));
>  }
>  
> diff --git a/src/wifi-utils-nl80211.c b/src/wifi-utils-nl80211.c
> new file mode 100644
> index 0000000..4b96448
> --- /dev/null
> +++ b/src/wifi-utils-nl80211.c
> @@ -0,0 +1,695 @@
> +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
> +/* NetworkManager -- Network link manager
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + *
> + * Copyright (C) 2005 - 2011 Red Hat, Inc.
> + * Copyright (C) 2006 - 2008 Novell, Inc.
> + * Copyright (C) 2011 Intel Corporation. All rights reserved.
> + */
> +
> +#include <config.h>
> +#include <errno.h>
> +#include <string.h>
> +#include <sys/ioctl.h>
> +#include <net/ethernet.h>
> +#include <unistd.h>
> +#include <math.h>
> +
> +#include <glib.h>
> +
> +#include <netlink/genl/genl.h>
> +#include <netlink/genl/family.h>
> +#include <netlink/genl/ctrl.h>
> +
> +#include <linux/nl80211.h>
> +
> +#include "wifi-utils-private.h"
> +#include "wifi-utils-nl80211.h"
> +#include "nm-logging.h"
> +#include "nm-utils.h"
> +#include "nm-netlink-compat.h"
> +
> +typedef struct {
> +	WifiData parent;
> +	struct nl_sock *nl_sock;
> +	struct nl_cache *nl_cache;
> +	struct genl_family *nl_family;
> +	struct nl_cb *nl_cb;
> +	guint32 *freqs;
> +	int num_freqs;
> +} WifiDataNl80211;
> +
> +static int ack_handler (struct nl_msg *msg, void *arg)
> +{
> +	int *err = arg;
> +	*err = 0;
> +	return NL_STOP;
> +}
> +
> +static int finish_handler (struct nl_msg *msg, void *arg)
> +{
> +	int *ret = arg;
> +	*ret = 0;
> +	return NL_SKIP;
> +}
> +
> +static int error_handler (struct sockaddr_nl *nla, struct nlmsgerr *err,
> +			  void *arg)
> +{
> +	int *ret = arg;
> +	*ret = err->error;
> +	return NL_SKIP;
> +}
> +
> +static struct nl_msg *nl80211_alloc_msg (WifiDataNl80211 *nl80211,
> +					 guint32 cmd, guint32 flags)
> +{
> +	struct nl_msg *msg = nlmsg_alloc ();
> +	if (!msg)
> +		return NULL;
> +
> +	genlmsg_put (msg, 0, 0, genl_family_get_id (nl80211->nl_family), 0,
> +		     flags, cmd, 0);
> +
> +	NLA_PUT_U32 (msg, NL80211_ATTR_IFINDEX, nl80211->parent.ifindex);
> +
> +	return msg;
> + nla_put_failure:
> +	nlmsg_free (msg);
> +	return NULL;
> +}
> +
> +static int nl80211_send_and_recv (WifiDataNl80211 *nl80211,
> +				  struct nl_msg *msg,
> +				  int (*valid_handler)(struct nl_msg *, void *),
> +				  void *valid_data)
> +{
> +	struct nl_cb *cb;
> +	int err;
> +
> +	if (msg == NULL)
> +		return -ENOMEM;
> +
> +	g_return_val_if_fail (valid_handler != NULL, -EINVAL);
> +
> +	cb = nl_cb_clone (nl80211->nl_cb);
> +	if (!cb) {
> +		err = -ENOMEM;
> +		goto out;
> +	}
> +
> +	err = nl_send_auto_complete (nl80211->nl_sock, msg);
> +	if (err < 0)
> +		goto out;
> +
> +	err = 1;
> +
> +	nl_cb_err (cb, NL_CB_CUSTOM, error_handler, &err);
> +	nl_cb_set (cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
> +	nl_cb_set (cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
> +	nl_cb_set (cb, NL_CB_VALID, NL_CB_CUSTOM, valid_handler, valid_data);
> +
> +	while (err > 0)
> +		nl_recvmsgs (nl80211->nl_sock, cb);
> + out:
> +	nl_cb_put (cb);
> +	nlmsg_free (msg);
> +	return err;
> +}
> +
> +
> +static void
> +wifi_nl80211_deinit (WifiData *parent)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) parent;
> +
> +	if (nl80211->nl_family)
> +		genl_family_put (nl80211->nl_family);
> +	if (nl80211->nl_cache)
> +		nl_cache_free (nl80211->nl_cache);
> +	if (nl80211->nl_sock)
> +		nl_socket_free (nl80211->nl_sock);
> +	if (nl80211->nl_cb)
> +		nl_cb_put (nl80211->nl_cb);
> +}
> +
> +struct nl80211_iface_info {
> +	NM80211Mode mode;
> +};
> +
> +static int nl80211_iface_info_handler (struct nl_msg *msg, void *arg)
> +{
> +	struct nl80211_iface_info *info = arg;
> +	struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg));
> +	struct nlattr *tb[NL80211_ATTR_MAX + 1];
> +                
> +	if (nla_parse (tb, NL80211_ATTR_MAX, genlmsg_attrdata (gnlh, 0),
> +		       genlmsg_attrlen (gnlh, 0), NULL) < 0)
> +		return NL_SKIP;
> +
> +	if (!tb[NL80211_ATTR_IFTYPE])
> +		return NL_SKIP;
> +
> +	switch (nla_get_u32 (tb[NL80211_ATTR_IFTYPE])) {
> +	case NL80211_IFTYPE_ADHOC:
> +		info->mode = NM_802_11_MODE_ADHOC;
> +		break;
> +	case NL80211_IFTYPE_STATION:
> +		info->mode = NM_802_11_MODE_INFRA;
> +		break;
> +	}
> +                          
> +	return NL_SKIP;
> +}
> +
> +static NM80211Mode
> +wifi_nl80211_get_mode (WifiData *data)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	struct nl80211_iface_info iface_info = {
> +		.mode = NM_802_11_MODE_UNKNOWN,
> +	};
> +	struct nl_msg *msg;
> +
> +	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_INTERFACE, 0);
> +
> +	if (nl80211_send_and_recv (nl80211, msg, nl80211_iface_info_handler,
> +				   &iface_info) < 0)
> +		return NM_802_11_MODE_UNKNOWN;
> +
> +	return iface_info.mode;
> +	return NM_802_11_MODE_INFRA;
> +	return NM_802_11_MODE_ADHOC;
> +	return NM_802_11_MODE_UNKNOWN;
> +}
> +
> +static gboolean
> +wifi_nl80211_set_mode (WifiData *data, const NM80211Mode mode)
> +{
> +	/*
> +	 * Used only to set mode for scanning as some old cards
> +	 * don't properly scan in IBSS mode, nl80211 cards are
> +	 * expected to scan properly so ignore this.
> +	 */
> +	return TRUE;
> +}
> +
> +static guint32 nl80211_mbm_to_percent (gint32 mbm)
> +{
> +#define NOISE_FLOOR_MBM  -9000
> +#define SIGNAL_MAX_MBM   -2000
> +
> +	mbm = CLAMP(mbm, NOISE_FLOOR_MBM, SIGNAL_MAX_MBM);
> +
> +	return 100 - 70 * ((SIGNAL_MAX_MBM - mbm) /
> +			   (SIGNAL_MAX_MBM - NOISE_FLOOR_MBM));
> +}
> +
> +struct nl80211_bss_info {
> +	guint32 freq;
> +	guint8 bssid[ETH_ALEN];
> +	guint8 ssid[32];
> +	guint32 ssid_len;
> +	guint32 beacon_signal;
> +	gboolean valid;
> +};
> +
> +#define WLAN_EID_SSID	0
> +
> +static void find_ssid (guint8 *ies, guint32 ies_len,
> +		       guint8 **ssid, guint32 *ssid_len)
> +{
> +	*ssid = NULL;
> +	*ssid_len = 0;
> +
> +	while (ies_len > 2 && ies[0] != WLAN_EID_SSID) {
> +		ies_len -= ies[1] + 2;
> +		ies += ies[1] + 2;
> +	}
> +	if (ies_len < 2)
> +		return;
> +	if (ies_len < 2 + ies[1])
> +		return;
> +
> +	*ssid_len = ies[1];
> +	*ssid = ies + 2;
> +}
> +
> +static int nl80211_bss_dump_handler (struct nl_msg *msg, void *arg)
> +{
> +	struct nl80211_bss_info *info = arg;
> +	struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg));
> +	struct nlattr *tb[NL80211_ATTR_MAX + 1];
> +	struct nlattr *bss[NL80211_BSS_MAX + 1];
> +	static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = {
> +		[NL80211_BSS_TSF] = { .type = NLA_U64 },
> +		[NL80211_BSS_FREQUENCY] = { .type = NLA_U32 },
> +		[NL80211_BSS_BSSID] = { },
> +		[NL80211_BSS_BEACON_INTERVAL] = { .type = NLA_U16 },
> +		[NL80211_BSS_CAPABILITY] = { .type = NLA_U16 },
> +		[NL80211_BSS_INFORMATION_ELEMENTS] = { },
> +		[NL80211_BSS_SIGNAL_MBM] = { .type = NLA_U32 },
> +		[NL80211_BSS_SIGNAL_UNSPEC] = { .type = NLA_U8 },
> +		[NL80211_BSS_STATUS] = { .type = NLA_U32 },
> +		[NL80211_BSS_SEEN_MS_AGO] = { .type = NLA_U32 },
> +		[NL80211_BSS_BEACON_IES] = { },
> +	};
> +	guint32 status;
> +                
> +	if (nla_parse (tb, NL80211_ATTR_MAX, genlmsg_attrdata (gnlh, 0),
> +		       genlmsg_attrlen (gnlh, 0), NULL) < 0)
> +		return NL_SKIP;
> +
> +	if (tb[NL80211_ATTR_BSS] == NULL)
> +		return NL_SKIP;
> +
> +	if (nla_parse_nested (bss, NL80211_BSS_MAX,
> +			      tb[NL80211_ATTR_BSS],
> +			      bss_policy))
> +		return NL_SKIP;
> +
> +	if (bss[NL80211_BSS_STATUS] == NULL)
> +		return NL_SKIP;
> +
> +	status = nla_get_u32 (bss[NL80211_BSS_STATUS]);
> +
> +	if (status != NL80211_BSS_STATUS_ASSOCIATED &&
> +	    status != NL80211_BSS_STATUS_IBSS_JOINED)
> +		return NL_SKIP;
> +
> +	if (bss[NL80211_BSS_BSSID] == NULL)
> +		return NL_SKIP;
> +	memcpy(info->bssid, nla_data (bss[NL80211_BSS_BSSID]), ETH_ALEN);
> +
> +	if (bss[NL80211_BSS_FREQUENCY])
> +		info->freq = nla_get_u32 (bss[NL80211_BSS_FREQUENCY]);
> +
> +	if (bss[NL80211_BSS_SIGNAL_UNSPEC])
> +		info->beacon_signal =
> +			nla_get_u8 (bss[NL80211_BSS_SIGNAL_UNSPEC]);
> +
> +	if (bss[NL80211_BSS_SIGNAL_MBM])
> +		info->beacon_signal =
> +			nl80211_mbm_to_percent (
> +				nla_get_u32 (bss[NL80211_BSS_SIGNAL_MBM]));
> +
> +	if (bss[NL80211_BSS_INFORMATION_ELEMENTS]) {
> +		guint8 *ssid;
> +		guint32 ssid_len;
> +
> +		find_ssid(nla_data (bss[NL80211_BSS_INFORMATION_ELEMENTS]),
> +			  nla_len (bss[NL80211_BSS_INFORMATION_ELEMENTS]),
> +			  &ssid, &ssid_len);
> +		if (ssid && ssid_len && ssid_len <= sizeof(info->ssid)) {
> +			memcpy (info->ssid, ssid, ssid_len);
> +			info->ssid_len = ssid_len;
> +		}
> +	}
> +
> +	info->valid = TRUE;
> +
> +	return NL_SKIP;
> +}
> +
> +static void nl80211_get_bss_info (WifiDataNl80211 *nl80211,
> +				  struct nl80211_bss_info *bss_info)
> +{
> +	struct nl_msg *msg;
> +
> +	memset(bss_info, 0, sizeof(*bss_info));
> +
> +	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_SCAN, NLM_F_DUMP);
> +
> +	nl80211_send_and_recv (nl80211, msg, nl80211_bss_dump_handler,
> +			       bss_info);
> +}
> +
> +static guint32
> +wifi_nl80211_get_freq (WifiData *data)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	struct nl80211_bss_info bss_info;
> +
> +	nl80211_get_bss_info (nl80211, &bss_info);
> +
> +	return bss_info.freq;
> +}
> +
> +static guint32
> +wifi_nl80211_find_freq (WifiData *data, const guint32 *freqs)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	int i;
> +
> +	for (i = 0; i < nl80211->num_freqs; i++) {
> +		while (*freqs) {
> +			if (nl80211->freqs[i] == *freqs)
> +				return *freqs;
> +			freqs++;
> +		}
> +	}
> +	return 0;
> +}
> +
> +static GByteArray *
> +wifi_nl80211_get_ssid (WifiData *data)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	GByteArray *array = NULL;
> +	struct nl80211_bss_info bss_info;
> +
> +	nl80211_get_bss_info (nl80211, &bss_info);
> +
> +	if (bss_info.valid) {
> +		array = g_byte_array_sized_new (bss_info.ssid_len);
> +		g_byte_array_append (array, (const guint8 *) bss_info.ssid,
> +				     bss_info.ssid_len);
> +	}
> +
> +	return array;
> +}
> +
> +static gboolean
> +wifi_nl80211_get_bssid (WifiData *data, struct ether_addr *out_bssid)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	struct nl80211_bss_info bss_info;
> +
> +	nl80211_get_bss_info (nl80211, &bss_info);
> +
> +	if (bss_info.valid)
> +		memcpy(out_bssid, bss_info.bssid, ETH_ALEN);
> +
> +	return bss_info.valid;
> +}
> +
> +struct nl80211_station_info {
> +	guint32 txrate;
> +	gboolean valid;
> +};
> +
> +static int nl80211_station_handler (struct nl_msg *msg, void *arg)
> +{
> +	struct nl80211_station_info *info = arg;
> +	struct nlattr *tb[NL80211_ATTR_MAX + 1];
> +	struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg));
> +	struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1];
> +	struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1];
> +	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
> +		[NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32 },
> +		[NL80211_STA_INFO_RX_BYTES] = { .type = NLA_U32 },
> +		[NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 },
> +		[NL80211_STA_INFO_RX_PACKETS] = { .type = NLA_U32 },
> +		[NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 },
> +		[NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
> +		[NL80211_STA_INFO_TX_BITRATE] = { .type = NLA_NESTED },
> +		[NL80211_STA_INFO_LLID] = { .type = NLA_U16 },
> +		[NL80211_STA_INFO_PLID] = { .type = NLA_U16 },
> +		[NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 },
> +	};
> +
> +	static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
> +		[NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 },
> +		[NL80211_RATE_INFO_MCS] = { .type = NLA_U8 },
> +		[NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
> +		[NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG },
> +	};
> +
> +	if (nla_parse (tb, NL80211_ATTR_MAX, genlmsg_attrdata (gnlh, 0),
> +		       genlmsg_attrlen (gnlh, 0), NULL) < 0)
> +		return NL_SKIP;
> +
> +	if (tb[NL80211_ATTR_STA_INFO] == NULL)
> +		return NL_SKIP;
> +
> +	if (nla_parse_nested (sinfo, NL80211_STA_INFO_MAX,
> +			      tb[NL80211_ATTR_STA_INFO],
> +			      stats_policy))
> +		return NL_SKIP;
> +
> +	if (sinfo[NL80211_STA_INFO_TX_BITRATE] == NULL)
> +		return NL_SKIP;
> +
> +	if (nla_parse_nested (rinfo, NL80211_RATE_INFO_MAX,
> +			      sinfo[NL80211_STA_INFO_TX_BITRATE],
> +			      rate_policy))
> +		return NL_SKIP;
> +
> +	if (rinfo[NL80211_RATE_INFO_BITRATE] == NULL)
> +		return NL_SKIP;
> +
> +	info->txrate = nla_get_u16 (rinfo[NL80211_RATE_INFO_BITRATE]) / 10;
> +	info->valid = TRUE;
> +	return NL_SKIP;
> +}
> +
> +static void nl80211_get_ap_info (WifiDataNl80211 *nl80211,
> +				 struct nl80211_station_info *sta_info)
> +{
> +	struct nl_msg *msg;
> +	struct nl80211_bss_info bss_info;
> +
> +	memset(sta_info, 0, sizeof(*sta_info));
> +
> +	nl80211_get_bss_info (nl80211, &bss_info);
> +	if (!bss_info.valid)
> +		return;
> +
> +	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_STATION, 0);
> +	if (msg) {
> +		NLA_PUT (msg, NL80211_ATTR_MAC, ETH_ALEN, bss_info.bssid);
> +
> +		nl80211_send_and_recv (nl80211, msg, nl80211_station_handler,
> +				       sta_info);
> +	}
> +
> + nla_put_failure:
> +	nlmsg_free (msg);
> +	return;
> +}
> +
> +static guint32
> +wifi_nl80211_get_rate (WifiData *data)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	struct nl80211_station_info sta_info;
> +
> +	nl80211_get_ap_info (nl80211, &sta_info);
> +
> +	return sta_info.txrate;
> +}
> +
> +static int
> +wifi_nl80211_get_qual (WifiData *data)
> +{
> +	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
> +	struct nl80211_bss_info bss_info;
> +
> +	nl80211_get_bss_info (nl80211, &bss_info);
> +
> +	return bss_info.beacon_signal;
> +}
> +
> +struct nl80211_device_info {
> +	guint32 *freqs;
> +	int num_freqs;
> +	guint32 caps;
> +	gboolean can_scan, can_scan_ssid;
> +	gboolean success;
> +};
> +
> +static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg)
> +{
> +	struct nlattr *tb[NL80211_ATTR_MAX + 1];
> +	struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg));
> +	struct nl80211_device_info *info = arg;
> +	struct nlattr *tb_band[NL80211_BAND_ATTR_MAX + 1];
> +	struct nlattr *tb_freq[NL80211_FREQUENCY_ATTR_MAX + 1];
> +	struct nlattr *nl_band;
> +	struct nlattr *nl_freq;
> +	int rem_freq;
> +	int rem_band;
> +	int freq_idx;
> +	static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = {
> +		[NL80211_FREQUENCY_ATTR_FREQ] = { .type = NLA_U32 },
> +		[NL80211_FREQUENCY_ATTR_DISABLED] = { .type = NLA_FLAG },
> +		[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG },
> +		[NL80211_FREQUENCY_ATTR_NO_IBSS] = { .type = NLA_FLAG },
> +		[NL80211_FREQUENCY_ATTR_RADAR] = { .type = NLA_FLAG },
> +		[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32 },
> +	};
> +
> +	if (nla_parse (tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
> +		       genlmsg_attrlen (gnlh, 0), NULL) < 0)
> +		return NL_SKIP;
> +
> +	if (tb[NL80211_ATTR_WIPHY_BANDS] == NULL)
> +		return NL_SKIP;
> +
> +	if (tb[NL80211_ATTR_MAX_NUM_SCAN_SSIDS]) {
> +		info->can_scan_ssid =
> +			nla_get_u8 (tb[NL80211_ATTR_MAX_NUM_SCAN_SSIDS]) > 0;
> +	} else {
> +		/* old kernel that only had mac80211, so assume it can */
> +		info->can_scan_ssid = TRUE;
> +	}
> +
> +	if (tb[NL80211_ATTR_SUPPORTED_COMMANDS]) {
> +		struct nlattr *nl_cmd;
> +		int i;
> +
> +		nla_for_each_nested (nl_cmd,
> +				     tb[NL80211_ATTR_SUPPORTED_COMMANDS], i) {
> +			guint32 cmd = nla_get_u32 (nl_cmd);
> +			if (cmd == NL80211_CMD_TRIGGER_SCAN)
> +				info->can_scan = TRUE;
> +		}
> +	}
> +
> +	info->num_freqs = 0;
> +
> +	nla_for_each_nested (nl_band, tb[NL80211_ATTR_WIPHY_BANDS], rem_band) {
> +		if (nla_parse_nested (tb_band, NL80211_BAND_ATTR_MAX, nl_band,
> +				      NULL) < 0)
> +			return NL_SKIP;
> +
> +		nla_for_each_nested(nl_freq, tb_band[NL80211_BAND_ATTR_FREQS],
> +				    rem_freq) {
> +			nla_parse_nested (tb_freq, NL80211_FREQUENCY_ATTR_MAX,
> +					  nl_freq, freq_policy);
> +
> +			if (!tb_freq[NL80211_FREQUENCY_ATTR_FREQ])
> +				continue;
> +
> +			info->num_freqs++;
> +		}
> +	}
> +
> +	info->freqs = g_malloc0 (sizeof(guint32) * info->num_freqs);
> +
> +	freq_idx = 0;
> +	nla_for_each_nested (nl_band, tb[NL80211_ATTR_WIPHY_BANDS], rem_band) {
> +		if (nla_parse_nested (tb_band, NL80211_BAND_ATTR_MAX, nl_band,
> +				      NULL) < 0)
> +			return NL_SKIP;
> +
> +		nla_for_each_nested(nl_freq, tb_band[NL80211_BAND_ATTR_FREQS],
> +				    rem_freq) {
> +			nla_parse_nested (tb_freq, NL80211_FREQUENCY_ATTR_MAX,
> +					  nl_freq, freq_policy);
> +
> +			if (!tb_freq[NL80211_FREQUENCY_ATTR_FREQ])
> +				continue;
> +
> +			info->freqs[freq_idx] =
> +				nla_get_u32 (tb_freq[NL80211_FREQUENCY_ATTR_FREQ]);
> +			freq_idx++;
> +		}
> +	}
> +
> +	if (tb[NL80211_ATTR_CIPHER_SUITES]) {
> +		int num;
> +		int i;
> +		__u32 *ciphers = nla_data (tb[NL80211_ATTR_CIPHER_SUITES]);
> +
> +		num = nla_len (tb[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
> +		for (i = 0; i < num; i++) {
> +			switch (ciphers[i]) {
> +			case 0x000fac01:
> +				info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP40;
> +				break;
> +			case 0x000fac05:
> +				info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP104;
> +				break;
> +			case 0x000fac02:
> +				info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_TKIP |
> +					      NM_WIFI_DEVICE_CAP_WPA;
> +				break;
> +			case 0x000fac04:
> +				info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_CCMP |
> +					      NM_WIFI_DEVICE_CAP_RSN;
> +				break;
> +			}
> +		}
> +	}
> +
> +	info->success = TRUE;
> +
> +	return NL_SKIP;
> +}
> +
> +WifiData *
> +wifi_nl80211_init (const char *iface, int ifindex)
> +{
> +	WifiDataNl80211 *nl80211;
> +	struct nl_msg *msg;
> +	struct nl80211_device_info device_info = {};
> +
> +	nl80211 = wifi_data_new (iface, ifindex, sizeof (*nl80211));
> +	nl80211->parent.get_mode = wifi_nl80211_get_mode;
> +	nl80211->parent.set_mode = wifi_nl80211_set_mode;
> +	nl80211->parent.get_freq = wifi_nl80211_get_freq;
> +	nl80211->parent.find_freq = wifi_nl80211_find_freq;
> +	nl80211->parent.get_ssid = wifi_nl80211_get_ssid;
> +	nl80211->parent.get_bssid = wifi_nl80211_get_bssid;
> +	nl80211->parent.get_rate = wifi_nl80211_get_rate;
> +	nl80211->parent.get_qual = wifi_nl80211_get_qual;
> +	nl80211->parent.deinit = wifi_nl80211_deinit;
> +
> +	nl80211->nl_sock = nl_socket_alloc ();
> +	if (nl80211->nl_sock == NULL)
> +		goto error;
> +
> +	if (genl_connect (nl80211->nl_sock))
> +		goto error;
> +
> +	if (genl_ctrl_alloc_cache (nl80211->nl_sock, &nl80211->nl_cache))
> +		goto error;
> +
> +	nl80211->nl_family = genl_ctrl_search_by_name (nl80211->nl_cache, "nl80211");
> +	if (nl80211->nl_family == NULL)
> +		goto error;
> +
> +	nl80211->nl_cb = nl_cb_alloc (NL_CB_DEFAULT);
> +	if (nl80211->nl_cb == NULL)
> +		goto error;
> +
> +	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_WIPHY, 0);
> +
> +	if (nl80211_send_and_recv (nl80211, msg, nl80211_wiphy_info_handler,
> +				   &device_info) < 0)
> +		goto error;
> +
> +	if (!device_info.success)
> +		goto error;
> +
> +	if (!device_info.can_scan_ssid)
> +		goto error;
> +
> +	if (device_info.num_freqs == 0 || device_info.freqs == NULL)
> +		goto error;
> +
> +	nl80211->freqs = device_info.freqs;
> +	nl80211->num_freqs = device_info.num_freqs;
> +	nl80211->parent.can_scan_ssid = device_info.can_scan_ssid;
> +	nl80211->parent.caps = device_info.caps;
> +
> +	return (WifiData *) nl80211;
> +
> +error:
> +	wifi_utils_deinit ((WifiData *) nl80211);
> +	return NULL;
> +}
> diff --git a/src/wifi-utils-nl80211.h b/src/wifi-utils-nl80211.h
> new file mode 100644
> index 0000000..371aa4e
> --- /dev/null
> +++ b/src/wifi-utils-nl80211.h
> @@ -0,0 +1,28 @@
> +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
> +/* NetworkManager -- Network link manager
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + *
> + * Copyright (C) 2011 Intel Corporation. All rights reserved.
> + */
> +
> +#ifndef WIFI_UTILS_NL80211_H
> +#define WIFI_UTILS_NL80211_H
> +
> +#include "wifi-utils.h"
> +
> +WifiData *wifi_nl80211_init (const char *iface, int ifindex);
> +
> +#endif  /* WIFI_UTILS_NL80211_H */
> diff --git a/src/wifi-utils.c b/src/wifi-utils.c
> index 748a11d..dd1234d 100644
> --- a/src/wifi-utils.c
> +++ b/src/wifi-utils.c
> @@ -26,6 +26,7 @@
>  #include "wifi-utils.h"
>  #include "wifi-utils-private.h"
>  #include "wifi-utils-wext.h"
> +#include "wifi-utils-nl80211.h"
>  
>  gpointer
>  wifi_data_new (const char *iface, int ifindex, gsize len)
> @@ -51,10 +52,14 @@ wifi_data_free (WifiData *data)
>  WifiData *
>  wifi_utils_init (const char *iface, int ifindex)
>  {
> +	WifiData *ret;
> +
>  	g_return_val_if_fail (iface != NULL, NULL);
>  	g_return_val_if_fail (ifindex > 0, NULL);
>  
> -	/* Determine WEXT vs. nl80211 here */
> +	ret = wifi_nl80211_init (iface, ifindex);
> +	if (ret != NULL)
> +		return ret;
>  
>  	return wifi_wext_init (iface, ifindex);
>  }
> 
> 
> _______________________________________________
> networkmanager-list mailing list
> networkmanager-list gnome org
> http://mail.gnome.org/mailman/listinfo/networkmanager-list




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]