Remove unused gid_str pointer update

[mech_eap.git] / wpa_supplicant / ctrl_iface_unix.c

diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c
index faa773d..d4e45de 100644 (file)
--- a/wpa_supplicant/ctrl_iface_unix.c
+++ b/wpa_supplicant/ctrl_iface_unix.c
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant / UNIX domain socket -based control interface
- * Copyright (c) 2004-2013, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2014, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -75,6 +75,7 @@ static int wpa_supplicant_ctrl_iface_attach(struct dl_list *ctrl_dst,
                                            socklen_t fromlen)
 {
        struct wpa_ctrl_dst *dst;
+       char addr_txt[200];
 
        dst = os_zalloc(sizeof(*dst));
        if (dst == NULL)
@@ -83,9 +84,10 @@ static int wpa_supplicant_ctrl_iface_attach(struct dl_list *ctrl_dst,
        dst->addrlen = fromlen;
        dst->debug_level = MSG_INFO;
        dl_list_add(ctrl_dst, &dst->list);
-       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached",
-                   (u8 *) from->sun_path,
-                   fromlen - offsetof(struct sockaddr_un, sun_path));
+       printf_encode(addr_txt, sizeof(addr_txt),
+                     (u8 *) from->sun_path,
+                     fromlen - offsetof(struct sockaddr_un, sun_path));
+       wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor attached %s", addr_txt);
        return 0;
 }
 
@@ -101,10 +103,13 @@ static int wpa_supplicant_ctrl_iface_detach(struct dl_list *ctrl_dst,
                    os_memcmp(from->sun_path, dst->addr.sun_path,
                              fromlen - offsetof(struct sockaddr_un, sun_path))
                    == 0) {
-                       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached",
-                                   (u8 *) from->sun_path,
-                                   fromlen -
-                                   offsetof(struct sockaddr_un, sun_path));
+                       char addr_txt[200];
+                       printf_encode(addr_txt, sizeof(addr_txt),
+                                     (u8 *) from->sun_path,
+                                     fromlen -
+                                     offsetof(struct sockaddr_un, sun_path));
+                       wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor detached %s",
+                                  addr_txt);
                        dl_list_del(&dst->list);
                        os_free(dst);
                        return 0;
@@ -128,11 +133,13 @@ static int wpa_supplicant_ctrl_iface_level(struct ctrl_iface_priv *priv,
                    os_memcmp(from->sun_path, dst->addr.sun_path,
                              fromlen - offsetof(struct sockaddr_un, sun_path))
                    == 0) {
-                       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE changed monitor "
-                                   "level", (u8 *) from->sun_path,
-                                   fromlen -
-                                   offsetof(struct sockaddr_un, sun_path));
+                       char addr_txt[200];
                        dst->debug_level = atoi(level);
+                       printf_encode(addr_txt, sizeof(addr_txt),
+                                     (u8 *) from->sun_path, fromlen -
+                                     offsetof(struct sockaddr_un, sun_path));
+                       wpa_printf(MSG_DEBUG, "CTRL_IFACE changed monitor level to %d for %s",
+                                  dst->debug_level, addr_txt);
                        return 0;
                }
        }
@@ -237,7 +244,7 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
 {
        char *buf;
        size_t len;
-       char *pbuf, *dir = NULL, *gid_str = NULL;
+       char *pbuf, *dir = NULL;
        int res;
 
        if (wpa_s->conf->ctrl_interface == NULL)
@@ -247,12 +254,11 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
        if (pbuf == NULL)
                return NULL;
        if (os_strncmp(pbuf, "DIR=", 4) == 0) {
+               char *gid_str;
                dir = pbuf + 4;
                gid_str = os_strstr(dir, " GROUP=");
-               if (gid_str) {
+               if (gid_str)
                        *gid_str = '\0';
-                       gid_str += 7;
-               }
        } else
                dir = pbuf;
 
@@ -566,7 +572,7 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
 
        if (priv->sock > -1) {
                char *fname;
-               char *buf, *dir = NULL, *gid_str = NULL;
+               char *buf, *dir = NULL;
                eloop_unregister_read_sock(priv->sock);
                if (!dl_list_empty(&priv->ctrl_dst)) {
                        /*
@@ -586,16 +592,17 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
                        os_free(fname);
                }
 
+               if (priv->wpa_s->conf->ctrl_interface == NULL)
+                       goto free_dst;
                buf = os_strdup(priv->wpa_s->conf->ctrl_interface);
                if (buf == NULL)
                        goto free_dst;
                if (os_strncmp(buf, "DIR=", 4) == 0) {
+                       char *gid_str;
                        dir = buf + 4;
                        gid_str = os_strstr(dir, " GROUP=");
-                       if (gid_str) {
+                       if (gid_str)
                                *gid_str = '\0';
-                               gid_str += 7;
-                       }
                } else
                        dir = buf;
 
@@ -674,32 +681,33 @@ static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
        msg.msg_iov = io;
        msg.msg_iovlen = idx;
 
-       idx = -1;
        dl_list_for_each_safe(dst, next, ctrl_dst, struct wpa_ctrl_dst, list) {
                int _errno;
+               char addr_txt[200];
 
-               idx++;
                if (level < dst->debug_level)
                        continue;
 
-               wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send",
-                           (u8 *) dst->addr.sun_path, dst->addrlen -
-                           offsetof(struct sockaddr_un, sun_path));
+               printf_encode(addr_txt, sizeof(addr_txt),
+                             (u8 *) dst->addr.sun_path, dst->addrlen -
+                             offsetof(struct sockaddr_un, sun_path));
                msg.msg_name = (void *) &dst->addr;
                msg.msg_namelen = dst->addrlen;
                if (sendmsg(sock, &msg, MSG_DONTWAIT) >= 0) {
+                       wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor sent successfully to %s",
+                                  addr_txt);
                        dst->errors = 0;
-                       idx++;
                        continue;
                }
 
                _errno = errno;
-               wpa_printf(MSG_INFO, "CTRL_IFACE monitor[%d]: %d - %s",
-                          idx, errno, strerror(errno));
+               wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor[%s]: %d - %s",
+                          addr_txt, errno, strerror(errno));
                dst->errors++;
 
                if (dst->errors > 10 || _errno == ENOENT || _errno == EPERM) {
-                       wpa_printf(MSG_INFO, "CTRL_IFACE: Detach monitor that cannot receive messages");
+                       wpa_printf(MSG_INFO, "CTRL_IFACE: Detach monitor %s that cannot receive messages",
+                               addr_txt);
                        wpa_supplicant_ctrl_iface_detach(ctrl_dst, &dst->addr,
                                                         dst->addrlen);
                }
@@ -722,6 +730,7 @@ static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
                        if (sock < 0) {
                                wpa_dbg(wpa_s, MSG_DEBUG,
                                        "Failed to reinitialize ctrl_iface socket");
+                               break;
                        }
                }
        }
@@ -789,7 +798,7 @@ static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
 {
        struct wpa_global *global = eloop_ctx;
        struct ctrl_iface_global_priv *priv = sock_ctx;
-       char buf[256];
+       char buf[4096];
        int res;
        struct sockaddr_un from;
        socklen_t fromlen = sizeof(from);
@@ -1035,6 +1044,8 @@ wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
                return NULL;
        }
 
+       wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb);
+
        return priv;
 }