Make bind failure messages unique

This helps someone know which part of the code is complaining.

Signed-hostap: Ben Greear <greearb@candelatech.com>

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 63fe557e453528e5b453a13fd94fc51975a140b0..52b3bd8c456356718b2da054ea14f87085572412 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -893,7 +893,7 @@ int hostapd_ctrl_iface_init(struct hostapd_data *hapd)
                        }
                        if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) <
                            0) {
-                               perror("bind(PF_UNIX)");
+                               perror("hostapd-ctrl-iface: bind(PF_UNIX)");
                                goto fail;
                        }
                        wpa_printf(MSG_DEBUG, "Successfully replaced leftover "

diff --git a/hostapd/hlr_auc_gw.c b/hostapd/hlr_auc_gw.c
index b59ea1b915ee6754b5eb27dd882f97eb2cec8eb5..3c3a75803de25298bc837000418da608b188a7f5 100644 (file)
--- a/hostapd/hlr_auc_gw.c
+++ b/hostapd/hlr_auc_gw.c
@@ -96,7 +96,7 @@ static int open_socket(const char *path)
        addr.sun_family = AF_UNIX;
        os_strlcpy(addr.sun_path, path, sizeof(addr.sun_path));
        if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               perror("bind(PF_UNIX)");
+               perror("hlr-auc-gw: bind(PF_UNIX)");
                close(s);
                return -1;
        }

diff --git a/src/drivers/driver_privsep.c b/src/drivers/driver_privsep.c
index 81a328a9060ea1f94f2906438db4dadf847718ce..c8916f06136ef75f81faa72078cbce562e5eeedf 100644 (file)
--- a/src/drivers/driver_privsep.c
+++ b/src/drivers/driver_privsep.c
@@ -651,7 +651,7 @@ static int wpa_driver_privsep_set_param(void *priv, const char *param)
        os_strlcpy(addr.sun_path, drv->own_socket_path, sizeof(addr.sun_path));
        if (bind(drv->priv_socket, (struct sockaddr *) &addr, sizeof(addr)) <
            0) {
-               perror("bind(PF_UNIX)");
+               perror("privsep-set-params priv-sock: bind(PF_UNIX)");
                close(drv->priv_socket);
                drv->priv_socket = -1;
                unlink(drv->own_socket_path);
@@ -676,7 +676,7 @@ static int wpa_driver_privsep_set_param(void *priv, const char *param)
        os_strlcpy(addr.sun_path, drv->own_cmd_path, sizeof(addr.sun_path));
        if (bind(drv->cmd_socket, (struct sockaddr *) &addr, sizeof(addr)) < 0)
        {
-               perror("bind(PF_UNIX)");
+               perror("privsep-set-params cmd-sock: bind(PF_UNIX)");
                close(drv->cmd_socket);
                drv->cmd_socket = -1;
                unlink(drv->own_cmd_path);

diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 839bf7415e844e7a6b5d88544d31a606b6a08fa4..b37d9f72961273c5cf69203dbc0f0296c80337ba 100644 (file)
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1275,7 +1275,7 @@ static void * test_driver_init(struct hostapd_data *hapd,
                        alen = sizeof(addr_un);
                }
                if (bind(drv->test_socket, addr, alen) < 0) {
-                       perror("bind(PF_UNIX)");
+                       perror("test-driver-init: bind(PF_UNIX)");
                        close(drv->test_socket);
                        if (drv->own_socket_path)
                                unlink(drv->own_socket_path);
@@ -2252,7 +2252,7 @@ static int wpa_driver_test_attach(struct wpa_driver_test_data *drv,
        os_strlcpy(addr.sun_path, drv->own_socket_path, sizeof(addr.sun_path));
        if (bind(drv->test_socket, (struct sockaddr *) &addr,
                 sizeof(addr)) < 0) {
-               perror("bind(PF_UNIX)");
+               perror("test-driver-attach: bind(PF_UNIX)");
                close(drv->test_socket);
                unlink(drv->own_socket_path);
                os_free(drv->own_socket_path);

diff --git a/src/l2_packet/l2_packet_privsep.c b/src/l2_packet/l2_packet_privsep.c
index aacd76bb4744964e10e3314bb878ff14e653119b..6b117ca2b9076709d3840d06924b363908ce6612 100644 (file)
--- a/src/l2_packet/l2_packet_privsep.c
+++ b/src/l2_packet/l2_packet_privsep.c
@@ -173,7 +173,7 @@ struct l2_packet_data * l2_packet_init(
        addr.sun_family = AF_UNIX;
        os_strlcpy(addr.sun_path, l2->own_socket_path, sizeof(addr.sun_path));
        if (bind(l2->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               perror("bind(PF_UNIX)");
+               perror("l2-pkt-privsep: bind(PF_UNIX)");
                goto fail;
        }
 

diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c
index 65136041a58b3420981958c144e37d7e8b68791b..7bebcb8bf9a5a752800f517f9a0b693476802218 100644 (file)
--- a/wpa_supplicant/ctrl_iface_unix.c
+++ b/wpa_supplicant/ctrl_iface_unix.c
@@ -375,7 +375,7 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
                        }
                        if (bind(priv->sock, (struct sockaddr *) &addr,
                                 sizeof(addr)) < 0) {
-                               perror("bind(PF_UNIX)");
+                               perror("supp-ctrl-iface-init: bind(PF_UNIX)");
                                goto fail;
                        }
                        wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
@@ -667,7 +667,8 @@ wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
        os_strlcpy(addr.sun_path, global->params.ctrl_interface,
                   sizeof(addr.sun_path));
        if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               perror("bind(PF_UNIX)");
+               perror("supp-global-ctrl-iface-init (will try fixup): "
+                      "bind(PF_UNIX)");
                if (connect(priv->sock, (struct sockaddr *) &addr,
                            sizeof(addr)) < 0) {
                        wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
@@ -682,7 +683,7 @@ wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
                        }
                        if (bind(priv->sock, (struct sockaddr *) &addr,
                                 sizeof(addr)) < 0) {
-                               perror("bind(PF_UNIX)");
+                               perror("supp-glb-iface-init: bind(PF_UNIX)");
                                goto fail;
                        }
                        wpa_printf(MSG_DEBUG, "Successfully replaced leftover "

diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index 74476e2397441adc6d38d0482430110a569475e3..ad6a080b942c45b42968fed0623df353ae1037cb 100644 (file)
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -643,7 +643,7 @@ wpa_priv_interface_init(const char *dir, const char *params)
                        }
                        if (bind(iface->fd, (struct sockaddr *) &addr,
                                 sizeof(addr)) < 0) {
-                               perror("bind(PF_UNIX)");
+                               perror("wpa-priv-iface-init: bind(PF_UNIX)");
                                goto fail;
                        }
                        wpa_printf(MSG_DEBUG, "Successfully replaced leftover "