This commit is contained in:
ehouse 2005-03-03 15:26:19 +00:00
parent 9d87b3f3d1
commit 54fce74a1f

View file

@ -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();