engine: more checks on IPv6 and multicast

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index 4ba4a5f80b82edea9e30566d7fc48e5b309a900a..4be106a28307e20db7ee26d315877b41d081ffec 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -857,13 +857,17 @@ static int fio_fill_addr(struct thread_data *td, const char *host, int af,
                return 0;
 
        memset(&hints, 0, sizeof(hints));
-       hints.ai_family = AF_UNSPEC;
 
        if (is_tcp(o))
                hints.ai_socktype = SOCK_STREAM;
        else
                hints.ai_socktype = SOCK_DGRAM;
 
+       if (is_ipv6(o))
+               hints.ai_family = AF_INET6;
+       else
+               hints.ai_family = AF_INET;
+
        ret = getaddrinfo(host, NULL, &hints, res);
        if (ret) {
                int e = EINVAL;
@@ -1035,12 +1039,17 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
        }
 #endif
 
-       if (td->o.filename){
+       if (td->o.filename) {
                if (!is_udp(o) || !fio_netio_is_multicast(td->o.filename)) {
                        log_err("fio: hostname not valid for non-multicast inbound network IO\n");
                        close(fd);
                        return 1;
                }
+               if (is_ipv6(o)) {
+                       log_err("fio: IPv6 not supported for multicast network IO");
+                       close(fd);
+                       return 1;
+               }
 
                inet_aton(td->o.filename, &sin.sin_addr);
 
@@ -1054,6 +1063,7 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                } else {
                        mr.imr_interface.s_addr = htonl(INADDR_ANY);
                }
+
                if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const char*)&mr, sizeof(mr)) < 0) {
                        td_verror(td, errno, "setsockopt IP_ADD_MEMBERSHIP");
                        close(fd);