Shutdown SSL connection before closing socket

Without shutting down the SSL connection, log messages like: stream_ssl|WARN|SSL_read: unexpected SSL connection close jsonrpc|WARN|ssl:127.0.0.1:47052: receive error: Protocol error reconnect|WARN|ssl:127.0.0.1:47052: connection dropped (Protocol error) would occur whenever the socket is closed. This just adds an SSLStream.close() that calls shutdown() and ignores SSL errors, the same way that lib/stream-ssl.c does in ssl_close(). Signed-off-by: Terry Wilson <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
qinghon · Jul 12, 2019 · 5fe1799 · 5fe1799
1 parent 03b7563
commit 5fe1799
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
@@ -825,6 +825,14 @@ def send(self, buf):
         except SSL.SysCallError as e:
             return -ovs.socket_util.get_exception_errno(e)
 
+    def close(self):
+        if self.socket:
+            try:
+                self.socket.shutdown()
+            except SSL.Error:
+                pass
+        return super(SSLStream, self).close()
+
 
 if SSL:
     # Register SSL only if the OpenSSL module is available