MCL/sf/mw/shortlinkconn: comparison localconnectivityservice/lccustomplugin/src/lccustomplugin.cpp

equal deleted inserted replaced

-:11d83199e2d9
+:a2f12998bb04
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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".
 *
 * Description:  Main handler for incoming requests
 *
 */
 #include "lccustomplugin.h"
 #include "lclistallcmd.h"
 #include "debug.h"
 const TInt KErrorReplyLength = 9;  // CR+LF+"ERROR"+CR+LF
 // ---------------------------------------------------------------------------
 //
 CLcCustomPlugin::CLcCustomPlugin() : CATExtPluginBase()
 {
 iHandler = NULL;
+iHcCmd = NULL;
+iHcReply = NULL;
 }
 // ---------------------------------------------------------------------------
 // CLcCustomPlugin::ConstructL
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 TBool CLcCustomPlugin::IsCommandSupported( const TDesC8& aCmd )
 {
 TRACE_FUNC_ENTRY
+iHcCmd = NULL;
+iHcReply = NULL;
 TInt i;
 TInt count = iHandlers.Count();
 for ( i=0; i<count; i++ )
 {
 CLcCustomPluginBase* handler = iHandlers[i];
 TBool aReplyNeeded )
 	{
 	TRACE_FUNC_ENTRY
 	if ( iHandler )
 	    {
+	    iHcCmd = &aCmd;
+	    iHcReply = &aReply;
 	    iHandler->HandleCommand( aCmd, aReply, aReplyNeeded );
 	    }
 	TRACE_FUNC_EXIT
 }
 // ---------------------------------------------------------------------------
 // Reports about external handle command error condition.
 // This is for cases when for example DUN decided the reply contained an
 // error condition but the plugin is still handling the command internally.
-// Example: in command line "AT+TEST;ATDT1234" was given. "AT+TEST" returns
+// Example: "AT+TEST;+TEST2" was given in command line; "AT+TEST" returns
-// "OK" and "ATDT" returns "CONNECT". Because "OK" and "CONNECT" are
+// non-EReplyTypeError condition and "AT+TEST2" returns EReplyTypeError.
-// different reply types the condition is "ERROR" and DUN ends processing.
+// As the plugin(s) returning the non-EReplyTypeError may still have some
-// This solution keeps the pointer to the last AT command handling plugin
+// ongoing operation then these plugins are notified about the external
-// inside ATEXT and calls this function there to report the error.
+// EReplyTypeError in command line processing. It is to be noted that
-// It is to be noted that HandleCommandCancel() is not sufficient to stop
+// HandleCommandCancel() is not sufficient to stop the processing as the
-// the processing as the command handling has already finished.
+// command handling has already finished.
 // ---------------------------------------------------------------------------
 //
 void CLcCustomPlugin::ReportExternalHandleCommandError()
 {
 TRACE_FUNC_ENTRY
 // Creates an AT command reply based on the reply type and completes the
 // request to ATEXT. Uses iReplyBuffer for reply storage.
 // ---------------------------------------------------------------------------
 //
 TInt CLcCustomPlugin::CreateReplyAndComplete( TATExtensionReplyType aReplyType,
-RBuf8& aDstBuffer,
 const TDesC8& aSrcBuffer,
-TInt aError )
+											  TInt aError )
 {
 TRACE_FUNC_ENTRY
 iReplyBuffer.Close();
 if ( aError != KErrNone )
 {
 HandleCommandCompleted( aError, EReplyTypeUndefined );
+iHcCmd = NULL;
+iHcReply = NULL;
 TRACE_FUNC_EXIT
 return KErrNone;
 }
-TInt retVal = KErrNone;
+if ( !iHcReply )
+{
+TRACE_FUNC_EXIT
+return KErrGeneral;
+}
 switch ( aReplyType )
 {
 case EReplyTypeOther:
-if ( iQuietMode || !iVerboseMode )
+if ( iQuietMode )
 {
 iReplyBuffer.Create( KNullDesC8 );
 }
 else
 {
 iReplyBuffer.Create( aSrcBuffer );
 }
-CreatePartOfReply( aDstBuffer );
-HandleCommandCompleted( KErrNone, aReplyType );
 break;
 case EReplyTypeOk:
 CreateOkOrErrorReply( iReplyBuffer, ETrue );
-CreatePartOfReply( aDstBuffer );
-HandleCommandCompleted( KErrNone, aReplyType );
 break;
 case EReplyTypeError:
 CreateOkOrErrorReply( iReplyBuffer, EFalse );
-CreatePartOfReply( aDstBuffer );
-HandleCommandCompleted( KErrNone, aReplyType );
 break;
 default:
-retVal = KErrGeneral;
+TRACE_FUNC_EXIT
-break;
+return KErrGeneral;
 }
-TRACE_FUNC_EXIT
+CreatePartOfReply( *iHcReply );
-return retVal;
+HandleCommandCompleted( KErrNone, aReplyType );
+iHcCmd = NULL;
+iHcReply = NULL;
+TRACE_FUNC_EXIT
+return KErrNone;
 }
 // ---------------------------------------------------------------------------
 // Creates a buffer for "OK" or "ERROR" reply based on the line settings
 // ---------------------------------------------------------------------------
 return retVal;
 }
 // ---------------------------------------------------------------------------
 // From MLcCustomPlugin.
+// Checks if the command is a base, set, read or test type of command
+// ---------------------------------------------------------------------------
+//
+TCmdHandlerType CLcCustomPlugin::CheckCommandType(
+const TDesC8& aCmdBase,
+const TDesC8& aCmdFull )
+{
+TRACE_FUNC_ENTRY
+TInt retTemp = KErrNone;
+TBuf8<KDefaultCmdBufLength> atCmdBuffer;
+atCmdBuffer.Copy( aCmdBase );
+// Check "base" command ("AT+COMMAND")
+retTemp = aCmdFull.Compare( atCmdBuffer );
+if ( retTemp == 0 )
+{
+TRACE_FUNC_EXIT
+return ECmdHandlerTypeBase;
+}
+// Check "read" command ("AT+COMMAND?")
+// Add last question mark
+atCmdBuffer.Append( '?' );
+retTemp = aCmdFull.Compare( atCmdBuffer );
+if ( retTemp == 0 )
+{
+TRACE_FUNC_EXIT
+return ECmdHandlerTypeRead;
+}
+// Check "test" command ("AT+COMMAND=?")
+// Add "=" before the question mark
+_LIT8( KAssignmentMark, "=" );
+atCmdBuffer.Insert( atCmdBuffer.Length()-1, KAssignmentMark );
+retTemp = aCmdFull.Compare( atCmdBuffer );
+if ( retTemp == 0 )
+{
+TRACE_FUNC_EXIT
+return ECmdHandlerTypeTest;
+}
+// Check "set" command ("AT+COMMAND=")
+// Remove last question mark
+atCmdBuffer.SetLength( atCmdBuffer.Length() - 1 );
+retTemp = aCmdFull.Compare( atCmdBuffer );
+if ( retTemp == 0 )
+{
+TRACE_FUNC_EXIT
+return ECmdHandlerTypeSet;
+}
+TRACE_FUNC_EXIT
+return ECmdHandlerTypeUndefined;
+}
+// ---------------------------------------------------------------------------
+// From MLcCustomPlugin.
 // Returns the array of supported commands
 // ---------------------------------------------------------------------------
 //
 TInt CLcCustomPlugin::GetSupportedCommands( RPointerArray<HBufC8>& aCmds )
 {

branch	RCL_3
changeset 7	a2f12998bb04
parent 0	c3e98f10fcf4