From: Ben Pfaff <blp@nicira.com>
Date: Thu, 5 Mar 2009 20:26:07 +0000 (-0800)
Subject: rconn: Tolerate negative argument in rconn_set_max_backoff().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aa88e2cc76ef982f62d0458493f87e357f76b56;p=openvswitch

rconn: Tolerate negative argument in rconn_set_max_backoff().

This argument is likely to come directly from the user, so it helps callers
if they don't have to validate carefully.
---

diff --git a/lib/rconn.c b/lib/rconn.c
index 562f96f3..9b4ae551 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -221,7 +221,7 @@ rconn_create(int probe_interval, int max_backoff)
 void
 rconn_set_max_backoff(struct rconn *rc, int max_backoff)
 {
-    rc->max_backoff = max_backoff ? max_backoff : 60;
+    rc->max_backoff = MAX(1, max_backoff);
     if (rc->state == S_BACKOFF && rc->backoff > max_backoff) {
         rc->backoff = max_backoff;
         if (rc->backoff_deadline > time_now() + max_backoff) {