These handlers only ever operate on their respective global pools
(pool_tap4 and pool_tap6). The pool parameter was always passed the
same value, making it unnecessary indirection.
Access the global pools directly instead, simplifying the function
signatures.
Signed-off-by: Laurent Vivier
Reviewed-by: David Gibson
---
tap.c | 46 +++++++++++++++++++++-------------------------
1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/tap.c b/tap.c
index 4cba4c785617..4699c5ef9177 100644
--- a/tap.c
+++ b/tap.c
@@ -699,23 +699,21 @@ static bool tap4_is_fragment(const struct iphdr *iph,
/**
* tap4_handler() - IPv4 and ARP packet handler for tap file descriptor
* @c: Execution context
- * @in: Ingress packet pool, packets with Ethernet headers
* @now: Current timestamp
*
* Return: count of packets consumed by handlers
*/
-static int tap4_handler(struct ctx *c, const struct pool *in,
- const struct timespec *now)
+static int tap4_handler(struct ctx *c, const struct timespec *now)
{
unsigned int i, j, seq_count;
struct tap4_l4_t *seq;
- if (!c->ifi4 || !in->count)
- return in->count;
+ if (!c->ifi4 || !pool_tap4->count)
+ return pool_tap4->count;
i = 0;
resume:
- for (seq_count = 0, seq = NULL; i < in->count; i++) {
+ for (seq_count = 0, seq = NULL; i < pool_tap4->count; i++) {
size_t l3len, hlen, l4len;
struct ethhdr eh_storage;
struct iphdr iph_storage;
@@ -725,7 +723,7 @@ resume:
struct iov_tail data;
struct iphdr *iph;
- if (!packet_get(in, i, &data))
+ if (!packet_get(pool_tap4, i, &data))
continue;
eh = IOV_PEEK_HEADER(&data, eh_storage);
@@ -797,7 +795,7 @@ resume:
if (iph->protocol == IPPROTO_UDP) {
struct iov_tail eh_data;
- packet_get(in, i, &eh_data);
+ packet_get(pool_tap4, i, &eh_data);
if (dhcp(c, &eh_data))
continue;
}
@@ -828,7 +826,7 @@ resume:
goto append;
if (seq_count == TAP_SEQS)
- break; /* Resume after flushing if i < in->count */
+ break; /* Resume after flushing if i < pool_tap4->count */
for (seq = tap4_l4 + seq_count - 1; seq >= tap4_l4; seq--) {
if (L4_MATCH(iph, uh, seq)) {
@@ -874,10 +872,10 @@ append:
}
}
- if (i < in->count)
+ if (i < pool_tap4->count)
goto resume;
- return in->count;
+ return pool_tap4->count;
}
#define IPV6_NH_OPT(nh) \
@@ -935,23 +933,21 @@ found:
/**
* tap6_handler() - IPv6 packet handler for tap file descriptor
* @c: Execution context
- * @in: Ingress packet pool, packets with Ethernet headers
* @now: Current timestamp
*
* Return: count of packets consumed by handlers
*/
-static int tap6_handler(struct ctx *c, const struct pool *in,
- const struct timespec *now)
+static int tap6_handler(struct ctx *c, const struct timespec *now)
{
unsigned int i, j, seq_count = 0;
struct tap6_l4_t *seq;
- if (!c->ifi6 || !in->count)
- return in->count;
+ if (!c->ifi6 || !pool_tap6->count)
+ return pool_tap6->count;
i = 0;
resume:
- for (seq_count = 0, seq = NULL; i < in->count; i++) {
+ for (seq_count = 0, seq = NULL; i < pool_tap6->count; i++) {
size_t l4len, plen, check;
struct in6_addr *saddr, *daddr;
struct ipv6hdr ip6h_storage;
@@ -963,7 +959,7 @@ resume:
struct ipv6hdr *ip6h;
uint8_t proto;
- if (!packet_get(in, i, &data))
+ if (!packet_get(pool_tap6, i, &data))
return -1;
eh = IOV_REMOVE_HEADER(&data, eh_storage);
@@ -1076,7 +1072,7 @@ resume:
goto append;
if (seq_count == TAP_SEQS)
- break; /* Resume after flushing if i < in->count */
+ break; /* Resume after flushing if i < pool_tap6->count */
for (seq = tap6_l4 + seq_count - 1; seq >= tap6_l4; seq--) {
if (L4_MATCH(ip6h, proto, uh, seq)) {
@@ -1123,10 +1119,10 @@ append:
}
}
- if (i < in->count)
+ if (i < pool_tap6->count)
goto resume;
- return in->count;
+ return pool_tap6->count;
}
/**
@@ -1145,8 +1141,8 @@ void tap_flush_pools(void)
*/
void tap_handler(struct ctx *c, const struct timespec *now)
{
- tap4_handler(c, pool_tap4, now);
- tap6_handler(c, pool_tap6, now);
+ tap4_handler(c, now);
+ tap6_handler(c, now);
}
/**
@@ -1182,14 +1178,14 @@ void tap_add_packet(struct ctx *c, struct iov_tail *data,
case ETH_P_ARP:
case ETH_P_IP:
if (!pool_can_fit(pool_tap4, data)) {
- tap4_handler(c, pool_tap4, now);
+ tap4_handler(c, now);
pool_flush(pool_tap4);
}
packet_add(pool_tap4, data);
break;
case ETH_P_IPV6:
if (!pool_can_fit(pool_tap6, data)) {
- tap6_handler(c, pool_tap6, now);
+ tap6_handler(c, now);
pool_flush(pool_tap6);
}
packet_add(pool_tap6, data);
--
2.54.0