From b5f611f3ba29e51e9cc232ea1b4085fdd1b1ebd0 Mon Sep 17 00:00:00 2001
From: Jason T Alborough <v>
Date: Fri, 17 Jan 2020 20:02:41 -0500
Subject: [PATCH] Changes the conditions under which the server would restart.

---
 ._Readme.md                                   | Bin 0 -> 4096 bytes
 .../Comm/GenericSecureTcpIpServer.cs          |  49 +++++++++---------
 Readme.md                                     |   2 +
 3 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 ._Readme.md

diff --git a/._Readme.md b/._Readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..4a7c548aeb4b876ee8d84ed85cdf24ef8c50a25b
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vS{8I^
zAw&nm0-$mMG%bukK2%&PIX_n~v7jI)RWB#8xTLf=H6<mnBvm;e7^LUU9FaH>eb6^f
z7etSO(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@Rz!d_Z&L#+hfm}#NX0bw1
zYH@yPQF5w6T7FTsLS|k`YF<fZeqLfuPNhOlYFddxQchxCHn1-Y)itCkRR6=hBEul}
G|33i2_$%!I

literal 0
HcmV?d00001

diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs
index f93a471..6703551 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs	
@@ -403,31 +403,26 @@ namespace PepperDash.Core
                     ErrorLog.Warn(string.Format("Server '{0}': No Shared Key set", Key));
                     return;
                 }
-                if (IsListening)
-                    return;
-
-                if (SecureServer == null)
-                {
-                    SecureServer = new SecureTCPServer(Port, MaxClients);
-                    if(HeartbeatRequired)
-                        SecureServer.SocketSendOrReceiveTimeOutInMs = (this.HeartbeatRequiredIntervalMs * 5);
-                    SecureServer.HandshakeTimeout = 30;
-                    SecureServer.SocketStatusChange += new SecureTCPServerSocketStatusChangeEventHandler(SecureServer_SocketStatusChange);
-                }
-                else
-                {
-                    //KillServer();  Remove this to be able to reactivate listener if it stops itself due to max clients without disconnecting connected clients.
-                    SecureServer.PortNumber = Port;
-                }
-                ServerStopped = false;
-                SecureServer.WaitForConnectionAsync(IPAddress.Any, SecureConnectCallback);
-                OnServerStateChange(SecureServer.State);
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Secure Server Status: {0}, Socket Status: {1}", SecureServer.State, SecureServer.ServerSocketStatus);
-
-                // StartMonitorClient();
 
 
-                ServerCCSection.Leave();
+					if (SecureServer == null)
+					{
+						SecureServer = new SecureTCPServer(Port, MaxClients);
+						if (HeartbeatRequired)
+							SecureServer.SocketSendOrReceiveTimeOutInMs = (this.HeartbeatRequiredIntervalMs * 5);
+						SecureServer.HandshakeTimeout = 30;
+						SecureServer.SocketStatusChange += new SecureTCPServerSocketStatusChangeEventHandler(SecureServer_SocketStatusChange);
+					}
+					else
+					{
+						SecureServer.PortNumber = Port;
+					}
+					ServerStopped = false;
+					SecureServer.WaitForConnectionAsync(IPAddress.Any, SecureConnectCallback);
+					OnServerStateChange(SecureServer.State);
+					Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "Secure Server Status: {0}, Socket Status: {1}", SecureServer.State, SecureServer.ServerSocketStatus);
+					ServerCCSection.Leave();
+				
             }
             catch (Exception ex)
             {
@@ -677,10 +672,13 @@ namespace PepperDash.Core
         {
             try
             {
+				
 
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "SecureServerSocketStatusChange Index:{0} status:{1} Port:{2} IP:{3}", clientIndex, serverSocketStatus, this.SecureServer.GetPortNumberServerAcceptedConnectionFromForSpecificClient(clientIndex), this.SecureServer.GetLocalAddressServerAcceptedConnectionFromForSpecificClient(clientIndex));
+               // Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "SecureServerSocketStatusChange Index:{0} status:{1} Port:{2} IP:{3}", clientIndex, serverSocketStatus, this.SecureServer.GetPortNumberServerAcceptedConnectionFromForSpecificClient(clientIndex), this.SecureServer.GetLocalAddressServerAcceptedConnectionFromForSpecificClient(clientIndex));
                 if (serverSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
                 {
+					Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "SecureServerSocketStatusChange ConnectedCLients: {0} ServerState: {1} Port: {2}", SecureServer.NumberOfClientsConnected, SecureServer.State, SecureServer.PortNumber);
+                
                     if (ConnectedClientsIndexes.Contains(clientIndex))
                         ConnectedClientsIndexes.Remove(clientIndex);
                     if (HeartbeatRequired && HeartbeatTimerDictionary.ContainsKey(clientIndex))
@@ -693,7 +691,7 @@ namespace PepperDash.Core
                         ClientReadyAfterKeyExchange.Remove(clientIndex);
 					if (WaitingForSharedKey.Contains(clientIndex))
 						WaitingForSharedKey.Remove(clientIndex);
-					if (SecureServer.MaxNumberOfClientSupported > SecureServer.NumberOfClientsConnected && SecureServer.State == ServerState.SERVER_NOT_LISTENING)
+					if (SecureServer.MaxNumberOfClientSupported > SecureServer.NumberOfClientsConnected)
 					{
 						Listen();
 					}
@@ -797,6 +795,7 @@ namespace PepperDash.Core
         {
             if (numberOfBytesReceived > 0)
             {
+				
                 string received = "Nothing";
                 var handler = TextReceivedQueueInvoke;
                 try
diff --git a/Readme.md b/Readme.md
index af824bf..0795018 100644
--- a/Readme.md
+++ b/Readme.md
@@ -15,3 +15,5 @@
 - Build the project
 - Copy PepperDash_Core.cpz and PepperDash_Core.dll from the bin folder to the CLZ Builds folder in the repo root.  Commit.
 - Merge the PR in Bitbucket
+
+