--- a/telephonyprotocols/pdplayer/inc/PDPSCPRStates.h	Fri Apr 16 16:12:37 2010 +0300
+++ b/telephonyprotocols/pdplayer/inc/PDPSCPRStates.h	Mon May 03 13:37:20 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -25,25 +25,9 @@
 
 #include <comms-infras/corescprstates.h>
 #include <comms-infras/corescpractivities.h>
+#include "PDPMessageDefn.h"
 #include "PDPSCPR.h"
 
-class TPDPFSMMessages
-    {
-public:
-    enum { ERealmId = 0x102822EF };
-
-private:
-    enum
-    /**
-    Definition of generic Link Tier message ids
-    */
-    	{
-    	EPDPFSMMessage = Messages::KNullMessageId + 1,
-    	};
-public:
-    typedef Messages::TMessageSigNumberNumber<EPDPFSMMessage, TPDPFSMMessages::ERealmId> TPDPFSMMessage;
-    };
-
 //-=========================================================
 //
 //
@@ -60,7 +44,7 @@
 const TInt KUnblocked = 3;
 const TInt KSendErrorRecoveryRequest = 4;
 const TInt KContentionTag = 5;
-
+const TInt KUserAuthenticate = 6;
 
 typedef MeshMachine::TNodeContext<CPDPSubConnectionProvider, SCprStates::TContext> TContext;
 typedef MeshMachine::TNodeContext<CPDPDefaultSubConnectionProvider, PDPSCprStates::TContext> TDefContext;
@@ -77,9 +61,9 @@
   	virtual TInt TransitionTag();
 DECLARE_SMELEMENT_FOOTER( TNoTagOrError )
 
-DECLARE_SMELEMENT_HEADER( TNoTagOrAlreadyStarted, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, TContext )
+DECLARE_SMELEMENT_HEADER( TNoTagOrUserAuthenticateOrAlreadyStarted, MeshMachine::TStateFork<TDefContext>, NetStateMachine::MStateFork, TDefContext )
   	virtual TInt TransitionTag();
-DECLARE_SMELEMENT_FOOTER( TNoTagOrAlreadyStarted )
+DECLARE_SMELEMENT_FOOTER( TNoTagOrUserAuthenticateOrAlreadyStarted )
 
 DECLARE_SMELEMENT_HEADER( TSendDataClientIdleIfNoSubconnsAndNoClients, MeshMachine::TStateTransition<TDefContext>, NetStateMachine::MStateTransition, TDefContext )
   	virtual void DoL();
@@ -102,7 +86,8 @@
 //Provision
 //-=========================================================
 DECLARE_SMELEMENT_HEADER( TSelfInit, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, PDPSCprStates::TContext)
-	virtual void DoL();
+	virtual void SetupProvisionCfgL(ESock::CCommsDatIapView* aIapView);
+    virtual void DoL();
 DECLARE_SMELEMENT_FOOTER( TSelfInit)
 
 DECLARE_AGGREGATED_TRANSITION2(
@@ -130,6 +115,8 @@
     void SetupSipServerAddrRetrievalL(RPacketContext::TProtocolConfigOptionV2& aPco);
 	void SetImsSignallingFlagL(RPacketContext::TProtocolConfigOptionV2& aPco, TBool aImcn);
 	TBool IsModeGsmL() const;
+	void SetChapInformationL(RPacketContext::TProtocolConfigOptionV2& aPco);
+	void CreateChallengeAndResponseForChapL(RPacketContext::TProtocolConfigOptionV2& aPco);
 DECLARE_SMELEMENT_FOOTER( TCreatePrimaryPDPCtx)
 
 DECLARE_SMELEMENT_HEADER( TCreateSecondaryOrMbmsPDPCtx, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, PDPSCprStates::TContext)
@@ -414,6 +401,17 @@
     virtual void DoL();
 DECLARE_SMELEMENT_FOOTER( TCancelDataClientStartInPDP )
 
+//===========================================================
+//   User Authentication
+//===========================================================
+DECLARE_SMELEMENT_HEADER(TSendAuthenticate, MeshMachine::TStateTransition<PDPSCprStates::TDefContext>, NetStateMachine::MStateTransition, PDPSCprStates::TDefContext)
+    virtual void DoL();
+DECLARE_SMELEMENT_FOOTER(TSendAuthenticate)
+
+DECLARE_SMELEMENT_HEADER(TAwaitingAuthenticateComplete, MeshMachine::TState<PDPSCprStates::TDefContext>, NetStateMachine::MState, PDPSCprStates::TDefContext)
+    virtual TBool Accept();
+DECLARE_SMELEMENT_FOOTER(TAwaitingAuthenticateComplete)
+
 }
 
 #endif // SYMBIAN_PDPSCPRSTATES_H