mirror of
https://passt.top/passt
synced 2024-09-28 10:05:47 +00:00
epoll: Better handling of number of epoll types
As we already did for flow types, use an "EPOLL_NUM_TYPES" isntead of EPOLL_TYPE_MAX, which is a little bit safer and clearer. Add a static assert on the size of the matching names array. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
36dfa8b8fb
commit
70121ca1ec
4
passt.c
4
passt.c
@ -59,7 +59,7 @@
|
|||||||
|
|
||||||
char pkt_buf[PKT_BUF_BYTES] __attribute__ ((aligned(PAGE_SIZE)));
|
char pkt_buf[PKT_BUF_BYTES] __attribute__ ((aligned(PAGE_SIZE)));
|
||||||
|
|
||||||
char *epoll_type_str[EPOLL_TYPE_MAX + 1] = {
|
char *epoll_type_str[] = {
|
||||||
[EPOLL_TYPE_TCP] = "connected TCP socket",
|
[EPOLL_TYPE_TCP] = "connected TCP socket",
|
||||||
[EPOLL_TYPE_TCP_LISTEN] = "listening TCP socket",
|
[EPOLL_TYPE_TCP_LISTEN] = "listening TCP socket",
|
||||||
[EPOLL_TYPE_TCP_TIMER] = "TCP timer",
|
[EPOLL_TYPE_TCP_TIMER] = "TCP timer",
|
||||||
@ -71,6 +71,8 @@ char *epoll_type_str[EPOLL_TYPE_MAX + 1] = {
|
|||||||
[EPOLL_TYPE_TAP_PASST] = "connected qemu socket",
|
[EPOLL_TYPE_TAP_PASST] = "connected qemu socket",
|
||||||
[EPOLL_TYPE_TAP_LISTEN] = "listening qemu socket",
|
[EPOLL_TYPE_TAP_LISTEN] = "listening qemu socket",
|
||||||
};
|
};
|
||||||
|
static_assert(ARRAY_SIZE(epoll_type_str) == EPOLL_NUM_TYPES,
|
||||||
|
"epoll_type_str[] doesn't match enum epoll_type");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* post_handler() - Run periodic and deferred tasks for L4 protocol handlers
|
* post_handler() - Run periodic and deferred tasks for L4 protocol handlers
|
||||||
|
4
passt.h
4
passt.h
@ -70,7 +70,7 @@ enum epoll_type {
|
|||||||
/* socket listening for qemu socket connections */
|
/* socket listening for qemu socket connections */
|
||||||
EPOLL_TYPE_TAP_LISTEN,
|
EPOLL_TYPE_TAP_LISTEN,
|
||||||
|
|
||||||
EPOLL_TYPE_MAX = EPOLL_TYPE_TAP_LISTEN,
|
EPOLL_NUM_TYPES,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -115,7 +115,7 @@ extern char pkt_buf [PKT_BUF_BYTES];
|
|||||||
|
|
||||||
extern char *epoll_type_str[];
|
extern char *epoll_type_str[];
|
||||||
#define EPOLL_TYPE_STR(n) \
|
#define EPOLL_TYPE_STR(n) \
|
||||||
(((uint8_t)(n) <= EPOLL_TYPE_MAX && epoll_type_str[(n)]) ? \
|
(((uint8_t)(n) < EPOLL_NUM_TYPES && epoll_type_str[(n)]) ? \
|
||||||
epoll_type_str[(n)] : "?")
|
epoll_type_str[(n)] : "?")
|
||||||
|
|
||||||
#include <resolv.h> /* For MAXNS below */
|
#include <resolv.h> /* For MAXNS below */
|
||||||
|
Loading…
Reference in New Issue
Block a user