X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fra.c;h=c572c130ebe3bbedf62ebac3909de81ceebcf52e;hb=3fb3c327d889a8c5e0370259c4c6360c7d3106cb;hp=4ed5371a160d4b63dc7e1ac80a6d74a38ba2e726;hpb=2cc9d0fa03c68cea04111c05b139e5eaaa999fca;p=odhcp6c.git diff --git a/src/ra.c b/src/ra.c index 4ed5371..c572c13 100644 --- a/src/ra.c +++ b/src/ra.c @@ -1,3 +1,17 @@ +/** + * Copyright (C) 2012-2013 Steven Barth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License v2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + #include #include #include @@ -216,13 +230,15 @@ bool ra_process(void) struct icmpv6_opt *opt; icmpv6_for_each_option(opt, &adv[1], &buf[len]) { if (opt->type == ND_OPT_MTU) { - update_proc("conf", "mtu", ntohl(*((uint32_t*)&opt->data[2]))); + uint32_t *mtu = (uint32_t*)&opt->data[2]; + update_proc("conf", "mtu", ntohl(*mtu)); } else if (opt->type == ND_OPT_ROUTE_INFORMATION && opt->len <= 3) { entry.router = from.sin6_addr; entry.target = any; entry.priority = pref_to_priority(opt->data[1]); entry.length = opt->data[0]; - entry.valid = ntohl(*((uint32_t*)&opt->data[2])); + uint32_t *valid = (uint32_t*)&opt->data[2]; + entry.valid = ntohl(*valid); memcpy(&entry.target, &opt->data[6], (opt->len - 1) * 8); if (entry.length > 128 || IN6_IS_ADDR_LINKLOCAL(&entry.target) @@ -262,7 +278,8 @@ bool ra_process(void) entry.router = from.sin6_addr; entry.priority = 0; entry.length = 128; - entry.valid = ntohl(*((uint32_t*)&opt->data[2])); + uint32_t *valid = (uint32_t*)&opt->data[2]; + entry.valid = ntohl(*valid); entry.preferred = 0; for (ssize_t i = 0; i < (opt->len - 1) / 2; ++i) {