aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-11-30 15:13:05 +1100
committerStefano Brivio <sbrivio@redhat.com>2022-12-06 07:41:28 +0100
commit85172392435613c8b5145c1fb36ce6e134851c7d (patch)
tree5247ee246baf4e86a1a95995e2f34eb782212926
parent1cd684b09b19e28e5832482a438f04254a757c1d (diff)
downloadpasst-85172392435613c8b5145c1fb36ce6e134851c7d.tar
passt-85172392435613c8b5145c1fb36ce6e134851c7d.tar.gz
passt-85172392435613c8b5145c1fb36ce6e134851c7d.tar.bz2
passt-85172392435613c8b5145c1fb36ce6e134851c7d.tar.lz
passt-85172392435613c8b5145c1fb36ce6e134851c7d.tar.xz
passt-85172392435613c8b5145c1fb36ce6e134851c7d.tar.zst
passt-85172392435613c8b5145c1fb36ce6e134851c7d.zip
udp: Remove the @bound field from union udp_epoll_ref
We set this field, but nothing ever checked it. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--udp.c8
-rw-r--r--udp.h3
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