Skip to content

detect: fix SCTime_t -Wshorten-64-to-32 warnings #13189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
catenacyber wants to merge 1 commit into from
Closed

detect: fix SCTime_t -Wshorten-64-to-32 warnings #13189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/detect-engine-threshold.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void ThresholdDestroy(void)
typedef struct ThresholdEntry_ {
uint32_t key[5];

uint32_t tv_timeout; /**< Timeout for new_action (for rate_filter)
uint64_t tv_timeout; /**< Timeout for new_action (for rate_filter)
its not "seconds", that define the time interval */
uint32_t seconds; /**< Event seconds */
uint32_t current_count; /**< Var for count control */
Expand Down
4 changes: 2 additions & 2 deletions src/detect-tag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ typedef struct DetectTagDataEntry_ {
uint32_t packets; /**< number of packets (metric packets) */
uint32_t bytes; /**< number of bytes (metric bytes) */
};
uint32_t first_ts; /**< First time seen (for metric = seconds) */
uint32_t last_ts; /**< Last time seen (to prune old sessions) */
uint64_t first_ts; /**< First time seen (for metric = seconds) */
uint64_t last_ts; /**< Last time seen (to prune old sessions) */
#if __WORDSIZE == 64
uint32_t pad1;
#endif
Expand Down
10 changes: 5 additions & 5 deletions src/host-bit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static XBit *HostBitGet(Host *h, uint32_t idx)
}

/* add a flowbit to the flow */
static void HostBitAdd(Host *h, uint32_t idx, uint32_t expire)
static void HostBitAdd(Host *h, uint32_t idx, uint64_t expire)
{
XBit *fb = HostBitGet(h, idx);
if (fb == NULL) {
Expand Down Expand Up @@ -128,7 +128,7 @@ static void HostBitRemove(Host *h, uint32_t idx)
}
}

void HostBitSet(Host *h, uint32_t idx, uint32_t expire)
void HostBitSet(Host *h, uint32_t idx, uint64_t expire)
{
XBit *fb = HostBitGet(h, idx);
if (fb == NULL) {
Expand All @@ -144,7 +144,7 @@ void HostBitUnset(Host *h, uint32_t idx)
}
}

void HostBitToggle(Host *h, uint32_t idx, uint32_t expire)
void HostBitToggle(Host *h, uint32_t idx, uint64_t expire)
{
XBit *fb = HostBitGet(h, idx);
if (fb != NULL) {
Expand All @@ -154,7 +154,7 @@ void HostBitToggle(Host *h, uint32_t idx, uint32_t expire)
}
}

int HostBitIsset(Host *h, uint32_t idx, uint32_t ts)
int HostBitIsset(Host *h, uint32_t idx, uint64_t ts)
{
XBit *fb = HostBitGet(h, idx);
if (fb != NULL) {
Expand All @@ -167,7 +167,7 @@ int HostBitIsset(Host *h, uint32_t idx, uint32_t ts)
return 0;
}

int HostBitIsnotset(Host *h, uint32_t idx, uint32_t ts)
int HostBitIsnotset(Host *h, uint32_t idx, uint64_t ts)
{
XBit *fb = HostBitGet(h, idx);
if (fb == NULL) {
Expand Down
8 changes: 4 additions & 4 deletions src/host-bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ void HostBitRegisterTests(void);
int HostHasHostBits(Host *host);
int HostBitsTimedoutCheck(Host *h, SCTime_t ts);

void HostBitSet(Host *, uint32_t, uint32_t);
void HostBitSet(Host *, uint32_t, uint64_t);
void HostBitUnset(Host *, uint32_t);
void HostBitToggle(Host *, uint32_t, uint32_t);
int HostBitIsset(Host *, uint32_t, uint32_t);
int HostBitIsnotset(Host *, uint32_t, uint32_t);
void HostBitToggle(Host *, uint32_t, uint64_t);
int HostBitIsset(Host *, uint32_t, uint64_t);
int HostBitIsnotset(Host *, uint32_t, uint64_t);
int HostBitList(Host *, XBit **);

#endif /* SURICATA_HOST_BIT_H */
10 changes: 5 additions & 5 deletions src/ippair-bit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static XBit *IPPairBitGet(IPPair *h, uint32_t idx)
}

/* add a flowbit to the flow */
static void IPPairBitAdd(IPPair *h, uint32_t idx, uint32_t expire)
static void IPPairBitAdd(IPPair *h, uint32_t idx, uint64_t expire)
{
XBit *fb = IPPairBitGet(h, idx);
if (fb == NULL) {
Expand Down Expand Up @@ -128,7 +128,7 @@ static void IPPairBitRemove(IPPair *h, uint32_t idx)
}
}

void IPPairBitSet(IPPair *h, uint32_t idx, uint32_t expire)
void IPPairBitSet(IPPair *h, uint32_t idx, uint64_t expire)
{
XBit *fb = IPPairBitGet(h, idx);
if (fb == NULL) {
Expand All @@ -144,7 +144,7 @@ void IPPairBitUnset(IPPair *h, uint32_t idx)
}
}

void IPPairBitToggle(IPPair *h, uint32_t idx, uint32_t expire)
void IPPairBitToggle(IPPair *h, uint32_t idx, uint64_t expire)
{
XBit *fb = IPPairBitGet(h, idx);
if (fb != NULL) {
Expand All @@ -154,7 +154,7 @@ void IPPairBitToggle(IPPair *h, uint32_t idx, uint32_t expire)
}
}

int IPPairBitIsset(IPPair *h, uint32_t idx, uint32_t ts)
int IPPairBitIsset(IPPair *h, uint32_t idx, uint64_t ts)
{
XBit *fb = IPPairBitGet(h, idx);
if (fb != NULL) {
Expand All @@ -168,7 +168,7 @@ int IPPairBitIsset(IPPair *h, uint32_t idx, uint32_t ts)
return 0;
}

int IPPairBitIsnotset(IPPair *h, uint32_t idx, uint32_t ts)
int IPPairBitIsnotset(IPPair *h, uint32_t idx, uint64_t ts)
{
XBit *fb = IPPairBitGet(h, idx);
if (fb == NULL) {
Expand Down
8 changes: 4 additions & 4 deletions src/ippair-bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ void IPPairBitRegisterTests(void);
int IPPairHasBits(IPPair *host);
int IPPairBitsTimedoutCheck(IPPair *h, SCTime_t ts);

void IPPairBitSet(IPPair *, uint32_t, uint32_t);
void IPPairBitSet(IPPair *, uint32_t, uint64_t);
void IPPairBitUnset(IPPair *, uint32_t);
void IPPairBitToggle(IPPair *, uint32_t, uint32_t);
int IPPairBitIsset(IPPair *, uint32_t, uint32_t);
int IPPairBitIsnotset(IPPair *, uint32_t, uint32_t);
void IPPairBitToggle(IPPair *, uint32_t, uint64_t);
int IPPairBitIsset(IPPair *, uint32_t, uint64_t);
int IPPairBitIsnotset(IPPair *, uint32_t, uint64_t);

#endif /* SURICATA_IPPAIR_BIT_H */
4 changes: 2 additions & 2 deletions src/runmode-unix-socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ TmEcode UnixSocketHostbitList(json_t *cmd, json_t* answer, void *data_unused)

struct Bit {
uint32_t id;
uint32_t expire;
uint64_t expire;
} bits[256];
memset(&bits, 0, sizeof(bits));
int i = 0, use = 0;
Expand Down Expand Up @@ -1463,7 +1463,7 @@ TmEcode UnixSocketHostbitList(json_t *cmd, json_t* answer, void *data_unused)
json_t *bitobject = json_object();
if (bitobject == NULL)
continue;
uint32_t expire = 0;
uint64_t expire = 0;
if ((uint32_t)SCTIME_SECS(ts) < bits[i].expire)
expire = bits[i].expire - (uint32_t)SCTIME_SECS(ts);

Expand Down
2 changes: 1 addition & 1 deletion src/util-var.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ typedef struct XBit_ {
uint8_t pad[2];
uint32_t idx; /* name idx */
GenericVar *next;
uint32_t expire;
uint64_t expire;
} XBit;

void XBitFree(XBit *);
Expand Down
Loading