FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/simatktsy

equal deleted inserted replaced

-:510c70acdbf6
+:8ccc39f9d787
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
 #include <pn_const.h>           // server id constants
 #include <tisi.h>               // isi message
 #include <uiccisi.h>            // UICC server
 #include <smsisi.h>             // sms server
 #include <atk_sharedisi.h>
-#include "osttracedefinitions.h"
+#include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
-#include "satmosmsctrltraces.h"
+#include "satmosmsctrlTraces.h"
 #endif
 // CONSTANTS
 )
 {
 OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SMSRESOURCEINDRECEIVED, "CSatMoSmsCtrl::SmsResourceIndReceived" );
 TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceived");
-TBuf8<256> addressData1;
+TUint sbOffset;
-TBuf8<256> addressData2;
 // Save the transaction id, which is going to
 // be re-used in the resp.
 iMoSmsCtrlReqTransactionId = aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID );
 // Save the sender object id, in order to re-use it
 // in the response to this request
 iSenderObject = aIsiMessage.Get8bit( ISI_HEADER_OFFSET_SENDEROBJECT );
 // Save Sequence id to send it in request message
-iSequenceId = aIsiMessage.Get8bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+
+if ( KErrNotFound != aIsiMessage.FindSubBlockOffsetById(
-SIZE_SMS_SB_RESOURCE+SMS_SB_RESOURCE_SEQ_ID_OFFSET_SEQUENCEID );
+ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND,
+SMS_SB_RESOURCE_SEQ_ID,
+EIsiSubBlockTypeId16Len16,
+sbOffset ) )
+{
+iSequenceId = aIsiMessage.Get8bit(
+sbOffset + SMS_SB_RESOURCE_SEQ_ID_OFFSET_SEQUENCEID );
+}
 // save resource id to send it in request mesage
-iResourceId = aIsiMessage.Get16bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+
+if ( KErrNotFound != aIsiMessage.FindSubBlockOffsetById(
-SMS_SB_RESOURCE_OFFSET_RESOURCES );
+ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND,
+SMS_SB_RESOURCE,
+EIsiSubBlockTypeId16Len16,
-// Save Service Centre Address Subblock to send it in request message if server has
+sbOffset ) )
-//denied to access
+{
-iAddressSubblock = aIsiMessage.GetData( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+
+iResourceId = aIsiMessage.Get16bit(
-SIZE_SMS_SB_RESOURCE_SEQ_ID+SMS_SB_ADDRESS_OFFSET_ADDRESSDATA ,
+sbOffset + SMS_SB_RESOURCE_OFFSET_RESOURCES );
-aIsiMessage.Get8bit(ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+SIZE_SMS_SB_RESOURCE_SEQ_ID+
+}
-SMS_SB_ADDRESS_OFFSET_ADDRESSDATALENGTH) );
+// Save Service Centre Address Subblock to send it in request message if server has
-// Calculate Address Subblock length
+//denied to access
-TUint8 addrSbLen = aIsiMessage.Get16bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+SIZE_SMS_SB_RESOURCE_SEQ_ID+
+if ( KErrNotFound != aIsiMessage.FindSubBlockOffsetById(
-SMS_SB_ADDRESS_OFFSET_SUBBLOCKLENGTH );
+ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND,
+SMS_SB_ADDRESS,
-// Save Destination address TPDU to send it in request message if server has
+EIsiSubBlockTypeId16Len16,
-// Denied the access for that address
+sbOffset ) )
-iUserDataSubblock = ( aIsiMessage.GetData( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+
+{
-SIZE_SMS_SB_RESOURCE_SEQ_ID+addrSbLen+
+TUint8 addressLength = aIsiMessage.Get8bit(
-SMS_SB_TPDU_OFFSET_DATABYTES,
+sbOffset + SMS_SB_ADDRESS_OFFSET_ADDRESSDATALENGTH );
-aIsiMessage.Get8bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+
+iAddressSubblock = aIsiMessage.GetData(
-SIZE_SMS_SB_RESOURCE_SEQ_ID+addrSbLen+SMS_SB_TPDU_OFFSET_DATALENGTH )));
+sbOffset + SMS_SB_ADDRESS_OFFSET_ADDRESSDATA,
+addressLength );
+}
+else
+{
+iAddressSubblock.Zero();
+}
+// Save TPDU to send it in request message if server has
+// Denied the access for that address
+if ( KErrNotFound != aIsiMessage.FindSubBlockOffsetById(
+ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND,
+SMS_SB_TPDU,
+EIsiSubBlockTypeId16Len16,
+sbOffset ) )
+{
+TUint8 tpduLength =
+aIsiMessage.Get8bit( sbOffset + SMS_SB_TPDU_OFFSET_DATALENGTH );
+iUserDataSubblock = aIsiMessage.GetData(
+sbOffset + SMS_SB_TPDU_OFFSET_DATABYTES,
+tpduLength );
+}
+else
+{
+iUserDataSubblock.Zero();
+}
 //Check if location data is present. Otherwise response to SmsResourceInd
 //is always ALLOWED.
 if ( !iSatMessHandler->ServiceAvailable() )
 {
 }
 dataResp.AppendFill( KPadding,fillbytes );
 addressSb.CompleteSubBlock();
 // Add 5th Subblock SMS_SB_TPDU (Destination address)
 TIsiSubBlock userDataSb( dataResp, SMS_SB_TPDU ,
 EIsiSubBlockTypeId16Len16 );
 dataResp.Append( iUserDataSubblock.Length() );            // Addrees Length
 dataResp.Append( KPadding );
 }
 else
 {
 if( iIsMoSmsCtrlActivated )    // Check is MO SMS is activated or not
 {
-TDes8* addressData = NULL;
+TPtrC8 addressData2;
-if(SMS_SB_ADDRESS == aIsiMessage.Get16bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+
-SIZE_SMS_SB_RESOURCE_SEQ_ID+SMS_SB_ADDRESS_OFFSET_SUBBLOCKID ))
+if ( iUserDataSubblock.Length() )
 {
-addressData = &addressData1;
-TPtrC8 phoneNumber = aIsiMessage.GetData( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+
-SIZE_SMS_SB_RESOURCE_SEQ_ID+SMS_SB_ADDRESS_OFFSET_ADDRESSDATA,
-aIsiMessage.Get8bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE+
-SIZE_SMS_SB_RESOURCE_SEQ_ID+SMS_SB_ADDRESS_OFFSET_ADDRESSDATALENGTH ) );
-addressData->Append( phoneNumber.Mid( 0, phoneNumber.Length()) );
-}
-if(SMS_SB_TPDU == aIsiMessage.Get16bit( ISI_HEADER_SIZE+SIZE_SMS_RESOURCE_IND+SIZE_SMS_SB_RESOURCE
-+SIZE_SMS_SB_RESOURCE_SEQ_ID+addrSbLen+SMS_SB_TPDU_OFFSET_SUBBLOCKID ))
-{
-addressData =&addressData2;
 // check for message type
 // Whether its a command type message or Submit type
 if(KSmsCommandType == ( iUserDataSubblock[0]& 0x03 ))
 {
 iMessageType = KSmsCommandType;
 TPtrC8 phoneNumber = &iUserDataSubblock[5];
 // Addition of two for Type of number semi octet
-addressData->Append( phoneNumber.Mid( 1, (iUserDataSubblock[5]/2)+1 ));
+addressData2.Set(
+phoneNumber.Mid( 1, (iUserDataSubblock[5]/2)+1 ) );
 }
-else if( KSmsSubmitType == ( iUserDataSubblock[0] & 0x03 ))
+else if( KSmsSubmitType == ( iUserDataSubblock[0] & 0x03 ) )
 {
 iMessageType = KSmsSubmitType;
 TPtrC8 phoneNumber = &iUserDataSubblock[2];
 // Addition of two for Type of number semi octet
-addressData->Append( phoneNumber.Mid( 1, (iUserDataSubblock[2]/2)+1 ));
+addressData2.Set(
+phoneNumber.Mid( 1, (iUserDataSubblock[2]/2)+1 ) );
 }
 }
 // Dialled Number String, the length has to be removed (first byte)
 iMoSmsCtrlEnvelopeTransactionId = iSatMessaging->GetTransactionId();
 TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceived, Send envelope");
 OstTrace0( TRACE_NORMAL, DUP3_CSATMOSMSCTRL_SMSRESOURCEINDRECEIVED, "CSatMoSmsCtrl::SmsResourceIndReceived, Send envelope" );
 // The envelope is sent if MO SMS is activated
 SendMoSmsCtrlEnvelope(
 iMoSmsCtrlEnvelopeTransactionId,
-addressData1,
+iAddressSubblock,
 addressData2
 );
 }
 else        // If MO SMS is not activated
 {
 TBuf8<KMaxLengthOfResourceReq> dataResp;
 TIsiSend resourceReq( dataResp );
 // -----------------------------------------------------------------------------
 //
 void CSatMoSmsCtrl::SendMoSmsCtrlEnvelope
 (
 TUint8 aTraId,
-TDes8& aAddressData1,
+const TDesC8& aAddressData1,
-TDes8& aAddressData2
+const TDesC8& aAddressData2
 )
 {
 OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SENDMOSMSCTRLENVELOPE, "CSatMoSmsCtrl::SendMoSmsCtrlEnvelope" );
 TFLOGSTRING("TSY:CSatMoSmsCtrl::SendMoSmsCtrlEnvelope");
 data.AppendFill( KPadding, 3 );
 resourceStatus.CompleteSubBlock();
 if(iIsMoSmsCtrlActivated)
 {
 //Resource is disallowed   ||    Resource is allowed without modification
 if((SMS_RESOURCE_ALLOWED != status)||(0 == address1.Length()))
 {
 // Increment subblock
 data[1]++;
 {
 // none
 break;
 }
 }
 }
 else if ( PN_UICC == resource )
 {
 switch( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) )
 {

changeset 5	8ccc39f9d787
parent 0	63b37f68c1ce
child 7	fa67e03b87df