MCL/sf/os/cellularsrv: comparison telephonyprotocols/rawipnif/src/BcaIoController.cpp

equal deleted inserted replaced

-:7ef16719d8cb
+:fc69e1e37771
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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".
 * Second-phase constructor. Creates all the state objects it owns.
 */
 	{
 	_LOG_L1C1(_L8("CBcaIoController::ConstructL"));
 	BaseConstructL();
-	iSender = CSender::NewL(*this, iTheLogger, iMaxPacketSise);
+	iSender = CSender::NewL(*this, iTheLogger, iMaxTxPacketSize);
-	iReceiver = CReceiver::NewL(*this, iTheLogger, iMaxPacketSise);
+	iReceiver = CReceiver::NewL(*this, iTheLogger, iMaxRxPacketSize);
 	iLoader = new (ELeave) CBcaControl(*this, iTheLogger);
 	}
 CBcaIoController::~CBcaIoController()
 * @param aBcaStack Text composed of bca stack and next bca names
 */
 void CBcaIoController::SetBcaStackAndName(const TDesC& aBcaStack, const TDesC& aBcaName)
 	{
 	iBcaName.Set(aBcaName);
-	iBcaName.Set(aBcaStack);
+	iBcaStack.Set(aBcaStack);
 	}
 void CBcaIoController::StartL()
 /**
 		}
 	// Update module state
 	SendState(EShuttingDown);
-	//It does nothing here.
+iLoader->ShutdownBca(aError);
-	iLoader->Cancel();
+	}
-	MBca* bca = iLoader->Bca();
-	if(bca)
-		{
-		if(aError == KErrConnectionTerminated )
-			{
-			_LOG_L1C1(_L8("This is an emergency shutdown, it kills the NIF immediately."));
-			// It is a emergency shutdown, it kills the NIF immediately.
-			bca->Close();
-			GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
-			}
-		else
-			{
-			_LOG_L1C1(_L8("This is a graceful termination which takes a while."));
-			//It is a graceful termination which takes a while.
-			iLoader->ShutdownBca(aError);
-			}
-		}
-	else //nothing to shutdown, just notify linklayer down.
-		{
-		_LOG_L1C1(_L8("Bca is not initialized, bring the linklayer down"));
-		GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
-		}
-	}
 void CBcaIoController::InitialiseBcaL()
 /**
 *  Load & Initialise Bca.
 */
 */
 	{
 	Cancel();
 	if(iMBca)
 		{
+//If the Bca is still open, close it
+if(EBcaOpened == iState)
+{
+iMBca->Close();
+}
+//delete the BCA instance
 		iMBca->Release();
 		}
 	// Library will be Closed when iBcaDll is destroyed.
 	}
 void CBcaControl::RunL()
 /**
 				_LOG_L2C2(_L8("ERROR in BCA Open = %d"), iStatus.Int());
 				iObserver.Stop(iStatus.Int());
 				}
 			else
 				{
+iState = EBcaOpened;
+//Activate the receiver Active Object
 				iObserver.Receiver().StartListening();
 				_LOG_L1C1(_L8("CBcaIoController Is Initialised"));
 				TRAPD(err, iObserver.GetObserver().InitialiseL(MRawIPObserverBase::EBcaController,KErrNone));
 				if(err != KErrNone)
 					{
 		//in this state, BCA is Shutdown, shutdown the NIF.
 		case EClosing:
 			{
 			// linklayer shutdown
+			iState = EIdling;
 			iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, iError);
 			break;
 			}
 		// Wrong state.
 		default:
 	_LOG_L2C2(_L8("iState value is %d"), iState);
 	switch (iState)
 		{
 		case EIdling:
 		case EIAPSet:
+	    case EBcaStackSet:
 			if(iMBca)
 				{
 				iMBca->CancelIoctl();
 				}
 			iState = EIdling;
 			break;
-		case EBcaStackSet:
 		case EClosing:
-		    if(iMBca)
+iState = EIdling;
-			    {
+break;
-			    iMBca->Close();
-			    }
-			iState = EIdling;
-			break;
 		default:
 			_LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state"));
 			_BTT_PANIC(KNifName, KBcaUnkownState);
 			break;
 		}
 *  This method loads the C32BCA library and uses Ioctl to set the Bca iIapId.
 */
 	{
 	_LOG_L1C1(_L8("CBcaControl::StartLoad"));
+	//iMBca should not be initialized at this point
+	__ASSERT_DEBUG(!iMBca,Panic(KBcaAlreadyExists));
+	//We don't expect iMBca here, but if it occurs, we delete previous BCA Instance
+	if(iMBca)
+	    {
+//If the state is still "open", close it first
+if(EBcaOpened == iState)
+{
+iMBca->Close();
+}
+iMBca->Release();
+}
 	// Loads Bca Dll and creates a Bca instance;
 	User::LeaveIfError(iBcaDll.iObj.Load(iObserver.BcaName()));
 	TNewBcaFactoryL newBcaFactoryProcL = (TNewBcaFactoryL)iBcaDll.iObj.Lookup(1);
 	if (NULL == newBcaFactoryProcL)
 *  @param aError the error code to shutdown the NIF.
 */
 	{
 	__ASSERT_DEBUG(iMBca,Panic(KBcaNotExist));
 	Cancel();
-iError = aError;
-iState = EClosing;
+//We should only call shutdown or close if we have successfully opened a BCA Channel
-if(iMBca)
+if((iMBca) && (EBcaOpened == iState))
 {
-iMBca->Shutdown(iStatus);
+if(aError == KErrConnectionTerminated )
-SetActive();
+{
+_LOG_L1C1(_L8("This is an emergency shutdown, it kills the NIF immediately."));
+// It is a emergency shutdown, it kills the NIF immediately.
+iMBca->Close();
+iState = EIdling;
+iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
+}
+else
+{
+_LOG_L1C1(_L8("This is a graceful termination which takes a while."));
+//It is a graceful termination which takes a while.
+iError = aError;
+iState = EClosing;
+iMBca->Shutdown(iStatus);
+SetActive();
+}
 }
+else //nothing to shutdown, just notify linklayer down.
+{
+_LOG_L1C1(_L8("Bca is not initialized or opened, bring the linklayer down"));
+iState = EIdling;
+iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
+}
 	}
 /** Panic function for RawIpNif
 * @param aPanic panic code */

branch	RCL_3
changeset 6	fc69e1e37771
parent 0	3553901f7fa8
child 7	fe8b59ab9fa0