[PATCH] Add blacklist command

Dmitry Shmidt dimitrysh at google.com
Wed Mar 16 17:32:18 EDT 2011


This command allows to network manager to avoid AP

Signed-off-by: Dmitry Shmidt <dimitrysh at google.com>
---
 wpa_supplicant/ctrl_iface.c |   53 +++++++++++++++++++++++++++++++++++++++=
++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 9f06115..e82a095 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -38,6 +38,7 @@
 #include "bss.h"
 #include "scan.h"
 #include "ctrl_iface.h"
+#include "blacklist.h"

 extern struct wpa_driver_ops *wpa_drivers[];

@@ -899,6 +900,55 @@ static int wpa_supplicant_ctrl_iface_bssid(struct
wpa_supplicant *wpa_s,
 }


+static int wpa_supplicant_ctrl_iface_blacklist(struct wpa_supplicant *wpa_=
s,
+					char *cmd, char *buf, size_t buflen)
+{
+	u8 bssid[ETH_ALEN];
+	struct wpa_blacklist *e;
+	char *pos, *end;
+	int ret;
+
+	/* cmd: "BLACKLIST [<BSSID>]" */
+	if (*cmd =3D=3D '\0') {
+		pos =3D buf;
+		end =3D buf + buflen;
+		e =3D wpa_s->blacklist;
+		while (e) {
+			ret =3D os_snprintf(pos, end-pos, MACSTR"\n", MAC2STR(e->bssid));
+			if ((ret < 0) || (ret >=3D end - pos))
+				return pos - buf;
+			pos +=3D ret;
+			e =3D e->next;
+		}
+		return pos - buf;
+	}
+
+	cmd++;
+	if (os_strncmp(cmd, "clear", 5) =3D=3D 0) {
+		wpa_blacklist_clear(wpa_s);
+		os_memcpy(buf, "OK\n", 3);
+		return 3;
+	}
+
+	wpa_printf(MSG_DEBUG, "CTRL_IFACE: BLACKLIST bssid=3D'%s'", cmd);
+	if (hwaddr_aton(cmd, bssid)) {
+		wpa_printf(MSG_DEBUG ,"CTRL_IFACE: invalid BSSID '%s'", cmd);
+		return -1;
+	}
+
+	/* Add the BSSID twice, so its count will be 2, causing it to be
+	   skipped when processing scan results. */
+	ret =3D wpa_blacklist_add(wpa_s, bssid);
+	if (ret < 0)
+		return -1;
+	ret =3D wpa_blacklist_add(wpa_s, bssid);
+	if (ret < 0)
+		return -1;
+	os_memcpy(buf, "OK\n", 3);
+	return 3;
+}
+
+
 static int wpa_supplicant_ctrl_iface_list_networks(
 	struct wpa_supplicant *wpa_s, char *buf, size_t buflen)
 {
@@ -3113,6 +3163,9 @@ char * wpa_supplicant_ctrl_iface_process(struct
wpa_supplicant *wpa_s,
 	} else if (os_strncmp(buf, "BSSID ", 6) =3D=3D 0) {
 		if (wpa_supplicant_ctrl_iface_bssid(wpa_s, buf + 6))
 			reply_len =3D -1;
+	} else if (os_strncmp(buf, "BLACKLIST", 9) =3D=3D 0) {
+		reply_len =3D wpa_supplicant_ctrl_iface_blacklist(wpa_s, buf + 9,
+							reply, reply_size);
 	} else if (os_strcmp(buf, "LIST_NETWORKS") =3D=3D 0) {
 		reply_len =3D wpa_supplicant_ctrl_iface_list_networks(
 			wpa_s, reply, reply_size);
--=20
1.7.3.1


More information about the HostAP mailing list