mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-04 23:02:02 +01:00
cleanup
This commit is contained in:
parent
9d87b3f3d1
commit
54fce74a1f
1 changed files with 2 additions and 4 deletions
|
@ -87,6 +87,8 @@ CSendSocket::CSendSocket()
|
||||||
|
|
||||||
CSendSocket::~CSendSocket()
|
CSendSocket::~CSendSocket()
|
||||||
{
|
{
|
||||||
|
Cancel();
|
||||||
|
iSocketServer.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -182,7 +184,6 @@ CSendSocket::SendL( const XP_U8* aBuf, XP_U16 aLen, const CommsAddrRec* aAddr )
|
||||||
TBool success;
|
TBool success;
|
||||||
|
|
||||||
XP_ASSERT( !IsActive() );
|
XP_ASSERT( !IsActive() );
|
||||||
XP_LOGF( "here" );
|
|
||||||
if ( iSSockState == ESending ) {
|
if ( iSSockState == ESending ) {
|
||||||
success = EFalse;
|
success = EFalse;
|
||||||
} else if ( aLen > KMaxMsgLen ) {
|
} else if ( aLen > KMaxMsgLen ) {
|
||||||
|
@ -190,17 +191,14 @@ CSendSocket::SendL( const XP_U8* aBuf, XP_U16 aLen, const CommsAddrRec* aAddr )
|
||||||
} else {
|
} else {
|
||||||
XP_ASSERT( iSendBuf.Length() == 0 );
|
XP_ASSERT( iSendBuf.Length() == 0 );
|
||||||
iSendBuf.Copy( aBuf, aLen );
|
iSendBuf.Copy( aBuf, aLen );
|
||||||
XP_LOGF( "here 1" );
|
|
||||||
|
|
||||||
if ( iAddrSet && (0 != XP_MEMCMP( (void*)&iCurAddr, (void*)aAddr,
|
if ( iAddrSet && (0 != XP_MEMCMP( (void*)&iCurAddr, (void*)aAddr,
|
||||||
sizeof(aAddr) )) ) {
|
sizeof(aAddr) )) ) {
|
||||||
Disconnect();
|
Disconnect();
|
||||||
}
|
}
|
||||||
XP_ASSERT( !iAddrSet );
|
XP_ASSERT( !iAddrSet );
|
||||||
XP_LOGF( "here 2: aAddr = 0x%x", aAddr );
|
|
||||||
iCurAddr = *aAddr;
|
iCurAddr = *aAddr;
|
||||||
iAddrSet = ETrue;
|
iAddrSet = ETrue;
|
||||||
XP_LOGF( "here 3" );
|
|
||||||
|
|
||||||
if ( iSSockState == ENotConnected ) {
|
if ( iSSockState == ENotConnected ) {
|
||||||
ConnectL();
|
ConnectL();
|
||||||
|
|
Loading…
Reference in a new issue