2009-09-08 11:56:07 +02:00
|
|
|
/*
|
|
|
|
* Control interface for shared AP commands
|
2014-12-14 19:13:22 +01:00
|
|
|
* Copyright (c) 2004-2014, Jouni Malinen <j@w1.fi>
|
2009-09-08 11:56:07 +02:00
|
|
|
*
|
2012-02-11 15:46:35 +01:00
|
|
|
* This software may be distributed under the terms of the BSD license.
|
|
|
|
* See README for more details.
|
2009-09-08 11:56:07 +02:00
|
|
|
*/
|
|
|
|
|
2009-12-25 23:05:40 +01:00
|
|
|
#include "utils/includes.h"
|
2009-09-08 11:56:07 +02:00
|
|
|
|
2009-12-25 23:05:40 +01:00
|
|
|
#include "utils/common.h"
|
2012-02-25 16:22:48 +01:00
|
|
|
#include "common/ieee802_11_defs.h"
|
2014-12-14 19:13:22 +01:00
|
|
|
#include "common/sae.h"
|
2014-01-02 16:49:48 +01:00
|
|
|
#include "eapol_auth/eapol_auth_sm.h"
|
2015-01-21 14:30:48 +01:00
|
|
|
#include "fst/fst_ctrl_iface.h"
|
2009-12-25 23:05:40 +01:00
|
|
|
#include "hostapd.h"
|
|
|
|
#include "ieee802_1x.h"
|
|
|
|
#include "wpa_auth.h"
|
|
|
|
#include "ieee802_11.h"
|
|
|
|
#include "sta_info.h"
|
|
|
|
#include "wps_hostapd.h"
|
2010-07-18 23:30:25 +02:00
|
|
|
#include "p2p_hostapd.h"
|
2009-09-08 11:56:07 +02:00
|
|
|
#include "ctrl_iface_ap.h"
|
2012-02-25 16:22:48 +01:00
|
|
|
#include "ap_drv_ops.h"
|
2016-02-22 12:03:28 +01:00
|
|
|
#include "mbo_ap.h"
|
Passive Client Taxonomy
Implement the signature mechanism described in the paper
"Passive Taxonomy of Wifi Clients using MLME Frame Contents"
published by Denton Gentry and Avery Pennarun.
http://research.google.com/pubs/pub45429.html
https://arxiv.org/abs/1608.01725
This involves:
1. Add a CONFIG_TAXONOMY compile option. Enabling taxonomy incurs
a memory overhead of up to several kilobytes per associated
station.
2. If enabled, store the Probe Request and (Re)Associate Request frame in
struct sta_info.
3. Implement code to extract the ID of each Information Element,
plus selected fields and bitmasks from certain IEs, into a
descriptive text string. This is done in a new source file,
src/ap/taxonomy.c.
4. Implement a "signature qq:rr:ss:tt:uu:vv" command
in hostapd_cli to retrieve the signature.
Signatures take the form of a text string. For example, a signature
for the Nexus 5X is:
wifi4|probe:0,1,127,45,191,htcap:01ef,htagg:03,htmcs:0000ffff,vhtcap:338061b2,
vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:00000a0201000040|assoc:0,1,48,45,
221(0050f2,2),191,127,htcap:01ef,htagg:03,htmcs:0000ffff,vhtcap:339071b2,
vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:0000000000000040
Signed-off-by: dgentry@google.com (Denton Gentry)
Signed-off-by: denny@geekhold.com (Denton Gentry)
Signed-off-by: rofrankel@google.com (Richard Frankel)
Signed-off-by: richard@frankel.tv (Richard Frankel)
2016-08-15 06:42:48 +02:00
|
|
|
#include "taxonomy.h"
|
2009-09-08 11:56:07 +02:00
|
|
|
|
|
|
|
|
2014-01-02 15:31:46 +01:00
|
|
|
static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
|
|
|
|
struct sta_info *sta,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct hostap_sta_driver_data data;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (hostapd_drv_read_sta_data(hapd, &data, sta->addr) < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = os_snprintf(buf, buflen, "rx_packets=%lu\ntx_packets=%lu\n"
|
2016-04-08 17:38:50 +02:00
|
|
|
"rx_bytes=%llu\ntx_bytes=%llu\ninactive_msec=%lu\n",
|
2014-01-02 15:31:46 +01:00
|
|
|
data.rx_packets, data.tx_packets,
|
2016-04-08 17:38:50 +02:00
|
|
|
data.rx_bytes, data.tx_bytes, data.inactive_msec);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2014-01-02 15:31:46 +01:00
|
|
|
return 0;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-26 12:52:19 +02:00
|
|
|
static int hostapd_get_sta_conn_time(struct sta_info *sta,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2013-11-25 21:56:04 +01:00
|
|
|
struct os_reltime age;
|
2014-01-02 15:31:46 +01:00
|
|
|
int ret;
|
2012-09-26 12:52:19 +02:00
|
|
|
|
|
|
|
if (!sta->connected_time.sec)
|
|
|
|
return 0;
|
|
|
|
|
2013-11-25 21:56:04 +01:00
|
|
|
os_reltime_age(&sta->connected_time, &age);
|
2012-09-26 12:52:19 +02:00
|
|
|
|
2014-01-02 15:31:46 +01:00
|
|
|
ret = os_snprintf(buf, buflen, "connected_time=%u\n",
|
2012-09-26 12:52:19 +02:00
|
|
|
(unsigned int) age.sec);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2014-01-02 15:31:46 +01:00
|
|
|
return 0;
|
|
|
|
return ret;
|
|
|
|
}
|
2012-09-26 12:52:19 +02:00
|
|
|
|
2014-01-02 15:31:46 +01:00
|
|
|
|
|
|
|
static const char * timeout_next_str(int val)
|
|
|
|
{
|
|
|
|
switch (val) {
|
|
|
|
case STA_NULLFUNC:
|
|
|
|
return "NULLFUNC POLL";
|
|
|
|
case STA_DISASSOC:
|
|
|
|
return "DISASSOC";
|
|
|
|
case STA_DEAUTH:
|
|
|
|
return "DEAUTH";
|
|
|
|
case STA_REMOVE:
|
|
|
|
return "REMOVE";
|
|
|
|
case STA_DISASSOC_FROM_CLI:
|
|
|
|
return "DISASSOC_FROM_CLI";
|
|
|
|
}
|
|
|
|
|
|
|
|
return "?";
|
2012-09-26 12:52:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-09-08 11:56:07 +02:00
|
|
|
static int hostapd_ctrl_iface_sta_mib(struct hostapd_data *hapd,
|
|
|
|
struct sta_info *sta,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2014-01-02 15:31:46 +01:00
|
|
|
int len, res, ret, i;
|
2009-09-08 11:56:07 +02:00
|
|
|
|
2014-01-22 15:05:46 +01:00
|
|
|
if (!sta)
|
|
|
|
return 0;
|
|
|
|
|
2009-09-08 11:56:07 +02:00
|
|
|
len = 0;
|
2013-12-27 18:24:24 +01:00
|
|
|
ret = os_snprintf(buf + len, buflen - len, MACSTR "\nflags=",
|
2009-09-08 11:56:07 +02:00
|
|
|
MAC2STR(sta->addr));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2009-09-08 11:56:07 +02:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
|
2013-12-27 18:24:24 +01:00
|
|
|
ret = ap_sta_flags_txt(sta->flags, buf + len, buflen - len);
|
|
|
|
if (ret < 0)
|
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
|
2014-01-02 15:31:46 +01:00
|
|
|
ret = os_snprintf(buf + len, buflen - len, "\naid=%d\ncapability=0x%x\n"
|
|
|
|
"listen_interval=%d\nsupported_rates=",
|
|
|
|
sta->aid, sta->capability, sta->listen_interval);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2014-01-02 15:31:46 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
|
|
|
|
for (i = 0; i < sta->supported_rates_len; i++) {
|
|
|
|
ret = os_snprintf(buf + len, buflen - len, "%02x%s",
|
|
|
|
sta->supported_rates[i],
|
|
|
|
i + 1 < sta->supported_rates_len ? " " : "");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2014-01-02 15:31:46 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(buf + len, buflen - len, "\ntimeout_next=%s\n",
|
|
|
|
timeout_next_str(sta->timeout_next));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2013-12-27 18:24:24 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
|
2009-09-08 11:56:07 +02:00
|
|
|
res = ieee802_11_get_mib_sta(hapd, sta, buf + len, buflen - len);
|
|
|
|
if (res >= 0)
|
|
|
|
len += res;
|
|
|
|
res = wpa_get_mib_sta(sta->wpa_sm, buf + len, buflen - len);
|
|
|
|
if (res >= 0)
|
|
|
|
len += res;
|
|
|
|
res = ieee802_1x_get_mib_sta(hapd, sta, buf + len, buflen - len);
|
|
|
|
if (res >= 0)
|
|
|
|
len += res;
|
|
|
|
res = hostapd_wps_get_mib_sta(hapd, sta->addr, buf + len,
|
|
|
|
buflen - len);
|
|
|
|
if (res >= 0)
|
2010-07-18 23:30:25 +02:00
|
|
|
len += res;
|
|
|
|
res = hostapd_p2p_get_mib_sta(hapd, sta, buf + len, buflen - len);
|
|
|
|
if (res >= 0)
|
2009-09-08 11:56:07 +02:00
|
|
|
len += res;
|
|
|
|
|
2014-01-02 15:31:46 +01:00
|
|
|
len += hostapd_get_sta_tx_rx(hapd, sta, buf + len, buflen - len);
|
|
|
|
len += hostapd_get_sta_conn_time(sta, buf + len, buflen - len);
|
2012-09-26 12:52:19 +02:00
|
|
|
|
2014-12-14 19:13:22 +01:00
|
|
|
#ifdef CONFIG_SAE
|
|
|
|
if (sta->sae && sta->sae->state == SAE_ACCEPTED) {
|
|
|
|
res = os_snprintf(buf + len, buflen - len, "sae_group=%d\n",
|
|
|
|
sta->sae->group);
|
|
|
|
if (!os_snprintf_error(buflen - len, res))
|
|
|
|
len += res;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SAE */
|
|
|
|
|
2015-04-26 14:58:10 +02:00
|
|
|
if (sta->vlan_id > 0) {
|
|
|
|
res = os_snprintf(buf + len, buflen - len, "vlan_id=%d\n",
|
|
|
|
sta->vlan_id);
|
|
|
|
if (!os_snprintf_error(buflen - len, res))
|
|
|
|
len += res;
|
|
|
|
}
|
|
|
|
|
2016-02-22 12:03:28 +01:00
|
|
|
res = mbo_ap_get_info(sta, buf + len, buflen - len);
|
|
|
|
if (res >= 0)
|
|
|
|
len += res;
|
|
|
|
|
2016-02-24 11:20:31 +01:00
|
|
|
if (sta->supp_op_classes &&
|
|
|
|
buflen - len > (unsigned) (17 + 2 * sta->supp_op_classes[0])) {
|
|
|
|
len += os_snprintf(buf + len, buflen - len, "supp_op_classes=");
|
|
|
|
len += wpa_snprintf_hex(buf + len, buflen - len,
|
|
|
|
sta->supp_op_classes + 1,
|
|
|
|
sta->supp_op_classes[0]);
|
|
|
|
len += os_snprintf(buf + len, buflen - len, "\n");
|
|
|
|
}
|
|
|
|
|
2009-09-08 11:56:07 +02:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_sta_first(struct hostapd_data *hapd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
return hostapd_ctrl_iface_sta_mib(hapd, hapd->sta_list, buf, buflen);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_sta(struct hostapd_data *hapd, const char *txtaddr,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
int ret;
|
2014-01-02 16:49:48 +01:00
|
|
|
const char *pos;
|
|
|
|
struct sta_info *sta;
|
2009-09-08 11:56:07 +02:00
|
|
|
|
|
|
|
if (hwaddr_aton(txtaddr, addr)) {
|
|
|
|
ret = os_snprintf(buf, buflen, "FAIL\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2009-09-08 11:56:07 +02:00
|
|
|
return 0;
|
|
|
|
return ret;
|
|
|
|
}
|
2014-01-02 16:49:48 +01:00
|
|
|
|
|
|
|
sta = ap_get_sta(hapd, addr);
|
|
|
|
if (sta == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(txtaddr, ' ');
|
|
|
|
if (pos) {
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
#ifdef HOSTAPD_DUMP_STATE
|
|
|
|
if (os_strcmp(pos, "eapol") == 0) {
|
|
|
|
if (sta->eapol_sm == NULL)
|
|
|
|
return -1;
|
|
|
|
return eapol_auth_dump_state(sta->eapol_sm, buf,
|
|
|
|
buflen);
|
|
|
|
}
|
|
|
|
#endif /* HOSTAPD_DUMP_STATE */
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-01-21 14:30:48 +01:00
|
|
|
ret = hostapd_ctrl_iface_sta_mib(hapd, sta, buf, buflen);
|
|
|
|
ret += fst_ctrl_iface_mb_info(addr, buf + ret, buflen - ret);
|
|
|
|
|
|
|
|
return ret;
|
2009-09-08 11:56:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_sta_next(struct hostapd_data *hapd, const char *txtaddr,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct sta_info *sta;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (hwaddr_aton(txtaddr, addr) ||
|
|
|
|
(sta = ap_get_sta(hapd, addr)) == NULL) {
|
|
|
|
ret = os_snprintf(buf, buflen, "FAIL\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2009-09-08 11:56:07 +02:00
|
|
|
return 0;
|
|
|
|
return ret;
|
2014-01-22 15:05:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!sta->next)
|
|
|
|
return 0;
|
|
|
|
|
2009-09-08 11:56:07 +02:00
|
|
|
return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
|
|
|
|
}
|
2012-02-25 16:22:48 +01:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P_MANAGER
|
|
|
|
static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
|
|
|
|
u8 minor_reason_code, const u8 *addr)
|
|
|
|
{
|
|
|
|
struct ieee80211_mgmt *mgmt;
|
|
|
|
int ret;
|
|
|
|
u8 *pos;
|
|
|
|
|
2016-08-19 11:24:15 +02:00
|
|
|
if (!hapd->drv_priv || !hapd->driver->send_frame)
|
2012-02-25 16:22:48 +01:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
mgmt = os_zalloc(sizeof(*mgmt) + 100);
|
|
|
|
if (mgmt == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2014-06-03 10:24:53 +02:00
|
|
|
mgmt->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT, stype);
|
2012-02-25 16:22:48 +01:00
|
|
|
wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "P2P: Disconnect STA " MACSTR
|
2014-06-03 10:24:53 +02:00
|
|
|
" with minor reason code %u (stype=%u (%s))",
|
|
|
|
MAC2STR(addr), minor_reason_code, stype,
|
2016-06-24 00:58:33 +02:00
|
|
|
fc2str(le_to_host16(mgmt->frame_control)));
|
2012-02-25 16:22:48 +01:00
|
|
|
|
|
|
|
os_memcpy(mgmt->da, addr, ETH_ALEN);
|
|
|
|
os_memcpy(mgmt->sa, hapd->own_addr, ETH_ALEN);
|
|
|
|
os_memcpy(mgmt->bssid, hapd->own_addr, ETH_ALEN);
|
|
|
|
if (stype == WLAN_FC_STYPE_DEAUTH) {
|
|
|
|
mgmt->u.deauth.reason_code =
|
|
|
|
host_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
|
|
|
|
pos = (u8 *) (&mgmt->u.deauth.reason_code + 1);
|
|
|
|
} else {
|
|
|
|
mgmt->u.disassoc.reason_code =
|
|
|
|
host_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
|
|
|
|
pos = (u8 *) (&mgmt->u.disassoc.reason_code + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
*pos++ = WLAN_EID_VENDOR_SPECIFIC;
|
|
|
|
*pos++ = 4 + 3 + 1;
|
2014-02-26 07:18:07 +01:00
|
|
|
WPA_PUT_BE32(pos, P2P_IE_VENDOR_TYPE);
|
|
|
|
pos += 4;
|
2012-02-25 16:22:48 +01:00
|
|
|
|
|
|
|
*pos++ = P2P_ATTR_MINOR_REASON_CODE;
|
|
|
|
WPA_PUT_LE16(pos, 1);
|
|
|
|
pos += 2;
|
|
|
|
*pos++ = minor_reason_code;
|
|
|
|
|
|
|
|
ret = hapd->driver->send_frame(hapd->drv_priv, (u8 *) mgmt,
|
|
|
|
pos - (u8 *) mgmt, 1);
|
|
|
|
os_free(mgmt);
|
|
|
|
|
|
|
|
return ret < 0 ? -1 : 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P_MANAGER */
|
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_deauthenticate(struct hostapd_data *hapd,
|
|
|
|
const char *txtaddr)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct sta_info *sta;
|
|
|
|
const char *pos;
|
2013-01-04 11:19:02 +01:00
|
|
|
u16 reason = WLAN_REASON_PREV_AUTH_NOT_VALID;
|
2012-02-25 16:22:48 +01:00
|
|
|
|
|
|
|
wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "CTRL_IFACE DEAUTHENTICATE %s",
|
|
|
|
txtaddr);
|
|
|
|
|
|
|
|
if (hwaddr_aton(txtaddr, addr))
|
|
|
|
return -1;
|
|
|
|
|
2014-03-13 00:26:09 +01:00
|
|
|
pos = os_strstr(txtaddr, " reason=");
|
|
|
|
if (pos)
|
|
|
|
reason = atoi(pos + 8);
|
|
|
|
|
2012-02-25 16:22:48 +01:00
|
|
|
pos = os_strstr(txtaddr, " test=");
|
|
|
|
if (pos) {
|
|
|
|
struct ieee80211_mgmt mgmt;
|
|
|
|
int encrypt;
|
2016-08-19 11:24:15 +02:00
|
|
|
if (!hapd->drv_priv || !hapd->driver->send_frame)
|
2012-02-25 16:22:48 +01:00
|
|
|
return -1;
|
|
|
|
pos += 6;
|
|
|
|
encrypt = atoi(pos);
|
|
|
|
os_memset(&mgmt, 0, sizeof(mgmt));
|
|
|
|
mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
|
|
|
|
WLAN_FC_STYPE_DEAUTH);
|
|
|
|
os_memcpy(mgmt.da, addr, ETH_ALEN);
|
|
|
|
os_memcpy(mgmt.sa, hapd->own_addr, ETH_ALEN);
|
|
|
|
os_memcpy(mgmt.bssid, hapd->own_addr, ETH_ALEN);
|
2014-03-13 00:26:09 +01:00
|
|
|
mgmt.u.deauth.reason_code = host_to_le16(reason);
|
2012-02-25 16:22:48 +01:00
|
|
|
if (hapd->driver->send_frame(hapd->drv_priv, (u8 *) &mgmt,
|
|
|
|
IEEE80211_HDRLEN +
|
|
|
|
sizeof(mgmt.u.deauth),
|
|
|
|
encrypt) < 0)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P_MANAGER
|
|
|
|
pos = os_strstr(txtaddr, " p2p=");
|
|
|
|
if (pos) {
|
|
|
|
return p2p_manager_disconnect(hapd, WLAN_FC_STYPE_DEAUTH,
|
|
|
|
atoi(pos + 5), addr);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P_MANAGER */
|
|
|
|
|
2016-04-08 18:18:33 +02:00
|
|
|
if (os_strstr(txtaddr, " tx=0"))
|
|
|
|
hostapd_drv_sta_remove(hapd, addr);
|
|
|
|
else
|
|
|
|
hostapd_drv_sta_deauth(hapd, addr, reason);
|
2012-02-25 16:22:48 +01:00
|
|
|
sta = ap_get_sta(hapd, addr);
|
|
|
|
if (sta)
|
2013-01-04 11:19:02 +01:00
|
|
|
ap_sta_deauthenticate(hapd, sta, reason);
|
2012-02-25 16:22:48 +01:00
|
|
|
else if (addr[0] == 0xff)
|
|
|
|
hostapd_free_stas(hapd);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_disassociate(struct hostapd_data *hapd,
|
|
|
|
const char *txtaddr)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct sta_info *sta;
|
|
|
|
const char *pos;
|
2013-01-04 11:19:02 +01:00
|
|
|
u16 reason = WLAN_REASON_PREV_AUTH_NOT_VALID;
|
2012-02-25 16:22:48 +01:00
|
|
|
|
|
|
|
wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "CTRL_IFACE DISASSOCIATE %s",
|
|
|
|
txtaddr);
|
|
|
|
|
|
|
|
if (hwaddr_aton(txtaddr, addr))
|
|
|
|
return -1;
|
|
|
|
|
2014-03-13 00:26:09 +01:00
|
|
|
pos = os_strstr(txtaddr, " reason=");
|
|
|
|
if (pos)
|
|
|
|
reason = atoi(pos + 8);
|
|
|
|
|
2012-02-25 16:22:48 +01:00
|
|
|
pos = os_strstr(txtaddr, " test=");
|
|
|
|
if (pos) {
|
|
|
|
struct ieee80211_mgmt mgmt;
|
|
|
|
int encrypt;
|
2016-08-19 11:24:15 +02:00
|
|
|
if (!hapd->drv_priv || !hapd->driver->send_frame)
|
2012-02-25 16:22:48 +01:00
|
|
|
return -1;
|
|
|
|
pos += 6;
|
|
|
|
encrypt = atoi(pos);
|
|
|
|
os_memset(&mgmt, 0, sizeof(mgmt));
|
|
|
|
mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
|
|
|
|
WLAN_FC_STYPE_DISASSOC);
|
|
|
|
os_memcpy(mgmt.da, addr, ETH_ALEN);
|
|
|
|
os_memcpy(mgmt.sa, hapd->own_addr, ETH_ALEN);
|
|
|
|
os_memcpy(mgmt.bssid, hapd->own_addr, ETH_ALEN);
|
2014-03-13 00:26:09 +01:00
|
|
|
mgmt.u.disassoc.reason_code = host_to_le16(reason);
|
2012-02-25 16:22:48 +01:00
|
|
|
if (hapd->driver->send_frame(hapd->drv_priv, (u8 *) &mgmt,
|
|
|
|
IEEE80211_HDRLEN +
|
|
|
|
sizeof(mgmt.u.deauth),
|
|
|
|
encrypt) < 0)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P_MANAGER
|
|
|
|
pos = os_strstr(txtaddr, " p2p=");
|
|
|
|
if (pos) {
|
|
|
|
return p2p_manager_disconnect(hapd, WLAN_FC_STYPE_DISASSOC,
|
|
|
|
atoi(pos + 5), addr);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P_MANAGER */
|
|
|
|
|
2016-04-08 18:18:33 +02:00
|
|
|
if (os_strstr(txtaddr, " tx=0"))
|
|
|
|
hostapd_drv_sta_remove(hapd, addr);
|
|
|
|
else
|
|
|
|
hostapd_drv_sta_disassoc(hapd, addr, reason);
|
2012-02-25 16:22:48 +01:00
|
|
|
sta = ap_get_sta(hapd, addr);
|
|
|
|
if (sta)
|
2013-01-04 11:19:02 +01:00
|
|
|
ap_sta_disassociate(hapd, sta, reason);
|
2012-02-25 16:22:48 +01:00
|
|
|
else if (addr[0] == 0xff)
|
|
|
|
hostapd_free_stas(hapd);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2013-11-03 17:13:14 +01:00
|
|
|
|
|
|
|
|
Passive Client Taxonomy
Implement the signature mechanism described in the paper
"Passive Taxonomy of Wifi Clients using MLME Frame Contents"
published by Denton Gentry and Avery Pennarun.
http://research.google.com/pubs/pub45429.html
https://arxiv.org/abs/1608.01725
This involves:
1. Add a CONFIG_TAXONOMY compile option. Enabling taxonomy incurs
a memory overhead of up to several kilobytes per associated
station.
2. If enabled, store the Probe Request and (Re)Associate Request frame in
struct sta_info.
3. Implement code to extract the ID of each Information Element,
plus selected fields and bitmasks from certain IEs, into a
descriptive text string. This is done in a new source file,
src/ap/taxonomy.c.
4. Implement a "signature qq:rr:ss:tt:uu:vv" command
in hostapd_cli to retrieve the signature.
Signatures take the form of a text string. For example, a signature
for the Nexus 5X is:
wifi4|probe:0,1,127,45,191,htcap:01ef,htagg:03,htmcs:0000ffff,vhtcap:338061b2,
vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:00000a0201000040|assoc:0,1,48,45,
221(0050f2,2),191,127,htcap:01ef,htagg:03,htmcs:0000ffff,vhtcap:339071b2,
vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:0000000000000040
Signed-off-by: dgentry@google.com (Denton Gentry)
Signed-off-by: denny@geekhold.com (Denton Gentry)
Signed-off-by: rofrankel@google.com (Richard Frankel)
Signed-off-by: richard@frankel.tv (Richard Frankel)
2016-08-15 06:42:48 +02:00
|
|
|
#ifdef CONFIG_TAXONOMY
|
|
|
|
int hostapd_ctrl_iface_signature(struct hostapd_data *hapd,
|
|
|
|
const char *txtaddr,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct sta_info *sta;
|
|
|
|
|
|
|
|
wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "CTRL_IFACE SIGNATURE %s", txtaddr);
|
|
|
|
|
|
|
|
if (hwaddr_aton(txtaddr, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
sta = ap_get_sta(hapd, addr);
|
|
|
|
if (!sta)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return retrieve_sta_taxonomy(hapd, sta, buf, buflen);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_TAXONOMY */
|
|
|
|
|
|
|
|
|
2016-04-08 18:37:08 +02:00
|
|
|
int hostapd_ctrl_iface_poll_sta(struct hostapd_data *hapd,
|
|
|
|
const char *txtaddr)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct sta_info *sta;
|
|
|
|
|
|
|
|
wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "CTRL_IFACE POLL_STA %s", txtaddr);
|
|
|
|
|
|
|
|
if (hwaddr_aton(txtaddr, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
sta = ap_get_sta(hapd, addr);
|
|
|
|
if (!sta)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
hostapd_drv_poll_client(hapd, hapd->own_addr, addr,
|
|
|
|
sta->flags & WLAN_STA_WMM);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-03 17:13:14 +01:00
|
|
|
int hostapd_ctrl_iface_status(struct hostapd_data *hapd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
struct hostapd_iface *iface = hapd->iface;
|
|
|
|
int len = 0, ret;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
ret = os_snprintf(buf + len, buflen - len,
|
|
|
|
"state=%s\n"
|
|
|
|
"phy=%s\n"
|
|
|
|
"freq=%d\n"
|
|
|
|
"num_sta_non_erp=%d\n"
|
|
|
|
"num_sta_no_short_slot_time=%d\n"
|
|
|
|
"num_sta_no_short_preamble=%d\n"
|
|
|
|
"olbc=%d\n"
|
|
|
|
"num_sta_ht_no_gf=%d\n"
|
|
|
|
"num_sta_no_ht=%d\n"
|
|
|
|
"num_sta_ht_20_mhz=%d\n"
|
2014-04-14 19:40:56 +02:00
|
|
|
"num_sta_ht40_intolerant=%d\n"
|
2013-11-03 17:13:14 +01:00
|
|
|
"olbc_ht=%d\n"
|
|
|
|
"ht_op_mode=0x%x\n",
|
|
|
|
hostapd_state_text(iface->state),
|
|
|
|
iface->phy,
|
|
|
|
iface->freq,
|
|
|
|
iface->num_sta_non_erp,
|
|
|
|
iface->num_sta_no_short_slot_time,
|
|
|
|
iface->num_sta_no_short_preamble,
|
|
|
|
iface->olbc,
|
|
|
|
iface->num_sta_ht_no_gf,
|
|
|
|
iface->num_sta_no_ht,
|
|
|
|
iface->num_sta_ht_20mhz,
|
2014-04-14 19:40:56 +02:00
|
|
|
iface->num_sta_ht40_intolerant,
|
2013-11-03 17:13:14 +01:00
|
|
|
iface->olbc_ht,
|
|
|
|
iface->ht_op_mode);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2013-11-03 17:13:14 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
|
2014-03-05 09:23:42 +01:00
|
|
|
if (!iface->cac_started || !iface->dfs_cac_ms) {
|
|
|
|
ret = os_snprintf(buf + len, buflen - len,
|
|
|
|
"cac_time_seconds=%d\n"
|
|
|
|
"cac_time_left_seconds=N/A\n",
|
|
|
|
iface->dfs_cac_ms / 1000);
|
|
|
|
} else {
|
|
|
|
/* CAC started and CAC time set - calculate remaining time */
|
|
|
|
struct os_reltime now;
|
|
|
|
unsigned int left_time;
|
|
|
|
|
|
|
|
os_reltime_age(&iface->dfs_cac_start, &now);
|
|
|
|
left_time = iface->dfs_cac_ms / 1000 - now.sec;
|
|
|
|
ret = os_snprintf(buf + len, buflen - len,
|
|
|
|
"cac_time_seconds=%u\n"
|
|
|
|
"cac_time_left_seconds=%u\n",
|
|
|
|
iface->dfs_cac_ms / 1000,
|
|
|
|
left_time);
|
|
|
|
}
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2014-03-05 09:23:42 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
|
2013-11-03 17:13:14 +01:00
|
|
|
ret = os_snprintf(buf + len, buflen - len,
|
|
|
|
"channel=%u\n"
|
|
|
|
"secondary_channel=%d\n"
|
|
|
|
"ieee80211n=%d\n"
|
2016-08-02 16:41:01 +02:00
|
|
|
"ieee80211ac=%d\n",
|
2013-11-03 17:13:14 +01:00
|
|
|
iface->conf->channel,
|
2016-08-02 16:41:01 +02:00
|
|
|
iface->conf->ieee80211n && !hapd->conf->disable_11n ?
|
|
|
|
iface->conf->secondary_channel : 0,
|
|
|
|
iface->conf->ieee80211n && !hapd->conf->disable_11n,
|
|
|
|
iface->conf->ieee80211ac &&
|
|
|
|
!hapd->conf->disable_11ac);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2013-11-03 17:13:14 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
2016-08-02 16:41:01 +02:00
|
|
|
if (iface->conf->ieee80211ac && !hapd->conf->disable_11ac) {
|
|
|
|
ret = os_snprintf(buf + len, buflen - len,
|
|
|
|
"vht_oper_chwidth=%d\n"
|
|
|
|
"vht_oper_centr_freq_seg0_idx=%d\n"
|
|
|
|
"vht_oper_centr_freq_seg1_idx=%d\n",
|
|
|
|
iface->conf->vht_oper_chwidth,
|
|
|
|
iface->conf->vht_oper_centr_freq_seg0_idx,
|
|
|
|
iface->conf->vht_oper_centr_freq_seg1_idx);
|
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
}
|
2013-11-03 17:13:14 +01:00
|
|
|
|
|
|
|
for (i = 0; i < iface->num_bss; i++) {
|
|
|
|
struct hostapd_data *bss = iface->bss[i];
|
|
|
|
ret = os_snprintf(buf + len, buflen - len,
|
|
|
|
"bss[%d]=%s\n"
|
|
|
|
"bssid[%d]=" MACSTR "\n"
|
|
|
|
"ssid[%d]=%s\n"
|
|
|
|
"num_sta[%d]=%d\n",
|
|
|
|
(int) i, bss->conf->iface,
|
|
|
|
(int) i, MAC2STR(bss->own_addr),
|
|
|
|
(int) i,
|
|
|
|
wpa_ssid_txt(bss->conf->ssid.ssid,
|
|
|
|
bss->conf->ssid.ssid_len),
|
|
|
|
(int) i, bss->num_sta);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 10:15:51 +01:00
|
|
|
if (os_snprintf_error(buflen - len, ret))
|
2013-11-03 17:13:14 +01:00
|
|
|
return len;
|
|
|
|
len += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
2013-11-14 11:28:32 +01:00
|
|
|
|
|
|
|
|
|
|
|
int hostapd_parse_csa_settings(const char *pos,
|
|
|
|
struct csa_settings *settings)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
os_memset(settings, 0, sizeof(*settings));
|
|
|
|
settings->cs_count = strtol(pos, &end, 10);
|
|
|
|
if (pos == end) {
|
|
|
|
wpa_printf(MSG_ERROR, "chanswitch: invalid cs_count provided");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
settings->freq_params.freq = atoi(end);
|
|
|
|
if (settings->freq_params.freq == 0) {
|
|
|
|
wpa_printf(MSG_ERROR, "chanswitch: invalid freq provided");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SET_CSA_SETTING(str) \
|
|
|
|
do { \
|
|
|
|
const char *pos2 = os_strstr(pos, " " #str "="); \
|
|
|
|
if (pos2) { \
|
|
|
|
pos2 += sizeof(" " #str "=") - 1; \
|
|
|
|
settings->freq_params.str = atoi(pos2); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
SET_CSA_SETTING(center_freq1);
|
|
|
|
SET_CSA_SETTING(center_freq2);
|
|
|
|
SET_CSA_SETTING(bandwidth);
|
|
|
|
SET_CSA_SETTING(sec_channel_offset);
|
|
|
|
settings->freq_params.ht_enabled = !!os_strstr(pos, " ht");
|
|
|
|
settings->freq_params.vht_enabled = !!os_strstr(pos, " vht");
|
|
|
|
settings->block_tx = !!os_strstr(pos, " blocktx");
|
|
|
|
#undef SET_CSA_SETTING
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-02-08 11:16:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd)
|
|
|
|
{
|
|
|
|
return hostapd_drv_stop_ap(hapd);
|
|
|
|
}
|
2016-03-09 10:16:12 +01:00
|
|
|
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_pmksa_list(struct hostapd_data *hapd, char *buf,
|
|
|
|
size_t len)
|
|
|
|
{
|
|
|
|
return wpa_auth_pmksa_list(hapd->wpa_auth, buf, len);
|
|
|
|
}
|
2016-03-09 10:16:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
void hostapd_ctrl_iface_pmksa_flush(struct hostapd_data *hapd)
|
|
|
|
{
|
|
|
|
wpa_auth_pmksa_flush(hapd->wpa_auth);
|
|
|
|
}
|
2017-01-02 11:32:07 +01:00
|
|
|
|
|
|
|
|
2017-06-18 13:14:18 +02:00
|
|
|
int hostapd_ctrl_iface_pmksa_add(struct hostapd_data *hapd, char *cmd)
|
|
|
|
{
|
|
|
|
u8 spa[ETH_ALEN];
|
|
|
|
u8 pmkid[PMKID_LEN];
|
|
|
|
u8 pmk[PMK_LEN_MAX];
|
|
|
|
size_t pmk_len;
|
|
|
|
char *pos, *pos2;
|
|
|
|
int akmp = 0, expiration = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Entry format:
|
|
|
|
* <STA addr> <PMKID> <PMK> <expiration in seconds> <akmp>
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, spa))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (!pos)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, pmkid, PMKID_LEN) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (!pos)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
pos2 = os_strchr(pos, ' ');
|
|
|
|
if (!pos2)
|
|
|
|
return -1;
|
|
|
|
pmk_len = (pos2 - pos) / 2;
|
|
|
|
if (pmk_len < PMK_LEN || pmk_len > PMK_LEN_MAX ||
|
|
|
|
hexstr2bin(pos, pmk, pmk_len) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = pos2 + 1;
|
|
|
|
|
|
|
|
if (sscanf(pos, "%d %d", &expiration, &akmp) != 2)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpa_auth_pmksa_add2(hapd->wpa_auth, spa, pmk, pmk_len,
|
|
|
|
pmkid, expiration, akmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-01-02 11:32:07 +01:00
|
|
|
#ifdef CONFIG_PMKSA_CACHE_EXTERNAL
|
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
|
|
|
|
int hostapd_ctrl_iface_pmksa_list_mesh(struct hostapd_data *hapd,
|
|
|
|
const u8 *addr, char *buf, size_t len)
|
|
|
|
{
|
|
|
|
return wpa_auth_pmksa_list_mesh(hapd->wpa_auth, addr, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void * hostapd_ctrl_iface_pmksa_create_entry(const u8 *aa, char *cmd)
|
|
|
|
{
|
|
|
|
u8 spa[ETH_ALEN];
|
|
|
|
u8 pmkid[PMKID_LEN];
|
|
|
|
u8 pmk[PMK_LEN_MAX];
|
|
|
|
char *pos;
|
|
|
|
int expiration;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Entry format:
|
|
|
|
* <BSSID> <PMKID> <PMK> <expiration in seconds>
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, spa))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (!pos)
|
|
|
|
return NULL;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, pmkid, PMKID_LEN) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (!pos)
|
|
|
|
return NULL;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, pmk, PMK_LEN) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (!pos)
|
|
|
|
return NULL;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (sscanf(pos, "%d", &expiration) != 1)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return wpa_auth_pmksa_create_entry(aa, spa, pmk, pmkid, expiration);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_MESH */
|
|
|
|
#endif /* CONFIG_PMKSA_CACHE_EXTERNAL */
|