FCL/sf/os/cellularsrv: comparison smsprotocols/smsstack/wapprot/Src/wapdgrm.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2009 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".
 //
 // Contributors:
 //
 // Description:
 //
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wapdgrmTraces.h"
-#endif
 #include "gsmubuf.h"
 #include "gsmuset.h"
 #include "Gsmuelem.h"
 #include "Gsmumsg.h"
 //
 // For incoming short message
 //
 CWapDatagram* CWapDatagram::NewL(const CSmsMessage& aSms)
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_1, "CWapDatagram::NewL(): aSms=0x%08x", (TInt) &aSms);
+LOGWAPPROT2("CWapDatagram::NewL(): aSms=0x%08x", (TInt) &aSms);
 CWapDatagram* datagram = new (ELeave)CWapDatagram();
 CleanupStack::PushL(datagram);
 datagram->ConstructL(aSms);
 CleanupStack::Pop();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_2, "CWapDatagram::NewL(): iFromPort: %d", datagram->iFromPort);
+LOGWAPPROT2("CWapDatagram::NewL(): iFromPort: %d", datagram->iFromPort);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_3, "CWapDatagram::NewL(): iToPort: %d", datagram->iToPort);
+LOGWAPPROT2("CWapDatagram::NewL(): iToPort: %d", datagram->iToPort);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_4, "CWapDatagram::NewL(): iReference: %d", datagram->iReference);
+LOGWAPPROT2("CWapDatagram::NewL(): iReference: %d", datagram->iReference);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_5, "CWapDatagram::NewL(): iTotalSegments: %d", datagram->iTotalSegments);
+LOGWAPPROT2("CWapDatagram::NewL(): iTotalSegments: %d", datagram->iTotalSegments);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_6, "CWapDatagram::NewL(): iSegmentNumber: %d", datagram->iSegmentNumber);
+LOGWAPPROT2("CWapDatagram::NewL(): iSegmentNumber: %d", datagram->iSegmentNumber);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_7, "CWapDatagram::NewL(): iIsComplete: %d", datagram->iIsComplete);
+LOGWAPPROT2("CWapDatagram::NewL(): iIsComplete: %d", datagram->iIsComplete);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_8, "CWapDatagram::NewL(): iReference: %d", datagram->iReference);
+LOGWAPPROT2("CWapDatagram::NewL(): iReference: %d", datagram->iReference);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_9, "CWapDatagram::NewL(): iIsTextHeader: %d", datagram->iIsTextHeader);
+LOGWAPPROT2("CWapDatagram::NewL(): iIsTextHeader: %d", datagram->iIsTextHeader);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_10, "CWapDatagram::NewL(): iLogServerId: %d", datagram->iLogServerId);
+LOGWAPPROT2("CWapDatagram::NewL(): iLogServerId: %d", datagram->iLogServerId);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_11, "CWapDatagram::NewL(): i16BitPorts: %d", datagram->i16BitPorts);
+LOGWAPPROT2("CWapDatagram::NewL(): i16BitPorts: %d", datagram->i16BitPorts);
 // assert destination port
 	if (datagram->i16BitPorts)
 		{
 		if (datagram->iToPort>=0  &&  datagram->iToPort<=65535)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_12, "iToPort OK");
+			LOGWAPPROT1("iToPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_13, "iToPort FAILED");
+			LOGWAPPROT1("iToPort FAILED");
 			}
 		}
 else
 		{
 if (datagram->iToPort>=0  &&  datagram->iToPort<=255)
 			{
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_14, "iToPort OK");
+		    LOGWAPPROT1("iToPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_15, "iToPort FAILED");
+			LOGWAPPROT1("iToPort FAILED");
 			}
 		}
 	if (datagram->i16BitPorts)
 		{
 		if (datagram->iFromPort>=0  &&  datagram->iFromPort<=65535)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_16, "iFromPort OK");
+			LOGWAPPROT1("iFromPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_17, "iFromPort FAILED");
+			LOGWAPPROT1("iFromPort FAILED");
 			}
 		}
 else
 		{
 if (datagram->iFromPort>=0  &&  datagram->iFromPort<=255)
 			{
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_18, "iFromPort OK");
+		    LOGWAPPROT1("iFromPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_19, "iFromPort FAILED");
+			LOGWAPPROT1("iFromPort FAILED");
 			}
 		}
 return datagram;
 } // CWapDatagram::NewL
 //
 // For outgoing short messages
 //
 CWapDatagram* CWapDatagram::NewL(const TDesC8& aSendBuffer)
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL1_1, "CWapDatagram::NewL(): aSendBuffer=0x%08x", (TInt) &aSendBuffer);
+LOGWAPPROT2("CWapDatagram::NewL(): aSendBuffer=0x%08x", (TInt) &aSendBuffer);
 CWapDatagram* datagram = new (ELeave)CWapDatagram();
 CleanupStack::PushL(datagram);
 datagram->Construct(aSendBuffer);
 } // CWapDatagram::NewL
 CWapDatagram::~CWapDatagram()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_DTOR_1, "CWapDatagram::~CWapDatagram()");
+LOGWAPPROT1("CWapDatagram::~CWapDatagram()");
 	delete iRecvbuf;
 delete iBuffer;
 delete iSegment;
 } // CWapDatagram::~CWapDatagram
 // What about service centre address ?
 // aSmsMessageArray contains CSmsMessage objects
 //
 void CWapDatagram::EncodeConcatenatedMessagesL(RFs& aFs, CArrayPtr<CSmsMessage>& aSmsMessageArray)
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1, "CWapDatagram::EncodeConcatenatedMessagesL(): %d messages", aSmsMessageArray.Count());
+LOGWAPPROT2("CWapDatagram::EncodeConcatenatedMessagesL(): %d messages", aSmsMessageArray.Count());
 // Couple of checkings makes sense
 __ASSERT_DEBUG(iToPort >=0 && iToAddress.Length()>=0
 && (iUserDataSettings.Alphabet()==TSmsDataCodingScheme::ESmsAlphabet8Bit
 || iUserDataSettings.Alphabet()==TSmsDataCodingScheme::ESmsAlphabet7Bit),
 }
 } // CWapDatagram::EncodeConcatenatedMessagesL
 void CWapDatagram::DecodeConcatenatedMessagesL(CArrayPtr<TSegmentData>& aSmsMessageArray)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1, "CWapDatagram::DecodeConcatenatedMessagesL()");
+LOGWAPPROT1("CWapDatagram::DecodeConcatenatedMessagesL()");
 // The TSegmentData elements are in the random order in the array
 TInt Count = aSmsMessageArray.Count();
 TInt i=0;
 //
 // Outgoing
 //
 void CWapDatagram::Construct(const TDesC8& aSendBuffer)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONSTRUCT_1, "CWapDatagram::Construct()");
+LOGWAPPROT1("CWapDatagram::Construct()");
 	// Set version number to 1, as we have had to make
 	// changes to CWapDatagram for CR0929
 	iVersionNumber = EFirstVersion;
 // encoded in information elements (IE) although it is not
 // a requirement
 //
 void CWapDatagram::ConstructL(const CSmsMessage& aSms)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONSTRUCTL_1, "CWapDatagram::ConstructL()");
+LOGWAPPROT1("CWapDatagram::ConstructL()");
 	// Set version number to 1, as we have had to make
 	// changes to CWapDatagram for CR0929
 	iVersionNumber = EFirstVersion;
 // Copies contents of iBuffer to iSmsBuffer
 // Allocates iSegment object
 //
 void CWapDatagram::GetDatagramSettingsL()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1, "CWapDatagram::GetDatagramSettingsL()");
+LOGWAPPROT1("CWapDatagram::GetDatagramSettingsL()");
 	/* The WAP stack always receives 8 bit WAP datagrams from the SMS Stack as a single CSmsMessage.
 	This is because 8 bit WAP messages which cannot be encoded into a single PDU are sent in a segmented SMS
 	message which is reassembled inside the SMS Stack; the SMS Stack always passes the WAP stack
 	a single CSmsMessage containing a single WAP message regardless of the message length.
 //
 // Set WAP datagram private members from information element structures
 //
 void CWapDatagram::GetDatagramSettings(const CSmsMessage& aSms)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_GETDATAGRAMSETTINGS_1, "CWapDatagram::GetDatagramSettings()");
+LOGWAPPROT1("CWapDatagram::GetDatagramSettings()");
 const CSmsPDU& Pdu = aSms.SmsPDU();
 __ASSERT_DEBUG(Pdu.Type()==CSmsPDU::ESmsDeliver || Pdu.Type()==CSmsPDU::ESmsSubmit, // this line is testing purposes only
 			Panic(KPanicUsageError));
 // Set Alphabet information of iUserDataSettings before calling the method
 // Converts from 7/8-bit to UNICODE
 //
 void CWapDatagram::ConvertL(const TDesC8& aNarrowChars,CSmsBufferBase& aSmsBuffer) const
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONVERTL_1, "CWapDatagram::ConvertL()");
+LOGWAPPROT1("CWapDatagram::ConvertL()");
 	// Convert the data in segments of specified max size
 	const TInt KMaxSegmentSize=CSmsBufferBase::EMaxBufLength;
 	// Create converter and reassembler
 //
 // Converts from UNICODE to 7/8-bit
 //
 void CWapDatagram::ConvertL(const CSmsBufferBase& aSmsBuffer,HBufC8** aNarrowChars) const
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONVERTL1_1, "CWapDatagram::ConvertL()");
+LOGWAPPROT1("CWapDatagram::ConvertL()");
 	// Convert the data in segments of specified max size
 	const TInt KMaxSegmentSize=CSmsBufferBase::EMaxBufLength;
 	// Delete the existing buffer
 } // CWapDatagram::ConvertL
 void CWapDatagram::SetSmsMessageSettingsL(CSmsMessage& aSmsMessage, TBool aSetPorts)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1, "CWapDatagram::SetSmsMessageSettingsL()");
+LOGWAPPROT1("CWapDatagram::SetSmsMessageSettingsL()");
 CSmsPDU& Pdu = aSmsMessage.SmsPDU();
 aSmsMessage.SetToFromAddressL(iToAddress);
 aSmsMessage.SetUserDataSettingsL(iUserDataSettings);
 //
 // Return the location of the link
 //
 TInt CWapDatagram::LinkOffset()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_LINKOFFSET_1, "CWapDatagram::LinkOffset()");
+	LOGWAPPROT1("CWapDatagram::LinkOffset()");
 	return _FOFF(CWapDatagram,iLink);
 	} // CWapDatagram::LinkOffset
 TBool CWapDatagram::SetUTCOffset(const TTimeIntervalSeconds& aUTCOffset)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETUTCOFFSET_1, "CWapDatagram::SetUTCOffset()");
+LOGWAPPROT1("CWapDatagram::SetUTCOffset()");
 TBool rc = ETrue;
 TInt utcOffset = aUTCOffset.Int();
 if ((utcOffset <=  CSmsMessage::EMaximumSeconds) &&
 {
 iUTCOffset = utcOffset;
 }
 else
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETUTCOFFSET_2, "CWapDatagram:SetUTCOffset offset [out of range] = %d",utcOffset);
+LOGWAPPROT2("CWapDatagram:SetUTCOffset offset [out of range] = %d",utcOffset);
 rc = EFalse;
 }
 return rc;
 } // CWapDatagram::SetUTCOffset

branch	RCL_3
changeset 66	07a122eea281
parent 65	630d2f34d719