Export AFTR-IP as well and update README

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index b249288279955446ecf59e061a4015b0314b3302..c572c130ebe3bbedf62ebac3909de81ceebcf52e 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -1,3 +1,17 @@
+/**
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ *
+ * 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 <fcntl.h>
 #include <stdio.h>
 #include <signal.h>
@@ -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)
@@ -236,7 +252,7 @@ bool ra_process(void)
                                struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt;
                                entry.router = any;
                                entry.target = pinfo->nd_opt_pi_prefix;
-                               entry.priority = 0;
+                               entry.priority = 256;
                                entry.length = pinfo->nd_opt_pi_prefix_len;
                                entry.valid = ntohl(pinfo->nd_opt_pi_valid_time);
                                entry.preferred = ntohl(pinfo->nd_opt_pi_preferred_time);
@@ -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) {