}
static int
-netdev_pltap_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_pltap_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
{
+ size_t size = ofpbuf_tailroom(buffer);
struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
struct tun_pi pi;
struct iovec iov[2] = {
{ .iov_base = &pi, .iov_len = sizeof(pi) },
- { .iov_base = buffer, .iov_len = size }
+ { .iov_base = buffer->data, .iov_len = size }
};
for (;;) {
ssize_t retval;
retval = readv(rx->fd, iov, 2);
if (retval >= 0) {
if (retval <= size) {
- return retval;
+ buffer->size += retval;
+ return 0;
} else {
- return -EMSGSIZE;
+ return EMSGSIZE;
}
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
netdev_rx_get_name(rx_), ovs_strerror(errno));
}
- return -errno;
+ return errno;
}
}
}
netdev_pltap_update_flags,
- netdev_pltap_change_seq,
-
netdev_pltap_rx_alloc,
netdev_pltap_rx_construct,
netdev_pltap_rx_destruct,