Server launch and close fixes

drkno · Aug 31, 2014 · 163d7f7 · 163d7f7
1 parent c700841
commit 163d7f7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/PCR1000/PcrNetworkComm.cs b/PCR1000/PcrNetworkComm.cs
@@ -350,7 +350,7 @@ public PcrNetworkServer(IComm pcrComm, int netport = 4456, bool ssl = false, str
             Debug.WriteLine("PcrNetwork Created");
         }
 
-        private bool _listenContinue = true;
+        private bool _listenContinue;
 
         /// <summary>
         /// Listen for a new incoming connection.
@@ -477,6 +477,8 @@ private void PcrCommOnDataReceived(IComm sender, DateTime recvTime, string data)
             }
         }
 
+        private Thread _listenThread;
+
         /// <summary>
         /// Starts the network server.
         /// </summary>
@@ -493,8 +495,8 @@ public bool Start()
 
                 _listenContinue = true;
                 _tcpListener = new TcpListener(IPAddress.Any, _port);
-                var listenThread = new Thread(ListenForClients);
-                listenThread.Start();
+                _listenThread = new Thread(ListenForClients);
+                _listenThread.Start();
             }
             catch (Exception)
             {
@@ -516,6 +518,9 @@ public bool Stop()
                 {
                     return false;
                 }
+                _listenContinue = false;
+                _tcpListener.Stop();
+                _listenThread.Abort();
             }
             catch (Exception)
             {

diff --git a/PCRNetworkServer/Gui.Designer.cs b/PCRNetworkServer/Gui.Designer.cs
diff --git a/PCRNetworkServer/Gui.cs b/PCRNetworkServer/Gui.cs
@@ -44,7 +44,7 @@ public Gui()
         private bool CheckSettings()
         {
             int port;
-            if (int.TryParse(textBoxNetwork.Text, out port) || port <= 0)
+            if (!int.TryParse(textBoxNetwork.Text, out port) || port <= 0)
             {
                 return false;
             }
@@ -66,7 +66,10 @@ private void ButtonOnOffClick(object sender, EventArgs e)
                 {
                     try
                     {
-                        _pcrNetworkServer.Stop();
+                        if (!_pcrNetworkServer.Stop())
+                        {
+                            throw new Exception("A fatal error occured while stopping the server. Please check debug messages for details.");
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -77,6 +80,9 @@ private void ButtonOnOffClick(object sender, EventArgs e)
                     buttonOnOff.BackColor = Color.FromArgb(255, 128, 128);
                     textBoxNetwork.Enabled = true;
                     comboBoxSerialPort.Enabled = true;
+                    checkBoxUseSecurity.Enabled = true;
+                    checkBoxSsl.Enabled = checkBoxUseSecurity.Checked;
+                    textBoxPassword.Enabled = checkBoxUseSecurity.Checked;
                     _isOn = false;
                     break;
                 }
@@ -99,6 +105,11 @@ private void ButtonOnOffClick(object sender, EventArgs e)
                         #if DEBUG
                         _pcrNetworkServer.SetDebugLogger(true);
                         #endif
+
+                        if (!_pcrNetworkServer.Start())
+                        {
+                            throw new Exception("Server startup failed. Review debug messages for details.");
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -111,6 +122,9 @@ private void ButtonOnOffClick(object sender, EventArgs e)
                     buttonOnOff.BackColor = Color.FromArgb(192, 255, 192);
                     textBoxNetwork.Enabled = false;
                     comboBoxSerialPort.Enabled = false;
+                    checkBoxUseSecurity.Enabled = false;
+                    checkBoxSsl.Enabled = false;
+                    textBoxPassword.Enabled = false;
                     _isOn = true;
                     break;
                 }