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 --- tap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tap.c') diff --git a/tap.c b/tap.c index 43a7372..8d552e9 100644 --- a/tap.c +++ b/tap.c @@ -318,7 +318,7 @@ static int tap4_handler(struct ctx *c, const struct pool *in, unsigned int i, j, seq_count; struct tap4_l4_t *seq; - if (!c->v4 || !in->count) + if (!c->ifi4 || !in->count) return in->count; i = 0; @@ -471,7 +471,7 @@ static int tap6_handler(struct ctx *c, const struct pool *in, unsigned int i, j, seq_count = 0; struct tap6_l4_t *seq; - if (!c->v6 || !in->count) + if (!c->ifi6 || !in->count) return in->count; i = 0; -- cgit v1.2.3