DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

RNR: Short SSID assignment

Browse source 
Calculate and store short SSID in hostapd_data context during config
load time and in neighbor report.

Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Aloka Dixit <alokad@codeaurora.org>
This commit is contained in:
John Crispin 2021-07-27 16:42:16 -07:00 • committed by Jouni Malinen
parent 8d881d9427
commit 9d0948ecc9
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hostapd/config_file.c
View file

@ -13,6 +13,7 @@
#include "utils/common.h" #include "utils/common.h"
#include "utils/uuid.h" #include "utils/uuid.h"
#include "utils/crc32.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/sae.h" #include "common/sae.h"
#include "crypto/sha256.h" #include "crypto/sha256.h"
@ -2396,16 +2397,19 @@ static int hostapd_config_fill(struct hostapd_config *conf,
wpa_printf(MSG_INFO, "Line %d: DEPRECATED: 'dump_file' configuration variable is not used anymore", wpa_printf(MSG_INFO, "Line %d: DEPRECATED: 'dump_file' configuration variable is not used anymore",
line); line);
} else if (os_strcmp(buf, "ssid") == 0) { } else if (os_strcmp(buf, "ssid") == 0) {
bss->ssid.ssid_len = os_strlen(pos); struct hostapd_ssid *ssid = &bss->ssid;
if (bss->ssid.ssid_len > SSID_MAX_LEN ||
bss->ssid.ssid_len < 1) { ssid->ssid_len = os_strlen(pos);
if (ssid->ssid_len > SSID_MAX_LEN || ssid->ssid_len < 1) {
wpa_printf(MSG_ERROR, "Line %d: invalid SSID '%s'", wpa_printf(MSG_ERROR, "Line %d: invalid SSID '%s'",
line, pos); line, pos);
return 1; return 1;
} }
os_memcpy(bss->ssid.ssid, pos, bss->ssid.ssid_len); os_memcpy(ssid->ssid, pos, ssid->ssid_len);
bss->ssid.ssid_set = 1; ssid->ssid_set = 1;
ssid->short_ssid = crc32(ssid->ssid, ssid->ssid_len);
} else if (os_strcmp(buf, "ssid2") == 0) { } else if (os_strcmp(buf, "ssid2") == 0) {
struct hostapd_ssid *ssid = &bss->ssid;
size_t slen; size_t slen;
char *str = wpa_config_parse_string(pos, &slen); char *str = wpa_config_parse_string(pos, &slen);
if (str == NULL || slen < 1 || slen > SSID_MAX_LEN) { if (str == NULL || slen < 1 || slen > SSID_MAX_LEN) {
@ -2414,9 +2418,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
os_free(str); os_free(str);
return 1; return 1;
} }
os_memcpy(bss->ssid.ssid, str, slen); os_memcpy(ssid->ssid, str, slen);
bss->ssid.ssid_len = slen; ssid->ssid_len = slen;
bss->ssid.ssid_set = 1; ssid->ssid_set = 1;
ssid->short_ssid = crc32(ssid->ssid, ssid->ssid_len);
os_free(str); os_free(str);
} else if (os_strcmp(buf, "utf8_ssid") == 0) { } else if (os_strcmp(buf, "utf8_ssid") == 0) {
bss->ssid.utf8_ssid = atoi(pos) > 0; bss->ssid.utf8_ssid = atoi(pos) > 0;

1
src/ap/hostapd.h
View file

@ -138,6 +138,7 @@ struct hostapd_neighbor_entry {
/* LCI update time */ /* LCI update time */
struct os_time lci_date; struct os_time lci_date;
int stationary; int stationary;
u32 short_ssid;
}; };
struct hostapd_sae_commit_queue { struct hostapd_sae_commit_queue {

2
src/ap/neighbor_db.c
View file

@ -10,6 +10,7 @@
#include "utils/includes.h" #include "utils/includes.h"
#include "utils/common.h" #include "utils/common.h"
#include "utils/crc32.h"
#include "hostapd.h" #include "hostapd.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "neighbor_db.h" #include "neighbor_db.h"
@ -134,6 +135,7 @@ int hostapd_neighbor_set(struct hostapd_data *hapd, const u8 *bssid,
os_memcpy(entry->bssid, bssid, ETH_ALEN); os_memcpy(entry->bssid, bssid, ETH_ALEN);
os_memcpy(&entry->ssid, ssid, sizeof(entry->ssid)); os_memcpy(&entry->ssid, ssid, sizeof(entry->ssid));
entry->short_ssid = crc32(ssid->ssid, ssid->ssid_len);
entry->nr = wpabuf_dup(nr); entry->nr = wpabuf_dup(nr);
if (!entry->nr) if (!entry->nr)