--- a/ipappprotocols_plat/rtprtcp_api/inc/rtpapi.h Tue Aug 31 15:32:57 2010 +0300
+++ b/ipappprotocols_plat/rtprtcp_api/inc/rtpapi.h Wed Sep 01 12:27:36 2010 +0100
@@ -334,15 +334,7 @@
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
TRequestStatus& aStatus );
-
- /**
- * Send an RTP data packet, with a given CSRC list.
- * @param aHeaderInfo - [input] TRtpSendPktParam and CSRC list.
- * @return KErrNone if successful; system wide error code otherwise
- */
- IMPORT_C TInt SendRtpPacket( const TRtpSendPktParams& aSendPktParam,
- TArray<TRtpCSRC> aCSRCList);
-
+
/**
* Send a non-RTP (control) data packet asynchronously
@@ -541,30 +533,8 @@
* @return KErrNone.
*/
IMPORT_C TInt NotInUseSetNonRTPDataObserver( );
-
-
- /**
- * Register a callback object for Send RTP data packets from an RTP
- * Session. Only one Sender callback object is allowed to be
- * registered for one Session.
- * MRTPPacketObserver::ReadyToSendRtpPacket function from aRtpObserver object is
- * called when an RTP data packet is received.
- * @param aSessionId - [input] RTP Session ID
- * @param aRtpObserver - [input] Callback object to receive RTP packets
- * @return KErrNone if successful; system wide error code otherwise
- */
- IMPORT_C TInt RegisterRtpPostProcessingObserver( TRtpId aSessionId,
- MRtpPostProcessingObserver& aRtpObserver );
-
-
- /**
- * Unregister RTP Packet observer callback object associated with an RTP
- * session.
- * @param aSessionId - [input] RTP Session ID
- * @return None
- */
- IMPORT_C void UnregisterRtpPostProcessingObserver( TRtpId aSessionId );
-
+
+
private:
/**
* C++ default constructor.
--- a/ipappprotocols_plat/rtprtcp_api/inc/rtpdef.h Tue Aug 31 15:32:57 2010 +0300
+++ b/ipappprotocols_plat/rtprtcp_api/inc/rtpdef.h Wed Sep 01 12:27:36 2010 +0100
@@ -34,7 +34,6 @@
const TUint KMaxSdesItemSize = 255;
const TUint KSocketBufSize = 4096;
const TInt KMinRtpHeaderSize = 12; // 96 bits in header, 96/8 = 12
-const TInt KMaxCsrcIdentifiers = 15;
// DATA TYPES
@@ -42,7 +41,6 @@
const TRtpId KNullId = 0xffffffff;
typedef TUint32 TRtpSSRC; //
-typedef TUint32 TRtpCSRC; //
typedef TUint8 TRtpPayloadType; // payload type of the RTP packet
typedef TUint16 TRtpSequence; // sequence number of the RTP packet
typedef TUint32 TRtpTimeStamp; // timestamp of the RTP packet
@@ -57,7 +55,6 @@
// FORWARD DECLARATIONS
class TRtpSendHeader;
class TRtpRecvHeader;
-class TRtpSendPktParams;
// CLASS DECLARATION
@@ -209,30 +206,6 @@
};
-/**
-* Header class for sending RTP Packets
-*
-* @lib RtpService.dll
-*/
-class TRtpSendPktParams
- {
-public:
-
- TRtpSendPktParams(TRtpSendHeader &aHeaderInfo);
-
- TRtpId iTranStreamId; // Transtream Id
- TRtpSendHeader &iHeaderInfo; // Standard fixed header of RTP packet to send.
- TPtrC8 iPayloadData; // Payload
- TRequestStatus *iStatus;
- TRtpSequence *iSequenceNum; // Sequence Number
- };
-
-inline TRtpSendPktParams::TRtpSendPktParams(TRtpSendHeader &aHeaderInfo) : iTranStreamId( 0 ),
- iHeaderInfo( aHeaderInfo ),
- iStatus( 0 ),
- iSequenceNum( 0 )
- {
- };
/**
* An interface to the callback functions for asynchronous event
@@ -345,23 +318,4 @@
};
-
-/**
-* callback functions for Send RTP packets.
-*
-* @lib RtpService.dll
-*/
-class MRtpPostProcessingObserver
- {
- public:
- /**
- * Callback function to receive a handle to RTP packet which is ready to send.
- * @param TRtpId aTranStreamId - Transimission stream id
- * @param TPtr8 &aPacket - RTP packet Ready to send
- * @return None
- */
- virtual void ReadyToSendRtpPacket( TRtpId aTranStreamId, TPtr8 &aPacket ) = 0;
-
- };
-
#endif // __RTPDEF_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Wed Sep 01 12:27:36 2010 +0100
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="ipappprotocols" name="IP App Protocols" levels="plugin conn server if">
+ <collection id="rtp" name="RTP" level="server">
+ <component id="rtpstack" filter="s60" name="RTP Stack">
+ <unit bldFile="rtp/rtpstack/group"/>
+ <!-- <unit bldFile="rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
+ </component>
+ </collection>
+ <collection id="sipplugins" name="SIP Plugins" level="plugin">
+ <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+ <unit bldFile="sipplugins/sippwlanplugin/group"/>
+ </component>
+ <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+ <unit bldFile="sipplugins/sippsipsettingsui/group"/>
+ <!-- <unit bldFile="sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
+ </component>
+ <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+ <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
+ <!-- <unit bldFile="sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
+ </component>
+ <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+ <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
+ </component>
+ <component id="srtpstack" filter="s60" name="SRTP Stack">
+ <unit bldFile="rtp/srtpstack/group"/>
+ <!-- <unit bldFile="rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
+ </component>
+ </collection>
+ <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+ <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+ <!-- Real Time Data Protocol -->
+ <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+ </component>
+ <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+ <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+ </component>
+ </collection>
+ <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+ <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+ </component>
+ </collection>
+ <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+ <component id="ipappprotocols_plat" filter="s60" name="IP App Protocols Platform Interfaces" class="api">
+ <unit bldFile="ipappprotocols_plat/group"/>
+ </component>
+ <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition_v2.xml Wed Sep 01 12:27:36 2010 +0100
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="ipappprotocols" name="IP App Protocols" levels="plugin conn server if">
+ <collection id="rtp" name="RTP" level="server">
+ <component id="rtpstack" filter="s60" name="RTP Stack">
+ <unit bldFile="rtp/rtpstack/group"/>
+ <!-- <unit bldFile="rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
+ </component>
+ </collection>
+ <collection id="sipplugins" name="SIP Plugins" level="plugin">
+ <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+ <unit bldFile="sipplugins/sippwlanplugin/group"/>
+ </component>
+ <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+ <unit bldFile="sipplugins/sippsipsettingsui/group"/>
+ <!-- <unit bldFile="sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
+ </component>
+ <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+ <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
+ <!-- <unit bldFile="sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
+ </component>
+ <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+ <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
+ </component>
+ <component id="srtpstack" filter="s60" name="SRTP Stack">
+ <unit bldFile="rtp/srtpstack/group"/>
+ <!-- <unit bldFile="rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
+ </component>
+ </collection>
+ <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+ <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+ <!-- Real Time Data Protocol -->
+ <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+ </component>
+ <component id="srtp" name="Secure RTP" introduced="^4" purpose="optional">
+ <unit bldFile="realtimenetprots/srtp/group" mrp="realtimenetprots/srtp/group/mm-protocols_srtp.mrp"/>
+ </component>
+ <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+ <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+ </component>
+ </collection>
+ <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+ <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+ </component>
+ </collection>
+ <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+ <component id="ipappprotocols_plat" filter="s60" name="IP App Protocols Platform Interfaces" class="api">
+ <unit bldFile="ipappprotocols_plat/group"/>
+ </component>
+ <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/realtimenetprots/rtp/cfrtp/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/cfrtp/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -27,7 +27,7 @@
../inc/rtp_proto_id.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(rtp_proto_id.h)
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
../inc/rtp_subconparams.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(rtp_subconparams.h)
-./cfrtp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cfrtp.iby)
+./cfrtp.iby /epoc32/rom/include/cfrtp.iby
PRJ_MMPFILES
cfrtp.mmp
--- a/realtimenetprots/rtp/cfrtp/test/rtpscpr_dummy/group/dummy_cfrtp.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/cfrtp/test/rtpscpr_dummy/group/dummy_cfrtp.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -39,7 +39,10 @@
USERINCLUDE ../../../inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/comms-infras
+SYSTEMINCLUDE /epoc32/include/networking
START RESOURCE A0008AA9.rss
TARGET dummy_rtpscpr.rsc
--- a/realtimenetprots/rtp/cfrtp/test/te_cfrtp/group/te_cfrtpsuite.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/cfrtp/test/te_cfrtp/group/te_cfrtpsuite.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -33,7 +33,9 @@
USERINCLUDE ../../../inc
USERINCLUDE ../../rtpscpr_dummy/inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/comms-infras
LIBRARY testexecuteutils.lib
LIBRARY testexecutelogclient.lib
--- a/realtimenetprots/rtp/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -25,10 +25,10 @@
PRJ_EXPORTS
-./rtp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(rtp.iby)
+./rtp.iby /epoc32/rom/include/rtp.iby
PRJ_TESTEXPORTS
-./te_rtp.iby /epoc32/rom/include/te_rtp.iby
+./te_rtp.iby /epoc32/rom/include/te_rtp.iby
./rtptest.xml z:/testdata/configs/rtp/rtptest.xml
--- a/realtimenetprots/rtp/rtpcore/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/rtpcore/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -19,7 +19,7 @@
*/
PRJ_EXPORTS
-./rtpcore.iby CORE_MW_LAYER_IBY_EXPORT_PATH(rtpcore.iby)
+./rtpcore.iby /epoc32/rom/include/rtpcore.iby
PRJ_MMPFILES
rtpcore.mmp
--- a/realtimenetprots/rtp/rtpcore/group/rtpcore.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/rtpcore/group/rtpcore.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -30,9 +30,7 @@
VENDORID 0x70000001
USERINCLUDE ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-OS_LAYER_ESTLIB_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
SOURCEPATH ../src
@@ -55,6 +53,9 @@
SOURCE rtpapi.cpp
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+
+
LIBRARY euser.lib esock.lib insock.lib random.lib bluetooth.lib commsfw.lib
LIBRARY hal.lib
DEBUGLIBRARY flogger.lib
--- a/realtimenetprots/rtp/rtpcore/test/te_ut_rtpcollisionmgr/group/te_ut_rtpcollisionmgrsuite.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/rtpcore/test/te_ut_rtpcollisionmgr/group/te_ut_rtpcollisionmgrsuite.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -47,7 +47,9 @@
USERINCLUDE ../src
USERINCLUDE ../../../inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/libc
LIBRARY euser.lib esock.lib insock.lib random.lib bluetooth.lib hal.lib charconv.lib
--- a/realtimenetprots/rtp/rtpcore/test/trtpcore/group/trtp2.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/rtpcore/test/trtpcore/group/trtp2.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -52,7 +52,9 @@
USERINCLUDE ../../../src/
USERINCLUDE ../../../inc/
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/libc
LIBRARY euser.lib testexecuteutils.lib esock.lib insock.lib
--- a/realtimenetprots/rtp/rtpcore/test/trtpsocket/group/trtpsocket.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/rtpcore/test/trtpsocket/group/trtpsocket.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -59,7 +59,15 @@
USERINCLUDE ../../../inc
USERINCLUDE ../../../src
-MW_LAYER_SYSTEMINCLUDE
+
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/comms-infras
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/libc
+
+
+
+
LIBRARY euser.lib testexecuteutils.lib esock.lib insock.lib
LIBRARY testexecutelogclient.lib netmeta.lib
--- a/realtimenetprots/rtp/rtpcore/test/trtpsocket/src/trtpcoreserver.h Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/rtpcore/test/trtpsocket/src/trtpcoreserver.h Wed Sep 01 12:27:36 2010 +0100
@@ -124,7 +124,7 @@
iSSRC = 0; // synchronization source
}
-class CRtpFixedHeader : public CBase
+class CRtpFixedHeader
{
public:
CRtpFixedHeader(TDes8& packet);
@@ -238,7 +238,7 @@
} specific;
};
-class CRtcpPacketTest : public CBase
+class CRtcpPacketTest
{
public:
CRtcpPacketTest(TDes8& aPacket);
--- a/realtimenetprots/rtp/shimrtp/bwins/rtpmu.def Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/bwins/rtpmu.def Wed Sep 01 12:27:36 2010 +0100
@@ -112,5 +112,4 @@
?SetPrePostProcessingRegisterCallback@RRtpSession_Internal@@QAEXPAVMPrePostProcessingCallback@@@Z @ 111 NONAME ; void RRtpSession_Internal::SetPrePostProcessingRegisterCallback(class MPrePostProcessingCallback *)
?RtcpStatistics@RRtpSession_Internal@@QAEHKAAVTRtcpStatistics@@@Z @ 112 NONAME ; int RRtpSession_Internal::RtcpStatistics(unsigned long, class TRtcpStatistics &)
?Close@RRtpSendPacket@@QAEXXZ @ 113 NONAME ; void RRtpSendPacket::Close(void)
- ?SenderSSRC@RRtcpRRItem@@QBEIXZ @ 114 NONAME ; unsigned int RRtcpRRItem::SenderSSRC(void) const
--- a/realtimenetprots/rtp/shimrtp/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -21,7 +21,7 @@
PRJ_EXPORTS
-./shimrtp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(shimrtp.iby)
+./shimrtp.iby /epoc32/rom/include/shimrtp.iby
../inc/rtp.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(rtp.h)
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
../inc/rtpsession_internal.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(rtpsession_internal.h)
--- a/realtimenetprots/rtp/shimrtp/group/rtpremoved.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/group/rtpremoved.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -36,11 +36,9 @@
USERINCLUDE ../inc
USERINCLUDE ../../rtpcore/inc
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../src/rtp
-MW_LAYER_SYSTEMINCLUDE
-
-
SOURCEPATH ../src/stubs
SOURCE events_stub.cpp
SOURCE receivestream_stub.cpp
--- a/realtimenetprots/rtp/shimrtp/test/rtpfilestreamer/group/rtpfilestreamer.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/test/rtpfilestreamer/group/rtpfilestreamer.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -28,9 +28,7 @@
SOURCE demoapp.cpp
USERINCLUDE ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
+SYSTEMINCLUDE /epoc32/include
LIBRARY euser.lib
LIBRARY esock.lib
LIBRARY insock.lib
--- a/realtimenetprots/rtp/shimrtp/test/te_rtcp/group/te_rtcpsuite.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/test/te_rtcp/group/te_rtcpsuite.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -35,7 +35,9 @@
USERINCLUDE ../../../inc
USERINCLUDE ../../../src/rtp
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/comms-infras
+SYSTEMINCLUDE /epoc32/include/test
//Please add your system include under here.
--- a/realtimenetprots/rtp/shimrtp/test/te_rtp/group/te_rtpsuite.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/test/te_rtp/group/te_rtpsuite.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -33,7 +33,9 @@
USERINCLUDE ../src
USERINCLUDE ../../../inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/comms-infras
//Please add your system include under here.
--- a/realtimenetprots/rtp/shimrtp/test/trtp/group/trtp.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/test/trtp/group/trtp.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -36,7 +36,10 @@
SOURCE trtpstep.cpp
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/comms-infras
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/libc
LIBRARY euser.lib estlib.lib
--- a/realtimenetprots/sipfw/Group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/Group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -44,8 +44,8 @@
../conf/sipframework_2001f889.crml MW_LAYER_EXPORTS_CRML(sipframework_2001f889.crml)
// SIP iby-files
-../rom/sipsw.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sipsw.iby)
-../rom/siph2lanbearermonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(siph2lanbearermonitor.iby)
+../rom/sipsw.iby /epoc32/rom/include/sipsw.iby
+../rom/siph2lanbearermonitor.iby /epoc32/rom/include/siph2lanbearermonitor.iby
// SDP Codec API
../SDP/api/SdpAttributeField.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(sdpattributefield.h)
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrmonitor.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrmonitor.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -188,20 +188,16 @@
//
void CSipAlrMonitor::FreeResources ( MSipAlrObserver& aObserver )
{
- CSipAlrSnapMonitor* monitor= 0;
for ( TInt i = iSnapMonitors.Count()-1; i >= 0; i-- )
{
TBool last = iSnapMonitors[i]->DetachObserver ( aObserver );
if ( last )
{
- monitor = iSnapMonitors[i];
- iSnapMonitors.Remove(i);
- delete monitor;
- monitor = NULL;
+ delete iSnapMonitors[i];
+ iSnapMonitors.Remove ( i );
PROFILE_DEBUG1( "CSipAlrMonitor::FreeResources monitor deleted" )
}
}
- iSnapMonitors.Compress();
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -300,7 +300,6 @@
iObservers.Remove( i );
}
}
- iObservers.Compress();
return iObservers.Count() == 0;
}
@@ -486,7 +485,7 @@
DestroyMobilityAo();
Cancel();
-// iConnection.Close();
+ iConnection.Close();
iMigrationAllowedByClient = EFalse;
iConnectionActive = EFalse;
iPreferredCarrierAvailableCalled = EFalse;
--- a/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnconfigurationhandler.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnconfigurationhandler.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -312,7 +312,6 @@
iIsFailed = EFalse;
iIsFatalFailure = EFalse;
iCellularDataBlocked = EFalse;
- iApnUseSecureAuthProposal = EFalse;
}
// -----------------------------------------------------------------------------
@@ -830,7 +829,7 @@
if ( aIsFailed )
{
TRAP( err, SetApnL(
- SecondaryApn(), EFalse, ETrue) );
+ SecondaryApn(), ETrue, ETrue) );
}
else if ( !iIsFatalFailure )
{
--- a/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnmanager.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnmanager.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -106,8 +106,11 @@
// CSIPApnManager::WriteApnL
// ----------------------------------------------------------------------------
//
-void CSIPApnManager::WriteApnL( TUint32 aIapId, TBool /*aIsPrimaryApn*/, const TDesC8* aApn )
+void CSIPApnManager::WriteApnL( TUint32 aIapId, TBool aIsPrimaryApn, const TDesC8* aApn )
{
+ PROFILE_DEBUG3( "CSIPApnManager::WriteApnL isPrimary", aIsPrimaryApn )
+ TBool useSecureAuth = aIsPrimaryApn ? EFalse : ETrue;
+
CSIPApnConfigurationHandler* handler = FindIapIdHandler( aIapId );
if (!handler)
{
@@ -115,7 +118,7 @@
handler = FindIapIdHandler(aIapId);
}
- handler->SetApnL( *aApn, EFalse, ETrue);
+ handler->SetApnL( *aApn, useSecureAuth, ETrue);
}
// ----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -94,7 +94,8 @@
LIBRARY commsdat.lib
LIBRARY featmgr.lib
LIBRARY commdb.lib
-LIBRARY extendedconnpref.lib
+LIBRARY extendedconnpref.lib
+LIBRARY netmeta.lib
VENDORID 0x70000001
--- a/realtimenetprots/sipfw/ProfileAgent/IETF_Agent/src/Sipietfprofilecontext.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/IETF_Agent/src/Sipietfprofilecontext.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -491,9 +491,7 @@
//
TBool CSIPIetfProfileContext::ShouldRetryRegistration( TInt aError )
{
- return (iProfile &&
- AgentObserver().ProceedRegistration(*iProfile, aError) &&
- (aError == K503ServiceUnavailable ||
+ return (aError == K503ServiceUnavailable ||
aError == K408TimeOut ||
aError == K500ServerInternalError ||
aError == KErrTimedOut ||
@@ -501,7 +499,7 @@
aError == KErrSIPTransportFailure ||
aError == KErrSIPICMPFailure ||
aError == KErrSIPOutboundProxyNotResponding ) &&
- iConnection.State() != CSIPConnection::ESuspended)));
+ iConnection.State() != CSIPConnection::ESuspended));
}
// -----------------------------------------------------------------------------
@@ -564,12 +562,10 @@
PROFILE_DEBUG3("SIPIetfProfileContext::IncomingResponse", ProfileId())
aHandled = ETrue;
const CSIPResponseElements* response = aTransaction.ResponseElements();
- TInt responseCode = KErrGeneral;
+ TUint responseCode = response->StatusCode();
TBool retry = EFalse;
if (response)
{
- responseCode = response->StatusCode();
-
retry = RetryRegister( &aTransaction, responseCode);
if( !retry )
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Inc/sipphoneregistrationmonitor.h Wed Sep 01 12:27:36 2010 +0100
@@ -0,0 +1,99 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Name : sipphoneregistrationmonitor.h
+* Part of : SIP Profile Agent / SIP IMS Agent
+* Version : %version: 2 %
+*
+*/
+
+
+
+
+/**
+ @internalComponent
+*/
+
+#ifndef CSIPPHONEREGISTRATIONMONITOR_H
+#define CSIPPHONEREGISTRATIONMONITOR_H
+
+// INCLUDES
+#include <etelmm.h>
+
+// FORWARD DECLARATIONS
+class MSipPhoneRegistrationObserver;
+
+// CLASS DEFINITION
+/**
+ * Monitors the status of the phone's network registration.
+ * Notifies when the status changes.
+ */
+class CSipPhoneRegistrationMonitor : public CActive
+ {
+ public:
+
+ /** Phone registration status */
+ enum TStatus
+ {
+ ENotRegistered,
+ ERegisteredOnHomeNetwork,
+ ERegisteredRoaming
+ };
+
+ static CSipPhoneRegistrationMonitor* NewL(
+ RTelServer& aTelServer,
+ const RTelServer::TPhoneInfo& aPhoneInfo,
+ MSipPhoneRegistrationObserver& aObserver );
+
+ ~CSipPhoneRegistrationMonitor();
+
+ public: // New methods
+
+ TStatus Status() const;
+
+ protected: // From CActive
+
+ void DoCancel();
+ void RunL();
+ TInt RunError(TInt aError);
+
+ private: // Constructors
+
+ /// Constructor
+ CSipPhoneRegistrationMonitor(
+ MSipPhoneRegistrationObserver& aObserver );
+
+ /// Default constructor, not implemented.
+ CSipPhoneRegistrationMonitor();
+
+ /// 2nd phase constructor
+ void ConstructL(
+ RTelServer& aTelServer,
+ const RTelServer::TPhoneInfo& aPhoneInfo );
+
+ void MonitorStatus();
+
+ private: // Data
+
+ MSipPhoneRegistrationObserver& iObserver;
+ RMobilePhone iPhone;
+ RMobilePhone::TMobilePhoneRegistrationStatus iRegistrationStatus;
+
+
+#ifdef CPPUNIT_TEST
+ friend class CSIPIMSProfileAgentTest;
+#endif
+ };
+
+#endif // CSIPPHONEREGISTRATIONMONITOR_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Inc/sipphoneregistrationobserver.h Wed Sep 01 12:27:36 2010 +0100
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Name : sipphoneregistrationobserver.h
+* Part of : SIP Profile Agent / SIP IMS Agent
+* Version : %version: 2 %
+*
+*/
+
+
+
+
+/**
+ @internalComponent
+*/
+
+#ifndef MSIPPHONEREGISTRATIONOBSERVER_H
+#define MSIPPHONEREGISTRATIONOBSERVER_H
+
+// INCLUDES
+#include <e32def.h>
+
+// CLASS DECLARATION
+/**
+* MSipPhoneRegistrationObserver defines an internal interface for observing
+* phone's network registration status.
+*/
+class MSipPhoneRegistrationObserver
+ {
+ public: // Abstract methods
+
+ /**
+ * Called when the phone's network registration status changes.
+ */
+ virtual void PhoneRegistrationStatusChangedL() = 0;
+
+ /**
+ * Called when there is a fatal failure when monitoring
+ * the phone's network registration status.
+ * The user should delete the monitor.
+ * @param aError the failure reason
+ */
+ virtual void PhoneRegistrationStatusError( TInt aError ) = 0;
+ };
+
+#endif // MSIPPHONEREGISTRATIONOBSERVER_H
--- a/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/Sipimsprofilecontext.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/Sipimsprofilecontext.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -781,9 +781,7 @@
//
TBool CSIPIMSProfileContext::ShouldRetryRegistration( TInt aError )
{
- return (iProfile &&
- AgentObserver().ProceedRegistration(*iProfile, aError) &&
- (aError == K503ServiceUnavailable ||
+ return (aError == K503ServiceUnavailable ||
aError == K408TimeOut ||
aError == K480TemporarilyUnavailable ||
aError == K500ServerInternalError ||
@@ -793,7 +791,7 @@
aError == KErrSIPTransportFailure ||
aError == KErrSIPICMPFailure ||
aError == KErrSIPOutboundProxyNotResponding ) &&
- iConnection.State() != CSIPConnection::ESuspended)));
+ iConnection.State() != CSIPConnection::ESuspended));
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/Sipimsprofileusimprovider.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/Sipimsprofileusimprovider.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -402,10 +402,7 @@
iObserver.UpdateRegistrationsL();
if (!iProfileSIMRecord.PrivateIdentity().Length())
{
- if(iAuthorization)
- {
iAuthorization->RequestL();
- }
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/sipphoneregistrationmonitor.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -0,0 +1,172 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Name : sipphoneregistrationmonitor.cpp
+// Part of : SIP Profile Agent / IMS Agent
+// Version : %version: 2 %
+//
+
+
+#include "sipphoneregistrationmonitor.h"
+#include "sipphoneregistrationobserver.h"
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::NewL
+// -----------------------------------------------------------------------------
+//
+CSipPhoneRegistrationMonitor* CSipPhoneRegistrationMonitor::NewL(
+ RTelServer& aTelServer,
+ const RTelServer::TPhoneInfo& aPhoneInfo,
+ MSipPhoneRegistrationObserver& aObserver )
+ {
+ CSipPhoneRegistrationMonitor* self
+ = new( ELeave ) CSipPhoneRegistrationMonitor( aObserver );
+ CleanupStack::PushL( self );
+ self->ConstructL( aTelServer, aPhoneInfo );
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::CSipPhoneRegistrationMonitor
+// -----------------------------------------------------------------------------
+//
+CSipPhoneRegistrationMonitor::CSipPhoneRegistrationMonitor(
+ MSipPhoneRegistrationObserver& aObserver )
+ : CActive( CActive::EPriorityStandard ),
+ iObserver( aObserver ),
+ iRegistrationStatus( RMobilePhone::ERegistrationUnknown )
+ {
+ CActiveScheduler::Add( this );
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::ConstructL
+// -----------------------------------------------------------------------------
+//
+#ifdef __WINSCW__
+
+void CSipPhoneRegistrationMonitor::ConstructL(
+ RTelServer& /*aTelServer*/,
+ const RTelServer::TPhoneInfo& /*aPhoneInfo*/ )
+ {
+ iRegistrationStatus = RMobilePhone::ERegisteredOnHomeNetwork;
+ }
+
+#else
+
+void CSipPhoneRegistrationMonitor::ConstructL(
+ RTelServer& aTelServer,
+ const RTelServer::TPhoneInfo& aPhoneInfo )
+ {
+
+ User::LeaveIfError( iPhone.Open( aTelServer, aPhoneInfo.iName ) );
+
+ // Get current status
+ TRequestStatus status;
+ iPhone.GetNetworkRegistrationStatus( status, iRegistrationStatus );
+ User::WaitForRequest( status );
+ User::LeaveIfError( status.Int() );
+
+ // Start to monitor the status
+ MonitorStatus();
+ }
+
+#endif
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::~CSipPhoneRegistrationMonitor
+// -----------------------------------------------------------------------------
+//
+CSipPhoneRegistrationMonitor::~CSipPhoneRegistrationMonitor()
+ {
+ Cancel();
+ iPhone.Close();
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::Status
+// -----------------------------------------------------------------------------
+//
+CSipPhoneRegistrationMonitor::TStatus
+CSipPhoneRegistrationMonitor::Status() const
+ {
+ TStatus status = ENotRegistered;
+ switch ( iRegistrationStatus )
+ {
+ case RMobilePhone::ERegisteredOnHomeNetwork:
+ status = ERegisteredOnHomeNetwork;
+ break;
+ case RMobilePhone::ERegisteredRoaming:
+ status = ERegisteredRoaming;
+ break;
+ default:
+ break;
+ }
+ return status;
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::DoCancel
+// -----------------------------------------------------------------------------
+//
+void CSipPhoneRegistrationMonitor::DoCancel()
+ {
+ iPhone.CancelAsyncRequest(
+ EMobilePhoneNotifyNetworkRegistrationStatusChange );
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::RunL
+// -----------------------------------------------------------------------------
+//
+void CSipPhoneRegistrationMonitor::RunL()
+ {
+ TInt err = iStatus.Int();
+
+ if ( err )
+ {
+ iObserver.PhoneRegistrationStatusError( err );
+ }
+ else
+ {
+ MonitorStatus();
+ iObserver.PhoneRegistrationStatusChangedL();
+ }
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::RunError
+// -----------------------------------------------------------------------------
+//
+TInt CSipPhoneRegistrationMonitor::RunError(TInt aError)
+ {
+ iObserver.PhoneRegistrationStatusError( aError );
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// CSipPhoneRegistrationMonitor::MonitorStatus
+// -----------------------------------------------------------------------------
+//
+void CSipPhoneRegistrationMonitor::MonitorStatus()
+ {
+#ifndef __WINSCW__
+
+ // Request further notification from ETel
+ iPhone.NotifyNetworkRegistrationStatusChange( iStatus,
+ iRegistrationStatus );
+ SetActive();
+
+#endif
+ }
--- a/realtimenetprots/sipfw/ProfileAgent/PluginMgr/Src/Sipplugindirector.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/PluginMgr/Src/Sipplugindirector.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -305,7 +305,6 @@
}//if
}//for
- iSIPProfileAgents.Compress();
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileCacheItem.h Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileCacheItem.h Wed Sep 01 12:27:36 2010 +0100
@@ -571,8 +571,6 @@
* Function returns the Bearer ID for the Profile.
*/
TUint32 BearerID();
-
- TBool HasQueuedUpdate()const;
private:
/**
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileCacheItem.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileCacheItem.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -366,7 +366,6 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
- iObservers.Compress();
}
RemoveFromPendingObservers(aObserver);
@@ -403,7 +402,6 @@
if (index != KErrNotFound)
{
iUsers.Remove(index);
- iUsers.Compress();
CheckProfileEnabledState();
}
}
@@ -1258,7 +1256,6 @@
if (index != KErrNotFound)
{
iObserversWaitedForPermission.Remove(index);
- iObserversWaitedForPermission.Compress();
}
}
@@ -1419,14 +1416,3 @@
LatestProfile().ExtensionParameter(KBearerType , bearerId);
return bearerId;
}
-
-// -----------------------------------------------------------------------------
-// CSIPProfileCacheItem::HasQueuedUpdate
-// This function will return true if profile updated and not yet processed
-// false otherwise
-// -----------------------------------------------------------------------------
-//
-TBool CSIPProfileCacheItem::HasQueuedUpdate() const
- {
- return (iQueuedProfile != NULL);
- }
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -396,14 +396,7 @@
{
return EFalse;
}
-
- if((aError != KErrNone) && item->HasQueuedUpdate())
- {
- PROFILE_DEBUG4("ProfileServerCore::ProceedRegistration HasQueuedUpdate, err",
- item->HasQueuedUpdate(), aError)
- return EFalse;
- }
-
+
if ( ShouldChangeIap(item->UsedProfile(), aError) &&
!item->SnapRetryCountReached() )
{
@@ -1553,7 +1546,6 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
- iObservers.Compress();
}
for (TInt i = 0; i < iProfileCache.Count(); i ++)
@@ -1934,7 +1926,6 @@
if (index >= 0)
{
iProfileCache.Remove(index);
- iProfileCache.Compress();
}
}
@@ -1951,9 +1942,7 @@
{
CSipAlrMigrationController* unused = iMigrationControllers[i];
iMigrationControllers.Remove(i);
- iMigrationControllers.Compress();
delete unused;
- unused = NULL;
}
}
}
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -178,7 +178,6 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
- iObservers.Compress();
}
if (iObservers.Count() == 0)
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSipConnection.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSipConnection.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -622,10 +622,7 @@
//Message is response. Host part will be extracted from the top
//Via header
CSIPViaHeader* viaHeader = TopViaHeader( &aMessage );
- if(viaHeader)
- {
- domainName = viaHeader->SentByHostPort().Host().AllocL();
- }
+ domainName = viaHeader->SentByHostPort().Host().AllocL();
}
transport = static_cast<CTransportTls*>(FindTransport( aParams,
SIPStrings::StringF( SipStrConsts::ETLS ),
--- a/realtimenetprots/sipfw/SIP/NATTraversalController/example_plugin/group/nattraversalcontrollerexample.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/NATTraversalController/example_plugin/group/nattraversalcontrollerexample.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -30,7 +30,8 @@
TARGET nattraversalcontrollerexample.rsc
END
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
USERINCLUDE ../src
--- a/realtimenetprots/sipfw/SIP/NATTraversalController/example_plugin/src/dllentry.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/NATTraversalController/example_plugin/src/dllentry.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -18,7 +18,7 @@
-#include <ecom/implementationproxy.h>
+#include <implementationproxy.h>
#include "CNATTraversalControllerExample.h"
--- a/realtimenetprots/sipfw/SIP/SystemStateMonitor/example_plugin/group/sipsystemstatemonitor.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/SystemStateMonitor/example_plugin/group/sipsystemstatemonitor.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -33,7 +33,8 @@
TARGET sipsystemstatemonitor.rsc
END
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
USERINCLUDE ../inc
--- a/realtimenetprots/sipfw/SIP/SystemStateMonitor/example_plugin/src/implementationproxy.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/SystemStateMonitor/example_plugin/src/implementationproxy.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -19,7 +19,7 @@
#include "sipsystemstatemonitorimpl.h"
-#include <ecom/ImplementationProxy.h>
+#include <ImplementationProxy.h>
const TImplementationProxy ImplementationTable[] =
{
--- a/realtimenetprots/sipfw/SampleApp/gameUI_techview/Group/ui.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SampleApp/gameUI_techview/Group/ui.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -58,7 +58,9 @@
USERINCLUDE ../../sipengine/inc
USERINCLUDE ../../../SIP/Codec/inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/techview
+SYSTEMINCLUDE /epoc32/include/oem
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib
LIBRARY eikcoctl.lib bafl.lib
--- a/realtimenetprots/sipfw/SampleApp/gameengine/Group/gameengine.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SampleApp/gameengine/Group/gameengine.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -37,7 +37,7 @@
USERINCLUDE ../../sipengine/inc
USERINCLUDE ../../socketengine/Inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
LIBRARY euser.lib
LIBRARY sipexsocketengine.lib
--- a/realtimenetprots/sipfw/SampleApp/resolverplugin/Group/resolverplugin.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SampleApp/resolverplugin/Group/resolverplugin.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -26,7 +26,7 @@
USERINCLUDE ../Inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include /epoc32/include/ecom
START RESOURCE ../Data/A00001EC.rss
TARGET sipexresolverplugin.rsc
--- a/realtimenetprots/sipfw/SampleApp/sipengine/group/SIPExSIPEngine.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SampleApp/sipengine/group/SIPExSIPEngine.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -34,7 +34,7 @@
USERINCLUDE ../inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
LIBRARY euser.lib
LIBRARY estor.lib
--- a/realtimenetprots/sipfw/SampleApp/socketengine/Group/SIPExSocketEngine.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/SampleApp/socketengine/Group/SIPExSocketEngine.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -29,7 +29,7 @@
USERINCLUDE ../Inc
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
LIBRARY euser.lib
LIBRARY esock.lib // RSocketServ
--- a/realtimenetprots/sipfw/rom/sipsw.iby Tue Aug 31 15:32:57 2010 +0300
+++ b/realtimenetprots/sipfw/rom/sipsw.iby Wed Sep 01 12:27:36 2010 +0100
@@ -77,7 +77,7 @@
ECOM_PLUGIN(siptls.dll,siptls.rsc)
-#ifndef __IPSEC
+#ifdef SYMBIAN_EXCLUDE_IPSEC
REM Feature IPSEC not included in this rom
#else
ECOM_PLUGIN(sipipsec.dll,sipipsec.rsc)
--- a/rtp/rtpstack/bwins/rtpserviceu.def Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/bwins/rtpserviceu.def Wed Sep 01 12:27:36 2010 +0100
@@ -44,7 +44,4 @@
?UnregisterRtpObserver@CRtpAPI@@QAEXK@Z @ 43 NONAME ; void CRtpAPI::UnregisterRtpObserver(unsigned long)
?Version@CRtpAPI@@QBE?AVTVersion@@XZ @ 44 NONAME ; class TVersion CRtpAPI::Version(void) const
?CreateSessionL@CRtpAPI@@QAEKABVTCreateSessionParams@@AAIHPBVTRtcpParams@@AAVCSRTPSession@@@Z @ 45 NONAME ; unsigned long CRtpAPI::CreateSessionL(class TCreateSessionParams const &, unsigned int &, int, class TRtcpParams const *, class CSRTPSession &)
- ?SendRtpPacket@CRtpAPI@@QAEHABVTRtpSendPktParams@@V?$TArray@K@@@Z @ 46 NONAME ; int CRtpAPI::SendRtpPacket(class TRtpSendPktParams const &, class TArray<unsigned long>)
- ?RegisterRtpPostProcessingObserver@CRtpAPI@@QAEHKAAVMRtpPostProcessingObserver@@@Z @ 47 NONAME ; int CRtpAPI::RegisterRtpPostProcessingObserver(unsigned long, class MRtpPostProcessingObserver &)
- ?UnregisterRtpPostProcessingObserver@CRtpAPI@@QAEXK@Z @ 48 NONAME ; void CRtpAPI::UnregisterRtpPostProcessingObserver(unsigned long)
--- a/rtp/rtpstack/eabi/rtpserviceu.def Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/eabi/rtpserviceu.def Wed Sep 01 12:27:36 2010 +0100
@@ -74,7 +74,3 @@
_ZTI12CRtpSendItem @ 73 NONAME ; #<TI>#
_ZTI15CRtpSessionSrtp @ 74 NONAME ; #<TI>#
_ZTV15CRtpSessionSrtp @ 75 NONAME ; #<VT>#
- _ZN7CRtpAPI13SendRtpPacketERK17TRtpSendPktParams6TArrayImE @ 76 NONAME
- _ZN7CRtpAPI33RegisterRtpPostProcessingObserverEmR26MRtpPostProcessingObserver @ 77 NONAME
- _ZN7CRtpAPI35UnregisterRtpPostProcessingObserverEm @ 78 NONAME
-
--- a/rtp/rtpstack/inc/rtpmanager.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/inc/rtpmanager.h Wed Sep 01 12:27:36 2010 +0100
@@ -135,31 +135,24 @@
TInt RegisterRtpObserver( TRtpId aSessionId, MRtpObserver& aObserver );
void UnregisterRtpObserver( TRtpId aSessionId );
-
- TInt RegisterRtpPostProcessingObserver( TRtpId aSessionId, MRtpPostProcessingObserver& aRtpObserver );
-
- void UnregisterRtpPostProcessingObserver( TRtpId aSessionId );
TInt SetNonRTPDataObserver( TRtpId aSessionId,
MNonRTPDataObserver* aNonRTPDataObserver );
TInt SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
- const TDesC8& aPayloadData,
- const TArray<TRtpCSRC> *aCsrcList = NULL );
+ const TDesC8& aPayloadData );
TInt SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList = NULL );
+ TRequestStatus& aStatus );
TInt SendRtpPacket( TRtpId aTranStreamId,
TRtpSequence aSequenceNum,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList = NULL );
+ TRequestStatus& aStatus );
void SendDataL( TRtpId aSessionId,
TBool aUseRTPSocket,
--- a/rtp/rtpstack/inc/rtppacketparam.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/inc/rtppacketparam.h Wed Sep 01 12:27:36 2010 +0100
@@ -184,7 +184,6 @@
TUint32* CSRCarray;
TUint8* payloadData;
TInt payloadDataLen;
- const TArray<TRtpCSRC> *iCsrcList;
public://Nested class
/**
--- a/rtp/rtpstack/inc/rtpsession.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/inc/rtpsession.h Wed Sep 01 12:27:36 2010 +0100
@@ -108,20 +108,16 @@
TInt RegisterRtpObserver( MRtpObserver& aObserver );
void UnregisterRtpObserver();
-
- TInt RegisterRtpPostProcessingObserver( MRtpPostProcessingObserver& aObserver );
- void UnregisterRtpPostProcessingObserver();
TInt SetNonRTPDataObserver( MNonRTPDataObserver* aNonRTPDataObserver );
TInt SendRtpPacket( TRtpId aTranStreamId, const TRtpSendHeader& aHeaderInfo,
- const TDesC8& aPayloadData, const TArray<TRtpCSRC> *aCsrcList = NULL );
+ const TDesC8& aPayloadData );
TInt SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList = NULL );
+ TRequestStatus& aStatus );
TInt SendRtpPacket( const TRtpSendHeader& aHeaderInfo, const TDesC8& aPayloadData );
@@ -132,8 +128,7 @@
TRtpSequence aSequenceNum,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList = NULL );
+ TRequestStatus& aStatus );
void SendData( TBool aUseRTPSocket,
const TDesC8& aData,
@@ -167,8 +162,6 @@
* disabled; system wide error code otherwise
*/
TInt IsRtcpSendingSuspended( TBool& aAutoSending );
-
- void ReadyToSendRtpPacket(TRtpId aTranStreamId);
public: // from MSsrcCheckCallback
/**
@@ -461,7 +454,6 @@
MNonRTPDataObserver* iNonRTPDataObserver;
MRtpErrNotify& iErrNotify;
MRtpAsignUniqueID& iAssignUniqueID;
- MRtpPostProcessingObserver* iRtpPacketObserver;
TBool iSessionStarted;
--- a/rtp/rtpstack/inc/rtpsessionsrtp.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/inc/rtpsessionsrtp.h Wed Sep 01 12:27:36 2010 +0100
@@ -55,21 +55,19 @@
~CRtpSessionSrtp();
TInt SendRtpPacket( TRtpId aTranStreamId, const TRtpSendHeader& aHeaderInfo,
- const TDesC8& aPayloadData, const TArray<TRtpCSRC> *aCsrcList = NULL );
+ const TDesC8& aPayloadData );
TInt SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList = NULL);
+ TRequestStatus& aStatus );
TInt SendRtpPacket( TRtpId aTranStreamId,
TRtpSequence aSequenceNum,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList = NULL );
+ TRequestStatus& aStatus );
//TInt SendRtcpByePacket( TRtpId aTranStreamId, const TDesC8& aReason );
//TInt SendRtcpAppPacket( TRtpId aTranStreamId, const TRtcpApp& aApp );
--- a/rtp/rtpstack/inc/rtptranstream.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/inc/rtptranstream.h Wed Sep 01 12:27:36 2010 +0100
@@ -49,8 +49,7 @@
const TDesC8& aPayloadData,
TRtpSequence aSeqNum,
TBool aSetSeqNum,
- CRtpPacket* aPktSnd,
- const TArray<TRtpCSRC> *aCsrcList = NULL);
+ CRtpPacket* aPktSnd );
TInt BuildRtcpBYEPacket( const TDesC8& aReason,
CRtpPacket* aPktRtcpSnd );
--- a/rtp/rtpstack/src/rtpapi.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtpapi.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -389,56 +389,6 @@
{
return iManager->SendRtpPacket( aTranStreamId, aHeaderInfo, aPayloadData, aStatus );
}
-
-
-// ---------------------------------------------------------------------------
-// TInt CRtpAPI::RegisterRtpPostProcessingObserver()
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CRtpAPI::RegisterRtpPostProcessingObserver( TRtpId aSessionId,
- MRtpPostProcessingObserver& aRtpPacketObserver )
- {
- return iManager->RegisterRtpPostProcessingObserver( aSessionId, aRtpPacketObserver );
- }
-
-
-// ---------------------------------------------------------------------------
-// CRtpAPI::UnregisterRtpPostProcessingObserver()
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRtpAPI::UnregisterRtpPostProcessingObserver( TRtpId aSessionId )
- {
- iManager->UnregisterRtpPostProcessingObserver( aSessionId );
- }
-
-
-// ---------------------------------------------------------------------------
-// TInt CRtpAPI::SendRtpPacket()
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CRtpAPI::SendRtpPacket(const TRtpSendPktParams& aSendPktParam , TArray<TRtpCSRC> aCSRCList)
- {
- if(!aSendPktParam.iStatus)
- {
- //SYNC Version
- return iManager->SendRtpPacket( aSendPktParam.iTranStreamId, aSendPktParam.iHeaderInfo,
- aSendPktParam.iPayloadData, &aCSRCList );
- }
- else if (!aSendPktParam.iSequenceNum) //ASYNC Versions With and Without SEQ Number
- {
- return iManager->SendRtpPacket( aSendPktParam.iTranStreamId, aSendPktParam.iHeaderInfo,
- aSendPktParam.iPayloadData, *aSendPktParam.iStatus, &aCSRCList );
- }
- else
- {
- return iManager->SendRtpPacket( aSendPktParam.iTranStreamId, *aSendPktParam.iSequenceNum, aSendPktParam.iHeaderInfo,
- aSendPktParam.iPayloadData, *aSendPktParam.iStatus, &aCSRCList );
- }
- }
-
// ---------------------------------------------------------------------------
// TInt CRtpAPI::SendData()
--- a/rtp/rtpstack/src/rtpmanager.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtpmanager.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -721,47 +721,6 @@
return result;
}
-
-// ---------------------------------------------------------------------------
-// TInt CRtpManager::RegisterRtpPostProcessingObserver()
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRtpManager::RegisterRtpPostProcessingObserver( TRtpId aSessionId, MRtpPostProcessingObserver& aRtpPacketObserver )
- {
- CRtpSession* session = GetSession( aSessionId );
- TInt result( KErrGeneral );
- if ( session )
- {
- result = session->RegisterRtpPostProcessingObserver( aRtpPacketObserver );
- }
- else
- {
- RTP_DEBUG_DETAIL( "CRtpManager::RegisterRtpPostProcessingObserver, Session not found" );
- }
- return result;
- }
-
-
-// ---------------------------------------------------------------------------
-// CRtpManager::UnregisterRtpPostProcessingObserver()
-//
-// ---------------------------------------------------------------------------
-//
-void CRtpManager::UnregisterRtpPostProcessingObserver( TRtpId aSessionId )
- {
- CRtpSession* session = GetSession( aSessionId );
-
- if ( session )
- {
- session->UnregisterRtpPostProcessingObserver();
- }
- else
- {
- RTP_DEBUG_DETAIL( "CRtpManager::UnregisterRtpPostProcessingObserver, Session not found" );
- }
- }
-
// ---------------------------------------------------------------------------
// CRtpManager::UnregisterRtpObserver()
//
@@ -814,8 +773,7 @@
//
TInt CRtpManager::SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
- const TDesC8& aPayloadData,
- const TArray<TRtpCSRC> *aCsrcList)
+ const TDesC8& aPayloadData )
{
CRtpSession* rtpSession = GetSession( aTranStreamId );
@@ -828,13 +786,13 @@
return static_cast<CRtpSessionSrtp*>
(rtpSession)->SendRtpPacket( aTranStreamId, aHeaderInfo,
- aPayloadData, aCsrcList );
+ aPayloadData );
}
else
{
return rtpSession->SendRtpPacket( aTranStreamId, aHeaderInfo,
- aPayloadData, aCsrcList );
+ aPayloadData );
}
}
else
@@ -857,8 +815,7 @@
TInt CRtpManager::SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList)
+ TRequestStatus& aStatus )
{
CRtpSession* rtpSession = GetSession( aTranStreamId );
@@ -871,13 +828,13 @@
return static_cast<CRtpSessionSrtp*>
(rtpSession)->SendRtpPacket( aTranStreamId, aHeaderInfo,
- aPayloadData, aStatus, aCsrcList );
+ aPayloadData, aStatus );
}
else
{
return rtpSession->SendRtpPacket( aTranStreamId, aHeaderInfo,
- aPayloadData, aStatus, aCsrcList );
+ aPayloadData, aStatus );
}
}
@@ -903,8 +860,7 @@
TRtpSequence aSequenceNum,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList )
+ TRequestStatus& aStatus )
{
CRtpSession* rtpSession = GetSession( aTranStreamId );
TInt result( KErrNone );
@@ -918,14 +874,14 @@
result = static_cast<CRtpSessionSrtp*>
(rtpSession)->SendRtpPacket( aTranStreamId, aSequenceNum,
aHeaderInfo, aPayloadData,
- aStatus, aCsrcList );
+ aStatus );
}
else
{
result = rtpSession->SendRtpPacket( aTranStreamId, aSequenceNum,
aHeaderInfo, aPayloadData,
- aStatus, aCsrcList );
+ aStatus );
}
}
--- a/rtp/rtpstack/src/rtppacket.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtppacket.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -123,8 +123,8 @@
* *
* 2 bit = version *
* 1 bit = padding *
- * 1 bit = extension *
- * 4 bit = CRSRC Count *
+ * 1 bit = CRSRC Count *
+ * 4 bit = extension *
****************************/
//version (2 bit)
@@ -143,17 +143,13 @@
dataP[0] |= ( 1 << 4 );
}
- // CC 4 bit)
- if( aInitParam->TRTP.numCSRC)
- {
- dataP[0] |= aInitParam->TRTP.numCSRC;
- }
+ // CC = 0 (1 bit)
/****************************
* dataP[1] = 8 bit *
* *
* 1 bit = marker *
- * 7 bits = payload type *
+ * 1 bit = payload type *
****************************/
// marker (1 bit)
@@ -186,15 +182,6 @@
//set the pointer to point to the first bit after SSRC
dataP += 4;
-
-
- //Set CSRC if Present
- for(TInt count = 0; count<aInitParam->TRTP.numCSRC; count++)
- {
- Write32( dataP, (*aInitParam->TRTP.iCsrcList)[count]);
- dataP += 4;
- }
-
if ( aInitParam->TRTP.fHeaderExtension )
{
@@ -688,7 +675,7 @@
// Originally Allocate memory for all CSRC:s
//it will have memeory resouce problem so only allocate when
// CSRC<2
- if ( aExtractParam->TRTP.numCSRC <= KCSRCListMax )
+ if ( aExtractParam->TRTP.numCSRC < KCSRCListMax )
{
if ( !aExtractParam->TRTP.CSRCarray )
{
--- a/rtp/rtpstack/src/rtppacketparam.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtppacketparam.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -115,7 +115,6 @@
CSRCarray( NULL ),
payloadData( NULL ),
payloadDataLen( 0 ),
- iCsrcList(0),
extension()
{
}
--- a/rtp/rtpstack/src/rtprecvstream.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtprecvstream.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -241,11 +241,6 @@
iHdr.iPadding = extractParam.TRTP.padding;
iHdr.iExtension = extractParam.TRTP.fHeaderExtension;
iHdr.iCsrcCount = extractParam.TRTP.numCSRC;
-
- if ( iHdr.iCsrcCount )
- {
- iHdr.iCsrcList = extractParam.TRTP.CSRCarray;
- }
iHdr.iMarker = extractParam.TRTP.marker;
iHdr.iTimestamp = streamParam.TRTP.timeStamp;
--- a/rtp/rtpstack/src/rtpsession.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtpsession.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -573,23 +573,6 @@
}
}
-
-// ---------------------------------------------------------------------------
-// TInt CRtpSession::ReadyToSendRtpPacket()
-//
-// ---------------------------------------------------------------------------
-//
-void CRtpSession::ReadyToSendRtpPacket(TRtpId aTranStreamId)
- {
- if ( iRtpPacketObserver )
- {
- RTP_DEBUG_DETAIL("Giving ReadyToSendRtpPacket() Call Back " );
- TPtr8 pktPtr(iPktSnd->Data(), iPktSnd->Size(), iPktSnd->Size());
- iRtpPacketObserver->ReadyToSendRtpPacket( aTranStreamId , pktPtr );
- }
- }
-
-
// ---------------------------------------------------------------------------
// TInt CRtpSession::SendRtpPacket()
//
@@ -597,8 +580,7 @@
//
TInt CRtpSession::SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
- const TDesC8& aPayloadData,
- const TArray<TRtpCSRC> *aCsrcList )
+ const TDesC8& aPayloadData )
{
if ( static_cast<TUint> (aPayloadData.Size()) > iCommNet->MaxSocketSize() )
{
@@ -613,16 +595,12 @@
{
CRtpTranStream* tempStream = ( CRtpTranStream* ) streamAddress;
tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, 0, EFalse,
- iPktSnd, aCsrcList );
-
- ReadyToSendRtpPacket(aTranStreamId);
-
+ iPktSnd );
ret = iCommNet->Send( ERTPPort, iPktSnd->Des() );
}
return ret;
}
-
// ---------------------------------------------------------------------------
// TInt CRtpSession::SendRtpPacket()
//
@@ -631,8 +609,7 @@
TInt CRtpSession::SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList )
+ TRequestStatus& aStatus )
{
if ( static_cast<TUint>( aPayloadData.Size() ) > iCommNet->MaxSocketSize() )
{
@@ -648,10 +625,7 @@
CRtpTranStream* tempStream =
reinterpret_cast<CRtpTranStream*>( streamAddress );
tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, 0, EFalse,
- iPktSnd, aCsrcList );
-
- ReadyToSendRtpPacket(aTranStreamId);
-
+ iPktSnd );
iCommNet->Send( ERTPPort, iPktSnd->Des(), aStatus );
}
return ret;
@@ -733,8 +707,7 @@
TRtpSequence aSequenceNum,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList )
+ TRequestStatus& aStatus )
{
if ( static_cast<TUint>( aPayloadData.Size() ) > iCommNet->MaxSocketSize() )
{
@@ -750,10 +723,7 @@
CRtpTranStream* tempStream =
reinterpret_cast<CRtpTranStream*>( streamAddress );
tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, aSequenceNum,
- ETrue, iPktSnd, aCsrcList );
-
- ReadyToSendRtpPacket(aTranStreamId);
-
+ ETrue, iPktSnd );
iCommNet->Send( ERTPPort, iPktSnd->Des(), aStatus );
}
return ret;
@@ -1176,29 +1146,6 @@
}
}
-
-// ---------------------------------------------------------------------------
-// TInt CRtpSession::RegisterRtpPostProcessingObserver()
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRtpSession::RegisterRtpPostProcessingObserver( MRtpPostProcessingObserver& aRTPPacketObserver )
- {
- iRtpPacketObserver = &aRTPPacketObserver;
-
- return KErrNone;
- }
-
-// ---------------------------------------------------------------------------
-// CRtpSession::UnregisterRtpPostProcessingObserver()
-//
-// ---------------------------------------------------------------------------
-//
-void CRtpSession::UnregisterRtpPostProcessingObserver()
- {
- iRtpPacketObserver = NULL;
- }
-
// ---------------------------------------------------------------------------
// TInt CRtpSession::RegisterRtcpObserver()
//
--- a/rtp/rtpstack/src/rtpsessionsrtp.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtpsessionsrtp.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -117,8 +117,7 @@
TInt CRtpSessionSrtp::SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
- const TDesC8& aPayloadData,
- const TArray<TRtpCSRC> *aCsrcList )
+ const TDesC8& aPayloadData )
{
if ( static_cast<TUint> (aPayloadData.Size()) > iCommNet->MaxSocketSize() )
{
@@ -133,7 +132,7 @@
{
CRtpTranStream* tempStream = ( CRtpTranStream* ) streamAddress;
tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, 0, EFalse,
- iPktSnd, aCsrcList );
+ iPktSnd );
if(iSndPacket)
{
@@ -160,8 +159,7 @@
TInt CRtpSessionSrtp::SendRtpPacket( TRtpId aTranStreamId,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList )
+ TRequestStatus& aStatus )
{
if ( static_cast<TUint> (aPayloadData.Size()) > iCommNet->MaxSocketSize() )
{
@@ -176,7 +174,7 @@
{
CRtpTranStream* tempStream = ( CRtpTranStream* ) streamAddress;
tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, 0, EFalse,
- iPktSnd, aCsrcList );
+ iPktSnd );
if(iSndPacket)
{
delete iSndPacket;
@@ -204,8 +202,7 @@
TRtpSequence aSequenceNum,
const TRtpSendHeader& aHeaderInfo,
const TDesC8& aPayloadData,
- TRequestStatus& aStatus,
- const TArray<TRtpCSRC> *aCsrcList )
+ TRequestStatus& aStatus )
{
if ( static_cast<TUint>( aPayloadData.Size() ) > iCommNet->MaxSocketSize() )
{
@@ -221,7 +218,7 @@
CRtpTranStream* tempStream =
reinterpret_cast<CRtpTranStream*>( streamAddress );
tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, aSequenceNum,
- ETrue, iPktSnd, aCsrcList );
+ ETrue, iPktSnd );
if(iSndPacket)
{
delete iSndPacket;
--- a/rtp/rtpstack/src/rtptranstream.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtptranstream.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -187,8 +187,7 @@
const TDesC8& aPayloadData,
TRtpSequence aSeqNum,
TBool aSetSeqNum,
- CRtpPacket* aPktSnd,
- const TArray<TRtpCSRC> *aCsrcList)
+ CRtpPacket* aPktSnd )
{
TRtpPacketStreamParam streamParam;
TRtpPacketIOParam inParam;
@@ -235,21 +234,6 @@
inParam.TRTP.payloadData = const_cast<TUint8*>( aPayloadData.Ptr() );
inParam.TRTP.payloadDataLen = aPayloadData.Length();
-
- if(aCsrcList && aCsrcList->Count())
- {
- // Maxm 15 CSRC identifiers will be supported
- if( aCsrcList->Count() <= KMaxCsrcIdentifiers )
- {
- inParam.TRTP.numCSRC = (TUint8)aCsrcList->Count();
- }
- else
- {
- inParam.TRTP.numCSRC = KMaxCsrcIdentifiers;
- }
-
- inParam.TRTP.iCsrcList = aCsrcList;
- }
streamParam.TRTP.payload = aHeaderInfo.iPayloadType;
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpAPI.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpAPI.h Wed Sep 01 12:27:36 2010 +0100
@@ -65,8 +65,7 @@
public MRtpObserver,
public MNonRTPDataObserver,
public MRtcpObserver,
- public MSRTPReKeyingObserver,
- public MRtpPostProcessingObserver
+ public MSRTPReKeyingObserver
{
public: // Constructors and destructors
@@ -104,8 +103,6 @@
void SRTPMasterKeyStaleEvent(const CSRTPSession& aSession);
void SRTPMasterKeyStaleEvent(const CSRTPStream& aStream);
- void ReadyToSendRtpPacket( TRtpId aTranStreamId, TPtr8 &aPacket );
-
private: // New methods
void SetupL();
@@ -122,7 +119,7 @@
void UT_CRtpAPI_StartConnectionL();
- void UT_CRtpAPI_StartConnection_OneL();
+ void UT_CRtpAPI_StartConnection_1L();
void UT_CRtpAPI_CancelStartL();
@@ -183,7 +180,7 @@
void UT_CRtpAPI_SendRtpPacket_2L();
- void UT_CRtpAPI_SendRtpPacket_ThreeL();
+ void UT_CRtpAPI_SendRtpPacket_3L();
void UT_CRtpAPI_SendDataLL();
@@ -243,12 +240,7 @@
void UT_CRtpAPI_VersionL();
-
- void UT_CRtpAPI_RegisterRtpPostProcessingObserverL();
-
- void UT_CRtpAPI_SendRtpPacketWithCSRCL();
-
- void UT_CRtpAPI_UnregisterRtpPostProcessingObserverL();
+
private: // Data
@@ -264,9 +256,8 @@
TBuf8<32> iMKI;
TBuf8<32> iRFC3711_TestMasterKey128bits;
TBuf8<32> iRFC3711_TestMasterSalt112bits;
- TBuf8<32> iSalt;
+ TBuf8<32> iSalt;
TBuf8<32> iKey;
- TBool iIsCallBackReceived;
};
#endif // __UT_CRTPAPI_H__
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpComm.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpComm.h Wed Sep 01 12:27:36 2010 +0100
@@ -124,7 +124,7 @@
void UT_CRtpComm_CommReceiveL( );
- void UT_CRtpComm_MaxSocketSizeL();
+ void UT_CRtpComm_MaxSocketSize();
private:
static TInt StopScheduler( TAny* aThis );
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpManager.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpManager.h Wed Sep 01 12:27:36 2010 +0100
@@ -98,9 +98,9 @@
void UT_CRtpManager_StartConnectionL();
- void UT_CRtpManager_StartConnection_OneL();
+ void UT_CRtpManager_StartConnection_1L();
- void UT_CRtpManager_StartConnection_TwoL();
+ void UT_CRtpManager_StartConnection_2L();
void UT_CRtpManager_CancelStartL();
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpSDES.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpSDES.h Wed Sep 01 12:27:36 2010 +0100
@@ -74,7 +74,7 @@
void UT_CRtpSDES_NewLL();
- void UT_CRtpSDES_NewL_OneL();
+ void UT_CRtpSDES_NewL_1L();
void UT_CRtpSDES_GetSDESL();
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpSession.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpSession.h Wed Sep 01 12:27:36 2010 +0100
@@ -158,10 +158,10 @@
void UT_CRtpSession_SendRtpPacketL();
- void UT_CRtpSession_SendRtpPacket_OneL();
+ void UT_CRtpSession_SendRtpPacket_1L();
- void UT_CRtpSession_SendRtpPacket_TwoL();
+ void UT_CRtpSession_SendRtpPacket_2L();
void UT_CRtpSession_SendRtpPacket_3L();
@@ -243,7 +243,7 @@
void UT_CRtpSession_OnExpiredL();
- void UT_CRtpSession_ScheduleRtcpSendL();
+ void UT_CRtpSession_ScheduleRtcpSend();
void UT_CRtpSession_OnRtpReceivedLL();
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpSessionSRTP.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpSessionSRTP.h Wed Sep 01 12:27:36 2010 +0100
@@ -158,19 +158,19 @@
void UT_CRtpSessionSrtp_SendRtpPacket1L( );
- void UT_CRtpSessionSrtp_SendRtpPacket_OneL();
- void UT_CRtpSessionSrtp_SendRtpPacket_OneAL( );
+ void UT_CRtpSessionSrtp_SendRtpPacket_1L();
+ void UT_CRtpSessionSrtp_SendRtpPacket_1AL( );
void UT_CRtpSessionSrtp_SendRtpPacket_2L();
- void UT_CRtpSessionSrtp_SendRtpPacket_TwoAL();
+ void UT_CRtpSessionSrtp_SendRtpPacket_2AL();
void UT_CRtpSessionSrtp_OnRtpReceivedL();
- void UT_CRtpSessionSrtp_OnRtpReceived_OneL( );
- void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendSRTCPReportL();
+ void UT_CRtpSessionSrtp_OnRtpReceived_1L( );
+ void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendSRTCPReport();
- void UT_CRtpSessionSrtp_OnRtcpReceivedL();
+ void UT_CRtpSessionSrtp_OnRtcpReceived();
--- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpStream.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpStream.h Wed Sep 01 12:27:36 2010 +0100
@@ -129,16 +129,16 @@
void UT_CRtpStream_RtpStreamCreateRtcpReportSectionL();
- void UT_CRtpStream_UpdateParamL();
+ void UT_CRtpStream_UpdateParam();
- void UT_CRtpStream_RtpByeAppMethodsL();
+ void UT_CRtpStream_RtpByeAppMethods();
- void UT_CRtpStream_TestRtpSRMethodsL();
+ void UT_CRtpStream_TestRtpSRMethods();
- void UT_CRtpStream_TestRtpRRMethodsL();
+ void UT_CRtpStream_TestRtpRRMethods();
void UT_CRtpStream_TestStreamStatAndSdesMethods();
- void UT_CRtpStream_RtpStreamProcessRtpPacketL();
+ void UT_CRtpStream_RtpStreamProcessRtpPacket();
void Hex(HBufC8& aString);
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpAPI.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpAPI.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -68,8 +68,6 @@
#endif
_LIT8(KHello, "hello...testing");
-_LIT8(KNoCName, "");
-
// CONSTRUCTION
UT_CRtpAPI* UT_CRtpAPI::NewL()
{
@@ -142,12 +140,10 @@
{
iRtpAPI->Close();
delete iRtpAPI;
- iRtpAPI = NULL;
iStpAPI->Close();
delete iStpAPI;
- iStpAPI = NULL;
- }
+ }
void UT_CRtpAPI::UT_CRtpAPI_NewLL( )
{
@@ -198,7 +194,7 @@
iRtpAPI->CancelStart();
}
-void UT_CRtpAPI::UT_CRtpAPI_StartConnection_OneL( )
+void UT_CRtpAPI::UT_CRtpAPI_StartConnection_1L( )
{
//Synchronize
TInt result(KErrNone);
@@ -984,7 +980,7 @@
EUNIT_ASSERT( KErrNone == status.Int() );
}
-void UT_CRtpAPI::UT_CRtpAPI_SendRtpPacket_ThreeL()
+void UT_CRtpAPI::UT_CRtpAPI_SendRtpPacket_3L()
{
TInt result(KErrNone);
TRtpSdesParams params;
@@ -1424,7 +1420,6 @@
{
iErr= aErrCode;
}
-
//from Obs
void UT_CRtpAPI::RtpPacketReceived( TRtpId /*aStreamId*/,
const TRtpRecvHeader& /*aHeaderInfo*/,
@@ -1474,279 +1469,6 @@
{
}
-
-void UT_CRtpAPI::ReadyToSendRtpPacket( TRtpId /*aTranStreamId*/, TPtr8 &/*aPacket*/ )
- {
- // RTP Packet Callback received
- iIsCallBackReceived = ETrue;
- }
-
-
-void UT_CRtpAPI::UT_CRtpAPI_RegisterRtpPostProcessingObserverL( )
- {
- TInt result(KErrNone);
- TRtpSdesParams params;
-
- result = iRtpAPI->OpenL( params, NULL, NULL, NULL );
- EUNIT_ASSERT(result==KErrNone);
-
- TRequestStatus status;
- result = iRtpAPI->StartConnection( status, KDefaultIap2 ); // KDefaultIap
- RTP_EUNIT_ASSERT_EQUALS ( result, KErrNone );
- // Wait until the connection is really up
- User::WaitForRequest( status );
-
- //create session
- TCreateSessionParams sessionParams;
- sessionParams.iPriority = TCreateSessionParams::EPriorityStandard;
- sessionParams.iSocketBufSize = KSocketBufSize;
- TUint port( 5000 );
- TBool enableRtcp( EFalse );
- TRtcpParams rtcpParams;
- rtcpParams.iRtcpFraction = 0.10;
- rtcpParams.iRtcpTimeOut = 0;
- rtcpParams.iSessionBWidth = 32000;
-
- TRtpId error( KNullId );
- error = iRtpAPI->CreateSessionL( sessionParams,
- port,
- enableRtcp,
- &rtcpParams );
- RTP_EUNIT_ASSERT_RTP_ID( error );
-
- TRcvStreamParams recvparams;
- recvparams.iPayloadType = 0;
-
- TRtpId error2( KNullId );
- TInt err( KErrNone );
- error2 = iRtpAPI->CreateReceiveStreamL( error /*session id*/, recvparams );
- RTP_EUNIT_ASSERT_RTP_ID ( error2 );
-
-
- err = iRtpAPI->RegisterRtpPostProcessingObserver( error, *this );
- EUNIT_ASSERT ( err == KErrNone )
- }
-
-
-void UT_CRtpAPI::UT_CRtpAPI_SendRtpPacketWithCSRCL()
- {
- TInt result(KErrNone);
- TRtpSdesParams params;
-
- result = iRtpAPI->OpenL( params, NULL, NULL, NULL );
- RTP_EUNIT_ASSERT_EQUALS(result, KErrNone);
-
- TRequestStatus status;
- result = iRtpAPI->StartConnection( status, KDefaultIap ); // KDefaultIap
- RTP_EUNIT_ASSERT_EQUALS ( result, KErrNone );
- // Wait until the connection is really up
- User::WaitForRequest( status );
-
- //create session
- TCreateSessionParams sessionParams;
- sessionParams.iPriority = TCreateSessionParams::EPriorityStandard;
- sessionParams.iSocketBufSize = KSocketBufSize;
- TUint port( 5000 );
- TBool enableRtcp( EFalse );
- TRtcpParams rtcpParams;
- rtcpParams.iRtcpFraction = 0.10;
- rtcpParams.iRtcpTimeOut = 0;
- rtcpParams.iSessionBWidth = 32000;
-
- TRtpId error( KNullId );
- error = iRtpAPI->CreateSessionL( sessionParams,
- port,
- enableRtcp,
- &rtcpParams );
- RTP_EUNIT_ASSERT_RTP_ID( error );
-
- TTranStreamParams transparams;
- transparams.iPayloadType = 0;
- TRtpSSRC ssrc( 0 );
-
- TInt err( KErrNone );
- err = iRtpAPI->RegisterRtpPostProcessingObserver( error, *this );
- EUNIT_ASSERT ( err == KErrNone )
-
-
- err = iRtpAPI->CreateTransmitStreamL( error /*session id*/, transparams, ssrc );
- RTP_EUNIT_ASSERT_RTP_ID ( err );
-
-
- TRtpSendHeader header;
- header.iHeaderExtension = NULL;
- header.iMarker = 0;
- header.iPadding = 0;
- header.iPayloadType = 0;
- header.iTimestamp = 10;
-
- HBufC8* data = HBufC8::NewLC(KLength);
- data->Des().Copy(KHello);
- CleanupStack::Pop(data);
-
- TRtpSendPktParams *headerinfo = new(ELeave) TRtpSendPktParams(header);
- headerinfo->iTranStreamId = err;
- headerinfo->iPayloadData.Set(data->Des());
-
- const TUint KArrayGranularity = 15;
-
- CArrayFixFlat<TUint32>* fix;
- fix = new(ELeave) CArrayFixFlat<TUint32>(KArrayGranularity);
-
- fix->AppendL(123456);
- fix->AppendL(999999);
-
- TInt error2( KErrNone );
- iIsCallBackReceived = EFalse;
- // Try sending synchronously with Csrc
- error2 = iRtpAPI->SendRtpPacket(*headerinfo, fix->Array());
- RTP_EUNIT_ASSERT_EQUALS ( error2, KErrNone );
-
- CRtpSession* rtpSession = iRtpAPI->iManager->GetSession( err );
- User::WaitForRequest( rtpSession->iCommNet->iSender[ERTPPort]->iStatus );
- rtpSession->iCommNet->iSender[ERTPPort]->RunL();
- rtpSession->iCommNet->iSender[ERTPPort]->iStatus = TRequestStatus();
- EUNIT_ASSERT(iIsCallBackReceived == ETrue);
-
- iIsCallBackReceived = EFalse;
- // Try sending asynchronously with CSRC
- headerinfo->iStatus = &status;
- error2 = iRtpAPI->SendRtpPacket(*headerinfo, fix->Array());
- RTP_EUNIT_ASSERT_EQUALS ( error2, KErrNone );
- EUNIT_ASSERT( KRequestPending == status.Int() );
- User::WaitForRequest( rtpSession->iCommNet->iSender[ERTPPort]->iStatus );
- rtpSession->iCommNet->iSender[ERTPPort]->RunL();
- rtpSession->iCommNet->iSender[ERTPPort]->iStatus = TRequestStatus();
- User::WaitForRequest( status );
- EUNIT_ASSERT( KErrNone == status.Int() );
- // Is call back received check
- EUNIT_ASSERT(iIsCallBackReceived == ETrue);
-
- iIsCallBackReceived = EFalse;
- // Try sending asynchronously, specifying the sequence number with CSRC
- TRtpSequence seqNum = 42;
- headerinfo->iSequenceNum = &seqNum;
- error2 = iRtpAPI->SendRtpPacket(*headerinfo, fix->Array());
- RTP_EUNIT_ASSERT_EQUALS ( error2, KErrNone );
- EUNIT_ASSERT( KRequestPending == status.Int() );
- User::WaitForRequest( rtpSession->iCommNet->iSender[ERTPPort]->iStatus );
- rtpSession->iCommNet->iSender[ERTPPort]->RunL();
- rtpSession->iCommNet->iSender[ERTPPort]->iStatus = TRequestStatus();
- User::WaitForRequest( status );
- EUNIT_ASSERT( KErrNone == status.Int() );
- EUNIT_ASSERT(iIsCallBackReceived == ETrue);
-
- delete fix;
- delete headerinfo;
- delete data;
- }
-
-
-void UT_CRtpAPI::UT_CRtpAPI_UnregisterRtpPostProcessingObserverL( )
- {
- TInt result(KErrNone);
- TRtpSdesParams params;
-
- result = iRtpAPI->OpenL( params, NULL, NULL, NULL );
- EUNIT_ASSERT(result==KErrNone);
-
- TRequestStatus status;
- result = iRtpAPI->StartConnection( status, KDefaultIap2 ); // KDefaultIap
- RTP_EUNIT_ASSERT_EQUALS ( result, KErrNone );
- // Wait until the connection is really up
- User::WaitForRequest( status );
-
- //create session
- TCreateSessionParams sessionParams;
- sessionParams.iPriority = TCreateSessionParams::EPriorityStandard;
- sessionParams.iSocketBufSize = KSocketBufSize;
- TUint port( 5000 );
- TBool enableRtcp( EFalse );
- TRtcpParams rtcpParams;
- rtcpParams.iRtcpFraction = 0.10;
- rtcpParams.iRtcpTimeOut = 0;
- rtcpParams.iSessionBWidth = 32000;
-
- TRtpId error( KNullId );
- error = iRtpAPI->CreateSessionL( sessionParams,
- port,
- enableRtcp,
- &rtcpParams );
- RTP_EUNIT_ASSERT_RTP_ID( error );
-
- TRcvStreamParams recvparams;
- recvparams.iPayloadType = 0;
-
- TRtpId error2( KNullId );
- TInt err( KErrNone );
- error2 = iRtpAPI->CreateReceiveStreamL( error /*session id*/, recvparams );
- RTP_EUNIT_ASSERT_RTP_ID ( error2 );
-
- TTranStreamParams transparams;
- transparams.iPayloadType = 0;
- TRtpSSRC ssrc( 0 );
-
- err = iRtpAPI->RegisterRtpPostProcessingObserver( error, *this );
- EUNIT_ASSERT ( err == KErrNone )
-
- err = iRtpAPI->CreateTransmitStreamL( error /*session id*/, transparams, ssrc );
- RTP_EUNIT_ASSERT_RTP_ID ( err );
-
-
- TRtpSendHeader header;
- header.iHeaderExtension = NULL;
- header.iMarker = 0;
- header.iPadding = 0;
- header.iPayloadType = 0;
- header.iTimestamp = 10;
-
- HBufC8* data = HBufC8::NewLC(KLength);
- data->Des().Copy(KHello);
- CleanupStack::Pop(data);
-
- TRtpSendPktParams *headerinfo = new(ELeave) TRtpSendPktParams(header);
- headerinfo->iTranStreamId = err;
- headerinfo->iPayloadData.Set(data->Des());
-
- const TUint KArrayGranularity = 15;
-
- CArrayFixFlat<TUint32>* fix;
- fix = new(ELeave) CArrayFixFlat<TUint32>(KArrayGranularity);
-
- fix->AppendL(123456);
- fix->AppendL(999999);
-
- TInt error3( KErrNone );
- iIsCallBackReceived = EFalse;
- // Try sending synchronously with Csrc
- error3 = iRtpAPI->SendRtpPacket(*headerinfo, fix->Array());
- RTP_EUNIT_ASSERT_EQUALS ( error3, KErrNone );
-
- CRtpSession* rtpSession = iRtpAPI->iManager->GetSession( err );
- User::WaitForRequest( rtpSession->iCommNet->iSender[ERTPPort]->iStatus );
- rtpSession->iCommNet->iSender[ERTPPort]->RunL();
- rtpSession->iCommNet->iSender[ERTPPort]->iStatus = TRequestStatus();
- EUNIT_ASSERT(iIsCallBackReceived == ETrue);
-
- // Unregister callback
- iRtpAPI->UnregisterRtpPostProcessingObserver(error);
-
- iIsCallBackReceived = EFalse;
- error3 = KErrNone;
- // Try sending synchronously with Csrc
- error3 = iRtpAPI->SendRtpPacket(*headerinfo, fix->Array());
- RTP_EUNIT_ASSERT_EQUALS ( error3, KErrNone );
-
- User::WaitForRequest( rtpSession->iCommNet->iSender[ERTPPort]->iStatus );
- rtpSession->iCommNet->iSender[ERTPPort]->RunL();
- rtpSession->iCommNet->iSender[ERTPPort]->iStatus = TRequestStatus();
- EUNIT_ASSERT(iIsCallBackReceived == EFalse);
-
- delete fix;
- delete headerinfo;
- delete data;
- }
-
// TEST TABLE
EUNIT_BEGIN_TEST_TABLE(
@@ -1780,7 +1502,7 @@
"CRtpAPI",
"StartConnection",
"FUNCTIONALITY",
- SetupL, UT_CRtpAPI_StartConnection_OneL, Teardown)
+ SetupL, UT_CRtpAPI_StartConnection_1L, Teardown)
EUNIT_TEST(
"CancelStart - test ",
@@ -1934,7 +1656,7 @@
"CRtpAPI",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpAPI_SendRtpPacket_ThreeL, Teardown)
+ SetupL, UT_CRtpAPI_SendRtpPacket_3L, Teardown)
EUNIT_TEST(
"SendDataL - test ",
@@ -2075,30 +1797,8 @@
"Version",
"FUNCTIONALITY",
SetupL, UT_CRtpAPI_VersionL, Teardown)
-
-EUNIT_TEST(
- "RegisterRtpPostProcessingObserver - test ",
- "CRtpAPI",
- "RegisterRtpPostProcessingObserver",
- "FUNCTIONALITY",
- SetupL, UT_CRtpAPI_RegisterRtpPostProcessingObserverL, Teardown)
-EUNIT_TEST(
- "SendRtpPacketWithCSRC - test ",
- "CRtpAPI",
- "SendRtpPacket",
- "FUNCTIONALITY",
- SetupL, UT_CRtpAPI_SendRtpPacketWithCSRCL, Teardown)
-
-EUNIT_TEST(
- "UnregisterRtpPostProcessingObserver - test ",
- "CRtpAPI",
- "UnregisterRtpPostProcessingObserver",
- "FUNCTIONALITY",
- SetupL, UT_CRtpAPI_UnregisterRtpPostProcessingObserverL, Teardown)
-
-
EUNIT_END_TEST_TABLE
// END OF FILE
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpComm.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpComm.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -604,7 +604,7 @@
delete iRtpComm; iRtpComm=NULL;
}
-void UT_CRtpComm::UT_CRtpComm_MaxSocketSizeL()
+void UT_CRtpComm::UT_CRtpComm_MaxSocketSize()
{
TCreateSessionParams params;
params.iSocketBufSize = 10000;
@@ -804,7 +804,7 @@
"CRtpComm",
"MaxSocketSize",
"FUNCTIONALITY",
- SetupL, UT_CRtpComm_MaxSocketSizeL, Teardown)
+ SetupL, UT_CRtpComm_MaxSocketSize, Teardown)
EUNIT_END_TEST_TABLE
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpManager.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpManager.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -174,7 +174,7 @@
iRtpManager->Close();
}
-void UT_CRtpManager::UT_CRtpManager_StartConnection_OneL( )
+void UT_CRtpManager::UT_CRtpManager_StartConnection_1L( )
{
TInt result(KErrNone);
TRtpSdesParams params;
@@ -186,7 +186,7 @@
iRtpManager->Close();
}
-void UT_CRtpManager::UT_CRtpManager_StartConnection_TwoL( )
+void UT_CRtpManager::UT_CRtpManager_StartConnection_2L( )
{
TInt result(KErrNone);
TRtpSdesParams params;
@@ -937,7 +937,7 @@
"CRtpManager",
"StartConnection 1",
"FUNCTIONALITY",
- SetupL, UT_CRtpManager_StartConnection_OneL, Teardown)
+ SetupL, UT_CRtpManager_StartConnection_1L, Teardown)
EUNIT_TEST(
@@ -945,7 +945,7 @@
"CRtpManager",
"StartConnection2",
"FUNCTIONALITY",
- SetupL, UT_CRtpManager_StartConnection_TwoL, Teardown)
+ SetupL, UT_CRtpManager_StartConnection_2L, Teardown)
EUNIT_TEST(
"CancelStart - test ",
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpPacket.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpPacket.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -172,12 +172,7 @@
delete iPktSnd;
delete iPktRtcpSnd;
delete iTooLongData;
-
- iPktSnd = NULL;
- iPktRtcpSnd = NULL;
- iTooLongData = NULL;
-
- }
+ }
void UT_CRtpPacket::UT_CRtpPacket_NewLL( )
{
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSDES.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSDES.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -121,7 +121,7 @@
}
-void UT_CRtpSDES::UT_CRtpSDES_NewL_OneL( )
+void UT_CRtpSDES::UT_CRtpSDES_NewL_1L( )
{
TInt result( KErrNone );
TBuf8<16> cName;
@@ -419,7 +419,7 @@
"CRtpSDES",
"NewL",
"FUNCTIONALITY",
- SetupL, UT_CRtpSDES_NewL_OneL, Teardown)
+ SetupL, UT_CRtpSDES_NewL_1L, Teardown)
EUNIT_TEST(
"GetSDES - test ",
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSession.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSession.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -1012,7 +1012,7 @@
iSession->iCommNet->iSender[ERTPPort]->iStatus = TRequestStatus();
}
-void UT_CRtpSession::UT_CRtpSession_SendRtpPacket_OneL( )
+void UT_CRtpSession::UT_CRtpSession_SendRtpPacket_1L( )
{
TCreateSessionParams sessionParams;
TRtcpParams rtcpParams;
@@ -1082,7 +1082,7 @@
}
-void UT_CRtpSession::UT_CRtpSession_SendRtpPacket_TwoL( )
+void UT_CRtpSession::UT_CRtpSession_SendRtpPacket_2L( )
{
TInt error( KErrNone );
@@ -2275,7 +2275,7 @@
// "CRtpSession::OnExpired() - passed" ) );
}
-void UT_CRtpSession::UT_CRtpSession_ScheduleRtcpSendL()
+void UT_CRtpSession::UT_CRtpSession_ScheduleRtcpSend()
{
//"") );
// "Test description: Test scheduling RTCP transmission" ) );
@@ -3287,7 +3287,7 @@
"CRtpSession",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSession_SendRtpPacket_OneL, Teardown)
+ SetupL, UT_CRtpSession_SendRtpPacket_1L, Teardown)
*/
EUNIT_TEST(
@@ -3295,7 +3295,7 @@
"CRtpSession",
"SendRtpPacket",
"FUNCTIONALITY",
- Setup2L, UT_CRtpSession_SendRtpPacket_TwoL, Teardown)
+ Setup2L, UT_CRtpSession_SendRtpPacket_2L, Teardown)
EUNIT_TEST(
"SendRtpPacket3 - test ",
@@ -3448,7 +3448,7 @@
"CRtpSession",
"ScheduleRtcpSend",
"FUNCTIONALITY",
- SetupL, UT_CRtpSession_ScheduleRtcpSendL, Teardown)
+ SetupL, UT_CRtpSession_ScheduleRtcpSend, Teardown)
EUNIT_TEST(
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSessionSRTP.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSessionSRTP.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -521,29 +521,14 @@
delete iTestMKI128Bits;
delete iTestAuthTag80Bits;
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
- iTestMKI128Bits = NULL;
- iTestAuthTag80Bits = NULL;
-
delete iStreamIn;
delete iStreamOut;
delete iSRTPSession;
-
- iStreamIn = NULL;
- iStreamOut = NULL;
- iSRTPSession = NULL;
-
+
delete iRFC3711_SessionEncrKey128bits;
delete iRFC3711_SessionSaltKey128bits;
delete iRFC3711_SessionAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
-
-
- iRFC3711_TestMasterKey128bits.Zero();
+ iRFC3711_TestMasterKey128bits.Zero();
iRFC3711_TestMasterSalt112bits.Zero();
iMKI.Zero();
@@ -662,7 +647,7 @@
RTP_EUNIT_ASSERT_EQUALS(status, KErrNone)
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_OneL( )
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_1L( )
{
//Test more branch
TInt error( KErrNone );
@@ -698,7 +683,7 @@
RTP_EUNIT_ASSERT_EQUALS(status, KErrNone)
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_OneAL( )
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_1AL( )
{
TInt error( KErrNone );
@@ -772,7 +757,7 @@
}
- void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_TwoAL( )
+ void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_2AL( )
{
TInt error( KErrNone );
@@ -886,7 +871,7 @@
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtpReceived_OneL( )
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtpReceived_1L( )
{
//cover more branch
@@ -937,7 +922,7 @@
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendSRTCPReportL()
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendSRTCPReport()
{
TInt error( KErrNone );
TRtpSSRC ssrcOut( 1234 );
@@ -1005,7 +990,7 @@
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtcpReceivedL()
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtcpReceived()
{
HBufC8* encSrtcpPacket =HBufC8::NewLC(KRTCPPacket().Length());
*encSrtcpPacket=KRTCPPacket;
@@ -1119,14 +1104,14 @@
"CRtpSessionSrtp",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendRtpPacket_OneL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendRtpPacket_1L, Teardown)
EUNIT_TEST(
"SendRtpPacket4 - test ",
"CRtpSessionSrtp",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendRtpPacket_OneAL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendRtpPacket_1AL, Teardown)
EUNIT_TEST(
"SendRtpPacket5 - test ",
@@ -1140,7 +1125,7 @@
"CRtpSessionSrtp",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendRtpPacket_TwoAL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendRtpPacket_2AL, Teardown)
EUNIT_TEST(
"OnRtpReceived1 - test ",
@@ -1154,20 +1139,20 @@
"CRtpSessionSrtp",
"OnRtpReceived",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_OnRtpReceived_OneL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_OnRtpReceived_1L, Teardown)
EUNIT_TEST(
"SendSRTCPReport ",
"CRtpSessionSrtp",
"SendSRTCPReport",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendSRTCPReportL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendSRTCPReport, Teardown)
EUNIT_TEST(
"OnRtcpReceived ",
"CRtpSessionSrtp",
"OnRtcpReceived",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_OnRtcpReceivedL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_OnRtcpReceived, Teardown)
EUNIT_END_TEST_TABLE
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpStpPacket.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpStpPacket.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -75,8 +75,10 @@
void UT_CRtpStpPacket::SetupL( )
{
iRtpStpPacket = new(ELeave) CRtpStpPacket();
+
+ CleanupStack::PushL(iRtpStpPacket);
iRtpStpPacket->ConstructL( KMaxRtpPacketSize, 1 );
-
+ CleanupStack::Pop();
}
void UT_CRtpStpPacket::Teardown( )
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpStream.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpStream.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -123,9 +123,6 @@
{
delete iRecvStream;
delete iTranStream;
-
- iRecvStream = NULL;
- iTranStream = NULL;
}
void UT_CRtpStream::UT_CRtpStream_ResetStreamStatL( )
@@ -888,7 +885,7 @@
CleanupStack::PopAndDestroy( packet );
}
-void UT_CRtpStream::UT_CRtpStream_UpdateParamL()
+void UT_CRtpStream::UT_CRtpStream_UpdateParam()
{
// "Test description: Test update of statistics" ) );
@@ -967,7 +964,7 @@
EUNIT_ASSERT(ETrue);
}
-void UT_CRtpStream::UT_CRtpStream_RtpByeAppMethodsL()
+void UT_CRtpStream::UT_CRtpStream_RtpByeAppMethods()
{
//"") );
// "Test description: Test creating a BYE packet" ) );
@@ -1026,7 +1023,7 @@
EUNIT_ASSERT(ETrue);
}
-void UT_CRtpStream::UT_CRtpStream_TestRtpSRMethodsL()
+void UT_CRtpStream::UT_CRtpStream_TestRtpSRMethods()
{
//"") );
// "Test description: Test creating and parsing an SR packet" ) );
@@ -1109,7 +1106,7 @@
EUNIT_ASSERT(ETrue);
}
-void UT_CRtpStream::UT_CRtpStream_TestRtpRRMethodsL()
+void UT_CRtpStream::UT_CRtpStream_TestRtpRRMethods()
{
//"") );
// "Test description: Test creating and parsing an RR packet" ) );
@@ -1317,7 +1314,7 @@
EUNIT_ASSERT(ETrue);
}
-void UT_CRtpStream::UT_CRtpStream_RtpStreamProcessRtpPacketL()
+void UT_CRtpStream::UT_CRtpStream_RtpStreamProcessRtpPacket()
{
TInt result(KErrNone);
TInt error(KErrNone);
@@ -1545,27 +1542,27 @@
"CRtpStream",
"UT_CRtpStream_UpdateParam",
"FUNCTIONALITY",
- SetupL, UT_CRtpStream_UpdateParamL, Teardown)
+ SetupL, UT_CRtpStream_UpdateParam, Teardown)
EUNIT_TEST(
"RtpByeAppMethods",
"CRtpStream",
"RtpByeAppMethods",
"FUNCTIONALITY",
- SetupL, UT_CRtpStream_RtpByeAppMethodsL, Teardown)
+ SetupL, UT_CRtpStream_RtpByeAppMethods, Teardown)
EUNIT_TEST(
"TestRtpSRMethods",
"CRtpStream",
"TestRtpSRMethods",
"FUNCTIONALITY",
- SetupL, UT_CRtpStream_TestRtpSRMethodsL, Teardown)
+ SetupL, UT_CRtpStream_TestRtpSRMethods, Teardown)
EUNIT_TEST(
"TestRtpRRMethods",
"CRtpStream",
"TestRtpRRMethods",
"FUNCTIONALITY",
- SetupL, UT_CRtpStream_TestRtpRRMethodsL, Teardown)
+ SetupL, UT_CRtpStream_TestRtpRRMethods, Teardown)
EUNIT_TEST(
"TestRtpRRMethods",
@@ -1578,7 +1575,7 @@
"CRtpStream",
"RtpStreamProcessRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpStream_RtpStreamProcessRtpPacketL, Teardown)
+ SetupL, UT_CRtpStream_RtpStreamProcessRtpPacket, Teardown)
--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpTranStream.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpTranStream.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -139,7 +139,6 @@
void UT_CRtpTranStream::Teardown( )
{
delete iTranStream;
- iTranStream = NULL;
}
void UT_CRtpTranStream::UT_CRtpTranStream_NewLL( )
--- a/rtp/rtpstack/tsrc/ut_rtpstack/stubs/inc/es_sock.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/stubs/inc/es_sock.h Wed Sep 01 12:27:36 2010 +0100
@@ -1216,7 +1216,7 @@
TUint32 iReserved[4];
};
-class CSubConParameterSet : public CBase, public SMetaDataECom
+class CSubConParameterSet : public SMetaDataECom
/** Base class for all RSubConnection parameter sets.
@publishedAll
@@ -1408,7 +1408,7 @@
IMPORT_C TUint32 Id() const;
};
-class CSubConNotificationEvent : public CBase, public SMetaDataECom
+class CSubConNotificationEvent : public SMetaDataECom
{
public:
IMPORT_C static CSubConNotificationEvent* NewL(const STypeId& aTypeId);
--- a/rtp/srtpstack/inc/srtputils.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/inc/srtputils.h Wed Sep 01 12:27:36 2010 +0100
@@ -29,7 +29,6 @@
#include <e32std.h>
#include <f32file.h>
-#include <e32hal.h>
#ifdef SRTP_UNIT_TEST_COVERAGE
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPCryptoContext.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPCryptoContext.h Wed Sep 01 12:27:36 2010 +0100
@@ -111,7 +111,7 @@
void TestSetRCCm3SyncL();
- void TestIsValidL();
+ void TestIsValid();
private: // Data
//TBuf8<32> iSalt;
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPCryptoHandlerSRTCP.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPCryptoHandlerSRTCP.h Wed Sep 01 12:27:36 2010 +0100
@@ -81,7 +81,7 @@
void UT_CSRTPCryptoHandlerSRTCP_NewLCL();
- void UT_DeriveSessionKeysL_OneL();
+ void UT_DeriveSessionKeysL_1L();
void UT_PerformAuthenticationLL();
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPCryptoHandlerSRTP.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPCryptoHandlerSRTP.h Wed Sep 01 12:27:36 2010 +0100
@@ -109,7 +109,7 @@
HBufC8* BuildPacketL(TBool aSrtp, TPayloadDetails& details);
- void UT_DeriveSessionKeysL_OneL();
+ void UT_DeriveSessionKeysL_1L();
void UT_UpdateROCL();
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPKeyDerivation_AESCM128.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPKeyDerivation_AESCM128.h Wed Sep 01 12:27:36 2010 +0100
@@ -75,7 +75,7 @@
void UT_RFC3711_Session_Auth_Key_TestL();
- void UT_ErronousInput_OneL();
+ void UT_ErronousInput_1L();
void UT_ErronousInput_2L();
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPSession.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPSession.h Wed Sep 01 12:27:36 2010 +0100
@@ -79,10 +79,10 @@
void Teardown();
- void UT_CSRTPSession_NewL_OneL();
+ void UT_CSRTPSession_NewL_1L();
- void UT_CSRTPSession_NewL_TwoL();
+ void UT_CSRTPSession_NewL_2L();
void UT_CSRTPSession_RemoveStreamL();
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPStream.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPStream.h Wed Sep 01 12:27:36 2010 +0100
@@ -101,8 +101,8 @@
void UT_CSRTPStream_GetCryptoContextL();
void UT_CSRTPStream_SetSSRCL( );
void Hex(HBufC8& aString);
- void UT_CSRTPStream_ReKeyNeeded_OneL( );
- void UT_CSRTPStream_ReKeyNeeded_TwoL( );
+ void UT_CSRTPStream_ReKeyNeeded_1L( );
+ void UT_CSRTPStream_ReKeyNeeded_2L( );
void UT_CSRTPStream_TestNewL( );
void UT_CSRTPStream_IsContextSetL();
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPStreamIn.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPStreamIn.h Wed Sep 01 12:27:36 2010 +0100
@@ -100,10 +100,10 @@
void Teardown();
- void UT_CSRTPStreamIn_NewL_OneL();
- void UT_CSRTPStreamIn_NewL_TwoL();
- void UT_CSRTPStreamIn_NewL_ThreeL();
- void UT_CSRTPStreamIn_NewL_FourL();
+ void UT_CSRTPStreamIn_NewL_1L();
+ void UT_CSRTPStreamIn_NewL_2L();
+ void UT_CSRTPStreamIn_NewL_3L();
+ void UT_CSRTPStreamIn_NewL_4L();
void UT_CSRTPStreamIn_UnprotectSrtpLL();
@@ -115,7 +115,7 @@
void UT_CSRTPStreamIn_StateTestsL();
void UT_CSRTPStreamIn_StateTests2L();
HBufC8* BuildPacketL(TBool aSrtp, TPayloadDetails& details);
- void UT_CSRTPStreamIn_NewL_FiveL( );
+ void UT_CSRTPStreamIn_NewL_5L( );
void UT_CSRTPStreamIn_SetCryptoInL( );
void Hex(HBufC8& aString);
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPStreamOut.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSRTPStreamOut.h Wed Sep 01 12:27:36 2010 +0100
@@ -96,12 +96,12 @@
void Teardown();
- void UT_CSRTPStreamOut_NewL_OneL();
+ void UT_CSRTPStreamOut_NewL_1L();
- void UT_CSRTPStreamOut_NewL_TwoL();
+ void UT_CSRTPStreamOut_NewL_2L();
- void UT_CSRTPStreamOut_NewL_ThreeL( );
+ void UT_CSRTPStreamOut_NewL_3L( );
void UT_CSRTPStreamOut_SetCryptoOutLL( );
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSrtpAuthentication_RCC.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_CSrtpAuthentication_RCC.h Wed Sep 01 12:27:36 2010 +0100
@@ -79,21 +79,21 @@
void UT_CSrtpAuthentication_RCC_AuthenticateLL();
void Hex(HBufC8& aString);
- void UT_AuthenticateL_RFC2202_Test1_EightyL();
- void UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test2_EightyL();
- void UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test3_EightyL();
- void UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test4_EightyL();
- void UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test5_EightyL();
- void UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test6_EightyL();
- void UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test7_EightyL();
- void UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL();
- void UT_AuthenticateL_Test8_ThirtyTwoL( );
+ void UT_AuthenticateL_RFC2202_Test1_80L();
+ void UT_AuthenticateL_RFC2202_Test1_32L();
+ void UT_AuthenticateL_RFC2202_Test2_80L();
+ void UT_AuthenticateL_RFC2202_Test2_32L();
+ void UT_AuthenticateL_RFC2202_Test3_80L();
+ void UT_AuthenticateL_RFC2202_Test3_32L();
+ void UT_AuthenticateL_RFC2202_Test4_80L();
+ void UT_AuthenticateL_RFC2202_Test4_32L();
+ void UT_AuthenticateL_RFC2202_Test5_80L();
+ void UT_AuthenticateL_RFC2202_Test5_32L();
+ void UT_AuthenticateL_RFC2202_Test6_80L();
+ void UT_AuthenticateL_RFC2202_Test6_32L();
+ void UT_AuthenticateL_RFC2202_Test7_80L();
+ void UT_AuthenticateL_RFC2202_Test7_32L();
+ void UT_AuthenticateL_Test8_32L( );
void UT_AuthenticateL_Test_KeyChangedL();
private: // Data
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_SRTPAuthentication_HMAC_SHA1.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_SRTPAuthentication_HMAC_SHA1.h Wed Sep 01 12:27:36 2010 +0100
@@ -67,21 +67,21 @@
void Teardown();
- void UT_AuthenticateL_RFC2202_Test1_EightyL();
- void UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test2_EightyL();
- void UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test3_EightyL();
- void UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test4_EightyL();
- void UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test5_EightyL();
- void UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test6_EightyL();
- void UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL();
- void UT_AuthenticateL_RFC2202_Test7_EightyL();
- void UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL();
- void UT_AuthenticateL_Test8_ThirtyTwoL( );
+ void UT_AuthenticateL_RFC2202_Test1_80L();
+ void UT_AuthenticateL_RFC2202_Test1_32L();
+ void UT_AuthenticateL_RFC2202_Test2_80L();
+ void UT_AuthenticateL_RFC2202_Test2_32L();
+ void UT_AuthenticateL_RFC2202_Test3_80L();
+ void UT_AuthenticateL_RFC2202_Test3_32L();
+ void UT_AuthenticateL_RFC2202_Test4_80L();
+ void UT_AuthenticateL_RFC2202_Test4_32L();
+ void UT_AuthenticateL_RFC2202_Test5_80L();
+ void UT_AuthenticateL_RFC2202_Test5_32L();
+ void UT_AuthenticateL_RFC2202_Test6_80L();
+ void UT_AuthenticateL_RFC2202_Test6_32L();
+ void UT_AuthenticateL_RFC2202_Test7_80L();
+ void UT_AuthenticateL_RFC2202_Test7_32L();
+ void UT_AuthenticateL_Test8_32L( );
void UT_AuthenticateL_Test_KeyChangedL();
void Hex(HBufC8& aString);
--- a/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_SRTPAuthentication_NULL.h Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/inc/UT_SRTPAuthentication_NULL.h Wed Sep 01 12:27:36 2010 +0100
@@ -67,7 +67,7 @@
void Teardown();
- void UT_AuthenticateL_RFC2202_Test1_EightyL();
+ void UT_AuthenticateL_RFC2202_Test1_80L();
void Hex(HBufC8& aString);
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoContext.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoContext.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -228,12 +228,6 @@
delete iSRTPSession;
delete iContext2;
-
- iStreamIn = NULL;
- iStreamOut = NULL;
- iSRTPSession = NULL;
-
- iContext2 = NULL;
}
@@ -256,22 +250,22 @@
TSrtpCryptoParams params;
//test constructL
- iMasterKey3 = CSRTPMasterKey::NewL( *masterKey3, *mki3,
+ iMasterKey3 = CSRTPMasterKey::NewLC( *masterKey3, *mki3,
KSRTPDefSessionEncryptionKeyLength,
KSRTPDefSessionAuthenticationKeyLength );
iMasterSalt3 = CSRTPMasterSalt::NewL( *masterSalt3, 1100 );
-
+ CleanupStack::Pop( iMasterKey3 );
CleanupStack::PopAndDestroy( mki3 );
CleanupStack::PopAndDestroy( masterSalt3 );
CleanupStack::PopAndDestroy( masterKey3 );
-
-
+ CleanupStack::PushL( iMasterKey3 );
+ CleanupStack::PushL( iMasterSalt3 );
params.iSrtcpAuthTagLen=80;
RTP_EUNIT_ASSERT_SPECIFIC_LEAVE( iContext3= CSRTPCryptoContext::NewL(iMasterKey3,iMasterSalt3, params ),
KErrArgument );
-
-
+ CleanupStack::Pop( iMasterSalt3 );
+ CleanupStack::Pop( iMasterKey3 );
delete iContext3;
}
@@ -294,20 +288,25 @@
TSrtpCryptoParams params;
- iMasterKey3 = CSRTPMasterKey::NewL( *masterKey3, *mki3,
+ iMasterKey3 = CSRTPMasterKey::NewLC( *masterKey3, *mki3,
KSRTPDefSessionEncryptionKeyLength,
KSRTPDefSessionAuthenticationKeyLength );
iMasterSalt3 = CSRTPMasterSalt::NewL( *masterSalt3, 1100 );
-
+ CleanupStack::Pop( iMasterKey3 );
CleanupStack::PopAndDestroy( mki3 );
CleanupStack::PopAndDestroy( masterSalt3 );
CleanupStack::PopAndDestroy( masterKey3 );
params.iSrtcpAuthTagLen=80;
- RTP_EUNIT_ASSERT_SPECIFIC_LEAVE( iContext3= CSRTPCryptoContext::NewL(iMasterKey3,iMasterSalt3, params ),
+
+ CleanupStack::PushL( iMasterKey3 );
+ CleanupStack::PushL( iMasterSalt3 );
+ RTP_EUNIT_ASSERT_SPECIFIC_LEAVE( iContext3= CSRTPCryptoContext::NewL(iMasterKey3,iMasterSalt3, params ),
KErrArgument );
- delete iContext3;
+ CleanupStack::Pop( iMasterSalt3 );
+ CleanupStack::Pop( iMasterKey3 );
+ delete iContext3;
}
@@ -325,18 +324,18 @@
*mki = K128bitMKITest1;
Hex(*mki);
- iMasterKey4 = CSRTPMasterKey::NewL( *masterKey, *mki,
+ iMasterKey4 = CSRTPMasterKey::NewLC( *masterKey, *mki,
KSRTPDefSessionEncryptionKeyLength,
KSRTPDefSessionAuthenticationKeyLength );
iMasterSalt4 = CSRTPMasterSalt::NewL( *masterSalt,KSRTPDefSessionSaltingKeyLength );
-
+ CleanupStack::Pop( iMasterKey4 );
CleanupStack::PopAndDestroy( mki );
CleanupStack::PopAndDestroy( masterSalt );
CleanupStack::PopAndDestroy( masterKey );
-
-
+ CleanupStack::PushL( iMasterKey4 );
+ CleanupStack::PushL( iMasterSalt4 );
//invalid authalg
TSrtpCryptoParams params;
@@ -344,8 +343,8 @@
RTP_EUNIT_ASSERT_SPECIFIC_LEAVE(iContext4=CSRTPCryptoContext::NewL(iMasterKey4,iMasterSalt4, params),
KErrArgument );
-
-
+ CleanupStack::Pop( iMasterSalt4 );
+ CleanupStack::Pop( iMasterKey4 );
}
void UT_CSRTPCryptoContext::UT_CSRTPCryptoContext_Test4L( )
@@ -362,17 +361,17 @@
*mki = K128bitMKITest1;
Hex(*mki);
- iMasterKey5 = CSRTPMasterKey::NewL( *masterKey, *mki,
+ iMasterKey5 = CSRTPMasterKey::NewLC( *masterKey, *mki,
KSRTPDefSessionEncryptionKeyLength,
KSRTPDefSessionAuthenticationKeyLength);
iMasterSalt5 = CSRTPMasterSalt::NewL( *masterSalt,KSRTPDefSessionSaltingKeyLength );
-
+ CleanupStack::Pop( iMasterKey5 );
CleanupStack::PopAndDestroy( mki );
CleanupStack::PopAndDestroy( masterSalt );
CleanupStack::PopAndDestroy( masterKey );
-
-
+ CleanupStack::PushL( iMasterKey5 );
+ CleanupStack::PushL( iMasterSalt5 );
TSrtpCryptoParams params;
//invalid auth tag length in context5
@@ -380,7 +379,8 @@
RTP_EUNIT_ASSERT_SPECIFIC_LEAVE( iContext5=CSRTPCryptoContext::NewL(iMasterKey5,iMasterSalt5,params ),
KErrArgument );
-
+ CleanupStack::Pop( iMasterSalt5 );
+ CleanupStack::Pop( iMasterKey5 );
}
void UT_CSRTPCryptoContext::UT_CSRTPCryptoContext_Test5L( )
@@ -396,24 +396,26 @@
CleanupStack::PushL( mki);
*mki = K128bitMKITest1;
Hex(*mki);
- iMasterKey6 = CSRTPMasterKey::NewL( *masterKey, *mki,
+ iMasterKey6 = CSRTPMasterKey::NewLC( *masterKey, *mki,
KSRTPDefSessionEncryptionKeyLength,
KSRTPDefSessionAuthenticationKeyLength );
iMasterSalt6 = CSRTPMasterSalt::NewL( *masterSalt,KSRTPDefSessionSaltingKeyLength );
-
+ CleanupStack::Pop( iMasterKey6 );
TSrtpCryptoParams params;
CleanupStack::PopAndDestroy( mki );
CleanupStack::PopAndDestroy( masterSalt );
CleanupStack::PopAndDestroy( masterKey );
-
+ CleanupStack::PushL( iMasterKey6 );
+ CleanupStack::PushL( iMasterSalt6 );
//invalid prefix length in context6
params.iPrefixLen=10;
RTP_EUNIT_ASSERT_SPECIFIC_LEAVE( iContext6=CSRTPCryptoContext::NewL(iMasterKey6,iMasterSalt6, params ) ,
KErrArgument );
-
+ CleanupStack::Pop( iMasterSalt6 );
+ CleanupStack::Pop( iMasterKey6 );
}
void UT_CSRTPCryptoContext::UT_MasterKey_Test1L( )
@@ -534,26 +536,26 @@
TSrtpCryptoParams params;
//test constructL
- iMasterKey3 = CSRTPMasterKey::NewL( *masterKey3, *mki3 );
+ iMasterKey3 = CSRTPMasterKey::NewLC( *masterKey3, *mki3 );
iMasterSalt3 = CSRTPMasterSalt::NewL( *masterSalt3);
-
+ CleanupStack::Pop( iMasterKey3 );
CleanupStack::PopAndDestroy( mki3 );
CleanupStack::PopAndDestroy( masterSalt3 );
CleanupStack::PopAndDestroy( masterKey3 );
-
+ CleanupStack::PushL( iMasterKey3 );
+ CleanupStack::PushL( iMasterSalt3 );
iContext3= CSRTPCryptoContext::NewL(iMasterKey3,iMasterSalt3, params );
-
-
+ CleanupStack::Pop( iMasterSalt3 );
+ CleanupStack::Pop( iMasterKey3 );
params.iSrtpAuthTagLen=112;
iContext3->UpdateCryptoParams(params );
EUNIT_ASSERT(iContext->IsEqual(*iContext3)==EFalse);
- delete iContext3;
- iContext3 = NULL;
+ delete iContext3;
//test only param is different
HBufC8* masterKey1 = HBufC8::NewL(K128bitMasterKey1().Length());
CleanupStack::PushL( masterKey1 );
@@ -569,22 +571,22 @@
*mki = K128bitMKITest1;
Hex(*mki);
- iMasterKey = CSRTPMasterKey::NewL( *masterKey1, *mki,
+ iMasterKey = CSRTPMasterKey::NewLC( *masterKey1, *mki,
KSRTPDefSessionEncryptionKeyLength,
KSRTPDefSessionAuthenticationKeyLength );
iMasterSalt = CSRTPMasterSalt::NewL( *masterSalt1,KSRTPDefSessionSaltingKeyLength );
-
+ CleanupStack::Pop( iMasterKey );
CleanupStack::PopAndDestroy( mki );
CleanupStack::PopAndDestroy( masterSalt1 );
CleanupStack::PopAndDestroy( masterKey1 );
TSrtpCryptoParams params2;
params2.iSrtpAuthTagLen=32;
-
-
+ CleanupStack::PushL( iMasterKey );
+ CleanupStack::PushL( iMasterSalt );
CSRTPCryptoContext* context = CSRTPCryptoContext::NewL(iMasterKey, iMasterSalt,params2 );
EUNIT_ASSERT(!iContext->IsEqual(*context));
-
-
+ CleanupStack::Pop( iMasterSalt );
+ CleanupStack::Pop( iMasterKey );
params2.iSrtpAuthTagLen=80;
params2.iMasterKeysLifeTime = 0;
context->UpdateCryptoParams(params2 );
@@ -600,7 +602,7 @@
EUNIT_ASSERT(iContext->CryptoParams().iIsRCCm3Sync);
}
-void UT_CSRTPCryptoContext::TestIsValidL()
+void UT_CSRTPCryptoContext::TestIsValid()
{
TSrtpCryptoParams params;
//TEst cases 1 about Encryption method
@@ -663,20 +665,23 @@
*mki3 = K128bitMKITest3;
Hex(*mki3);
- iMasterKey3 = CSRTPMasterKey::NewL( *masterKey3, *mki3,
+ iMasterKey3 = CSRTPMasterKey::NewLC( *masterKey3, *mki3,
KSRTPDefSessionAuthenticationKeyLength,
KSRTPDefSessionEncryptionKeyLength
);
iMasterSalt3 = CSRTPMasterSalt::NewL( *masterSalt3, 1100 );
-
+ CleanupStack::Pop( iMasterKey3 );
CleanupStack::PopAndDestroy( mki3 );
CleanupStack::PopAndDestroy( masterSalt3 );
CleanupStack::PopAndDestroy( masterKey3 );
-
+ CleanupStack::PushL( iMasterKey3 );
+ CleanupStack::PushL( iMasterSalt3 );
RTP_EUNIT_ASSERT_SPECIFIC_LEAVE( iContext3= CSRTPCryptoContext::NewL(iMasterKey3,iMasterSalt3, params ),
KErrArgument );
+ CleanupStack::Pop( iMasterSalt3 );
+ CleanupStack::Pop( iMasterKey3 );
}
void UT_CSRTPCryptoContext::SRTPMasterKeyStaleEvent(const CSRTPStream& /*aStream*/)
@@ -823,7 +828,7 @@
"CSRTPCryptoContext",
"TestIsValid",
"FUNCTIONALITY",
- SetupL, TestIsValidL, Teardown)
+ SetupL, TestIsValid, Teardown)
EUNIT_END_TEST_TABLE
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandler.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandler.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -193,12 +193,6 @@
delete iStreamOut;
delete iSRTPSession;
-
- iTestAuthTag80Bits = NULL;
- iStreamIn = NULL;
-
- iStreamOut = NULL;
- iSRTPSession = NULL;
iResult.Zero();
iRFCTestSalt112bits.Zero();
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandlerSRTCP.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandlerSRTCP.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -228,26 +228,14 @@
delete iTestPayload160Bits;
delete iTestMKI128Bits;
delete iTestAuthTag80Bits;
-
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
- iTestMKI128Bits = NULL;
- iTestAuthTag80Bits = NULL;
delete iStreamIn;
- delete iSRTPSession;
-
- iStreamIn = NULL;
- iSRTPSession = NULL;
+ delete iSRTPSession;
delete iRFC3711_SessionEncrKey128bits;
delete iRFC3711_SessionSaltKey128bits;
- delete iRFC3711_SessionAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
+ delete iRFC3711_SessionAuthKey128bits;
}
@@ -263,7 +251,7 @@
-void UT_CSRTPCryptoHandlerSRTCP::UT_DeriveSessionKeysL_OneL()
+void UT_CSRTPCryptoHandlerSRTCP::UT_DeriveSessionKeysL_1L()
{
HBufC8* encSrtcpPacket =HBufC8::NewLC(KSRTCPPacket().Length());
*encSrtcpPacket=KSRTCPPacket;
@@ -656,7 +644,7 @@
"CSRTPCryptoHandlerSRTCP",
"DeriveSessionKeys",
"FUNCTIONALITY",
- SetupL, UT_DeriveSessionKeysL_OneL, Teardown)
+ SetupL, UT_DeriveSessionKeysL_1L, Teardown)
EUNIT_TEST(
"Authentication1",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandlerSRTP.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandlerSRTP.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -221,26 +221,14 @@
delete iTestPayload160Bits;
delete iTestMKI128Bits;
delete iTestAuthTag80Bits;
-
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
- iTestMKI128Bits = NULL;
- iTestAuthTag80Bits = NULL;
delete iStreamIn;
delete iSRTPSession;
-
- iStreamIn = NULL;
- iSRTPSession = NULL;
delete iRFC3711_SessionEncrKey128bits;
delete iRFC3711_SessionSaltKey128bits;
delete iRFC3711_SessionAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
}
@@ -440,7 +428,7 @@
-void UT_CSRTPCryptoHandlerSRTP::UT_DeriveSessionKeysL_OneL( )
+void UT_CSRTPCryptoHandlerSRTP::UT_DeriveSessionKeysL_1L( )
{
//Create the packet firest
TInt authTagLenInBytes = iContext->CryptoParams().iSrtpAuthTagLen/8;
@@ -1640,7 +1628,7 @@
"CSRTPCryptoHandlerSRTP",
"DeriveSessionKeysL",
"FUNCTIONALITY",
- SetupL, UT_DeriveSessionKeysL_OneL, Teardown)
+ SetupL, UT_DeriveSessionKeysL_1L, Teardown)
EUNIT_TEST(
"UpdateROC - 1 ",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPKeyDerivation_AESCM128.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPKeyDerivation_AESCM128.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -228,7 +228,7 @@
}
-void UT_CSRTPKeyDerivation_AESCM128::UT_ErronousInput_OneL()
+void UT_CSRTPKeyDerivation_AESCM128::UT_ErronousInput_1L()
{
TInt err = KErrNone;
@@ -332,14 +332,14 @@
"CSRTPKeyDerivation_AESCM128",
"PRF_128L",
"FUNCTIONALITY",
- SetupL, UT_ErronousInput_OneL, Teardown)
+ SetupL, UT_ErronousInput_1L, Teardown)
EUNIT_END_TEST_TABLE
// END OF FILE
/*
-void UT_CSRTPKeyDerivation_AESCM128::UT_ErronousInput_OneL()
+void UT_CSRTPKeyDerivation_AESCM128::UT_ErronousInput_1L()
{
TInt err = KErrNone;
HBufC8* result = NULL;
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPMasterKey.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPMasterKey.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -144,12 +144,6 @@
delete iMasterKey4;
delete iMasterKey5;
- iMasterKey = NULL;
- iMasterKey2 = NULL;
- iMasterKey3 = NULL;
- iMasterKey4 = NULL;
- iMasterKey5 = NULL;
-
iTestKey128bits.Zero();
iTestKey128bits_dehexed.Zero();
}
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPMasterSalt.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPMasterSalt.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -100,12 +100,6 @@
delete iMasterSalt2;
delete iMasterSalt3;
delete iMasterSalt4;
-
- iMasterSalt = NULL;
- iMasterSalt2 = NULL;
- iMasterSalt3 = NULL;
- iMasterSalt4 = NULL;
-
iRFCTestSalt112bits.Zero();
iRFCTestSalt112bits_dehexed.Zero();
}
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPSession.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPSession.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -151,14 +151,14 @@
iContext=NULL;
}
-void UT_CSRTPSession::UT_CSRTPSession_NewL_OneL( )
+void UT_CSRTPSession::UT_CSRTPSession_NewL_1L( )
{
CSRTPSession* srtpSession = CSRTPSession::NewL( iDestination);
EUNIT_ASSERT(srtpSession);
delete srtpSession;
}
-void UT_CSRTPSession::UT_CSRTPSession_NewL_TwoL( )
+void UT_CSRTPSession::UT_CSRTPSession_NewL_2L( )
{
CSRTPSession* srtpSession = CSRTPSession::NewL(iDestination,
@@ -630,14 +630,14 @@
"CSRTPSession",
"NewL",
"FUNCTIONALITY",
- SetupL, UT_CSRTPSession_NewL_OneL, Teardown)
+ SetupL, UT_CSRTPSession_NewL_1L, Teardown)
EUNIT_TEST(
"NewL - test ",
"CSRTPSession",
"NewL",
"FUNCTIONALITY",
- SetupL, UT_CSRTPSession_NewL_TwoL, Teardown)
+ SetupL, UT_CSRTPSession_NewL_2L, Teardown)
EUNIT_TEST(
"ConstructL ",
"CSRTPSession",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStream.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStream.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -230,25 +230,13 @@
delete iTestPayload160Bits;
delete iTestMKI128Bits;
delete iTestAuthTag80Bits;
-
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
- iTestMKI128Bits = NULL;
- iTestAuthTag80Bits = NULL;
delete iStreamIn;
- delete iSRTPSession;
-
- iStreamIn = NULL;
- iSRTPSession = NULL;
+ delete iSRTPSession;
delete iRFC3711_SessionEncrKey128bits;
delete iRFC3711_SessionSaltKey128bits;
delete iRFC3711_SessionAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
}
@@ -360,7 +348,7 @@
delete streamIn;
}
- void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_OneL( )
+ void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_1L( )
{
iReKeyCalled= EFalse;
CSRTPStreamIn* streamIn = CSRTPStreamIn::NewL(*iSRTPSession, (TUint)0);
@@ -369,7 +357,7 @@
delete streamIn;
}
-void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_TwoL( )
+void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_2L( )
{
iReKeyCalled= EFalse;
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
@@ -444,13 +432,13 @@
"CSRTPStream",
"ReKey",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStream_ReKeyNeeded_OneL, Teardown)
+ SetupL, UT_CSRTPStream_ReKeyNeeded_1L, Teardown)
EUNIT_TEST(
"ReKey2 ",
"CSRTPStream",
"ReKey",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStream_ReKeyNeeded_TwoL, Teardown)
+ SetupL, UT_CSRTPStream_ReKeyNeeded_2L, Teardown)
EUNIT_TEST(
"TestNewL",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStreamIn.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStreamIn.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -347,19 +347,11 @@
{
delete iDecryptedPayload;
delete iTestPayload160Bits;
-
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
-
delete iStreamIn;
delete iStreamInLateBD;
delete iSRTPSession;
-
- iStreamIn = NULL;
- iStreamInLateBD = NULL;
- iSRTPSession = NULL;
delete iRFC3711_SessionEncrKey128bits;
@@ -368,23 +360,16 @@
delete iRFC3711_RtcpEncrKey128bits;
delete iRFC3711_RtcpSaltKey128bits;
delete iRFC3711_RtcpAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
- iRFC3711_RtcpEncrKey128bits = NULL;
- iRFC3711_RtcpSaltKey128bits = NULL;
- iRFC3711_RtcpAuthKey128bits = NULL;
}
-void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_OneL( )
+void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_1L( )
{
CSRTPStreamIn* tempStreamIn = CSRTPStreamIn::NewL(*iSRTPSession, (TUint)1);
EUNIT_ASSERT(tempStreamIn->SSRC()== 1);
delete tempStreamIn;
}
-void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_TwoL( )
+void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_2L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -421,7 +406,7 @@
CleanupStack::PopAndDestroy( srtpSession );
}
-void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_ThreeL( )
+void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_3L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -457,7 +442,7 @@
delete tempStreamIn;
CleanupStack::PopAndDestroy( srtpSession );
}
-void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_FourL( )
+void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_4L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -494,7 +479,7 @@
CleanupStack::PopAndDestroy( srtpSession );
}
-void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_FiveL( )
+void UT_CSRTPStreamIn::UT_CSRTPStreamIn_NewL_5L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -1051,35 +1036,35 @@
"CSRTPStreamIn",
"NewL1",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamIn_NewL_OneL, Teardown)
+ SetupL, UT_CSRTPStreamIn_NewL_1L, Teardown)
EUNIT_TEST(
"NewL2 - test ",
"CSRTPStreamIn",
"NewL2",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamIn_NewL_TwoL, Teardown)
+ SetupL, UT_CSRTPStreamIn_NewL_2L, Teardown)
EUNIT_TEST(
"NewL3 - test ",
"CSRTPStreamIn",
"NewL3",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamIn_NewL_ThreeL, Teardown)
+ SetupL, UT_CSRTPStreamIn_NewL_3L, Teardown)
EUNIT_TEST(
"NewL4 - test ",
"CSRTPStreamIn",
"NewL4",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamIn_NewL_FourL, Teardown)
+ SetupL, UT_CSRTPStreamIn_NewL_4L, Teardown)
EUNIT_TEST(
"NewL5 - test ",
"CSRTPStreamIn",
"NewL5",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamIn_NewL_FiveL, Teardown)
+ SetupL, UT_CSRTPStreamIn_NewL_5L, Teardown)
EUNIT_TEST(
"UnprotectSrtpL - test ",
"CSRTPStreamIn",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStreamOut.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStreamOut.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -334,16 +334,10 @@
{
delete iDecryptedPayload;
delete iTestPayload160Bits;
-
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
//delete iTestMKI128Bits;
delete iStreamOut;
delete iSRTPSession;
-
- iStreamOut = NULL;
- iSRTPSession = NULL;
delete iRFC3711_SessionEncrKey128bits;
@@ -352,23 +346,17 @@
delete iRFC3711_RtcpEncrKey128bits;
delete iRFC3711_RtcpSaltKey128bits;
delete iRFC3711_RtcpAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
- iRFC3711_RtcpEncrKey128bits = NULL;
- iRFC3711_RtcpSaltKey128bits = NULL;
- iRFC3711_RtcpAuthKey128bits = NULL;
+
}
-void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_OneL( )
+void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_1L( )
{
CSRTPStreamOut* tempStreamOut = CSRTPStreamOut::NewL(*iSRTPSession, (TUint)1);
EUNIT_ASSERT(tempStreamOut->SSRC()== 1);
delete tempStreamOut;
}
-void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_TwoL( )
+void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_2L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -411,7 +399,7 @@
delete srtpSession;
}
-void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_ThreeL( )
+void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_3L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -776,20 +764,20 @@
"CSRTPStreamOut",
"NewL",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamOut_NewL_OneL, Teardown)
+ SetupL, UT_CSRTPStreamOut_NewL_1L, Teardown)
EUNIT_TEST(
"NewL2 - test ",
"CSRTPStreamOut",
"NewL2",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamOut_NewL_TwoL, Teardown)
+ SetupL, UT_CSRTPStreamOut_NewL_2L, Teardown)
EUNIT_TEST(
"NewL3 - test ",
"CSRTPStreamOut",
"NewL3",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamOut_NewL_ThreeL, Teardown)
+ SetupL, UT_CSRTPStreamOut_NewL_3L, Teardown)
EUNIT_TEST(
"ProtectRtpL - test ",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -315,91 +315,49 @@
void UT_CSrtpAuthentication_RCC::Teardown( )
{
delete iAuthenticator;
- iAuthenticator = NULL;
delete iRFC2202_Test1_Key_160bits;
delete iRFC2202_Test1_Data_16bits;
delete iRFC2202_Test1_Tag_80bits;
delete iRFC2202_Test1_Tag_32bits;
-
- iRFC2202_Test1_Key_160bits = NULL;
- iRFC2202_Test1_Data_16bits = NULL;
- iRFC2202_Test1_Tag_80bits = NULL;
- iRFC2202_Test1_Tag_32bits = NULL;
delete iRFC2202_Test2_Key;
delete iRFC2202_Test2_Data_28bits;
delete iRFC2202_Test2_Tag_80bits;
delete iRFC2202_Test2_Tag_32bits;
-
- iRFC2202_Test2_Key = NULL;
- iRFC2202_Test2_Data_28bits = NULL;
- iRFC2202_Test2_Tag_80bits = NULL;
- iRFC2202_Test2_Tag_32bits = NULL;
delete iRFC2202_Test3_Key_160bits;
delete iRFC2202_Test3_Data_400bits;
delete iRFC2202_Test3_Tag_80bits;
delete iRFC2202_Test3_Tag_32bits;
-
- iRFC2202_Test3_Key_160bits = NULL;
- iRFC2202_Test3_Data_400bits = NULL;
- iRFC2202_Test3_Tag_80bits = NULL;
- iRFC2202_Test3_Tag_32bits = NULL;
delete iRFC2202_Test4_Key_200bits;
delete iRFC2202_Test4_Data_400bits;
delete iRFC2202_Test4_Tag_80bits;
delete iRFC2202_Test4_Tag_32bits;
-
- iRFC2202_Test4_Key_200bits = NULL;
- iRFC2202_Test4_Data_400bits = NULL;
- iRFC2202_Test4_Tag_80bits = NULL;
- iRFC2202_Test4_Tag_32bits = NULL;
delete iRFC2202_Test5_Key_160bits;
delete iRFC2202_Test5_Data;
delete iRFC2202_Test5_Tag_80bits;
delete iRFC2202_Test5_Tag_32bits;
-
- iRFC2202_Test5_Key_160bits = NULL;
- iRFC2202_Test5_Data = NULL;
- iRFC2202_Test5_Tag_80bits = NULL;
- iRFC2202_Test5_Tag_32bits = NULL;
delete iRFC2202_Test6_Key_640bits;
delete iRFC2202_Test6_Data_54bits;
delete iRFC2202_Test6_Tag_80bits;
delete iRFC2202_Test6_Tag_32bits;
-
- iRFC2202_Test6_Key_640bits = NULL;
- iRFC2202_Test6_Data_54bits = NULL;
- iRFC2202_Test6_Tag_80bits = NULL;
- iRFC2202_Test6_Tag_32bits = NULL;
delete iRFC2202_Test7_Key_640bits;
delete iRFC2202_Test7_Data_73bits;
delete iRFC2202_Test7_Tag_80bits;
delete iRFC2202_Test7_Tag_32bits;
-
- iRFC2202_Test7_Key_640bits = NULL;
- iRFC2202_Test7_Data_73bits = NULL;
- iRFC2202_Test7_Tag_80bits = NULL;
- iRFC2202_Test7_Tag_32bits = NULL;
-
delete iTest8_Key_160bits;
delete iTest8_Data_168bits;
delete iTest8_Data2_32bits;
delete iTest8_Tag_80bits;
-
- iTest8_Key_160bits = NULL;
- iTest8_Data_168bits = NULL;
- iTest8_Data2_32bits = NULL;
- iTest8_Tag_80bits = NULL;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -413,7 +371,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -422,7 +380,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test2_Key,
*iRFC2202_Test2_Data_28bits,
@@ -436,7 +394,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test2_Key,
*iRFC2202_Test2_Data_28bits,
@@ -445,7 +403,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test3_Key_160bits,
*iRFC2202_Test3_Data_400bits,
@@ -459,7 +417,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test3_Key_160bits,
*iRFC2202_Test3_Data_400bits,
@@ -467,7 +425,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test4_Key_200bits,
*iRFC2202_Test4_Data_400bits,
@@ -481,7 +439,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test4_Key_200bits,
*iRFC2202_Test4_Data_400bits,
@@ -489,7 +447,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test5_Key_160bits,
*iRFC2202_Test5_Data,
@@ -503,7 +461,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test5_Key_160bits,
*iRFC2202_Test5_Data,
@@ -511,7 +469,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test6_Key_640bits,
*iRFC2202_Test6_Data_54bits,
@@ -525,7 +483,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test6_Key_640bits,
*iRFC2202_Test6_Data_54bits,
@@ -533,7 +491,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test7_Key_640bits,
*iRFC2202_Test7_Data_73bits,
@@ -547,7 +505,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test7_Key_640bits,
*iRFC2202_Test7_Data_73bits,
@@ -556,7 +514,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test8_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test8_32L( )
{
TBuf8<20> buf;
TBuf8<19> buf2;
@@ -635,8 +593,8 @@
void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test_KeyChangedL()
{
- UT_AuthenticateL_RFC2202_Test2_EightyL();
- UT_AuthenticateL_RFC2202_Test3_EightyL();
+ UT_AuthenticateL_RFC2202_Test2_80L();
+ UT_AuthenticateL_RFC2202_Test3_80L();
}
void UT_CSrtpAuthentication_RCC::Hex(HBufC8& aString)
@@ -672,104 +630,104 @@
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 1 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 2 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test2_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test2_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 2 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test2_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 3 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test3_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test3_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 3 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test3_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 4 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test4_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test4_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 4 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test4_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 5 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test5_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test5_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 5 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test5_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 6 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test6_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test6_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 6 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test6_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 7 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test7_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test7_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 7 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test7_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - RealPacket",
"CSrtpAuthentication_RCC",
"AuthenticateL with Real Packet",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_Test8_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_Test8_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - KeyChanged",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_SRTPAuthentication_HMAC_SHA1.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_SRTPAuthentication_HMAC_SHA1.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -312,67 +312,36 @@
void UT_SRTPAuthentication_HMAC_SHA1::Teardown( )
{
delete iAuthenticator;
- iAuthenticator = NULL;
-
+
delete iRFC2202_Test1_Key_160bits;
delete iRFC2202_Test1_Data_16bits;
delete iRFC2202_Test1_Tag_80bits;
delete iRFC2202_Test1_Tag_32bits;
-
- iRFC2202_Test1_Key_160bits = NULL;
- iRFC2202_Test1_Data_16bits = NULL;
- iRFC2202_Test1_Tag_80bits = NULL;
- iRFC2202_Test1_Tag_32bits = NULL;
delete iRFC2202_Test2_Key;
delete iRFC2202_Test2_Data_28bits;
delete iRFC2202_Test2_Tag_80bits;
delete iRFC2202_Test2_Tag_32bits;
-
- iRFC2202_Test2_Key = NULL;
- iRFC2202_Test2_Data_28bits = NULL;
- iRFC2202_Test2_Tag_80bits = NULL;
- iRFC2202_Test2_Tag_32bits = NULL;
delete iRFC2202_Test3_Key_160bits;
delete iRFC2202_Test3_Data_400bits;
delete iRFC2202_Test3_Tag_80bits;
delete iRFC2202_Test3_Tag_32bits;
-
- iRFC2202_Test3_Key_160bits = NULL;
- iRFC2202_Test3_Data_400bits = NULL;
- iRFC2202_Test3_Tag_80bits = NULL;
- iRFC2202_Test3_Tag_32bits = NULL;
delete iRFC2202_Test4_Key_200bits;
delete iRFC2202_Test4_Data_400bits;
delete iRFC2202_Test4_Tag_80bits;
delete iRFC2202_Test4_Tag_32bits;
-
- iRFC2202_Test4_Key_200bits = NULL;
- iRFC2202_Test4_Data_400bits = NULL;
- iRFC2202_Test4_Tag_80bits = NULL;
- iRFC2202_Test4_Tag_32bits = NULL;
delete iRFC2202_Test5_Key_160bits;
delete iRFC2202_Test5_Data;
delete iRFC2202_Test5_Tag_80bits;
delete iRFC2202_Test5_Tag_32bits;
- iRFC2202_Test5_Key_160bits = NULL;
- iRFC2202_Test5_Data = NULL;
- iRFC2202_Test5_Tag_80bits = NULL;
- iRFC2202_Test5_Tag_32bits = NULL;
-
delete iRFC2202_Test6_Key_640bits;
delete iRFC2202_Test6_Data_54bits;
delete iRFC2202_Test6_Tag_80bits;
delete iRFC2202_Test6_Tag_32bits;
-
- iRFC2202_Test6_Key_640bits = NULL;
- iRFC2202_Test6_Data_54bits = NULL;
- iRFC2202_Test6_Tag_80bits = NULL;
- iRFC2202_Test6_Tag_32bits = NULL;
delete iRFC2202_Test7_Key_640bits;
delete iRFC2202_Test7_Data_73bits;
@@ -382,19 +351,10 @@
delete iTest8_Data_168bits;
delete iTest8_Data2_32bits;
delete iTest8_Tag_80bits;
-
- iRFC2202_Test7_Key_640bits = NULL;
- iRFC2202_Test7_Data_73bits = NULL;
- iRFC2202_Test7_Tag_80bits = NULL;
- iRFC2202_Test7_Tag_32bits = NULL;
- iTest8_Key_160bits = NULL;
- iTest8_Data_168bits = NULL;
- iTest8_Data2_32bits = NULL;
- iTest8_Tag_80bits = NULL;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test1_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test1_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -408,7 +368,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test1_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -423,7 +383,7 @@
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test2_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test2_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test2_Key,
*iRFC2202_Test2_Data_28bits,
@@ -437,7 +397,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test2_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test2_Key,
*iRFC2202_Test2_Data_28bits,
@@ -452,7 +412,7 @@
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test3_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test3_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test3_Key_160bits,
*iRFC2202_Test3_Data_400bits,
@@ -466,7 +426,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test3_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test3_Key_160bits,
*iRFC2202_Test3_Data_400bits,
@@ -480,7 +440,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test4_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test4_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test4_Key_200bits,
*iRFC2202_Test4_Data_400bits,
@@ -494,7 +454,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test4_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test4_Key_200bits,
*iRFC2202_Test4_Data_400bits,
@@ -508,7 +468,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test5_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test5_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test5_Key_160bits,
*iRFC2202_Test5_Data,
@@ -522,7 +482,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test5_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test5_Key_160bits,
*iRFC2202_Test5_Data,
@@ -536,7 +496,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test6_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test6_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test6_Key_640bits,
*iRFC2202_Test6_Data_54bits,
@@ -550,7 +510,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test6_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test6_Key_640bits,
*iRFC2202_Test6_Data_54bits,
@@ -564,7 +524,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test7_EightyL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test7_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test7_Key_640bits,
*iRFC2202_Test7_Data_73bits,
@@ -578,7 +538,7 @@
delete result;
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_RFC2202_Test7_32L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(32, *iRFC2202_Test7_Key_640bits,
*iRFC2202_Test7_Data_73bits,
@@ -593,7 +553,7 @@
}
-void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_Test8_ThirtyTwoL( )
+void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_Test8_32L( )
{
TBuf8<20> buf;
TBuf8<19> buf2;
@@ -672,8 +632,8 @@
void UT_SRTPAuthentication_HMAC_SHA1::UT_AuthenticateL_Test_KeyChangedL( )
{
- UT_AuthenticateL_RFC2202_Test1_EightyL();
- UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL();
+ UT_AuthenticateL_RFC2202_Test1_80L();
+ UT_AuthenticateL_RFC2202_Test1_32L();
}
void UT_SRTPAuthentication_HMAC_SHA1::Hex(HBufC8& aString)
@@ -709,104 +669,104 @@
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 1 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 2 80 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test2_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test2_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 2 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test2_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 3 80 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test3_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test3_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 3 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test3_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 4 80 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test4_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test4_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 4 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test4_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 5 80 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test5_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test5_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 5 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test5_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 6 80 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test6_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test6_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 6 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test6_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 7 80 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test7_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test7_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 7 32 bits",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test7_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - RealPacket",
"SRTPAuthentication_HMAC_SHA1",
"AuthenticateL with Real Packet",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_Test8_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_Test8_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - KeyChanged",
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_SRTPAuthentication_NULL.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_SRTPAuthentication_NULL.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -98,18 +98,13 @@
void UT_SRTPAuthentication_NULL::Teardown( )
{
delete iAuthenticator;
- iAuthenticator = NULL;
-
+
delete iRFC2202_Test1_Key_160bits;
delete iRFC2202_Test1_Data_16bits;
delete iRFC2202_Test1_Tag_80bits;
-
- iRFC2202_Test1_Key_160bits = NULL;
- iRFC2202_Test1_Data_16bits = NULL;
- iRFC2202_Test1_Tag_80bits = NULL;
}
-void UT_SRTPAuthentication_NULL::UT_AuthenticateL_RFC2202_Test1_EightyL( )
+void UT_SRTPAuthentication_NULL::UT_AuthenticateL_RFC2202_Test1_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -155,7 +150,7 @@
"SRTPAuthentication_NULL",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_80L, Teardown)
EUNIT_END_TEST_TABLE
--- a/sipplugins/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -19,6 +19,7 @@
#include "../sippwlanplugin/group/bld.inf"
+#include "../sippsipsettingsui/group/bld.inf"
#include "../sippdevmgmtsipadapter/group/bld.inf"
#include "../sippsystemstatemonitor/group/bld.inf"
#include "../sippsipadapter/group/bld.inf"
--- a/sipplugins/sippdevmgmtsipadapter/tsrc/UT_CNSmlDmSIPAdapter/Group/ut_cnsmldmsipadapter.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippdevmgmtsipadapter/tsrc/UT_CNSmlDmSIPAdapter/Group/ut_cnsmldmsipadapter.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -41,6 +41,11 @@
USERINCLUDE ../../../inc
USERINCLUDE ../inc
+#if defined ( OS_LAYER_SYSTEMINCLUDE )
+OS_LAYER_SYSTEMINCLUDE
+#else
+SYSTEMINCLUDE /epoc32/include
+#endif
MW_LAYER_SYSTEMINCLUDE
LIBRARY bafl.lib
--- a/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group/T_SIPAdapter.mmp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group/T_SIPAdapter.mmp Wed Sep 01 12:27:36 2010 +0100
@@ -36,6 +36,12 @@
USERINCLUDE ../inc
USERINCLUDE ../../../inc
+#if defined ( OS_LAYER_SYSTEMINCLUDE )
+OS_LAYER_SYSTEMINCLUDE
+#else
+SYSTEMINCLUDE /epoc32/include
+#endif
+
MW_LAYER_SYSTEMINCLUDE
LIBRARY EUnit.lib
--- a/sipplugins/sippsipsettingsui/inc/gssipsettingsplugin.hrh Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/inc/gssipsettingsplugin.hrh Wed Sep 01 12:27:36 2010 +0100
@@ -34,8 +34,7 @@
enum TGSRegistrationMode
{
EGSWhenNeeded = 0,
- EGSAlwaysOn,
- EGSAlwaysOnHome
+ EGSAlwaysOn
};
// Security negotiation choices
--- a/sipplugins/sippsipsettingsui/inc/sipsettingscontainer.h Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/inc/sipsettingscontainer.h Wed Sep 01 12:27:36 2010 +0100
@@ -103,6 +103,12 @@
* @return feature id.
*/
TInt CurrentFeatureId( );
+
+ /**
+ * Retrieves the DrawerFlags
+ * @return feature id.
+ */
+ TInt DrawerFlags( );
/**
* Defines observer for the middle softkey label changes.
Binary file sipplugins/sippsipsettingsui/sis/sipsettingsui_stub.SIS has changed
--- a/sipplugins/sippsipsettingsui/sis/sipsettingsui_stub.pkg Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/sis/sipsettingsui_stub.pkg Wed Sep 01 12:27:36 2010 +0100
@@ -37,10 +37,10 @@
; SIP Settings UI
; /////////////////////////
"" - "z:\sys\bin\GSSIPSettingsPlugin.dll"
-"" - "z:\resource\plugins\GSSIPSettingsPlugin.r??"
+"" - "z:\resource\plugins\GSSIPSettingsPlugin.r*"
"" - "z:\resource\apps\GSSIPSettingsPlugin.mif"
; /////////////////////////
; SIP Settings UI resources
; /////////////////////////
-"" - "z:\resource\GSSIPSettingsPluginRsc.R??"
+"" - "z:\resource\GSSIPSettingsPluginRsc.R*"
--- a/sipplugins/sippsipsettingsui/src/SIPSettIntegerSetPage.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/SIPSettIntegerSetPage.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -27,7 +27,6 @@
#include "gssippluginlogger.h"
_LIT( NULLString,"" );
-_LIT16( ZeroString,"-1" );
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
@@ -72,23 +71,18 @@
}
TextControl()->GetText( intText );
lex.Assign( intText.Ptr() );
- lex.Val( value );
- if( value >= 0 && value <= 65535 || intText == NULLString )
- {
- if( intText == NULLString )
- {
- TextControl()->SetTextL(&ZeroString);
- }
- UpdateSettingL();
+ lex.Val( value );
+ if( intText == NULLString )
+ {
+ TextControl()->SetTextL(&NULLString);
+ }
+ UpdateSettingL();
- // Everything OK, save setting and exit page
- AcceptSettingL();
- ret = ETrue;
- }
- else
- {
- ret = EFalse;
- }
+ // Everything OK, save setting and exit page
+ AcceptSettingL();
+ ret = ETrue;
+
+
return ret;
}
--- a/sipplugins/sippsipsettingsui/src/SipSettIntegerEditItem.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/SipSettIntegerEditItem.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -45,8 +45,7 @@
lex.Assign(aInteger.Ptr());
lex.Val(value);
iValue = value;
-
-
+ AknTextUtils::DisplayTextLanguageSpecificNumberConversion( aInteger );
}
@@ -89,6 +88,7 @@
{
TBuf<KMaxServerPortLength> ValueString;
ValueString.AppendNum( iValue );
+ AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ValueString );
InternalTextPtr().Copy( ValueString );
}
--- a/sipplugins/sippsipsettingsui/src/gssipmodel.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/gssipmodel.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -1205,7 +1205,9 @@
{
profile->GetParameter( KSIPDefaultProfile, aDefault );
profile->GetParameter( KSIPProfileLocked, aLocked );
- aIsUse = iEngine->IsInUseL( *profile );
+ TUint32 profileId;
+ profile->GetParameter( KSIPProfileId, profileId );
+ aIsUse = CheckIsProfileInUseL( profileId );
}
__GSLOGSTRING("CGSSIPModel::CheckProfileForDeleteL End" )
}
@@ -1224,6 +1226,10 @@
if ( profile )
{
profile->GetParameter( KSIPProfileRegistered, inUse );
+ if ( !inUse )
+ {
+ inUse = iEngine->IsInUseL( *profile );
+ }
}
return inUse;
--- a/sipplugins/sippsipsettingsui/src/sipsettingscontainer.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettingscontainer.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <aknlists.h>
-#include <cshelp/conset.hlp.hrh>
+#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
#include <gssipsettingspluginrsc.rsg>
#include <gssipsettingsplugin.mbg>
@@ -389,6 +389,16 @@
}
// ---------------------------------------------------------------------------
+// CSIPSettingsContainer::DrawerFlags()
+//
+// ---------------------------------------------------------------------------
+//
+TInt CSIPSettingsContainer::DrawerFlags()
+ {
+ return iListBox->View()->ItemDrawer()->Flags();
+ }
+
+// ---------------------------------------------------------------------------
// Sets observer for MSK label updations.
// ---------------------------------------------------------------------------
//
--- a/sipplugins/sippsipsettingsui/src/sipsettingsmodel.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettingsmodel.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -112,6 +112,8 @@
{
__GSLOGSTRING1("CSIPSettingsModel::SetDefaultProfileL index: %d", aIndex)
TRAPD(err, iHandler->SetDefaultProfileL( aIndex ));
+ if( err != KErrNone )
+ {
if ( err == KErrInUse )
{
HBufC* txtErr = StringLoader::LoadLC( R_QTN_SIP_ERROR_PROFILE_USED );
@@ -123,6 +125,7 @@
{
User::Leave( err );
}
+ }
}
// -----------------------------------------------------------------------------
--- a/sipplugins/sippsipsettingsui/src/sipsettingsplugin.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettingsplugin.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -496,30 +496,40 @@
void CSIPSettingsPlugin::ChangeDefaultProfileL()
{
__GSLOGSTRING("CSIPSettingsPlugin::ChangeDefaultProfileL Start " )
- TInt selectedIndex = iModel->DefaultProfileIndex();
- TInt oldProfileIndex = selectedIndex;
-
- // Get the array of the profile names, ownership changes
- CDesCArray* array = iModel->ListOfProfileNamesL();
- CleanupStack::PushL( array );
-
- // Create and display the pop-up list
- CAknRadioButtonSettingPage* defaultPopUp =
- new ( ELeave ) CAknRadioButtonSettingPage(
- R_SIP_PROFILE_LIST_VIEW_DEFAULT_SETTING_PAGE,
- selectedIndex,
- array );
- if ( defaultPopUp->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
- {
- if ( selectedIndex != oldProfileIndex )
- {
- // User has changed the default profile, set new setting
- // to persistent storage
- iModel->SetDefaultProfileL( selectedIndex );
- }
- }
+
+ TInt aFlage = iContainer->DrawerFlags();
+ if( aFlage & CTextListItemDrawer::EDisableMarquee )
+ {
+ TInt selectedIndex = iContainer->CurrentIndex();
+ iModel->SetDefaultProfileL( selectedIndex );
+ }
+ else
+ {
+ TInt selectedIndex = iModel->DefaultProfileIndex();
+ TInt oldProfileIndex = selectedIndex;
+
+ // Get the array of the profile names, ownership changes
+ CDesCArray* array = iModel->ListOfProfileNamesL();
+ CleanupStack::PushL( array );
+
+ // Create and display the pop-up list
+ CAknRadioButtonSettingPage* defaultPopUp =
+ new ( ELeave ) CAknRadioButtonSettingPage(
+ R_SIP_PROFILE_LIST_VIEW_DEFAULT_SETTING_PAGE,
+ selectedIndex,
+ array );
+ if ( defaultPopUp->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
+ {
+ if ( selectedIndex != oldProfileIndex )
+ {
+ // User has changed the default profile, set new setting
+ // to persistent storage
+ iModel->SetDefaultProfileL( selectedIndex );
+ }
+ }
CleanupStack::PopAndDestroy( array ); // array
+ }
__GSLOGSTRING("CSIPSettingsPlugin::ChangeDefaultProfileL End" )
}
--- a/sipplugins/sippsipsettingsui/src/sipsettlistsipprofsetcontainer.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettlistsipprofsetcontainer.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <eikappui.h>
#include <eikenv.h>
-#include <cshelp/conset.hlp.hrh>
+#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
#include <aknsettingitemlist.h>
#include "sipsettlistsipprofsetcontainer.h"
--- a/sipplugins/sippsipsettingsui/src/sipsettlistsipprofsetitemlist.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettlistsipprofsetitemlist.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -266,7 +266,8 @@
}
else if ( currentIndex == EGSItemServiceProfile ||
currentIndex == EGSItemCompression ||
- currentIndex == EGSItemSecurity )
+ currentIndex == EGSItemSecurity ||
+ currentIndex == EGSItemRegistration )
{
SetNextSettingItemL( currentIndex );
aListBox->ActivateL();
@@ -535,6 +536,21 @@
iSecurity->LoadL();
iSecurity->UpdateListBoxTextL();
break;
+
+ case EGSItemRegistration:
+ iRegistration->StoreL();
+ if ( iProfileData.iRegistrationMode == EGSWhenNeeded )
+ {
+ iProfileData.iRegistrationMode = EGSAlwaysOn;
+ }
+ else
+ {
+ iProfileData.iRegistrationMode = EGSWhenNeeded;
+ }
+ iRegistration->LoadL();
+ iRegistration->UpdateListBoxTextL();
+ break;
+
default: // Other setting items are not supported.
User::Leave( KErrNotSupported );
break;
--- a/sipplugins/sippsipsettingsui/src/sipsettlistsipsrvsetcontainer.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettlistsipsrvsetcontainer.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include <aknview.h>
-#include <cshelp/conset.hlp.hrh>
+#include <csxhelp/cp.hlp.hrh>
#include <gsfwviewuids.h>
#include <gssipsettingspluginrsc.rsg> //GUI Resource
#include "sipsettlistsipsrvsetcontainer.h"
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -26,7 +26,7 @@
../data/esock_sip.cmi z:/private/101f7988/esock_sip.cmi
-../group/sipproviders.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sipproviders.iby)
+../group/sipproviders.iby /epoc32/rom/include/sipproviders.iby
PRJ_MMPFILES
sipproviders.mmp
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconevents.h Tue Aug 31 15:32:57 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconevents.h Wed Sep 01 12:27:36 2010 +0100
@@ -21,7 +21,6 @@
@publishedAll
@released since v9.2
*/
-#warning "SIPProvider APIs are deprecated, use SIP Client Library APIs instead."
#ifndef SIPSCPR_SUBCONEVENTS_H
#define SIPSCPR_SUBCONEVENTS_H
@@ -45,8 +44,7 @@
/** CSubConSIPResponseEvent is used to get and set the response elements of the most recent response
@publishedAll
-@deprecated
-*/
+@released since v9.2 */
{
public:
/**
@@ -79,8 +77,7 @@
/** CSubConSIPAuthenticationRequiredEvent is used when SIP authentication is required
@publishedAll
-@deprecated
-*/
+@released since v9.2 */
{
public:
@@ -105,8 +102,7 @@
/** CSubConSIPNotificationEvent is used for receiving SIP event notifications
@publishedAll
-@deprecated
- */
+@released since v9.2 */
{
public:
inline static CSubConSIPNotificationEvent* NewL();
@@ -130,13 +126,13 @@
/** Factory used to create instances of the SIP SubConnection Extension Events
@publishedAll
-@deprecated
+@released since v9.2
*/
{
public:
static CSubConNotificationEvent* NewL(TAny* aConstructionParameters);
};
-#include "sip_subconevents.inl"
+#include "SIP_subconevents.inl"
#endif // SIPSCPR_SUBCONEVENTS_H
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconparams.h Tue Aug 31 15:32:57 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconparams.h Wed Sep 01 12:27:36 2010 +0100
@@ -21,7 +21,7 @@
@publishedAll
@released since v9.2
*/
-#warning "SIPProvider APIs are deprecated, use SIP Client Library APIs instead."
+
#ifndef SIP_SUBCONPARAMS_H
#define SIP_SUBCONPARAMS_H
@@ -45,7 +45,7 @@
This contains the SIP Invite parameters that will be passed via subconnection
to the SIP stack
@publishedAll
-@deprecated
+@released since v9.2
*/
{
public:
@@ -123,7 +123,7 @@
This contains the SIP Subscribe parameters that will be passed via subconnection
to the SIP stack
@publishedAll
-@deprecated
+@released since v9.2
*/
{
public:
@@ -212,7 +212,7 @@
This contains the SIP Authenticate parameters that will be passed via subconnection
to the SIP stack
@publishedAll
-@deprecated
+@released since v9.2
*/
{
public:
@@ -265,13 +265,13 @@
/** Factory used to create instances of the SIP SubConnection Parameter Extension Sets.
@publishedAll
-@depricated
+@released since v9.2
*/
{
public:
static CSubConExtensionParameterSet* NewL(TAny* aConstructionParameters);
};
-#include "sip_subconparams.inl"
+#include "SIP_subconparams.inl"
#endif // SIP_SUBCONPARAMS_H
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/inc/sipconnpref.h Tue Aug 31 15:32:57 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/sipconnpref.h Wed Sep 01 12:27:36 2010 +0100
@@ -20,7 +20,6 @@
@publishedAll
@released since v9.2
*/
-#warning "SIPProvider APIs are deprecated, use SIP Client Library APIs instead."
#ifndef SIPCONNPREFS_H
@@ -49,7 +48,7 @@
/**
This contains the information about the type of the connection preferences used by the SIP in the form of the profiles
@publishedAll
-@deprecated
+@released since v9.2
*/
{
public:
--- a/sipproviderplugins/sipprovider/sipdummyprt/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipdummyprt/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -21,13 +21,13 @@
*/
PRJ_EXPORTS
-../group/SIPDummyPRT.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sipdummyprt.iby)
+../group/SIPDummyPRT.iby /epoc32/rom/include/sipdummyprt.iby
../data/sip.providers.esk z:/private/101f7989/esock/sip.providers.esk
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-../group/siphlapi.iby CORE_MW_LAYER_IBY_EXPORT_PATH(siphlapi.iby)
+../group/siphlapi.iby /epoc32/rom/include/siphlapi.iby
../data/esock_sip.cmi z:/private/101f7988/esock_sip.cmi
#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
--- a/sipproviderplugins/sipprovider/sipstatemachine/group/bld.inf Tue Aug 31 15:32:57 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipstatemachine/group/bld.inf Wed Sep 01 12:27:36 2010 +0100
@@ -25,5 +25,5 @@
SipStateMachine.mmp
PRJ_EXPORTS
-../group/SipStateMachine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sipstatemachine.iby)
+../group/SipStateMachine.iby /epoc32/rom/include/sipstatemachine.iby
../inc/siphlerr.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(siphlerr.h)
\ No newline at end of file