Re: [ovs-dev] [PATCH v2] Shutdown SSL connection before closing socket
Thanks! Could I get a backport to whatever branches backports are still available for? I tested that it applied cleanly on 2.9 and passed tests there. That code hasn't changed in a while. On Tue, Jul 16, 2019 at 12:20 PM Ben Pfaff wrote: > On Thu, Jul 11, 2019 at 08:00:20AM -0500, Terry Wilson wrote: > > 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 > > I applied this to master a few days ago, but it looks like I forgot to > point it out at the time. > ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v2] Shutdown SSL connection before closing socket
On Thu, Jul 11, 2019 at 08:00:20AM -0500, Terry Wilson wrote: > 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 I applied this to master a few days ago, but it looks like I forgot to point it out at the time. ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v2] Shutdown SSL connection before closing socket
On Tue, Jul 16, 2019 at 7:44 PM Daniel Alvarez Sanchez wrote: > Acked-By: Daniel Alvarez > > On Thu, Jul 11, 2019 at 3:08 PM Terry Wilson wrote: > > > > 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 > Acked-by: Numan Siddique > > --- > > python/ovs/stream.py | 8 > > 1 file changed, 8 insertions(+) > > > > diff --git a/python/ovs/stream.py b/python/ovs/stream.py > > index c15be4b..a98057e 100644 > > --- a/python/ovs/stream.py > > +++ b/python/ovs/stream.py > > @@ -825,6 +825,14 @@ class SSLStream(Stream): > > 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 > > -- > > 1.8.3.1 > > > > ___ > > dev mailing list > > d...@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > ___ > dev mailing list > d...@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v2] Shutdown SSL connection before closing socket
Acked-By: Daniel Alvarez On Thu, Jul 11, 2019 at 3:08 PM Terry Wilson wrote: > > 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 > --- > python/ovs/stream.py | 8 > 1 file changed, 8 insertions(+) > > diff --git a/python/ovs/stream.py b/python/ovs/stream.py > index c15be4b..a98057e 100644 > --- a/python/ovs/stream.py > +++ b/python/ovs/stream.py > @@ -825,6 +825,14 @@ class SSLStream(Stream): > 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 > -- > 1.8.3.1 > > ___ > dev mailing list > d...@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH v2] 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 --- python/ovs/stream.py | 8 1 file changed, 8 insertions(+) diff --git a/python/ovs/stream.py b/python/ovs/stream.py index c15be4b..a98057e 100644 --- a/python/ovs/stream.py +++ b/python/ovs/stream.py @@ -825,6 +825,14 @@ class SSLStream(Stream): 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 -- 1.8.3.1 ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
