riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15359 from miri64/uhcp/fix/i15353

Browse Source 
uhcp: fix handling of pushed prefix
This commit is contained in:
benpicco 2020-11-25 00:17:30 +01:00 committed by GitHub
commit 6a4ece5246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/net/application_layer/uhcp/uhcp.c
View File

@ -97,14 +97,18 @@ void uhcp_handle_push(uhcp_push_t *req, uint8_t *src, uint16_t port, uhcp_iface_
char addr_str[INET6_ADDRSTRLEN]; char addr_str[INET6_ADDRSTRLEN];
char prefix_str[INET6_ADDRSTRLEN]; char prefix_str[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, src, addr_str, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, src, addr_str, INET6_ADDRSTRLEN);
uint8_t prefix[16]; uint8_t prefix[IN6ADDRSZ] = { 0 };
if (req->prefix_len == 0) {
LOG_ERROR("uhcp_handle_push(): prefix length 0\n");
return;
}
size_t prefix_bytes = (req->prefix_len + 7)>>3; size_t prefix_bytes = (req->prefix_len + 7)>>3;
memset(prefix + 16 - prefix_bytes, '\0', 16 - prefix_bytes);
memcpy(prefix, req->prefix, prefix_bytes); memcpy(prefix, req->prefix, prefix_bytes);
inet_ntop(AF_INET6, prefix, prefix_str, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, prefix, prefix_str, INET6_ADDRSTRLEN);
LOG_INFO("uhcp: push from %s:%u prefix=%s/%u\n", addr_str, (unsigned)port, prefix_str, req->prefix_len); LOG_INFO("uhcp: push from %s:%u prefix=%s/%u\n", addr_str, (unsigned)port,
prefix_str, req->prefix_len);
uhcp_handle_prefix(prefix, req->prefix_len, 0xFFFF, src, iface); uhcp_handle_prefix(prefix, req->prefix_len, 0xFFFF, src, iface);
} }
#endif #endif