diff options
| -rw-r--r-- | udp.c | 15 | ||||
| -rw-r--r-- | udp_vu.c | 9 | ||||
| -rw-r--r-- | udp_vu.h | 3 |
3 files changed, 8 insertions, 19 deletions
@@ -758,27 +758,21 @@ void udp_listen_sock_handler(const struct ctx *c, * @c: Execution context * @s: Socket to read data from * @tosidx: Flow & side to forward data from @s to - * @now: Current timestamp * * Return: true on success, false if can't forward from socket to flow's pif * * #syscalls recvmmsg */ static bool udp_buf_reply_sock_data(const struct ctx *c, - int s, flow_sidx_t tosidx, - const struct timespec *now) + int s, flow_sidx_t tosidx) { const struct flowside *toside = flowside_at_sidx(tosidx); - struct udp_flow *uflow = udp_at_sidx(tosidx); uint8_t topif = pif_at_sidx(tosidx); int n, i; if ((n = udp_sock_recv(c, s, udp_mh_recv)) <= 0) return true; - flow_trace(uflow, "Received %d datagrams on reply socket", n); - uflow->ts = now->tv_sec; - for (i = 0; i < n; i++) { if (pif_is_socket(topif)) udp_splice_prepare(udp_mh_recv, i); @@ -825,10 +819,13 @@ void udp_reply_sock_handler(const struct ctx *c, union epoll_ref ref, int s = ref.fd; bool ret; + flow_trace(uflow, "Received data on reply socket"); + uflow->ts = now->tv_sec; + if (c->mode == MODE_VU) - ret = udp_vu_reply_sock_data(c, s, tosidx, now); + ret = udp_vu_reply_sock_data(c, s, tosidx); else - ret = udp_buf_reply_sock_data(c, s, tosidx, now); + ret = udp_buf_reply_sock_data(c, s, tosidx); if (!ret) { flow_err(uflow, "Unable to forward UDP"); @@ -275,22 +275,17 @@ void udp_vu_listen_sock_data(const struct ctx *c, union epoll_ref ref, * @c: Execution context * @s: Socket to read data from * @tosidx: Flow & side to forward data from @s to - * @now: Current timestamp * * Return: true on success, false if can't forward from socket to flow's pif */ -bool udp_vu_reply_sock_data(const struct ctx *c, int s, flow_sidx_t tosidx, - const struct timespec *now) +bool udp_vu_reply_sock_data(const struct ctx *c, int s, flow_sidx_t tosidx) { const struct flowside *toside = flowside_at_sidx(tosidx); bool v6 = !(inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)); - struct udp_flow *uflow = udp_at_sidx(tosidx); struct vu_dev *vdev = c->vdev; struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; int i; - ASSERT(uflow); - if (pif_at_sidx(tosidx) != PIF_TAP) return false; @@ -301,8 +296,6 @@ bool udp_vu_reply_sock_data(const struct ctx *c, int s, flow_sidx_t tosidx, iov_used = udp_vu_sock_recv(c, s, v6, &dlen); if (iov_used <= 0) break; - flow_trace(uflow, "Received 1 datagram on reply socket"); - uflow->ts = now->tv_sec; udp_vu_prepare(c, toside, dlen); if (*c->pcap) { @@ -8,7 +8,6 @@ void udp_vu_listen_sock_data(const struct ctx *c, union epoll_ref ref, const struct timespec *now); -bool udp_vu_reply_sock_data(const struct ctx *c, int s, flow_sidx_t tosidx, - const struct timespec *now); +bool udp_vu_reply_sock_data(const struct ctx *c, int s, flow_sidx_t tosidx); #endif /* UDP_VU_H */ |