replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / notification / src / common / NSStructs.h

diff --git a/service/notification/src/common/NSStructs.h b/service/notification/src/common/NSStructs.h
index 4c30ed9..39126bc 100644 (file)
--- a/service/notification/src/common/NSStructs.h
+++ b/service/notification/src/common/NSStructs.h
@@ -35,14 +35,25 @@ typedef struct _nsTask
     NSTaskType taskType;\r
     void * taskData;\r
     struct _nsTask * nextTask;\r
+\r
 } NSTask;\r
 \r
+typedef struct\r
+{\r
+    NSTopicLL * head;\r
+    NSTopicLL * tail;\r
+    char consumerId[NS_UUID_STRING_SIZE];\r
+    NSTopicLL ** topics;\r
+\r
+} NSTopicList;\r
+\r
 typedef void * NSCacheData;\r
 \r
 typedef struct _NSCacheElement\r
 {\r
     NSCacheData * data;\r
     struct _NSCacheElement * next;\r
+\r
 } NSCacheElement;\r
 \r
 typedef struct\r
@@ -50,6 +61,7 @@ typedef struct
     NSCacheType cacheType;\r
     NSCacheElement * head;\r
     NSCacheElement * tail;\r
+\r
 } NSCacheList;\r
 \r
 typedef struct\r
@@ -60,6 +72,7 @@ typedef struct
     int remote_syncObId; //sync observer ID subscribed through remote server\r
     int remote_messageObId; //message observer ID subscribed through remote server\r
     bool isWhite; // access state -> True: allowed / False: blocked\r
+\r
 } NSCacheSubData;\r
 \r
 typedef struct\r
@@ -67,6 +80,7 @@ typedef struct
     char * id;\r
     int messageType; // noti = 1, read = 2, dismiss = 3\r
     NSMessage * nsMessage;\r
+\r
 } NSCacheMsgData;\r
 \r
 typedef struct\r
@@ -80,19 +94,21 @@ typedef struct
 {\r
     char id[NS_UUID_STRING_SIZE];\r
     char * topicName;\r
-    NSTopicState state;\r
 \r
 } NSCacheTopicSubData;\r
 \r
 typedef struct\r
 {\r
     OCResourceHandle handle;\r
-    int accepter;\r
+    char providerId[NS_UUID_STRING_SIZE];\r
+    char * version;\r
+    bool policy;\r
     char * message_uri;\r
     char * sync_uri;\r
 \r
     //optional\r
     char * topic_uri;\r
+\r
 } NSNotificationResource;\r
 \r
 typedef struct\r
@@ -109,21 +125,27 @@ typedef struct
     char * title;\r
     char * contentText;\r
     char * sourceName;\r
+    char * topicName;\r
     NSMediaContents * mediaContents;\r
+\r
 } NSMessageResource;\r
 \r
 typedef struct\r
 {\r
     OCResourceHandle handle;\r
-    char * id;\r
+    uint64_t messageId;\r
+    char providerId[NS_UUID_STRING_SIZE];\r
     char * state;\r
+\r
 } NSSyncResource;\r
 \r
 typedef struct\r
 {\r
     OCResourceHandle handle;\r
+    char providerId[NS_UUID_STRING_SIZE];\r
     char consumerId[NS_UUID_STRING_SIZE];\r
     NSTopicList ** TopicList;\r
+\r
 } NSTopicResource;\r
 \r
 typedef struct\r
@@ -131,6 +153,23 @@ typedef struct
     char providerId[NS_UUID_STRING_SIZE];\r
     char * providerName;\r
     char * userInfo;\r
+\r
 } NSProviderInfo;\r
 \r
+#ifdef WITH_MQ\r
+typedef struct\r
+{\r
+    char * serverAddr;\r
+    char * topicName;\r
+\r
+} NSMQTopicAddress;\r
+\r
+typedef struct\r
+{\r
+    char * serverUri;\r
+    OCDevAddr * devAddr;\r
+\r
+} NSMQServerInfo;\r
+#endif\r
+\r
 #endif /* _NS_STRUCTS_H_ */\r