fwd_nat_from_splice() has several cases that deal with the possibility of ini->oaddr being unspecified. That used to be a possible case, but since e3c4c4175ce6 ("tcp: Always populate oaddr field for socket initiated flows") and 59cc89f4cc01 ("udp, udp_flow: Track our specific address on socket interfaces") we now always populate ini->oaddr with a specified address for all flows. Remove the now-unnecessary fallback logic. Signed-off-by: David Gibson --- fwd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fwd.c b/fwd.c index 44a0e109..9b701ad0 100644 --- a/fwd.c +++ b/fwd.c @@ -650,7 +650,7 @@ uint8_t fwd_nat_from_splice(const struct ctx *c, uint8_t proto, const struct flowside *ini, struct flowside *tgt) { if (!inany_is_loopback(&ini->eaddr) || - (!inany_is_loopback(&ini->oaddr) && !inany_is_unspecified(&ini->oaddr))) { + !inany_is_loopback(&ini->oaddr)) { char estr[INANY_ADDRSTRLEN], fstr[INANY_ADDRSTRLEN]; debug("Non loopback address on %s: [%s]:%hu -> [%s]:%hu", @@ -660,12 +660,7 @@ uint8_t fwd_nat_from_splice(const struct ctx *c, uint8_t proto, return PIF_NONE; } - if (!inany_is_unspecified(&ini->oaddr)) - tgt->eaddr = ini->oaddr; - else if (inany_v4(&ini->oaddr)) - tgt->eaddr = inany_loopback4; - else - tgt->eaddr = inany_loopback6; + tgt->eaddr = ini->oaddr; /* Preserve the specific loopback address used, but let the kernel pick * a source port on the target side -- 2.52.0