[PATCH 2/2] fwd: Minor cleanup to fwd_nat_from_splice()

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

The order we do things in this function is slightly odd, and we have
a redundant assignment to tgt->oport.  Remove that, and re-order for
clarity.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 fwd.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fwd.c b/fwd.c
index 9b701ad0..961c533f 100644
--- a/fwd.c
+++ b/fwd.c
@@ -660,13 +660,15 @@ uint8_t fwd_nat_from_splice(const struct ctx *c, uint8_t proto,
 		return PIF_NONE;
 	}
 
+	/* Preserve the src & dest (loopback) addresses */
+	tgt->oaddr = ini->eaddr;
 	tgt->eaddr = ini->oaddr;
 
-	/* Preserve the specific loopback address used, but let the kernel pick
-	 * a source port on the target side
-	 */
-	tgt->oaddr = ini->eaddr;
+	/* Let the kernel pick a host side source port */
 	tgt->oport = 0;
+	if (proto == IPPROTO_UDP)
+		/* But for UDP preserve the source port */
+		tgt->oport = ini->eport;
 
 	tgt->eport = ini->oport;
 	if (proto == IPPROTO_TCP)
@@ -674,12 +676,6 @@ uint8_t fwd_nat_from_splice(const struct ctx *c, uint8_t proto,
 	else if (proto == IPPROTO_UDP)
 		tgt->eport += c->udp.fwd_out.delta[tgt->eport];
 
-	/* Let the kernel pick a host side source port */
-	tgt->oport = 0;
-	if (proto == IPPROTO_UDP)
-		/* But for UDP preserve the source port */
-		tgt->oport = ini->eport;
-
 	return PIF_HOST;
 }
 
-- 
2.52.0