summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-07-14 13:47:02 +0200
committerDavid Lönnhager <david.l@mullvad.net>2021-07-14 13:47:02 +0200
commitdd39f09e920717e4af8471bed9084d769c4f361d (patch)
tree177efbc14cdfbd2d7efb8e5fe0703ba41a72814e
parent79e3da6d6f6dff34534886f1e2d3d04916165baa (diff)
parentec81401bed83bc03cbe935b15a815244036f13db (diff)
downloadmullvadvpn-dd39f09e920717e4af8471bed9084d769c4f361d.tar.xz
mullvadvpn-dd39f09e920717e4af8471bed9084d769c4f361d.zip
Merge branch 'fix-socket-reset'
-rw-r--r--mullvad-rpc/src/tcp_stream.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/mullvad-rpc/src/tcp_stream.rs b/mullvad-rpc/src/tcp_stream.rs
index e006c4f3dd..4930777541 100644
--- a/mullvad-rpc/src/tcp_stream.rs
+++ b/mullvad-rpc/src/tcp_stream.rs
@@ -92,7 +92,10 @@ impl AsyncWrite for TcpStream {
) -> Poll<io::Result<usize>> {
self.do_stream(
|stream| Pin::new(stream).poll_write(cx, buf),
- Poll::Ready(Ok(0)),
+ Poll::Ready(Err(io::Error::new(
+ io::ErrorKind::ConnectionReset,
+ "socket is closed",
+ ))),
)
}
@@ -119,7 +122,10 @@ impl AsyncRead for TcpStream {
) -> Poll<io::Result<()>> {
self.do_stream(
|stream| Pin::new(stream).poll_read(cx, buf),
- Poll::Ready(Ok(())),
+ Poll::Ready(Err(io::Error::new(
+ io::ErrorKind::ConnectionReset,
+ "socket is closed",
+ ))),
)
}
}