server: unlink sock file if interrupted early

[fio.git] / server.c

diff --git a/server.c b/server.c
index 6e96b77a46432cc3371d9cf1fb4f28e8555a39c9..d72835b72690148fc78662fb99599465e2836a55 100644 (file)
--- a/server.c
+++ b/server.c
@@ -840,7 +840,8 @@ static int handle_connection(int sk)
 static int accept_loop(int listen_sk)
 {
        struct sockaddr_in addr;
-       socklen_t len = sizeof(addr);
+       struct sockaddr_in6 addr6;
+       socklen_t len = use_ipv6 ? sizeof(addr6) : sizeof(addr);
        struct pollfd pfd;
        int ret = 0, sk, flags, exitval = 0;
        FLIST_HEAD(conn_list);
@@ -852,6 +853,8 @@ static int accept_loop(int listen_sk)
        fcntl(listen_sk, F_SETFL, flags);
 
        while (!exit_backend) {
+               const char *from;
+               char buf[64];
                pid_t pid;
 
                pfd.fd = listen_sk;
@@ -882,13 +885,22 @@ static int accept_loop(int listen_sk)
                if (exit_backend || ret < 0)
                        break;
 
-               sk = accept(listen_sk, (struct sockaddr *) &addr, &len);
+               if (use_ipv6)
+                       sk = accept(listen_sk, (struct sockaddr *) &addr6, &len);
+               else
+                       sk = accept(listen_sk, (struct sockaddr *) &addr, &len);
+
                if (sk < 0) {
                        log_err("fio: accept: %s\n", strerror(errno));
                        return -1;
                }
 
-               dprint(FD_NET, "server: connect from %s\n", inet_ntoa(addr.sin_addr));
+               if (use_ipv6)
+                       from = inet_ntop(AF_INET6, (struct sockaddr *) &addr6.sin6_addr, buf, sizeof(buf));
+               else
+                       from = inet_ntop(AF_INET, (struct sockaddr *) &addr.sin_addr, buf, sizeof(buf));
+
+               dprint(FD_NET, "server: connect from %s\n", from);
 
                pid = fork();
                if (pid) {
@@ -975,9 +987,9 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
 
        memset(&p, 0, sizeof(p));
 
-       strcpy(p.ts.name, ts->name);
-       strcpy(p.ts.verror, ts->verror);
-       strcpy(p.ts.description, ts->description);
+       strncpy(p.ts.name, ts->name, FIO_JOBNAME_SIZE - 1);
+       strncpy(p.ts.verror, ts->verror, FIO_VERROR_SIZE - 1);
+       strncpy(p.ts.description, ts->description, FIO_JOBDESC_SIZE - 1);
 
        p.ts.error              = cpu_to_le32(ts->error);
        p.ts.thread_number      = cpu_to_le32(ts->thread_number);
@@ -1126,7 +1138,7 @@ static int fio_send_cmd_ext_pdu(int sk, uint16_t opcode, const void *buf,
        struct fio_net_cmd cmd;
        struct iovec iov[2];
 
-       iov[0].iov_base = &cmd;
+       iov[0].iov_base = (void *) &cmd;
        iov[0].iov_len = sizeof(cmd);
        iov[1].iov_base = (void *) buf;
        iov[1].iov_len = size;
@@ -1255,6 +1267,8 @@ static int fio_init_server_ip(void)
 {
        struct sockaddr *addr;
        socklen_t socklen;
+       char buf[80];
+       const char *str;
        int sk, opt;
 
        if (use_ipv6)
@@ -1282,17 +1296,24 @@ static int fio_init_server_ip(void)
 #endif
 
        if (use_ipv6) {
+               const void *src = &saddr_in6.sin6_addr;
+
                addr = (struct sockaddr *) &saddr_in6;
                socklen = sizeof(saddr_in6);
                saddr_in6.sin6_family = AF_INET6;
+               str = inet_ntop(AF_INET6, src, buf, sizeof(buf));
        } else {
+               const void *src = &saddr_in.sin_addr;
+
                addr = (struct sockaddr *) &saddr_in;
                socklen = sizeof(saddr_in);
                saddr_in.sin_family = AF_INET;
+               str = inet_ntop(AF_INET, src, buf, sizeof(buf));
        }
 
        if (bind(sk, addr, socklen) < 0) {
                log_err("fio: bind: %s\n", strerror(errno));
+               log_info("fio: failed with IPv%c %s\n", use_ipv6 ? '6' : '4', str);
                close(sk);
                return -1;
        }
@@ -1318,7 +1339,6 @@ static int fio_init_server_sock(void)
        memset(&addr, 0, sizeof(addr));
        addr.sun_family = AF_UNIX;
        strcpy(addr.sun_path, bind_sock);
-       unlink(bind_sock);
 
        len = sizeof(addr.sun_family) + strlen(bind_sock) + 1;
 
@@ -1380,41 +1400,38 @@ static int fio_init_server_connection(void)
        return sk;
 }
 
-int fio_server_parse_host(const char *host, int *ipv6, struct in_addr *inp,
+int fio_server_parse_host(const char *host, int ipv6, struct in_addr *inp,
                          struct in6_addr *inp6)
 
 {
        int ret = 0;
 
-       if (*ipv6)
+       if (ipv6)
                ret = inet_pton(AF_INET6, host, inp6);
        else
                ret = inet_pton(AF_INET, host, inp);
 
        if (ret != 1) {
-               struct hostent *hent;
+               struct addrinfo hints, *res;
 
-               hent = gethostbyname(host);
-               if (!hent) {
-                       log_err("fio: failed to resolve <%s>\n", host);
-                       return 0;
-               }
+               memset(&hints, 0, sizeof(hints));
+               hints.ai_family = ipv6 ? AF_INET6 : AF_INET;
+               hints.ai_socktype = SOCK_STREAM;
 
-               if (*ipv6) {
-                       if (hent->h_addrtype != AF_INET6) {
-                               log_info("fio: falling back to IPv4\n");
-                               *ipv6 = 0;
-                       } else
-                               memcpy(inp6, hent->h_addr_list[0], 16);
-               }
-               if (!*ipv6) {
-                       if (hent->h_addrtype != AF_INET) {
-                               log_err("fio: lookup type mismatch\n");
-                               return 0;
-                       }
-                       memcpy(inp, hent->h_addr_list[0], 4);
+               ret = getaddrinfo(host, NULL, &hints, &res);
+               if (ret) {
+                       log_err("fio: failed to resolve <%s> (%s)\n", host,
+                                       gai_strerror(ret));
+                       return 1;
                }
+
+               if (ipv6)
+                       memcpy(inp6, &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr, sizeof(*inp6));
+               else
+                       memcpy(inp, &((struct sockaddr_in *) res->ai_addr)->sin_addr, sizeof(*inp));
+
                ret = 1;
+               freeaddrinfo(res);
        }
 
        return !(ret == 1);
@@ -1476,7 +1493,7 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
        }
 
        /*
-        * If no port seen yet, check if there's a last ':' at the end
+        * If no port seen yet, check if there's a last ',' at the end
         */
        if (!lport) {
                portp = strchr(host, ',');
@@ -1499,7 +1516,7 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
 
        *ptr = strdup(host);
 
-       if (fio_server_parse_host(*ptr, ipv6, inp, inp6)) {
+       if (fio_server_parse_host(*ptr, *ipv6, inp, inp6)) {
                free(*ptr);
                *ptr = NULL;
                return 1;
@@ -1549,6 +1566,22 @@ out:
        return ret;
 }
 
+static void sig_int(int sig)
+{
+       if (bind_sock)
+               unlink(bind_sock);
+}
+
+static void set_sig_handlers(void)
+{
+       struct sigaction act;
+
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = sig_int;
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+}
+
 static int fio_server(void)
 {
        int sk, ret;
@@ -1562,6 +1595,8 @@ static int fio_server(void)
        if (sk < 0)
                return -1;
 
+       set_sig_handlers();
+
        ret = accept_loop(sk);
 
        close(sk);