host/ippair: fix integer warnings

Ticket: 4516
pull/7242/head
Philippe Antoine 4 years ago committed by Victor Julien
parent b1eaa1e8cd
commit 1cc9762b6a

@ -34,6 +34,7 @@
#include "util-random.h" #include "util-random.h"
#include "util-misc.h" #include "util-misc.h"
#include "util-byte.h" #include "util-byte.h"
#include "util-validate.h"
#include "host-queue.h" #include "host-queue.h"
@ -174,8 +175,10 @@ void HostClearMemory(Host *h)
void HostInitConfig(bool quiet) void HostInitConfig(bool quiet)
{ {
SCLogDebug("initializing host engine..."); SCLogDebug("initializing host engine...");
if (HostStorageSize() > 0) if (HostStorageSize() > 0) {
g_host_size = sizeof(Host) + HostStorageSize(); DEBUG_VALIDATE_BUG_ON(sizeof(Host) + HostStorageSize() > UINT16_MAX);
g_host_size = (uint16_t)(sizeof(Host) + HostStorageSize());
}
memset(&host_config, 0, sizeof(host_config)); memset(&host_config, 0, sizeof(host_config));
//SC_ATOMIC_INIT(flow_flags); //SC_ATOMIC_INIT(flow_flags);

@ -33,6 +33,7 @@
#include "util-random.h" #include "util-random.h"
#include "util-misc.h" #include "util-misc.h"
#include "util-byte.h" #include "util-byte.h"
#include "util-validate.h"
#include "ippair-queue.h" #include "ippair-queue.h"
@ -168,8 +169,10 @@ void IPPairClearMemory(IPPair *h)
void IPPairInitConfig(bool quiet) void IPPairInitConfig(bool quiet)
{ {
SCLogDebug("initializing ippair engine..."); SCLogDebug("initializing ippair engine...");
if (IPPairStorageSize() > 0) if (IPPairStorageSize() > 0) {
g_ippair_size = sizeof(IPPair) + IPPairStorageSize(); DEBUG_VALIDATE_BUG_ON(sizeof(IPPair) + IPPairStorageSize() > UINT16_MAX);
g_ippair_size = (uint16_t)(sizeof(IPPair) + IPPairStorageSize());
}
memset(&ippair_config, 0, sizeof(ippair_config)); memset(&ippair_config, 0, sizeof(ippair_config));
//SC_ATOMIC_INIT(flow_flags); //SC_ATOMIC_INIT(flow_flags);

Loading…
Cancel
Save