#ifndef _NS_CONSTANTS_H_
#define _NS_CONSTANTS_H_
+#define __PRINTLOG 0
#define __NS_FILE__ ( strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__ )
-#ifdef TB_LOG
-#include "logger.h"
-#define NS_LOG_V(level, format, ...) (OIC_LOG_V((level), __NS_FILE__, (format), __VA_ARGS__))
-#define NS_LOG(level, msg) (OIC_LOG((level), __NS_FILE__, (msg)))
-#else
#include "logger.h"
+
+#ifdef TB_LOG
+#ifdef __TIZEN__
+#include <dlog.h>
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif // LOG_TAG
+#define LOG_TAG "NotificationService"
+#define NS_CONVERT_LEVEL(level) ( \
+ ((level) == 0) ? DLOG_DEBUG : \
+ ((level) == 1) ? DLOG_INFO : \
+ ((level) == 2) ? DLOG_WARN : \
+ ((level) == 3) ? DLOG_ERROR : \
+ ((level) == 4) ? DLOG_ERROR : \
+ ((level) == 5) ? DLOG_INFO : \
+ ((level) == 6) ? DLOG_INFO : \
+ ((level) == 7) ? DLOG_INFO : DLOG_INFO)
+#define NS_LOG_V(level, format, ...) (dlog_print(NS_CONVERT_LEVEL(level), LOG_TAG, (format), __VA_ARGS__))
+#define NS_LOG(level, msg) (dlog_print(NS_CONVERT_LEVEL(level), LOG_TAG, (msg)))
+#else // __TIZEN__
+#define NS_LOG_V(level, format, ...) OIC_LOG_V((level), __NS_FILE__, (format), __VA_ARGS__)
+#define NS_LOG(level, msg) OIC_LOG((level), __NS_FILE__, (msg))
+#endif // __TIZEN__
+#else // TB_LOG
+#if (__PRINTLOG == 1)
#define NS_CONVERT_LEVEL(level) ( \
((level) == 0) ? "DEBUG" : \
((level) == 1) ? "INFO" : \
((level) == 2) ? "WARNING" : \
- ((level) == 3) ? "ERROR" : "FATAL")
+ ((level) == 3) ? "ERROR" : \
+ ((level) == 4) ? "FATAL" : \
+ ((level) == 5) ? "DEBUG_LITE" : \
+ ((level) == 6) ? "INFO_LITE" : \
+ ((level) == 7) ? "INFO_PRIVATE" : "INFO_PRIVATE")
#define NS_LOG_V(level, format, ...) \
{ \
printf("%s: %s ", NS_CONVERT_LEVEL(level), __NS_FILE__); \
printf((msg)); \
printf("\n"); \
}
-#endif
+#else // (__PRINTLOG == 1)
+#define NS_CONVERT_LEVEL(level)
+#define NS_LOG(level, msg)
+#define NS_LOG_V(level, format, ...) NS_LOG((level), ((format), __VA_ARGS__))
+#endif // (__PRINTLOG == 1)
+#endif // TB_LOG
#define NS_TAG "IOT_NOTI"
// SCHEDULE //
-#define THREAD_COUNT 4
+#define THREAD_COUNT 5
-// NOTIOBJ //
-#define NOTIOBJ_TITLE_KEY "title"
-#define NOTIOBJ_ID_KEY "id"
-#define NOTOOBJ_CONTENT_KEY "contentText"
+// NOTIOBJ //
+#define NOTIOBJ_TITLE_KEY "x.org.iotivity.ns.title"
+#define NOTIOBJ_ID_KEY "x.org.iotivity.ns.id"
+#define NOTOOBJ_CONTENT_KEY "x.org.iotivity.ns.contenttext"
#define DISCOVERY_TAG "NS_PROVIDER_DISCOVERY"
#define SUBSCRIPTION_TAG "NS_PROVIDER_SUBSCRIPTION"
#define SCHEDULER_TAG "NS_PROVIDER_SCHEDULER"
#define LISTENER_TAG "NS_PROVIDER_LISTENER"
#define RESOURCE_TAG "NS_PROVIDER_RESOURCE"
+#define TOPIC_TAG "NS_PROVIDER_TOPIC"
-#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_ROOT_TYPE "x.org.iotivity.notification"
+#define NS_COLLECTION_MESSAGE_TYPE "x.org.iotivity.notification.message"
+#define NS_COLLECTION_SYNC_TYPE "x.org.iotivity.notification.sync"
+#define NS_COLLECTION_TOPIC_TYPE "x.org.iotivity.notification.topic"
-#define NS_DEFAULT_INTERFACE "oic.if.baseline"
+#define NS_INTERFACE_READ "oic.if.r"
+#define NS_INTERFACE_READWRITE "oic.if.rw"
+#define NS_INTERFACE_BASELINE "oic.if.baseline"
#define NS_ROOT_URI "/notification"
#define NS_COLLECTION_MESSAGE_URI "/notification/message"
#define NS_COLLECTION_SYNC_URI "/notification/sync"
+#define NS_COLLECTION_TOPIC_URI "/notification/topic"
#define NS_QUERY_SEPARATOR "&;"
#define NS_KEY_VALUE_DELIMITER "="
-#define NS_QUERY_CONSUMER_ID "consumerid"
-#define NS_QUERY_PROVIDER_ID "providerid"
+#define NS_QUERY_CONSUMER_ID "x.org.iotivity.ns.consumerid"
+#define NS_QUERY_PROVIDER_ID "x.org.iotivity.ns.providerid"
+#define NS_QUERY_INTERFACE "if"
#define NS_QUERY_ID_SIZE 10
+#define NS_POLICY_PROVIDER 1
+#define NS_POLICY_CONSUMER 0
+
+#define NS_RD_PUBLISH_QUERY "/oic/rd?rt=oic.wk.rdpub"
+
+#ifdef WITH_MQ
+#define NS_ATTRIBUTE_MQ_MESSAGE "x.org.iotivity.ns.message"
+#define NS_ATTIRBUTE_MQ_TOPICLIST "x.org.iotivity.ns.topiclist"
+#endif
+
+#define NS_VERIFY_NOT_NULL_V(obj) \
+ { \
+ if ((obj) == NULL) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is null", __func__, #obj); \
+ return; \
+ } \
+ }
+
+#define NS_VERIFY_NOT_NULL(obj, retVal) \
+ { \
+ if ((obj) == NULL) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is null", __func__, #obj); \
+ return (retVal); \
+ } \
+ }
+
+#define NS_VERIFY_NOT_NULL_WITH_POST_CLEANING_V(obj, func) \
+ { \
+ if ((obj) == NULL) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is null", __func__, #obj); \
+ NS_LOG(ERROR, "execute deletion"); \
+ (func); \
+ return; \
+ } \
+ }
+
+#define NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(obj, retVal, func) \
+ { \
+ if ((obj) == NULL) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is null", __func__, #obj); \
+ NS_LOG(ERROR, "execute deletion"); \
+ (func); \
+ return (retVal); \
+ } \
+ }
+
+#define NS_VERIFY_STACK_SUCCESS_V(obj) \
+ { \
+ bool _ret = (obj); \
+ if ( _ret != true) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is not OC_STACK_OK : %d", __func__, #obj, _ret); \
+ return; \
+ } \
+ }
+
+#define NS_VERIFY_STACK_SUCCESS(obj, retVal) \
+ { \
+ bool _ret = (obj); \
+ if ( _ret != true) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is not OC_STACK_OK : %d", __func__, #obj, _ret); \
+ return (retVal); \
+ } \
+ }
+
+#define NS_VERIFY_STACK_SUCCESS_WITH_POST_CLEANING(obj, retVal, func) \
+ { \
+ bool _ret = (obj); \
+ if ( _ret != true) \
+ { \
+ NS_LOG_V(ERROR, "%s : %s is not OC_STACK_OK : %d", __func__, #obj, _ret); \
+ (func); \
+ return (retVal); \
+ } \
+ }
+
+#define NSOICFree(obj) \
+ { \
+ if ((obj)) \
+ { \
+ OICFree((obj)); \
+ (obj) = NULL; \
+ NS_LOG_V(DEBUG, "%s : %s Removed", __func__, #obj); \
+ } \
+ }
+
+#define VERSION "1.2.1"
+
+#define NS_ATTRIBUTE_VERSION "x.org.iotivity.ns.version"
+#define NS_ATTRIBUTE_POLICY "x.org.iotivity.ns.subcontrollability"
+#define NS_ATTRIBUTE_MESSAGE "x.org.iotivity.ns.messageuri"
+#define NS_ATTRIBUTE_SYNC "x.org.iotivity.ns.syncuri"
+#define NS_ATTRIBUTE_TOPIC "x.org.iotivity.ns.topicuri"
+#define NS_ATTRIBUTE_MESSAGE_ID "x.org.iotivity.ns.messageid"
+#define NS_ATTRIBUTE_PROVIDER_ID "x.org.iotivity.ns.providerid"
+#define NS_ATTRIBUTE_CONSUMER_ID "x.org.iotivity.ns.consumerid"
+#define NS_ATTRIBUTE_TOPIC_LIST "x.org.iotivity.ns.topiclist"
+#define NS_ATTRIBUTE_TOPIC_NAME "x.org.iotivity.ns.topicname"
+#define NS_ATTRIBUTE_TOPIC_SELECTION "x.org.iotivity.ns.topicstate"
+#define NS_ATTRIBUTE_TITLE "x.org.iotivity.ns.title"
+#define NS_ATTRIBUTE_TEXT "x.org.iotivity.ns.contenttext"
+#define NS_ATTRIBUTE_SOURCE "x.org.iotivity.ns.source"
+#define NS_ATTRIBUTE_STATE "x.org.iotivity.ns.state"
+#define NS_ATTRIBUTE_DEVICE "x.org.iotivity.ns.device"
+#define NS_ATTRIBUTE_TYPE "x.org.iotivity.ns.type"
+#define NS_ATTRIBUTE_DATETIME "x.org.iotivity.ns.datetime"
+#define NS_ATTRIBUTE_TTL "x.org.iotivity.ns.ttl"
+#define NS_ATTRIBUTE_ICON_IMAGE "x.org.iotivity.ns.iconimage"
+
typedef enum eConnectionState
{
DISCONNECTED = 0,
typedef enum eSchedulerType
{
- INTERFACE_SCHEDULER = 0,
+ CALLBACK_RESPONSE_SCHEDULER = 0,
DISCOVERY_SCHEDULER = 1,
SUBSCRIPTION_SCHEDULER = 2,
NOTIFICATION_SCHEDULER = 3,
+ TOPIC_SCHEDULER = 4,
+
} NSSchedulerType;
typedef enum eTaskType
{
+#ifdef WITH_MQ
+ TASK_MQ_REQ_SUBSCRIBE = 20001,
+#endif
+
TASK_REGISTER_RESOURCE = 1000,
+ TASK_PUBLISH_RESOURCE = 1001,
TASK_START_PRESENCE = 2000,
TASK_STOP_PRESENCE = 2001,
TASK_CONSUMER_REQ_DISCOVER = 8001,
TASK_CONSUMER_REQ_SUBSCRIBE = 8002,
TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL = 8003,
- TASK_CONSUMER_RECV_SUBSCRIBE_CONFIRMED = 8004,
+ TASK_CONSUMER_SENT_REQ_OBSERVE = 8004,
+ TASK_CONSUMER_RECV_PROVIDER_CHANGED = 8005,
TASK_CONSUMER_RECV_MESSAGE = 8101,
TASK_CONSUMER_PROVIDER_DISCOVERED = 8201,
TASK_CONSUMER_PROVIDER_DELETED = 8202,
TASK_CONSUMER_RECV_CONFIRM = 8206,
+ TASK_CONSUMER_REQ_TOPIC_URI = 8299,
+ TASK_CONSUMER_REQ_TOPIC_LIST = 8300,
+ TASK_CONSUMER_RECV_TOPIC_LIST = 8031,
+ TASK_CONSUMER_SELECT_TOPIC_LIST = 8303,
+
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,
+ TASK_SEND_TOPICS = 11000,
+ TASK_REGISTER_TOPIC = 11001,
+ TASK_UNREGISTER_TOPIC = 11002,
+ TASK_SUBSCRIBE_TOPIC = 11003,
+ TASK_UNSUBSCRIBE_TOPIC = 11004,
+ TASK_POST_TOPIC = 11005,
+ TASK_GET_TOPICS = 11006,
+ TAST_GET_CONSUMER_TOPICS = 11007
+
} NSTaskType;
typedef enum eCache
{
NS_PROVIDER_CACHE_SUBSCRIBER = 1000,
NS_PROVIDER_CACHE_MESSAGE = 1001,
+ NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME = 1002,
+ NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID = 1003,
+ NS_PROVIDER_CACHE_REGISTER_TOPIC = 1004,
+ NS_PROVIDER_CACHE_SUBSCRIBER_OBSERVE_ID = 1005,
NS_CONSUMER_CACHE_PROVIDER = 2000,
NS_CONSUMER_CACHE_MESSAGE = 2001,
+
} NSCacheType;
typedef enum eResourceType
{
NS_RESOURCE_MESSAGE = 1000,
NS_RESOURCE_SYNC = 1001,
+ NS_RESOURCE_TOPIC = 1002,
+
} NSResourceType;
+typedef enum eInterfaceType
+{
+ NS_INTERFACE_TYPE_READ = 1,
+ NS_INTERFACE_TYPE_READWRITE = 2,
+
+} NSInterfaceType;
+
#endif /* _NS_CONSTANTS_H_ */
projects / platform / upstream / iotivity.git / blobdiff