From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v4 05/16] udp: Remove the @bound field from union udp_epoll_ref
Date: Wed, 30 Nov 2022 15:13:05 +1100 [thread overview]
Message-ID: <20221130041316.2539575-6-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20221130041316.2539575-1-david@gibson.dropbear.id.au>
We set this field, but nothing ever checked it.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
udp.c | 8 +++-----
udp.h | 3 +--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/udp.c b/udp.c
index 42dd1ea..da0728a 100644
--- a/udp.c
+++ b/udp.c
@@ -951,8 +951,7 @@ int udp_tap_handler(struct ctx *c, int af, const void *addr,
sl = sizeof(s_in);
if (!(s = udp_tap_map[V4][src].sock)) {
- union udp_epoll_ref uref = { .udp.bound = 1,
- .udp.port = src };
+ union udp_epoll_ref uref = { .udp.port = src };
s = sock_l4(c, AF_INET, IPPROTO_UDP, NULL, NULL, src,
uref.u32);
@@ -1004,8 +1003,7 @@ int udp_tap_handler(struct ctx *c, int af, const void *addr,
}
if (!(s = udp_tap_map[V6][src].sock)) {
- union udp_epoll_ref uref = { .udp.bound = 1,
- .udp.v6 = 1,
+ union udp_epoll_ref uref = { .udp.v6 = 1,
.udp.port = src };
s = sock_l4(c, AF_INET6, IPPROTO_UDP, bind_addr, NULL,
@@ -1068,7 +1066,7 @@ int udp_tap_handler(struct ctx *c, int af, const void *addr,
void udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
const void *addr, const char *ifname, in_port_t port)
{
- union udp_epoll_ref uref = { .udp.bound = 1 };
+ union udp_epoll_ref uref = { .u32 = 0 };
const void *bind_addr;
int s;
diff --git a/udp.h b/udp.h
index 2ac8610..43bd28a 100644
--- a/udp.h
+++ b/udp.h
@@ -29,8 +29,7 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s,
*/
union udp_epoll_ref {
struct {
- uint32_t bound:1,
- splice:3,
+ uint32_t splice:3,
#define UDP_TO_NS 1
#define UDP_TO_INIT 2
#define UDP_BACK_TO_NS 3
--
@@ -29,8 +29,7 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s,
*/
union udp_epoll_ref {
struct {
- uint32_t bound:1,
- splice:3,
+ uint32_t splice:3,
#define UDP_TO_NS 1
#define UDP_TO_INIT 2
#define UDP_BACK_TO_NS 3
--
2.38.1
next prev parent reply other threads:[~2022-11-30 4:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 4:13 [PATCH v4 00/16] Simplify and correct handling of "spliced" UDP forwarding David Gibson
2022-11-30 4:13 ` [PATCH v4 01/16] udp: Also bind() connected ports for "splice" forwarding David Gibson
2022-11-30 4:13 ` [PATCH v4 02/16] udp: Separate tracking of inbound and outbound packet flows David Gibson
2022-11-30 4:13 ` [PATCH v4 03/16] udp: Always use sendto() rather than send() for forwarding spliced packets David Gibson
2022-11-30 4:13 ` [PATCH v4 04/16] udp: Don't connect "forward" sockets for spliced flows David Gibson
2022-11-30 4:13 ` David Gibson [this message]
2022-11-30 4:13 ` [PATCH v4 06/16] udp: Split splice field in udp_epoll_ref into (mostly) independent bits David Gibson
2022-11-30 4:13 ` [PATCH v4 07/16] udp: Don't create double sockets for -U port David Gibson
2022-11-30 4:13 ` [PATCH v4 08/16] udp: Re-use fixed bound sockets for packet forwarding when possible David Gibson
2022-11-30 4:13 ` [PATCH v4 09/16] udp: Don't explicitly track originating socket for spliced "connections" David Gibson
2022-11-30 4:13 ` [PATCH v4 10/16] udp: Update UDP "connection" timestamps in both directions David Gibson
2022-11-30 4:13 ` [PATCH v4 11/16] udp: Simplify udp_sock_handler_splice David Gibson
2022-11-30 4:13 ` [PATCH v4 12/16] udp: Make UDP_SPLICE_FRAMES and UDP_TAP_FRAMES_MEM the same thing David Gibson
2022-11-30 4:13 ` [PATCH v4 13/16] udp: Add helper to extract port from a sockaddr_in or sockaddr_in6 David Gibson
2022-11-30 4:13 ` [PATCH v4 14/16] udp: Unify buffers for tap and splice paths David Gibson
2022-11-30 4:13 ` [PATCH v4 15/16] udp: Split send half of udp_sock_handler_splice() from the receive half David Gibson
2022-11-30 4:13 ` [PATCH v4 16/16] udp: Correct splice forwarding when receiving from multiple sources David Gibson
2022-12-06 6:45 ` [PATCH v4 00/16] Simplify and correct handling of "spliced" UDP forwarding Stefano Brivio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221130041316.2539575-6-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).