[noup] zephyr: remove zephyr wpas monitor socket pair

The socket pair will no longer be used as we will directly filter
and handle msg in wpa_msg_cb for zephyr.

The handler path is short and quick. So it won't hold hostap task.
Saves 4K RAM space and hostap task loops for receiving msg.

Signed-off-by: Fengming Ye <frank.ye@nxp.com>

Author: fengming-ye

wpa_supplicant/ctrl_iface_zephyr.c

@@ -8,119 +8,6 @@
 
 #include "ctrl_iface_zephyr.h"
 
-
-static int wpa_supplicant_ctrl_mon_iface_attach(struct wpa_ctrl_mon **head, int sock)
-{
-	struct wpa_ctrl_mon *dst;
-
-	dst = os_zalloc(sizeof(*dst));
-	if (dst == NULL)
-		return -1;
-
-	dst->sock = sock;
-	dst->debug_level = MSG_INFO;
-	dst->next = *head;
-	*head = dst;
-	return 0;
-}
-
-
-static int wpa_supplicant_ctrl_mon_iface_detach(struct wpa_ctrl_mon **head, int sock)
-{
-	struct wpa_ctrl_mon *dst, *prev = NULL;
-
-	dst = *head;
-	while (dst) {
-		if (dst->sock == sock) {
-			if (prev == NULL) {
-				*head = dst->next;
-			} else {
-				prev->next = dst->next;
-			}
-			os_free(dst);
-			return 0;
-		}
-		prev = dst;
-		dst = dst->next;
-	}
-	return -1;
-}
-
-static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
-					   const char *ifname, int sock,
-					   struct wpa_ctrl_mon **head,
-					   int level, const char *buf,
-					   size_t len)
-{
-	struct wpa_ctrl_mon *dst, *next;
-	char levelstr[64];
-	int idx;
-	struct conn_msg msg;
-
-	dst = *head;
-	if (sock < 0 || dst == NULL)
-		return;
-
-	if (ifname)
-		os_snprintf(levelstr, sizeof(levelstr), "IFNAME=%s <%d>",
-			    ifname, level);
-	else
-		os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);
-
-	idx = 0;
-	if (len > MAX_CTRL_MSG_LEN) {
-		wpa_printf(MSG_DEBUG, "CTRL_MSG too long");
-		return;
-	}
-
-	while (dst) {
-		next = dst->next;
-		if (level >= dst->debug_level) {
-			memcpy(&msg.msg, buf, len);
-			msg.msg_len = len;
-			if (send(dst->sock, &msg, len + 4, 0) < 0) {
-				wpa_printf(MSG_ERROR,
-					   "sendto(CTRL_IFACE monitor): %s",
-					   strerror(errno));
-				dst->errors++;
-			} else {
-				dst->errors = 0;
-			}
-		}
-		idx++;
-		dst = next;
-	}
-}
-
-static void wpa_supplicant_ctrl_iface_msg_cb(void *ctx, int level,
-					     enum wpa_msg_type type,
-					     const char *txt, size_t len)
-{
-	struct wpa_supplicant *wpa_s = ctx;
-
-	if (!wpa_s)
-		return;
-
-	if (type != WPA_MSG_NO_GLOBAL && wpa_s->global->ctrl_iface) {
-		struct ctrl_iface_global_priv *priv = wpa_s->global->ctrl_iface;
-
-		if (priv->ctrl_dst) {
-			wpa_supplicant_ctrl_iface_send(wpa_s, type != WPA_MSG_PER_INTERFACE ?
-							NULL : wpa_s->ifname,
-							priv->sock_pair[0],
-							 &priv->ctrl_dst, level, txt, len);
-		}
-	}
-
-	if (type == WPA_MSG_ONLY_GLOBAL || !wpa_s->ctrl_iface)
-		return;
-
-	wpa_supplicant_ctrl_iface_send(wpa_s, NULL, wpa_s->ctrl_iface->sock_pair[0],
-				       &wpa_s->ctrl_iface->ctrl_dst,
-				       level, txt, len);
-}
-
-
 static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
 					      void *sock_ctx)
 {
@@ -155,27 +42,8 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
 	while (*pos == ' ')
 		pos++;
 
-	if (os_strcmp(pos, "ATTACH") == 0) {
-		if (wpa_supplicant_ctrl_mon_iface_attach(&wpa_s->ctrl_iface->ctrl_dst,
-						    wpa_s->ctrl_iface->mon_sock_pair[1])){
-			reply_len = 1;
-		}
-		else {
-			reply_len = 2;
-		}
-	} else if (os_strcmp(pos, "DETACH") == 0) {
-		if (wpa_supplicant_ctrl_mon_iface_detach(&wpa_s->ctrl_iface->ctrl_dst,
-						    wpa_s->ctrl_iface->mon_sock_pair[1])) {
-			reply_len = 1;
-		}
-		else {
-			reply_len = 2;
-		}
-	} else {
-		reply = wpa_supplicant_ctrl_iface_process(wpa_s, pos,
-							&reply_len);
-	}
-
+	reply = wpa_supplicant_ctrl_iface_process(wpa_s, pos,
+						  &reply_len);
 	if (reply) {
 		send(sock, reply, reply_len, 0);
 	} else if (reply_len == 1) {
@@ -217,8 +85,6 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
 	eloop_register_read_sock(priv->sock_pair[1], wpa_supplicant_ctrl_iface_receive,
 				 wpa_s, priv);
 
-	wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb);
-
 	return priv;
 
 fail:
@@ -287,27 +153,8 @@ static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
 	while (*pos == ' ')
 		pos++;
 
-	if (os_strcmp(pos, "ATTACH") == 0) {
-		if (wpa_supplicant_ctrl_mon_iface_attach(&global->ctrl_iface->ctrl_dst,
-						    global->ctrl_iface->mon_sock_pair[1])) {
-			reply_len = 1;
-		}
-		else {
-			reply_len = 2;
-		}
-	} else if (os_strcmp(pos, "DETACH") == 0) {
-		if (wpa_supplicant_ctrl_mon_iface_detach(&global->ctrl_iface->ctrl_dst,
-						    global->ctrl_iface->mon_sock_pair[1])) {
-			reply_len = 1;
-		}
-		else {
-			reply_len = 2;
-		}
-	} else {
 	reply = wpa_supplicant_global_ctrl_iface_process(global, pos,
-							&reply_len);
-	}
-
+							 &reply_len);
 	if (reply) {
 		send(sock, reply, reply_len, 0);
 	} else if (reply_len == 1) {

wpa_supplicant/ctrl_iface_zephyr.h

@@ -16,37 +16,14 @@
 #include "ctrl_iface.h"
 #include "common/wpa_ctrl.h"
 
-#define MAX_CTRL_MSG_LEN 256
-/**
- * struct wpa_ctrl_mon - Data structure of control interface monitors
- *
- * This structure is used to store information about registered control
- * interface monitors into struct wpa_supplicant.
- */
-struct wpa_ctrl_mon {
-	struct wpa_ctrl_mon *next;
-	int sock;
-	int debug_level;
-	int errors;
-};
-
 struct ctrl_iface_priv {
 	struct wpa_supplicant *wpa_s;
-	/* 0 - wpa_cli, 1 - ctrl_iface */
+	/* wpa_cli command socket pair */
 	int sock_pair[2];
-	int mon_sock_pair[2];
-	struct wpa_ctrl_mon *ctrl_dst;
 };
 
 struct ctrl_iface_global_priv {
 	struct wpa_global *global;
-	/* 0 - wpa_cli, 1 - ctrl_iface */
+	/* wpa_cli command socket pair */
 	int sock_pair[2];
-	int mon_sock_pair[2];
-	struct wpa_ctrl_mon *ctrl_dst;
-};
-
-struct conn_msg {
-	int msg_len;
-	char msg[MAX_CTRL_MSG_LEN];
 };

wpa_supplicant/wpa_cli_zephyr.c

@@ -31,7 +31,6 @@
 #define MAX_ARGS 32
 
 struct wpa_ctrl *ctrl_conn;
-struct wpa_ctrl *mon_conn;
 struct wpa_ctrl *global_ctrl_conn;
 char *ifname_prefix = NULL;
 extern struct wpa_global *global;
@@ -113,103 +112,18 @@ static void wpa_cli_close_connection(struct wpa_supplicant *wpa_s)
 	}
 	wpa_ctrl_close(ctrl_conn);
 	ctrl_conn = NULL;
-
-	eloop_unregister_read_sock(wpa_s->ctrl_iface->mon_sock_pair[0]);
-
-	wpa_ctrl_close(mon_conn);
-	mon_conn = NULL;
-
-	close(wpa_s->ctrl_iface->mon_sock_pair[1]);
-	wpa_s->ctrl_iface->mon_sock_pair[1] = -1;
-}
-
-static void wpa_cli_recv_pending(struct wpa_ctrl *ctrl, struct wpa_supplicant *wpa_s)
-{
-	while (wpa_ctrl_pending(ctrl) > 0) {
-		char buf[sizeof(struct conn_msg)];
-		size_t hlen = sizeof(int);
-		size_t plen = MAX_CTRL_MSG_LEN;
-
-		if (wpa_ctrl_recv(ctrl, buf, &hlen) == 0 &&
-		    hlen == sizeof(int)) {
-			plen = *((int *)buf);
-		} else {
-			wpa_printf(MSG_ERROR, "Could not read pending message header len %d.\n", hlen);
-			continue;
-		}
-
-		if (wpa_ctrl_recv(ctrl, buf + sizeof(int), &plen) == 0) {
-			struct conn_msg *msg = (struct conn_msg *)buf;
-
-			msg->msg[msg->msg_len] = '\0';
-			wpa_printf(MSG_DEBUG, "Received len: %d, msg_len:%d - %s->END\n",
-				   plen, msg->msg_len, msg->msg);
-			if (msg->msg_len >= MAX_CTRL_MSG_LEN) {
-				wpa_printf(MSG_DEBUG, "Too long message received.\n");
-				continue;
-			}
-
-			if (msg->msg_len > 0) {
-				/* Only interested in CTRL-EVENTs */
-				if (strncmp(msg->msg, "CTRL-EVENT", 10) == 0) {
-					if (strncmp(msg->msg, "CTRL-EVENT-SIGNAL-CHANGE", 24) == 0) {
-						supplicant_send_wifi_mgmt_event(wpa_s->ifname,
-									NET_EVENT_WIFI_CMD_SIGNAL_CHANGE,
-									msg->msg, msg->msg_len);
-					} else {
-						supplicant_send_wifi_mgmt_event(wpa_s->ifname,
-									NET_EVENT_WIFI_CMD_SUPPLICANT,
-									msg->msg, msg->msg_len);
-					}
-				} else if (strncmp(msg->msg, "RRM-NEIGHBOR-REP-RECEIVED", 25) == 0) {
-						supplicant_send_wifi_mgmt_event(wpa_s->ifname,
-									NET_EVENT_WIFI_CMD_NEIGHBOR_REP_RECEIVED,
-									msg->msg, msg->msg_len);
-				}
-			}
-		} else {
-			wpa_printf(MSG_INFO, "Could not read pending message.\n");
-		}
-	}
-}
-
-static void wpa_cli_mon_receive(int sock, void *eloop_ctx,
-					      void *sock_ctx)
-{
-	struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)eloop_ctx;
-
-	wpa_cli_recv_pending(mon_conn, wpa_s);
 }
 
 static int wpa_cli_open_connection(struct wpa_supplicant *wpa_s)
 {
-	int ret;
-
 	ctrl_conn = wpa_ctrl_open(wpa_s->ctrl_iface->sock_pair[0]);
 	if (ctrl_conn == NULL) {
 		wpa_printf(MSG_ERROR, "Failed to open control connection to %d",
 			wpa_s->ctrl_iface->sock_pair[0]);
 		return -1;
 	}
 
-	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, wpa_s->ctrl_iface->mon_sock_pair);
-	if (ret != 0) {
-		wpa_printf(MSG_ERROR, "Failed to open monitor connection: %s",
-			    strerror(errno));
-		goto fail;
-	}
-	mon_conn = wpa_ctrl_open(wpa_s->ctrl_iface->mon_sock_pair[0]);
-	if (mon_conn) {
-		if (wpa_ctrl_attach(ctrl_conn) == 0) {
-			eloop_register_read_sock(wpa_s->ctrl_iface->mon_sock_pair[0],
-						wpa_cli_mon_receive, wpa_s, NULL);
-		}
-	}
-
 	return 0;
-fail:
-	wpa_ctrl_close(ctrl_conn);
-	return -1;
 }
 
 static int wpa_cli_open_global_ctrl(void)