net: use SIGTERM for terminate

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index fcf4b8984cd612d1a25d849f2e295ba3935222cf..1d89db1cdcecc4a740b1afe603711ea3a114ba0c 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -945,7 +945,8 @@ static int fio_netio_setup_connect_unix(struct thread_data *td,
        struct sockaddr_un *soun = &nd->addr_un;
 
        soun->sun_family = AF_UNIX;
-       strcpy(soun->sun_path, path);
+       memset(soun->sun_path, 0, sizeof(soun->sun_path));
+       strncpy(soun->sun_path, path, sizeof(soun->sun_path) - 1);
        return 0;
 }
 
@@ -976,7 +977,7 @@ static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
 
        memset(addr, 0, sizeof(*addr));
        addr->sun_family = AF_UNIX;
-       strcpy(addr->sun_path, path);
+       strncpy(addr->sun_path, path, sizeof(addr->sun_path) - 1);
        unlink(path);
 
        len = sizeof(addr->sun_family) + strlen(path) + 1;
@@ -998,13 +999,11 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
        struct netio_options *o = td->eo;
        struct ip_mreq mr;
        struct sockaddr_in sin;
-       struct sockaddr_in6 sin6;
        struct sockaddr *saddr;
        int fd, opt, type, domain;
        socklen_t len;
 
        memset(&sin, 0, sizeof(sin));
-       memset(&sin6, 0, sizeof(sin6));
 
        if (o->proto == FIO_TYPE_TCP) {
                type = SOCK_STREAM;
@@ -1087,11 +1086,12 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                len = sizeof(nd->addr6);
 
                nd->addr6.sin6_family = AF_INET6;
-               nd->addr6.sin6_addr = sin6.sin6_addr.s6_addr ? sin6.sin6_addr : in6addr_any;
+               nd->addr6.sin6_addr = in6addr_any;
                nd->addr6.sin6_port = htons(port);
        }
 
        if (bind(fd, saddr, len) < 0) {
+               close(fd);
                td_verror(td, errno, "bind");
                return 1;
        }
@@ -1213,7 +1213,7 @@ static int fio_netio_setup(struct thread_data *td)
 
 static void fio_netio_terminate(struct thread_data *td)
 {
-       kill(td->pid, SIGUSR2);
+       kill(td->pid, SIGTERM);
 }
 
 #ifdef CONFIG_LINUX_SPLICE