sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-09-15 02:35:30 +00:00
parent aec8820748
commit 66d94126c9
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
18 changed files with 112 additions and 108 deletions

View file

@ -809,6 +809,7 @@ addr_to_nat64(const struct sockaddr_storage* addr,
struct sockaddr_in *sin = (struct sockaddr_in *)addr;
struct sockaddr_in6 *sin6;
uint8_t *v4_byte;
int i;
/* This needs to be checked by the caller */
log_assert(addr->ss_family == AF_INET);
@ -826,7 +827,7 @@ addr_to_nat64(const struct sockaddr_storage* addr,
nat64_prefixnet = nat64_prefixnet / 8;
v4_byte = (uint8_t *)&sin->sin_addr.s_addr;
for(int i = 0; i < 4; i++) {
for(i = 0; i < 4; i++) {
if(nat64_prefixnet == 8) {
/* bits 64...71 are MBZ */
sin6->sin6_addr.s6_addr[nat64_prefixnet++] = 0;