Skip to content

Commit

Permalink
community-id: Fix IPv6 address sorting not respecting byte order
Browse files Browse the repository at this point in the history
When comparing IPv6 addresses based on uint32_t chunks, one needs to
apply ntohl() conversion to the individual parts, otherwise on little
endian systems individual bytes are compared in the wrong order.
Avoid this all and leverage memcmp(), it'll short circuit on the first
differing byte and its return values tells us which address sorts lower.

Bug: #6276
  • Loading branch information
awelzel authored and jasonish committed Aug 30, 2023
1 parent 3172431 commit e467cfe
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions src/output-json.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,18 +638,6 @@ static bool CalculateCommunityFlowIdv4(const Flow *f,
return false;
}

static inline bool FlowHashRawAddressIPv6LtU32(const uint32_t *a, const uint32_t *b)
{
for (int i = 0; i < 4; i++) {
if (a[i] < b[i])
return true;
if (a[i] > b[i])
break;
}

return false;
}

static bool CalculateCommunityFlowIdv6(const Flow *f,
const uint16_t seed, unsigned char *base64buf)
{
Expand All @@ -673,9 +661,8 @@ static bool CalculateCommunityFlowIdv6(const Flow *f,
dp = htons(dp);

ipv6.seed = htons(seed);
if (FlowHashRawAddressIPv6LtU32(f->src.addr_data32, f->dst.addr_data32) ||
((memcmp(&f->src, &f->dst, sizeof(f->src)) == 0) && sp < dp))
{
int cmp_r = memcmp(&f->src, &f->dst, sizeof(f->src));
if ((cmp_r < 0) || (cmp_r == 0 && sp < dp)) {
memcpy(&ipv6.src, &f->src.addr_data32, 16);
memcpy(&ipv6.dst, &f->dst.addr_data32, 16);
ipv6.sp = sp;
Expand Down

0 comments on commit e467cfe

Please sign in to comment.