FCL/sf/incubator/modemadaptation: comparison adaptationlayer/modematadaptation/modematcontroller

equal deleted inserted replaced

-:510c70acdbf6
+:8ccc39f9d787
 #ifndef NCP_COMMON_BRIDGE_FAMILY
 const TUint8 PEP_COMM_IND_ID_ESCAPE(0x07);
 const TInt KInvalidDteId = -1;
 const TUint8 KFiller = 0;
 const TUint8 KDefaultTrId(0);
-const TUint8 KTaskIdQuerySize(20);
 #endif
+const TInt KLastByteIndex = 3;
 CModemAtPipeController* CModemAtPipeController::NewL( RIscApi& aIscApi,
 TUint& aObjId,
 CModemAtHandler& aHandler )
 {
 iModemAtObjId( aObjId ),
 iModemAtDevId( THIS_DEVICE ),
 iPipeHandle( KInvalidPipeHandle ),
 iDataportDevId( 0 ),
 iDataportObjId( 0 ),
-iCellmoDevId( 0 ),
-iCellmoObjId( 0 ),
 iAtHandler( aHandler ),
 iSchedulerWait( NULL ),
 iDteId( KInitialDteId )
 {
 C_TRACE (( _T("CModemAtPipeController::CModemAtPipeController()") ));
 C_TRACE(_L("PNS_NAME_REMOVE_IND"));
 HandleNameRemoveInd( aReceivedMessage );
 break;
 default:
-ASSERT_PANIC_ALWAYS( EFalse ) ;
+TRACE_ASSERT_ALWAYS;
 break;
 }
 }
 void CModemAtPipeController::HandlePipeServiceMessage( const TIsiReceiveC& aReceivedMessage)
 {
 C_TRACE (( _T("CModemAtPipeController::HandlePipeServiceMessage()") ));
+C_TRACE((_L("message id: %d") , aReceivedMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ));
 switch( aReceivedMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) )
 {
 case PNS_PIPE_CREATE_RESP:
 C_TRACE(_L("PIPE CREATE RESP"));
 HandlePipeCreateResp( aReceivedMessage );
 C_TRACE(_L("PNS_PEP_STATUS_IND "));
 HandlePepStatusInd( aReceivedMessage );
 break;
 default:
-ASSERT_PANIC_ALWAYS( EFalse );
+TRACE_ASSERT_ALWAYS;
 break;
 }
 }
 }
 void CModemAtPipeController::HandleNameAddInd( const TIsiReceiveC& aReceivedMessage )
 {
 C_TRACE (( _T("CModemAtPipeController::HandleNameAddInd()") ));
-TInt count = aReceivedMessage.Get16bit( ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_MATCHESINMSG );
+TInt matchesInThisMsg = aReceivedMessage.Get16bit( ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_MATCHESINMSG );
-C_TRACE((_L("Count %d") ,count ));
+C_TRACE((_L("matchesInThisMsg: %d") ,matchesInThisMsg ));
 TUint name = 0;
-for( TInt i = 1; i <= count ; i++ )
+for( TInt i = 1; i <= matchesInThisMsg; i++ )
 {
-name = aReceivedMessage.Get32bit(ISI_HEADER_SIZE+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i);
+name = aReceivedMessage.Get32bit(ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i);
 C_TRACE((_L("name [%d] 0x%x"), i ,name));
 if( MatchDataportName(name) )
 {
 iDataportDevId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
-PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i +  PN_NAME_SRV_ITEM_STR_OFFSET_DEV );
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_DEV );
 iDataportObjId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
-PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i +  PN_NAME_SRV_ITEM_STR_OFFSET_OBJ);
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_OBJ);
 if( iDataportDevId == THIS_DEVICE )
 {
 C_TRACE((_L("CREATE PIPE FROM DATAPORT when ATEXT plugins connect (devid %x  o-bjid %x) "),iDataportDevId,iDataportObjId));
 }
 else
 }
 }
 }
 void CModemAtPipeController::HandleNameRemoveInd( const TIsiReceiveC& aReceivedMessage )
 {
 C_TRACE (( _T("CModemAtPipeController::HandleNameRemoveInd()") ));
-TInt count = aReceivedMessage.Get16bit( ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_MATCHESINMSG );
+TInt matchesInThisMsg = aReceivedMessage.Get16bit( ISI_HEADER_SIZE +
+PNS_NAME_REMOVE_IND_OFFSET_MATCHESINMSG );
-C_TRACE((_L("Count %d") ,count ));
-TUint name = 0;
-for( TInt i = 1; i <= count ; i++ )
+C_TRACE((_L("matchesInThisMsg: %d"), matchesInThisMsg ));
-{
+TUint name = 0;
-name = aReceivedMessage.Get32bit(ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i);
-C_TRACE((_L("name [%d] 0x%x"), i ,name));
+for( TInt i = 1; i <= matchesInThisMsg; i++ )
+{
-if( MatchDataportName(name) )
+name = aReceivedMessage.Get32bit(ISI_HEADER_SIZE +
-{
+PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i);
-TUint devId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
+C_TRACE((_L("name [%d] 0x%x"), i ,name));
-PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i +  PN_NAME_SRV_ITEM_STR_OFFSET_DEV );
-TUint objId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
+if( MatchDataportName(name) )
-PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i +  PN_NAME_SRV_ITEM_STR_OFFSET_OBJ);
+{
+TUint devId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
-if( iDataportDevId == devId && iDataportObjId == objId )
+PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_DEV );
+TUint objId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
+PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_OBJ);
+if( iDataportDevId == devId && iDataportObjId == objId )
+{
+C_TRACE((_L("Dataport removed from name service (devid %x  o-bjid %x) "), iDataportDevId, iDataportObjId));
+iDataportDevId = 0;
+iDataportObjId = 0;
+}
+else
+{
+C_TRACE((_L("Unused dataport removed from name service. DevId: 0x%x or ObjId 0x%x"), iDataportDevId, iDataportObjId ));
+TRACE_ASSERT_ALWAYS;
+}
+}
+}
+}
+void CModemAtPipeController::HandleNameQueryResp( const TIsiReceiveC& aReceivedMessage )
+{
+C_TRACE((_L("CModemAtPipeHandler::HandleNameQueryResp")));
+TUint16 matchesInThisMsg( aReceivedMessage.Get16bit(
+ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) );
+C_TRACE((_L("matchesInThisMsg: %d"), matchesInThisMsg ));
+TBool found = EFalse;
+if( 0 < matchesInThisMsg )
+{
+for( TInt i = 0; i < matchesInThisMsg; i++ )
+{
+TInt recordIndex( i * SIZE_PN_NAME_SRV_ITEM_STR );
+TUint8 name( aReceivedMessage.Get8bit(
+ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL +
+recordIndex + ( PN_NAME_SRV_ITEM_STR_OFFSET_NAME + KLastByteIndex ) ) );
+C_TRACE((_L("name [%d] 0x%x"), i, name ));
+if( PN_AT_MODEM == name )
 {
-C_TRACE((_L("Dataport removed from name service (devid %x  o-bjid %x) "),iDataportDevId,iDataportObjId));
+C_TRACE((_L("PN_AT_MODEM found.")));
-iDataportDevId = 0;
+i = matchesInThisMsg;
-iDataportObjId = 0;
+found = ETrue;
 }
-else
-{
-C_TRACE((_L("Unused dataport removed from name service. DevId: 0x%x or ObjId 0x%x"), iDataportDevId, iDataportObjId ));
-TRACE_ASSERT_ALWAYS;
-}
-}
-}
-}
-void CModemAtPipeController::HandleNameQueryResp( const TIsiReceiveC& aReceivedMessage )
-{
-C_TRACE((_L("CModemAtPipeHandler::HandleNameQueryResp")));
-TInt count = aReceivedMessage.Get16bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG );
-C_TRACE((_L("Count d%d"), count ));
-TInt name = 0;
-TBool found = EFalse;
-for( TInt i = 0; i < count ; i++ )
-{
-name = aReceivedMessage.Get32bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL * i );
-C_TRACE((_L("name [%d]%x"),i ,name ));
-if(name == PN_AT_MODEM)
-{
-iCellmoDevId =  aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
-PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL * i +  PN_NAME_SRV_ITEM_STR_OFFSET_DEV );
-iCellmoObjId =  aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
-PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL * i +  PN_NAME_SRV_ITEM_STR_OFFSET_OBJ );
-found = ETrue;
-C_TRACE((_L("devid %x  objid %x"),iCellmoDevId,iCellmoObjId));
 }
 }
+iAtHandler.SetModemAtExistsInCmt( found );
-if( !found )
-{
-TRACE_ASSERT_ALWAYS;
-User::Panic( _L("NO AT-MODEM"), KErrNotFound );
-}
 }
 void CModemAtPipeController::SendCreatePipeMessage( const TUint8 aDevId, const TUint8 aObjId )
 isimessage.Complete();
 C_TRACE(_L("Created ISI-message"));
 DUMP_MESSAGE( messageptr );
 TInt retVal = iIscApi.Send( messageptr );
-ASSERT_PANIC_ALWAYS( retVal == KErrNone );
+TRACE_ASSERT( retVal == KErrNone );
 delete message;
 }
 void CModemAtPipeController::HandlePipeCreateResp( const TIsiReceiveC& aReceivedMessage )
 void CModemAtPipeController::LinkDteIdToPipe( const TUint8 aDteId )
 {
 C_TRACE (( _T("CModemAtPipeController::LinkDteIdToPipe(0x%x)"), aDteId ));
 TRACE_ASSERT( aDteId < KMaxDteIdCount );
+if( !(aDteId < KMaxDteIdCount) )
+{
+C_TRACE(( _T("CModemAtPipeController::LinkDteIdToPipe() illegal dteid %d"), aDteId ));
+return;
+}
 iDteId = aDteId;
 if( iDataportDevId == THIS_DEVICE )
 {
 C_TRACE((_L("CREATE PIPE FROM DATAPORT (plugins are connecting) (devid %x  o-bjid %x) "),iDataportDevId,iDataportObjId));
 SendCreatePipeMessage( iDataportDevId, iDataportObjId );
 PNS_PIPE_REMOVE_RESP_OFFSET_ERRORCODE );
 TInt pipehandle = aReceivedMessage.Get8bit( ISI_HEADER_SIZE +
 PNS_PIPE_REMOVE_RESP_OFFSET_PIPEHANDLE );
 TInt dteId = FindDteId( pipehandle );
-ASSERT_PANIC_ALWAYS( dteId < KMaxDteIdCount )
-ASSERT_PANIC_ALWAYS( error == PN_PIPE_NO_ERROR )
+TRACE_ASSERT( dteId < KMaxDteIdCount )
+if( !(dteId < KMaxDteIdCount) )
+{
+C_TRACE(( _T("CModemAtPipeController::HandlePipeRemoveResp() illegal dteid %d"), dteId ));
+return;
+}
+TRACE_ASSERT( error == PN_PIPE_NO_ERROR )
+if( error != PN_PIPE_NO_ERROR )
+{
+C_TRACE(( _T("CModemAtPipeController::HandlePipeRemoveResp() error %d"), error ));
+return;
+}
 ChangePipeState( dteId, TPipeInfo::EPipeNoPipe );
 iPipeTable[ dteId ].iHandle = KInvalidPipeHandle;
 if( iSchedulerWait )
 void CModemAtPipeController::RemovePipe( const TUint8 aDteId )
 {
 C_TRACE (( _T("CModemAtPipeController::RemovePipe(%d, 0x%x)"), aDteId, this ));
-ASSERT_PANIC_ALWAYS( aDteId < KMaxDteIdCount );
+TRACE_ASSERT( aDteId < KMaxDteIdCount );
+if( !(aDteId < KMaxDteIdCount) )
+{
+C_TRACE(( _T("CModemAtPipeController::RemovePipe() illegal dteid %d"), aDteId ));
+return;
+}
 C_TRACE (( _T("iPipeTable[aDteId]:0x%x"), &iPipeTable[aDteId] ));
 C_TRACE (( _T("iHandle: %d"), iPipeTable[aDteId].iHandle ));
 C_TRACE (( _T("i1stDevId: %d"), iPipeTable[aDteId].iFirstDevId ));
 C_TRACE (( _T("i1stObjId: %d"), iPipeTable[aDteId].iFirstObjId ));
 C_TRACE (( _T("i2ndDevId: %d"), iPipeTable[aDteId].iSecondDevId ));
 {
 C_TRACE (( _T(">>CModemAtPipeController::SendRemovePipeReq()") ));
 C_TRACE((_L("Remove pipe handle %d"), aPipeHandle));
 TInt size = ISI_HEADER_SIZE + SIZE_PNS_PIPE_REMOVE_REQ;
 HBufC8* message = HBufC8::New( size );
-ASSERT_PANIC_ALWAYS( message );
+TRACE_ASSERT( message );
 TPtr8 messageptr = message->Des();
 TIsiSend isimessage( messageptr, size );
 isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_PIPE );
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_REQ_OFFSET_UTID, 0 );
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_REQ_OFFSET_FILLERBYTE1 ,0 );
 isimessage.Complete();
 C_TRACE(_L("Created ISI-message"));
 TInt retVal = iIscApi.Send( messageptr );
-ASSERT_PANIC_ALWAYS( retVal == KErrNone );
+TRACE_ASSERT( retVal == KErrNone );
 delete message;
 if( !iSchedulerWait )
 {
 C_TRACE(_L("CModemAtPipeController::SendRemovePipeReq() iSchedulerWait->Start()"));
 TRAPD(err, iSchedulerWait = new (ELeave) CActiveSchedulerWait);
 const TUint8 aNewDevId,
 const TUint8 aNewObjId )
 {
 C_TRACE (( _T("CModemAtPipeController::RedirectPipe() dteid %d"), aDteId ));
 C_TRACE((_L("CModemAtPipeController::RedirectPipe() New pep, deviceId: 0x%x objId: 0x%x "), aNewDevId, aNewObjId));
-ASSERT_PANIC_ALWAYS( aDteId < KMaxDteIdCount )
+TRACE_ASSERT( aDteId < KMaxDteIdCount );
-ASSERT_PANIC_ALWAYS( iPipeTable[aDteId].iHandle != KInvalidPipeHandle )
+if( !(aDteId < KMaxDteIdCount) )
+{
+C_TRACE(( _T("CModemAtPipeController::RedirectPipe() illegal dteid %d"), aDteId ));
+return;
+}
+TRACE_ASSERT( iPipeTable[aDteId].iHandle != KInvalidPipeHandle );
+if( iPipeTable[aDteId].iHandle == KInvalidPipeHandle )
+{
+C_TRACE(( _T("CModemAtPipeController::RedirectPipe() invalid pipe handle %d"), iPipeTable[aDteId].iHandle ));
+return;
+}
 if( iPipeTable[aDteId].iPipeState == TPipeInfo::EPipeRemoving ||
 iPipeTable[aDteId].iPipeState == TPipeInfo::EPipeNoPipe )
 {
 C_TRACE(_L("CModemAtPipeController::RedirectPipe() Pipe is already removed -> cant redirect"));
 }
 C_TRACE(_L("CModemAtPipeController::RedirectPipe() Redirecting pipe"));
 HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_PIPE_REDIRECT_REQ );
-ASSERT_PANIC_ALWAYS( message )
+ASSERT_PANIC_ALWAYS( message );
 TPtr8 messageptr = message->Des();
 TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_PIPE_REDIRECT_REQ );
 isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID,PN_PIPE);
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_UTID, 0);
 isimessage.Set8bit(ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_NSB, KFiller );
 isimessage.Complete();
 C_TRACE(_L("Created ISI-message"));
 TInt retVal = iIscApi.Send( messageptr );
-ASSERT_PANIC_ALWAYS( retVal == KErrNone );
+TRACE_ASSERT( retVal == KErrNone );
 delete message;
 }
 void CModemAtPipeController::HandlePipeRedirectResp( const TIsiReceiveC& aReceivedMessage )
 {
 SendEnablePipeReq( pipeHandle );
 }
 }
-void CModemAtPipeController::SendTaskIdQuery()
+void CModemAtPipeController::QueryModemAtFromNameService()
 {
-C_TRACE (( _T("CModemAtPipeController::SendTaskIdQuery()") ));
+C_TRACE (( _T("CModemAtPipeController::QueryModemAtFromNameService()") ));
-HBufC8* message = HBufC8::New( KTaskIdQuerySize );
+HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_NAME_QUERY_REQ );
 TRACE_ASSERT( message );
 if( message )
 {
 TPtr8 messageptr = message->Des();
-TIsiSend isimessage( messageptr, KTaskIdQuerySize );
+TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_NAME_QUERY_REQ );
 isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_NAMESERVICE );
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_UTID, KDefaultTrId );
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_SUBFUNCTION, PNS_NAME_QUERY_REQ );
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_RESERVED1, 0 );
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_RESERVED2, 0);
 isimessage.Set32bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_BITMASK, PN_AT_MODEM );
 isimessage.Complete();
 DUMP_MESSAGE( messageptr );
 TInt retVal = iIscApi.Send( messageptr );
-ASSERT_PANIC_ALWAYS( retVal == KErrNone );
+TRACE_ASSERT( retVal == KErrNone );
 delete message;
 }
 }
 void CModemAtPipeController::SendEnablePipeReq( const TUint8 aPipeHandle )
 isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_REQ_OFFSET_FILLERBYTE1 , 0 );
 isimessage.Complete();
 DUMP_MESSAGE( messageptr );
 TInt retVal = iIscApi.Send( messageptr );
-ASSERT_PANIC_ALWAYS( retVal == KErrNone );
+TRACE_ASSERT( retVal == KErrNone );
 delete message;
 }
 TInt CModemAtPipeController::FindDteId( const TInt aHandle )
 {

changeset 5	8ccc39f9d787
parent 0	63b37f68c1ce
child 8	6295dc2169f3