summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-04-08 09:12:50 +0200
committerSteven Barth <steven@midlink.org>2013-04-08 09:12:50 +0200
commit3fb3c327d889a8c5e0370259c4c6360c7d3106cb (patch)
treecfc6e794c4cea9ff8ecbf0d0432b440123e84a3d
parent4369d2f0e1ab9682d677f2f8fd876329e740fb0b (diff)
downloadodhcp6c-3fb3c327d889a8c5e0370259c4c6360c7d3106cb.tar.gz
Fix compilation
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/ra.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db7ef65..b1871a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
project(odhcp6c C)
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=c99")
-add_definitions(-D_GNU_SOURCE -Wall -Werror -Wextra -pedantic)
+add_definitions(-D_GNU_SOURCE -Os -Wall -Werror -Wextra -pedantic)
add_executable(odhcp6c src/odhcp6c.c src/dhcpv6.c src/ra.c src/script.c src/md5.c)
target_link_libraries(odhcp6c resolv)
diff --git a/src/ra.c b/src/ra.c
index 814a17d..c572c13 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -230,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)
@@ -276,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) {