zebra/interface.c: allow link-param delay min <= avg <= max

    RFC 7471 Section 4.2.7:
	It is possible for min delay and max delay to be the same value.

    Prior to this change, the code required min < avg < max. This
    change allows min == avg and avg == max.

    test case:

    interface eth-rt1
      link-params
        delay 8000 min 8000 max 8000

Signed-off-by: G. Paul Ziemba <paulz@labn.net>

diff --git a/zebra/interface.c b/zebra/interface.c
index 677ec4650f7648cbbc9409e31dcf6187abb248cf..d5f2dc4c9af83c009eb13dbadfacfc0fa821542e 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -3557,12 +3557,20 @@ DEFUN (link_params_delay,
        uint8_t update = 0;
 
        if (argc == 2) {
-               /* Check new delay value against old Min and Max delays if set
+               /*
+                * Check new delay value against old Min and Max delays if set
+                *
+                * RFC 7471 Section 4.2.7:
+                *    It is possible for min delay and max delay to be
+                *    the same value.
+                *
+                * Therefore, it is also allowed that the average
+                * delay be equal to the min delay or max delay.
                 */
                if (IS_PARAM_SET(iflp, LP_MM_DELAY)
-                   && (delay <= iflp->min_delay || delay >= iflp->max_delay)) {
+                   && (delay < iflp->min_delay || delay > iflp->max_delay)) {
                        vty_out(vty,
-                               "Average delay should be comprise between Min (%d) and Max (%d) delay\n",
+                               "Average delay should be in range Min (%d) - Max (%d) delay\n",
                                iflp->min_delay, iflp->max_delay);
                        return CMD_WARNING_CONFIG_FAILED;
                }
@@ -3580,10 +3588,13 @@ DEFUN (link_params_delay,
                        update = 1;
                }
        } else {
-               /* Check new delays value coherency */
-               if (delay <= low || delay >= high) {
+               /*
+                * Check new delays value coherency. See above note
+                * regarding average delay equal to min/max allowed
+                */
+               if (delay < low || delay > high) {
                        vty_out(vty,
-                               "Average delay should be comprise between Min (%d) and Max (%d) delay\n",
+                               "Average delay should be in range Min (%d) - Max (%d) delay\n",
                                low, high);
                        return CMD_WARNING_CONFIG_FAILED;
                }