If the path is already bound, we close the socket immediately.
A couple of error message fixes.
Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx>
---
input/packet/ulogd_inppkt_UNIXSOCK.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c
index f97c2e174b2d..d88609f203c4 100644
--- a/input/packet/ulogd_inppkt_UNIXSOCK.c
+++ b/input/packet/ulogd_inppkt_UNIXSOCK.c
@@ -479,10 +479,17 @@ static int _create_unix_socket(const char *unix_path)
int s;
struct stat st_dummy;
+ if (stat(unix_path, &st_dummy) == 0 && st_dummy.st_size > 0) {
+ ulogd_log(ULOGD_ERROR,
+ "ulogd2: unix socket '%s' already exists\n",
+ unix_path);
+ return -1;
+ }
+
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
ulogd_log(ULOGD_ERROR,
- "ulogd2: could not create unix socket\n");
+ "ulogd2: could not create unix socket\n");
return -1;
}
@@ -490,19 +497,11 @@ static int _create_unix_socket(const char *unix_path)
strncpy(server_sock.sun_path, unix_path, sizeof(server_sock.sun_path));
server_sock.sun_path[sizeof(server_sock.sun_path)-1] = '\0';
- if (stat(unix_path, &st_dummy) == 0 && st_dummy.st_size > 0) {
- ulogd_log(ULOGD_ERROR,
- "ulogd2: unix socket \'%s\' already exists\n",
- unix_path);
- close(s);
- return -1;
- }
-
ret = bind(s, (struct sockaddr *)&server_sock, sizeof(server_sock));
if (ret < 0) {
ulogd_log(ULOGD_ERROR,
- "ulogd2: could not bind to unix socket \'%s\'\n",
- server_sock.sun_path);
+ "ulogd2: could not bind to unix socket '%s'\n",
+ server_sock.sun_path);
close(s);
return -1;
}
@@ -510,8 +509,8 @@ static int _create_unix_socket(const char *unix_path)
ret = listen(s, 10);
if (ret < 0) {
ulogd_log(ULOGD_ERROR,
- "ulogd2: could not bind to unix socket \'%s\'\n",
- server_sock.sun_path);
+ "ulogd2: could not listen to unix socket '%s'\n",
+ server_sock.sun_path);
close(s);
return -1;
}
--
2.33.0
