Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement WiFi Blaster related TAPI #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+176 −35
Open

Implement WiFi Blaster related TAPI #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2c7918
Implement WiFi Blaster related TAPI
Serhiy-Chumak Aug 4, 2020
bb6b179
Fix indent size to 4 spaces instead of tab
Serhiy-Chumak Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/lib/ioctl80211/inc/ioctl80211_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,11 @@ ioctl_status_t ioctl80211_client_stats_convert(
ioctl80211_client_record_t *data_old,
dpp_client_record_t *client_result);

ioctl_status_t ioctl80211_client_stats_get(
radio_type_t radio_type,
char *ifName,
char *phyName,
mac_address_t mac,
dpp_client_stats_t *stats);

#endif /* IOCTL80211_CLIENT_H_INCLUDED */
4 changes: 4 additions & 0 deletions src/lib/ioctl80211/inc/ioctl80211_survey.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,8 @@ ioctl_status_t ioctl80211_survey_results_convert(
ioctl80211_survey_record_t *data_old,
dpp_survey_record_t *survey_record);

ioctl_status_t ioctl80211_survey_noise_floor_get(
char *if_name,
int *noise_floor);

#endif /* IOCTL80211_SURVEY_H_INCLUDED */
141 changes: 106 additions & 35 deletions src/lib/ioctl80211/ioctl80211_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,25 +843,25 @@ static
ioctl_status_t ioctl80211_clients_stats_tx_fetch(
radio_type_t radio_type,
char *phyName,
ioctl80211_client_record_t *client_entry)
mac_address_t mac,
struct ps_uapi_ioctl *ioctl_stats)
{
int32_t rc;

struct iwreq request;
struct ps_uapi_ioctl *ioctl_stats = &client_entry->stats_tx;

memset (ioctl_stats, 0, sizeof(*ioctl_stats));
memset (&request, 0, sizeof(request));
request.u.data.pointer = ioctl_stats;
request.u.data.length = PS_UAPI_IOCTL_SIZE;

ioctl_stats->cmd = PS_UAPI_IOCTL_CMD_PEER_TX_STATS;
ioctl_stats->u.peer_tx_stats.set.addr[0] = (u8)client_entry->info.mac[0];
ioctl_stats->u.peer_tx_stats.set.addr[1] = (u8)client_entry->info.mac[1];
ioctl_stats->u.peer_tx_stats.set.addr[2] = (u8)client_entry->info.mac[2];
ioctl_stats->u.peer_tx_stats.set.addr[3] = (u8)client_entry->info.mac[3];
ioctl_stats->u.peer_tx_stats.set.addr[4] = (u8)client_entry->info.mac[4];
ioctl_stats->u.peer_tx_stats.set.addr[5] = (u8)client_entry->info.mac[5];
ioctl_stats->u.peer_tx_stats.set.addr[0] = (u8)mac[0];
ioctl_stats->u.peer_tx_stats.set.addr[1] = (u8)mac[1];
ioctl_stats->u.peer_tx_stats.set.addr[2] = (u8)mac[2];
ioctl_stats->u.peer_tx_stats.set.addr[3] = (u8)mac[3];
ioctl_stats->u.peer_tx_stats.set.addr[4] = (u8)mac[4];
ioctl_stats->u.peer_tx_stats.set.addr[5] = (u8)mac[5];

rc =
ioctl80211_request_send(
Expand Down Expand Up @@ -1207,24 +1207,28 @@ ioctl_status_t ioctl80211_peer_stats_calculate(
}

static
ioctl_status_t ioctl80211_clients_stats_fetch(
ioctl_status_t ioctl80211_clients_stats_get(
radio_type_t radio_type,
char *ifName,
ioctl80211_client_record_t *client_entry)
char *phyName,
mac_address_t mac,
ioctl80211_client_stats_t *stats_entry)
{
int32_t rc;
ioctl80211_client_stats_t *stats_entry = &client_entry->stats.client;

struct iwreq request;
struct ieee80211req_sta_stats ieee80211_client_stats;
struct ps_uapi_ioctl stats_tx;
ioctl_status_t status;
uint32_t stats_index;

memset (&ieee80211_client_stats, 0, sizeof(ieee80211_client_stats));
memset (&request, 0, sizeof(request));
request.u.data.pointer = &ieee80211_client_stats;
request.u.data.length = sizeof(ieee80211_client_stats);

memcpy (ieee80211_client_stats.is_u.macaddr,
client_entry->info.mac,
mac,
sizeof(ieee80211_client_stats.is_u.macaddr));

rc =
Expand All @@ -1243,13 +1247,6 @@ ioctl_status_t ioctl80211_clients_stats_fetch(
return IOCTL_STATUS_ERROR;
}

stats_entry->frames_tx =
ieee80211_client_stats.is_stats.ns_tx_data_success;
LOG(TRACE,
"Parsed %s client tx_frames %u",
radio_get_name_from_type(radio_type),
stats_entry->frames_tx);

stats_entry->bytes_tx =
ieee80211_client_stats.is_stats.ns_tx_bytes_success;
LOG(TRACE,
Expand All @@ -1271,20 +1268,6 @@ ioctl_status_t ioctl80211_clients_stats_fetch(
radio_get_name_from_type(radio_type),
stats_entry->bytes_rx);

/* TODO: Needs verification.

Retry counter was taken from assumption from the following calculation:

all queued packets were packets actually sent and not ok - retried!!
packet_queued = tx_data_packets + ns_is_tx_not_ok
*/
stats_entry->retries_tx =
ieee80211_client_stats.is_stats.ns_is_tx_not_ok;
LOG(TRACE,
"Parsed %s client tx retries %u",
radio_get_name_from_type(radio_type),
stats_entry->retries_tx);

stats_entry->retries_rx =
ieee80211_client_stats.is_stats.ns_rx_retries;
LOG(TRACE,
Expand Down Expand Up @@ -1316,9 +1299,57 @@ ioctl_status_t ioctl80211_clients_stats_fetch(
radio_get_name_from_type(radio_type),
stats_entry->errors_rx);

status =
ioctl80211_clients_stats_tx_fetch (
radio_type,
phyName,
mac,
&stats_tx);
if (IOCTL_STATUS_OK != status)
{
LOG(WARNING,
"Skipping parsing %s client stats tx "
"(Failed to retrieve them from driver)",
radio_get_name_from_type(radio_type));
return IOCTL_STATUS_ERROR;
}

stats_entry->frames_tx = 0;
stats_entry->retries_tx = 0;
for (stats_index = 0; stats_index < PS_MAX_ALL; stats_index++)
{
stats_entry->frames_tx += stats_tx.u.peer_tx_stats.get.stats[stats_index].success;
stats_entry->retries_tx += (stats_tx.u.peer_tx_stats.get.stats[stats_index].attempts -
stats_tx.u.peer_tx_stats.get.stats[stats_index].success);
}

LOG(TRACE,
"Parsed %s client tx_frames %u",
radio_get_name_from_type(radio_type),
stats_entry->frames_tx);
LOG(TRACE,
"Parsed %s client tx retries %u",
radio_get_name_from_type(radio_type),
stats_entry->retries_tx);

return IOCTL_STATUS_OK;
}

static
ioctl_status_t ioctl80211_clients_stats_fetch(
radio_type_t radio_type,
char *ifName,
char *phyName,
ioctl80211_client_record_t *client_entry)
{
return ioctl80211_clients_stats_get(
radio_type,
ifName,
phyName,
client_entry->info.mac,
&client_entry->stats.client);
}

static
ioctl_status_t ioctl80211_clients_list_fetch(
radio_entry_t *radio_cfg,
Expand Down Expand Up @@ -1444,6 +1475,7 @@ ioctl_status_t ioctl80211_clients_list_fetch(
ioctl80211_clients_stats_fetch (
radio_type,
ifName,
radio_cfg->phy_name,
client_entry);
if (IOCTL_STATUS_OK != status)
{
Expand All @@ -1464,7 +1496,8 @@ ioctl_status_t ioctl80211_clients_list_fetch(
ioctl80211_clients_stats_tx_fetch (
radio_type,
radio_cfg->phy_name,
client_entry);
client_entry->info.mac,
&client_entry->stats_tx);
if (IOCTL_STATUS_OK != status)
{
goto error;
Expand Down Expand Up @@ -1740,7 +1773,8 @@ ioctl_status_t ioctl80211_peer_list_fetch(
ioctl80211_clients_stats_tx_fetch (
radio_type,
radio_cfg->phy_name,
client_entry);
client_entry->info.mac,
&client_entry->stats_tx);
if (IOCTL_STATUS_OK != status)
{
goto error;
Expand Down Expand Up @@ -1936,3 +1970,40 @@ ioctl_status_t ioctl80211_client_stats_convert(

return IOCTL_STATUS_OK;
}

ioctl_status_t ioctl80211_client_stats_get(
radio_type_t radio_type,
char *ifName,
char *phyName,
mac_address_t mac,
dpp_client_stats_t *stats)
{
ioctl_status_t status;
ioctl80211_client_stats_t stats_entry;

status =
ioctl80211_clients_stats_get(
radio_type,
ifName,
phyName,
mac,
&stats_entry);
if (IOCTL_STATUS_OK != status)
{
return IOCTL_STATUS_ERROR;
}

stats->bytes_tx = stats_entry.bytes_tx;
stats->bytes_rx = stats_entry.bytes_rx;
stats->frames_tx = stats_entry.frames_tx;
stats->frames_rx = stats_entry.frames_rx;
stats->retries_rx = stats_entry.retries_rx;
stats->retries_tx = stats_entry.retries_tx;
stats->errors_rx = stats_entry.errors_rx;
stats->errors_tx = stats_entry.errors_tx;
stats->rate_rx = stats_entry.rate_rx;
stats->rate_tx = stats_entry.rate_tx;
stats->rssi = stats_entry.rssi;

return IOCTL_STATUS_OK;
}
19 changes: 19 additions & 0 deletions src/lib/ioctl80211/ioctl80211_survey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,3 +446,22 @@ ioctl_status_t ioctl80211_survey_results_convert(

return IOCTL_STATUS_OK;
}

ioctl_status_t ioctl80211_survey_noise_floor_get(
char *if_name,
int *noise_floor)
{
struct iwreq iwr;

memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_name, if_name, IFNAMSIZ);
iwr.u.mode = IEEE80211_PARAM_CHAN_NOISE;

if (ioctl(ioctl80211_fd_get(), IEEE80211_IOCTL_GETPARAM, &iwr) < 0) {
LOGE("%s: Failed to get Noise Floor for %s dev", __func__, if_name);
return IOCTL_STATUS_ERROR;
}

*noise_floor = iwr.u.param.value;
return IOCTL_STATUS_OK;
}
5 changes: 5 additions & 0 deletions src/lib/target/target_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ struct ev_loop *target_mainloop;
bool target_init(target_init_opt_t opt, struct ev_loop *loop)
{
switch (opt) {
case TARGET_INIT_MGR_WBM:
if (ioctl80211_init(loop, false) != IOCTL_STATUS_OK) {
return false;
}
break;
case TARGET_INIT_MGR_SM:
if (ioctl80211_init(loop, true) != IOCTL_STATUS_OK) {
return false;
Expand Down
35 changes: 35 additions & 0 deletions src/lib/target/target_ioctl_stats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,26 @@ bool target_radio_fast_scan_enable(radio_entry_t *radio_cfg, ifname_t if_name)
return true;
}

bool target_stats_client_get(radio_type_t radio_type,
char *if_name,
char *phy_name,
mac_address_t mac,
dpp_client_stats_t *stats)
{
ioctl_status_t rc;
rc = ioctl80211_client_stats_get(radio_type,
if_name,
phy_name,
mac,
stats);
if (IOCTL_STATUS_OK != rc)
{
return false;
}

return true;
}


/******************************************************************************
* CLIENT definitions
Expand Down Expand Up @@ -217,6 +237,21 @@ bool target_stats_survey_convert(radio_entry_t *radio_cfg,
return true;
}

bool target_stats_survey_noise_floor_get(char *ifname,
int *noise_floor)
{
ioctl_status_t rc;

rc = ioctl80211_survey_noise_floor_get(ifname,
noise_floor);
if (IOCTL_STATUS_OK != rc)
{
return false;
}

return true;
}


/******************************************************************************
* NEIGHBORS definitions
Expand Down