diff -r fb2c519f85e0 -r 7a45d2ea2f56 localconnectivityservice/dun/utils/src/DunDataPusher.cpp --- a/localconnectivityservice/dun/utils/src/DunDataPusher.cpp Tue Sep 14 22:59:42 2010 +0300 +++ b/localconnectivityservice/dun/utils/src/DunDataPusher.cpp Wed Oct 13 15:32:36 2010 +0300 @@ -194,7 +194,6 @@ FTRACE(FPrint( _L("CDunDataPusher::SendQueuedData() (ERROR) complete" ))); return EFalse; } - iPushState = EDunStateDataPushing; FTRACE(FPrint( _L("CDunDataPusher::SendQueuedData() complete (%d)" ), iEventQueue.Count() )); return ETrue; } @@ -338,21 +337,24 @@ if ( iComm ) { iStatus = KRequestPending; + iPushState = EDunStateDataPushing; iComm->Write( iStatus, *dataToPush ); - FTRACE(FPrint( _L("CDunDataPusher::ManageOneEvent() RComm Write() requested (buffer=0x%08X)" ), dataToPush )); + SetActive(); + FTRACE(FPrint( _L("CDunDataPusher::ManageOneEvent() RComm Write() requested for %d bytes... (buffer=0x%08X)" ), dataToPush->Length(), dataToPush )); } else if ( iSocket ) { iStatus = KRequestPending; + iPushState = EDunStateDataPushing; iSocket->Send( *dataToPush, 0, iStatus ); - FTRACE(FPrint( _L("CDunDataPusher::ManageOneEvent() RSocket Send() requested (buffer=0x%08X)" ), dataToPush )); + SetActive(); + FTRACE(FPrint( _L("CDunDataPusher::ManageOneEvent() RSocket Send() requested for %d bytes... (buffer=0x%08X)" ), dataToPush->Length(), dataToPush )); } else { FTRACE(FPrint( _L("CDunDataPusher::ManageOneEvent() (ERROR) complete" ))); return KErrGeneral; } - SetActive(); FTRACE(FPrint( _L("CDunDataPusher::ManageOneEvent() complete" ))); return KErrNone; } @@ -412,6 +414,7 @@ } // if ( !stop ) else // stop -> tear down connection { + iPushState = EDunStateIdle; TDunConnectionReason connReason; connReason.iReasonType = EDunReasonTypeRW; connReason.iContext = EDunMediaContextLocal;