--- a/omadrm/drmengine/server/inc/DRMRightsServer.h Fri Mar 12 15:43:46 2010 +0200
+++ b/omadrm/drmengine/server/inc/DRMRightsServer.h Mon Mar 15 12:41:43 2010 +0200
@@ -24,9 +24,9 @@
#include <f32file.h>
#include <abclient.h>
#include "drmcommonclientserver.h"
-#include "drmreplaycache.h"
+#include "DRMReplayCache.h"
#include "drmmeteringdb.h"
-#include "drmclockclient.h"
+#include "DRMClockClient.h"
#include "dbwatcher.h"
#include "procwatcher.h"
#include "watcherobserver.h"
@@ -39,7 +39,7 @@
class CDRMBackupObserver;
class CDRMBackup;
class RMobilePhone;
-
+
// CLASS DECLARATION
/**
@@ -51,46 +51,46 @@
NONSHARABLE_CLASS( CDRMRightsServer ) : public CServer2, public MWatcherObserver
{
public: // Constructors and destructor
-
+
/**
* Two-phased constructor.
* @since S60Rel2.5
* @return Pointer to newly created server instance.
*/
static CDRMRightsServer* NewL();
-
+
/**
* Destructor.
* @since S60Rel2.5
*/
~CDRMRightsServer();
-
+
public: // New functions
/**
* This method returns a handle to DRM Notifier.
* @since S60Rel2.6
* @return Handle to DRM Notifier.
- */
+ */
CDRMNotifier& Notifier();
/**
* This method starts the ROAP storage server
- *
+ *
* @since S60Rel3.0
- */
+ */
void StartRoapStorageL();
-
+
/**
* This method returns the handle to the rights database.
- *
+ *
* @since S60Rel2.6
* @return Handle to the rights database.
- */
+ */
CDRMRightsDB& Database();
RFs& FileServerSession();
-
+
/**
* This method returns the handle to the metering database.
*
@@ -98,7 +98,7 @@
* @return Handle to the metering database.
*/
RDrmMeteringDb& MeteringDatabase();
-
+
RDRMReplayCache& ReplayCache();
/**
@@ -117,23 +117,23 @@
* @return Truth value: Is the time a secure time or not.
*/
TBool GetSecureTime( TTime& aTime ) const;
-
+
/**
- *
+ *
*/
const TDesC& GetIMEIL();
/**
- *
+ *
*/
const CDRMPointerArray<HBufC8>& GetIMSIL();
-
+
/**
* This function is used to handle backup restore events for
* the DRM system
*/
- void HandleBackupEventL( TInt aBackupEvent );
-
+ void HandleBackupEventL( TInt aBackupEvent );
+
/**
* Checks if a content ID is in the list of currently consumed contents
* with count constraints
@@ -143,7 +143,7 @@
* @return ETrue if the content ID is in the list
*/
TBool HasActiveCountConstraint( const TDesC8& aContentId );
-
+
/**
* Removes a content ID from the list of currently consumed contents
* with count constraints
@@ -152,7 +152,7 @@
* @param aContentId content ID to remove
*/
void RemoveActiveCountConstraint( const TDesC8& aContentId );
-
+
/**
* Adds a content ID to the list of currently consumed contents
* with count constraints
@@ -161,7 +161,7 @@
* @param aContentId content ID to add
*/
void AddActiveCountConstraintL( const TDesC8& aContentId );
-
+
/**
* Import rights objects on startup
*
@@ -169,7 +169,7 @@
* @param aImportDir Directory to import from
*/
void ImportRightsObjectsL( const TDesC& aImportDir );
-
+
/**
* Stop watching the DCF repository server and the rights DB
* @since 3.1
@@ -177,31 +177,31 @@
void StopWatchingL();
public: // Functions from base classes
-
+
//class MBackupOperationObserver
-
- /**
+
+ /**
* HandleNotifyL
* @since S60Rel2.5
* @param aBackupOperationAttributes Event related attributes.
*/
- void HandleNotifyL(const TUid aUid, const TDesC& aKey,
- const TDesC& aValue);
+ void HandleNotifyL(const TUid aUid, const TDesC& aKey,
+ const TDesC& aValue);
//class MWatcherObserver
-
- /**
+
+ /**
* Called when the RDB has been modified
*
* @since S60 3.0
* @param aObject Changed directory
*/
void WatchedObjectChangedL( const TDesC& aObject );
-
+
protected: // New functions
-
+
protected: // Functions from base classes
-
+
//class CServer
/**
* RunError.
@@ -211,20 +211,20 @@
* error.
*/
TInt RunError( TInt aError );
-
+
private:
/**
* C++ default constructor.
* @since S60Rel2.5
*/
CDRMRightsServer();
-
+
/**
* By default Symbian 2nd phase constructor is private.
* @since S60Rel2.5
*/
void ConstructL();
-
+
/**
* This method fetches the database key and stores
* it to the given descriptor.
@@ -232,81 +232,81 @@
* @param aKey Descriptor where the key is stored.
*/
void GetDbKeyL( TDRMKey& aKey );
-
- /**
+
+ /**
* This method generates the actual key from key seed.
* @since S60Rel2.5
* @param aKeySeed Key seed.
* @param aKey The key produced.
*/
- void GenerateKeyL( HBufC*& aKeySeed,
+ void GenerateKeyL( HBufC*& aKeySeed,
TDRMKey& aKey ) const;
-
+
void StartThreadL( const TDesC& aThreadName,
- TThreadFunction aFunc,
+ TThreadFunction aFunc,
RSemaphore& aSemaphore );
void AppendExtendedIndividualConstraintsL(RMobilePhone* aMobilePhone = NULL);
- static void Release(TAny* aIndividualConstraintExtension);
+ static void Release(TAny* aIndividualConstraintExtension);
private: // Functions from base classes
// Class CServer
- /**
+ /**
* NewSessionL
* @since S60Rel2.5
*/
CSession2* NewSessionL( const TVersion& aVersion,
const RMessage2& aMessage) const;
-
+
public: // Data
-
+
protected: // Data
-
+
private: // Data
CDRMRightsDB* iDb;
-
+
CDRMNotifier* iNotifier;
-
+
RFs iFs;
RDRMReplayCache iCache;
- RDrmMeteringDb iMeteringDb;
+ RDrmMeteringDb iMeteringDb;
RDRMClockClient iClock;
RPointerArray<CDRMXOma>* iXOmaHeaders;
RPointerArray<HBufC8> iActiveCountConstraints;
-
+
HBufC* iIMEI;
-
+
// Backup Observer
CDRMBackupObserver* iBackupObserver;
-
+
// BackupHandler
CDRMBackup* iBackupHandler;
-
+
// Backup client
- conn::CActiveBackupClient* iActiveBackupClient;
-
+ conn::CActiveBackupClient* iActiveBackupClient;
+
// RDB Watcher
CDbWatcher* iDbWatcher;
// Peer process watcher
CProcWatcher* iProcWatcher;
-
+
// Watching causes a restart
TBool iArmed;
-
+
CDRMPointerArray<HBufC8>* iIMSI;
TBool iGetImsi;
-
+
public: // Friend classes
-
+
protected: // Friend classes
-
+
private: // Friend classes
-
+
};
-#endif // CDRMRIGHTSSERVER_H
+#endif // CDRMRIGHTSSERVER_H
// End of File