--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/BtSerialClient.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/BtSerialClient.h Sat Feb 20 00:22:34 2010 +0200
@@ -24,8 +24,8 @@
#include <es_sock.h>
#include <bluetooth/btpowercontrol.h>
#include <bt_sock.h>
-#include <BTextNotifiers.h>
-#include <BtSdp.h>
+#include <btextnotifiers.h>
+#include <btsdp.h>
#include "SocketObserver.h"
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/btservicesearcher.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/btservicesearcher.h Sat Feb 20 00:22:34 2010 +0200
@@ -24,11 +24,11 @@
#include <bttypes.h>
#include <btextnotifiers.h>
-#include "SdpAttributeParser.h"
-#include "SdpAttributeNotifier.h"
+#include "sdpattributeparser.h"
+#include "sdpattributenotifier.h"
// CONSTANTS
-#include "MessageProtocolConstants.h"
+#include "messageprotocolconstants.h"
// CLASS DECLARATIONS
/**
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/messageservicesearcher.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/messageservicesearcher.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <e32base.h>
-#include "BTServiceSearcher.h"
+#include "btservicesearcher.h"
// CLASS DECLARATIONS
/**
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/sdpattributeparser.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/sdpattributeparser.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <btsdp.h>
-#include "StaticArrayC.h"
+#include "staticarrayc.h"
// FORWARD DECLARATIONS
class MSdpAttributeNotifier;
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/socketswriter.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/socketswriter.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <in_sock.h>
-#include "TimeOutNotifier.h"
+#include "timeoutnotifier.h"
// FORWARD DECLARATIONS
class CTimeOutTimer;
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/staticarrayc.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/inc/staticarrayc.h Sat Feb 20 00:22:34 2010 +0200
@@ -68,7 +68,7 @@
};
// INCLUDES
-#include "StaticArrayC.inl"
+#include "staticarrayc.inl"
/**
* CONSTRUCT_STATIC_ARRAY_C
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/BtSerialClient.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/BtSerialClient.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -20,7 +20,7 @@
#include <e32std.h>
#include <c32comm.h>
#include "BtSerialClient.h"
-#include "MessageServiceSearcher.h"
+#include "messageservicesearcher.h"
#include "BtSerialEngine.pan"
#include "HtiBtEngineLogging.h"
#include "socketswriter.h"
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/btservicesearcher.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/btservicesearcher.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -17,8 +17,8 @@
// INCLUDE FILES
-#include "BTServiceSearcher.h"
-#include "BTServiceSearcher.pan"
+#include "btservicesearcher.h"
+#include "btservicesearcher.pan"
#include "HtiBtEngineLogging.h"
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/messageservicesearcher.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/messageservicesearcher.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -19,8 +19,8 @@
// INCLUDE FILES
#include <bt_sock.h>
-#include "MessageServiceSearcher.h"
-#include "BTServiceSearcher.pan"
+#include "messageservicesearcher.h"
+#include "btservicesearcher.pan"
// ============================ MEMBER FUNCTIONS ===============================
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/sdpattributeparser.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/sdpattributeparser.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -19,9 +19,9 @@
// INCLUDE FILES
#include <bt_sock.h>
-#include "SdpAttributeParser.h"
-#include "SdpAttributeParser.pan"
-#include "SdpAttributeNotifier.h"
+#include "sdpattributeparser.h"
+#include "sdpattributeparser.pan"
+#include "sdpattributenotifier.h"
// ============================ MEMBER FUNCTIONS ==============================
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketsreader.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketsreader.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include "BtSerialEngine.pan"
-#include "SocketsReader.h"
+#include "socketsreader.h"
#include "SocketObserver.h"
// -----------------------------------------------------------------------------
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketswriter.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/socketswriter.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -17,8 +17,8 @@
// INCLUDE FILES
-#include "SocketsWriter.h"
-#include "TimeOutTimer.h"
+#include "socketswriter.h"
+#include "timeouttimer.h"
#include "BtSerialEngine.pan"
#include "SocketObserver.h"
#include "HtiBtEngineLogging.h"
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/timeouttimer.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/BtEngine/src/timeouttimer.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -17,8 +17,8 @@
// INCLUDE FILES
-#include "TimeOutTimer.h"
-#include "TimeOutNotifier.h"
+#include "timeouttimer.h"
+#include "timeoutnotifier.h"
#include "HtiBtEngineLogging.h"
// -----------------------------------------------------------------------------
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/inc/HtiBtCommEcomPlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/inc/HtiBtCommEcomPlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <c32comm.h>
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
#include "HtiBtCommInterface.h" // RHtiBtCommInterface
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/src/HtiBtCommEcomPlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommEcomPlugin/src/HtiBtCommEcomPlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -22,8 +22,8 @@
#include "HtiBtCommEcomPlugin.h"
#include "BtSerialClient.h"
-#include <hticfg.h>
-#include <htilogging.h>
+#include <HtiCfg.h>
+#include <HtiLogging.h>
// CONSTANTS
_LIT( KHtiCfgPath, "\\" ); // root of drive
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommInterface.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommInterface.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -25,7 +25,7 @@
#include "HtiBtCommInterface.h"
#include <e32uid.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
// CONSTANTS
const TUint KBtCommServerDefaultMessageSlots = 4; // Read, write, readCancel, writeCancel
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommServerSession.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/src/HtiBtCommServerSession.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -29,7 +29,7 @@
#include <e32std.h>
#include <e32svr.h>
-#include <HTICommPluginInterface.h> // KErrComModuleReset;
+#include <HtiCommPluginInterface.h> // KErrComModuleReset;
// CONSTANTS
_LIT(KBtComSessPanic, "BtComSessAssrt");
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/inc/HtiConnectionManager.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/inc/HtiConnectionManager.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,10 +21,10 @@
// INCLUDES
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
#include <es_sock.h>
#include <in_sock.h>
-#include <CommDbConnPref.h>
+#include <commdbconnpref.h>
#include "HtiIPCommServerCommon.h"
#include "HtiSocketMonitor.h"
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/inc/HtiIPCommEcomPlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/inc/HtiIPCommEcomPlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
#include "HtiIPCommServerClient.h"
// FORWARD DECLARATIONS
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/inc/HtiSocketMonitor.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/inc/HtiSocketMonitor.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
// FORWARD DECLARATIONS
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiConnectionManager.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiConnectionManager.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -20,10 +20,10 @@
#include "HtiIPCommEcomPlugin.h"
#include "HtiConnectionManager.h"
#include "HtiCfg.h"
-#include "HtiIPCommlogging.h"
+#include "HtiIPCommLogging.h"
#include <commdb.h> // CCommsDatabase
-#include <hticfg.h>
+#include <HtiCfg.h>
// CONSTANTS
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommEcomPlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommEcomPlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include "HtiIPCommEcomPlugin.h"
-#include <htilogging.h>
+#include <HtiLogging.h>
CHtiIPCommEcomPlugin* CHtiIPCommEcomPlugin::NewL()
{
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommServerClient.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommServerClient.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <e32uid.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include "HtiIPCommServerCommon.h"
#include "HtiIPCommServerClient.h"
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommserver.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommserver.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -23,7 +23,7 @@
#include "HtiIPCommServerCommon.h"
#include "HtiIPCommServer.h"
#include "HtiIPCommServerSession.h"
-#include "HtiIPCommlogging.h"
+#include "HtiIPCommLogging.h"
CHtiIPCommServer::CHtiIPCommServer()
:CServer2( EPriorityUserInput, EUnsharableSessions ),
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommserverSession.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiIPCommserverSession.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDE FILES
#include "HtiIPCommServerCommon.h"
#include "HtiIPCommServerSession.h"
-#include "HtiIPCommlogging.h"
+#include "HtiIPCommLogging.h"
CHtiIPCommServerSession::CHtiIPCommServerSession( CHtiIPCommServer* aServer )
:iServer( aServer )
--- a/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiSocketMonitor.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiIPCommPlugin/src/HtiSocketMonitor.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include "HtiSocketMonitor.h"
-#include "HtiIPCommlogging.h"
+#include "HtiIPCommLogging.h"
CHtiSocketMonitor* CHtiSocketMonitor::NewL( MHtiSocketObserver::TRequestType aType, MHtiSocketObserver* aObserver )
--- a/hti/HtiCommPlugins/HtiSerialCommPlugin/inc/HtiSerialCommEcomPlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiSerialCommPlugin/inc/HtiSerialCommEcomPlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <c32comm.h>
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
// FORWARD DECLARATIONS
--- a/hti/HtiCommPlugins/HtiSerialCommPlugin/src/HtiSerialCommEcomPlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiSerialCommPlugin/src/HtiSerialCommEcomPlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -21,8 +21,8 @@
#include <f32file.h>
#include "HtiSerialCommEcomPlugin.h"
-#include <hticfg.h>
-#include <htilogging.h>
+#include <HtiCfg.h>
+#include <HtiLogging.h>
// CONSTANTS
_LIT( KHtiSerialError, "HtiSerialError" );
--- a/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group/HtiUsbSerialComm.cfg Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group/HtiUsbSerialComm.cfg Sat Feb 20 00:22:34 2010 +0200
@@ -20,3 +20,13 @@
#DataRate=576000
#DataRate=1152000
#DataRate=4000000
+
+# The RetryTimes parameter configures the retry amount(times) if the port opening fails.
+# Default value: 10
+
+#RetryTimes=10
+
+# The RetryInterval parameter configures the time(seconds) between retries if the port opening fails.
+# Default value: 10
+
+#RetryInterval=10
--- a/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/inc/HtiUsbSerialCommEcomPlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/inc/HtiUsbSerialCommEcomPlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
#include <c32comm.h>
-#include <HTICommPluginInterface.h> // defined in HtiFramework project
+#include <HtiCommPluginInterface.h> // defined in HtiFramework project
// FORWARD DECLARATIONS
class CHtiCfg;
--- a/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/src/HtiUsbSerialCommEcomPlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/src/HtiUsbSerialCommEcomPlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -21,8 +21,8 @@
#include <f32file.h>
#include "HtiUsbSerialCommEcomPlugin.h"
-#include <hticfg.h>
-#include <htilogging.h>
+#include <HtiCfg.h>
+#include <HtiLogging.h>
// EXTERNAL DATA STRUCTURES
@@ -36,6 +36,8 @@
_LIT( KHtiUsbSerialCommCfg, "HTIUsbSerialComm.cfg" );
_LIT8( KUsbPortNumber, "PortNumber" );
_LIT8( KUsbDataRate, "DataRate" );
+_LIT8( KUsbRetryTimes, "RetryTimes" );
+_LIT8( KUsbRetryInterval, "RetryInterval" );
// _LIT( KUsbPddName, "" );
_LIT( KUsbLddName, "EUSBC" );
@@ -306,8 +308,41 @@
err = iCommPort.Open( iCommServ, commPort, ECommExclusive, ECommRoleDTE );
if ( err )
{
- HTI_LOG_FORMAT( "Failed to open port %d", err );
- ShowErrorNotifierL( _L( "Failed to open port" ), err );
+ //read retry parameters from cfg
+ TInt retryTimes = 10;
+ TRAPD( paramRetryTimesErr,
+ retryTimes = iCfg->GetParameterIntL( KUsbRetryTimes ) );
+ if ( paramRetryTimesErr != KErrNone )
+ {
+ HTI_LOG_TEXT( "RetryTimes is not defined in cfg, using default" );
+ }
+ HTI_LOG_FORMAT( " RetryTimes = %d", retryTimes );
+
+ TInt retryInterval = 10;
+ TRAPD( paramRetryIntervalErr,
+ retryInterval = iCfg->GetParameterIntL( KUsbRetryInterval ) );
+ if ( paramRetryIntervalErr != KErrNone )
+ {
+ HTI_LOG_TEXT( "RetryInterval is not defined in cfg, using default" );
+ }
+ HTI_LOG_FORMAT( " RetryInterval = %d(s)", retryInterval );
+
+ // retry to open the port
+ for( TInt i=0; i<retryTimes; i++ )
+ {
+ User::After( retryInterval * 1000000 );
+ err = iCommPort.Open( iCommServ, commPort, ECommExclusive, ECommRoleDTE );
+ if( !err )
+ {
+ break;
+ }
+ }
+
+ if( err )
+ {
+ HTI_LOG_FORMAT( "Failed to open port %d", err );
+ ShowErrorNotifierL( _L( "Failed to open port" ), err );
+ }
}
User::LeaveIfError( err );
HTI_LOG_TEXT( "Port open - checking port capabilities" );
--- a/hti/HtiFramework/src/HtiCommAdapter.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiFramework/src/HtiCommAdapter.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,11 +18,11 @@
#include "HtiCommAdapter.h"
#include "HtiDispatcher.h"
-#include "HTICommPluginInterface.h"
+#include "HtiCommPluginInterface.h"
#include "HtiMessage.h"
#include "HtiNotifier.h"
-#include "HTILogging.h"
+#include "HtiLogging.h"
//default value for max message size for incoming messages
//used if value in constructor is not valid (<0)
--- a/hti/HtiFramework/src/HtiDispatcher.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiFramework/src/HtiDispatcher.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -20,10 +20,10 @@
#include "HtiDispatcher.h"
#include "HtiMessage.h"
#include "HtiMessageQueue.h"
-#include "HTILogging.h"
+#include "HtiLogging.h"
#include "HtiCommAdapter.h"
-#include "HTIServicePluginInterface.h"
-#include "HTICommPluginInterface.h"
+#include "HtiServicePluginInterface.h"
+#include "HtiCommPluginInterface.h"
#include "HtiSecurityManager.h"
#include "HtiVersion.h"
--- a/hti/HtiServicePlugins/HtiAppServicePlugin/inc/HtiAppServicePlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiAppServicePlugin/inc/HtiAppServicePlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// CONSTANTS
--- a/hti/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppServicePlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppServicePlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -22,7 +22,7 @@
#include "HtiAppServicePlugin.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
// CONSTANTS
const static TUid KAppServiceUid = { 0x1020DEC7 };
--- a/hti/HtiServicePlugins/HtiEchoServicePlugin/inc/HtiEchoServicePlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiEchoServicePlugin/inc/HtiEchoServicePlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
#define CHTIECHOSERVICEPLUGIN_H__
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// CONSTANTS
--- a/hti/HtiServicePlugins/HtiEchoServicePlugin/src/HtiEchoServicePlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiEchoServicePlugin/src/HtiEchoServicePlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -17,9 +17,9 @@
// INCLUDE FILES
-#include "HtiEchoServiceplugin.h"
+#include "HtiEchoServicePlugin.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
// CONSTANTS
const static TUid KEchoServiceUid = { 0x1020DEBF };
--- a/hti/HtiServicePlugins/HtiFtpServicePlugin/inc/HtiFtpServicePlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiFtpServicePlugin/inc/HtiFtpServicePlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32std.h>
#include <f32file.h>
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// CONSTANTS
enum TFtpCommand
--- a/hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -20,7 +20,7 @@
#include "HtiFtpServicePlugin.h"
#include <HtiFtpBackupFakeBase.h>
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include <e32property.h>
#include <hash.h>
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Inc/CIPProxyEngine.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Inc/CIPProxyEngine.h Sat Feb 20 00:22:34 2010 +0200
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <es_sock.h>
#include "MIPProxyEngine.h"
-#include "MHostConnectionObserver.h"
+#include "Mhostconnectionobserver.h"
#include "MLocalTCPConnectionObserver.h"
#include "MTCPPortListenerObserver.h"
#include "MSocketRouterObserver.h"
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CExprTCPClose.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CExprTCPClose.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -88,7 +88,7 @@
TPtr8 dataToParse( aData.MidTPtr( aStartPos ) );
- TInt err = TryParsing( dataToParse, aLength );
+ TInt err = TryParsingL( dataToParse, aLength );
if ( err != KErrNone )
{
@@ -110,7 +110,7 @@
// CExprTCPClose::TryParsing
// -----------------------------------------------------------------------------
//
-TInt CExprTCPClose::TryParsing( TDes8& aData, TInt& aLength )
+TInt CExprTCPClose::TryParsingL( TDes8& aData, TInt& aLength )
{
__ASSERT_ALWAYS( aData.Left( KTCPClosePrefix().Length() ) == KTCPClosePrefix,
User::Panic( _L("Protocol"), 1 ) );
@@ -133,7 +133,7 @@
}
// send parsed results
- iObserver->CloseTCPConnection( port );
+ iObserver->CloseTCPConnectionL( port );
aLength = frameOverhead;
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CExprTCPClose.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CExprTCPClose.h Sat Feb 20 00:22:34 2010 +0200
@@ -68,7 +68,7 @@
public: // new functions
- TInt TryParsing( TDes8& aData, TInt& aLength );
+ TInt TryParsingL( TDes8& aData, TInt& aLength );
private:
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CIPProxyEngine.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CIPProxyEngine.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -19,9 +19,9 @@
// INCLUDE FILES
#include "CIPProxyEngine.h"
-#include "CTCPPortListener.h"
+#include "Ctcpportlistener.h"
#include "CLocalTCPConnection.h"
-#include "CSocketRouter.h"
+#include "Csocketrouter.h"
#include "MIPProxyEngineObserver.h"
#include "MHostConnection.h"
#include "MAbstractConnection.h"
@@ -528,6 +528,7 @@
DEBUG_PRINT( DEBUG_STRING(
"CIPProxyEngine::CloseTCPConnection(), port=%d"), aPort );
+ // Delete local TCP connections
TInt index = FindLocalTCPConn( aPort );
if ( index > -1 )
{
@@ -538,6 +539,25 @@
DEBUG_PRINT( DEBUG_STRING(
"CIPProxyEngine::CloseTCPConnection(), conn deleted.") );
}
+
+ // stop listening on this port
+ TInt peerListenerArrayCount = iPeerListenerArray->Count();
+ for ( TInt i = 0; i < peerListenerArrayCount; i++ )
+ {
+ CTCPPortListener* listener = iPeerListenerArray->At( i );
+ if(listener->Port() == aPort)
+ {
+ listener->Cancel();
+ iPeerListenerArray->Delete(i);
+ delete listener;
+ break;
+ }
+ }
+
+ if(iPeerListenerArray->Count() == 0)
+ {
+ iListening = EFalse;
+ }
}
// -----------------------------------------------------------------------------
@@ -552,6 +572,8 @@
iSocketRouter->ResetQueue();
iSocketRouter->RemoveAllPeers();
+ iLocalConnArray->ResetAndDestroy();
+
StopListening();
if ( iPeerListenerArray )
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CProtocolTCP.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CProtocolTCP.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -158,9 +158,9 @@
// CProtocolTCP::CloseTCPConnection
// -----------------------------------------------------------------------------
//
-void CProtocolTCP::CloseTCPConnection( TUint aPort )
+void CProtocolTCP::CloseTCPConnectionL( TUint aPort )
{
- iObserver->CloseTCPConnection( aPort );
+ iObserver->CloseTCPConnectionL( aPort );
}
// -----------------------------------------------------------------------------
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CProtocolTCP.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CProtocolTCP.h Sat Feb 20 00:22:34 2010 +0200
@@ -70,7 +70,7 @@
void ProtocolErrorL( TInt aErrorCode, const TDesC8& aReceivedData );
void OpenLocalTCPConnectionL( TUint aPort );
void OpenListeningTCPConnectionL( TUint aPort );
- void CloseTCPConnection( TUint aPort );
+ void CloseTCPConnectionL( TUint aPort );
void CloseAllTCPConnections();
public: // From MBPProtocol
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CProtocolUDP.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CProtocolUDP.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -132,22 +132,42 @@
"CProtocolUDP::WriteFrameL(), peer port=%d, original port=%d" ),
aPeerPort, aOriginalPort );
- aSocketWriter.WriteL( KUDPPrefix );
-
- TBuf8<KHexDecimalLength> portBuf;
- portBuf.Format( KHexFormat, aPeerPort );
- aSocketWriter.WriteL( portBuf );
- aSocketWriter.WriteL( KPortSuffix );
+ TInt bufSize = 0;
+ bufSize += KUDPPrefix().Length();
+ bufSize += KHexDecimalLength;
+ bufSize += KPortSuffix().Length();
+ bufSize += KHexDecimalLength;
+ bufSize += KLengthSuffix().Length();
+ bufSize += aData.Length();
+ bufSize += KDataSuffix().Length();
+ bufSize += KMessageSuffix().Length();
+
+ TBuf8<KHexDecimalLength> hexbuf;
+ HBufC8* buf = HBufC8::NewLC( bufSize );
+ TPtr8 ptr( buf->Des() );
+
+ // Append UDP prefix
+ ptr.Append( KUDPPrefix );
- TBuf8<KHexDecimalLength> lengthBuf;
- lengthBuf.Format( KHexFormat, aData.Length() );
- aSocketWriter.WriteL( lengthBuf );
+ // Append peer port
+ hexbuf.Format( KHexFormat, aPeerPort );
+ ptr.Append( hexbuf );
+ ptr.Append( KPortSuffix );
+
+ // Append data length
+ hexbuf.Format( KHexFormat, aData.Length() );
+ ptr.Append( hexbuf );
+ ptr.Append( KLengthSuffix );
- aSocketWriter.WriteL( KLengthSuffix );
- aSocketWriter.WriteL( aData );
- aSocketWriter.WriteL( KDataSuffix );
+ // Append data
+ ptr.Append( aData );
+ ptr.Append( KDataSuffix );
+ ptr.Append( KMessageSuffix );
+
+ // Write to socket
+ aSocketWriter.WriteL( *buf );
- aSocketWriter.WriteL( KMessageSuffix );
+ CleanupStack::PopAndDestroy( buf );
}
// -----------------------------------------------------------------------------
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CSocketReader.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/CSocketReader.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
-#include "CSocketReader.h"
+#include "Csocketreader.h"
#include "MSocketReaderObserver.h"
#include <badesca.h>
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Csocket.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Csocket.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,11 +18,11 @@
// INCLUDE FILES
-#include "CSocket.h"
+#include "Csocket.h"
#include <es_sock.h>
#include <in_sock.h>
#include "CSocketWriter.h"
-#include "CSocketReader.h"
+#include "Csocketreader.h"
#include "MSocketObserver.h"
#define DEBUG_FILENAME "IPProxyEngine.log"
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Csocketrouter.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Csocketrouter.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDE FILES
-#include "CSocketRouter.h"
+#include "Csocketrouter.h"
#include "CommRouterDefinitions.h"
#include "MSocketRouterObserver.h"
#include "MBPProtocol.h"
@@ -215,13 +215,14 @@
// CSocketRouter::FindPeerSocket
// -----------------------------------------------------------------------------
//
-TInt CSocketRouter::FindPeerSocket( TUint aRemotePort )
+TInt CSocketRouter::FindPeerSocket( TUint aPort )
{
DEBUG_PRINT( DEBUG_STRING( "CSocketRouter::FindPeerSocket()" ) );
TInt count = iPeerSocketArray->Count();
for ( TInt i = 0; i < count; i++ )
{
- if ( iPeerSocketArray->At( i )->RemotePort() == aRemotePort )
+ if ( iPeerSocketArray->At( i )->RemotePort() == aPort
+ || iPeerSocketArray->At( i )->LocalPort() == aPort)
{
return i;
}
@@ -648,17 +649,24 @@
// CSocketRouter::CloseTCPConnection
// -----------------------------------------------------------------------------
//
-void CSocketRouter::CloseTCPConnection( TUint aPort )
+void CSocketRouter::CloseTCPConnectionL( TUint aPort )
{
DEBUG_PRINT( DEBUG_STRING( "CloseTCPConnection, port = %d" ), aPort );
+
// Close the socket if it exists
+ CArrayPtr<CSocket>* socketArrayForDestroy = new (ELeave) CArrayPtrFlat<CSocket> ( 10 );
+ CleanupStack::PushL(socketArrayForDestroy);
TInt index = FindPeerSocket( aPort );
- if ( index > -1 )
+ while ( index > -1 )
{
- RemovePeerSocket( index );
+ socketArrayForDestroy->AppendL(iPeerSocketArray->At( index ));
+ iPeerSocketArray->Delete(index);
+ index = FindPeerSocket( aPort );
}
+ socketArrayForDestroy->ResetAndDestroy();
+ CleanupStack::PopAndDestroy(socketArrayForDestroy);
- if ( iObserver && index > -1 )
+ if ( iObserver )
{
iObserver->CloseTCPConnection( aPort );
}
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Csocketrouter.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Csocketrouter.h Sat Feb 20 00:22:34 2010 +0200
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
-#include "CSocket.h"
+#include "Csocket.h"
#include "MSocketObserver.h"
#include "MProtocolObserverTCP.h"
#include "MProtocolObserverUDP.h"
@@ -101,10 +101,10 @@
/**
* Finds peer socket from the array.
- * @param aRemotePort A port to remove from the array
+ * @param aPort A port to remove from the array
* @return index of the peer socket, -1 if not found
*/
- TInt FindPeerSocket( TUint aRemotePort );
+ TInt FindPeerSocket( TUint aPort );
/**
* Removes all peer sockets from the array.
@@ -185,7 +185,7 @@
void TCPFrameParsedL( TUint aPort, const TDesC8& aData );
void OpenLocalTCPConnectionL( TUint aPort );
void OpenListeningTCPConnectionL( TUint aPort );
- void CloseTCPConnection( TUint aPort );
+ void CloseTCPConnectionL( TUint aPort );
void CloseAllTCPConnections();
protected: // From MProtocolObserverUDP
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Ctcpportlistener.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/Ctcpportlistener.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -17,7 +17,7 @@
// INCLUDE FILES
-#include "CTCPPortListener.h"
+#include "Ctcpportlistener.h"
#include "MTCPPortListenerObserver.h"
#include <in_sock.h>
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/MExpressionObserverTCP.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/MExpressionObserverTCP.h Sat Feb 20 00:22:34 2010 +0200
@@ -40,7 +40,7 @@
virtual void OpenListeningTCPConnectionL( TUint aPort ) = 0;
- virtual void CloseTCPConnection( TUint aPort ) = 0;
+ virtual void CloseTCPConnectionL( TUint aPort ) = 0;
virtual void CloseAllTCPConnections() = 0;
};
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/MProtocolObserverTCP.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/IPProxyEngine/Src/MProtocolObserverTCP.h Sat Feb 20 00:22:34 2010 +0200
@@ -60,7 +60,7 @@
* Close a TCP connection
* @param aPort Remote port number to close
*/
- virtual void CloseTCPConnection( TUint aPort ) = 0;
+ virtual void CloseTCPConnectionL( TUint aPort ) = 0;
/**
* Close all TCP connections from listening & connecting ports
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/inc/HtiIpProxyServicePlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/inc/HtiIpProxyServicePlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
#define HTIIPPROXYSERVICEPLUGIN_H__
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
#include "MSocket.h"
#include "MHostConnection.h"
#include "MAbstractConnection.h"
--- a/hti/HtiServicePlugins/HtiIpProxyServicePlugin/src/HtiIpProxyServicePlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiIpProxyServicePlugin/src/HtiIpProxyServicePlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -19,11 +19,11 @@
// INCLUDE FILES
#include "HtiIpProxyServicePlugin.h"
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include <badesca.h>
#include <in_sock.h>
#include "MSocketObserver.h"
-#include "MHostConnectionObserver.h"
+#include "Mhostconnectionobserver.h"
#include "CIPProxyEngine.h"
// CONSTANTS
--- a/hti/HtiServicePlugins/HtiStifTfServicePlugin/inc/HtiStifTfIf.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiStifTfServicePlugin/inc/HtiStifTfIf.h Sat Feb 20 00:22:34 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <StifTFwIf.h>
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// CONSTANTS
--- a/hti/HtiServicePlugins/HtiStifTfServicePlugin/inc/HtiStifTfServicePlugin.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiStifTfServicePlugin/inc/HtiStifTfServicePlugin.h Sat Feb 20 00:22:34 2010 +0200
@@ -22,7 +22,7 @@
#define HTISTIFTFSERVICEPLUGIN_H
// INCLUDES
-#include <HTIServicePluginInterface.h>
+#include <HtiServicePluginInterface.h>
// CONSTANTS
--- a/hti/HtiServicePlugins/HtiStifTfServicePlugin/src/HtiStifTfServicePlugin.cpp Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/HtiServicePlugins/HtiStifTfServicePlugin/src/HtiStifTfServicePlugin.cpp Sat Feb 20 00:22:34 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDE FILES
#include <e32std.h>
#include <HtiDispatcherInterface.h>
-#include <HTILogging.h>
+#include <HtiLogging.h>
#include "HtiStifTfServicePlugin.h"
#include "HtiStifTfIf.h"
--- a/hti/hti_plat/hti_api/inc/HtiVersion.h Tue Feb 02 10:12:29 2010 +0200
+++ b/hti/hti_plat/hti_api/inc/HtiVersion.h Sat Feb 20 00:22:34 2010 +0200
@@ -25,13 +25,13 @@
// CONSTANTS
const TUint8 KHtiVersionMajor = 2;
-const TUint8 KHtiVersionMinor = 15;
+const TUint8 KHtiVersionMinor = 16;
const TUint8 KHtiVersionBuild = 0;
-const TUint16 KHtiVersionYear = 2009;
+const TUint16 KHtiVersionYear = 2010;
const TUint8 KHtiVersionMonth = 1;
-const TUint8 KHtiVersionWeek = 1;
-const TUint8 KHtiVersionDay = 8;
+const TUint8 KHtiVersionWeek = 3;
+const TUint8 KHtiVersionDay = 22;
// MACROS
--- a/stif/TestModuleTemplates/HardCodedTestModuleXXX/group/HardCodedTestModuleXXX_DoxyFile.txt Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/TestModuleTemplates/HardCodedTestModuleXXX/group/HardCodedTestModuleXXX_DoxyFile.txt Sat Feb 20 00:22:34 2010 +0200
@@ -2,7 +2,7 @@
# 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/stif/TestModuleTemplates/TemplateKernelScriptXXX/group/TemplateKernelScriptXXX_DoxyFile.txt Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/TestModuleTemplates/TemplateKernelScriptXXX/group/TemplateKernelScriptXXX_DoxyFile.txt Sat Feb 20 00:22:34 2010 +0200
@@ -2,7 +2,7 @@
# 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/stif/TestModuleTemplates/TemplateScriptXXX/group/TemplateScriptXXX_DoxyFile.txt Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/TestModuleTemplates/TemplateScriptXXX/group/TemplateScriptXXX_DoxyFile.txt Sat Feb 20 00:22:34 2010 +0200
@@ -2,7 +2,7 @@
# 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/stif/TestModuleTemplates/TestModuleXXX/group/TestModuleXXX_DoxyFile.txt Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/TestModuleTemplates/TestModuleXXX/group/TestModuleXXX_DoxyFile.txt Sat Feb 20 00:22:34 2010 +0200
@@ -2,7 +2,7 @@
# 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/stif/examples/STIFTestMeasurementStub/group/STIFTestMeasurementStub_DoxyFile.txt Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/examples/STIFTestMeasurementStub/group/STIFTestMeasurementStub_DoxyFile.txt Sat Feb 20 00:22:34 2010 +0200
@@ -2,7 +2,7 @@
# 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/stif/group/ReleaseNote.txt Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/group/ReleaseNote.txt Sat Feb 20 00:22:34 2010 +0200
@@ -1,5 +1,5 @@
========================================================================
-RELEASE NOTE FOR STIF - STIF_200952 (7.3.23)
+RELEASE NOTE FOR STIF - STIF_201003 (7.3.25)
SUPPORTING SERIES 60 3.0 ->
========================================================================
--- a/stif/group/bld.inf Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/group/bld.inf Sat Feb 20 00:22:34 2010 +0200
@@ -56,8 +56,8 @@
// Test Server Starter
#include "../TestServerStarter/group/bld.inf"
- // StifTfwIf
- #include "../StifTfwIf/group/bld.inf"
+ // StifTFwIf
+ #include "../StifTFwIf/group/bld.inf"
// Console UI
#include "../ConsoleUI/group/bld.inf"
--- a/stif/inc/version.h Tue Feb 02 10:12:29 2010 +0200
+++ b/stif/inc/version.h Sat Feb 20 00:22:34 2010 +0200
@@ -20,9 +20,9 @@
#define STIF_MAJOR_VERSION 7
#define STIF_MINOR_VERSION 3
-#define STIF_BUILD_VERSION 23
+#define STIF_BUILD_VERSION 25
-#define STIF_REL_DATE "22nd Dec 2009"
+#define STIF_REL_DATE "19th Jan 2010"
#define TO_UNICODE(text) _L(text)
Binary file stif/sis/Stif_31.sis has changed