From ddc99f085fd6c54feaf4e41912bc8ab5903bdf8e Mon Sep 17 00:00:00 2001
From: dnobori <da.git@softether.co.jp>
Date: Mon, 7 Jun 2021 22:18:30 +0900
Subject: v4.36-9754-beta

---
 src/Cedar/Cedar.h           | 16 ++++++++--------
 src/Cedar/Connection.c      | 13 ++++++++-----
 src/Cedar/Interop_OpenVPN.c |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'src/Cedar')

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index acca6d08..5dfeabe2 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -126,10 +126,10 @@
 
 
 // Version number
-#define	CEDAR_VER					434
+#define	CEDAR_VER					436
 
 // Build Number
-#define	CEDAR_BUILD					9745
+#define	CEDAR_BUILD					9754
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -148,12 +148,12 @@
 #endif	// BUILD_PLACE
 
 // Specifies the build date
-#define	BUILD_DATE_Y		2020
-#define	BUILD_DATE_M		4
-#define	BUILD_DATE_D		5
-#define	BUILD_DATE_HO		23
-#define	BUILD_DATE_MI		20
-#define	BUILD_DATE_SE		52
+#define	BUILD_DATE_Y		2021
+#define	BUILD_DATE_M		6
+#define	BUILD_DATE_D		7
+#define	BUILD_DATE_HO		21
+#define	BUILD_DATE_MI		29
+#define	BUILD_DATE_SE		54
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/Cedar/Connection.c b/src/Cedar/Connection.c
index 5bdb0a34..e7298ddd 100644
--- a/src/Cedar/Connection.c
+++ b/src/Cedar/Connection.c
@@ -1709,7 +1709,7 @@ void ConnectionReceive(CONNECTION *c, CANCEL *c1, CANCEL *c2)
 				num = LIST_NUM(tcp->TcpSockList);
 				if (num >= s->MaxConnection)
 				{
-					TCPSOCK *ts;
+					TCPSOCK *ts = NULL;
 					for (i = 0;i < num;i++)
 					{
 						ts = LIST_DATA(tcp->TcpSockList, i);
@@ -1722,11 +1722,14 @@ void ConnectionReceive(CONNECTION *c, CANCEL *c1, CANCEL *c2)
 							c2s++;
 						}
 					}
-					if (s2c == 0 || c2s == 0)
+					if (ts != NULL)
 					{
-						// Disconnect the last socket
-						Disconnect(ts->Sock);
-						Debug("Disconnect (s2c=%u, c2s=%u)\n", s2c, c2s);
+						if (s2c == 0 || c2s == 0)
+						{
+							// Disconnect the last socket
+							Disconnect(ts->Sock);
+							Debug("Disconnect (s2c=%u, c2s=%u)\n", s2c, c2s);
+						}
 					}
 				}
 			}
diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c
index a2eaa8ad..c4280394 100644
--- a/src/Cedar/Interop_OpenVPN.c
+++ b/src/Cedar/Interop_OpenVPN.c
@@ -234,7 +234,7 @@ void OvsProceccRecvPacket(OPENVPN_SERVER *s, UDPPACKET *p, UINT protocol)
 				}
 				se->Channels[recv_packet->KeyId] = c;
 				Debug("OpenVPN New Channel :%u\n", recv_packet->KeyId);
-				OvsLog(s, se, c, "LO_NEW_CHANNEL");
+				//OvsLog(s, se, c, "LO_NEW_CHANNEL");
 			}
 /*			else if (recv_packet->OpCode == OPENVPN_P_CONTROL_SOFT_RESET_V1)
 			{
@@ -1810,7 +1810,7 @@ OPENVPN_SESSION *OvsNewSession(OPENVPN_SERVER *s, IP *server_ip, UINT server_por
 	Debug("OpenVPN New Session: %s:%u -> %s:%u Proto=%u\n", server_ip_str, server_port,
 		client_ip_str, client_port, protocol);
 
-	OvsLog(s, se, NULL, "LO_NEW_SESSION", (protocol == OPENVPN_PROTOCOL_UDP ? "UDP" : "TCP"));
+	//OvsLog(s, se, NULL, "LO_NEW_SESSION", (protocol == OPENVPN_PROTOCOL_UDP ? "UDP" : "TCP"));
 
 	return se;
 }
@@ -2434,7 +2434,7 @@ void OvsRecvPacket(OPENVPN_SERVER *s, LIST *recv_packet_list, UINT protocol)
 			OPENVPN_SESSION *se = LIST_DATA(delete_session_list, i);
 
 			Debug("Deleting Session %p\n", se);
-			OvsLog(s, se, NULL, "LO_DELETE_SESSION");
+			//OvsLog(s, se, NULL, "LO_DELETE_SESSION");
 
 			OvsFreeSession(se);
 
-- 
cgit v1.2.3