From 83621970301e6c5bd7f78dff6337e773771cf516 Mon Sep 17 00:00:00 2001 From: Joshua Gutenplan Date: Thu, 6 Jun 2019 15:05:01 -0700 Subject: [PATCH] Updated to add check for heartbeat enabled before setting a SendOrReceiveTimeOutInMs. Used find to find all refs of that prop being set and added check for heartbeat enable. --- .../Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs | 3 ++- .../Pepperdash Core/Comm/GenericSecureTcpIpServer.cs | 3 ++- .../Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs | 3 ++- Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs index 13e1c66..3b551b2 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs @@ -328,7 +328,8 @@ namespace PepperDash.Core Client = new SecureTCPClient(Hostname, Port, BufferSize); Client.SocketStatusChange += Client_SocketStatusChange; - Client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5); + if(HeartbeatEnabled) + Client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5); Client.AddressClientConnectedTo = Hostname; Client.PortNumber = Port; // SecureClient = c; diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs index 3047a60..5554764 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs @@ -384,7 +384,8 @@ namespace PepperDash.Core if (SecureServer == null) { SecureServer = new SecureTCPServer(Port, MaxClients); - SecureServer.SocketSendOrReceiveTimeOutInMs = (this.HeartbeatRequiredIntervalMs * 5); + if(HeartbeatRequired) + SecureServer.SocketSendOrReceiveTimeOutInMs = (this.HeartbeatRequiredIntervalMs * 5); SecureServer.HandshakeTimeout = 30; SecureServer.SocketStatusChange += new SecureTCPServerSocketStatusChangeEventHandler(SecureServer_SocketStatusChange); } diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs index 820f5bb..491fe14 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs @@ -328,7 +328,8 @@ namespace PepperDash.Core Client = new TCPClient(Hostname, Port, BufferSize); Client.SocketStatusChange += Client_SocketStatusChange; - Client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5); + if(HeartbeatEnabled) + Client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5); Client.AddressClientConnectedTo = Hostname; Client.PortNumber = Port; // SecureClient = c; diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs index 7dfb682..a079c60 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs @@ -384,7 +384,8 @@ namespace PepperDash.Core if (myTcpServer == null) { myTcpServer = new TCPServer(Port, MaxClients); - myTcpServer.SocketSendOrReceiveTimeOutInMs = (this.HeartbeatRequiredIntervalMs * 5); + if(HeartbeatRequired) + myTcpServer.SocketSendOrReceiveTimeOutInMs = (this.HeartbeatRequiredIntervalMs * 5); // myTcpServer.HandshakeTimeout = 30; }