X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=f08a7b0bc0d6f12cb167fe72608d05fede059165;hp=a31bf4e0f2584b8bb8b6febc535410ad67a36867;hb=3e4c8ad1a33abfb5f0e5886353ca4e3f2dbfedc1;hpb=9dd5316deae6402de68ddc8a08d1a6b496101828

diff --git a/src/router.c b/src/router.c
index a31bf4e..f08a7b0 100644
--- a/src/router.c
+++ b/src/router.c
@@ -259,15 +259,18 @@ static uint16_t calc_ra_lifetime(struct interface *iface, uint32_t maxival)
 static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
 {
 	time_t now = odhcpd_time();
-	uint32_t mtu = iface->ra_mtu;
-	int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+	int mtu = iface->ra_mtu;
+	int hlim = iface->ra_hoplimit;
 
 	if (mtu == 0)
-		 mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
+		mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
 
 	if (mtu < 1280)
 		mtu = 1280;
 
+	if (hlim == 0)
+		hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+
 	struct {
 		struct nd_router_advert h;
 		struct icmpv6_opt lladdr;
@@ -292,6 +295,10 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 		adv.h.nd_ra_flags_reserved |= ND_RA_PREF_LOW;
 	else if (iface->route_preference > 0)
 		adv.h.nd_ra_flags_reserved |= ND_RA_PREF_HIGH;
+
+	adv.h.nd_ra_reachable = htonl(iface->ra_reachabletime);
+	adv.h.nd_ra_retransmit = htonl(iface->ra_retranstime);
+
 	odhcpd_get_mac(iface, adv.lladdr.data);
 
 	// If not currently shutting down