From 5e12d23acbda8871848c6221a4f14e5b7daff66f Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 22 Jul 2022 15:31:17 +1000 Subject: Separate IPv4 and IPv6 configuration After recent changes, conf_ip() now has essentially entirely disjoint paths for IPv4 and IPv6 configuration. So, it's cleaner to split them out into different functions conf_ip4() and conf_ip6(). Splitting these out also lets us make the interface a bit nicer, having them return success or failure directly, rather than manipulating c->v4 and c->v6 to indicate success/failure of the two versions. Since these functions may also initialize the interface index for each protocol, it turns out we can then drop c->v4 and c->v6 entirely, replacing tests on those with tests on whether c->ifi4 or c->ifi6 is non-zero (since a 0 interface index is never valid). Signed-off-by: David Gibson [sbrivio: Whitespace fixes] Signed-off-by: Stefano Brivio --- passt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'passt.c') diff --git a/passt.c b/passt.c index 01eed1b..5d0b3cd 100644 --- a/passt.c +++ b/passt.c @@ -365,10 +365,10 @@ int main(int argc, char **argv) proto_update_l2_buf(c.mac_guest, c.mac, &c.addr4); - if (c.v4 && !c.no_dhcp) + if (c.ifi4 && !c.no_dhcp) dhcp_init(); - if (c.v6 && !c.no_dhcpv6) + if (c.ifi6 && !c.no_dhcpv6) dhcpv6_init(&c); if (c.debug) -- cgit v1.2.3