wlanutilities/wlansniffer/engine/server/src/wsfwlanbearerconnectionmonitor.cpp
branchRCL_3
changeset 11 8b0eae1b1d71
parent 10 dff6ebfd236f
child 18 aaabc7526ded
--- a/wlanutilities/wlansniffer/engine/server/src/wsfwlanbearerconnectionmonitor.cpp	Fri Mar 12 15:48:54 2010 +0200
+++ b/wlanutilities/wlansniffer/engine/server/src/wsfwlanbearerconnectionmonitor.cpp	Mon Mar 15 12:44:54 2010 +0200
@@ -476,9 +476,10 @@
 // CWsfWlanBearerConnectionMonitor::AbortConnecting
 // ---------------------------------------------------------------------------
 //
-void CWsfWlanBearerConnectionMonitor::AbortConnecting()
+TInt CWsfWlanBearerConnectionMonitor::AbortConnecting()
     {
     LOG_ENTERFN( "CWsfWlanBearerConnectionMonitor::AbortConnecting" );
+    TInt result = KErrGeneral;
     
     if ( iConnectingState != ECsIdle )
         {
@@ -488,9 +489,10 @@
         if ( IsActive() && iConnectingState == ECsSocketOpened )
             {
             LOG_WRITE( "forcing connection to stop" );
-            iConnection.Stop();
+            result = iConnection.Stop();
             }
         }
+    return result;
     }
     
 
@@ -518,7 +520,7 @@
     LOG_WRITEF( "Monitor iConnectingState =%d and iConnectionId = %d", 
                          iConnectingState, iConnectionId );
     
-    if ( iConnectingState == ECsIdle )
+    if ( iConnectingState == ECsIdle && iConnectionId == KNoConnection )
         {
         // Make sure that we have connection id
         FindWlanBearerConnectedL();