From d75643b478d1e5f38c6f25d674005e73be2fe9aa Mon Sep 17 00:00:00 2001
From: Michael Richardson <mcr@sandelman.ca>
Date: Mon, 24 Jan 2022 11:15:31 -0500
Subject: [PATCH] added comment about why socket always returns None

---
 examples/mbedtls-req/main.rs              |  6 +++--
 examples/mbedtls-req/mbedtls_connector.rs | 31 ++++++++++-------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/examples/mbedtls-req/main.rs b/examples/mbedtls-req/main.rs
index ae63f0c..63b8d0c 100644
--- a/examples/mbedtls-req/main.rs
+++ b/examples/mbedtls-req/main.rs
@@ -1,5 +1,5 @@
 use std::io::{self, Read};
-use std::sync::{Arc};
+use std::sync::Arc;
 use std::time::Duration;
 use std::{env, error, fmt, result};
 
@@ -54,7 +54,9 @@ fn main() -> Result<()> {
     env_logger::init();
 
     let agent = ureq::builder()
-        .tls_connector(Arc::new(mbedtls_connector::MbedTlsConnector::new(mbedtls::ssl::config::AuthMode::None)))
+        .tls_connector(Arc::new(mbedtls_connector::MbedTlsConnector::new(
+            mbedtls::ssl::config::AuthMode::None,
+        )))
         .timeout_connect(Duration::from_secs(5))
         .timeout(Duration::from_secs(20))
         .build();
diff --git a/examples/mbedtls-req/mbedtls_connector.rs b/examples/mbedtls-req/mbedtls_connector.rs
index 8ba5000..0120d1e 100644
--- a/examples/mbedtls-req/mbedtls_connector.rs
+++ b/examples/mbedtls-req/mbedtls_connector.rs
@@ -5,16 +5,16 @@ use ureq::{Error, ReadWrite, TlsConnector};
 use std::net::TcpStream;
 use std::sync::{Arc, Mutex};
 
+use mbedtls::rng::CtrDrbg;
 use mbedtls::ssl::config::{Endpoint, Preset, Transport};
 use mbedtls::ssl::{Config, Context};
-use mbedtls::rng::CtrDrbg;
 
 fn entropy_new() -> mbedtls::rng::OsEntropy {
     mbedtls::rng::OsEntropy::new()
 }
 
 pub struct MbedTlsConnector {
-    context:  Arc<Mutex<Context>>
+    context: Arc<Mutex<Context>>,
 }
 
 #[derive(Debug)]
@@ -33,7 +33,9 @@ impl std::error::Error for MbedTlsError {
 
 #[allow(dead_code)]
 pub(crate) fn default_tls_config() -> std::sync::Arc<dyn TlsConnector> {
-    Arc::new(MbedTlsConnector::new(mbedtls::ssl::config::AuthMode::Required))
+    Arc::new(MbedTlsConnector::new(
+        mbedtls::ssl::config::AuthMode::Required,
+    ))
 }
 
 impl MbedTlsConnector {
@@ -45,50 +47,46 @@ impl MbedTlsConnector {
         config.set_authmode(mode);
         let ctx = Context::new(Arc::new(config));
         MbedTlsConnector {
-            context: Arc::new(Mutex::new(ctx))
+            context: Arc::new(Mutex::new(ctx)),
         }
     }
 }
 
 impl TlsConnector for MbedTlsConnector {
-    fn connect(
-        &self,
-        _dns_name: &str,
-        tcp_stream: TcpStream,
-    ) -> Result<Box<dyn ReadWrite>, Error> {
-
+    fn connect(&self, _dns_name: &str, tcp_stream: TcpStream) -> Result<Box<dyn ReadWrite>, Error> {
         let mut ctx = self.context.lock().unwrap();
         match ctx.establish(tcp_stream, None) {
             Err(_) => {
                 let io_err = io::Error::new(io::ErrorKind::InvalidData, MbedTlsError);
                 return Err(io_err.into());
             }
-            Ok(()) => Ok(MbedTlsStream::new(self))
+            Ok(()) => Ok(MbedTlsStream::new(self)),
         }
     }
 }
 
 struct MbedTlsStream {
-    context:  Arc<Mutex<Context>>
-    //tcp_stream: TcpStream,
+    context: Arc<Mutex<Context>>, //tcp_stream: TcpStream,
 }
 
 impl MbedTlsStream {
     pub fn new(mtc: &MbedTlsConnector) -> Box<MbedTlsStream> {
         Box::new(MbedTlsStream {
-            context: mtc.context.clone()
+            context: mtc.context.clone(),
         })
     }
 }
 
-
 impl ReadWrite for MbedTlsStream {
+    // no obvious way to get socket back out of mbedtls context
+    // context.io() returns Any, which is hard to turn back into
+    // TcpStream reference, and what is lifetime of reference?
     fn socket(&self) -> Option<&TcpStream> {
         None
     }
 }
 
-impl io::Read for MbedTlsStream  {
+impl io::Read for MbedTlsStream {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         let mut ctx = self.context.lock().unwrap();
         ctx.read(buf)
@@ -107,7 +105,6 @@ impl io::Write for MbedTlsStream {
     }
 }
 
-
 /*
  * Local Variables:
  * compile-command: "cd ../.. && cargo build --example mbedtls-req --features=\"mbedtls\""