Remove Sync bound from TlsConnector io arg

This commit is contained in:
Martin Algesten
2022-05-01 09:33:43 +02:00
parent 049b5a5acd
commit 4675d748e9
6 changed files with 31 additions and 13 deletions

View File

@@ -34,7 +34,7 @@ impl TlsConnector for PassThrough {
fn connect(
&self,
_dns_name: &str,
io: Box<dyn ReadWrite + Sync>,
io: Box<dyn ReadWrite>,
) -> Result<Box<dyn ReadWrite>, Error> {
if self.handshake_fail {
let io_err = io::Error::new(io::ErrorKind::InvalidData, PassThroughError);

View File

@@ -56,10 +56,11 @@ impl TlsConnector for MbedTlsConnector {
fn connect(
&self,
_dns_name: &str,
io: Box<dyn ReadWrite + Sync>,
io: Box<dyn ReadWrite>,
) -> Result<Box<dyn ReadWrite>, Error> {
let mut ctx = self.context.lock().unwrap();
match ctx.establish(io, None) {
let sync = SyncIo(Mutex::new(io));
match ctx.establish(sync, None) {
Err(_) => {
let io_err = io::Error::new(io::ErrorKind::InvalidData, MbedTlsError);
return Err(io_err.into());
@@ -69,6 +70,27 @@ impl TlsConnector for MbedTlsConnector {
}
}
struct SyncIo(Mutex<Box<dyn ReadWrite>>);
impl io::Read for SyncIo {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
let mut lock = self.0.lock().unwrap();
lock.read(buf)
}
}
impl io::Write for SyncIo {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
let mut lock = self.0.lock().unwrap();
lock.write(buf)
}
fn flush(&mut self) -> io::Result<()> {
let mut lock = self.0.lock().unwrap();
lock.flush()
}
}
struct MbedTlsStream {
context: Arc<Mutex<Context>>, //tcp_stream: TcpStream,
}