Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-21 11:52:34 +01:00
Code Releases Activity

scan: Add scan_active

Browse Source
This commit is contained in:
Denis Kenzior 2015-09-30 11:32:02 -05:00
parent 46da18f23b
commit e551133960
2 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/scan.c
View File

@ -63,6 +63,8 @@ struct scan_request {
scan_destroy_func_t destroy; scan_destroy_func_t destroy;
bool passive:1; /* Active or Passive scan? */ bool passive:1; /* Active or Passive scan? */
bool triggered:1; bool triggered:1;
uint8_t *extra_ie;
size_t extra_ie_size;
}; };
struct scan_context { struct scan_context {
@ -166,7 +168,32 @@ static bool __scan_passive_start(struct l_genl_family *nl80211,
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &ifindex); l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &ifindex);
if (!l_genl_family_send(nl80211, msg, callback, user_data, NULL)) { if (!l_genl_family_send(nl80211, msg, callback, user_data, NULL)) {
l_error("Starting scheduled scan failed"); l_error("Starting passive scan failed");
return false;
}
return true;
}
static bool __scan_active_start(struct l_genl_family *nl80211,
uint32_t ifindex,
uint8_t *extra_ie, size_t extra_ie_size,
scan_func_t callback, void *user_data)
{
struct l_genl_msg *msg;
msg = l_genl_msg_new_sized(NL80211_CMD_TRIGGER_SCAN,
32 + extra_ie_size);
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &ifindex);
l_genl_msg_enter_nested(msg, NL80211_ATTR_SCAN_SSIDS);
l_genl_msg_leave_nested(msg);
if (extra_ie && extra_ie_size)
l_genl_msg_append_attr(msg, NL80211_ATTR_IE, extra_ie_size,
extra_ie);
if (!l_genl_family_send(nl80211, msg, callback, user_data, NULL)) {
l_error("Starting active scan failed");
return false; return false;
} }
@ -242,12 +269,15 @@ static void scan_done(struct l_genl_msg *msg, void *userdata)
sr->triggered = true; sr->triggered = true;
} }
bool scan_passive(uint32_t ifindex, scan_trigger_func_t trigger, static bool scan_common(uint32_t ifindex, bool passive,
scan_notify_func_t notify, void *userdata, uint8_t *extra_ie, size_t extra_ie_size,
scan_destroy_func_t destroy) scan_trigger_func_t trigger,
scan_notify_func_t notify, void *userdata,
scan_destroy_func_t destroy)
{ {
struct scan_context *sc; struct scan_context *sc;
struct scan_request *sr; struct scan_request *sr;
bool r;
sc = l_queue_find(scan_contexts, scan_context_match, sc = l_queue_find(scan_contexts, scan_context_match,
L_UINT_TO_PTR(ifindex)); L_UINT_TO_PTR(ifindex));
@ -260,7 +290,9 @@ bool scan_passive(uint32_t ifindex, scan_trigger_func_t trigger,
sr->callback = notify; sr->callback = notify;
sr->userdata = userdata; sr->userdata = userdata;
sr->destroy = destroy; sr->destroy = destroy;
sr->passive = true; sr->passive = passive;
sr->extra_ie = extra_ie;
sr->extra_ie_size = extra_ie_size;
if (l_queue_length(sc->requests) > 0) if (l_queue_length(sc->requests) > 0)
goto done; goto done;
@ -268,7 +300,14 @@ bool scan_passive(uint32_t ifindex, scan_trigger_func_t trigger,
if (sc->state != SCAN_STATE_NOT_RUNNING) if (sc->state != SCAN_STATE_NOT_RUNNING)
goto done; goto done;
if (!__scan_passive_start(nl80211, ifindex, scan_done, sc)) { if (passive)
r = __scan_passive_start(nl80211, ifindex, scan_done, sc);
else
r = __scan_active_start(nl80211, ifindex,
extra_ie, extra_ie_size,
scan_done, sc);
if (!r) {
scan_request_free(sr); scan_request_free(sr);
return false; return false;
} }
@ -279,6 +318,27 @@ done:
return true; return true;
} }
bool scan_passive(uint32_t ifindex, scan_trigger_func_t trigger,
scan_notify_func_t notify, void *userdata,
scan_destroy_func_t destroy)
{
return scan_common(ifindex, true, NULL, 0, trigger, notify,
userdata, destroy);
}
/*
* @extra_ie data is passed by reference. So it must be valid at least until
* the @trigger callback is called.
*/
bool scan_active(uint32_t ifindex, uint8_t *extra_ie, size_t extra_ie_size,
scan_trigger_func_t trigger,
scan_notify_func_t notify, void *userdata,
scan_destroy_func_t destroy)
{
return scan_common(ifindex, false, extra_ie, extra_ie_size,
trigger, notify, userdata, destroy);
}
void scan_sched_start(struct l_genl_family *nl80211, uint32_t ifindex, void scan_sched_start(struct l_genl_family *nl80211, uint32_t ifindex,
uint32_t scan_interval, uint32_t scan_interval,
scan_func_t callback, void *user_data) scan_func_t callback, void *user_data)

5
src/scan.h
View File

@ -68,6 +68,11 @@ struct scan_bss {
bool scan_passive(uint32_t ifindex, scan_trigger_func_t trigger, bool scan_passive(uint32_t ifindex, scan_trigger_func_t trigger,
scan_notify_func_t notify, void *userdata, scan_notify_func_t notify, void *userdata,
scan_destroy_func_t destroy); scan_destroy_func_t destroy);
bool scan_active(uint32_t ifindex, uint8_t *extra_ie, size_t extra_ie_size,
scan_trigger_func_t trigger,
scan_notify_func_t notify, void *userdata,
scan_destroy_func_t destroy);
void scan_periodic_start(uint32_t ifindex, scan_notify_func_t func, void scan_periodic_start(uint32_t ifindex, scan_notify_func_t func,
void *userdata); void *userdata);
bool scan_periodic_stop(uint32_t ifindex); bool scan_periodic_stop(uint32_t ifindex);