# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271420464 -10800 # Node ID 861e78e4e84c6de84b0d08373d53e2c3c25b25a2 # Parent 966b25fd74b52c7af477d60b3d2b30d02f62f993 Revision: 201011 Kit: 201015 diff -r 966b25fd74b5 -r 861e78e4e84c inc/natfwconnectivityapi.h --- a/inc/natfwconnectivityapi.h Fri Mar 19 09:37:25 2010 +0200 +++ b/inc/natfwconnectivityapi.h Fri Apr 16 15:21:04 2010 +0300 @@ -77,7 +77,7 @@ * @leave KErrAlreadyExists Observer is already registered for some of * the events */ - void RegisterObserverForEventsL( MNATFWConnectivityObserver& aObserver, + IMPORT_C void RegisterObserverForEventsL( MNATFWConnectivityObserver& aObserver, TUint16 aEvents ); /** @@ -91,7 +91,7 @@ * @post Observer will not receive notifications for specified events * any more. */ - void UnregisterObserverForEvents( MNATFWConnectivityObserver& aObserver, + IMPORT_C void UnregisterObserverForEvents( MNATFWConnectivityObserver& aObserver, TUint16 aEvents ); /** diff -r 966b25fd74b5 -r 861e78e4e84c ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp --- a/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp Fri Mar 19 09:37:25 2010 +0200 +++ b/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp Fri Apr 16 15:21:04 2010 +0300 @@ -1,3 +1,19 @@ +# +# 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: +# + component ipappsrv_metadata source \sf\mw\ipappsrv\ipappsrv_info\ipappsrv_metadata source \sf\mw\ipappsrv\package_definition.xml diff -r 966b25fd74b5 -r 861e78e4e84c multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/stubs/src/CMCEMediaManagerStub.cpp --- a/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/stubs/src/CMCEMediaManagerStub.cpp Fri Mar 19 09:37:25 2010 +0200 +++ b/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/stubs/src/CMCEMediaManagerStub.cpp Fri Apr 16 15:21:04 2010 +0300 @@ -1360,8 +1360,24 @@ HBufC8* configKey = HBufC8::NewLC( KMaxConfigKeyLen ); CleanupStack::PopAndDestroy( configKey ); } - - + +// --------------------------------------------------------- +// CMceMediaManager::UpDateStreamStateL +// --------------------------------------------------------- +// +void CMceMediaManager::UpDateStreamStateL(CMceComSession& /*currentSession*/, + CMceComSession& /*forkSession*/ ) + { + } + +// --------------------------------------------------------- +// CMceMediaManager::ForceEnableSinkState +// --------------------------------------------------------- +// +void CMceMediaManager::ForceEnableSinkState(CMceComSession& /*aSession*/ ) + { + } + // --------------------------------------------------------- // CMceMediaManager::SdpCodec diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwclient/tsrc/ut_natfwclient/group/ut_natfwclient.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwclient/tsrc/ut_natfwclient/group/ut_natfwclient.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,36 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWClient"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnatfwclient.dll"-"c:\sys\bin\ut_cnatfwclient.dll" +"\epoc32\release\armv5\urel\natfwtestsettings.dll"-"c:\sys\bin\natfwtestsettings.dll" +"\epoc32\release\armv5\urel\natfwtestplugin.dll"-"c:\sys\bin\natfwtestplugin.dll" +"\epoc32\data\Z\Resource\Plugins\natfwtestplugin.rsc"-"c:\resource\plugins\natfwtestplugin.rsc" +"\epoc32\release\armv5\urel\connectionmux_stub.dll"-"c:\sys\bin\connectionmux_stub.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group/ut_connectionmultiplexer.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group/ut_connectionmultiplexer.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWConnMultiPlex"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_connectionmultiplexer.dll"-"c:\sys\bin\ut_connectionmultiplexer.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group/ut_cnatfwicecandidatehandler.mmp --- a/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group/ut_cnatfwicecandidatehandler.mmp Fri Mar 19 09:37:25 2010 +0200 +++ b/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group/ut_cnatfwicecandidatehandler.mmp Fri Apr 16 15:21:04 2010 +0300 @@ -30,7 +30,7 @@ VENDORID 0x00000000 MACRO CPPUNIT_TEST - +MACRO TEST_EUNIT // to allow friend class in target class SOURCEPATH ../src SOURCE ut_cnatfwicecandidatehandlerdllmain.cpp SOURCE ut_cicesessiondata.cpp diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group/ut_natfwicecandidatehandler.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group/ut_natfwicecandidatehandler.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,41 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWIceCH"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnatfwicecandidatehandler.dll"-"c:\sys\bin\ut_cnatfwicecandidatehandler.dll" +"\epoc32\release\armv5\urel\stunserver_stub.dll"-"c:\sys\bin\stunserver_stub.dll" +"\epoc32\release\armv5\urel\natfwstunclientstub.dll"-"c:\sys\bin\natfwstunclientstub.dll" +;this pkg file is created for ATS testing purpose only +;stunplugin and turnplugin stubs can not be installed by this pkg file +; +"\epoc32\release\armv5\urel\stunplugin.dll"-"c:\sys\bin\stunplugin.dll" +"\epoc32\data\Z\Resource\Plugins\stunplugin.RSC"-"c:\resource\plugins\stunplugin.RSC" +"\epoc32\release\armv5\urel\turnplugin.dll"-"c:\sys\bin\turnplugin.dll" +"\epoc32\data\Z\Resource\Plugins\turnplugin.RSC"-"c:\resource\plugins\turnplugin.RSC" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group/ut_natfwnatsettings.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group/ut_natfwnatsettings.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWnatsett"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnatfwnatsettings.dll"-"c:\sys\bin\ut_cnatfwnatsettings.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group/ut_socketmediaconnwrapper.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group/ut_socketmediaconnwrapper.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWSMW"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_socketmediaconnwrapper.dll"-"c:\sys\bin\ut_socketmediaconnwrapper.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group/ut_natfwstunplugin.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group/ut_natfwstunplugin.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWStunP"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnatfwstunplugin.dll"-"c:\sys\bin\ut_cnatfwstunplugin.dll" + diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group/ut_natfwstunsrv.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group/ut_natfwstunsrv.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWStunSrv"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_natfwstunsrv.dll"-"c:\sys\bin\ut_natfwstunsrv.dll" + diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group/ut_stunturnclient.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group/ut_stunturnclient.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,35 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWStunTurnC"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cstunrelaybinding.dll"-"c:\sys\bin\ut_cstunrelaybinding.dll" +"\epoc32\release\armv5\urel\ut_cstunrelaybindingimplementation.dll"-"c:\sys\bin\ut_cstunrelaybindingimplementation.dll" +"\epoc32\release\armv5\urel\ut_cstunclient.dll"-"c:\sys\bin\ut_cstunclient.dll" +;"\epoc32\release\armv5\urel\natfwunsafprotocols.dll"-"c:\sys\bin\natfwunsafprotocols.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group/ut_natfwturnplugin.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group/ut_natfwturnplugin.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWTURNP"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnatfwturnplugin.dll"-"c:\sys\bin\ut_cnatfwturnplugin.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group/ut_natfwunsafcodec.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group/ut_natfwunsafcodec.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWUnsafC"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnatfwunsafcodec.dll"-"c:\sys\bin\ut_cnatfwunsafcodec.dll" + diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group/ut_natfwunsaftransport.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group/ut_natfwunsaftransport.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,36 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWUnsafT"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_natfwunsaftransport.dll"-"c:\sys\bin\ut_natfwunsaftransport.dll" +"\epoc32\release\armv5\urel\ut_natfwunsafserverresolver.dll"-"c:\sys\bin\ut_natfwunsafserverresolver.dll" +"\epoc32\release\armv5\urel\ut_natfwunsaficmpreceiver.dll"-"c:\sys\bin\ut_natfwunsaficmpreceiver.dll" +"\epoc32\release\armv5\urel\natfwunsafsecuresocketstub.dll"-"c:\sys\bin\natfwunsafsecuresocketstub.dll" + diff -r 966b25fd74b5 -r 861e78e4e84c natfw/natfwunsaf_protocols/unsaf_transport/inc/natfwunsafserverresolver.h --- a/natfw/natfwunsaf_protocols/unsaf_transport/inc/natfwunsafserverresolver.h Fri Mar 19 09:37:25 2010 +0200 +++ b/natfw/natfwunsaf_protocols/unsaf_transport/inc/natfwunsafserverresolver.h Fri Apr 16 15:21:04 2010 +0300 @@ -97,16 +97,16 @@ * @param aResult a client owned array * that will be filled on succesful completion. */ - void ResolveL(const TDesC8& aHostName, - const TDesC8& aServiceName, - const TDesC8& aProtocol, - TUint aDefaultPort, - RArray& aResult); + IMPORT_C void ResolveL(const TDesC8& aHostName, + const TDesC8& aServiceName, + const TDesC8& aProtocol, + TUint aDefaultPort, + RArray& aResult); /** * Cancels a pending resolving request. */ - void CancelResolving(); + IMPORT_C void CancelResolving(); private:// Constructors and destructor diff -r 966b25fd74b5 -r 861e78e4e84c natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/Group/ut_cnsmldmnatfwtraversaladapter.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/Group/ut_cnsmldmnatfwtraversaladapter.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWTravAdap"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\UT_CNSmlDmNATFWTraversalAdapter.dll"-"c:\sys\bin\UT_CNSmlDmNATFWTraversalAdapter.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/stubs/inc/SmlDmCallback_stub.h --- a/natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/stubs/inc/SmlDmCallback_stub.h Fri Mar 19 09:37:25 2010 +0200 +++ b/natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/stubs/inc/SmlDmCallback_stub.h Fri Apr 16 15:21:04 2010 +0300 @@ -76,6 +76,8 @@ HBufC8* GetLuidAllocL(const TDesC8& aURI); + TInt RemoveMappingL( TUint32 aAdapterId, const TDesC8& aURI, TBool aChildAlso ); + private: /** diff -r 966b25fd74b5 -r 861e78e4e84c natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/stubs/src/SmlDmCallback_stub.cpp --- a/natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/stubs/src/SmlDmCallback_stub.cpp Fri Mar 19 09:37:25 2010 +0200 +++ b/natplugins/natpdevmgmtnatfwadapter/tsrc/UT_CNSmlDmNATFWTraversalAdapter/stubs/src/SmlDmCallback_stub.cpp Fri Apr 16 15:21:04 2010 +0300 @@ -139,6 +139,12 @@ return iLUID2; } + TInt CSmlDmCallback_stub::RemoveMappingL( TUint32 /*aAdapterId*/, const TDesC8& /*aURI*/, TBool /*aChildAlso*/ ) + { + return 0; + } + + void CSmlDmCallback_stub::ConstructL() { iLUID = HBufC8::NewL( 0 ); diff -r 966b25fd74b5 -r 861e78e4e84c natplugins/natpnatfwsdpprovider/tsrc/ut_NatFwSdpProvider/group/ut_natfwsdpprovider.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natplugins/natpnatfwsdpprovider/tsrc/ut_NatFwSdpProvider/group/ut_natfwsdpprovider.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,32 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATFWsdpProv"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_natfwsdpprovider.dll"-"c:\sys\bin\ut_natfwsdpprovider.dll" diff -r 966b25fd74b5 -r 861e78e4e84c natplugins/natptraversalcontroller/tsrc/ut_NatTraversalController/group/ut_nattraversalcontroller.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/natplugins/natptraversalcontroller/tsrc/ut_NatTraversalController/group/ut_nattraversalcontroller.pkg Fri Apr 16 15:21:04 2010 +0300 @@ -0,0 +1,33 @@ +; +; 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: +; + +;Languages +&EN + +;Header +#{"EUnit: NATTraverContr"},(0x01700000),1,0,0 + +(0x101F7961), 0, 0, 0, {"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique vendor name +:"Nokia" + +;DLL files +"\epoc32\release\armv5\urel\ut_cnattraversalcontroller.dll"-"c:\sys\bin\ut_cnattraversalcontroller.dll" +"\epoc32\release\armv5\urel\natfwstunclientstub.dll"-"c:\sys\bin\natfwstunclientstub.dll"