Reduce code duplication for client/server

Take is_client argument for Conn::new()

src/conn.rs

@@ -86,17 +86,14 @@ pub(crate) struct Dispatched {
 }
 
 impl Conn {
-    pub fn new_client() -> Result<Self> {
-        let algo_conf = AlgoConfig::new(true);
-        Self::new(ClientServer::Client(client::Client::new()), algo_conf)
-    }
-
-    pub fn new_server() -> Result<Self> {
-        let algo_conf = AlgoConfig::new(false);
-        Self::new(ClientServer::Server(server::Server::new()), algo_conf)
-    }
+    pub fn new(is_client: bool) -> Result<Self> {
+        let algo_conf = AlgoConfig::new(is_client);
+        let cliserv = if is_client {
+            ClientServer::Client(client::Client::new())
+        } else {
+            ClientServer::Server(server::Server::new())
+        };
 
-    fn new(cliserv: ClientServer, algo_conf: AlgoConfig) -> Result<Self, Error> {
         Ok(Conn {
             sess_id: None,
             kex: Kex::new(),

src/runner.rs

@@ -67,26 +67,23 @@ impl<'a> Runner<'a> {
         inbuf: &'a mut [u8],
         outbuf: &'a mut [u8],
     ) -> Result<Runner<'a>, Error> {
-        let conn = Conn::new_client()?;
-        let runner = Runner {
-            conn,
-            traf_in: TrafIn::new(inbuf),
-            traf_out: TrafOut::new(outbuf),
-            keys: KeyState::new_cleartext(),
-            output_waker: None,
-            input_waker: None,
-            closed: false,
-        };
-
-        Ok(runner)
+        Self::new(inbuf, outbuf, true)
     }
 
     /// `inbuf` and `outbuf` must be sized to fit the largest SSH packet allowed.
     pub fn new_server(
         inbuf: &'a mut [u8],
         outbuf: &'a mut [u8],
     ) -> Result<Runner<'a>, Error> {
-        let conn = Conn::new_server()?;
+        Self::new(inbuf, outbuf, false)
+    }
+
+    pub fn new(
+        inbuf: &'a mut [u8],
+        outbuf: &'a mut [u8],
+        is_client: bool,
+    ) -> Result<Runner<'a>, Error> {
+        let conn = Conn::new(is_client)?;
         let runner = Runner {
             conn,
             traf_in: TrafIn::new(inbuf),
@@ -99,6 +96,7 @@ impl<'a> Runner<'a> {
 
         Ok(runner)
     }
+
     pub fn is_client(&self) -> bool {
         self.conn.is_client()
     }