Skip to content

Fix FreeBSD 13.5 build error - Using s6_addr struct #57

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix FreeBSD 13.5 build error - Using s6_addr struct #57

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
28 changes: 13 additions & 15 deletions mod_evasive24.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,26 +253,24 @@ static int parse_wildcard(const char *ip, struct in_addr *addr, uint32_t *mask)

static void ipv6_cidr_bits_to_mask(unsigned long cidr_bits, struct in6_addr *mask)
{
for (unsigned i = 0; i < 4; i++) {
if (cidr_bits == 0) {
mask->s6_addr32[i] = 0;
} else if (cidr_bits >= 32) {
mask->s6_addr32[i] = ~UINT32_C(0);
} else {
mask->s6_addr32[i] = htobe32(~((UINT32_C(1) << (32 - cidr_bits)) - 1));
}
cidr_bits = (cidr_bits > 128) ? 128 : cidr_bits;
memset(mask, 0, sizeof(*mask));

if (cidr_bits >= 32)
cidr_bits -= 32;
else
cidr_bits = 0;
}
unsigned full = (unsigned)(cidr_bits / 8);
unsigned rem = (unsigned)(cidr_bits % 8);

for (unsigned i = 0; i < full && i < 16; i++)
mask->s6_addr[i] = 0xFF;

// Set remaining partial bits in the next byte
if (rem && full < 16)
mask->s6_addr[full] = (uint8_t)(0xFFu << (8 - rem));
}

static void ipv6_apply_mask(struct in6_addr *restrict addr, const struct in6_addr *restrict mask)
{
for (unsigned i = 0; i < 4; i++)
addr->s6_addr32[i] &= mask->s6_addr32[i];
for (unsigned i = 0; i < 16; i++) //__u6_addr8[16]
addr->s6_addr[i] &= mask->s6_addr[i];
}

static const char *whitelist_ip(__attribute__((unused)) cmd_parms *cmd, void *dconfig, const char *ip)
Expand Down