From: Ben Pfaff Date: Fri, 27 Feb 2009 23:48:39 +0000 (-0800) Subject: vswitch: Fix connection to a remote controller. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18d92671bc8f7d5bc30ccc33ac87b62cb0810a5f;p=openvswitch vswitch: Fix connection to a remote controller. Without this change, vswitchd will kill secchan almost as soon as it starts it, because it fails to recognize that it is connecting to a remote controller instead of to vswitchd. --- diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 36755026..29d6b534 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -549,7 +549,7 @@ run_secchan(struct bridge *br) if (process_exited(br->secchan)) { log_secchan_died(VLL_ERR, br, false); br->sc_state = SC_UNSTARTED; - } else if (!rconn_is_alive(br->rconn)) { + } else if (!br->controller && !rconn_is_alive(br->rconn)) { VLOG_ERR("%s: connection to secchan closed unexpectedly, " "killing secchan", br->name); kill_secchan(br);