From: Jon Franklin <jon_franklin@dell.com>
Date: Wed, 12 Feb 2025 12:45:17 +0000 (+0000)
Subject: DHCP6: Align MAX_RC values with RFC 8415
X-Git-Tag: v10.2.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da364b33fd633811546d9dd34b4ff502c591a39b;p=thirdparty%2Fdhcpcd.git

DHCP6: Align MAX_RC values with RFC 8415
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 6a1eac3c..fad22f73 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -1498,7 +1498,7 @@ sent:
 		state->RT = RT * 2;
 		if (state->RT < RT) /* Check overflow */
 			state->RT = RT;
-		if (state->MRC == 0 || state->RTC < state->MRC)
+		if (state->MRC == 0 || state->RTC <= state->MRC)
 			eloop_timeout_add_msec(ctx->eloop,
 			    RT, callback, ifp);
 		else if (state->MRC != 0 && state->MRCcallback)
diff --git a/src/dhcp6.h b/src/dhcp6.h
index 51251962..ffae5f71 100644
--- a/src/dhcp6.h
+++ b/src/dhcp6.h
@@ -115,7 +115,7 @@
 
 #define	SOL_MAX_DELAY		1
 #define	SOL_TIMEOUT		1
-#define	SOL_MAX_RT		3600 /* RFC7083 */
+#define	SOL_MAX_RT		3600	/* RFC 8415 */
 #define	SOL_MAX_RC		0
 #define	REQ_MAX_DELAY		0
 #define	REQ_TIMEOUT		1
@@ -135,14 +135,14 @@
 #define	INF_MAX_DELAY		1
 #define	INF_TIMEOUT		1
 #define	INF_MAX_RD		CNF_MAX_RD /* NOT RFC defined */
-#define	INF_MAX_RT		3600 /* RFC7083 */
+#define	INF_MAX_RT		3600	/* RFC 8415*/
 #define	REL_MAX_DELAY		0
 #define	REL_TIMEOUT		1
 #define	REL_MAX_RT		0
-#define	REL_MAX_RC		5
+#define	REL_MAX_RC		4	/* RFC 8415 */
 #define	DEC_MAX_DELAY		0
 #define	DEC_TIMEOUT		1
-#define	DEC_MAX_RC		5
+#define	DEC_MAX_RC		4	/* RFC 8415 */
 #define	REC_MAX_DELAY		0
 #define	REC_TIMEOUT		2
 #define	REC_MAX_RC		8