Box<dyn ReadWrite> for TlsConnector::connect

This commit is contained in:
Martin Algesten
2022-04-30 12:50:08 +02:00
parent 101467f13f
commit 65371c966c
6 changed files with 90 additions and 51 deletions

View File

@@ -53,9 +53,14 @@ impl MbedTlsConnector {
}
impl TlsConnector for MbedTlsConnector {
fn connect(&self, _dns_name: &str, tcp_stream: TcpStream) -> Result<Box<dyn ReadWrite>, Error> {
fn connect(
&self,
_dns_name: &str,
io: Box<dyn ReadWrite>,
) -> Result<Box<dyn ReadWrite>, Error> {
let mut ctx = self.context.lock().unwrap();
match ctx.establish(tcp_stream, 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());
@@ -65,6 +70,28 @@ impl TlsConnector for MbedTlsConnector {
}
}
/// Internal wrapper to make Box<dyn ReadWrite> implement Sync
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,
}
@@ -84,6 +111,9 @@ impl ReadWrite for MbedTlsStream {
fn socket(&self) -> Option<&TcpStream> {
None
}
fn is_poolable(&self) -> bool {
true
}
}
impl io::Read for MbedTlsStream {