From 57da5c8bdb5dcd4e99eac2c532b20a4a2107b94e Mon Sep 17 00:00:00 2001 From: Christian Deacon Date: Sun, 17 May 2020 22:45:07 +0000 Subject: [PATCH] Changed blocktime from uint16_t to uint64_t. --- src/config.c | 4 ++-- src/include/xdpfw.h | 5 +++-- src/xdpfw_loader.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index a565920..5629f41 100644 --- a/src/config.c +++ b/src/config.c @@ -281,9 +281,9 @@ int ReadConfig(struct config_map *cfg) } // Block time (default 1). - int blocktime; + long long blocktime; - if (config_setting_lookup_int(filter, "blocktime", &blocktime)) + if (config_setting_lookup_int64(filter, "blocktime", &blocktime)) { cfg->filters[i].blockTime = blocktime; } diff --git a/src/include/xdpfw.h b/src/include/xdpfw.h index 74a9763..8f088b3 100644 --- a/src/include/xdpfw.h +++ b/src/include/xdpfw.h @@ -6,6 +6,7 @@ #define MAX_PCKT_LENGTH 65535 #define MAX_FILTERS 50 #define MAX_TRACK_IPS 100000 +#define MAX_PAYLOAD_LENGTH 1500 struct tcpopts { @@ -91,9 +92,9 @@ struct filter unsigned int do_bps : 1; uint64_t bps; - uint16_t blockTime; + uint64_t blockTime; - uint8_t payloadMatch[MAX_PCKT_LENGTH]; + uint8_t payloadMatch[MAX_PAYLOAD_LENGTH]; uint16_t payloadLen; struct tcpopts tcpopts; diff --git a/src/xdpfw_loader.c b/src/xdpfw_loader.c index d92ca26..8b72ef7 100644 --- a/src/xdpfw_loader.c +++ b/src/xdpfw_loader.c @@ -344,7 +344,7 @@ int main(int argc, char *argv[]) fprintf(stdout, "TOS => %" PRIu8 "\n", conf->filters[i].tos); fprintf(stdout, "PPS => %" PRIu64 "\n", conf->filters[i].pps); fprintf(stdout, "BPS => %" PRIu64 "\n\n", conf->filters[i].bps); - fprintf(stdout, "Block Time => %" PRIu16 "\n\n", conf->filters[i].blockTime); + fprintf(stdout, "Block Time => %" PRIu64 "\n\n", conf->filters[i].blockTime); // TCP Options. fprintf(stdout, "TCP Enabled => %" PRIu8 "\n", conf->filters[i].tcpopts.enabled);