socket-util: Remove get_socket_error().

[openvswitch] / python / ovs / socket_util.py

diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 845511e3b209a556ca353b27b43fb308e730ba6d..8fecbc79c11e974d1755041ae9b07fe7880270e6 100644 (file)
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -77,9 +77,23 @@ def make_unix_socket(style, nonblock, bind_path, connect_path):
 
 def check_connection_completion(sock):
     p = ovs.poller.SelectPoll()
-    p.register(sock, select.POLLOUT)
-    if len(p.poll(0)) == 1:
-        return get_socket_error(sock)
+    p.register(sock, ovs.poller.POLLOUT)
+    pfds = p.poll(0)
+    if len(pfds) == 1:
+        revents = pfds[0][1]
+        if revents & ovs.poller.POLLERR:
+            try:
+                # The following should raise an exception.
+                socket.send("\0", socket.MSG_DONTWAIT)
+
+                # (Here's where we end up if it didn't.)
+                # XXX rate-limit
+                vlog.err("poll return POLLERR but send succeeded")
+                return errno.EPROTO
+            except socket.error, e:
+                return get_exception_errno(e)
+        else:
+            return 0
     else:
         return errno.EAGAIN
 
@@ -88,13 +102,13 @@ def inet_parse_active(target, default_port):
     address = target.split(":")
     host_name = address[0]
     if not host_name:
-        raise Exception("%s: bad peer name format" % target)
+        raise ValueError("%s: bad peer name format" % target)
     if len(address) >= 2:
         port = int(address[1])
     elif default_port:
         port = default_port
     else:
-        raise Exception("%s: port number must be specified" % target)
+        raise ValueError("%s: port number must be specified" % target)
     return (host_name, port)
 
 
@@ -119,12 +133,6 @@ def inet_open_active(style, target, default_port, dscp):
         return get_exception_errno(e), None
 
 
-def get_socket_error(sock):
-    """Returns the errno value associated with 'socket' (0 if no error) and
-    resets the socket's error status."""
-    return sock.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
-
-
 def get_exception_errno(e):
     """A lot of methods on Python socket objects raise socket.error, but that
     exception is documented as having two completely different forms of
@@ -182,11 +190,11 @@ def set_nonblocking(sock):
         sock.setblocking(0)
     except socket.error, e:
         vlog.err("could not set nonblocking mode on socket: %s"
-                 % os.strerror(get_socket_error(e)))
+                 % os.strerror(get_exception_errno(e)))
 
 
 def set_dscp(sock, dscp):
     if dscp > 63:
-        raise Exception("Invalid dscp %d" % dscp)
+        raise ValueError("Invalid dscp %d" % dscp)
     val = dscp << 2
     sock.setsockopt(socket.IPPROTO_IP, socket.IP_TOS, val)