9 files changed, 63 insertions, 26 deletions
diff --git a/src/libwpactrl/deps-lib/wpactrl b/src/libwpactrl/deps-lib/wpactrl
index 74d579a..d1e7a2b 100644
--- a/src/libwpactrl/deps-lib/wpactrl
+++ b/src/libwpactrl/deps-lib/wpactrl
@@ -22,10 +22,12 @@ wpactrl_scan_parse.o
 wpactrl_selectnetwork.o
 wpactrl_setnetworkoption.o
 wpactrl_start.o
+wpactrl_startscan.o
 wpactrl_update.o
+wpactrl_xchg_cbres_free.o
+wpactrl_xchg_cbres_zero.o
 wpactrl_xchg_computedeadline.o
 wpactrl_xchg_event.o
-wpactrl_xchg_free.o
 wpactrl_xchg_init.o
 wpactrl_xchg_start.o
 wpactrl_xchg_timeout.o
diff --git a/src/libwpactrl/wpactrl_filter_match.c b/src/libwpactrl/wpactrl_filter_match.c
index 30ed0ff..09b6eab 100644
--- a/src/libwpactrl/wpactrl_filter_match.c
+++ b/src/libwpactrl/wpactrl_filter_match.c
@@ -7,6 +7,8 @@ int wpactrl_filter_match (wpactrl_t const *a, char const *s, size_t len)
 {
   size_t filterlen = a->filters.len ;
   char const *filters = a->filters.s ;
+  if (len < 4) return 0 ;
+  s += 3 ; len -= 3 ;
   while (filterlen)
   {
     size_t flen = strlen(filters) ;
diff --git a/src/libwpactrl/wpactrl_startscan.c b/src/libwpactrl/wpactrl_startscan.c
new file mode 100644
index 0000000..7ce5f52
--- /dev/null
+++ b/src/libwpactrl/wpactrl_startscan.c
@@ -0,0 +1,30 @@
+/* ISC license. */
+
+#include <errno.h>
+#include <bcnm/wpactrl.h>
+#include "wpactrl-internal.h"
+
+static int wpactrl_scan_cb (wpactrl_t *a, char const *s, size_t len, void *aux, tain_t *stamp)
+{
+  wpactrl_xchg_cbres_t *res = aux ;
+  char buf[WPACTRL_PACKET_MAX] ;
+  ssize_t r = wpactrl_query(a, "SCAN_RESULTS", buf, WPACTRL_PACKET_MAX, stamp) ;
+  if (r <= 0) return 0 ;
+  (void)s ;
+  (void)len ;
+  return wpactrl_scan_parse(buf, r, &res->parsed, &res->storage) ;
+}
+
+static wpactrl_xchgitem_t wpactrl_xchgitem_scan =
+{
+  .filter = "CTRL-EVENT-SCAN-RESULTS",
+  .cb = &wpactrl_scan_cb
+} ;
+
+int wpactrl_startscan (wpactrl_t *a, wpactrl_xchg_t *xchg, wpactrl_xchg_cbres_t *res, tain_t const *deadline, tain_t *stamp)
+{
+  wparesponse_t r = wpactrl_command(a, "SCAN", stamp) ;
+  if (r != WPA_OK && r != WPA_FAILBUSY) return (errno = EIO, 0) ;
+  wpactrl_xchg_init(xchg, &wpactrl_xchgitem_scan, 1, deadline, res) ;
+  return wpactrl_xchg_start(a, xchg) ;
+}
diff --git a/src/libwpactrl/wpactrl_xchg_cbres_free.c b/src/libwpactrl/wpactrl_xchg_cbres_free.c
new file mode 100644
index 0000000..b12a3fc
--- /dev/null
+++ b/src/libwpactrl/wpactrl_xchg_cbres_free.c
@@ -0,0 +1,11 @@
+/* ISC license. */
+
+#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
+#include <bcnm/wpactrl.h>
+
+void wpactrl_xchg_cbres_free (wpactrl_xchg_cbres_t *cr)
+{
+  genalloc_free(int, &cr->parsed) ; /* relies on genericity of genalloc_free */
+  stralloc_free(&cr->storage) ;
+}
diff --git a/src/libwpactrl/wpactrl_xchg_cbres_zero.c b/src/libwpactrl/wpactrl_xchg_cbres_zero.c
new file mode 100644
index 0000000..c38dc33
--- /dev/null
+++ b/src/libwpactrl/wpactrl_xchg_cbres_zero.c
@@ -0,0 +1,5 @@
+/* ISC license. */
+
+#include <bcnm/wpactrl.h>
+
+wpactrl_xchg_cbres_t const wpactrl_xchg_cbres_zero = WPACTRL_XCHG_CBRES_ZERO ;
diff --git a/src/libwpactrl/wpactrl_xchg_event.c b/src/libwpactrl/wpactrl_xchg_event.c
index 6d25295..e9d2f06 100644
--- a/src/libwpactrl/wpactrl_xchg_event.c
+++ b/src/libwpactrl/wpactrl_xchg_event.c
@@ -1,6 +1,8 @@
 /* ISC license. */
 
 #include <string.h>
+#include <errno.h>
+#include <skalibs/error.h>
 #include <skalibs/stralloc.h>
 #include <bcnm/wpactrl.h>
 
@@ -10,7 +12,7 @@ static inline size_t wpactrl_findmsg (wpactrl_t *a, char const *filter)
   size_t i = 0 ;
   while (i < a->data.len)
   {
-    if (!strncmp(a->data.s + i, filter, filterlen)) break ;
+    if (!strncmp(a->data.s + i + 3, filter, filterlen)) break ;
     i += strlen(a->data.s + i) + 1 ;
   }
   return i ;
@@ -20,23 +22,19 @@ int wpactrl_xchg_event (wpactrl_t *a, wpactrl_xchg_t *dt, tain_t *stamp)
 {
   size_t pos, len ;
   if (dt->i >= dt->n) return 2 ;
+  if (!error_isagain(dt->status)) return (errno = EINVAL, -1) ;
   pos = wpactrl_findmsg(a, dt->tab[dt->i].filter) ;
   if (pos >= a->data.len) return 0 ;
-  dt->sa.len = 0 ;
   len = strlen(a->data.s + pos) + 1 ;
-  if (dt->i == dt->n - 1)
+  if (!(*dt->tab[dt->i].cb)(a, a->data.s + pos, len - 1, dt->aux, stamp)) return -2 ;
+  memmove(a->data.s + pos, a->data.s + pos + len, a->data.len - len) ;
+  a->data.len -= len ;
+  wpactrl_filter_remove(a, dt->tab[dt->i].filter) ;
+  if (++dt->i == dt->n)
   {
-    if (!stralloc_catb(&dt->sa, a->data.s + pos, len)) return -1 ;
-    memmove(a->data.s + pos, a->data.s + pos + len, a->data.len - len) ;
-    a->data.len -= len ;
     dt->status = 0 ;
-    wpactrl_filter_remove(a, dt->tab[dt->i].filter) ;
     return 1 ;
   }
-  if (!(*dt->tab[dt->i].f)(a, a->data.s + pos, len - 1, dt->aux, stamp)) return -1 ;
-  memmove(a->data.s + pos, a->data.s + pos + len, a->data.len - len) ;
-  a->data.len -= len ;
-  wpactrl_filter_remove(a, dt->tab[dt->i].filter) ;
-  if (!wpactrl_filter_add(a, dt->tab[++dt->i].filter)) return -1 ;
+  if (!wpactrl_filter_add(a, dt->tab[dt->i].filter)) return -1 ;
   return 0 ;
 }
diff --git a/src/libwpactrl/wpactrl_xchg_free.c b/src/libwpactrl/wpactrl_xchg_free.c
deleted file mode 100644
index e244a52..0000000
--- a/src/libwpactrl/wpactrl_xchg_free.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* ISC license. */
-
-#include <skalibs/stralloc.h>
-#include <bcnm/wpactrl.h>
-
-void wpactrl_xchg_free (wpactrl_xchg_t *dt)
-{
-  stralloc_free(&dt->sa) ;
-  *dt = wpactrl_xchg_zero ;
-}
diff --git a/src/libwpactrl/wpactrl_xchg_init.c b/src/libwpactrl/wpactrl_xchg_init.c
index 2e2f391..b9d35f0 100644
--- a/src/libwpactrl/wpactrl_xchg_init.c
+++ b/src/libwpactrl/wpactrl_xchg_init.c
@@ -1,12 +1,10 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <skalibs/stralloc.h>
 #include <bcnm/wpactrl.h>
 
 void wpactrl_xchg_init (wpactrl_xchg_t *dt, wpactrl_xchgitem_t const *tab, unsigned int n, tain_t const *limit, void *aux)
 {
-  dt->sa.len = 0 ;
   dt->tab = tab ;
   dt->n = n ;
   dt->i = 0 ;
diff --git a/src/libwpactrl/wpactrl_xchg_timeout.c b/src/libwpactrl/wpactrl_xchg_timeout.c
index 01907ea..fd99390 100644
--- a/src/libwpactrl/wpactrl_xchg_timeout.c
+++ b/src/libwpactrl/wpactrl_xchg_timeout.c
@@ -4,11 +4,12 @@
 #include <skalibs/tai.h>
 #include <bcnm/wpactrl.h>
 
-int wpactrl_xchg_timeout (wpactrl_xchg_t *dt, tain_t const *stamp)
+int wpactrl_xchg_timeout (wpactrl_t *a, wpactrl_xchg_t *dt, tain_t const *stamp)
 {
   if (!tain_less(stamp, &dt->deadline))
   {
     dt->status = ETIMEDOUT ;
+    wpactrl_filter_remove(a, dt->tab[dt->i].filter) ;
     return 1 ;
   }
   else return 0 ;