DHCP6: Align MAX_RC values with RFC 8415

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 6a1eac3cc068c70f2f4a1c8b84d84c95e638eb6e..fad22f73dae91664a1fa6d2f9eca300ece284c06 100644 (file)
--- 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 51251962a65204aae9dd8900e35b11b52f1c8b6b..ffae5f716685e74c0912ec6b68737530219835de 100644 (file)
--- 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