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

Replace ieee802_11_print_ssid() with wpa_ssid_txt()

Browse source 
There is no need to maintain two different functions for printing out
ASCII text version of SSID.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-01-31 22:20:41 +02:00
parent 93ee3022dc
commit b37d582eaf
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ap/beacon.c
View file

@ -520,12 +520,10 @@ void handle_probe_req(struct hostapd_data *hapd,
sta->ssid_probe = &hapd->conf->ssid; sta->ssid_probe = &hapd->conf->ssid;
} else { } else {
if (!(mgmt->da[0] & 0x01)) { if (!(mgmt->da[0] & 0x01)) {
char ssid_txt[33];
ieee802_11_print_ssid(ssid_txt, elems.ssid,
elems.ssid_len);
wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR
" for foreign SSID '%s' (DA " MACSTR ")%s", " for foreign SSID '%s' (DA " MACSTR ")%s",
MAC2STR(mgmt->sa), ssid_txt, MAC2STR(mgmt->sa),
wpa_ssid_txt(elems.ssid, elems.ssid_len),
MAC2STR(mgmt->da), MAC2STR(mgmt->da),
elems.ssid_list ? " (SSID list)" : ""); elems.ssid_list ? " (SSID list)" : "");
} }

19
src/ap/ieee802_11.c
View file

@ -178,21 +178,6 @@ u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
} }
void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len)
{
int i;
if (len > HOSTAPD_MAX_SSID_LEN)
len = HOSTAPD_MAX_SSID_LEN;
for (i = 0; i < len; i++) {
if (ssid[i] >= 32 && ssid[i] < 127)
buf[i] = ssid[i];
else
buf[i] = '.';
}
buf[len] = '\0';
}
static u16 auth_shared_key(struct hostapd_data *hapd, struct sta_info *sta, static u16 auth_shared_key(struct hostapd_data *hapd, struct sta_info *sta,
u16 auth_transaction, const u8 *challenge, u16 auth_transaction, const u8 *challenge,
int iswep) int iswep)
@ -781,12 +766,10 @@ static u16 check_ssid(struct hostapd_data *hapd, struct sta_info *sta,
if (ssid_ie_len != hapd->conf->ssid.ssid_len || if (ssid_ie_len != hapd->conf->ssid.ssid_len ||
os_memcmp(ssid_ie, hapd->conf->ssid.ssid, ssid_ie_len) != 0) { os_memcmp(ssid_ie, hapd->conf->ssid.ssid, ssid_ie_len) != 0) {
char ssid_txt[33];
ieee802_11_print_ssid(ssid_txt, ssid_ie, ssid_ie_len);
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211, hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO, HOSTAPD_LEVEL_INFO,
"Station tried to associate with unknown SSID " "Station tried to associate with unknown SSID "
"'%s'", ssid_txt); "'%s'", wpa_ssid_txt(ssid_ie, ssid_ie_len));
return WLAN_STATUS_UNSPECIFIED_FAILURE; return WLAN_STATUS_UNSPECIFIED_FAILURE;
} }

1
src/ap/ieee802_11.h
View file

@ -19,7 +19,6 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
struct hostapd_frame_info *fi); struct hostapd_frame_info *fi);
void ieee802_11_mgmt_cb(struct hostapd_data *hapd, const u8 *buf, size_t len, void ieee802_11_mgmt_cb(struct hostapd_data *hapd, const u8 *buf, size_t len,
u16 stype, int ok); u16 stype, int ok);
void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len);
#ifdef NEED_AP_MLME #ifdef NEED_AP_MLME
int ieee802_11_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen); int ieee802_11_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen);
int ieee802_11_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta, int ieee802_11_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,