Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ldcsaa/HP-Socket
Browse files Browse the repository at this point in the history
  • Loading branch information
ldcsaa committed Jan 13, 2014
2 parents b47b51e + a11bde2 commit b32bd41
Show file tree
Hide file tree
Showing 134 changed files with 356 additions and 313 deletions.
6 changes: 3 additions & 3 deletions Bin/HPSocket/HPSocket.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions Bin/HPSocket/SocketInterface.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Binary file modified Bin/HPSocket/x64/HPSocket.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket_D.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket_D.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket_U.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket_U.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket_UD.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x64/HPSocket_UD.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket_D.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket_D.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket_U.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket_U.lib
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket_UD.dll
Binary file not shown.
Binary file modified Bin/HPSocket/x86/HPSocket_UD.lib
Binary file not shown.
6 changes: 3 additions & 3 deletions Bin/HPSocket4C/HPSocket4C.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Binary file modified Bin/HPSocket4C/x64/HPSocket4C.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C_D.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C_D.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C_U.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C_U.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C_UD.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x64/HPSocket4C_UD.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C_D.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C_D.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C_U.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C_U.lib
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C_UD.dll
Binary file not shown.
Binary file modified Bin/HPSocket4C/x86/HPSocket4C_UD.lib
Binary file not shown.
62 changes: 61 additions & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,64 @@
==========================================================================================
v3.1.2 ���£�
==========================================================================================

> �޸� Server ����� OnClose() / OnError() �¼��Ĵ�������
-----------------
1����ǰ�汾�� TCP/UDP Server ����У����ر�һ������ʱ���ܻ�ͬʱ����һ�� OnClose() �¼������ɸ� OnError() �¼�
2. ���ڴ������������ԣ�����Ӧ�ó�����Ҫ�� OnClose() / OnError() �Ĵ����¼�����ν���ͬ��
3���� v3.1.2 ��ʼ������� OnClose() / OnError() �¼�ͬʱ����ʱ�����ֻ����Ӧ�ó���֪ͨ��һ���¼��������¼������
4. ��ˣ�Ӧ�ó����ڴ��� OnClose() / OnError() �¼�ʱ���ش���ͬ���������˳����Ŀ��ܺͱ�дͬ����������ĸ���

ʾ������һ��
--------------------------------------------------------------------------------------
ISocketListener::EnHandleResult CServerDlg::OnClose(CONNID dwConnID)
{
// ��ǰ�汾���п��ܴ��ڲ����� OnClose()/OnError()��Ҫ�Ѵ�������ٽ����в���ⷵ��ֵ

CCriSecLock locallock(m_csPkgInfo); // <-- �ٽ���

PVOID pInfo = nullptr;

if(m_Server->GetConnectionExtra(dwConnID, &pInfo) && pInfo != nullptr) // <-- ��ⷵ��ֵ
{
m_Server->SetConnectionExtra(dwConnID, nullptr);
delete pInfo;
}
}

ʾ���������
--------------------------------------------------------------------------------------
ISocketListener::EnHandleResult CServerDlg::OnClose(CONNID dwConnID)
{
// v3.1.2 �汾��ֻ����յ�һ�� OnClose()/OnError() �¼����ܰ�ȫ���Ƴ��ٽ�������ͼ�����

PVOID pInfo = nullptr;
m_Server->GetConnectionExtra(dwConnID, &pInfo);
ASSERT(pInfo != nullptr);

delete pInfo;
}

> �������£�
-----------------
1������ TCP Server Ĭ�ϲ�����
1) DEFAULT_SOCKET_LISTEN_QUEUE : 300
2) DEFAULT_ACCEPT_SOCKET_COUNT : 300
3) DEFAULT_FREE_SOCKETOBJ_POOL : 150
4) DEFAULT_FREE_SOCKETOBJ_HOLD : 450
5) DEFAULT_FREE_BUFFEROBJ_POOL : 300
6) DEFAULT_FREE_BUFFEROBJ_HOLD : 900

2������ UDP Server Ĭ�ϲ�����
1) DEFAULT_FREE_SOCKETOBJ_POOL : 150
2) DEFAULT_FREE_SOCKETOBJ_HOLD : 450
3) DEFAULT_FREE_BUFFEROBJ_POOL : 300
4) DEFAULT_FREE_BUFFEROBJ_HOLD : 900

> ����˵����
-----------------
1��ʹ�� HP-Socket v3.1.1 ����ǰ�汾��Ӧ�ó�����԰�ȫ������ HP-Socket v3.1.2

==========================================================================================
v3.1.1 ���£�
==========================================================================================
Expand Down Expand Up @@ -53,7 +114,6 @@ v3.1.1
5��HPSocket.dll �� HPSocket4C.dll ʹ�� /MT(d) ѡ�����±��룬����������ʱ�������
6������ʾ������ TestEcho-4C��չʾ HPSocket4C.dll ��ʹ�÷���


> ����˵����
-----------------
1��ʹ�� HP-Socket v3.0.2 ����ǰ�汾��Ӧ�ó�����԰�ȫ������ HP-Socket v3.1.1
Expand Down
4 changes: 2 additions & 2 deletions Common/License.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/CriticalSection.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/CriticalSection.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/Event.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/Event.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/FuncHelper.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/FuncHelper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/GeneralHelper.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/GeneralHelper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/PrivateHeap.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/PrivateHeap.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/RWLock.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/RWLock.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/SE.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/STLHelper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/Semaphore.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/Semaphore.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/Singleton.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/WaitFor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/WaitFor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/Win32Helper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/bufferpool.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/bufferpool.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/bufferptr.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/bufferptr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/debug/win32_crtdbg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
2 changes: 1 addition & 1 deletion Common/Src/debug/win32_crtdbg.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 2.3.2
* Author : Bruce Liang
Expand Down
6 changes: 3 additions & 3 deletions Common/Src/socket/HPSocket.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions Common/Src/socket/HPSocket.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions Common/Src/socket/HPSocket4C.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions Common/Src/socket/HPSocket4C.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.1.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions Common/Src/socket/SocketHelper.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Bruce Liang (ldcsaa@gmail.com)
* Copyright: JessMA Open Source (ldcsaa@gmail.com)
*
* Version : 3.0.1
* Version : 3.1.2
* Author : Bruce Liang
* Website : http://www.jessma.org
* Project : https://github.com/ldcsaa
* Blog : http://www.cnblogs.com/ldcsaa
* WeiBo : http://weibo.com/u/1402935851
* Wiki : http://www.oschina.net/p/hp-socket
* QQ Group : 75375912
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Loading

0 comments on commit b32bd41

Please sign in to comment.