Ignore multiple MAP-E instances for now and output DMR / BR for every rule

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index d048e85d0419b67205c8203a4e10fff3f4f8da10..3e36f94692e14921cb9aa94132d032181cf654e1 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2014 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
@@ -230,7 +230,7 @@ bool ra_process(void)
        bool has_lladdr = !IN6_IS_ADDR_UNSPECIFIED(&lladdr);
        uint8_t buf[1500], cmsg_buf[128];
        struct nd_router_advert *adv = (struct nd_router_advert*)buf;
-       struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0, 0, 0};
+       struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0, 0, 0, 0};
        const struct in6_addr any = IN6ADDR_ANY_INIT;
 
        if (!has_lladdr) {
@@ -311,11 +311,13 @@ bool ra_process(void)
                        update_proc("conf", "hop_limit", adv->nd_ra_curhoplimit);
 
                // Parse ND parameters
-               if (ntohl(adv->nd_ra_reachable) <= 3600000)
-                       update_proc("neigh", "base_reachable_time_ms", ntohl(adv->nd_ra_reachable));
+               uint32_t reachable = ntohl(adv->nd_ra_reachable);
+               if (reachable > 0 && reachable <= 3600000)
+                       update_proc("neigh", "base_reachable_time_ms", reachable);
 
-               if (ntohl(adv->nd_ra_retransmit) <= 60000)
-                       update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit));
+               uint32_t retransmit = ntohl(adv->nd_ra_retransmit);
+               if (retransmit > 0 && retransmit <= 60000)
+                       update_proc("neigh", "retrans_time_ms", retransmit);
 
 
                // Evaluate options