From 1f617bc27ec33bc14d3289e89cc53092a57be9c1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 18 Mar 2009 12:42:38 -0700 Subject: [PATCH] Restore the default maximum backoff to 15 seconds for secchan and vswitchd. 15 seconds has always been the documented default maximum backoff, but the secchan restructuring accidentally changed it to 1 second. Thanks to Reid for noticing. --- secchan/main.c | 2 +- vswitchd/bridge.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/secchan/main.c b/secchan/main.c index 58d4210b..40f1353e 100644 --- a/secchan/main.c +++ b/secchan/main.c @@ -304,7 +304,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->fail_mode = FAIL_OPEN; s->max_idle = 0; s->probe_interval = 0; - s->max_backoff = 0; + s->max_backoff = 15; s->update_resolv_conf = true; s->rate_limit = 0; s->burst_limit = 0; diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 0429a6d1..35093fab 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -910,9 +910,14 @@ bridge_reconfigure_one(struct bridge *br) ofproto_set_probe_interval(br->ofproto, probe ? probe : cfg_get_int(0, "mgmt.inactivity-probe")); - max_backoff = cfg_get_int(0, "%s.max-backoff", pfx); - ofproto_set_max_backoff(br->ofproto, - max_backoff ? max_backoff : cfg_get_int(0, "mgmt.max-backoff")); + max_backoff = cfg_get_int(0, "%s.max-backoff", pfx); + if (!max_backoff) { + max_backoff = cfg_get_int(0, "mgmt.max-backoff"); + if (!max_backoff) { + max_backoff = 15; + } + } + ofproto_set_max_backoff(br->ofproto, max_backoff); ofproto_set_stp(br->ofproto, cfg_get_bool(0, "%s.stp", pfx)); -- 2.30.2