20241029

ldcsaa · Oct 28, 2024 · 2ba460b · 2ba460b
1 parent d1a9575
commit 2ba460b
Show file tree

Hide file tree

Showing 65 changed files with 32 additions and 6 deletions.
diff --git a/Linux/Change-Log.txt b/Linux/Change-Log.txt
@@ -1,4 +1,12 @@
 ==========================================================================================
+v5.9.6 Update:
+==========================================================================================
+
+> Major Upadate
+-----------------
+1. Bug fix: UDP Server component send data error would be lead to death lock.
+
+==========================================================================================
 v5.9.5 Update:
 ==========================================================================================
 

diff --git a/Linux/include/hpsocket/HPTypeDef.h b/Linux/include/hpsocket/HPTypeDef.h
@@ -28,7 +28,7 @@
 /* HP-Socket 版本号 */
 #define HP_VERSION_MAJOR	5	// 主版本号
 #define HP_VERSION_MINOR	9	// 子版本号
-#define HP_VERSION_REVISE	5	// 修正版本号
+#define HP_VERSION_REVISE	6	// 修正版本号
 #define HP_VERSION_BUILD	1	// 构建编号
 
 //#define _UDP_DISABLED			// 禁用 UDP

diff --git a/Linux/project/Version.props b/Linux/project/Version.props
@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros">
     <VER_MAJOR>5</VER_MAJOR>
     <VER_MINOR>9</VER_MINOR>
-    <VER_REVISE>5</VER_REVISE>
+    <VER_REVISE>6</VER_REVISE>
     <VER_BUILD>1</VER_BUILD>
     <ArmDeptToCopyRemotely>..\..\dependent\arm\include\brotli\decode.h:=$(RemoteRootDir)/dependent/arm/include/brotli/decode.h;..\..\dependent\arm\include\brotli\encode.h:=$(RemoteRootDir)/dependent/arm/include/brotli/encode.h;..\..\dependent\arm\include\brotli\port.h:=$(RemoteRootDir)/dependent/arm/include/brotli/port.h;..\..\dependent\arm\include\brotli\types.h:=$(RemoteRootDir)/dependent/arm/include/brotli/types.h;..\..\dependent\arm\lib\libbrotli.a:=$(RemoteRootDir)/dependent/arm/lib/libbrotli.a;..\..\dependent\arm\lib\libjemalloc_pic.a:=$(RemoteRootDir)/dependent/arm/lib/libjemalloc_pic.a;..\..\dependent\arm\lib\libmimalloc.a:=$(RemoteRootDir)/dependent/arm/lib/libmimalloc.a</ArmDeptToCopyRemotely>
     <Arm64DeptToCopyRemotely>..\..\dependent\arm64\include\brotli\decode.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/decode.h;..\..\dependent\arm64\include\brotli\encode.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/encode.h;..\..\dependent\arm64\include\brotli\port.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/port.h;..\..\dependent\arm64\include\brotli\types.h:=$(RemoteRootDir)/dependent/arm64/include/brotli/types.h;..\..\dependent\arm64\lib\libbrotli.a:=$(RemoteRootDir)/dependent/arm64/lib/libbrotli.a;..\..\dependent\arm64\lib\libjemalloc_pic.a:=$(RemoteRootDir)/dependent/arm64/lib/libjemalloc_pic.a;..\..\dependent\arm64\lib\libmimalloc.a:=$(RemoteRootDir)/dependent/arm64/lib/libmimalloc.a</Arm64DeptToCopyRemotely>

diff --git a/Linux/src/UdpServer.cpp b/Linux/src/UdpServer.cpp
@@ -1008,6 +1008,7 @@ VOID CUdpServer::HandleCmdSend(CONNID dwConnID, int flag)
 	if(!TUdpSocketObj::IsValid(pSocketObj) || !pSocketObj->IsPending())
 		return;
 
+	BOOL bClose     = FALSE;
 	BOOL bBlocked	= FALSE;
 	int writes		= flag ? -1 : MAX_CONTINUE_WRITES;
 
@@ -1034,7 +1035,10 @@ VOID CUdpServer::HandleCmdSend(CONNID dwConnID, int flag)
 			ASSERT(!itPtr->IsEmpty());
 
 			if(!SendItem(pSocketObj, itPtr, bBlocked))
-				return;
+			{
+				bClose = TRUE;
+				break;
+			}
 
 			if(bBlocked)
 			{
@@ -1052,7 +1056,9 @@ VOID CUdpServer::HandleCmdSend(CONNID dwConnID, int flag)
 		}
 	}
 
-	if(!bBlocked && pSocketObj->IsPending())
+	if(bClose)
+		HandleClose(pSocketObj, SO_SEND, ::WSAGetLastError());
+	else if(!bBlocked && pSocketObj->IsPending())
 		VERIFY(m_ioDispatcher.SendCommand(DISP_CMD_SEND, dwConnID));
 }
 
@@ -1076,7 +1082,7 @@ BOOL CUdpServer::SendItem(TUdpSocketObj* pSocketObj, TItem* pItem, BOOL& bBlocke
 
 		if(code == ERROR_WOULDBLOCK)
 			bBlocked = TRUE;
-		else if(!HandleClose(pSocketObj, SO_SEND, code))
+		else
 			return FALSE;
 	}
 	else

diff --git a/Windows/Change-Log.txt b/Windows/Change-Log.txt
@@ -1,3 +1,15 @@
+==========================================================================================
+v5.9.6 ���£�
+==========================================================================================
+
+> ��Ҫ���£�
+-----------------
+��Windows �汾û�и��£�
+
+> ����˵����
+-----------------
+1��HP-Socket v5.9.6 ���� HP-Socket v5.9.5 �汾������ֱ���滻����
+
 ==========================================================================================
 v5.9.5 ���£�
 ==========================================================================================

diff --git a/Windows/Demo/HttpProxy/Server-1/Server.rc b/Windows/Demo/HttpProxy/Server-1/Server.rc
diff --git a/Windows/Demo/HttpProxy/Server-2/Server.rc b/Windows/Demo/HttpProxy/Server-2/Server.rc
diff --git a/Windows/Demo/TestEcho-4C/Client/Client.rc b/Windows/Demo/TestEcho-4C/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-4C/Server/Server.rc b/Windows/Demo/TestEcho-4C/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-ARQ-PFM/Client/Client.rc b/Windows/Demo/TestEcho-ARQ-PFM/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-ARQ-PFM/Server/Server.rc b/Windows/Demo/TestEcho-ARQ-PFM/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-ARQ/Client/Client.rc b/Windows/Demo/TestEcho-ARQ/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-ARQ/Server/Server.rc b/Windows/Demo/TestEcho-ARQ/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-Agent/Agent-4C/Client.rc b/Windows/Demo/TestEcho-Agent/Agent-4C/Client.rc
diff --git a/Windows/Demo/TestEcho-Agent/Agent-PFM/Client.rc b/Windows/Demo/TestEcho-Agent/Agent-PFM/Client.rc
diff --git a/Windows/Demo/TestEcho-Agent/Agent-Pull/Client.rc b/Windows/Demo/TestEcho-Agent/Agent-Pull/Client.rc
diff --git a/Windows/Demo/TestEcho-Http-4C/Client/Client.rc b/Windows/Demo/TestEcho-Http-4C/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-Http-4C/Server/Server.rc b/Windows/Demo/TestEcho-Http-4C/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-Http-4C/SyncClient/Client.rc b/Windows/Demo/TestEcho-Http-4C/SyncClient/Client.rc
diff --git a/Windows/Demo/TestEcho-Http/Client/Client.rc b/Windows/Demo/TestEcho-Http/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-Http/Server/Server.rc b/Windows/Demo/TestEcho-Http/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-Http/SyncClient/Client.rc b/Windows/Demo/TestEcho-Http/SyncClient/Client.rc
diff --git a/Windows/Demo/TestEcho-PFM/Client/Client.rc b/Windows/Demo/TestEcho-PFM/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-PFM/Server/Server.rc b/Windows/Demo/TestEcho-PFM/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-Pack/Client/Client.rc b/Windows/Demo/TestEcho-Pack/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-Pack/Server/Server.rc b/Windows/Demo/TestEcho-Pack/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-Pull/Client/Client.rc b/Windows/Demo/TestEcho-Pull/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-Pull/Server/Server.rc b/Windows/Demo/TestEcho-Pull/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-SSL-4C/Client/Client.rc b/Windows/Demo/TestEcho-SSL-4C/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-SSL-4C/Server/Server.rc b/Windows/Demo/TestEcho-SSL-4C/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-SSL-PFM/Client/Client.rc b/Windows/Demo/TestEcho-SSL-PFM/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-SSL-PFM/Server/Server.rc b/Windows/Demo/TestEcho-SSL-PFM/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-SSL-Pack/Client/Client.rc b/Windows/Demo/TestEcho-SSL-Pack/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-SSL-Pack/Server/Server.rc b/Windows/Demo/TestEcho-SSL-Pack/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-SSL/Client/Client.rc b/Windows/Demo/TestEcho-SSL/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-SSL/Server/Server.rc b/Windows/Demo/TestEcho-SSL/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-UDP-PFM/Client/Client.rc b/Windows/Demo/TestEcho-UDP-PFM/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-UDP-PFM/Server/Server.rc b/Windows/Demo/TestEcho-UDP-PFM/Server/Server.rc
diff --git a/Windows/Demo/TestEcho-UDP/Client/Client.rc b/Windows/Demo/TestEcho-UDP/Client/Client.rc
diff --git a/Windows/Demo/TestEcho-UDP/Server/Server.rc b/Windows/Demo/TestEcho-UDP/Server/Server.rc
diff --git a/Windows/Demo/TestEcho/Client/Client.rc b/Windows/Demo/TestEcho/Client/Client.rc
diff --git a/Windows/Demo/TestEcho/Server/Server.rc b/Windows/Demo/TestEcho/Server/Server.rc
diff --git a/Windows/Demo/TestUDPCast/Member/Client.rc b/Windows/Demo/TestUDPCast/Member/Client.rc
diff --git a/Windows/Demo/TestUDPNode/Node/Node.rc b/Windows/Demo/TestUDPNode/Node/Node.rc
diff --git a/Windows/Include/HPSocket/HPTypeDef.h b/Windows/Include/HPSocket/HPTypeDef.h
@@ -26,7 +26,7 @@
 /* HP-Socket 版本号 */
 #define HP_VERSION_MAJOR		5	// 主版本号
 #define HP_VERSION_MINOR		9	// 子版本号
-#define HP_VERSION_REVISE		5	// 修正版本号
+#define HP_VERSION_REVISE		6	// 修正版本号
 #define HP_VERSION_BUILD		1	// 构建编号
 
 //#define _UDP_DISABLED				// 禁用 UDP

diff --git a/Windows/Project/HPSocketDLL-2010/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2010/HPSocketDLL.rc
diff --git a/Windows/Project/HPSocketDLL-2015/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2015/HPSocketDLL.rc
diff --git a/Windows/Project/HPSocketDLL-2017/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2017/HPSocketDLL.rc
diff --git a/Windows/Project/HPSocketDLL-2019/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2019/HPSocketDLL.rc
diff --git a/Windows/Project/HPSocketDLL-2022/HPSocketDLL.rc b/Windows/Project/HPSocketDLL-2022/HPSocketDLL.rc
diff --git a/Windows/Project/HPSocketDLL4C-2010/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2010/HPSocketDLL4C.rc
diff --git a/Windows/Project/HPSocketDLL4C-2015/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2015/HPSocketDLL4C.rc
diff --git a/Windows/Project/HPSocketDLL4C-2017/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2017/HPSocketDLL4C.rc
diff --git a/Windows/Project/HPSocketDLL4C-2019/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2019/HPSocketDLL4C.rc
diff --git a/Windows/Project/HPSocketDLL4C-2022/HPSocketDLL4C.rc b/Windows/Project/HPSocketDLL4C-2022/HPSocketDLL4C.rc
diff --git a/Windows/Project/HPSocketLIB-2010/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2010/HPSocketLIB.rc
diff --git a/Windows/Project/HPSocketLIB-2015/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2015/HPSocketLIB.rc
diff --git a/Windows/Project/HPSocketLIB-2017/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2017/HPSocketLIB.rc
diff --git a/Windows/Project/HPSocketLIB-2019/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2019/HPSocketLIB.rc
diff --git a/Windows/Project/HPSocketLIB-2022/HPSocketLIB.rc b/Windows/Project/HPSocketLIB-2022/HPSocketLIB.rc
diff --git a/Windows/Project/HPSocketLIB4C-2010/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2010/HPSocketLIB4C.rc
diff --git a/Windows/Project/HPSocketLIB4C-2015/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2015/HPSocketLIB4C.rc
diff --git a/Windows/Project/HPSocketLIB4C-2017/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2017/HPSocketLIB4C.rc
diff --git a/Windows/Project/HPSocketLIB4C-2019/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2019/HPSocketLIB4C.rc
diff --git a/Windows/Project/HPSocketLIB4C-2022/HPSocketLIB4C.rc b/Windows/Project/HPSocketLIB4C-2022/HPSocketLIB4C.rc