--- a/backupandrestore/backuptest/burtestserver/Group/bld.inf	Thu May 27 13:42:43 2010 +0300
+++ b/backupandrestore/backuptest/burtestserver/Group/bld.inf	Fri Jun 11 14:27:06 2010 +0300
@@ -40,9 +40,6 @@
 ../testscripts/test_restorepackage.script       z:/testdata/scripts/sbetestdata/test_restorepackage.script
 ../testscripts/test_increament.script           z:/testdata/scripts/sbetestdata/test_increament.script
 
-../testscripts/sbeconfig.xml                /epoc32/release/winscw/udeb/z/private/10202d56/sbeconfig.xml
-../testscripts/sbeconfig.xml                /epoc32/release/winscw/urel/z/private/10202d56/sbeconfig.xml
-
 PRJ_TESTMMPFILES
     burtestserver.mmp
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/bld.inf	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* 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: 
+*
+*/
+
+
+// Local Connectivity Service Component
+#include "../remoteconn_plat/group/bld.inf"
+#include "../localconnectivityservice/group/bld.inf"
+
+// MTP Component
+#include "../mtpdataproviders/mtppictbridgedp/pictbridgeengine/group/bld.inf"
+#include "../mtpfws/mtpfw/group/bld.inf"
+#include "../mtpdataproviders/mtpfileandfolderdp/group/bld.inf"
+#include "../mtpdataproviders/mtpwmpextndp/group/bld.inf"
+#include "../mtptransports/mtpusbtransport/group/bld.inf"
+#include "../mtpfws/mtpfw/dataproviders/devdp/devdpextn/group/bld.inf"
+#include "../mtptransports/mtpptpiptransport/group/bld.inf"
+#include "../mtptransports/mtpbttransport/group/bld.inf"
+#include "../mtpdataproviders/mtpmetadatadp/group/bld.inf"
+#include "../mtpdataproviders/mtpstatusdp/group/bld.inf"
+#include "../mtpdataproviders/mtppictbridgedp/group/bld.inf"
+#include "../mtpdataproviders/mtpimagedp/group/bld.inf"
+
+#ifdef FF_MTP_CONTROLLER
+#include        "../mtptransports/mtpcontroller/group/bld.inf"
+#endif//FF_MTP_CONTROLLER
+
+// SBE Component
+#include "../backupandrestore/backupengine/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/dummy.txt	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,3 @@
+test1.
+
+test2.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/layers.sysdef.xml	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
+  <!ENTITY layer_real_source_path "sf/mw/remoteconn" >
+]>
+
+<SystemDefinition name="Remoteconn" schema="1.5.1">
+  <systemModel>
+    <layer name="mw_layer">
+      	<module name="localconnectivityservice">
+         <unit unitID="lcdo.localconnectivityservice" mrp="" bldFile="&layer_real_source_path;/localconnectivityservice/group" name="localconnectivityservice" />
+      	</module>
+      	<module name="dialup_connection_service_api">
+         <unit unitID="lcdo.localconnectivityservice.dialup_connection_status_api" mrp="" bldFile="&layer_real_source_path;/remoteconn_plat/dialup_connection_status_api/group" name="dialup_connection_status_api"/>
+      	</module>
+	<module name="dun_secondary_display_notification_api">
+         <unit unitID="lcdo.localconnectivityservice.dun_secondary_display_notification_api" mrp="" bldFile="&layer_real_source_path;/remoteconn_plat/dun_secondary_display_notification_api/group" name="dun_secondary_display_notification_api"/>
+      	</module>
+	<module name="generic_hid_api">
+         <unit unitID="lcdo.localconnectivityservice.generic_hid_api" mrp="" bldFile="&layer_real_source_path;/remoteconn_plat/generic_hid_api/group" name="generic_hid_api"/>
+      	</module>
+	<module name="locod_bearer_plugin_api">
+         <unit unitID="lcdo.localconnectivityservice.locod_bearer_plugin_api" mrp="" bldFile="&layer_real_source_path;/remoteconn_plat/locod_bearer_plugin_api/group" name="locod_bearer_plugin_api"/>
+      	</module>
+	<module name="locod_service_plugin_api">
+         <unit unitID="lcdo.localconnectivityservice.locod_service_plugin_api" mrp="" bldFile="&layer_real_source_path;/remoteconn_plat/locod_service_plugin_api/group" name="locod_service_plugin_api"/>
+      	</module>
+	<module name="mtppictbridgedp">
+      	<unit unitID="lcdo.localconnectivityservice.mtppictbridgeengine" mrp="" bldFile="&layer_real_source_path;/mtpdataproviders/mtppictbridgedp/pictbridgeengine/group" name="mtppictbridgeengine"/>
+      	</module>
+		
+	        <module name="MTP Framework">
+				<unit name="MTP_Framework" unitID="smw.mtpfws.mtpfw" bldFile="sf\mw\remoteconn\mtpfws\mtpfw\group" mrp="sf\mw\remoteconn\mtpfws\mtpfw\group\mtp_framework.mrp"/>
+			</module>
+
+			<module name="MTP File and Folder Provider">
+				<unit name="MTP_File_Folder" unitID="smw.mtpdps.mtpfilefolder" bldFile="sf\mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group\mtp_filedp.mrp"/>
+			</module>
+
+			<module name="WMP Extension Data Provider">
+				<unit name="MTP_ExtDP" unitID="smw.mtpdps.mtpextdp" bldFile="sf\mw\remoteconn\mtpdataproviders\mtpwmpextndp\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtpwmpextndp\group\mtp_wmpextndp.mrp"/>
+			</module>
+		  
+			<module name="MTP USB Transport">
+				<unit name="MTP_Usb" unitID="smw.mtptsp.mtpusbtsp" bldFile="sf\mw\remoteconn\mtptransports\mtpusbtransport\group" mrp="sf\mw\remoteconn\mtptransports\mtpusbtransport\group\mtp_usbsic.mrp"/>
+			</module>
+
+			<module name="MTP Device Provider Extension">
+				<unit name="MTP_DPExt" unitID="smw.mtpfws.devdp" bldFile="sf\mw\remoteconn\mtpfws\mtpfw\dataproviders\devdp\devdpextn\group" mrp=""/>
+			</module>
+
+			<module name="MTP PTP-IP Transport">
+				<unit name="MTP_PTP_IP" unitID="smw.mtptsp.mtpptpip" bldFile="sf\mw\remoteconn\mtptransports\mtpptpiptransport\group" mrp="sf\mw\remoteconn\mtptransports\mtpptpiptransport\group\mtp_ptpip.mrp"/>
+			</module>
+
+			<module name="MTP Bluetooth Transport">
+				<unit name="MTP_Bt_Tsp" unitID="smw.mtptsp.mtpbt" bldFile="sf\mw\remoteconn\mtptransports\mtpbttransport\group" mrp="sf\mw\remoteconn\mtptransports\mtpbttransport\group\mtp_bt.mrp"/>
+			</module>
+
+			<module name="MTP Device Metadata Data Provider">
+				<unit name="MTP_MetaDP" unitID="smw.mtpdps.mtpmetadp" bldFile="sf\mw\remoteconn\mtpdataproviders\mtpmetadatadp\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtpmetadatadp\group\mtp_metadatadp.mrp"/>
+			</module>
+
+			<module name="MTP Status Data Provider">
+				<unit name="MTP_StatDP" unitID="smw.mtpdps.mtpstatdp" bldFile="sf\mw\remoteconn\mtpdataproviders\mtpstatusdp\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtpstatusdp\group\mtp_statusdp.mrp"/>
+			</module>
+
+			<module name="MTP PictBridge Data Provider">
+				<unit name="MTP_Pic_Bri" unitID="smw.mtpdps.mtppicbri" bldFile="sf\mw\remoteconn\mtpdataproviders\mtppictbridgedp\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtppictbridgedp\group\mtp_pictbridgedp.mrp"/>
+			</module>
+
+			<module name="MTP Image Data Provider">
+				<unit name="MTP_ImageDP" unitID="smw.mtptsp.mtpimagedp" bldFile="sf\mw\remoteconn\mtpdataproviders\mtpimagedp\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtpimagedp\group\mtp_imagedp.mrp"/>
+			</module>
+			
+			<module name="Backup Engine">
+				<unit name="backupengine" unitID="smw.br.backupengine" bldFile="sf\mw\remoteconn\backupandrestore\backupengine\group" mrp="sf\mw\remoteconn\backupandrestore\backupengine\group\connectivity_backupengine.mrp"/>
+			</module>
+
+			
+    </layer>
+  </systemModel>
+</SystemDefinition>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/bwins/dunatextu.def	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,12 @@
+EXPORTS
+	?StopUrc@CDunAtCmdHandler@@QAEHXZ @ 1 NONAME ; int CDunAtCmdHandler::StopUrc(void)
+	?Stop@CDunAtCmdHandler@@QAEHXZ @ 2 NONAME ; int CDunAtCmdHandler::Stop(void)
+	?SetEndOfCmdLine@CDunAtCmdHandler@@QAEXH@Z @ 3 NONAME ; void CDunAtCmdHandler::SetEndOfCmdLine(int)
+	?ResetData@CDunAtCmdHandler@@QAEXXZ @ 4 NONAME ; void CDunAtCmdHandler::ResetData(void)
+	?AddCmdModeCallback@CDunAtCmdHandler@@QAEHPAVMDunCmdModeMonitor@@@Z @ 5 NONAME ; int CDunAtCmdHandler::AddCmdModeCallback(class MDunCmdModeMonitor *)
+	?NewL@CDunAtCmdHandler@@SAPAV1@PAVMDunAtCmdStatusReporter@@PAVMDunStreamManipulator@@PBVTDesC8@@@Z @ 6 NONAME ; class CDunAtCmdHandler * CDunAtCmdHandler::NewL(class MDunAtCmdStatusReporter *, class MDunStreamManipulator *, class TDesC8 const *)
+	?ParseCommand@CDunAtCmdHandler@@QAEHAAVTDesC8@@AAH@Z @ 7 NONAME ; int CDunAtCmdHandler::ParseCommand(class TDesC8 &, int &)
+	?StartUrc@CDunAtCmdHandler@@QAEHXZ @ 8 NONAME ; int CDunAtCmdHandler::StartUrc(void)
+	?ManageAbortRequest@CDunAtCmdHandler@@QAEHXZ @ 9 NONAME ; int CDunAtCmdHandler::ManageAbortRequest(void)
+	?SendEchoCharacter@CDunAtCmdHandler@@QAEHPBVTDesC8@@PAVMDunAtCmdEchoer@@@Z @ 10 NONAME ; int CDunAtCmdHandler::SendEchoCharacter(class TDesC8 const *, class MDunAtCmdEchoer *)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/eabi/dunatextu.def	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,12 @@
+EXPORTS
+	_ZN16CDunAtCmdHandler12ParseCommandER6TDesC8Ri @ 1 NONAME
+	_ZN16CDunAtCmdHandler15SetEndOfCmdLineEi @ 2 NONAME
+	_ZN16CDunAtCmdHandler18AddCmdModeCallbackEP18MDunCmdModeMonitor @ 3 NONAME
+	_ZN16CDunAtCmdHandler4NewLEP23MDunAtCmdStatusReporterP21MDunStreamManipulatorPK6TDesC8 @ 4 NONAME
+	_ZN16CDunAtCmdHandler4StopEv @ 5 NONAME
+	_ZN16CDunAtCmdHandler7StopUrcEv @ 6 NONAME
+	_ZN16CDunAtCmdHandler8StartUrcEv @ 7 NONAME
+	_ZN16CDunAtCmdHandler9ResetDataEv @ 8 NONAME
+	_ZN16CDunAtCmdHandler18ManageAbortRequestEv @ 9 NONAME
+	_ZN16CDunAtCmdHandler17SendEchoCharacterEPK6TDesC8P15MDunAtCmdEchoer @ 10 NONAME
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/group/bld.inf	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2008 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: 
+*	 This file provides the information required for building the
+*    whole of DUN ATEXT
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+../../rom/dunatext.iby         CORE_MW_LAYER_IBY_EXPORT_PATH(dunatext.iby)
+
+PRJ_MMPFILES
+dunatext.mmp
+
+PRJ_TESTMMPFILES

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/group/dunatext.mmp	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2008 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:  Project definition file for project DUN ATEXT
+*
+*/
+
+
+#include <data_caging_paths.hrh>
+#include <platform_paths.hrh>
+
+TARGET                  dunatext.dll
+TARGETTYPE              DLL
+UID                     0x1000008d 0x2001CBE6
+
+CAPABILITY              CAP_GENERAL_DLL
+VENDORID                VID_DEFAULT
+
+SOURCEPATH              ../src
+SOURCE                  DunAtCmdEchoer.cpp
+SOURCE                  DunAtCmdHandler.cpp
+SOURCE                  DunAtCmdPusher.cpp
+SOURCE                  DunAtUrcHandler.cpp
+SOURCE                  DunAtModeListen.cpp
+SOURCE                  DunAtEcomListen.cpp
+SOURCE                  DunAtNvramListen.cpp
+SOURCE                  DunAtSpecialCmdHandler.cpp
+
+USERINCLUDE             ../inc ../../utils/inc
+
+MW_LAYER_SYSTEMINCLUDE
+
+// Note:
+// The only other SYSTEMINCLUDE should you shall add are Symbian specific ones.
+// If there is a S60 header in the subdirectory then that should be
+// added into the include statements (like #include <phonebook/header.h>)
+//SYSTEMINCLUDE           /epoc32/include/ecom
+SYSTEMINCLUDE           ../../../inc
+
+LIBRARY                 atextclient.lib
+LIBRARY                 atextcommon.lib
+LIBRARY                 euser.lib
+LIBRARY                 bafl.lib
+DEBUGLIBRARY            flogger.lib

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/inc/DunAtCmdEchoer.h	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,135 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* 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:  Echoer for AT commands
+*
+*/
+
+#ifndef C_CDUNATCMDECHOER_H
+#define C_CDUNATCMDECHOER_H
+
+#include "DunDataPusher.h"
+
+class MDunStreamManipulator;
+
+/**
+ *  Notification interface class for text mode
+ *
+ *  @lib dunatext.lib
+ *  @since TB9.2
+ */
+NONSHARABLE_CLASS( MDunAtCmdEchoer )
+    {
+
+public:
+
+    /**
+     * Notifies about completed echo in text mode
+     *
+     * @since TB9.2
+     * @return None
+     */
+    virtual void NotifyEchoComplete() = 0;
+
+    };
+
+/**
+ *  Class for AT command echoer
+ *
+ *  @lib dunatext.lib
+ *  @since TB9.2
+ */
+NONSHARABLE_CLASS( CDunAtCmdEchoer ) : public CBase,
+                                       public MDunCompletionReporter
+    {
+
+public:
+
+    /**
+     * Two-phased constructor.
+     * @param aStreamCallback Callback to stream
+     * @return Instance of self
+     */
+    static CDunAtCmdEchoer* NewL( MDunStreamManipulator* aStreamCallback );
+
+    /**
+    * Destructor.
+    */
+    virtual ~CDunAtCmdEchoer();
+
+    /**
+     * Resets data to initial values
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void ResetData();
+
+    /**
+     * Sends a character to be echoed
+     *
+     * @since TB9.2
+     * @param aInput Input to echo
+     * @param aCallback Callback to echo request completions
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt SendEchoCharacter( const TDesC8* aInput, MDunAtCmdEchoer* aCallback );
+
+private:
+
+    CDunAtCmdEchoer( MDunStreamManipulator* aStreamCallback );
+
+    void ConstructL();
+
+    /**
+     * Initializes this class
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void Initialize();
+
+// from base class MDunCompletionReporter
+
+    /**
+     * From MDunCompletionReporter.
+     * Gets called when data push is complete
+     *
+     * @since S60 5.0
+     * @param aAllPushed ETrue if all in the queue were pushed, EFalse otherwise
+     * @return None
+     */
+    void NotifyDataPushComplete( TBool aAllPushed );
+
+private:  // data
+
+    /**
+     * Notification interface class for echo request completions
+     * Not own.
+     */
+    MDunAtCmdEchoer* iCallback;
+
+    /**
+     * Callback to call when data to push
+     * Not own.
+     */
+    MDunStreamManipulator* iStreamCallback;
+
+    /**
+     * Current state of echoing: active or inactive
+     */
+    TDunState iAtEchoState;
+
+    };
+
+#endif  // C_CDUNATCMDECHOER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/inc/DunAtCmdHandler.h	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,996 @@
+/*
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* 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:  AT command handler and notifier
+*
+*/
+
+#ifndef C_CDUNATCMDHANDLER_H
+#define C_CDUNATCMDHANDLER_H
+
+#include <atext.h>
+#include <e32base.h>
+#include <atextcommon.h>
+#include "DunDataPusher.h"
+#include "DunAtCmdPusher.h"
+#include "DunAtCmdEchoer.h"
+#include "DunAtEcomListen.h"
+#include "DunAtModeListen.h"
+#include "DunAtNvramListen.h"
+#include "DunAtSpecialCmdHandler.h"
+
+const TInt KDunChSetMaxCharLen = 1;          // Only ASCII supported for now
+const TInt KDunOkBufLength     = 1+1+2+1+1;  // <CR>+<LF>+"OK"+<CR>+<LF>
+const TInt KDunErrorBufLength  = 1+1+5+1+1;  // <CR>+<LF>+"ERROR"+<CR>+<LF>
+const TInt KDunInputBufLength  = (512 + 1);  // 512 chars for command + <CR>
+const TInt KDunEscBufLength    = 1;          // Escape (0x1B) character
+
+class CDunAtUrcHandler;
+class MDunConnMon;
+class MDunStreamManipulator;
+
+/**
+ *  Class used for storing information related to string conversion and parsing
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v3.2
+ */
+NONSHARABLE_CLASS( TDunParseInfo )
+    {
+
+public:
+
+    /**
+     * Buffer for sending
+     */
+    TBuf8<KDunInputBufLength> iSendBuffer;
+
+    /**
+     * Conversion limit for upper case conversion.
+     * This is needed to convert the base part of special commands to upper case
+     * where the part after the base part should not be converted to upper case.
+     */
+    TInt iLimit;
+
+    };
+
+/**
+ *  Class used for AT command decoding related functionality
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( TDunDecodeInfo )
+    {
+
+public:
+
+    /**
+     * Flag to indicate if first decode
+     */
+    TBool iFirstDecode;
+
+    /**
+     * Index in iInputBuffer for decoding to iDecodeBuffer
+     */
+    TInt iDecodeIndex;
+
+    /**
+     * Index in iInputBuffer for extended character position 
+     */
+    TInt iExtendedIndex;
+
+    /**
+     * Previous character in parsing
+     */
+    TChar iPrevChar;
+
+    /**
+     * Flag to indicate if previous character exists
+     */
+    TBool iPrevExists;
+
+    /**
+     * Flag to indicate if assignment mark found
+     */
+    TBool iAssignFound;
+
+    /**
+     * Flag to indicate if processing inside quotes 
+     */
+    TBool iInQuotes;
+
+    /**
+     * Flag to indicate if special subcommand found
+     */
+    TBool iSpecialFound;
+    
+    /**
+     * Buffer for parsing
+     */
+    TBuf8<KDunInputBufLength> iDecodeBuffer;
+
+    };
+
+/**
+ *  Class used for AT command editor mode related functionality
+ *
+ *  @lib dunatext.lib
+ *  @since TB9.2
+ */
+NONSHARABLE_CLASS( TDunEditorModeInfo )
+    {
+
+public:
+
+    /**
+     * Flag to indicate if content found (not used if iContentFindStarted is EFalse)
+     */
+    TBool iContentFound;
+
+    /**
+     * AT command decoding related information for peeked data
+     * (not to be used if HandleNextDecodedCommand() returns EFalse)
+     */
+    TDunDecodeInfo iPeekInfo;
+
+    };
+
+/**
+ *  Notification interface class for command mode start/end
+ *
+ *  @lib dunutils.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( MDunCmdModeMonitor )
+    {
+
+public:
+
+    /**
+     * Notifies about command mode start
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    virtual void NotifyCommandModeStart() = 0;
+
+    /**
+     * Notifies about command mode end
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    virtual void NotifyCommandModeEnd() = 0;
+
+    };
+
+/**
+ *  Notification interface class for status changes in AT command handling
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( MDunAtCmdStatusReporter )
+    {
+
+public:
+
+    /**
+     * Notifies about AT command handling start
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    virtual void NotifyAtCmdHandlingStart() = 0;
+
+    /**
+     * Notifies about AT command handling end
+     *
+     * @since S60 5.0
+     * @param aEndIndex Index to the start of next command
+     * @return None
+     */
+    virtual void NotifyAtCmdHandlingEnd( TInt aStartIndex ) = 0;
+
+    /**
+     * Notifies about editor mode reply
+     *
+     * @since TB9.2
+     * @param aStart ETrue if start of editor mode, EFalse otherwise
+     * @return None
+     */
+    virtual void NotifyEditorModeReply( TBool aStart ) = 0;
+
+    };
+
+/**
+ *  Class for AT command handler and notifier
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( CDunAtCmdHandler ) : public CBase,
+                                        public MDunAtCmdPusher,
+                                        public MDunAtEcomListen,
+                                        public MDunAtModeListen
+    {
+
+public:
+
+    /**
+     * Two-phased constructor.
+     * @param aUpstream Callback to upstream
+     * @param aDownstream Callback to downstream
+     * @param aConnectionName Connection identifier name
+     * @return Instance of self
+     */
+	IMPORT_C static CDunAtCmdHandler* NewL(
+	    MDunAtCmdStatusReporter* aUpstream,
+	    MDunStreamManipulator* aDownstream,
+	    const TDesC8* aConnectionName );
+
+    /**
+    * Destructor.
+    */
+    virtual ~CDunAtCmdHandler();
+
+    /**
+     * Resets data to initial values
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    IMPORT_C void ResetData();
+
+    /**
+     * Adds callback for command mode notification
+     * The callback will be called when command mode starts or ends
+     *
+     * @since S60 5.0
+     * @param aCallback Callback to call when command mode starts or ends
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt AddCmdModeCallback( MDunCmdModeMonitor* aCallback );
+
+    /**
+     * Parses an AT command
+     *
+     * @since S60 5.0
+     * @param aCommand Command to parse
+     * @param aPartialInput ETrue if partial input, EFalse otherwise
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt ParseCommand( TDesC8& aCommand, TBool& aPartialInput );
+
+    /**
+     * Manages request to abort command handling
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt ManageAbortRequest();
+
+    /**
+     * Sets end of command line marker on for the possible series of AT
+     * commands.
+     *
+     * @since S60 5.0
+     * @param aClearInput ETrue to clear input buffer, EFalse otherwise
+     * @return None
+     */
+    IMPORT_C void SetEndOfCmdLine( TBool aClearInput );
+
+    /**
+     * Sends a character to be echoed
+     *
+     * @since TB9.2
+     * @param aInput Input to echo
+     * @param aCallback Callback to echo request completions
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt SendEchoCharacter( const TDesC8* aInput,
+                                     MDunAtCmdEchoer* aCallback );
+
+    /**
+     * Stops sending of AT command from decode buffer
+     *
+     * @since S60 3.2
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt Stop();
+
+    /**
+     * Starts URC message handling
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt StartUrc();
+
+    /**
+     * Stops URC message handling
+     *
+     * @since S60 3.2
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    IMPORT_C TInt StopUrc();
+
+private:
+
+    CDunAtCmdHandler( MDunAtCmdStatusReporter* aUpstream,
+                      MDunStreamManipulator* aDownstream,
+                      const TDesC8* aConnectionName );
+
+    void ConstructL();
+
+    /**
+     * Initializes this class
+     *
+     * @since S60 3.2
+     * @return None
+     */
+    void Initialize();
+
+    /**
+     * Creates plugin handlers for this class
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void CreatePluginHandlersL();
+
+    /**
+     * Creates the array of special commands
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void CreateSpecialCommandsL();
+
+    /**
+     * Recreates special command data.
+     * This is done when a plugin is installed or uninstalled.
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt RecreateSpecialCommands();
+
+    /**
+     * Gets default settings from RATExtCommon and sets them to RATExt
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void GetAndSetDefaultSettingsL();
+
+    /**
+     * Regenerates the reply strings based on settings
+     *
+     * @since S60 5.0
+     * @return ETrue if quiet mode, EFalse otherwise
+     */
+    TBool RegenerateReplyStrings();
+
+    /**
+     * Regenerates the ok reply based on settings
+     *
+     * @since S60 5.0
+     * @return ETrue if quiet mode, EFalse otherwise
+     */
+    TBool RegenerateOkReply();
+
+    /**
+     * Regenerates the error reply based on settings
+     *
+     * @since S60 5.0
+     * @return ETrue if quiet mode, EFalse otherwise
+     */
+    TBool RegenerateErrorReply();
+
+    /**
+     * Gets current mode
+     *
+     * @since S60 5.0
+     * @param aMask Mask for current mode (only one supported)
+     * @return New current mode
+     */
+    TUint GetCurrentModeL( TUint aMask );
+
+    /**
+     * Instantiates one URC message handling class instance and adds it to
+     * the URC message handler array
+     *
+     * @since S60 3.2
+     * @return None
+     */
+    CDunAtUrcHandler* AddOneUrcHandlerL();
+
+    /**
+     * Deletes all instantiated URC message handlers
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void DeletePluginHandlers();
+
+    /**
+     * Manages partial AT command
+     *
+     * @since S60 5.0
+     * @param aCommand Command to process
+     * @param aNeedsCarriage ETrue if full and non-consumed AT command needs
+     *                       carriage return (AT command "A/")
+     * @return ETrue if no other processing needed, EFalse otherwise
+     */
+    TBool ManagePartialCommand( TDesC8& aCommand,
+                                TBool& aNeedsCarriage );
+
+    /**
+     * Echoes a command if echo is on
+     *
+     * @since S60 5.0
+     * @param aDes String descriptor
+     * @return ETrue if echo push started, EFalse otherwise
+     */
+    TBool EchoCommand( TDesC8& aDes );
+
+    /**
+     * Handles backspace and cancel characters
+     *
+     * @since S60 5.0
+     * @param aCommand Command to process
+     * @return ETrue if special character found, EFalse otherwise
+     */
+    TBool HandleSpecialCharacters( TDesC8& aCommand );
+
+    /**
+     * Appends command to input buffer
+     *
+     * @since S60 5.0
+     * @param aCommand Command to append to input buffer
+     * @param aEndFound ETrue if end (carriage return) was found
+     * @return ETrue if overflow was found, EFalse otherwise
+     */
+    TBool AppendCommandToInputBuffer( TDesC8& aCommand, TBool& aEndFound );
+
+    /**
+     * Handles next decoded command from input buffer
+     *
+     * @since S60 5.0
+     * @return ETrue if last command decoded, EFalse otherwise
+     */
+    TBool HandleNextDecodedCommand();
+
+    /**
+     * Finds the start of the next command
+     *
+     * @since TB9.2
+     * @return Index to the next command or Symbian error code on error
+     */
+    TInt FindStartOfNextCommand();
+
+    /**
+     * Manages end of AT command handling
+     *
+     * @since S60 5.0
+     * @param aNotifyExternal Notify external parties
+     * @param aNotifyLocal Notify local parties
+     * @param aClearInput ETrue to clear input buffer, EFalse otherwise
+     * @return None
+     */
+    void ManageEndOfCmdHandling( TBool aNotifyExternal,
+                                 TBool aNotifyLocal,
+                                 TBool aClearInput );
+
+    /**
+     * Extracts next decoded command from input buffer to decode buffer
+     *
+     * @since S60 5.0
+     * @param aPeek Peek for the next command if ETrue, EFalse otherwise
+     * @return ETrue if command extracted, EFalse otherwise
+     */
+    TBool ExtractNextDecodedCommand( TBool aPeek=EFalse );
+
+    /**
+     * Restores old decode info. For ExtractNextDecodedCommand() when aPeeks is
+     * ETrue.
+     *
+     * @since S60 5.0
+     * @param aPeek Peek for the next command if ETrue, EFalse otherwise
+     * @param aOldInfo Old information to restore when aPeek is ETrue
+     * @return None
+     */
+    void RestoreOldDecodeInfo( TBool aPeek, TDunDecodeInfo& aOldInfo );
+
+    /**
+     * Finds end of an AT command
+     *
+     * @since S60 5.0
+     * @param aDes String descriptor
+     * @param aStartIndex Start index for search
+     * @return Index if found, KErrNotFound otherwise
+     */
+    TInt FindEndOfCommand( TDesC8& aDes, TInt aStartIndex=0 );
+
+    /**
+     * Tests for end of AT command character
+     *
+     * @since S60 5.0
+     * @param aCharacter Character to test
+     * @return ETrue if end of command, EFalse otherwise
+     */
+    TBool IsEndOfCommand( TChar& aCharacter );
+
+    /**
+     * Finds start of a decoded AT command
+     *
+     * @since S60 5.0
+     * @param aDes String descriptor
+     * @param aStartIndex Start index for search
+     * @return Index if found, KErrNotFound otherwise
+     */
+    TInt FindStartOfDecodedCommand( TDesC8& aDes,
+                                    TInt aStartIndex );
+
+    /**
+     * Checks if character is delimiter character
+     *
+     * @since S60 5.0
+     * @param aCharacter Character to test
+     * @return ETrue if delimiter character, EFalse otherwise
+     */
+    TBool IsDelimiterCharacter( TChar aCharacter );
+
+    /**
+     * Checks if character is of extended group
+     *
+     * @since S60 5.0
+     * @param aCharacter Character to test
+     * @return ETrue if extended character, EFalse otherwise
+     */
+    TBool IsExtendedCharacter( TChar aCharacter );
+
+    /**
+     * Checks special command
+     *
+     * @since S60 5.0
+     * @param aStartIndex Start index (doesn't change)
+     * @param aEndIndex End index (changes)
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TBool CheckSpecialCommand( TInt aStartIndex,
+                               TInt& aEndIndex );
+
+    /**
+     * Saves character decode state for a found character
+     *
+     * @since TB9.2
+     * @param aCharacter Character to save a state for
+     * @param aAddSpecial ETrue to add character for special command,
+     *                    EFalse otherwise
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    void SaveFoundCharDecodeState( TChar aCharacter,
+                                   TBool aAddSpecial=ETrue );
+    
+    /**
+     * Saves character decode state for a not found character
+     *
+     * @since TB9.2
+     * @param aStartIndex Start index (doesn't change)
+     * @param aEndIndex End index (changes)
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    void SaveNotFoundCharDecodeState();
+
+    /**
+     * Find quotes within subcommands
+     *
+     * @since TB9.2
+     * @param aCharacter Character to check
+     * @param aStartIndex Start index (doesn't change)
+     * @param aEndIndex End index (changes)
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TBool FindSubCommandQuotes( TChar aCharacter, TInt aStartIndex, TInt& aEndIndex );
+
+    /**
+     * Check if in next subcommand's extended border
+     *
+     * @since TB9.2
+     * @param aCharacter Extended character to check
+     * @param aStartIndex Start index (doesn't change)
+     * @param aEndIndex End index (changes)
+     * @return ETrue if in next command's extended border, EFalse otherwise
+     */
+    TBool IsExtendedBorder( TChar aCharacter, TInt aStartIndex, TInt& aEndIndex );
+    
+    /**
+     * Finds subcommand with alphanumeric borders
+     *
+     * @since TB9.2
+     * @param aCharacter Character to check
+     * @param aEndIndex End index (changes)
+     * @return ETrue if alpha border found, EFalse otherwise
+     */
+    TBool FindSubCommandAlphaBorder( TChar aCharacter, TInt& aEndIndex );
+
+    /**
+     * Finds subcommand
+     *
+     * @since TB9.2
+     * @param aStartIndex Start index (doesn't change)
+     * @param aEndIndex End index (changes)
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt FindSubCommand( TInt aStartIndex, TInt& aEndIndex );
+
+    /**
+     * Check if "A/" command
+     *
+     * @since S60 5.0
+     * @return ETrue if "A/" command, EFalse otherwise
+     */
+    TBool IsASlashCommand();
+
+    /**
+     * Handles "A/" command
+     *
+     * @since S60 5.0
+     * @return ETrue if error reply push started, EFalse otherwise
+     */
+    TBool HandleASlashCommand();
+
+    /**
+     * Resets parse buffers
+     *
+     * @since S60 5.0
+     * @param aClearInput ETrue to clear input buffer, EFalse otherwise
+     * @return None
+     */
+    void ResetParseBuffers( TBool aClearInput=ETrue );
+
+    /**
+     * Manages command mode change
+     *
+     * @since S60 5.0
+     * @param aMode Mode to manage
+     * @return ETrue if command mode change detected, EFalse otherwise
+     */
+    TBool ManageCommandModeChange( TUint aMode );
+
+    /**
+     * Reports command mode start/end change
+     *
+     * @since S60 3.2
+     * @param aStart Command mode start if ETrue, end otherwise
+     * @return None
+     */
+    void ReportCommandModeChange( TBool aStart );
+
+    /**
+     * Manages echo mode change
+     *
+     * @since S60 5.0
+     * @param aMode Mode to manage
+     * @return ETrue if echo mode change detected, EFalse otherwise
+     */
+    TBool ManageEchoModeChange( TUint aMode );
+
+    /**
+     * Manages quiet mode change
+     *
+     * @since S60 5.0
+     * @param aMode Mode to manage
+     * @return ETrue if quiet mode change detected, EFalse otherwise
+     */
+    TBool ManageQuietModeChange( TUint aMode );
+
+    /**
+     * Manages verbose mode change
+     *
+     * @since S60 5.0
+     * @param aMode Mode to manage
+     * @return ETrue if verbose mode change detected, EFalse otherwise
+     */
+    TBool ManageVerboseModeChange( TUint aMode );
+
+    /**
+     * Manages character change
+     *
+     * @since S60 5.0
+     * @param aMode Mode to manage
+     * @return None
+     */
+    void ManageCharacterChange( TUint aMode );
+
+    /**
+     * Manages editor mode reply
+     *
+     * @since TB9.2
+     * @param aStart ETrue if start of editor mode, EFalse otherwise
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt ManageEditorModeReply( TBool aStart );
+
+    /**
+     * Finds the next content from the input buffer
+     *
+     * @since TB9.2
+     * @param aStart ETrue if start of editor mode, EFalse otherwise
+     * @return ETrue if next content found, EFalse otherwise
+     */
+    TBool FindNextContent( TBool aStart );
+
+// from base class MDunAtCmdPusher
+
+    /**
+     * From MDunAtCmdPusher.
+     * Notifies about end of AT command processing.
+     * This is after all reply data for an AT command is multiplexed to the
+     * downstream.
+     *
+     * @since S60 5.0
+     * @param aError Error code of command processing completion
+     * @return None
+     */
+    TInt NotifyEndOfProcessing( TInt aError );
+
+    /**
+     * Notifies about request to stop AT command handling for the rest of the
+     * command line data
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt NotifyEndOfCmdLineProcessing();
+
+    /**
+     * Notifies about request to peek for the next command
+     *
+     * @since S60 5.0
+     * @return ETrue if next command exists, EFalse otherwise
+     */
+    TBool NotifyNextCommandPeekRequest();
+
+    /**
+     * Notifies about editor mode reply
+     *
+     * @since TB9.2
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt NotifyEditorModeReply();
+
+// from base class MDunAtCmdEchoer
+
+    /**
+     * Notifies about completed echo in text mode
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void NotifyEchoComplete();
+
+// from base class MDunAtEcomListen
+
+    /**
+     * From MDunAtEcomListen.
+     * Notifies about new plugin installation
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    TInt NotifyPluginInstallation( TUid& aPluginUid );
+
+    /**
+     * From MDunAtEcomListen.
+     * Notifies about existing plugin uninstallation
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    TInt NotifyPluginUninstallation( TUid& aPluginUid );
+
+// from base class MDunAtModeListen
+
+    /**
+     * From MDunAtModeListen.
+     * Gets called on mode status change
+     *
+     * @since S60 5.0
+     * @param aMode Mode to manage
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt NotifyModeStatusChange( TUint aMode );
+
+private:  // data
+
+    /**
+     * Callback to call when AT command handling status changes
+     * Not own.
+     */
+    MDunAtCmdStatusReporter* iUpstream;
+
+    /**
+     * Callback to call when data to push
+     * Not own.
+     */
+    MDunStreamManipulator* iDownstream;
+
+    /**
+     * Callback(s) to call when command mode starts or ends
+     * Usually two needed: one for upstream and second for downstream
+     */
+    RPointerArray<MDunCmdModeMonitor> iCmdCallbacks;
+
+    /**
+     * Connection identifier name
+     */
+    const TDesC8* iConnectionName;
+
+    /**
+     * Current state of AT command handling: active or inactive
+     */
+    TDunState iHandleState;
+
+    /**
+     * Character for carriage return
+     */
+    TInt8 iCarriageReturn;
+
+    /**
+     * Character for line feed
+     */
+    TInt8 iLineFeed;
+
+    /**
+     * Character for backspace
+     */
+    TInt8 iBackspace;
+
+    /**
+     * Current command to ParseCommand()
+     * Not own.
+     */
+    TDesC8* iCommand;
+
+    /**
+     * Special commands for parsing
+     */
+    RPointerArray<HBufC8> iSpecials;
+
+    /**
+     * Buffer for character echoing
+     */
+    TBuf8<KDunChSetMaxCharLen> iEchoBuffer;
+
+    /**
+     * Buffer for ok reply
+     */
+    TBuf8<KDunOkBufLength> iOkBuffer;
+
+    /**
+     * Buffer for error reply
+     */
+    TBuf8<KDunErrorBufLength> iErrorBuffer;
+
+    /**
+     * Buffer for AT command input
+     */
+    TBuf8<KDunInputBufLength> iInputBuffer;
+
+    /**
+     * Buffer for last AT command input (for "A/")
+     */
+    TBuf8<KDunInputBufLength> iLastBuffer;
+
+    /**
+     * Buffer for <ESC> command
+     */
+    TBuf8<KDunEscBufLength> iEscapeBuffer;
+
+    /**
+     * AT command decoding related information
+     */
+    TDunDecodeInfo iDecodeInfo;
+
+    /**
+     * Information for parsing
+     */
+    TDunParseInfo iParseInfo;
+
+    /**
+     * Information for editor mode
+     */
+    TDunEditorModeInfo iEditorModeInfo;
+
+    /**
+     * AT command reply pusher
+     * Own.
+     */
+    CDunAtCmdPusher* iCmdPusher;
+
+    /**
+     * AT command reply echoer
+     * Own.
+     */
+    CDunAtCmdEchoer* iCmdEchoer;
+
+    /**
+     * URC message handlers
+     * Own.
+     */
+    RPointerArray<CDunAtUrcHandler> iUrcHandlers;
+
+    /**
+     * ECOM plugin interface status change listener
+     * Own.
+     */
+    CDunAtEcomListen* iEcomListen;
+
+    /**
+     * Modem mode status change listener
+     * Own.
+     */
+    CDunAtModeListen* iModeListen;
+
+    /**
+     * NVRAM status change listener
+     * Own.
+     */
+    CDunAtNvramListen* iNvramListen;
+
+    /**
+     * Flag to mark command mode start/end
+     */
+    TBool iDataMode;
+
+    /**
+     * Flag to be set on if echo on
+     */
+    TBool iEchoOn;
+
+    /**
+     * Flag to be set on if quiet mode on
+     */
+    TBool iQuietOn;
+
+    /**
+     * Flag to be set on if verbose mode on
+     */
+    TBool iVerboseOn;
+
+    /**
+     * End index for command delimiter
+     */
+    TInt iEndIndex;
+
+    /**
+     * AT command extension
+     */
+    RATExt iAtCmdExt;
+
+    /**
+     * AT command extension to common functionality
+     */
+    RATExtCommon iAtCmdExtCommon;
+
+    /**
+     * Special AT command handler for handling commands like AT&FE0Q0V1&C1&D2+IFC=3,1.
+     */
+    CDunAtSpecialCmdHandler* iAtSpecialCmdHandler;
+    };
+
+#endif  // C_CDUNATCMDHANDLER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/inc/DunAtCmdPusher.h	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,372 @@
+/*
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* 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:  AT command pusher for downstream
+*
+*/
+
+#ifndef C_CDUNATCMDPUSHER_H
+#define C_CDUNATCMDPUSHER_H
+
+#include <atext.h>
+#include <e32base.h>
+#include "DunDataPusher.h"
+
+class MDunStreamManipulator;
+
+/**
+ *  Notification interface class for data pushing status changes
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( MDunAtCmdPusher )
+    {
+
+public:
+
+    /**
+     * Notifies about end of AT command processing.
+     * This is after all reply data for an AT command is multiplexed to the
+     * downstream.
+     *
+     * @since S60 5.0
+     * @param aError Error code of command processing completion
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    virtual TInt NotifyEndOfProcessing( TInt aError ) = 0;
+
+    /**
+     * Notifies about request to stop AT command handling for the rest of the
+     * command line data
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    virtual TInt NotifyEndOfCmdLineProcessing() = 0;
+
+    /**
+     * Notifies about request to peek for the next command
+     *
+     * @since S60 5.0
+     * @return ETrue if next command exists, EFalse otherwise
+     */
+    virtual TBool NotifyNextCommandPeekRequest() = 0;
+
+    /**
+     * Notifies about editor mode reply
+     *
+     * @since TB9.2
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    virtual TInt NotifyEditorModeReply() = 0;
+
+    };
+
+/**
+ *  Class for AT command URC handler
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( CDunAtCmdPusher ) : public CActive,
+                                       public MDunCompletionReporter
+    {
+
+public:
+
+    /**
+     * Two-phased constructor.
+     * @param aAtCmdExt Pointer to AT command extension
+     * @param aCallback Callback to AT command handler
+     * @param aDownstream Callback to downstream,
+     * @param aOkBuffer Buffer for ok reply
+     * @return Instance of self
+     */
+	static CDunAtCmdPusher* NewL( RATExt* aAtCmdExt,
+	                              MDunAtCmdPusher* aCallback,
+	                              MDunStreamManipulator* aDownstream,
+	                              TDesC8* aOkBuffer );
+
+    /**
+     * Two-phased constructor.
+     * @param aAtCmdExt Pointer to AT command extension
+     * @param aCallback Callback to AT command handler
+     * @param aDownstream Callback to downstream
+     * @param aOkBuffer Buffer for ok reply
+     * @return Instance of self
+     */
+    static CDunAtCmdPusher* NewLC( RATExt* aAtCmdExt,
+                                   MDunAtCmdPusher* aCallback,
+                                   MDunStreamManipulator* aDownstream,
+                                   TDesC8* aOkBuffer );
+
+    /**
+    * Destructor.
+    */
+    virtual ~CDunAtCmdPusher();
+
+    /**
+     * Resets data to initial values
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void ResetData();
+
+    /**
+     * Starts AT command handling
+     *
+     * @since S60 5.0
+     * @param aCommand AT command or editor mode input to handle
+     * @param aNormalMode ETrue if request issue for normal mode
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt IssueRequest( TDesC8& aCommand, TBool aNormalMode=ETrue );
+
+    /**
+     * Stops AT command handling
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt Stop();
+
+    /**
+     * Manages request to abort command handling
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt ManageAbortRequest();
+
+    /**
+     * Sets end of command line marker on for the possible series of AT
+     * commands.
+     *
+     * @since S60 5.0
+     * @param aPushLast ETrue to push last reply, EFalse otherwise
+     * @return None
+     */
+    void SetEndOfCmdLine();
+
+    /**
+     * Gets the editor mode status
+     *
+     * @since TB9.2
+     * @return ETrue if in editor mode, EFalse otherwise
+     */
+    TBool EditorMode();
+
+private:
+
+    CDunAtCmdPusher( RATExt* aAtCmdExt,
+                     MDunAtCmdPusher* aCallback,
+                     MDunStreamManipulator* aDownstream,
+                     TDesC8* aOkBuffer );
+
+    void ConstructL();
+
+    /**
+     * Initializes this class
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void Initialize();
+
+    /**
+     * Sets state to idle and notifies about subcommand handling completion
+     *
+     * @since S60 5.0
+     * @param aError Error code for completion
+     * @return None
+     */
+    void SetToIdleAndNotifyEnd( TInt aError );
+
+    /**
+     * Checks if "OK" (verbose) or "0" (numeric) string or exists at the end of
+     * buffer and removes it
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt CheckAndRemoveOkString();
+
+    /**
+     * Sends reply data to downstream
+     *
+     * @since S60 5.0
+     * @param aRecvBuffer ETrue if using receive buffer
+     *                    EFalse if using "OK" buffer
+     * @return None
+     */
+    void SendReplyData( TBool aRecvBuffer=ETrue );
+
+    /**
+     * Manages change in reply type to EReplyTypeOther
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void ManageReplyTypeChangeToOther();
+
+    /**
+     * Manages change in reply type to EReplyTypeOk
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void ManageReplyTypeChangeToOk();
+
+    /**
+     * Manages change in reply type to EReplyTypeError
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void ManageReplyTypeChangeToError();
+
+    /**
+     * Manages change in reply type to EReplyTypeEditor
+     *
+     * @since TB9.2
+     * @return None
+     */
+    void ManageReplyTypeChangeToEditor();
+
+    /**
+     * Manages change in reply type
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void ManageReplyTypeChange();
+
+// from base class CActive
+
+    /**
+     * From CActive.
+     * Gets called when AT command handled
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void RunL();
+
+    /**
+     * From CActive.
+     * Gets called on cancel
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void DoCancel();
+
+// from base class MDunCompletionReporter
+
+    /**
+     * From MDunCompletionReporter.
+     * Gets called when data push is complete
+     *
+     * @since S60 5.0
+     * @param aAllPushed ETrue if all in the queue were pushed, EFalse otherwise
+     * @return None
+     */
+    void NotifyDataPushComplete( TBool aAllPushed );
+
+private:  // data
+
+    /**
+     * AT command extension
+     * Not own.
+     */
+    RATExt* iAtCmdExt;
+
+    /**
+     * Notification interface class for data pushing status changes
+     * Not own.
+     */
+    MDunAtCmdPusher* iCallback;
+
+    /**
+     * Callback to call when data to push
+     * Not own.
+     */
+    MDunStreamManipulator* iDownstream;
+
+    /**
+     * Buffer for ok reply
+     * Not own.
+     */
+    TDesC8* iOkBuffer;
+
+    /**
+     * Current state of AT command handling: active or inactive
+     */
+    TDunState iAtPushState;
+
+    /**
+     * Buffer for receiving
+     */
+    TBuf8<KDefaultCmdBufLength> iRecvBuffer;
+
+    /**
+     * Indicates how many bytes of reply left
+     */
+    TInt iReplyBytesLeft;
+
+    /**
+     * Package for reply bytes left
+     */
+    TPckg<TInt> iReplyLeftPckg;
+
+    /**
+     * Reply type for the handled AT command
+     */
+    TATExtensionReplyType iReplyType;
+
+    /**
+     * Package for reply type for the handled AT command
+     */
+    TPckg<TATExtensionReplyType> iReplyTypePckg;
+
+    /**
+     * Flag indicating if other than "ERROR" reply already received in the
+     * command line
+     */
+    TBool iNoErrorReceived;
+
+    /**
+     * Flag indicating if the last "OK" reply push is started
+     */
+    TBool iLastOkPush;
+
+    /**
+     * Flag indicating if abort already tried for one command
+     */
+    TBool iCmdAbort;
+
+    /**
+     * Flag indicating if stop needed after the next reply
+     */
+    TBool iStop;
+
+    /**
+     * Flag indicating if in editor mode
+     */
+    TBool iEditorMode;
+
+    };
+
+#endif  // C_CDUNATCMDPUSHER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localconnectivityservice/dun/atext/inc/DunAtEcomListen.h	Fri Jun 11 14:27:06 2010 +0300
@@ -0,0 +1,185 @@
+/*
+* Copyright (c) 2008 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:  ECom plugin install/uninstall/version listener
+*
+*/
+
+
+#ifndef C_CDUNATECOMLISTEN_H
+#define C_CDUNATECOMLISTEN_H
+
+#include <atext.h>
+#include "DunTransporter.h"
+
+/**
+ *  Notification interface class for ECOM plugin interface status changes
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( MDunAtEcomListen )
+    {
+
+public:
+
+    /**
+     * Notifies about new plugin installation
+     *
+     * @since S60 5.0
+     * @param aPluginUid UID of installed plugin
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    virtual TInt NotifyPluginInstallation( TUid& aPluginUid ) = 0;
+
+    /**
+     * Notifies about existing plugin uninstallation
+     *
+     * @since S60 5.0
+     * @param aPluginUid UID of uninstalled plugin
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    virtual TInt NotifyPluginUninstallation( TUid& aPluginUid ) = 0;
+
+    };
+
+/**
+ *  Class for ECom plugin install/uninstall/version listener
+ *
+ *  @lib dunatext.lib
+ *  @since S60 v5.0
+ */
+NONSHARABLE_CLASS( CDunAtEcomListen ) : public CActive
+    {
+
+public:
+
+    /**
+     * Two-phased constructor.
+     * @param aAtCmdExt Pointer to AT command extension
+     * @param aCallback Callback to mode status change
+     * @return Instance of self
+     */
+	static CDunAtEcomListen* NewL( RATExt* aAtCmdExt,
+                                   MDunAtEcomListen* aCallback );
+
+    /**
+     * Two-phased constructor.
+     * @param aAtCmdExt Pointer to AT command extension
+     * @param aCallback Callback to mode status change
+     * @return Instance of self
+     */
+    static CDunAtEcomListen* NewLC( RATExt* aAtCmdExt,
+                                    MDunAtEcomListen* aCallback );
+	
+    /**
+    * Destructor.
+    */
+    virtual ~CDunAtEcomListen();
+
+    /**
+     * Resets data to initial values
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void ResetData();
+
+    /**
+     * Starts waiting for ECom plugin install/uninstall/version status changes
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt IssueRequest();
+
+    /**
+     * Stops waiting for Ecom plugin install/uninstall/version status changes
+     *
+     * @since S60 5.0
+     * @return Symbian error code on error, KErrNone otherwise
+     */
+    TInt Stop();
+
+private:
+
+    CDunAtEcomListen( RATExt* aAtCmdExt,
+                      MDunAtEcomListen* aCallback );
+
+    void ConstructL();
+
+    /**
+     * Initializes this class
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void Initialize();
+
+// from base class CActive
+
+    /**
+     * From CActive.
+     * Gets called when plugin installed, uninstalled or changed
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void RunL();
+
+    /**
+     * From CActive.
+     * Gets called on cancel
+     *
+     * @since S60 5.0
+     * @return None
+     */
+    void DoCancel();
+
+private:  // data
+
+    /**
+     * AT command extension
+     * Not own.
+     */
+    RATExt* iAtCmdExt;
+
+    /**
+     * Callback to call when plugin installed, uninstalled or changed
+     * Not own.
+     */
+    MDunAtEcomListen* iCallback;
+
+    /**
+     * Current state of ECom interface listening: active or inactive
+     */
+    TDunState iEcomListenState;
+
+    /**
+     * UID of the installed, uninstalled or changed plugin
+     */
+    TUid iPluginUid;
+
+    /**
+     * Package for plugin UID
+     */
+    TPckg<TUid> iPluginUidPckg;
+
+    /**
+     * Package for ECOM type
+     */
+    TPckg<TATExtensionEcomType> iEcomTypePckg;
+
+    };
+
+#endif  // C_CDUNATECOMLISTEN_H