FCL/sf/mw/ipconnmgmt: comparison connectionmonitoring/connmon/connectionmonitor/src/ConnMonNoti.cpp

equal deleted inserted replaced

-:cb7afde124a3
+:4af712113915
 /*
-* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 // are ON event handlers will remove the connection from the array.
 iServer->Iap()->RemoveConnection( connInfo );
 }
 else
 {
-TBool alreadyNotified( EFalse );
 // This updates the correct 'iConnectionId' and 'iBearer' to connInfo
-TInt ret = iServer->Iap()->GetDeleteNotifyStatus( connInfo, alreadyNotified );
+TInt ret = iServer->Iap()->GetDeleteNotifyStatus( connInfo );
 if ( ret == KErrNone )
 {
 CSubConnUpDownNotifier* subConnUpDownNotifier = 0;
 // because the current bearer has been lost (-36). MPM needs
 // a fresh list of available iaps on connection closure.
 iServer->Iap()->EnableWlanScan();
 }
-// Progress and subconn notifiers have died and no delete has been sent
+if ( subConnUpDownNotifier->LinkLayerClosed() )
-subConnUpDownNotifier->SendDeletedEvent();
+{
+// KLinkLayerClosed already received, finish with this connection
+subConnUpDownNotifier->SendDeletedEvent();
+}
 }
 else
 {
 // Delete has been sent. Just remove from internal table.
 iServer->Iap()->RemoveConnection( connInfo );
 if ( KErrNone == err )
 {
 if ( !subConnUpDownNotifier->IsActive() )
 {
 subConnUpDownNotifier->Receive();
+subConnUpDownNotifier->SetLinkLayerOpen();
 }
 }
 // Start activity notifier when stage reaches KLinkLayerOpen
 TRAPD( ret, ( iServer->Iap()->LaunchActivityNotifierL( iConnectionId ) ) );
 if ( ret == KErrNone && bearerInfo.iBearer == EBearerInfoWLAN )
 {
 LOGIT("CProgressNotifier::RunL triggered HandleAvailabilityChange()")
 iServer->AvailabilityManager()->HandleAvailabilityChange();
 }
+}
+else if ( iInfoBuf().iStage == KLinkLayerClosed )
+{
+CSubConnUpDownNotifier* subConnUpDownNotifier = 0;
+TInt err = iServer->Iap()->GetSubConnUpDownNotifier(
+iConnectionId,
+&subConnUpDownNotifier );
+if ( KErrNone == err )
+{
+subConnUpDownNotifier->SetLinkLayerClosed();
+if ( subConnUpDownNotifier->InterfaceClosed() )
+{
+// EInterfaceDown has arrived before KLinkLayerClosed
+// Let's finish with this connection.
+subConnUpDownNotifier->SendDeletedEvent();
+return;
+}
+}
 }
 iFilter = KNoFiltering;
 }
 else
 //
 void CSubConnUpDownNotifier::SendDeletedEvent()
 {
 if ( !iDeleteSent )
 {
+LOGIT("CSubConnUpDownNotifier::SendDeletedEvent")
 iEventInfo.Reset();
 iEventInfo.iEventType       = EConnMonDeleteConnection;
 iEventInfo.iConnectionId    = iConnectionId;
 iEventInfo.iSubConnectionId = iSubConnectionId;
 void CSubConnUpDownNotifier::SetInterfaceClosed()
 {
 iInterfaceClosed = ETrue;
 }
+// -----------------------------------------------------------------------------
+// CSubConnUpDownNotifier::InterfaceClosed
+// -----------------------------------------------------------------------------
+//
+TBool CSubConnUpDownNotifier::InterfaceClosed()
+{
+return iInterfaceClosed;
+}
+// -----------------------------------------------------------------------------
+// CSubConnUpDownNotifier::SetLinkLayerClosed
+// -----------------------------------------------------------------------------
+//
+void CSubConnUpDownNotifier::SetLinkLayerClosed()
+{
+iLinkLayerClosed = ETrue;
+}
+// -----------------------------------------------------------------------------
+// CSubConnUpDownNotifier::SetLinkLayerOpen
+// -----------------------------------------------------------------------------
+//
+void CSubConnUpDownNotifier::SetLinkLayerOpen()
+{
+iLinkLayerClosed = EFalse;
+}
+// -----------------------------------------------------------------------------
+// CSubConnUpDownNotifier::LinkLayerClosed
+// -----------------------------------------------------------------------------
+//
+TBool CSubConnUpDownNotifier::LinkLayerClosed()
+{
+return iLinkLayerClosed;
+}
 // -----------------------------------------------------------------------------
 // CSubConnUpDownNotifier::DoCancel
 // Cancels the request from RConnection.
 // -----------------------------------------------------------------------------
 if ( err == KErrNone )
 {
 // Is progress notifier still alive
 if ( !progressNotifier->IsActive() )
 {
+iStatus = KErrDied;
+// might delete this object
 SendDeletedEvent();
+return;
 }
 }
 }
 iStatus = KErrDied;
 iTotalUplinkDataVolume   = closedEvent.iTotalUplinkDataVolume;
 LOGIT3("SERVER: EVENT -> Connection %d closed, u: %d, d: %d",
 iConnectionId, iTotalUplinkDataVolume, iTotalDownlinkDataVolume)
+iStatus = KErrDisconnected;
 CProgressNotifier* progressNotifier = 0;
 TInt err = iServer->Iap()->GetProgressNotifier( iConnectionId, &progressNotifier );
 if ( err == KErrNone )
 {
 // Progess notifier has stopped and allinterface closed event has arrived
 if ( !progressNotifier->IsActive() )
 {
+// might delete this object
 SendDeletedEvent();
+return;
 }
 }
 else
 {
+// might delete this object
 SendDeletedEvent();
-}
+return;
+}
-iStatus = KErrDisconnected;
 }
 else if ( ( event.iSubConnectionUniqueId == 0 ) &&
 ( event.iEventType == ESubConnectionOpened ) )
 {
 // IS THIS A RECONNECT

changeset 53	4af712113915
parent 46	95d45f234cf3