[PATCH v2 07/16] udp: Don't create double sockets for -U port

[David Gibson <david@gibson.dropbear.id.au>]

For each IP version udp_socket() has 3 possible calls to sock_l4().  One
is for the "non-spliced" bound socket in the init namespace, one for the
"spliced" bound socket in the init namespace and one for the "spliced"
bound socket in the pasta namespace.

However when this is called to create a socket in the pasta namspeace there
is a logic error which causes it to take the path for the init side spliced
socket as well as the ns socket.  This essentially tries to create two
identical sockets on the ns side.  Unsurprisingly the second bind() call
fails according to strace.

Correct this to only attempt to open one socket within the ns.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 udp.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/udp.c b/udp.c
index 4c87e66..f93dd8b 100644
--- a/udp.c
+++ b/udp.c
@@ -1091,17 +1091,15 @@ void udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
 				    port, uref.u32);
 
 			udp_tap_map[V4][uref.udp.port].sock = s;
-		}
-
-		if (c->mode == MODE_PASTA) {
-			bind_addr = &(uint32_t){ htonl(INADDR_LOOPBACK) };
-			uref.udp.splice = uref.udp.orig = true;
 
-			sock_l4(c, AF_INET, IPPROTO_UDP, bind_addr, ifname,
-				port, uref.u32);
-		}
+			if (c->mode == MODE_PASTA) {
+				bind_addr = &(uint32_t){ htonl(INADDR_LOOPBACK) };
+				uref.udp.splice = uref.udp.orig = true;
 
-		if (ns) {
+				sock_l4(c, AF_INET, IPPROTO_UDP, bind_addr, ifname,
+					port, uref.u32);
+			}
+		} else {
 			uref.udp.splice = uref.udp.orig = uref.udp.ns = true;
 
 			bind_addr = &(uint32_t){ htonl(INADDR_LOOPBACK) };
@@ -1125,17 +1123,15 @@ void udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
 				    port, uref.u32);
 
 			udp_tap_map[V6][uref.udp.port].sock = s;
-		}
-
-		if (c->mode == MODE_PASTA) {
-			bind_addr = &in6addr_loopback;
-			uref.udp.splice = uref.udp.orig = true;
 
-			sock_l4(c, AF_INET6, IPPROTO_UDP, bind_addr, ifname,
-				port, uref.u32);
-		}
+			if (c->mode == MODE_PASTA) {
+				bind_addr = &in6addr_loopback;
+				uref.udp.splice = uref.udp.orig = true;
 
-		if (ns) {
+				sock_l4(c, AF_INET6, IPPROTO_UDP, bind_addr, ifname,
+					port, uref.u32);
+			}
+		} else {
 			bind_addr = &in6addr_loopback;
 			uref.udp.splice = uref.udp.orig = uref.udp.ns = true;
 
-- 
@@ -1091,17 +1091,15 @@ void udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
 				    port, uref.u32);
 
 			udp_tap_map[V4][uref.udp.port].sock = s;
-		}
-
-		if (c->mode == MODE_PASTA) {
-			bind_addr = &(uint32_t){ htonl(INADDR_LOOPBACK) };
-			uref.udp.splice = uref.udp.orig = true;
 
-			sock_l4(c, AF_INET, IPPROTO_UDP, bind_addr, ifname,
-				port, uref.u32);
-		}
+			if (c->mode == MODE_PASTA) {
+				bind_addr = &(uint32_t){ htonl(INADDR_LOOPBACK) };
+				uref.udp.splice = uref.udp.orig = true;
 
-		if (ns) {
+				sock_l4(c, AF_INET, IPPROTO_UDP, bind_addr, ifname,
+					port, uref.u32);
+			}
+		} else {
 			uref.udp.splice = uref.udp.orig = uref.udp.ns = true;
 
 			bind_addr = &(uint32_t){ htonl(INADDR_LOOPBACK) };
@@ -1125,17 +1123,15 @@ void udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
 				    port, uref.u32);
 
 			udp_tap_map[V6][uref.udp.port].sock = s;
-		}
-
-		if (c->mode == MODE_PASTA) {
-			bind_addr = &in6addr_loopback;
-			uref.udp.splice = uref.udp.orig = true;
 
-			sock_l4(c, AF_INET6, IPPROTO_UDP, bind_addr, ifname,
-				port, uref.u32);
-		}
+			if (c->mode == MODE_PASTA) {
+				bind_addr = &in6addr_loopback;
+				uref.udp.splice = uref.udp.orig = true;
 
-		if (ns) {
+				sock_l4(c, AF_INET6, IPPROTO_UDP, bind_addr, ifname,
+					port, uref.u32);
+			}
+		} else {
 			bind_addr = &in6addr_loopback;
 			uref.udp.splice = uref.udp.orig = uref.udp.ns = true;
 
-- 
2.38.1