equal
deleted
inserted
replaced
474 |
474 |
475 // --------------------------------------------------------------------------- |
475 // --------------------------------------------------------------------------- |
476 // CWsfWlanBearerConnectionMonitor::AbortConnecting |
476 // CWsfWlanBearerConnectionMonitor::AbortConnecting |
477 // --------------------------------------------------------------------------- |
477 // --------------------------------------------------------------------------- |
478 // |
478 // |
479 void CWsfWlanBearerConnectionMonitor::AbortConnecting() |
479 TInt CWsfWlanBearerConnectionMonitor::AbortConnecting() |
480 { |
480 { |
481 LOG_ENTERFN( "CWsfWlanBearerConnectionMonitor::AbortConnecting" ); |
481 LOG_ENTERFN( "CWsfWlanBearerConnectionMonitor::AbortConnecting" ); |
|
482 TInt result = KErrGeneral; |
482 |
483 |
483 if ( iConnectingState != ECsIdle ) |
484 if ( iConnectingState != ECsIdle ) |
484 { |
485 { |
485 LOG_WRITE( "connection in progress, aborting"); |
486 LOG_WRITE( "connection in progress, aborting"); |
486 iAborting = ETrue; |
487 iAborting = ETrue; |
487 |
488 |
488 if ( IsActive() && iConnectingState == ECsSocketOpened ) |
489 if ( IsActive() && iConnectingState == ECsSocketOpened ) |
489 { |
490 { |
490 LOG_WRITE( "forcing connection to stop" ); |
491 LOG_WRITE( "forcing connection to stop" ); |
491 iConnection.Stop(); |
492 result = iConnection.Stop(); |
492 } |
493 } |
493 } |
494 } |
|
495 return result; |
494 } |
496 } |
495 |
497 |
496 |
498 |
497 // --------------------------------------------------------------------------- |
499 // --------------------------------------------------------------------------- |
498 // CWsfWlanBearerConnectionMonitor::MonitorAccessPoint |
500 // CWsfWlanBearerConnectionMonitor::MonitorAccessPoint |
516 L"ConnectedWlanConnectionDetailsL" ); |
518 L"ConnectedWlanConnectionDetailsL" ); |
517 |
519 |
518 LOG_WRITEF( "Monitor iConnectingState =%d and iConnectionId = %d", |
520 LOG_WRITEF( "Monitor iConnectingState =%d and iConnectionId = %d", |
519 iConnectingState, iConnectionId ); |
521 iConnectingState, iConnectionId ); |
520 |
522 |
521 if ( iConnectingState == ECsIdle ) |
523 if ( iConnectingState == ECsIdle && iConnectionId == KNoConnection ) |
522 { |
524 { |
523 // Make sure that we have connection id |
525 // Make sure that we have connection id |
524 FindWlanBearerConnectedL(); |
526 FindWlanBearerConnectedL(); |
525 } |
527 } |
526 |
528 |