--- a/group/bld.inf Mon Jul 19 14:53:33 2010 +0100
+++ b/group/bld.inf Wed Jul 21 17:41:03 2010 +0100
@@ -15,10 +15,6 @@
*
*/
-/*
-* %version: 1.2.2 %
-*/
-
PRJ_PLATFORMS
DEFAULT
@@ -49,7 +45,7 @@
#include "../telephonyserverplugins/simatktsy/group/bld.inf"
#include "../telephonyutils/dial/group/bld.inf"
#include "../telephonyutils/telephonywatchers/group/bld.inf"
-#include "../telephonyutils/etel3rdpartyapi/group/bld.inf"
+#include "../telephonyutils/etel3rdpartyapi/Group/bld.inf"
#include "../hwpluginsimulation/mocksy/group/bld.inf"
#include "../wapstack/wapmessageapi/group/bld.inf"
--- a/package_definition.xml Mon Jul 19 14:53:33 2010 +0100
+++ b/package_definition.xml Wed Jul 21 17:41:03 2010 +0100
@@ -8,9 +8,6 @@
<component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
<unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
</component>
- <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
- <unit bldFile="basebandabstraction/isc_if/group"/>
- </component>
</collection>
<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
<component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
@@ -39,6 +36,9 @@
<component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
<unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
</component>
+ <component id="secondarypdpcontextumtsdriver" name="Secondary PDP Context UMTS Driver" introduced="8.1" deprecated="^3" purpose="optional" filter="test">
+ <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+ </component>
<component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
<unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
</component>
@@ -70,7 +70,7 @@
<component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
</component>
- <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
+ <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
<unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
</component>
<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
@@ -86,14 +86,6 @@
<unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
</component>
</collection>
- <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
- <component id="gennif" filter="s60" name="Generic NIF">
- <unit bldFile="commonnetworkinterface/gennif/group"/>
- </component>
- <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
- <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
- </component>
- </collection>
<collection id="telephonyutils" name="Telephony Utilities" level="app-if">
<component id="dial" name="Dial" deprecated="9.1" purpose="optional">
<unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
@@ -106,9 +98,6 @@
</component>
</collection>
<collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
- <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
- <unit bldFile="cellularsrv_plat/group"/>
- </component>
<component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
<unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
</component>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Wed Jul 21 17:41:03 2010 +0100
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="os"/>
--- a/smsprotocols/smsstack/common/inc/smsstacklog.h Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/common/inc/smsstacklog.h Wed Jul 21 17:41:03 2010 +0100
@@ -23,7 +23,7 @@
// Functions to perform specific logging where necessary.
//
- void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
+ void LogSmsIfPDUL(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
void LogSmsIfHexBuf(const TDesC8& aText, const TDesC8& aHexBuf);
void LogSmsIfTypeOfNumber(const TDesC8& aText, RMobilePhone::TMobileTON aTON);
void LogSmsIfNumberingPlan(const TDesC8& aText, RMobilePhone::TMobileNPI aNPI);
--- a/smsprotocols/smsstack/common/src/smsstacklog.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/common/src/smsstacklog.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -28,7 +28,7 @@
#include "gsmupdu.h"
#include "smsstacklog.h"
-#include <S32MEM.H>
+#include <s32mem.h>
//
// All functions in this file are available only if logging is enabled.
@@ -48,7 +48,7 @@
* @param aPDU PDU to log.
* @param aCommandPdu Flag to say if this is a command PDU.
*/
-void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu)
+void LogSmsIfPDUL(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu)
{
TBuf8<128> tmpBuf;
@@ -203,8 +203,8 @@
tmpBuf.Append(_L8(" - -"));
}
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_1, "%s HEX MTI RP UDHI SRX MMS RD VP", aText);
- OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_2, "%sFO: 0x%02X %s", aText, (TUint)firstOctet, tmpBuf);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_1, "%s HEX MTI RP UDHI SRX MMS RD VP", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_2, "%sFO: 0x%02X %s", aText, (TUint)firstOctet, tmpBuf);
if (pduType == -1)
{
@@ -220,7 +220,7 @@
pduType == CSmsPDU::ESmsStatusReport ||
pduType == CSmsPDU::ESmsCommand)
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_3, "%sMR: 0x%02X", aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_3, "%sMR: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
}
@@ -229,13 +229,13 @@
//
if (pduType == CSmsPDU::ESmsCommand)
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_4, "%sPID: 0x%02X", aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_4, "%sPID: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_5, "%sCT: 0x%02X", aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_5, "%sCT: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_6, "%sMN: 0x%02X", aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_6, "%sMN: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
}
@@ -261,11 +261,11 @@
tmpBuf.SetLength(telLength);
- OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_7, "%sTEL: 0x%02X %s", aText, (TUint)typeOfNumber, tmpBuf);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_7, "%sTEL: 0x%02X %s", aText, (TUint)typeOfNumber, tmpBuf);
}
else
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_8, "%sTEL: Illegal length value (%d)!", aText, telLength);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_8, "%sTEL: Illegal length value (%d)!", aText, telLength);
return;
}
@@ -274,7 +274,7 @@
//
if (pduType == CSmsPDU::ESmsSubmit || pduType == CSmsPDU::ESmsDeliver)
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_9, "%sPID: 0x%02X", aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_9, "%sPID: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
tmpBuf.Zero();
@@ -409,8 +409,8 @@
tmpBuf.Append(_L8("-"));
}
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_10, "%sDCS: HEX CLASS DCS INDICATION TYPE", aText);
- OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_11, "%s 0x%02X %s", aText, (TUint) dcs, tmpBuf);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_10, "%sDCS: HEX CLASS DCS INDICATION TYPE", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_11, "%s 0x%02X %s", aText, (TUint) dcs, tmpBuf);
}
//
@@ -420,7 +420,7 @@
{
if (vpf == EVpRel)
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_12, "%sVP: %d (Relative)", aText, aPDU[octetOffset++]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_12, "%sVP: %d (Relative)", aText, aPDU[octetOffset++]);
}
else if (vpf == EVpAbs)
{
@@ -432,7 +432,7 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_13, "%sVP: %s (Absolute)", aText, tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_13, "%sVP: %s (Absolute)", aText, tmpBuf);
octetOffset += 7;
}
else if (vpf == EVpEnh)
@@ -445,7 +445,7 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_14, "%sVP: %s (Enhanced)", aText, tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_14, "%sVP: %s (Enhanced)", aText, tmpBuf);
octetOffset += 7;
}
}
@@ -462,7 +462,7 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_15, "%sSCTS: %s", aText, tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_15, "%sSCTS: %s", aText, tmpBuf);
octetOffset += 7;
}
@@ -480,10 +480,10 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_16, "%sDT: %s", aText, tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_16, "%sDT: %s", aText, tmpBuf);
octetOffset += 7;
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_17, "%sST: %02X", aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_17, "%sST: %02X", aText, aPDU[octetOffset]);
octetOffset++;
}
@@ -527,15 +527,15 @@
}
else
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_18, "%sUDL: Problems with the ieidl_a %d being less that UDHL",aText, ieidl_a);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_18, "%sUDL: Problems with the ieidl_a %d being less that UDHL",aText, ieidl_a);
}
if ((ieidl_a + 1) > udhl)
{
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_19, "%sUDL: Corrupted or implement decoding for second iei_b, iei_n!",aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_19, "%sUDL: Corrupted or implement decoding for second iei_b, iei_n!",aText);
}
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_20, "%sUDL: HEX UDHL IEI_A IEIDL_A ", aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_20, "%sUDL: HEX UDHL IEI_A IEIDL_A ", aText);
TBuf8<200> data;
RDesWriteStream dataStream(data);
@@ -552,24 +552,24 @@
dataStream.WriteL(tmpBuf);
dataStream.Close();
- OstTraceDefData( OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_21, "%s 0x%02X 0x%02X 0x%02X 0x%02X %s", data.Ptr(), data.Size() );
+ OstTraceDefData( OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_21, "%s 0x%02X 0x%02X 0x%02X 0x%02X %s", data.Ptr(), data.Size() );
}
else
{
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_22, "%sUDL: Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", aText);
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_23, "%sUDL: HEX UDHL IEI_A", aText);
- OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_24, "%s 0x%02X 0x%02X", aText, udl, udhl);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_22, "%sUDL: Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_23, "%sUDL: HEX UDHL IEI_A", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_24, "%s 0x%02X 0x%02X", aText, udl, udhl);
}
}
else
{
TInt udl = aPDU[octetOffset++];
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_25, "%sUDL: HEX UDHL", aText);
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_26, "%s 0x%02X -", aText, udl);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_25, "%sUDL: HEX UDHL", aText);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_26, "%s 0x%02X -", aText, udl);
}
}
- } // LogSmsIfPDU
+ } // LogSmsIfPDUL
#ifdef OST_TRACE_COMPILER_IN_USE
@@ -841,7 +841,7 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" PDU: "));
- LogSmsIfPDU(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
+ LogSmsIfPDUL(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
} // LogSmsIfSmsEntry
@@ -956,7 +956,7 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" iSubmitReport PDU: "));
- LogSmsIfPDU(tmpBuf, aAttrib.iSubmitReport, EFalse);
+ LogSmsIfPDUL(tmpBuf, aAttrib.iSubmitReport, EFalse);
}
} // LogSmsIfSendAttributes
--- a/smsprotocols/smsstack/gsmu/inc/Gsmuelem.h Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/gsmu/inc/Gsmuelem.h Wed Jul 21 17:41:03 2010 +0100
@@ -1098,18 +1098,26 @@
IMPORT_C TPtrC ConvertToNativeL(const TDesC8& aUDElements);
IMPORT_C TPtrC ConvertToNativeL(const TDesC8& aUDElements, TSmsEncoding aEncoding);
- TBool IsSupportedL(TChar aChar);
TBool IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
TInt& aIndexOfFirstUnconvertibleCharacter);
- TBool IsSupportedL(TChar aChar, TSmsEncoding aEncoding, TBool& aIsDowngrade,
- TBool& aRequiresAlternativeEncoding);
TBool IsSupportedL(const TDesC& aDes, TSmsEncoding aEncoding,
TInt& aNumberOfUnconvertibleCharacters,
TInt& aNumberOfDowngradedCharacters,
TInt& aNumberRequiringAlternativeEncoding,
TInt& aIndexOfFirstUnconvertibleCharacter);
-
+
+ void ConvertWith7BitEncodingL(const TDesC& aDes, TDes& aRestoredDes,
+ TInt& aNumberOfUnconvertibleCharacters,
+ TInt& aNumberOfDowngradedCharacters,
+ TInt& aIndexOfFirstUnconvertibleCharacter, TBool aIsCountDowngrade);
+
+ void ConvertWithAlternativeEncodingL(const TDesC& aDes, const TDesC& aRestoredStdDes, TSmsEncoding aEncoding,
+ TInt& aNumberOfUnconvertibleCharacters,
+ TInt& aNumberOfDowngradedCharacters,
+ TInt& aNumberRequiringAlternativeEncoding,
+ TInt& aIndexOfFirstUnconvertibleCharacter);
+
// Alternative Encoding methods
TSmsEncoding FindBestAlternativeEncodingL(const TDesC& aNativeCharacters,
TSmsEncoding aSuggestedEncoding);
--- a/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -1399,33 +1399,6 @@
/**
- * Tests if the character is supported by the current character set.
- * This function can be used with 7bit and 8bit alphabets.
- *
- * @param aChar Character to investigate.
- *
- * @return ETrue if the character is supported.
- *
- * @note Since the function is based on the old behaviour (pre-PREQ2090)
- * it does not accept a downgraded character or alternative encoding
- * as being supported.
- */
-TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar)
- {
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_1, "[1] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
-
- TBool isDowngrade, isRequiresAlternativeEncoding;
-
- TBool supported = IsSupportedL(aChar, ESmsEncodingNone,
- isDowngrade, isRequiresAlternativeEncoding);
-
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_2, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
-
- return supported;
- } // CSmsAlphabetConverter::IsSupportedL
-
-
-/**
* Tests if the descriptor text is supported by the current character set.
* This function can be used with 7bit and 8bit alphabets.
*
@@ -1440,133 +1413,32 @@
TBool CSmsAlphabetConverter::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
TInt& aIndexOfFirstUnconvertibleCharacter)
{
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1, "[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_1, "[1] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
TInt desLength = aDes.Length();
- //
- // Initialise the exit params...
- //
- aNumberOfUnconvertibleCharacters = 0;
- aIndexOfFirstUnconvertibleCharacter = desLength;
-
- //
- // Create buffers for the input converted to 7Bit and a buffer for it once
- // converted back again...
- //
- HBufC8* encodedBuf = HBufC8::NewLC(desLength*2); // worse case
- HBufC* backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
- TPtr8 encoded(encodedBuf->Des());
- TPtr backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
-
- //
- // Convert the input string to standard 7bit (with downgrades if needed)...
- //
- PrepareForConversionFromNativeL(ESmsEncodingNone);
-
- TInt notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-
- if (notConverted > 0)
- {
- aNumberOfUnconvertibleCharacters += notConverted;
- }
- else if (notConverted < 0)
- {
- aNumberOfUnconvertibleCharacters = desLength;
- }
-
- //
- // Convert it back again to the native format...
- //
- TInt state = CCnvCharacterSetConverter::KStateDefault;
- TInt notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterStd, encoded, state);
-
- if (notRestored > 0)
- {
- aNumberOfUnconvertibleCharacters += notRestored;
- }
- else if (notRestored < 0)
- {
- aNumberOfUnconvertibleCharacters = desLength;
- }
//
- // Work out if the string is acceptable as it is (e.g. no unconvertible
- // and no downgrades). We only need do this if the previous conversions were
- // complete with no issues.
+ // Create buffer for restored text string...
+ //
+ HBufC* backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
+ TPtr backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
+
//
- for (TInt pos = desLength-1; pos >= 0; --pos)
- {
- if (backToUnicodeAfterStd[pos] != aDes[pos])
- {
- aNumberOfUnconvertibleCharacters++;
- aIndexOfFirstUnconvertibleCharacter = pos;
- }
- }
-
+ // Convert the string...
+ //
+ TInt numberOfDowngradedCharacters;
+ TBool isCountDowngrade = EFalse; // Don't count downgrades
+ ConvertWith7BitEncodingL(aDes, backToUnicodeAfterStd,
+ aNumberOfUnconvertibleCharacters, numberOfDowngradedCharacters,
+ aIndexOfFirstUnconvertibleCharacter, isCountDowngrade);
+
CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
- CleanupStack::PopAndDestroy(encodedBuf);
- //
- // Useful logging...
- //
TBool supported = (aNumberOfUnconvertibleCharacters == 0);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
-
- return supported;
- } // CSmsAlphabetConverter::IsSupportedL
-
-
-/**
- * Tests if the character is supported by the current character set.
- * This function can be used with 7bit and 8bit alphabets.
- *
- * @param aChar Character to investigate.
- * @param aEncoding Alternative 7bit encoding (if used).
- * @param aIsDowngrade Exit param set to ETrue if the
- * character has to be downgraded.
- * @param aRequiresAlternativeEncoding Exit param set to ETrue if the
- * alternative encoding has to be
- * used to encode it.
- *
- * @return ETrue if the character is supported.
- */
-TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar, TSmsEncoding aEncoding,
- TBool& aIsDowngrade,
- TBool& aRequiresAlternativeEncoding)
- {
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1, "[3] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
-
- //
- // Convert the character...
- //
- TInt numberOfUnconvertibleCharacters, numberOfDowngradedCharacters,
- numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
- TBuf<4> toEncode;
-
- toEncode.SetLength(1);
- toEncode[0]=(TText)aChar;
-
- TBool supported = IsSupportedL(toEncode, aEncoding,
- numberOfUnconvertibleCharacters,
- numberOfDowngradedCharacters,
- numberRequiringAlternativeEncoding,
- indexOfFirstUnconvertibleCharacter);
-
- //
- // Calculate the exit params...
- //
- aIsDowngrade = (numberOfDowngradedCharacters > 0);
- aRequiresAlternativeEncoding = (numberRequiringAlternativeEncoding > 0);
-
- //
- // Useful logging...
- //
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2, "CSmsAlphabetConverter::IsSupportedL(): aIsDowngrade=%d.", aIsDowngrade);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3, "CSmsAlphabetConverter::IsSupportedL(): aRequiresAlternativeEncoding=%d.", aRequiresAlternativeEncoding);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_3, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
return supported;
} // CSmsAlphabetConverter::IsSupportedL
@@ -1596,77 +1468,28 @@
TInt& aNumberRequiringAlternativeEncoding,
TInt& aIndexOfFirstUnconvertibleCharacter)
{
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1, "[4] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1, "[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
TInt desLength = aDes.Length();
//
- // Initialise the exit params...
+ // Initialise the exit param...
//
- aNumberOfUnconvertibleCharacters = 0;
- aNumberOfDowngradedCharacters = 0;
aNumberRequiringAlternativeEncoding = 0;
- aIndexOfFirstUnconvertibleCharacter = desLength;
//
- // Create buffers for the input converted to 7Bit and a buffer for it once
- // converted back again...
+ // Create buffer for restored text string...
//
- HBufC8* encodedBuf = HBufC8::NewLC(desLength*2); // worse case
HBufC* backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
- TPtr8 encoded(encodedBuf->Des());
TPtr backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
-
- //
- // Convert the input string to standard 7bit (with downgrades if needed)...
- //
- PrepareForConversionFromNativeL(ESmsEncodingNone);
-
- TInt notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-
- if (notConverted > 0)
- {
- aNumberOfUnconvertibleCharacters += notConverted;
- }
- else if (notConverted < 0)
- {
- aNumberOfUnconvertibleCharacters = desLength;
- }
+ TBool isCountDowngrade = ETrue; // Count downgraded chars
//
- // Convert it back again to the native format...
- //
- TInt state = CCnvCharacterSetConverter::KStateDefault;
- TInt notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterStd, encoded, state);
-
- if (notRestored > 0)
- {
- aNumberOfUnconvertibleCharacters += notRestored;
- }
- else if (notRestored < 0)
- {
- aNumberOfUnconvertibleCharacters = desLength;
- }
-
- //
- // Work out if the string is acceptable as it is (e.g. no unconvertible
- // and no downgrades).
- //
- for (TInt pos = desLength-1; pos >= 0; --pos)
- {
- if (backToUnicodeAfterStd[pos] != aDes[pos])
- {
- if (backToUnicodeAfterStd[pos] != KReplacementCharacter)
- {
- aNumberOfDowngradedCharacters++;
- }
- else
- {
- aNumberOfUnconvertibleCharacters++;
- aIndexOfFirstUnconvertibleCharacter = pos;
- }
- }
- }
-
+ // Convert the character...
+ //
+ ConvertWith7BitEncodingL(aDes, backToUnicodeAfterStd,
+ aNumberOfUnconvertibleCharacters, aNumberOfDowngradedCharacters,
+ aIndexOfFirstUnconvertibleCharacter, isCountDowngrade);
+
TInt totalCharFaultsSoFar = aNumberOfUnconvertibleCharacters +
aNumberOfDowngradedCharacters;
@@ -1700,73 +1523,12 @@
TInt tmpDowngradedCharacters = 0;
TInt tmpUnconvertibleCharacters = 0;
TInt tmpIndexOfFirstUnconvertibleCharacter = desLength;
-
- //
- // Convert the input string to the alternative encoding...
- //
- PrepareForConversionFromNativeL(aEncoding);
-
- notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
- if (notConverted > 0)
- {
- tmpUnconvertibleCharacters = notConverted;
- }
- else if (notConverted < 0)
- {
- tmpUnconvertibleCharacters = desLength;
- }
-
- //
- // Convert it back again to the native format...
- //
- HBufC* backToUnicodeAfterAltBuf = HBufC::NewLC(desLength);
- TPtr backToUnicodeAfterAlt(backToUnicodeAfterAltBuf->Des());
- TInt state = CCnvCharacterSetConverter::KStateDefault;
- TInt notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterAlt, encoded, state);
-
- if (notRestored > 0)
- {
- tmpUnconvertibleCharacters += notRestored;
- }
- else if (notRestored < 0)
- {
- tmpUnconvertibleCharacters = desLength;
- }
-
- //
- // Now work out which characters are downgrades, require alternative encoding
- // or are unsupported.
- //
- for (TInt pos = desLength-1; pos >= 0; --pos)
- {
- if (backToUnicodeAfterStd[pos] != aDes[pos])
- {
- // Not supported by standard encoder...
- if (backToUnicodeAfterAlt[pos] == aDes[pos])
- {
- // Supported by alternative encoder...
- aNumberRequiringAlternativeEncoding++;
- }
- else if (backToUnicodeAfterStd[pos] != KReplacementCharacter)
- {
- // Downgraded by standard encoder...
- tmpDowngradedCharacters++;
- }
- else if (backToUnicodeAfterAlt[pos] != KReplacementCharacter)
- {
- // Downgraded by alternative encoder...
- tmpDowngradedCharacters++;
- aNumberRequiringAlternativeEncoding++;
- }
- else
- {
- // Unconvertible...
- tmpUnconvertibleCharacters++;
- tmpIndexOfFirstUnconvertibleCharacter = pos;
- }
- }
- }
-
+
+ ConvertWithAlternativeEncodingL(aDes, backToUnicodeAfterStd, aEncoding,
+ tmpUnconvertibleCharacters, tmpDowngradedCharacters,
+ aNumberRequiringAlternativeEncoding,
+ tmpIndexOfFirstUnconvertibleCharacter);
+
// Is this better?
if ( totalCharFaultsSoFar >= (tmpUnconvertibleCharacters + tmpDowngradedCharacters) )
{
@@ -1780,29 +1542,238 @@
// Best conversion is the standard conversion
aNumberRequiringAlternativeEncoding = 0;
}
-
- CleanupStack::PopAndDestroy(backToUnicodeAfterAltBuf);
}
- CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
- CleanupStack::PopAndDestroy(encodedBuf);
-
+ CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
+
//
// Useful logging...
//
TBool supported = (aNumberOfUnconvertibleCharacters == 0);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4, "CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4, "CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
return supported;
} // CSmsAlphabetConverter::IsSupportedL
/**
+ * Tests if the descriptor text is supported by the current character set.
+ *
+ * @param aDes Text string to check.
+ * @param aRestoredDes Exit restored text string after conversion.
+ * @param aNumberOfUnconvertibleCharacters Exit param for the number of
+ * characters unconvertible.
+ * @param aNumberOfDowngradedCharacters Exit param for the number of
+ * downgraded characters.
+ * @param aIndexOfFirstUnconvertibleCharacter Exit param for the first
+ * unconverted character.
+ * @param aIsCountDowngrade Flag for counting downgrades.
+ */
+void CSmsAlphabetConverter::ConvertWith7BitEncodingL(const TDesC& aDes, TDes& aRestoredDes,
+ TInt& aNumberOfUnconvertibleCharacters,
+ TInt& aNumberOfDowngradedCharacters,
+ TInt& aIndexOfFirstUnconvertibleCharacter,
+ TBool aIsCountDowngrade)
+ {
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(aDes=\"%S\")", aDes);
+
+ TInt desLength = aDes.Length();
+ //
+ // Initialise the exit params...
+ //
+ aNumberOfUnconvertibleCharacters = 0;
+ aNumberOfDowngradedCharacters = 0;
+ aIndexOfFirstUnconvertibleCharacter = desLength;
+
+ //
+ // Create buffer for the input converted to 7Bit.
+ //
+ HBufC8* encodedBuf = HBufC8::NewLC(desLength*2); // worse case
+ TPtr8 encoded(encodedBuf->Des());
+
+ //
+ // Convert the input string to standard 7bit (with downgrades if needed)...
+ //
+ PrepareForConversionFromNativeL(ESmsEncodingNone);
+
+ TInt notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+
+ if (notConverted > 0)
+ {
+ aNumberOfUnconvertibleCharacters += notConverted;
+ }
+ else if (notConverted < 0)
+ {
+ aNumberOfUnconvertibleCharacters = desLength;
+ }
+
+ //
+ // Convert it back again to the native format...
+ //
+ TInt state = CCnvCharacterSetConverter::KStateDefault;
+ TInt notRestored = iCharacterSetConverter.ConvertToUnicode(aRestoredDes, encoded, state);
+
+ if (notRestored > 0)
+ {
+ aNumberOfUnconvertibleCharacters += notRestored;
+ }
+ else if (notRestored < 0)
+ {
+ aNumberOfUnconvertibleCharacters = desLength;
+ }
+
+ //
+ // Work out if the string is acceptable as it is (e.g. no unconvertible
+ // and no downgrades).
+ //
+ for (TInt pos = desLength-1; pos >= 0; --pos)
+ {
+ if (aRestoredDes[pos] != aDes[pos])
+ {
+ if (aRestoredDes[pos] != KReplacementCharacter
+ && aIsCountDowngrade)
+ {
+ ++aNumberOfDowngradedCharacters;
+ }
+ else
+ {
+ ++aNumberOfUnconvertibleCharacters;
+ aIndexOfFirstUnconvertibleCharacter = pos;
+ }
+ }
+ }
+
+ CleanupStack::PopAndDestroy(encodedBuf);
+
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+ } // CSmsAlphabetConverter::ConvertWith7BitEncodingL
+
+/**
+ * Tests if the descriptor text is supported by given encoding.
+ * This function can be used with 7bit and 8bit alphabets.
+ *
+ * @param aDes Text string to check.
+ * @param aRestoredStdDes Text string restored from 7bit encoding.
+ * @param aEncoding Alternative 7bit encoding.
+ * @param aNumberOfUnconvertibleCharacters Exit param for the number of
+ * characters unconvertible.
+ * @param aNumberOfDowngradedCharacters Exit param for the number of
+ * downgraded characters.
+ * @param aNumberRequiringAlternativeEncoding Exit param for the number of
+ * characters requiring use of
+ * the alternative encoder.
+ * @param aIndexOfFirstUnconvertibleCharacter Exit param for the first
+ */
+void CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(const TDesC& aDes, const TDesC& aRestoredStdDes,
+ TSmsEncoding aEncoding,
+ TInt& aNumberOfUnconvertibleCharacters,
+ TInt& aNumberOfDowngradedCharacters,
+ TInt& aNumberRequiringAlternativeEncoding,
+ TInt& aIndexOfFirstUnconvertibleCharacter)
+ {
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(aDes=\"%S\")", aDes);
+
+ TInt desLength = aDes.Length();
+ //
+ // Initialise the exit params...
+ //
+ aNumberOfUnconvertibleCharacters = 0;
+ aNumberOfDowngradedCharacters = 0;
+ aNumberRequiringAlternativeEncoding = 0;
+ aIndexOfFirstUnconvertibleCharacter = desLength;
+
+ //
+ // Create buffer for the input converted to 7Bit.
+ //
+ HBufC8* encodedBuf = HBufC8::NewLC(desLength*2); // worse case
+ TPtr8 encoded(encodedBuf->Des());
+
+ //
+ // Convert the input string to the alternative encoding...
+ //
+ PrepareForConversionFromNativeL(aEncoding);
+
+ TInt notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+ if (notConverted > 0)
+ {
+ aNumberOfUnconvertibleCharacters = notConverted;
+ }
+ else if (notConverted < 0)
+ {
+ aNumberOfUnconvertibleCharacters = desLength;
+ }
+
+ //
+ // Create buffer for restored text...
+ //
+ HBufC* backToUnicodeBuf = HBufC::NewLC(desLength);
+ TPtr backToUnicode(backToUnicodeBuf->Des());
+
+ //
+ // Convert it back again to the native format...
+ //
+ TInt state = CCnvCharacterSetConverter::KStateDefault;
+ TInt notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicode, encoded, state);
+
+ if (notRestored > 0)
+ {
+ aNumberOfUnconvertibleCharacters += notRestored;
+ }
+ else if (notRestored < 0)
+ {
+ aNumberOfUnconvertibleCharacters = desLength;
+ }
+
+ //
+ // Now work out which characters are downgrades, require alternative encoding
+ // or are unsupported.
+ //
+ for (TInt pos = desLength-1; pos >= 0; --pos)
+ {
+ if (aRestoredStdDes[pos] != aDes[pos])
+ {
+ // Not supported by standard encoder...
+ if (backToUnicode[pos] == aDes[pos])
+ {
+ // Supported by alternative encoder...
+ ++aNumberRequiringAlternativeEncoding;
+ }
+ else if (aRestoredStdDes[pos] != KReplacementCharacter)
+ {
+ // Downgraded by standard encoder...
+ ++aNumberOfDowngradedCharacters;
+ }
+ else if (backToUnicode[pos] != KReplacementCharacter)
+ {
+ // Downgraded by alternative encoder...
+ ++aNumberOfDowngradedCharacters;
+ ++aNumberRequiringAlternativeEncoding;
+ }
+ else
+ {
+ // Unconvertible...
+ ++aNumberOfUnconvertibleCharacters;
+ aIndexOfFirstUnconvertibleCharacter = pos;
+ }
+ }
+ }
+
+ CleanupStack::PopAndDestroy(2, encodedBuf); // backToUnicode, encodedBuf
+
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+ } // CSmsAlphabetConverter::ConvertWithAlternativeEncodingL
+
+/**
* Given a piece of text and an alternative encoding, this function works out
* which encoding is best to use and returns the ID of that converter.
*
@@ -1825,6 +1796,7 @@
if (aSuggestedEncoding != ESmsEncodingNone &&
iSmsAlphabet == TSmsDataCodingScheme::ESmsAlphabet7Bit)
{
+ TInt desLength = aNativeCharacters.Length();
TInt numberOfUnconvertibleCharacters, numberOfDowngradedCharacters;
TInt numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
@@ -1832,50 +1804,59 @@
// First try the default encoding (but in this case treat downgrades
// as unconverted, since later encoders might do better)...
//
- IsSupportedL(aNativeCharacters, ESmsEncodingNone,
- numberOfUnconvertibleCharacters,
- numberOfDowngradedCharacters,
- numberRequiringAlternativeEncoding,
- indexOfFirstUnconvertibleCharacter);
+ HBufC* backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
+ TPtr backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
+ TBool isCountDowngrade = ETrue; // Count downgraded chars
+
+ ConvertWith7BitEncodingL(aNativeCharacters, backToUnicodeAfterStd,
+ numberOfUnconvertibleCharacters, numberOfDowngradedCharacters,
+ indexOfFirstUnconvertibleCharacter, isCountDowngrade);
+
TInt leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
- //
- // Create a list of alternative encodings to try...
- //
- TSmsEncoding encodingList[8];
- TInt encodingCount = 0;
+ if (leastUnconvertibleCharacters > 0)
+ {
+ //
+ // Create a list of alternative encodings to try...
+ //
+ TSmsEncoding encodingList[8];
+ TInt encodingCount = 0;
+
+ if (aSuggestedEncoding == ESmsEncodingTurkishLockingAndSingleShift)
+ {
+ encodingList[encodingCount++] = ESmsEncodingTurkishSingleShift;
+ encodingList[encodingCount++] = ESmsEncodingTurkishLockingShift;
+ }
+ else if (aSuggestedEncoding == ESmsEncodingPortugueseLockingAndSingleShift)
+ {
+ encodingList[encodingCount++] = ESmsEncodingPortugueseSingleShift;
+ encodingList[encodingCount++] = ESmsEncodingPortugueseLockingShift;
+ }
+
+ encodingList[encodingCount++] = aSuggestedEncoding;
+
+ //
+ // Now try the all the alternatives...
+ //
+ for (TInt encoder = 0; encoder < encodingCount && leastUnconvertibleCharacters > 0; ++encoder)
+ {
+ ConvertWithAlternativeEncodingL(aNativeCharacters, backToUnicodeAfterStd,
+ encodingList[encoder],
+ numberOfUnconvertibleCharacters,
+ numberOfDowngradedCharacters,
+ numberRequiringAlternativeEncoding,
+ indexOfFirstUnconvertibleCharacter);
+
+ if (numberOfUnconvertibleCharacters + numberOfDowngradedCharacters < leastUnconvertibleCharacters)
+ {
+ encodingToUse = encodingList[encoder];
+ leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
+ }
+ }
+ }
- if (aSuggestedEncoding == ESmsEncodingTurkishLockingAndSingleShift)
- {
- encodingList[encodingCount++] = ESmsEncodingTurkishSingleShift;
- encodingList[encodingCount++] = ESmsEncodingTurkishLockingShift;
- }
- else if (aSuggestedEncoding == ESmsEncodingPortugueseLockingAndSingleShift)
- {
- encodingList[encodingCount++] = ESmsEncodingPortugueseSingleShift;
- encodingList[encodingCount++] = ESmsEncodingPortugueseLockingShift;
- }
-
- encodingList[encodingCount++] = aSuggestedEncoding;
- encodingList[encodingCount++] = ESmsEncodingNone;
-
- //
- // Now try the all the alternatives...
- //
- for (TInt encoder = 0; encoder < encodingCount; encoder++)
- {
- IsSupportedL(aNativeCharacters, encodingList[encoder],
- numberOfUnconvertibleCharacters,
- numberOfDowngradedCharacters,
- numberRequiringAlternativeEncoding,
- indexOfFirstUnconvertibleCharacter);
- if (numberOfUnconvertibleCharacters + numberOfDowngradedCharacters < leastUnconvertibleCharacters)
- {
- encodingToUse = encodingList[encoder];
- leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
- }
- }
+ CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
}
OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2, "CSmsAlphabetConverter::FindBestAlternativeEncodingL(): encodingToUse=%d", encodingToUse);
@@ -3967,9 +3948,19 @@
{
OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL_1, "CSmsUserData::IsSupportedL()");
+ TInt numberOfUnconvertibleCharacters, numberOfDowngradedCharacters,
+ numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
+ TBuf<4> toEncode;
+ toEncode.SetLength(1);
+ toEncode[0]=(TText)aChar;
+
CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
- TBool result=converter->IsSupportedL(aChar);
- CleanupStack::PopAndDestroy();
+ TBool result=converter->IsSupportedL(toEncode, ESmsEncodingNone,
+ numberOfUnconvertibleCharacters,
+ numberOfDowngradedCharacters,
+ numberRequiringAlternativeEncoding,
+ indexOfFirstUnconvertibleCharacter);
+ CleanupStack::PopAndDestroy(converter);
return result;
} // CSmsUserData::IsSupportedL
--- a/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions Wed Jul 21 17:41:03 2010 +0100
@@ -369,6 +369,15 @@
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x1a5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x1a6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x1a7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x1a8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x1a9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x1aa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x1ab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x1ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x1ad
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
@@ -376,18 +385,12 @@
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x18d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x18e
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x18b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x18c
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
--- a/smsprotocols/smsstack/smsprot/Group/bld.inf Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/smsprot/Group/bld.inf Wed Jul 21 17:41:03 2010 +0100
@@ -37,4 +37,4 @@
../Group/SMSPROT.mmp
-#include "../test/group/bld.inf"
+#include "../Test/group/bld.inf"
--- a/smsprotocols/smsstack/smsprot/Src/smspread.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/smsprot/Src/smspread.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -238,7 +238,7 @@
if (iStatus.Int() == KErrNone)
{
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
- LogSmsIfPDU(_L8("ETEL RX PDU: "), iMsgData, EFalse);
+ LogSmsIfPDUL(_L8("ETEL RX PDU: "), iMsgData, EFalse);
TBuf<40> timestamp;
SmsTimeStampL(timestamp);
OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPDUREAD_DORUNL_2, "%S",timestamp);
--- a/smsprotocols/smsstack/smsprot/Src/smspsend.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/smsprot/Src/smspsend.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -678,7 +678,7 @@
// Debug logging of the PDU we are sending...
//
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
- LogSmsIfPDU(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
+ LogSmsIfPDUL(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
LogSmsIfSendAttributes(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
TBuf<40> timestamp;
SmsTimeStampL(timestamp);
--- a/smsprotocols/smsstack/smsprot/traces/fixed_id.definitions Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/smsprot/traces/fixed_id.definitions Wed Jul 21 17:41:03 2010 +0100
@@ -639,32 +639,32 @@
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0xa
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0xb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0xc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0xd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0xe
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0xf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x10
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x11
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x12
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x13
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x14
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x15
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x16
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x17
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x18
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x19
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_1=0x2b6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_10=0x2bf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_11=0x2c0
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_12=0x2c1
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_13=0x2c2
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_14=0x2c3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_15=0x2c4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_16=0x2c5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_17=0x2c6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_18=0x2c7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_19=0x2c8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_2=0x2b7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_20=0x2c9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_21=0x2ca
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_22=0x2cb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_23=0x2cc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_24=0x2cd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_25=0x2ce
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_26=0x2cf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_3=0x2b8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_4=0x2b9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_5=0x2ba
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_6=0x2bb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_7=0x2bc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_8=0x2bd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_9=0x2be
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
--- a/smsprotocols/smsstack/smsu/inc/smsuaddr.H Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/smsu/inc/smsuaddr.H Wed Jul 21 17:41:03 2010 +0100
@@ -252,6 +252,15 @@
IMPORT_C TInt IdentifierMatch() const;
IMPORT_C void SetIdentifierMatch(TInt aIdentifier);
IMPORT_C TPtrC8 TextMatch() const;
+
+ /**
+ * Sets the match text. The matching is case-insensitive comparison
+ * done against the leading text in the message. Wild card matching
+ * is not supported.
+ *
+ * @param aText The match text
+ * @capability None
+ */
IMPORT_C void SetTextMatch(const TDesC8& aText);
IMPORT_C TBool operator==(const TSmsAddr& aAddr) const;
};
--- a/smsprotocols/smsstack/test/smsstacktestutilities.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/test/smsstacktestutilities.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -1504,7 +1504,7 @@
*/
{
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
- LogSmsIfPDU(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
+ LogSmsIfPDUL(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
TBuf<40> timestamp;
SmsTimeStampL(timestamp);
OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1, "%S",timestamp);
--- a/smsprotocols/smsstack/test/traces/fixed_id.definitions Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/test/traces/fixed_id.definitions Wed Jul 21 17:41:03 2010 +0100
@@ -25,246 +25,246 @@
[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1=0x37
[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NEWL_1=0x38
[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1=0x36
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x181
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x182
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x20f
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x216
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x217
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x210
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x206
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x204
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x205
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x214
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x215
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x20c
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x218
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x219
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x21a
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x211
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x20e
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x20d
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x202
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x203
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x21b
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x209
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x20a
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x20b
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x207
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x208
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x212
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x213
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x531
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x532
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x5bf
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x5c6
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x5c7
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x5c0
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x5b6
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x5b4
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x5b5
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x5c4
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x5c5
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x5bc
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x5c8
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x5c9
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x5ca
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x5c1
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x5be
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x5bd
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x5b2
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x5b3
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x5cb
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x5b9
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x5ba
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x5bb
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x5b7
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x5b8
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x5c2
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x5c3
[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1=0x3
[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1=0x2
[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1=0x5
[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1=0x4
[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_NEWLC_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x1f8
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x1f9
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x1fa
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x1fb
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x1f2
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x1f5
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0x1eb
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x1f7
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x1f1
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x1f0
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x1f4
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x1ed
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0x1e9
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x1ef
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x1f3
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x1f6
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x1ec
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x1ee
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0x1ea
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0x1e8
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0x1e7
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0x1d6
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0x1d4
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0x1d5
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0x1c5
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0x1bd
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0x1c6
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0x1bf
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0x1c3
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0x1be
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0x1c0
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0x1c4
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0x1c2
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0x1c1
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x1fc
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x1fd
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x1fe
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x17c
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x17d
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x180
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x17f
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x17e
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x16a
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x16c
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x16b
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x16d
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x16e
-[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x169
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x5a8
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x5a9
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x5aa
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x5ab
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x5a2
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x5a5
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0x59b
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x5a7
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x5a1
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x5a0
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x5a4
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x59d
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0x599
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x59f
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x5a3
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x5a6
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x59c
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x59e
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0x59a
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0x598
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0x597
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0x586
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0x584
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0x585
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0x575
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0x56d
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0x576
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0x56f
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0x573
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0x56e
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0x570
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0x574
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0x572
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0x571
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x5ac
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x5ad
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x5ae
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x52c
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x52d
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x530
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x52f
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x52e
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x51a
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x51c
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x51b
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x51d
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x51e
+[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x519
[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA1_1=0x8
[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA_1=0x7
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x157
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x14c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x153
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x154
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x155
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x144
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x152
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x166
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x149
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x14a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x132
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x14b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x148
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x136
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x160
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x134
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x168
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x159
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x150
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x13c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x13d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x13e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x13f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x140
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x161
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x162
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x163
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x164
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x135
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x15f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x133
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x158
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x147
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x146
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x156
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x13a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x13b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x131
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x130
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x138
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x139
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x143
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x14d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x14e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x14f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x145
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x165
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x167
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x142
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x15b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x15c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x15e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x137
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x151
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x141
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x15a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x15d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0x199
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0x1ab
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0x197
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0x19b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0x1a9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0x1a5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0x1b7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x186
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x187
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0x19f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0x1a1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0x190
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0x191
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0x192
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0x193
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x184
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x185
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x183
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0x1a7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x18a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0x18e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0x1ad
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0x1b9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x188
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0x19a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0x1ac
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0x198
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0x19c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0x1aa
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0x1a6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0x1b8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0x1a0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0x1a2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0x194
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0x195
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0x196
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0x1a8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x18b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0x18f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0x1ae
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0x1ba
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x189
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0x1b2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0x1b0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0x1b4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0x19e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0x1a4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0x18d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0x1b6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0x1b1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0x1af
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0x1b3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0x19d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0x1a3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0x18c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0x1bc
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0x1b5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0x1bb
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x171
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x172
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x16f
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x170
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x173
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x175
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x174
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x176
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x177
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x178
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x179
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x17b
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x17a
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0x1e2
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0x1e6
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0x1de
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0x1da
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0x1e0
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0x1e3
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0x1df
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0x1db
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0x1e1
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0x1dd
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0x1e5
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0x1dc
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0x1e4
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0x1d9
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0x1d7
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0x1d8
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0x1d3
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0x1cf
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0x1c7
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0x1cb
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0x1d0
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0x1c8
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0x1cc
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0x1ce
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0x1ca
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0x1d2
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0x1cd
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0x1c9
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0x1d1
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x507
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x4fc
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x503
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x504
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x505
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x4f4
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x502
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x516
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x4f9
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x4fa
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x4e2
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x4fb
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x4f8
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4e6
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x510
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x4e4
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x518
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x509
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x500
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x4ec
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x4ed
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x4ee
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x4ef
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x4f0
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x511
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x512
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x513
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x514
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x4e5
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x50f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x4e3
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x508
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x4f7
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x4f6
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x506
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4ea
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4eb
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x4e1
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x4e0
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4e8
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4e9
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x4f3
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x4fd
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x4fe
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x4ff
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x4f5
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x515
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x517
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x4f2
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x50b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x50c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x50e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4e7
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x501
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x4f1
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x50a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x50d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0x549
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0x55b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0x547
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0x54b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0x559
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0x555
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0x567
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x536
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x537
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0x54f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0x551
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0x540
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0x541
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0x542
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0x543
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x534
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x535
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x533
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0x557
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x53a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0x53e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0x55d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0x569
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x538
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0x54a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0x55c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0x548
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0x54c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0x55a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0x556
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0x568
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0x550
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0x552
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0x544
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0x545
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0x546
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0x558
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x53b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0x53f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0x55e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0x56a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x539
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0x562
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0x560
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0x564
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0x54e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0x554
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0x53d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0x566
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0x561
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0x55f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0x563
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0x54d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0x553
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0x53c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0x56c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0x565
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0x56b
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x521
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x522
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x51f
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x520
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x523
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x525
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x524
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x526
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x527
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x528
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x529
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x52b
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x52a
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0x592
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0x596
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0x58e
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0x58a
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0x590
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0x593
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0x58f
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0x58b
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0x591
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0x58d
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0x595
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0x58c
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0x594
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0x589
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0x587
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0x588
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0x583
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0x57f
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0x577
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0x57b
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0x580
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0x578
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0x57c
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0x57e
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0x57a
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0x582
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0x57d
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0x579
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0x581
[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ADDINFORMATIONELEMENTL_1=0xc
[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_BODY_1=0x10
[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTINDEX_1=0xa
@@ -301,9 +301,9 @@
[TRACE]TRACE_BORDER[0x84]_TGSMSMSTELNUMBER_ISINSTANCEOF_1=0x6
[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1=0x15
[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1=0x16
-[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x1ff
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x201
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x200
+[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x5af
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x5b1
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x5b0
[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1=0x87
[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1=0x83
[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1=0x84
@@ -331,30 +331,30 @@
[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x95
[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1=0x98
[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x29d
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x2a7
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x2a8
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x2a9
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x29f
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x2a0
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x2a1
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x2a2
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x2a6
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x2a3
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x2a5
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x2a4
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x29e
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x6f4
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x6fe
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x6fd
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x6f7
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x6f6
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x6f5
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x6fc
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x6f8
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x6f9
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x6fa
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x6fb
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x73c
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x746
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x747
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x748
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x73e
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x73f
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x740
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x741
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x745
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x742
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x744
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x743
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x73d
[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_ADDRESS_1=0x47
[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DOSETPARSEDADDRESSL_1=0x4e
[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DUPLICATEL_1=0x46
@@ -369,6 +369,15 @@
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x665
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x666
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x667
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x668
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x669
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x66a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x66b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x66c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x66d
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
@@ -376,29 +385,23 @@
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x2f0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x2f1
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x2ee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x2ef
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x29a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x297
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x29b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x299
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x298
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x296
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x739
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x734
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x736
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x73a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x738
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x737
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x735
[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1=0x6
[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DATA_1=0x8
[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DECODEL_1=0xb
@@ -414,49 +417,49 @@
[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETDATAL_1=0x9
[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETHEADERPRESENT_1=0xf
[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x291
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x290
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0x214
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0x213
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x278
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x279
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x269
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x29c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x226
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x225
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x227
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x228
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x229
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0x217
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0x216
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0x218
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0x219
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0x215
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0x210
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0x212
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0x211
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x730
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x732
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x733
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x731
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x72d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x72e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x72f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x6ef
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x6ee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0x6b3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0x6b2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x71b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x717
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x71d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x71c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x719
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x718
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x71a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x706
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x70b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x708
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x707
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x70a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x709
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x70d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x70c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x73b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x6c9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x6c5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x6c4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x6c6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x6c7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x6c8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0x6b6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0x6b5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0x6b7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0x6b8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0x6b9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0x6b4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0x6af
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0x6ae
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0x6b1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0x6b0
[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_CONSTRUCTL_1=0x59
[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_DECODEL_1=0x58
[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_ENCODEL_1=0x57
@@ -464,150 +467,150 @@
[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWDATAL_1=0x5a
[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL1_1=0x56
[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0x224
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0x223
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0x220
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0x221
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0x222
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x286
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x288
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x287
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x283
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x285
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x284
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x281
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x280
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x282
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x273
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x276
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x275
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x274
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x277
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x270
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x272
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x271
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x254
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x6dd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x6d1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x6d2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x6d3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x6d0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x6e2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x6cf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x6e4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x6d4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x6d5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x6df
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x6e0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x6e1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x6d6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x6d7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x6d8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x6d9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x6da
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x6db
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x6e7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x6e8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x6e5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x6ce
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x6e3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x6dc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x6de
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x6e6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x6e9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x6ea
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x6eb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0x682
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x680
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x681
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0x67d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x683
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x684
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0x685
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0x686
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0x687
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0x688
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0x6a8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0x6a7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0x67e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0x699
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0x6aa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0x6a5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0x6a6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0x676
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0x675
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0x66f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0x670
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0x67c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0x67a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0x67b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0x6ad
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0x697
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0x698
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0x689
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0x692
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0x693
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0x68a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0x68b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0x68c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0x68d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0x68e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0x68f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0x690
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0x691
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0x694
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0x695
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0x696
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0x67f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0x69a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0x69b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0x69c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0x69d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0x69e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0x69f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0x6a0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0x6a1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0x6a2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0x6ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0x6ab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0x6a4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0x6a3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0x671
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0x672
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0x677
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0x678
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0x673
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0x674
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0x679
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0x6a9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x6ed
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x6ec
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x704
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x705
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x703
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x702
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x6ff
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x700
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x701
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0x6bb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0x6ba
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0x6bc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0x6bd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0x6be
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x6cb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x6ca
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x6cc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x6cd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0x6c3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0x6c2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0x6bf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0x6c0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0x6c1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x72a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x725
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x72c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x72b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x727
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x726
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x729
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x728
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x722
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x71e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x724
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x723
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x720
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x71f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x721
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x712
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x70e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x715
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x714
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x713
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x716
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x70f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x711
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x710
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x6f1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x6f0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x6f2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x6f3
[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1=0x6c
[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_APPENDBODYL_1=0x6f
[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_BODYLENGTHINUDLUNITS_1=0x78
@@ -698,526 +701,3 @@
[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL1_1=0x53
[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL_1=0x52
[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_TIME_1=0x51
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x95
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x96
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x123
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x12a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x12b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x124
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x11a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x118
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x119
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x128
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x129
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x120
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x12c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x12d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x12e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x125
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x122
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x121
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x116
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x117
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x12f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x11d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x11e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x11f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x11b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x11c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x126
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x127
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x10c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x10d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x10e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x10f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x106
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x109
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0xff
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x10b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x105
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x104
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x108
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x101
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0xfd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x103
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x107
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x10a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x100
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x102
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0xfe
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0xfc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0xfb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0xea
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0xe8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0xe9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0xd9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0xd1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0xda
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0xd3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0xd7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0xd2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0xd4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0xd8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0xd6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0xd5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x110
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x111
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x112
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x90
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x91
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x94
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x93
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x92
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x7e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x80
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x7f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x81
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x82
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x7d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x6b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x60
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x67
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x68
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x69
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x58
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x66
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x7a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x5d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x5e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x46
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x5f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x5c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x74
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x48
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x7c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x6d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x64
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x50
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x51
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x52
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x53
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x54
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x75
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x76
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x77
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x78
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x49
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x73
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x47
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x6c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x5b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x5a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x6a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x45
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x44
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x57
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x61
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x62
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x63
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x59
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x79
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x7b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x56
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x6f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x70
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x72
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x65
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x55
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x6e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x71
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0xad
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0xbf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0xab
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0xaf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0xbd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0xb9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0xcb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x9a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x9b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0xb3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0xb5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0xa4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0xa5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0xa6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0xa7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x98
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x99
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x97
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0xbb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x9e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0xa2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0xc1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0xcd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x9c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0xae
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0xc0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0xac
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0xb0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0xbe
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0xba
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0xcc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0xb4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0xb6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0xa8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0xa9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0xaa
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0xbc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x9f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0xa3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0xc2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0xce
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x9d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0xc6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0xc4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0xc8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0xb2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0xb8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0xa1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0xca
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0xc5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0xc3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0xc7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0xb1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0xb7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0xa0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0xd0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0xc9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0xcf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x85
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x86
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x83
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x84
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x87
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x89
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x88
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x8a
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x8b
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x8c
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x8d
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x8f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x8e
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0xf6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0xfa
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0xf2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0xee
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0xf4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0xf7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0xf3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0xef
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0xf5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0xf1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0xf9
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0xf0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0xf8
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0xed
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0xeb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0xec
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0xe7
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0xe3
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0xdb
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0xdf
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0xe4
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0xdc
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0xe0
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0xe2
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0xde
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0xe6
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0xe1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0xdd
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0xe5
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x113
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x115
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x114
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x130
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x13a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x139
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x133
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x132
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x131
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x138
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x134
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x135
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x136
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x137
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x17e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x188
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x189
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x18a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x180
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x181
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x182
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x183
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x187
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x184
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x186
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x185
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x17f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x17b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x176
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x178
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x17c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x17a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x179
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x177
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x16c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x16e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x16f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x16d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x169
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x16a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x16b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x12b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x12a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0xef
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0xee
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x157
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x153
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x159
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x158
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x155
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x154
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x156
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x142
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x147
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x144
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x143
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x146
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x145
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x149
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x148
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x17d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x105
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x101
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x100
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x102
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x103
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x104
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0xf2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0xf1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0xf3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0xf4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0xf5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0xf0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0xeb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0xea
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0xed
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0xec
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x119
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x10d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x10e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x10f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x10c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x11e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x10b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x120
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x110
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x111
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x11b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x11c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x11d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x112
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x113
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x114
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x115
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x116
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x117
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x123
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x124
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x121
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x10a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x11f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x118
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x11a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x122
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x125
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x126
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x127
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0xbe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xbd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0xb9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xc0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0xc1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0xc2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0xc3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0xc4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0xe4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0xe3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0xba
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0xd5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0xe6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0xe1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0xe2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0xb2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0xb1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0xab
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0xac
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0xb8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0xb6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0xb7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0xe9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0xd3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0xd4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0xc5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0xce
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0xcf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0xc6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0xc7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0xc8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0xc9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0xca
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0xcb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0xcc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0xcd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0xd0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0xd1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0xd2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0xbb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0xd6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0xd7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0xd8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0xd9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0xda
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0xdb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0xdc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0xdd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0xde
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0xe8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0xe7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0xe0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0xdf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0xad
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0xae
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0xb3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0xb4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0xaf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0xb0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0xb5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0xe5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x129
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x128
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x140
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x141
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x13f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x13e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x13b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x13c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x13d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0xf7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0xf6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0xf8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0xf9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0xfa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x107
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x106
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x108
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x109
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0xff
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0xfe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0xfb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0xfc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0xfd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1=0x1cf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x166
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x161
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x168
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x167
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x163
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x162
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x165
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x164
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x15e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x15a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x160
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x15f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x15c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x15b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x15d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x14e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x14a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x151
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x150
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x14f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x152
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x14b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x14d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x14c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x12d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x12c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x12e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x12f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1a5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x1ae
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x1b7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x1af
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x1b0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x1b1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x1b2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x1b3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x1b4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x1b5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x1b6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x18b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0x194
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0x195
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0x196
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0x197
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0x198
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0x199
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x19a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x19b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x19c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x19d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x18c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x19e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x19f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x1a0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x1a1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x1a2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x1a3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x18d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x18e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x18f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x190
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x191
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x192
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x193
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x1c2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x1cb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x1cc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x1cd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x1ce
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x1c3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x1c4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x1c5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x1c6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x1c7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x1c8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x1c9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x1ca
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x1b8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x1c1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x1b9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x1ba
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x1bb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x1bc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x1bd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x1be
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x1bf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x1c0
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1a6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1a7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1a8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1a9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x1aa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x1ab
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x1ac
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x1ad
--- a/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions Wed Jul 21 17:41:03 2010 +0100
@@ -1,51 +1,51 @@
#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
[GROUP]TRACE_BORDER=0x84
[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x5f
+[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x133
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x132
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x130
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x131
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x135
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x117
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x120
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x121
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x122
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x123
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x124
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x125
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x126
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x127
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x128
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x129
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x118
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x119
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x134
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x136
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x137
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x139
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x141
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x138
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x142
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x140
[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x34
[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x33
[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x2d
@@ -54,50 +54,3 @@
[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x32
[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x2e
[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x2f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPTHDRBASE_PANIC_1=0x2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CTESTLOGGEROVERFLOW_DOTESTSTEPL_1=0x35
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x19
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x18
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x1d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x1c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x17
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x15
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x16
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x1a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x1b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x1f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x14
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0xa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0xb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0xc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0xd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0xe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0xf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x10
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x11
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x12
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x13
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x1e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x20
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x21
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x23
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x26
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x2b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x29
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x25
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x24
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x27
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x28
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x22
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x2c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x2a
--- a/smsprotocols/smsstack/wapprot/traces/fixed_id.definitions Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/traces/fixed_id.definitions Wed Jul 21 17:41:03 2010 +0100
@@ -146,32 +146,32 @@
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0xa
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0xb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0xc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0xd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0xe
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0xf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x10
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x11
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x12
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x13
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x14
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x15
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x16
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x17
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x18
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x19
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_1=0xd3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_10=0xdc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_11=0xdd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_12=0xde
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_13=0xdf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_14=0xe0
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_15=0xe1
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_16=0xe2
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_17=0xe3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_18=0xe4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_19=0xe5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_2=0xd4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_20=0xe6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_21=0xe7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_22=0xe8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_23=0xe9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_24=0xea
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_25=0xeb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_26=0xec
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_3=0xd5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_4=0xd6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_5=0xd7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_6=0xd8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_7=0xd9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_8=0xda
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_9=0xdb
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
--- a/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -58,7 +58,7 @@
#endif
const TUint8 KGenericNifChallengeSize = 8;
-const TUint KGenericNifIdLength = 1;
+
//-=========================================================
//
@@ -615,38 +615,38 @@
TUint8 challenge[KGenericNifChallengeSize] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
TUint8 i=0;
- while(i < KGenericNifChallengeSize)
+ while((i < KGenericNifChallengeSize) && (aProtocolConfigOption.iChallenge.Length() < aProtocolConfigOption.iChallenge.MaxLength()))
{
challenge[i] = (TUint8)(Math::Rand(seedValue)%256);
aProtocolConfigOption.iChallenge.Append(challenge[i++]);
}
//Response
- TBuf8<KGenericNifIdLength+KCommsDbSvrMaxColumnNameLength+KGenericNifChallengeSize> message;
- message.Append(aProtocolConfigOption.iId);
- message.Append(aProtocolConfigOption.iAuthInfo.iPassword);
- message.Append(aProtocolConfigOption.iChallenge);
-
- TInt length = 1 /*iId length */ + aProtocolConfigOption.iAuthInfo.iPassword.Length() + KGenericNifChallengeSize;
-
+ TInt length = 1 /*iId length */ + aProtocolConfigOption.iAuthInfo.iPassword.Length() + aProtocolConfigOption.iChallenge.Length();
HBufC8* buf = HBufC8::NewL(length);
-
CleanupStack::PushL(buf);
TPtr8 ptr((TUint8*)buf->Des().Ptr(),length);
-
- ptr.Copy(message);
+ ptr.Append(aProtocolConfigOption.iId);
+ ptr.Append(aProtocolConfigOption.iAuthInfo.iPassword);
+ ptr.Append(aProtocolConfigOption.iChallenge);
CMD5* md5=0;
md5 = CMD5::NewL();
-
CleanupStack::PushL(md5);
-
TPtrC8 Response = md5->Hash(ptr);
-
- aProtocolConfigOption.iResponse.Copy(Response);
-
- CleanupStack::PopAndDestroy(2); //buf, md5
+
+ if (Response.Length() < aProtocolConfigOption.iResponse.MaxLength())
+ {
+ aProtocolConfigOption.iResponse.Copy(Response);
+ }
+ else
+ {
+ // Just a defensive measure - this should not happen.
+ User::Leave(KErrCorrupt);
+ }
+
+ CleanupStack::PopAndDestroy(2); //buf, md5
}
void TCreatePrimaryPDPCtx::DoL()
@@ -1156,7 +1156,27 @@
DEFINE_SMELEMENT(TAwaitingContextBlockedOrUnblocked, NetStateMachine::MState, PDPSCprStates::TContext)
TBool TAwaitingContextBlockedOrUnblocked::Accept()
{
- return TAwaitingPDPFSMMessage::Accept(KContextBlockedEvent) || TAwaitingPDPFSMMessage::Accept(KContextUnblockedEvent);
+
+ if (TAwaitingPDPFSMMessage::Accept(KContextBlockedEvent) || TAwaitingPDPFSMMessage::Accept(KContextUnblockedEvent))
+ {
+ //check if there is a data flow as well. Incase we are getting the notification and the Data Client has already
+ //been destroyed, we will just ignore the notification. (ou1cimx1#466386)
+ RNodeInterface* theOnlyDataClient = iContext.iNode.GetFirstClient<TDefaultClientMatchPolicy>(TCFClientType::EData);
+ if (theOnlyDataClient == NULL)
+ {
+ // clear the message and return EFalse.
+ iContext.iMessage.ClearMessageId();
+ return EFalse;
+ }
+ else
+ {
+ return ETrue;
+ }
+ }
+ else
+ {
+ return EFalse;
+ }
}
DEFINE_SMELEMENT(TForwardContextBlockedOrUnblockedToDC, NetStateMachine::MStateTransition, PDPSCprStates::TContext)
--- a/telephonyprotocols/pdplayer/test/controlplane/group/te_PDPControlPlane.iby Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/test/controlplane/group/te_PDPControlPlane.iby Wed Jul 21 17:41:03 2010 +0100
@@ -18,17 +18,17 @@
#ifndef TE_PDPCONTROLPLANE_IBY
#define TE_PDPCONTROLPLANE_IBY
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside1.xml Testdata\configs\te_controlplanenetworkside1.xml
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside_config.txt Testdata\configs\te_controlplanenetworkside_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworkside1.xml testdata\configs\te_controlplanenetworkside1.xml
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_controlplanenetworkside_config.txt testdata\configs\te_controlplanenetworkside_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_PDP_ControlPlane.script Testdata\scripts\te_PDP_ControlPlane.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworksideloopbackcsy.ini Testdata\configs\te_controlplanenetworksideloopbackcsy.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdp_controlplane.script testdata\scripts\te_pdp_controlplane.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworksideloopbackcsy.ini testdata\configs\te_controlplanenetworksideloopbackcsy.ini
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_PDP_ControlPlane28.script Testdata\scripts\te_PDP_ControlPlane28.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside_test28.ini Testdata\configs\te_controlplanenetworkside_test28.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdp_controlplane28.script testdata\scripts\te_pdp_controlplane28.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworkside_test28.ini testdata\configs\te_controlplanenetworkside_test28.ini
-data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_PDP_ControlPlane29.script Testdata\scripts\te_PDP_ControlPlane29.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_controlplanenetworkside_test29.ini Testdata\configs\te_controlplanenetworkside_test29.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdp_controlplane29.script testdata\scripts\te_pdp_controlplane29.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_controlplanenetworkside_test29.ini testdata\configs\te_controlplanenetworkside_test29.ini
#endif // TE_PDPCONTROLPLANE_IBY
\ No newline at end of file
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_SpudNetworkSide.xml Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_SpudNetworkSide.xml Wed Jul 21 17:41:03 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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"
@@ -138,6 +138,15 @@
<IAPNetworkWeighting>0</IAPNetworkWeighting>
<LocationRef>Location.Mobile</LocationRef>
</IAP>
+
+ <IAP operation="add">
+ <Name>Loopback_GRPS_11</Name>
+ <IAPService>OutgoingGPRS.SPUD_Echo_5</IAPService>
+ <IAPBearer>ModemBearer.Loopback_SPUD_2</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Mobile</LocationRef>
+ </IAP>
</IAPTable>
@@ -435,6 +444,18 @@
<IpAddr>192.168.1.2</IpAddr>
<UmtsR99QoSAndOnRef>UmtsR99QoSAndOn.BAD_QOS</UmtsR99QoSAndOnRef>
</OutgoingGPRS>
+
+ <OutgoingGPRS operation="add">
+ <Name>SPUD_Echo_5</Name>
+ <PDPType>IPV4</PDPType>
+ <IfParams>lowernif=RAWIP</IfParams>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <IfAuthPass>aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeee</IfAuthPass>
+ <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+ <IpAddr>192.168.1.2</IpAddr>
+ </OutgoingGPRS>
</OutgoingGPRSTable>
<DefaultGPRSTable>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini Wed Jul 21 17:41:03 2010 +0100
@@ -1,6 +1,15 @@
[ESockCheck]
SimTsyTestNum = 0
+[PrimaryActivationCHAP]
+SimTsyTestNum = 69
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
[PrimaryActivationOk1]
SimTsyTestNum = 1
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt Wed Jul 21 17:41:03 2010 +0100
@@ -2859,4 +2859,134 @@
NotifyContextStatusChangeType = PublishSubscribe
# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
\ No newline at end of file
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
+
+############################################################################
+################### T E S T 69 ####################
+############################################################################
+############################################################################
+# Test case for success results for CHAP authentication protocol
+############################################################################
+[test69]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,2,RasUser,aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeee,,,,,1
+# TRel99ContextConfig = <TName iContextName>, <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>,
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
+R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask> 4<protocolNumberOrNextHeader>
+# 5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+# 11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+# 5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+# 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate>
+#
+# 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+# 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+# 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+# 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0
+QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0
+QosProfileReqR99 = SECONDARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+QosProfileReqR99 = SECONDARY2,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+# <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+# <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+# <negMaxUpLinkRate> <negMaxDownLinkRate>
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+
+
+#TQosProfileCapsR99 = <trafficCap> <deliveryOrderReqCap> <deliverErroneousSDUCap>
+# <BERCap> <SDUErrorRatioCap> <trafficHandlingPriorityCap>
+QosProfileCapsR99= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04
+
+QosNetworkNotificationType = PublishSubscribe
+# QosNetworkNotification = <contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery>
+# <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+# <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+# <negMaxUpLinkRate> <negMaxDownLinkRate> <negMaxSDUSize>
+QosNetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosNetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+
+#SetProfileFail= <contextName> <numberOfTimes> <errorCode> <setProfileDigit>
+SetProfileFail = NEG_99, 0x04, 0x02
+
+#QosprofileReqGPRS= <minPrecedence> <reqPrecedence> <minDelay> <reqDelay> <minReliability> <reqReliability> <minPeek> <reqPeek>
+# <minMean> <reqMean>
+QosProfileReqGPRS= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020
+QosProfileReqGPRS= 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020
+
+#QosProfileNegGPRS=<negPrecedence> <negDelay><negReliability> <negPeek> <negMean>
+QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+
+#QosProfileCapsGPRS=<negPrecedenceCap> <negDelayCap> <negReliabilityCap><negPeekCap> <negMeanCap>
+QosProfileCapsGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+
+# QosProfileReq
+# = <TTrafficClass>, <TTrafficClass>, <TDeliveryOrder>, <TDeliveryOrder>
+# <TErroneousSDUDelivery>, <TErroneousSDUDelivery>
+# <TErroneousSDUDelivery>, <TInt iReqMaxSDUSize>, <TInt iMinAcceptableMaxSDUSize>
+# <TBitRate>, <TBitRate>, <TBitErrorRatio>,
+# <TBitErrorRatio>, <TSDUErrorRatio>, <TSDUErrorRatio>, <TTrafficHandlingPriority>, <TTrafficHandlingPriority>
+# <TInt iReqTransferDelay>, <TInt iMaxTransferDelay>, <TBitRate>, <TBitRate>
+
+# QosProfileNeg = <TQoSPrecedence>, <TQoSDelay>, <TQoSReliability>, <TQoSPeakThroughput>, <TQoSMeanThroughput>
+# <TTrafficClass>, <TDeliveryOrder>, <TErroneousSDUDelivery>, <TInt iMaxSDUSize>, <TBitRate>,
+# <TBitErrorRatio>, <TSDUErrorRatio>, <TTrafficHandlingPriority>
+# <TInt iTransferDelay>, <TBitRate>
+
+DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+
+ReleaseMode = 5, 5
+# Packet Release mode = <Release> <Duration>
+
+#RegStatus=<duration> <regStat> <networkIndex>
+RegStatus= 5,3
+RegStatus= 2,5,0
+RegStatus= 2,7,3
+RegStatus= 5,2
+RegStatus= 2,5,0
+
+# NetworkRegStatus = <Duration>, <RegistrationStatus>
+NetworkRegStatusType = PublishSubscribe
+NetworkRegStatus= 5,2
+NetworkRegStatus= 5,1
+NetworkRegStatus= 5,1
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName>
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
\ No newline at end of file
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby Wed Jul 21 17:41:03 2010 +0100
@@ -20,59 +20,59 @@
REM Feature QoS is not included in this ROM
REM Temporary patch
#else
-file=ABI_DIR\DEBUG_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe
+file=ABI_DIR\DEBUG_DIR\te_spudnetworkside.exe System\Libs\te_spudnetworkside.exe
#endif
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide.script testdata\scripts\TE_SpudNetworkSide.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_ppp.script testdata\scripts\TE_SpudNetworkSide_ppp.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_nifman.script testdata\scripts\TE_SpudNetworkSide_nifman.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_PppSize_spud.script testdata\scripts\TE_PppSize_spud.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SpudNetworkside_Channel.script testdata\scripts\Te_SpudNetworkside_Channel.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_r4_and_r5.script testdata\scripts\TE_SpudNetworkSide_r4_and_r5.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_config.txt testdata\configs\TE_SpudNetworkSide_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp_config.txt testdata\configs\TE_SpudNetworkSide_ppp_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp_config2.txt testdata\configs\TE_SpudNetworkSide_ppp_config2.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman_config.txt testdata\configs\TE_SpudNetworkSide_nifman_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside.script testdata\scripts\te_spudnetworkside.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_ppp.script testdata\scripts\te_spudnetworkside_ppp.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_nifman.script testdata\scripts\te_spudnetworkside_nifman.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pppsize_spud.script testdata\scripts\te_pppsize_spud.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_channel.script testdata\scripts\te_spudnetworkside_channel.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_r4_and_r5.script testdata\scripts\te_spudnetworkside_r4_and_r5.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_config.txt testdata\configs\te_spudnetworkside_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_ppp_config.txt testdata\configs\te_spudnetworkside_ppp_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_ppp_config2.txt testdata\configs\te_spudnetworkside_ppp_config2.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman_config.txt testdata\configs\te_spudnetworkside_nifman_config.txt
data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudNetworkSide_config_r4_and_r5.txt testdata\configs\te_spudNetworkSide_config_r4_and_r5.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide.xml testdata\configs\TE_SpudNetworkSide.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp.xml testdata\configs\TE_SpudNetworkSide_ppp.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_PppLoopback.xml testdata\configs\TE_SpudNetworkSide_PppLoopback.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman.xml testdata\configs\TE_SpudNetworkSide_nifman.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_r4_and_r5.xml testdata\configs\TE_SpudNetworkSide_r4_and_r5.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide.ini testdata\configs\TE_SpudNetworkSide.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman.ini testdata\configs\TE_SpudNetworkSide_nifman.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_platsec.ini testdata\configs\TE_SpudNetworkSide_platsec.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini testdata\configs\TE_SpudNetworkSideLoopbackCSY.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini testdata\configs\TE_SpudNetworkSideLoopbackCSY_serial.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_r4_and_r5.ini testdata\configs\TE_SpudNetworkSide_r4_and_r5.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.xml testdata\configs\te_spudnetworkside.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_ppp.xml testdata\configs\te_spudnetworkside_ppp.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_PppLoopback.xml testdata\configs\te_spudnetworkside_PppLoopback.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.xml testdata\configs\te_spudnetworkside_nifman.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.xml testdata\configs\te_spudnetworkside_r4_and_r5.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.ini testdata\configs\te_spudnetworkside.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.ini testdata\configs\te_spudnetworkside_nifman.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_platsec.ini testdata\configs\te_spudnetworkside_platsec.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworksideLoopbackcsy.ini testdata\configs\te_spudnetworksideLoopbackcsy.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworksideLoopbackcsy_serial.ini testdata\configs\te_spudnetworksideLoopbackcsy_serial.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.ini testdata\configs\te_spudnetworkside_r4_and_r5.ini
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-data=EPOCROOT##epoc32\data\z\TestData\Configs\qospolicies.ini testdata\configs\qospolicies.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\qospolicies.ini testdata\configs\qospolicies.ini
#endif
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_spud.ini testdata\configs\TE_PPPSize_spud.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_spud.xml testdata\configs\TE_PPPSize_spud.xml
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_config.txt testdata\configs\TE_PPPSize_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt testdata\configs\TE_SpudNetworkSide_Channel_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_spud.ini testdata\configs\te_pppsize_spud.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_spud.xml testdata\configs\te_pppsize_spud.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_config.txt testdata\configs\te_pppsize_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_channel_config.txt testdata\configs\te_spudnetworkside_channel_config.txt
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdplayer_ip6.script testdata\scripts\te_pdplayer_ip6.script
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6.ini testdata\configs\te_pdplayer_ip6.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6.cfg testdata\configs\te_pdplayer_ip6.cfg
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6_loopbackcsy.ini testdata\configs\te_pdplayer_ip6_loopbackcsy.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdplayer_ip6_simtsy_config.txt testdata\configs\te_pdplayer_ip6_simtsy_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6.ini testdata\configs\te_pdplayer_ip6.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6.cfg testdata\configs\te_pdplayer_ip6.cfg
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6_loopbackcsy.ini testdata\configs\te_pdplayer_ip6_loopbackcsy.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdplayer_ip6_simtsy_config.txt testdata\configs\te_pdplayer_ip6_simtsy_config.txt
//stress tests
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_pdpstresstestsparam.ini testdata\configs\te_pdpstresstestsparam.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_pdpstresstestsparam.ini testdata\configs\te_pdpstresstestsparam.ini
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdpstresstest1.script testdata\scripts\te_pdpstresstest1.script
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdpstresstests.script testdata\scripts\te_pdpstresstests.script
//sip tests
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_sipaddress_config.txt testdata\configs\te_spudnetworkside_sipaddress_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_sipaddress.ini testdata\configs\te_spudnetworkside_sipaddress.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_sipaddress_config.txt testdata\configs\te_spudnetworkside_sipaddress_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_sipaddress.ini testdata\configs\te_spudnetworkside_sipaddress.ini
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_sipaddress.script testdata\scripts\te_spudnetworkside_sipaddress.script
//Min Max MMU tests
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_RawIpSize.ini testdata\configs\te_rawipsize.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_RawIpSize_config.txt testdata\configs\te_rawipsize_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_RawIpSize.cfg testdata\configs\te_rawipsize.cfg
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_RawIpSize.script testdata\scripts\te_rawipsize.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize.ini testdata\configs\te_rawipsize.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize_config.txt testdata\configs\te_rawipsize_config.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize.cfg testdata\configs\te_rawipsize.cfg
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_rawipsize.script testdata\scripts\te_rawipsize.script
#endif // TE_SPUD_NETWORK_SIDE_IBY
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Wed Jul 21 17:41:03 2010 +0100
@@ -569,14 +569,29 @@
RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
END_TESTCASE NET-Spud-NetworkSide-0830
+START_TESTCASE NET-Spud-NetworkSide-0831
+//! @SYMTestCaseID NET-Spud-NetworkSide-0831
+//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using CHAP authentication protocol.
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Explicitly start a connection using CHAP protocol.
+//! @SYMTestExpectedResults Primary PDP context is activated, RConnection::Start returns KErrNone.
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationCHAP
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+END_TESTCASE NET-Spud-NetworkSide-0831
+
+
run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
//The agentdialog.ini contains UID of agent dummy notifier which will make sure that authorization info is returned successfully.
RUN_UTILS CopyFile z:\TestData\Configs\agentdialog.ini c:\private\101F7989\esock\agentdialog.ini
ced -i z:\TestData\Configs\te_spudnetworkside_promptforauth.xml
run_script z:\TestData\scripts\te_esock_test_loadesock.script
-START_TESTCASE NET-Spud-NetworkSide-0831
-//! @SYMTestCaseID NET-Spud-NetworkSide-0831
+START_TESTCASE NET-Spud-NetworkSide-0832
+//! @SYMTestCaseID NET-Spud-NetworkSide-0832
//! @SYMTestCaseDesc Sanity check: successfully activate Primary context when prompt for authorization is true.
//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
@@ -587,7 +602,8 @@
RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationOk1
DELAY 3000
RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE NET-Spud-NetworkSide-0831
+END_TESTCASE NET-Spud-NetworkSide-0832
+
run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
--- a/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -22,7 +22,7 @@
#include <networking/qos3gpp_subconparams.h>
#include <ecom/implementationproxy.h>
-#include <networking/qos3GPP_subconparams_factory.h>
+#include <networking/qos3gpp_subconparams_factory.h>
/**
Data required for instantiating ECOM Plugin
--- a/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -28,7 +28,7 @@
#include <ecom/implementationproxy.h>
#include <networking/qos3gpp_subconparams.h>
#include <comms-infras/metatypearray.h>
-#include <networking/qos3GPP_subconparams_factory.h>
+#include <networking/qos3gpp_subconparams_factory.h>
START_ATTRIBUTE_TABLE( CSubConQosR99ParamSet, KSubCon3GPPExtParamsFactoryUid, KSubConQosR99ParamsType )
REGISTER_ATTRIBUTE( CSubConQosR99ParamSet, iTrafficClass, TMetaNumber )
--- a/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_EtelMM.script Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_EtelMM.script Wed Jul 21 17:41:03 2010 +0100
@@ -39,7 +39,7 @@
//! mobile signal, mobile auto redial etc.
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 300 Te_EtelMM TestPhone
+RUN_TEST_STEP 600 Te_EtelMM TestPhone
END_TESTCASE TEL-ETEL-NA-2001
--- a/telephonyserver/etelsimtoolkit/tetel/Te_EtelSat/TE_EtelSat.script Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserver/etelsimtoolkit/tetel/Te_EtelSat/TE_EtelSat.script Wed Jul 21 17:41:03 2010 +0100
@@ -31,7 +31,7 @@
//!@SYMTestActions Tests RSat functions
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatFns
+RUN_TEST_STEP 300 Te_EtelSat TestSatFns
END_TESTCASE TEL-ETEL-NA-4000
@@ -43,7 +43,7 @@
//!@SYMTestActions Tests RSat Envelope Cmds functions
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatEnvelopeCmds
+RUN_TEST_STEP 300 Te_EtelSat TestSatEnvelopeCmds
END_TESTCASE TEL-ETEL-NA-4001
@@ -55,7 +55,7 @@
//!@SYMTestActions Tests RSat control functions
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatControl
+RUN_TEST_STEP 300 Te_EtelSat TestSatControl
END_TESTCASE TEL-ETEL-NA-4002
@@ -67,7 +67,7 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1a
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1a
END_TESTCASE TEL-ETEL-NA-4003
@@ -79,7 +79,7 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1b
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1b
END_TESTCASE TEL-ETEL-NA-4004
@@ -91,7 +91,7 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1c
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1c
END_TESTCASE TEL-ETEL-NA-4005
@@ -103,7 +103,7 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1d
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1d
END_TESTCASE TEL-ETEL-NA-4006
@@ -115,7 +115,7 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1e
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1e
END_TESTCASE TEL-ETEL-NA-4007
START_TESTCASE TEL-ETEL-NA-4008
@@ -126,7 +126,7 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, if any APIs fail the step will leave
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1f
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1f
END_TESTCASE TEL-ETEL-NA-4008
START_TESTCASE TEL-ETEL-NA-4009
@@ -137,5 +137,5 @@
//!@SYMTestActions Calls RSat Proactive Commands
//!@SYMTestExpectedResults Pass, client and TSY data is consistent.
//!@SYMTestType CT
-RUN_TEST_STEP 30 Te_EtelSat TestSatPCmds1g
+RUN_TEST_STEP 300 Te_EtelSat TestSatPCmds1g
END_TESTCASE TEL-ETEL-NA-4009
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmsecuritytsy.h Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmsecuritytsy.h Wed Jul 21 17:41:03 2010 +0100
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -241,10 +241,12 @@
* Delivers current lock information
*
*
+ * @param aTsyReqHandle
* @param aPackage Parameters where lock information is stored
* @return KErrNone or KErrArgument
*/
- virtual TInt GetLockInfoL( const TDataPackage& aPackage );
+ virtual TInt GetLockInfoL( const TTsyReqHandle aTsyReqHandle,
+ const TDataPackage& aPackage );
/**
* Sets TSY notify if lock information changes
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -1923,7 +1923,7 @@
{
CAcquireEntry* entry = NULL;
// Call is owned, add this req handle to acquire list
-// coverity [resource_leak]
+
// TRAP macro releases memory while exception caught and trapError != KErrNone
TRAP( trapError, ( entry = CAcquireEntry::NewL( aTsyReqHandle ) ) );
if ( trapError != KErrNone )
@@ -1935,6 +1935,7 @@
{
iList->iAcquireList.AddLast( *entry );
}
+ // coverity[leaked_storage]
}
return KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -1461,8 +1461,8 @@
{
CAcquireEntry* entry = NULL;
// Call is owned, add this req handle to acquire list
-// coverity [resource_leak]
-// TRAP macro releases memory while exception caught and trapError != KErrNone
+
+ // TRAP macro releases memory while exception caught and trapError != KErrNone
TRAP( trapError,
entry = CAcquireEntry::NewL( aTsyReqHandle );
);
@@ -1475,6 +1475,7 @@
{
iList->iAcquireList.AddLast( *entry );
}
+ // coverity[leaked_storage]
}
return KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -111,7 +111,7 @@
REINTERPRET_CAST( TUint32*, dataPtr ) );
break;
case EMobilePhoneGetLockInfo:
- ret = GetLockInfoL( aPackage );
+ ret = GetLockInfoL( aTsyReqHandle, aPackage );
break;
// Notify Change of Lock Information
case EMobilePhoneNotifyLockInfoChange:
@@ -294,7 +294,7 @@
// (other items were commented in a header).
// ---------------------------------------------------------------------------
//
-TInt CMmSecurityTsy::GetLockInfoL( const TDataPackage& aPackage )
+TInt CMmSecurityTsy::GetLockInfoL( const TTsyReqHandle aTsyReqHandle, const TDataPackage& aPackage )
{
OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETLOCKINFOL_1, "LTSY: CMmSecurityTsy::GetLockInfoL - Client call");
@@ -308,13 +308,18 @@
//save pointer to client side for completion
iRetGetLockInfo = data;
+#ifdef REQHANDLE_TIMER
+ iMmPhoneTsy->SetTypeOfResponse( CMmPhoneTsy::EMultimodePhoneGetLockInfo, aTsyReqHandle );
+#else
+ iMmPhoneTsy->iTsyReqHandleStore->SetTsyReqHandle(
+ CMmPhoneTsy::EMultimodePhoneGetLockInfo, aTsyReqHandle );
+#endif //REQHANDLE_TIMER
+
ret = iMmPhoneTsy->iMmPhoneExtInterface->GetLockInfoL( aPackage );
- if ( KErrNone == ret )
+ if ( KErrNone != ret )
{
- //save req handle type
- iMmPhoneTsy->iReqHandleType =
- CMmPhoneTsy::EMultimodePhoneGetLockInfo;
+ iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetLockInfo );
}
}
--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp Wed Jul 21 17:41:03 2010 +0100
@@ -27,9 +27,9 @@
SOURCEPATH ../src
-SOURCE CMmMessageRouter.CPP
-SOURCE CmmCustomStubExt.cpp
-SOURCE CMmMockMessHandler.cpp
+SOURCE cmmmessagerouter.cpp
+SOURCE cmmcustomstubext.cpp
+SOURCE cmmmockmesshandler.cpp
USERINCLUDE ../inc
USERINCLUDE ../../simatk_tsy_stub/inc
--- a/telephonyserverplugins/licenseetsystub/simatk_tsy_stub/group/simatktsy.mmp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/licenseetsystub/simatk_tsy_stub/group/simatktsy.mmp Wed Jul 21 17:41:03 2010 +0100
@@ -34,7 +34,7 @@
USERINCLUDE ../../licensee_tsy_stub/inc
-LIBRARY ETel.lib // Etel server and core API
+LIBRARY etel.lib // Etel server and core API
LIBRARY euser.lib // E32 user library
LINKAS SIMATKTSY.dll
--- a/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -111,8 +111,6 @@
(aContextConfigLHS.iProtocolConfigOption.iAuthProtocol != aContextConfigRHS.iProtocolConfigOption.iAuthProtocol) ||
(aContextConfigLHS.iProtocolConfigOption.iUsername.Compare(aContextConfigRHS.iProtocolConfigOption.iUsername) != 0) ||
(aContextConfigLHS.iProtocolConfigOption.iPassword.Compare(aContextConfigRHS.iProtocolConfigOption.iPassword) != 0) ||
- (aContextConfigLHS.iProtocolConfigOption.iChallenge.Compare(aContextConfigRHS.iProtocolConfigOption.iChallenge) != 0) ||
- (aContextConfigLHS.iProtocolConfigOption.iResponse.Compare(aContextConfigRHS.iProtocolConfigOption.iResponse) != 0) ||
// These line are commented as these parameters currently are usually returned by the network and not required for
// setting the context configuration
// (aContextConfigLHS.iProtocolConfigOption.iPrimaryDNS.Compare(aContextConfigRHS.iProtocolConfigOption.iPrimaryDNS) != 0) ||
@@ -120,9 +118,19 @@
(aContextConfigLHS.iProtocolConfigOption.iId != aContextConfigRHS.iProtocolConfigOption.iId) ||
(aContextConfigLHS.iPdpHeaderCompression != aContextConfigRHS.iPdpHeaderCompression) ||
(aContextConfigLHS.iPdpDataCompression != aContextConfigRHS.iPdpDataCompression))
- {
+ // challenge is generated randomly and response is generated using MD5 in CHAP protocol, so it is not possible to check
+ {
return EFalse;
}
+ else if (aContextConfigLHS.iProtocolConfigOption.iAuthProtocol != RPacketContext::EProtocolCHAP)
+ {// if not CHAP we still try to check challenge and response just in case
+ if ((aContextConfigLHS.iProtocolConfigOption.iChallenge.Compare(aContextConfigRHS.iProtocolConfigOption.iChallenge) != 0) ||
+ (aContextConfigLHS.iProtocolConfigOption.iResponse.Compare(aContextConfigRHS.iProtocolConfigOption.iResponse) != 0))
+ {
+ return EFalse;
+ }
+ }
+
// else considered equal.
return ETrue;
--- a/telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -437,6 +437,7 @@
aTelCallStatus=CTelephony::EStatusReconnectPending;
break;
case RMobileCall::EStatusDisconnecting:
+ case RMobileCall::EStatusDisconnectingWithInband:
aTelCallStatus=CTelephony::EStatusDisconnecting;
break;
case RMobileCall::EStatusHold:
--- a/wapstack/wapmessageapi/client/wapmessage.cpp Mon Jul 19 14:53:33 2010 +0100
+++ b/wapstack/wapmessageapi/client/wapmessage.cpp Wed Jul 21 17:41:03 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -15,6 +15,7 @@
#include <wapmessage.h>
+#include <in_iface.h>
#include <ecom/ecom.h>
/** The WAP Messaging API. Four interfaces are defined that provide bound and fully-specified versions of WDP and Connectionless Push.
--- a/wapstack/wapmessageapi/inc/wapmessage.h Mon Jul 19 14:53:33 2010 +0100
+++ b/wapstack/wapmessageapi/inc/wapmessage.h Wed Jul 21 17:41:03 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,8 +20,6 @@
#include <e32base.h>
#include <e32std.h>
#include <in_sock.h>
-#include <nifman.h>
-#include <in_iface.h>
/**
* @file