Add Reconnect command

SSLproxy Pass filtering rules cause sslproxy to disconnect/reconnect to
the server, so the reconnect cmd instructs the server to allow it.

src/client.rs

@@ -121,7 +121,6 @@ impl Client {
 
         if self.base.proto.set_ecdhcurve {
             let ecdh = EcKey::from_curve_name(Nid::from_raw(ssl_nid_by_name(&self.base.proto.ecdhcurve))).expect("Cannot create EcKey");
-            // TODO: Is this the right way of typecasting to EcKeyRef, the compiler is fine with just &ecdh below, but the editor complains
             scb.set_tmp_ecdh(&ecdh as &EcKeyRef<Params>).expect("Cannot set ecdh");
         }
 

src/server.rs

@@ -59,6 +59,12 @@ impl Server {
     fn run_tcp(&mut self, tcp_stream: &TcpStream, failed: &mut bool) -> bool {
         self.base.cmd_trials = 0;
         loop {
+            if self.base.prev_cmd ==  Command::Reconnect {
+                debug!(target: &self.base.name, "Executing Reconnect command");
+                self.base.prev_cmd = Command::None;
+                break false;
+            }
+
             if let Err(RecvTimeoutError::Disconnected) = self.base.get_command() {
                 break false;
             }
@@ -148,6 +154,12 @@ impl Server {
         if let Ok(mut ssl_stream) = ssl_stream_result {
             self.base.cmd_trials = 0;
             exit = loop {
+                if self.base.prev_cmd ==  Command::Reconnect {
+                    debug!(target: &self.base.name, "Executing Reconnect command");
+                    self.base.prev_cmd = Command::None;
+                    break false;
+                }
+
                 if let Err(RecvTimeoutError::Disconnected) = self.base.get_command() {
                     break false;
                 }

src/testend.rs

@@ -215,6 +215,7 @@ pub enum Command {
     Recv,
     SslConnectFail,
     Timeout,
+    Reconnect,
     Quit,
     Fail,
     KeepAlive,
@@ -229,6 +230,7 @@ impl Command {
             Command::Recv => true,
             Command::SslConnectFail => true,
             Command::Timeout => true,
+            Command::Reconnect => false,
             Command::Quit => false,
             Command::Fail => false,
             Command::KeepAlive => false,
@@ -245,6 +247,7 @@ impl Display for Command {
             Command::Recv => write!(fmt, "recv"),
             Command::SslConnectFail => write!(fmt, "sslconnectfail"),
             Command::Timeout => write!(fmt, "timeout"),
+            Command::Reconnect => write!(fmt, "reconnect"),
             Command::Quit => write!(fmt, "quit"),
             Command::Fail => write!(fmt, "fail"),
             Command::KeepAlive => write!(fmt, "keepalive"),
@@ -262,6 +265,7 @@ impl FromStr for Command {
             "recv" => Ok(Command::Recv),
             "sslconnectfail" => Ok(Command::SslConnectFail),
             "timeout" => Ok(Command::Timeout),
+            "reconnect" => Ok(Command::Reconnect),
             cmd => {
                 error!("Command not supported: {}", cmd);
                 panic!("Command not supported")
@@ -334,6 +338,7 @@ pub struct TestEndBase {
     recv_trials: i32,
     pub cmd_trials: i32,
     disconnect_detect_trials: i32,
+    pub prev_cmd: Command,
 }
 
 impl TestEndBase {
@@ -352,6 +357,7 @@ impl TestEndBase {
             recv_trials: 0,
             cmd_trials: 0,
             disconnect_detect_trials: 0,
+            prev_cmd: Command::None,
         };
         testend.configure_proto(config);
         testend
@@ -730,6 +736,12 @@ impl TestEndBase {
     /// Executes commands which do not try to connect/send/recv
     pub fn execute_non_action_command(&mut self) -> CommandResult {
         match self.cmd {
+            Command::Reconnect => {
+                debug!(target: &self.name, "Received Reconnect command");
+                self.report_cmd_result(None).unwrap_or(());
+                // Signal the SSL stream loop to break out, which disconnects the current TCP stream
+                self.prev_cmd = Command::Reconnect;
+            }
             Command::Quit => {
                 debug!(target: &self.name, "Received Quit command");
                 self.reset_command();