Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00
Code Releases Activity

wiphy: Express SSID as an array of chars

Browse Source 
Handle SSIDs as if they would contain up to 32 octets of opaque data.
This commit is contained in:
Jukka Rissanen 2015-01-15 13:32:28 +02:00 committed by Denis Kenzior
parent b460b5e0e3
commit 7ec9c468f5
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -54,6 +54,7 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h linux/kdbus.h \
src/mpdu.h src/mpdu.c \ src/mpdu.h src/mpdu.c \
src/eapol.h src/eapol.c \ src/eapol.h src/eapol.c \
src/scan.h src/scan.c \ src/scan.h src/scan.c \
src/util.h src/util.c \
iwd.h iwd.h
src_iwd_LDADD = ell/libell-internal.la src_iwd_LDADD = ell/libell-internal.la

32
src/wiphy.c
View File

@ -38,6 +38,7 @@
#include "src/wiphy.h" #include "src/wiphy.h"
#include "src/dbus.h" #include "src/dbus.h"
#include "src/scan.h" #include "src/scan.h"
#include "src/util.h"
static struct l_genl *genl = NULL; static struct l_genl *genl = NULL;
static struct l_genl_family *nl80211 = NULL; static struct l_genl_family *nl80211 = NULL;
@ -46,7 +47,8 @@ static int scheduled_scan_interval = 60; /* in secs */
struct bss { struct bss {
uint8_t addr[ETH_ALEN]; uint8_t addr[ETH_ALEN];
uint32_t frequency; uint32_t frequency;
char *ssid; uint8_t *ssid;
size_t ssid_len;
}; };
struct network { struct network {
@ -116,7 +118,8 @@ static bool __iwd_network_append_properties(const struct network *network,
{ {
l_dbus_message_builder_enter_array(builder, "{sv}"); l_dbus_message_builder_enter_array(builder, "{sv}");
dbus_dict_append_string(builder, "SSID", network->bss->ssid); dbus_dict_append_bytearray(builder, "SSID", network->bss->ssid,
network->bss->ssid_len);
l_dbus_message_builder_leave_array(builder); l_dbus_message_builder_leave_array(builder);
@ -157,7 +160,7 @@ static struct l_dbus_message *network_connect(struct l_dbus *dbus,
msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index); msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index);
msg_append_attr(msg, NL80211_ATTR_WIPHY_FREQ, 4, &bss->frequency); msg_append_attr(msg, NL80211_ATTR_WIPHY_FREQ, 4, &bss->frequency);
msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN, bss->addr); msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN, bss->addr);
msg_append_attr(msg, NL80211_ATTR_SSID, strlen(bss->ssid), bss->ssid); msg_append_attr(msg, NL80211_ATTR_SSID, bss->ssid_len, bss->ssid);
msg_append_attr(msg, NL80211_ATTR_AUTH_TYPE, 4, &auth_type); msg_append_attr(msg, NL80211_ATTR_AUTH_TYPE, 4, &auth_type);
l_genl_family_send(nl80211, msg, NULL, NULL, NULL); l_genl_family_send(nl80211, msg, NULL, NULL, NULL);
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
@ -485,7 +488,8 @@ static void bss_free(void *data)
l_debug("Freeing BSS %02X:%02X:%02X:%02X:%02X:%02X [%s]", l_debug("Freeing BSS %02X:%02X:%02X:%02X:%02X:%02X [%s]",
bss->addr[0], bss->addr[1], bss->addr[2], bss->addr[0], bss->addr[1], bss->addr[2],
bss->addr[3], bss->addr[4], bss->addr[5], bss->ssid); bss->addr[3], bss->addr[4], bss->addr[5],
util_ssid_to_utf8(bss->ssid_len, bss->ssid));
l_free(bss->ssid); l_free(bss->ssid);
l_free(bss); l_free(bss);
@ -552,7 +556,7 @@ static void mlme_associate(struct netdev *netdev, struct bss *bss)
msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index); msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index);
msg_append_attr(msg, NL80211_ATTR_WIPHY_FREQ, 4, &bss->frequency); msg_append_attr(msg, NL80211_ATTR_WIPHY_FREQ, 4, &bss->frequency);
msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN, bss->addr); msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN, bss->addr);
msg_append_attr(msg, NL80211_ATTR_SSID, strlen(bss->ssid), bss->ssid); msg_append_attr(msg, NL80211_ATTR_SSID, bss->ssid_len, bss->ssid);
l_genl_family_send(nl80211, msg, NULL, NULL, NULL); l_genl_family_send(nl80211, msg, NULL, NULL, NULL);
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
} }
@ -567,9 +571,15 @@ static bool parse_ie(struct bss *bss, const void *data, uint16_t len)
uint8_t tag = ie_tlv_iter_get_tag(&iter); uint8_t tag = ie_tlv_iter_get_tag(&iter);
switch (tag) { switch (tag) {
case 0: case IE_TYPE_SSID:
bss->ssid = l_strndup((const char *) iter.data, if (iter.len > 32) {
iter.len); l_warn("Got SSID > 32");
return false;
}
bss->ssid_len = iter.len;
bss->ssid = l_malloc(bss->ssid_len);
memcpy(bss->ssid, iter.data, iter.len);
break; break;
default: default:
break; break;
@ -623,7 +633,8 @@ static void parse_bss(struct netdev *netdev, struct l_genl_attr *attr)
l_debug("Found new BSS '%s' with SSID: %s, freq: %u", l_debug("Found new BSS '%s' with SSID: %s, freq: %u",
bss_address_to_string(bss), bss_address_to_string(bss),
bss->ssid, bss->frequency); util_ssid_to_utf8(bss->ssid_len, bss->ssid),
bss->frequency);
network = l_new(struct network, 1); network = l_new(struct network, 1);
network->bss = bss; network->bss = bss;
@ -721,7 +732,8 @@ static void get_scan_done(void *user)
struct network *network; struct network *network;
l_debug("Lost BSS '%s' with SSID: %s", l_debug("Lost BSS '%s' with SSID: %s",
bss_address_to_string(bss), bss->ssid); bss_address_to_string(bss),
util_ssid_to_utf8(bss->ssid_len, bss->ssid));
network = l_hashmap_remove(netdev->networks, network = l_hashmap_remove(netdev->networks,
bss_address_to_string(bss)); bss_address_to_string(bss));
network_free(network); network_free(network);