do {
if (is_udp(o)) {
- struct sockaddr *to;
+ const struct sockaddr *to;
socklen_t len;
if (is_ipv6(o)) {
ret = 0; /* must be a SYNC */
if (ret != (int) io_u->xfer_buflen) {
- if (ret >= 0) {
+ if (ret > 0) {
io_u->resid = io_u->xfer_buflen - ret;
io_u->error = 0;
return FIO_Q_COMPLETED;
- } else {
+ } else if (!ret)
+ return FIO_Q_BUSY;
+ else {
int err = errno;
if (ddir == DDIR_WRITE && err == EMSGSIZE)
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;
}
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;
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;
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;
}
if (!td->files_index) {
add_file(td, td->o.filename ?: "net", 0, 0);
td->o.nr_files = td->o.nr_files ?: 1;
+ td->o.open_files++;
}
if (!td->io_ops->data) {
static void fio_netio_terminate(struct thread_data *td)
{
- kill(td->pid, SIGUSR2);
+ kill(td->pid, SIGTERM);
}
#ifdef CONFIG_LINUX_SPLICE