Skip to content
Snippets Groups Projects
Commit 8a554abf authored by Martine Lenders's avatar Martine Lenders
Browse files

Merge pull request #3904 from authmillenon/gnrc_sixlowpan_nd_router/fix/version-casting

gnrc_sixlowpan_nd_router: cast before shifting
parents 7f1db3b2 f3b9e5fa
No related branches found
No related tags found
No related merge requests found
...@@ -149,8 +149,8 @@ bool gnrc_sixlowpan_nd_router_abr_older(sixlowpan_nd_opt_abr_t *abr_opt) ...@@ -149,8 +149,8 @@ bool gnrc_sixlowpan_nd_router_abr_older(sixlowpan_nd_opt_abr_t *abr_opt)
return false; return false;
} }
version = byteorder_ntohs(abr_opt->vlow); version = (uint32_t)byteorder_ntohs(abr_opt->vlow);
version |= byteorder_ntohs(abr_opt->vhigh) << 16; version |= ((uint32_t)byteorder_ntohs(abr_opt->vhigh)) << 16;
return (version < abr->version); return (version < abr->version);
} }
...@@ -223,8 +223,8 @@ void gnrc_sixlowpan_nd_opt_abr_handle(kernel_pid_t iface, ndp_rtr_adv_t *rtr_adv ...@@ -223,8 +223,8 @@ void gnrc_sixlowpan_nd_opt_abr_handle(kernel_pid_t iface, ndp_rtr_adv_t *rtr_adv
sicmpv6_size -= (opt->len * 8); sicmpv6_size -= (opt->len * 8);
} }
abr->version = byteorder_ntohs(abr_opt->vlow); abr->version = (uint32_t)byteorder_ntohs(abr_opt->vlow);
abr->version |= byteorder_ntohs(abr_opt->vhigh) << 16; abr->version |= ((uint32_t)byteorder_ntohs(abr_opt->vhigh)) << 16;
abr->addr.u64[0] = abr_opt->braddr.u64[0]; abr->addr.u64[0] = abr_opt->braddr.u64[0];
abr->addr.u64[1] = abr_opt->braddr.u64[1]; abr->addr.u64[1] = abr_opt->braddr.u64[1];
memset(abr->ctxs, 0, sizeof(abr->ctxs)); memset(abr->ctxs, 0, sizeof(abr->ctxs));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment