separated the scheduler interface and added callbackresponse.

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

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index 76f52f3..9db4b55 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -33,7 +33,7 @@
         ((level) == 0) ? "DEBUG" : \
         ((level) == 1) ? "INFO" : \
         ((level) == 2) ? "WARNING" : \
-       ((level) == 3) ? "ERROR" : "FATAL")
+    ((level) == 3) ? "ERROR" : "FATAL")
 #define NS_LOG_V(level, format, ...) \
     { \
         printf("%s: %s ", NS_CONVERT_LEVEL(level), __NS_FILE__); \
@@ -48,33 +48,41 @@
     }
 #endif
 
-#define NS_TAG "IOT_NOTI"
+#define NS_TAG                     "IOT_NOTI"
 
 // SCHEDULE //
-#define THREAD_COUNT 4
+#define THREAD_COUNT               4
 
 // NOTIOBJ // 
-#define NOTIOBJ_TITLE_KEY "title"
-#define NOTIOBJ_ID_KEY "id"
-#define NOTOOBJ_CONTENT_KEY "contentText"
-
-#define DISCOVERY_TAG "NS_PROVIDER_DISCOVERY"
-#define SUBSCRIPTION_TAG "NS_PROVIDER_SUBSCRIPTION"
-#define INTERFACE_TAG "NS_PROVIDER_INTERFACE"
-#define NOTIFICATION_TAG "NS_PROVIDER_NOTIFICATION"
-#define SCHEDULER_TAG "NS_PROVIDER_SCHEDULER"
-#define LISTENER_TAG "NS_PROVIDER_LISTENER"
-#define RESOURCE_TAG "NS_PROVIDER_RESOURCE"
-
-#define NS_ROOT_TYPE "oic.r.notification"
+#define NOTIOBJ_TITLE_KEY          "title"
+#define NOTIOBJ_ID_KEY             "id"
+#define NOTOOBJ_CONTENT_KEY        "contentText"
+
+#define DISCOVERY_TAG              "NS_PROVIDER_DISCOVERY"
+#define SUBSCRIPTION_TAG           "NS_PROVIDER_SUBSCRIPTION"
+#define INTERFACE_TAG              "NS_PROVIDER_INTERFACE"
+#define NOTIFICATION_TAG           "NS_PROVIDER_NOTIFICATION"
+#define SCHEDULER_TAG              "NS_PROVIDER_SCHEDULER"
+#define LISTENER_TAG               "NS_PROVIDER_LISTENER"
+#define RESOURCE_TAG               "NS_PROVIDER_RESOURCE"
+
+#define NS_ROOT_TYPE               "oic.r.notification"
 #define NS_COLLECTION_MESSAGE_TYPE "oic.r.notification.message"
-#define NS_COLLECTION_SYNC_TYPE "oic.r.notification.sync"
+#define NS_COLLECTION_SYNC_TYPE    "oic.r.notification.sync"
 
-#define NS_DEFAULT_INTERFACE "oic.if.baseline"
+#define NS_DEFAULT_INTERFACE       "oic.if.baseline"
 
-#define NS_ROOT_URI "/notification"
-#define NS_COLLECTION_MESSAGE_URI "/notification/message"
-#define NS_COLLECTION_SYNC_URI "/notification/sync"
+#define NS_ROOT_URI                "/notification"
+#define NS_COLLECTION_MESSAGE_URI  "/notification/message"
+#define NS_COLLECTION_SYNC_URI     "/notification/sync"
+
+#define NS_QUERY_SEPARATOR         "&;"
+#define NS_KEY_VALUE_DELIMITER     "="
+
+#define NS_QUERY_CONSUMER_ID       "consumerid"
+#define NS_QUERY_PROVIDER_ID       "providerid"
+
+#define NS_QUERY_ID_SIZE           10
 
 typedef enum eConnectionState
 {
@@ -85,7 +93,7 @@ typedef enum eConnectionState
 
 typedef enum eSchedulerType
 {
-    INTERFACE_SCHEDULER = 0,
+    CALLBACK_RESPONSE_SCHEDULER = 0,
     DISCOVERY_SCHEDULER = 1,
     SUBSCRIPTION_SCHEDULER = 2,
     NOTIFICATION_SCHEDULER = 3,
@@ -94,6 +102,7 @@ typedef enum eSchedulerType
 typedef enum eTaskType
 {
     TASK_REGISTER_RESOURCE = 1000,
+    TASK_PUBLISH_RESOURCE = 1001,
 
     TASK_START_PRESENCE = 2000,
     TASK_STOP_PRESENCE = 2001,
@@ -108,14 +117,18 @@ typedef enum eTaskType
     TASK_SEND_NOTIFICATION = 4000,
     TASK_SEND_PENDING_NOTI = 4001,
 
-    TASK_RECV_READ = 5000,
-    TASK_RECV_DISMISS = 5001,
-    TASK_SEND_READ = 5002,
-    TASK_SEND_DISMISS = 5003,
+    TASK_RECV_SYNCINFO = 5000,
+    TASK_RECV_READ = 5001,
+    TASK_RECV_DISMISS = 5003,
+    TASK_SEND_SYNCINFO = 5099,
+    TASK_MAKE_SYNCINFO = 5100,
+    TASK_SEND_READ = 5101,
+    TASK_SEND_DISMISS = 5102,
 
     TASK_CONSUMER_REQ_DISCOVER = 8001,
     TASK_CONSUMER_REQ_SUBSCRIBE = 8002,
     TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL = 8003,
+    TASK_CONSUMER_RECV_SUBSCRIBE_CONFIRMED = 8004,
     TASK_CONSUMER_RECV_MESSAGE = 8101,
 
     TASK_CONSUMER_PROVIDER_DISCOVERED = 8201,
@@ -123,7 +136,8 @@ typedef enum eTaskType
     TASK_CONSUMER_RECV_CONFIRM = 8206,
 
     TASK_EVENT_CONNECTED = 9000,
-    TASK_EVENT_DISCONNECTED = 9001,
+    TASK_EVENT_CONNECTED_TCP = 9001,
+    TASK_EVENT_DISCONNECTED = 9002,
 
     TASK_CB_SUBSCRIPTION = 10000,
     TASK_CB_SYNC = 10001,
@@ -142,6 +156,7 @@ typedef enum eCacheType
     NS_PROVIDER_CACHE_SUBSCRIBER = 1000,
     NS_PROVIDER_CACHE_MESSAGE = 1001,
 
+    NS_CONSUMER_CACHE_PROVIDER = 2000,
     NS_CONSUMER_CACHE_MESSAGE = 2001,
 } NSCacheType;