From: Roy Marples <roy@marples.name>
Date: Wed, 12 Mar 2014 00:50:02 +0000 (+0000)
Subject: Clarify hop limit
X-Git-Tag: v6.3.2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c12837916bc63777e94bdb90b32d968cb569074d;p=thirdparty%2Fdhcpcd.git

Clarify hop limit
---

diff --git a/dhcp6.c b/dhcp6.c
index 5a1a4041..853cf7d5 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -713,7 +713,7 @@ dhcp6_sendmessage(struct interface *ifp, void (*callback)(void *))
 	uint8_t neg;
 	const char *broad_uni;
 	const struct in6_addr alldhcp = IN6ADDR_LINKLOCAL_ALLDHCP_INIT;
-	int hoplimit = HOPLIMIT;
+	int hoplimit = 1; /* Relay agents bump this up */
 
 	memset(&dst, 0, sizeof(dst));
 	dst.sin6_family = AF_INET6;
diff --git a/ipv6.h b/ipv6.h
index 2e9f7f9d..62c95733 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -41,7 +41,6 @@
 #include "dhcpcd.h"
 
 #define ALLROUTERS "ff02::2"
-#define HOPLIMIT 255
 
 #define ROUNDUP8(a) (1 + (((a) - 1) | 7))
 
diff --git a/ipv6nd.c b/ipv6nd.c
index 74500b29..d60e0979 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -247,7 +247,7 @@ ipv6nd_sendrsprobe(void *arg)
 	struct sockaddr_in6 dst;
 	struct cmsghdr *cm;
 	struct in6_pktinfo pi;
-	int hoplimit = HOPLIMIT;
+	int hoplimit = 255; /* RFC4861 4.1 */
 
 	if (ipv6_linklocal(ifp) == NULL) {
 		syslog(LOG_DEBUG,
@@ -1245,7 +1245,7 @@ ipv6nd_proberouter(void *arg)
 	struct sockaddr_in6 dst;
 	struct cmsghdr *cm;
 	struct in6_pktinfo pi;
-	int hoplimit = HOPLIMIT;
+	int hoplimit = 255; /* RFC4861 4.1 */
 	struct timeval tv, rtv;
 	struct ipv6_ctx *ctx;