From: Ben Pfaff Date: Thu, 22 Nov 2012 06:09:55 +0000 (-0800) Subject: python/ovs/stream: Fix Stream.connect() retval for incomplete connection. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff_plain;h=dcb66daea433cd93593e517c3fac3c898f2c9f70 python/ovs/stream: Fix Stream.connect() retval for incomplete connection. If the loop condition in Stream.connect() was false, which is especially likely for TCP connections, then Stream.connect() would return None, which violates its documented behavior. This commit fixes the problem. Reported-by: Isaku Yamahata Tested-by: Isaku Yamahata Signed-off-by: Ben Pfaff --- diff --git a/python/ovs/stream.py b/python/ovs/stream.py index c4d243d0..c640ebf5 100644 --- a/python/ovs/stream.py +++ b/python/ovs/stream.py @@ -161,15 +161,17 @@ class Stream(object): is complete, returns 0 if the connection was successful or a positive errno value if it failed. If the connection is still in progress, returns errno.EAGAIN.""" - last_state = -1 # Always differs from initial self.state - while self.state != last_state: - last_state = self.state - if self.state == Stream.__S_CONNECTING: - self.__scs_connecting() - elif self.state == Stream.__S_CONNECTED: - return 0 - elif self.state == Stream.__S_DISCONNECTED: - return self.error + + if self.state == Stream.__S_CONNECTING: + self.__scs_connecting() + + if self.state == Stream.__S_CONNECTING: + return errno.EAGAIN + elif self.state == Stream.__S_CONNECTED: + return 0 + else: + assert self.state == Stream.__S_DISCONNECTED + return self.error def recv(self, n): """Tries to receive up to 'n' bytes from this stream. Returns a