Fix verify_backlog start verification before finish writing

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index 5fdc88ced1192c59df44c7e3f54f3647ff510748..1dc55d5e7cb88d0b1a8ca9a60d2d24fc2f5eefdd 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -94,18 +94,22 @@ static struct fio_option options[] = {
                            .oval = FIO_TYPE_TCP,
                            .help = "Transmission Control Protocol",
                          },
+#ifdef CONFIG_IPV6
                          { .ival = "tcpv6",
                            .oval = FIO_TYPE_TCP_V6,
                            .help = "Transmission Control Protocol V6",
                          },
+#endif
                          { .ival = "udp",
                            .oval = FIO_TYPE_UDP,
                            .help = "User Datagram Protocol",
                          },
+#ifdef CONFIG_IPV6
                          { .ival = "udpv6",
                            .oval = FIO_TYPE_UDP_V6,
                            .help = "User Datagram Protocol V6",
                          },
+#endif
                          { .ival = "unix",
                            .oval = FIO_TYPE_UNIX,
                            .help = "UNIX domain socket",
@@ -1039,12 +1043,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);
 
@@ -1058,6 +1067,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);