replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / notification / include / NSCommon.h

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index 1ab2e96..35200df 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -28,29 +28,10 @@
 #define _NS_COMMON_H_
 
 #include <stdint.h>
+#include <octypes.h>
 
 #define NS_UUID_STRING_SIZE 37
-
-#define NS_ATTRIBUTE_POLICY "ACCEPTER"
-#define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
-#define NS_ATTRIBUTE_SYNC "SYNC_URI"
-#define NS_ATTRIBUTE_TOPIC "TOPIC_URI"
-#define NS_ATTRIBUTE_ACCPETANCE "ACCEPTANCE" // not used
-#define NS_ATTRIBUTE_MESSAGE_ID "MESSAGE_ID"
-#define NS_ATTRIBUTE_PROVIDER_ID "PROVIDER_ID"
-#define NS_ATTRIBUTE_CONSUMER_ID "CONSUMER_ID"
-#define NS_ATTRIBUTE_TOPIC_LIST "TOPIC_LIST"
-#define NS_ATTRIBUTE_TOPIC_NAME "TOPIC_NAME"
-#define NS_ATTRIBUTE_TOPIC_SELECTION "TOPIC_STATE"
-#define NS_ATTRIBUTE_TITLE "TITLE"
-#define NS_ATTRIBUTE_TEXT "CONTENTTEXT"
-#define NS_ATTRIBUTE_SOURCE "SOURCE"
-#define NS_ATTRIBUTE_STATE "STATE"
-#define NS_ATTRIBUTE_DEVICE "DEVICE"
-#define NS_ATTRIBUTE_TYPE "TYPE"
-#define NS_ATTRIBUTE_DATETIME "DATE_TIME"
-#define NS_ATTRIBUTE_TTL "TTL"
-
+//#define WITH_MQ
 /**
  * Result code of notification service
  */
@@ -64,24 +45,16 @@ typedef enum eResult
 } NSResult;
 
 /**
- * Response code of notification service
+ * Provider state of notification consumer service
  */
-typedef enum eResponse
+typedef enum
 {
     NS_ALLOW = 1,
     NS_DENY = 2,
     NS_TOPIC = 3,
-
-} NSResponse;
-
-/**
- * Access policy exchanged between provider and consumer during subscription process
- */
-typedef enum eAccessPolicy
-{
-    NS_ACCESS_ALLOW = 0,
-    NS_ACCESS_DENY = 1,
-} NSAccessPolicy;  // not used , this structure will be deleted.
+    NS_DISCOVERED = 11,
+    NS_STOPPED = 12
+} NSProviderState;
 
 /**
  * Notification message status to synchronize
@@ -91,6 +64,7 @@ typedef enum
     NS_SYNC_UNREAD = 0,
     NS_SYNC_READ = 1,
     NS_SYNC_DELETED = 2,
+
 } NSSyncType;
 
 /**
@@ -106,11 +80,14 @@ typedef enum
     NS_MESSAGE_NOTICE = 2,
     NS_MESSAGE_EVENT = 3,
     NS_MESSAGE_INFO = 4,
+    NS_MESSAGE_WARNING = 5,
+    NS_MESSAGE_READ = 11,
+    NS_MESSAGE_DELETED = 12
 
 } NSMessageType;
 
 /**
- *  Notification topic
+ *  Notification topic state
  */
 typedef enum
 {
@@ -119,21 +96,16 @@ typedef enum
 
 } NSTopicState;
 
+/**
+ * Topic linked list
+ */
 typedef struct _nsTopic
 {
     char * topicName;
     NSTopicState state;
     struct _nsTopic * next;
 
-} NSTopic;
-
-typedef struct
-{
-    char consumerId[NS_UUID_STRING_SIZE];
-    NSTopic * head;
-    NSTopic * tail;
-
-} NSTopicList;
+} NSTopicLL;
 
 /**
  *  Consumer information
@@ -150,7 +122,6 @@ typedef struct
 typedef struct
 {
     char providerId[NS_UUID_STRING_SIZE];
-    NSTopicList * topicList;
 
 } NSProvider;
 
@@ -181,6 +152,7 @@ typedef struct
     char * sourceName;
     NSMediaContents * mediaContents;
     char * topic;
+    OCRepPayload * extraInfo;
 
 } NSMessage;