jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Add PKTCNT_POLL command to get TX/RX packet counters

Browse source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Yuhao Zheng 2012-09-05 17:02:02 +03:00 committed by Jouni Malinen
parent a05126d620
commit dc7785f845
4 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/driver_nl80211.c
View file

@ -7373,6 +7373,7 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
[NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 }, [NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 },
[NL80211_STA_INFO_RX_PACKETS] = { .type = NLA_U32 }, [NL80211_STA_INFO_RX_PACKETS] = { .type = NLA_U32 },
[NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 }, [NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 },
[NL80211_STA_INFO_TX_FAILED] = { .type = NLA_U32 },
}; };
nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
@ -7408,6 +7409,9 @@ static int get_sta_handler(struct nl_msg *msg, void *arg)
if (stats[NL80211_STA_INFO_TX_PACKETS]) if (stats[NL80211_STA_INFO_TX_PACKETS])
data->tx_packets = data->tx_packets =
nla_get_u32(stats[NL80211_STA_INFO_TX_PACKETS]); nla_get_u32(stats[NL80211_STA_INFO_TX_PACKETS]);
if (stats[NL80211_STA_INFO_TX_FAILED])
data->tx_retry_failed =
nla_get_u32(stats[NL80211_STA_INFO_TX_FAILED]);
return NL_SKIP; return NL_SKIP;
} }

21
wpa_supplicant/ctrl_iface.c
View file

@ -4324,6 +4324,24 @@ static int wpa_supplicant_signal_poll(struct wpa_supplicant *wpa_s, char *buf,
} }
static int wpa_supplicant_pktcnt_poll(struct wpa_supplicant *wpa_s, char *buf,
size_t buflen)
{
struct hostap_sta_driver_data sta;
int ret;
ret = wpa_drv_pktcnt_poll(wpa_s, &sta);
if (ret)
return -1;
ret = os_snprintf(buf, buflen, "TXGOOD=%lu\nTXBAD=%lu\nRXGOOD=%lu\n",
sta.tx_packets, sta.tx_retry_failed, sta.rx_packets);
if (ret < 0 || (size_t) ret > buflen)
return -1;
return ret;
}
char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s, char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
char *buf, size_t *resp_len) char *buf, size_t *resp_len)
{ {
@ -4825,6 +4843,9 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
} else if (os_strncmp(buf, "SIGNAL_POLL", 11) == 0) { } else if (os_strncmp(buf, "SIGNAL_POLL", 11) == 0) {
reply_len = wpa_supplicant_signal_poll(wpa_s, reply, reply_len = wpa_supplicant_signal_poll(wpa_s, reply,
reply_size); reply_size);
} else if (os_strncmp(buf, "PKTCNT_POLL", 11) == 0) {
reply_len = wpa_supplicant_pktcnt_poll(wpa_s, reply,
reply_size);
#ifdef CONFIG_AUTOSCAN #ifdef CONFIG_AUTOSCAN
} else if (os_strncmp(buf, "AUTOSCAN ", 9) == 0) { } else if (os_strncmp(buf, "AUTOSCAN ", 9) == 0) {
if (wpa_supplicant_ctrl_iface_autoscan(wpa_s, buf + 9)) if (wpa_supplicant_ctrl_iface_autoscan(wpa_s, buf + 9))

9
wpa_supplicant/driver_i.h
View file

@ -463,6 +463,15 @@ static inline int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
return -1; return -1;
} }
static inline int wpa_drv_pktcnt_poll(struct wpa_supplicant *wpa_s,
struct hostap_sta_driver_data *sta)
{
if (wpa_s->driver->read_sta_data)
return wpa_s->driver->read_sta_data(wpa_s->drv_priv, sta,
wpa_s->bssid);
return -1;
}
static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s, static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
const struct wpabuf *beacon, const struct wpabuf *beacon,
const struct wpabuf *proberesp, const struct wpabuf *proberesp,

10
wpa_supplicant/wpa_cli.c
View file

@ -2174,6 +2174,13 @@ static int wpa_cli_cmd_signal_poll(struct wpa_ctrl *ctrl, int argc,
} }
static int wpa_cli_cmd_pktcnt_poll(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
return wpa_ctrl_command(ctrl, "PKTCNT_POLL");
}
static int wpa_cli_cmd_reauthenticate(struct wpa_ctrl *ctrl, int argc, static int wpa_cli_cmd_reauthenticate(struct wpa_ctrl *ctrl, int argc,
char *argv[]) char *argv[])
{ {
@ -2619,6 +2626,9 @@ static struct wpa_cli_cmd wpa_cli_commands[] = {
{ "signal_poll", wpa_cli_cmd_signal_poll, NULL, { "signal_poll", wpa_cli_cmd_signal_poll, NULL,
cli_cmd_flag_none, cli_cmd_flag_none,
"= get signal parameters" }, "= get signal parameters" },
{ "pktcnt_poll", wpa_cli_cmd_pktcnt_poll, NULL,
cli_cmd_flag_none,
"= get TX/RX packet counters" },
{ "reauthenticate", wpa_cli_cmd_reauthenticate, NULL, { "reauthenticate", wpa_cli_cmd_reauthenticate, NULL,
cli_cmd_flag_none, cli_cmd_flag_none,
"= trigger IEEE 802.1X/EAPOL reauthentication" }, "= trigger IEEE 802.1X/EAPOL reauthentication" },