projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: load improvements
[fio.git]
/
engines
/
net.c
diff --git
a/engines/net.c
b/engines/net.c
index 4be106a28307e20db7ee26d315877b41d081ffec..1df8d0635cf1b746ae7d597d1b4b4398f0019d2d 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",
},
.oval = FIO_TYPE_TCP,
.help = "Transmission Control Protocol",
},
+#ifdef CONFIG_IPV6
{ .ival = "tcpv6",
.oval = FIO_TYPE_TCP_V6,
.help = "Transmission Control Protocol V6",
},
{ .ival = "tcpv6",
.oval = FIO_TYPE_TCP_V6,
.help = "Transmission Control Protocol V6",
},
+#endif
{ .ival = "udp",
.oval = FIO_TYPE_UDP,
.help = "User Datagram Protocol",
},
{ .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",
},
{ .ival = "udpv6",
.oval = FIO_TYPE_UDP_V6,
.help = "User Datagram Protocol V6",
},
+#endif
{ .ival = "unix",
.oval = FIO_TYPE_UNIX,
.help = "UNIX domain socket",
{ .ival = "unix",
.oval = FIO_TYPE_UNIX,
.help = "UNIX domain socket",
@@
-909,10
+913,10
@@
static int fio_netio_setup_connect_inet(struct thread_data *td,
if (is_ipv6(o)) {
af = AF_INET6;
if (is_ipv6(o)) {
af = AF_INET6;
- dst = &nd->addr6;
+ dst = &nd->addr6
.sin6_addr
;
} else {
af = AF_INET;
} else {
af = AF_INET;
- dst = &nd->addr;
+ dst = &nd->addr
.sin_addr
;
}
if (fio_fill_addr(td, host, af, dst, &res))
}
if (fio_fill_addr(td, host, af, dst, &res))
@@
-1190,7
+1194,7
@@
static int fio_netio_setup(struct thread_data *td)
struct netio_data *nd;
if (!td->files_index) {
struct netio_data *nd;
if (!td->files_index) {
- add_file(td, td->o.filename ?: "net");
+ add_file(td, td->o.filename ?: "net"
, 0, 0
);
td->o.nr_files = td->o.nr_files ?: 1;
}
td->o.nr_files = td->o.nr_files ?: 1;
}