FCL/sf/mw/socialmobilefw: comparison smf/smfservermodule/smfserver/server/smfserversymbian

equal deleted inserted replaced

-:106a4bfcb866
+:013a02bf2bb0
 *
 * Initial Contributors:
 * Chandradeep Gandhi, Sasken Communication Technologies Ltd - Initial contribution
 *
 * Contributors:
-* Manasij Roy, Nalina Hariharan*
+* Manasij Roy, Nalina Hariharan
+*
 * Description:
 * SMF Server private implementation for Symbian
 *
-**/
+*/
 #ifndef SMFSERVERSYMBIAN_H
 #define SMFSERVERSYMBIAN_H
 #include <QObject>
 #include <e32hashtab.h>
 #include <e32base.h>
 #include <QByteArray>
 #include <QString>
-//testing -start
-#include "smfprovider.h"
+#include "smfserver.h"
-//end
-//SMF wide global const and macros, to be shared among SMF components as well as SMF aware apps
-//#include <smf/smfGlobal.h>
-//#include "clientGlobal.h"
-#include "SmfServer.h"
 //Forward declarations
 class SmfServerSymbianSession;
+class SmfProvider;
 /**
 * Stores session and request information.
 * For now storing RMessage2 is reduntant as we are allowing only one outstanding request per session
 */
 struct CSessionStruct
 	{
 	SmfServerSymbianSession* iSession;
 	RMessage2 iMsg;
 	};
 //Policy table---start
 //note capabilities are yet to be finalized
 //46 services as of 15th apr
 myRanges,
 myElementsIndex,
 myElements,
 };
 //Policy table---end
-/**
-* Our server class - an active object - and therefore derived ultimately from CActive.
-* It accepts requests from client threads and forwards
+/**
-* them to the client session to be dealt with. It also handles the creation
+* Our server class - an active object - and therefore derived ultimately from CActive.
-* of the server-side client session.
+* It accepts requests from client threads and forwards
-**/
+* them to the client session to be dealt with. It also handles the creation
+* of the server-side client session.
+*/
 class SmfServerSymbian : public CPolicyServer
-{
+	{
 public:
-	/**
+	static SmfServerSymbian * NewL(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper);
-	 * Creates a new session with the server; the function
-	 * implements the pure virtutal function
-	 * defined in class CServer2
-	 */
-	SmfServerSymbian(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper);
-static SmfServerSymbian * NewL(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper);
 ~SmfServerSymbian();
 CSession2 * NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const;
 /**
 * Returns SmfServer
 */
 SmfServer* wrapper();
 /**
 * Adds session info to the currently active session map iMap. This map is used to
 * retreive the corresponding session to be serviced. The keys for this map is sent
 * alongwith the request to other components
 * @param aSession Session to be added
 * @param aMsg Currently redundant
 */
 TInt addToSessionMap(SmfServerSymbianSession* aSession,const RMessage2& aMsg);
 /**
 * Removes the session from the active list of session map
 * @param aSession Session to be removed.
 * @param aMsg Currently redundant
 */
 TInt removeFromSessionMap(SmfServerSymbianSession* aSession,RMessage2& aMsg);
 /**
 * Returns a symbian session for the given key from the iMap.
 * @param id Session ID in the SmfServer Session map
 */
 SmfServerSymbianSession* findSession(TInt id);
 /**
 * Finds the given session and services it with the data.
 * @param requestID Session ID
 * @param parsedData Parsed and serialized data to be sent to client.
 * @param error Error code
 */
 TInt findAndServiceclient(TInt requestID,QByteArray* parsedData,SmfError error);
-	/**
-	 * Debugging
+private:
-	 */
+	/**
-	//void writeLog(QString log)const;
+	 * Creates a new session with the server. The function
-//private:
+	 * implements the pure virtual function
+	 * defined in class CServer2
+	 */
+	SmfServerSymbian(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper);
 void ConstructL();
+private:
+friend class SmfServerSymbianSession;
 SmfServer* iWrapper;
 	/**
 	 * Keeps track of the requests sent by each session
 	 */
 RHashMap<TInt,CSessionStruct> iMap;
-/**
-* The key in the iMap.
-* Its sent to the wrapper
-*/
-TInt iRequestID;
 TInt iSessionCount;
-};
+	};
 /**
 This class represents a session with the  Smf server.
 Functions are provided to respond appropriately to client messages.
 */
 class SmfServerSymbianSession : public CSession2
-{
+	{
 public:
 	/**
 	 * Creates a session.
 	 * @param aServer The server handle
 	 */
 	SmfServerSymbianSession(SmfServerSymbian* aServer);
 ~SmfServerSymbianSession();
 /**
 * From CSession2
 */
 void ServiceL(const RMessage2 & aMessage);
 /**
 * Called by the SmfServerSymbian when results are available
 * @param parsedData Parsed serialized data
 * @param error Smf Error code
 */
 	void resultsAvailable(QByteArray* parsedData,SmfError error);
 	/**
 	 * Called by the SmfServer when client authorization finishes.
 	 * @param success success of the authorization
 	 */
-	void clientathorizationFinished(bool success);
+	void clientAuthorizationFinished(bool success);
 protected:
 //TMessageParams ReadMessageAndRetrieveParams (const RMessage2 & aMessage);
 void PanicClient(const RMessage2 & aMessage, TInt aPanic) const;
 /**
 * Called by ServiceL()
 * It tests the function code and then delegates to
 * the appropriate function.
 */
 void HandleClientMessageL(const RMessage2 & aMessage);
+private:
 //Following are for handling specific client requests
 /**
 * ESmfGetService
 */
-void HandleGetService(const RMessage2 & aMessage);
+void HandleGetService(const RMessage2 & aMessage, const SmfInterfaceID& aInterfaceID);
+/**
+* Handles all synchronous services
+*/
+void HandleSyncServiceL(const RMessage2 & aMessage);
 /**
 * Handles all the opcodes except ESmfGetService
 */
 void HandleCommonServiceL(const RMessage2 & aMessage);
 * Handles all DSM related messages
 */
 void HandleDSMServiceL(const RMessage2 & aMessage);
-//private:
+private:
 SmfServerSymbian* iServer;
 RMessage2 iMessage;
 TBuf<100> iErrBuf;
 	//this interface id will be provided by Smf client, will map Smf Client
 	// interface hierarchy
 	SmfInterfaceID iInterfaceID;
-	TPtr8 iIntfNmaeSymbian;
+	TPtr iIntfNameSymbian;
-	TPtr iIntfNameSymbian16;
+	TPtr8 iIntfNameSymbian8;
 	TBuf8<125> iInterfaceNametbuf;
-	TPtr8 iProviderSymbian;
+	TPtr8 iProviderSymbian8;
-	TPtr8 iXtraDataPtr;
+	TPtr8 iXtraDataPtr8;
-	HBufC8* iDataForDSM;
+	HBufC8* iData8ForDSM;
-	TPtr8 iPtrDataForDSM;
+	TPtr8 iPtr8DataForDSM;
-	HBufC8* iDataFromDSM;
+	HBufC8* iData8FromDSM;
-	TPtr8 iPtrDataFromDSM;
+	TPtr8 iPtr8DataFromDSM;
 	TBuf<100> iDSMErr;
-	TBuf<100> iMaxSize;
+	HBufC8* iProviderBuf8;
-	HBufC8* iProviderBuf;
+	HBufC8* iXtraDataBuf8;
-	HBufC8* iXtraDataBuf;
+	HBufC8* iIntfNameBuf8;
-	HBufC8* iIntfNameBuf;
 	QMap<SmfPluginID,SmfProvider> iPluginIDMap;
 	QList<SmfPluginID> iPluginIDList;
 	QList<SmfPluginID> iAuthList;
 	/**
 	RArray<RMessage2> iRequestList;
 	/**
 	 * Last request opcode
 	 */
 	TInt iLastRequest;
-	//testing
-	TBuf<525> dataToPass;
-	HBufC8* iBuf;
-	HBufC* iBuf16;
 	TPtr8 iPtrToBuf;
 	TPtr8 iPtrToDataForClient;
 	HBufC8* iDataForClient;
-	QByteArray byteArrayToClnt;
+	QByteArray resultData;
-	SmfProvider* providerToClnt;
+	QByteArray xtraData;
-	TInt iError;
+	};
-};
 #endif // SMFSERVERSYMBIAN_H

changeset 18	013a02bf2bb0
parent 14	a469c0e6e7fb
child 25	a180113055cb