resource of noti. service support to mandatory field and optional field.
so, added optional field of struct and enum.
and then modified rename the field.
Change-Id: I45dc1d5763496e1c74225fae9ad71c95be2c2f9b
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
21 files changed:
'service/notification', 'NSConsumerInterface.h')
# Go to build Unit test
'service/notification', 'NSConsumerInterface.h')
# Go to build Unit test
-if target_os == 'linux':
- SConscript('unittest/SConscript')
+# if target_os == 'linux':
+# SConscript('unittest/SConscript')
# Go to build sample apps
SConscript('examples/SConscript')
# Go to build sample apps
SConscript('examples/SConscript')
g_obj_syncListener = (jobject) (*env)->NewGlobalRef(env, jSyncListener);\r
\r
// check access policy\r
g_obj_syncListener = (jobject) (*env)->NewGlobalRef(env, jSyncListener);\r
\r
// check access policy\r
- NSAccessPolicy access = NS_ACCEPTER_PROVIDER;\r
+ NSAccessPolicy access = NS_ACCESS_ALLOW;\r
\r
if (NSStartProvider(access, NSSubscribeRequestCb, NSSyncCb) != NS_OK)\r
{\r
\r
if (NSStartProvider(access, NSSubscribeRequestCb, NSSyncCb) != NS_OK)\r
{\r
-void NSSyncCb(NSSync *sync)\r
+void NSSyncCb(NSSyncInfo *sync)\r
{\r
LOGI("Sync requested");\r
\r
{\r
LOGI("Sync requested");\r
\r
- LOGI("Sync ID : %s\n", sync->mMessageId);\r
- LOGI("Sync STATE : %d\n", sync->mState);\r
+ LOGI("Sync ID : %s\n", sync->messageId);\r
+ LOGI("Sync STATE : %d\n", sync->state);\r
- jstring strMessageId = (*env)->NewStringUTF(env, sync->mMessageId);\r
+ jstring strMessageId = (*env)->NewStringUTF(env, sync->messageId);\r
\r
jclass cls = (*env)->GetObjectClass(env, g_obj_syncListener);\r
if (!cls)\r
\r
jclass cls = (*env)->GetObjectClass(env, g_obj_syncListener);\r
if (!cls)\r
- (*env)->CallVoidMethod(env, g_obj_syncListener, mid, strMessageId, (jint) sync->mState);\r
+ (*env)->CallVoidMethod(env, g_obj_syncListener, mid, strMessageId, (jint) sync->state);\r
\r
(*g_jvm)->DetachCurrentThread(g_jvm);\r
\r
\r
(*g_jvm)->DetachCurrentThread(g_jvm);\r
\r
\r
NSMessage * nsMsg = (NSMessage *) malloc(sizeof(NSMessage));\r
\r
\r
NSMessage * nsMsg = (NSMessage *) malloc(sizeof(NSMessage));\r
\r
- nsMsg->mId = strdup(messageId);\r
- nsMsg->mTitle = strdup(messageTitle);\r
- nsMsg->mContentText = strdup(messageBody);\r
- nsMsg->mSource = strdup(messageSource);\r
+ nsMsg->messageId = strdup(messageId);\r
+ nsMsg->title = strdup(messageTitle);\r
+ nsMsg->contentText = strdup(messageBody);\r
+ nsMsg->sourceName = strdup(messageSource);\r
\r
void NSSubscribeRequestCb(NSConsumer*);\r
\r
\r
void NSSubscribeRequestCb(NSConsumer*);\r
\r
- void NSSyncCb(NSSync*);\r
+ void NSSyncCb(NSSyncInfo*);\r
\r
NSMessage * NSGetMessage(JNIEnv *, jobject);\r
\r
\r
NSMessage * NSGetMessage(JNIEnv *, jobject);\r
\r
{
printf("Notification from : %s:%d\n", ((OCDevAddr *)provider->mUserData)->addr,
((OCDevAddr *)provider->mUserData)->port);
{
printf("Notification from : %s:%d\n", ((OCDevAddr *)provider->mUserData)->addr,
((OCDevAddr *)provider->mUserData)->port);
- printf("id : %s\n", notification->mId);
- printf("title : %s\n", notification->mTitle);
- printf("content : %s\n", notification->mContentText);
- printf("source : %s\n", notification->mSource);
+ printf("id : %s\n", notification->messageId);
+ printf("title : %s\n", notification->title);
+ printf("content : %s\n", notification->contentText);
+ printf("source : %s\n", notification->sourceName);
// NSDropNSObject(notification);
NSConsumerReadCheck(notification);
}
// NSDropNSObject(notification);
NSConsumerReadCheck(notification);
}
printf("startSubscribing\n");
}
printf("startSubscribing\n");
}
-void onNotificationSync(NSProvider * provider, NSSync * sync)
+void onNotificationSync(NSProvider * provider, NSSyncInfo * sync)
{
printf("Sync from : %s:%d\n", ((OCDevAddr *)provider->mUserData)->addr,
((OCDevAddr *)provider->mUserData)->port);
{
printf("Sync from : %s:%d\n", ((OCDevAddr *)provider->mUserData)->addr,
((OCDevAddr *)provider->mUserData)->port);
- printf("Sync ID : %s\n", sync->mMessageId);
- printf("Sync STATE : %d\n", sync->mState);
+ printf("Sync ID : %s\n", sync->messageId);
+ printf("Sync STATE : %d\n", sync->state);
NSAccept(consumer, true);\r
}\r
\r
NSAccept(consumer, true);\r
}\r
\r
-void syncCallback(NSSync *sync)\r
+void syncCallback(NSSyncInfo *sync)\r
{\r
OIC_LOG(INFO, TAG, "sync requested");\r
\r
{\r
OIC_LOG(INFO, TAG, "sync requested");\r
\r
- printf("NS_APP Sync State: %d\n", sync->mState);\r
+ printf("NS_APP Sync State: %d\n", sync->state);\r
{\r
case 1:\r
OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Provider)");\r
{\r
case 1:\r
OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Provider)");\r
- NSStartProvider(NS_ACCEPTER_PROVIDER, subscribeRequestCallback, syncCallback);\r
+ NSStartProvider(NS_ACCESS_ALLOW, subscribeRequestCallback, syncCallback);\r
break;\r
case 2:\r
OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Consumer)");\r
break;\r
case 2:\r
OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Consumer)");\r
- NSStartProvider(NS_ACCEPTER_CONSUMER, subscribeRequestCallback, syncCallback);\r
+ NSStartProvider(NS_ACCESS_DENY, subscribeRequestCallback, syncCallback);\r
break;\r
case 3:\r
OIC_LOG(INFO, TAG, "NSSendNotification()");\r
\r
char title[100];\r
char body[100];\r
break;\r
case 3:\r
OIC_LOG(INFO, TAG, "NSSendNotification()");\r
\r
char title[100];\r
char body[100];\r
\r
printf("id : %d\n", ++id);\r
printf("title : ");\r
\r
printf("id : %d\n", ++id);\r
printf("title : ");\r
printf("body : ");\r
gets(body);\r
\r
printf("body : ");\r
gets(body);\r
\r
- printf("app - mId : %s \n", charID);\r
printf("app - mTitle : %s \n", title);\r
printf("app - mContentText : %s \n", body);\r
\r
NSMessage * msg = (NSMessage *)OICMalloc(sizeof(NSMessage));\r
\r
printf("app - mTitle : %s \n", title);\r
printf("app - mContentText : %s \n", body);\r
\r
NSMessage * msg = (NSMessage *)OICMalloc(sizeof(NSMessage));\r
\r
- sprintf(charID, "%d", id);\r
-\r
- msg->mId = strdup(charID);\r
- msg->mTitle = strdup(title);\r
- msg->mContentText = OICStrdup(body);\r
- msg->mSource = OICStrdup("OCF");\r
+ msg->title = strdup(title);\r
+ msg->contentText = OICStrdup(body);\r
+ msg->sourceName = OICStrdup("OCF");\r
\r
NSSendMessage(msg);\r
\r
\r
NSSendMessage(msg);\r
\r
\r
case 4:\r
OIC_LOG(INFO, TAG, "NSRead");\r
\r
case 4:\r
OIC_LOG(INFO, TAG, "NSRead");\r
- NSSync * sync = (NSSync*) OICMalloc(sizeof(NSSync));\r
+ NSSyncInfo * sync = (NSSyncInfo*) OICMalloc(sizeof(NSSyncInfo));\r
- sync->mMessageId = OICStrdup("dev_001");\r
- sync->mState = 1;\r
+ sync->messageId = OICStrdup("dev_001");\r
+ sync->state = 1;\r
#define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
#define NS_ATTRIBUTE_SYNC "SYNC_URI"
#define NS_ATTRIBUTE_ACCPETANCE "ACCEPTANCE"
#define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
#define NS_ATTRIBUTE_SYNC "SYNC_URI"
#define NS_ATTRIBUTE_ACCPETANCE "ACCEPTANCE"
-#define NS_ATTRIBUTE_ID "ID"
+#define NS_ATTRIBUTE_MESSAGE_ID "MESSAGE_ID"
+#define NS_ATTRIBUTE_PROVIDER_ID "PROVIDER_ID"
#define NS_ATTRIBUTE_TITLE "TITLE"
#define NS_ATTRIBUTE_TEXT "CONTENTTEXT"
#define NS_ATTRIBUTE_SOURCE "SOURCE"
#define NS_ATTRIBUTE_TITLE "TITLE"
#define NS_ATTRIBUTE_TEXT "CONTENTTEXT"
#define NS_ATTRIBUTE_SOURCE "SOURCE"
{
NS_ACCESS_ALLOW = 0,
NS_ACCESS_DENY = 1,
{
NS_ACCESS_ALLOW = 0,
NS_ACCESS_DENY = 1,
- NS_ACCEPTER_PROVIDER = 0,
- NS_ACCEPTER_CONSUMER = 1,
-
- Notification_Read = 0,
- Notification_Dismiss = 1,
- Notification_Unread = 2,
+ NS_SYNC_UNREAD = 0,
+ NS_SYNC_READ = 1,
+ NS_SYNC_DELETED = 2,
+} NSSyncType;
+/**
+ * Notification Message Type
+ * Alert mean is High / critical
+ * Notice mean is low / critical
+ * Event mean is High / Normal
+ * Information mean is Low / Normal
+ */
+typedef enum
+{
+ NS_MESSAGE_ALERT = 0,
+ NS_MESSAGE_NOTICE = 1,
+ NS_MESSAGE_EVENT = 2,
+ NS_MESSAGE_INFO = 3,
+
+} NSMessageType;
/**
* Consumer information
/**
* Consumer information
+ * Media Contents of Notification Message (Optional)
+ */
+typedef struct
+{
+ char * iconImage;
+
+} NSMediaContents;
+
+/**
* Notification Message
*/
typedef struct
{
* Notification Message
*/
typedef struct
{
- char * mId;
- char * mTitle;
- char * mContentText;
- char * mSource;
+ //Mandatory
+ uint64_t messageId;
+ char * providerId;
+
+ //optional
+ NSMessageType type;
+ char * dateTime;
+ uint64_t ttl;
+ char * title;
+ char * contentText;
+ char * sourceName;
+ NSMediaContents mediaContents;
- // Mandatory
- char * mMessageId;
- char * mSourceId; // TO-DO from whom
- NSSyncTypes mState;
+ uint64_t messageId;
+ char * providerId;
+ NSSyncType state;
#endif /* _NS_COMMON_H_ */
#endif /* _NS_COMMON_H_ */
* @param[in] provider Provider who requests synchronization with the status
* @param[in] sync Synchronization information of the notification message
*/
* @param[in] provider Provider who requests synchronization with the status
* @param[in] sync Synchronization information of the notification message
*/
-typedef void (*NSSyncCallback)(NSProvider *, NSSync *);
+typedef void (*NSSyncCallback)(NSProvider *, NSSyncInfo *);
/**
* Consumer uses this callback function to receive the discovered providers
/**
* Consumer uses this callback function to receive the discovered providers
* synchronization\r
* @param[in] sync Synchronization information of the notification message\r
*/\r
* synchronization\r
* @param[in] sync Synchronization information of the notification message\r
*/\r
-typedef void (*NSSyncCallback)(NSSync *);\r
+typedef void (*NSSyncCallback)(NSSyncInfo *);\r
\r
/**\r
* Initialize notification service for provider\r
\r
/**\r
* Initialize notification service for provider\r
- OICFree(obj->mId);
- obj->mId = NULL;
+ OICFree(obj->messageId);
+ obj->messageId = NULL;
- OICFree(obj->mTitle);
- obj->mTitle = NULL;
+ OICFree(obj->title);
+ obj->title = NULL;
- OICFree(obj->mContentText);
- obj->mContentText = NULL;
+ OICFree(obj->contentText);
+ obj->contentText = NULL;
- OICFree(obj->mSource);
- obj->mSource = NULL;
+ OICFree(obj->sourceName);
+ obj->sourceName = NULL;
}
newMsg = (NSMessage *)OICMalloc(sizeof(NSMessage));
}
newMsg = (NSMessage *)OICMalloc(sizeof(NSMessage));
- newMsg->mContentText = NULL;
- newMsg->mId = NULL;
- newMsg->mSource = NULL;
- newMsg->mTitle = NULL;
+ newMsg->contentText = NULL;
+ newMsg->messageId = NULL;
+ newMsg->sourceName = NULL;
+ newMsg->title = NULL;
+ if (copyMsg->messageId)
- newMsg->mId = OICStrdup(copyMsg->mId);
+ newMsg->messageId = OICStrdup(copyMsg->messageId);
- newMsg->mTitle = OICStrdup(copyMsg->mTitle);
+ newMsg->title = OICStrdup(copyMsg->title);
- if (copyMsg->mContentText)
+ if (copyMsg->contentText)
- newMsg->mContentText = OICStrdup(copyMsg->mContentText);
+ newMsg->contentText = OICStrdup(copyMsg->contentText);
+ if (copyMsg->sourceName)
- newMsg->mSource = OICStrdup(copyMsg->mSource);
+ newMsg->sourceName = OICStrdup(copyMsg->sourceName);
-NSResult NSFreeSync(NSSync * obj)
+NSResult NSFreeSync(NSSyncInfo * obj)
{
if (!obj)
{
return NS_ERROR;
}
{
if (!obj)
{
return NS_ERROR;
}
- OICFree(obj->mMessageId);
- obj->mMessageId = NULL;
+ OICFree(obj->messageId);
+ obj->messageId = NULL;
- NS_LOG_V(DEBUG, "obj->mSourceid = %s", obj->mSourceId);
- OICFree(obj->mSourceId);
- obj->mSourceId = NULL;
+ NS_LOG_V(DEBUG, "obj->mSourceid = %s", obj->providerId);
+ OICFree(obj->providerId);
+ obj->providerId = NULL;
-NSSync* NSDuplicateSync(NSSync * copyMsg)
+NSSyncInfo* NSDuplicateSync(NSSyncInfo * copyMsg)
- NSSync * newMsg = NULL;
+ NSSyncInfo * newMsg = NULL;
- newMsg = (NSSync *)OICMalloc(sizeof(NSSync));
- newMsg->mMessageId = NULL;
- newMsg->mSourceId = NULL;
- newMsg->mState = -1;
+ newMsg = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
+ newMsg->messageId = NULL;
+ newMsg->providerId = NULL;
+ newMsg->state = -1;
- if (copyMsg->mMessageId)
+ if (copyMsg->messageId)
- newMsg->mMessageId = OICStrdup(copyMsg->mMessageId);
+ newMsg->messageId = OICStrdup(copyMsg->messageId);
- if (copyMsg->mSourceId)
+ if (copyMsg->providerId)
- newMsg->mSourceId = OICStrdup(copyMsg->mSourceId);
+ newMsg->providerId = OICStrdup(copyMsg->providerId);
- newMsg->mState = copyMsg->mState;
+ newMsg->state = copyMsg->state;
-NSSync * NSGetSyncInfo(OCPayload * payload)
+NSSyncInfo * NSGetSyncInfo(OCPayload * payload)
{
NS_LOG(DEBUG, "NSBuildOICNotificationSync - IN");
{
NS_LOG(DEBUG, "NSBuildOICNotificationSync - IN");
- NSSync * retSync = (NSSync *)OICMalloc(sizeof(NSSync));
+ NSSyncInfo * retSync = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
if (!retSync)
{
return NULL;
}
if (!retSync)
{
return NULL;
}
- retSync->mMessageId = NULL;
- retSync->mState = Notification_Read;
+ retSync->messageId = NULL;
+ retSync->state = NS_SYNC_READ;
OCRepPayload * repPayload = (OCRepPayload *)payload;
OCRepPayload * repPayload = (OCRepPayload *)payload;
- if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_ID, &retSync->mMessageId))
+ if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_MESSAGE_ID, &retSync->messageId))
{
OICFree(retSync);
return NULL;
}
{
OICFree(retSync);
return NULL;
}
- if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_SOURCE, &retSync->mSourceId))
+ if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_PROVIDER_ID, &retSync->providerId))
{
OICFree(retSync);
return NULL;
}
int64_t state;
{
OICFree(retSync);
return NULL;
}
int64_t state;
- if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_STATE, & state))
+ if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_STATE, &state))
- OICFree(retSync->mMessageId);
+ OICFree(retSync->messageId);
OICFree(retSync);
return NULL;
}
OICFree(retSync);
return NULL;
}
- retSync->mState = (NSSyncTypes) state;
+ retSync->state = (NSSyncType) state;
- NS_LOG_V(DEBUG, "Sync ID : %s", retSync->mMessageId);
- NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->mState);
+ NS_LOG_V(DEBUG, "Sync ID : %s", retSync->messageId);
+ NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state);
NS_LOG(DEBUG, "NSBuildOICNotificationSync - OUT");
NS_LOG(DEBUG, "NSBuildOICNotificationSync - OUT");
NSResult NSFreeMessage(NSMessage *);\r
NSMessage * NSDuplicateMessage(NSMessage *);\r
\r
NSResult NSFreeMessage(NSMessage *);\r
NSMessage * NSDuplicateMessage(NSMessage *);\r
\r
-NSResult NSFreeSync(NSSync *);\r
-NSSync * NSDuplicateSync(NSSync *);\r
-NSSync * NSGetSyncInfo(OCPayload * payload);\r
+NSResult NSFreeSync(NSSyncInfo *);\r
+NSSyncInfo * NSDuplicateSync(NSSyncInfo *);\r
+NSSyncInfo * NSGetSyncInfo(OCPayload * payload);\r
\r
NSResult NSFreeConsumer(NSConsumer *);\r
NSConsumer * NSDuplicateConsumer(NSConsumer *);\r
\r
NSResult NSFreeConsumer(NSConsumer *);\r
NSConsumer * NSDuplicateConsumer(NSConsumer *);\r
typedef struct
{
NSProvider * provider;
typedef struct
{
NSProvider * provider;
} NSSyncData;
void * NSNotificationSyncFunc(void * obj)
{
NSProvider * provider = ((NSSyncData *) obj)->provider;
} NSSyncData;
void * NSNotificationSyncFunc(void * obj)
{
NSProvider * provider = ((NSSyncData *) obj)->provider;
- NSSync * syncData = ((NSSyncData *) obj)->sync;
+ NSSyncInfo * syncData = ((NSSyncData *) obj)->sync;
(* NSGetBoneNotificationSyncCb())(provider, syncData);
return NULL;
}
(* NSGetBoneNotificationSyncCb())(provider, syncData);
return NULL;
}
-void NSNotificationSync(NSProvider * provider, NSSync * sync)
+void NSNotificationSync(NSProvider * provider, NSSyncInfo * sync)
{
NSSyncData * obj = (NSSyncData *)OICMalloc(sizeof(NSSyncData));
NS_VERTIFY_NOT_NULL_V(obj);
{
NSSyncData * obj = (NSSyncData *)OICMalloc(sizeof(NSSyncData));
NS_VERTIFY_NOT_NULL_V(obj);
void NSNotificationPost(NSProvider * provider, NSMessage * obj);
void NSSetNotificationSyncCb(NSSyncCallback cb);
void NSNotificationPost(NSProvider * provider, NSMessage * obj);
void NSSetNotificationSyncCb(NSSyncCallback cb);
-void NSNotificationSync(NSProvider * provider, NSSync * sync);
+void NSNotificationSync(NSProvider * provider, NSSyncInfo * sync);
NSTask * NSMakeTask(NSTaskType, void *);
NSTask * NSMakeTask(NSTaskType, void *);
const char NS_MESSAGE_ACCEPTANCE[] = "0000-0000-0000-0000";
NSMessage_consumer * NSGetNSMessage(OCClientResponse * clientResponse);
const char NS_MESSAGE_ACCEPTANCE[] = "0000-0000-0000-0000";
NSMessage_consumer * NSGetNSMessage(OCClientResponse * clientResponse);
-NSSync * NSGetNSSyncInfo(OCClientResponse * clientResponse);
+NSSyncInfo * NSGetNSSyncInfo(OCClientResponse * clientResponse);
NSProvider * NSGetNSProvider(OCClientResponse * clientResponse);
OCRepPayload * NSGetPayloadofSyncInfo(NSMessage_consumer * message, int type);
NSProvider * NSGetNSProvider(OCClientResponse * clientResponse);
OCRepPayload * NSGetPayloadofSyncInfo(NSMessage_consumer * message, int type);
NS_VERTIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
NS_VERTIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
NS_VERTIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
NS_VERTIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
- NSSync * newNoti = NULL;
+ NSSyncInfo * newNoti = NULL;
NS_LOG(ERROR, "get provider");
NSProvider * provider = NSGetNSProvider(clientResponse);
NS_LOG(ERROR, "get provider");
NSProvider * provider = NSGetNSProvider(clientResponse);
NSTaskType taskType = TASK_RECV_READ;
NSTaskType taskType = TASK_RECV_READ;
- if (newNoti->mState != Notification_Read)
+ if (newNoti->state != NS_SYNC_READ)
{
NS_LOG(DEBUG, "newNoti->type : Dismiss");
taskType = TASK_RECV_DISMISS;
{
NS_LOG(DEBUG, "newNoti->type : Dismiss");
taskType = TASK_RECV_DISMISS;
NS_LOG(DEBUG, "get id");
OCRepPayload * payload = (OCRepPayload *)clientResponse->payload;
char * id = NULL;
NS_LOG(DEBUG, "get id");
OCRepPayload * payload = (OCRepPayload *)clientResponse->payload;
char * id = NULL;
- bool getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_ID, &id);
+ bool getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_MESSAGE_ID, &id);
NS_VERTIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
NS_LOG(DEBUG, "create NSMessage");
NS_VERTIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
NS_LOG(DEBUG, "create NSMessage");
-NSSync * NSGetNSSyncInfo(OCClientResponse * clientResponse)
+NSSyncInfo * NSGetNSSyncInfo(OCClientResponse * clientResponse)
{
NS_VERTIFY_NOT_NULL(clientResponse->payload, NULL);
{
NS_VERTIFY_NOT_NULL(clientResponse->payload, NULL);
NS_LOG(DEBUG, "get id");
char * id = NULL;
NS_LOG(DEBUG, "get id");
char * id = NULL;
- getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_ID, &id);
+ getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_MESSAGE_ID, &id);
NS_VERTIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
NS_LOG(DEBUG, "create NSSyncInfo");
NS_VERTIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
NS_LOG(DEBUG, "create NSSyncInfo");
- NSSync * retSync = (NSSync *)OICMalloc(sizeof(NSSync));
+ NSSyncInfo * retSync = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
NS_VERTIFY_NOT_NULL(retSync, NULL);
NS_VERTIFY_NOT_NULL(retSync, NULL);
- retSync->mMessageId = id;
- retSync->mState = (NSSyncTypes) state;
+ retSync->messageId = id;
+ retSync->state = (NSSyncType) state;
- NS_LOG_V(DEBUG, "Sync ID : %s", retSync->mMessageId);
- NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->mState);
+ NS_LOG_V(DEBUG, "Sync ID : %s", retSync->messageId);
+ NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state);
OC_STACK_KEEP_TRANSACTION, OICFree(newProvider));
memcpy(newProvider->mUserData, clientResponse->addr, sizeof(OCDevAddr));
OC_STACK_KEEP_TRANSACTION, OICFree(newProvider));
memcpy(newProvider->mUserData, clientResponse->addr, sizeof(OCDevAddr));
- if (accepter == NS_ACCEPTER_CONSUMER)
+ if (accepter == NS_ACCESS_DENY)
{
NS_LOG(DEBUG, "accepter is NS_ACCEPTER_CONSUMER, Callback to user");
{
NS_LOG(DEBUG, "accepter is NS_ACCEPTER_CONSUMER, Callback to user");
{
NS_VERTIFY_NOT_NULL(obj, NS_ERROR);
{
NS_VERTIFY_NOT_NULL(obj, NS_ERROR);
- OICFree(obj->mId);
- obj->mId = NULL;
+ OICFree(obj->messageId);
+ obj->messageId = NULL;
- OICFree(obj->mTitle);
- obj->mTitle = NULL;
+ OICFree(obj->title);
+ obj->title = NULL;
- OICFree(obj->mContentText);
- obj->mContentText = NULL;
+ OICFree(obj->contentText);
+ obj->contentText = NULL;
- OICFree(obj->mSource);
- obj->mSource = NULL;
+ OICFree(obj->sourceName);
+ obj->sourceName = NULL;
NS_LOG(DEBUG, "NSSubscribeRequestCb - OUT");\r
}\r
\r
NS_LOG(DEBUG, "NSSubscribeRequestCb - OUT");\r
}\r
\r
-void NSSyncCb(NSSync *sync)\r
+void NSSyncCb(NSSyncInfo *sync)\r
{\r
NS_LOG(DEBUG, "NSSyncCb - IN");\r
g_syncCb(sync);\r
{\r
NS_LOG(DEBUG, "NSSyncCb - IN");\r
g_syncCb(sync);\r
case TASK_CB_SYNC:\r
{\r
NS_LOG(DEBUG, "CASE TASK_CB_SYNC : ");\r
case TASK_CB_SYNC:\r
{\r
NS_LOG(DEBUG, "CASE TASK_CB_SYNC : ");\r
- NSSync * sync = (NSSync*)node->taskData;\r
+ NSSyncInfo * sync = (NSSyncInfo*)node->taskData;\r
NSSyncCb(NSDuplicateSync(sync));\r
NSFreeSync(sync);\r
break;\r
NSSyncCb(NSDuplicateSync(sync));\r
NSFreeSync(sync);\r
break;\r
OCRepPayloadSetUri(*msgPayload, NS_COLLECTION_MESSAGE_URI);
OCRepPayloadSetUri(*msgPayload, NS_COLLECTION_MESSAGE_URI);
- NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_ID, msg->mId);
- NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TITLE, msg->mTitle);
- NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TEXT, msg->mContentText);
- NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_SOURCE, msg->mSource);
+ NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_MESSAGE_ID, msg->messageId);
+ NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TITLE, msg->title);
+ NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TEXT, msg->contentText);
+ NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_SOURCE, msg->sourceName);
NS_LOG(DEBUG, "NSSetMessagePayload - OUT");
return NS_OK;
}
NS_LOG(DEBUG, "NSSetMessagePayload - OUT");
return NS_OK;
}
-NSResult NSSetSyncPayload(NSSync *sync, OCRepPayload** syncPayload)
+NSResult NSSetSyncPayload(NSSyncInfo *sync, OCRepPayload** syncPayload)
{
NS_LOG(DEBUG, "NSSetSyncPayload - IN");
{
NS_LOG(DEBUG, "NSSetSyncPayload - IN");
OCRepPayloadSetUri(*syncPayload, NS_COLLECTION_SYNC_URI);
OCRepPayloadSetUri(*syncPayload, NS_COLLECTION_SYNC_URI);
- NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_ID, sync->mMessageId);
- NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_SOURCE, sync->mSourceId);
+ NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_MESSAGE_ID, sync->messageId);
+ NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_PROVIDER_ID, sync->providerId);
- OCRepPayloadSetPropInt(*syncPayload, NS_ATTRIBUTE_STATE, sync->mState);
+ OCRepPayloadSetPropInt(*syncPayload, NS_ATTRIBUTE_STATE, sync->state);
NS_LOG(DEBUG, "NSSetSyncPayload - OUT");
return NS_OK;
NS_LOG(DEBUG, "NSSetSyncPayload - OUT");
return NS_OK;
-NSResult NSSendSync(NSSync *sync)
+NSResult NSSendSync(NSSyncInfo *sync)
{
NS_LOG(DEBUG, "NSSendSync - IN");
{
NS_LOG(DEBUG, "NSSendSync - IN");
}
case TASK_SEND_READ:
NS_LOG(DEBUG, "CASE TASK_SEND_READ : ");
}
case TASK_SEND_READ:
NS_LOG(DEBUG, "CASE TASK_SEND_READ : ");
- NSSendSync((NSSync*) node->taskData);
- NSFreeSync((NSSync*) node->taskData);
+ NSSendSync((NSSyncInfo*) node->taskData);
+ NSFreeSync((NSSyncInfo*) node->taskData);
break;
case TASK_RECV_READ:
NS_LOG(DEBUG, "CASE TASK_RECV_READ : ");
break;
case TASK_RECV_READ:
NS_LOG(DEBUG, "CASE TASK_RECV_READ : ");
- NSSendSync((NSSync*) node->taskData);
+ NSSendSync((NSSyncInfo*) node->taskData);
NSPushQueue(INTERFACE_SCHEDULER, TASK_CB_SYNC, node->taskData);
break;
NSPushQueue(INTERFACE_SCHEDULER, TASK_CB_SYNC, node->taskData);
break;
{
NS_LOG(DEBUG, "NSMessage is valid");
{
NS_LOG(DEBUG, "NSMessage is valid");
- NotificationMessageResource.id = OICStrdup(msg->mId);
- NotificationMessageResource.title = OICStrdup(msg->mTitle);
- NotificationMessageResource.body = OICStrdup(msg->mContentText);
+ NotificationMessageResource.id = OICStrdup(msg->messageId);
+ NotificationMessageResource.title = OICStrdup(msg->title);
+ NotificationMessageResource.body = OICStrdup(msg->contentText);
-NSResult NSPutSyncResource(NSSync *sync, OCResourceHandle * handle)
+NSResult NSPutSyncResource(NSSyncInfo *sync, OCResourceHandle * handle)
{
NS_LOG(DEBUG, "NSPutSyncResource - IN");
{
NS_LOG(DEBUG, "NSPutSyncResource - IN");
NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle);
NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle);
-NSResult NSPutSyncResource(NSSync *sync, OCResourceHandle * handle);
+NSResult NSPutSyncResource(NSSyncInfo *sync, OCResourceHandle * handle);
const char* NSGetNotificationMessageUri();
const char* NSGetNotificationMessageUri();
break;\r
case TASK_CB_SYNC:\r
NS_LOG(DEBUG, "CASE TASK_CB_SYNC : Free");\r
break;\r
case TASK_CB_SYNC:\r
NS_LOG(DEBUG, "CASE TASK_CB_SYNC : Free");\r
- NSFreeSync((NSSync*) task->taskData);\r
+ NSFreeSync((NSSyncInfo*) task->taskData);\r
break;\r
default:\r
NS_LOG(DEBUG, "No Task Type");\r
break;\r
default:\r
NS_LOG(DEBUG, "No Task Type");\r
case TASK_SEND_READ:\r
case TASK_RECV_READ:\r
NS_LOG(DEBUG, "NSFreeSync : Free ");\r
case TASK_SEND_READ:\r
case TASK_RECV_READ:\r
NS_LOG(DEBUG, "NSFreeSync : Free ");\r
- NSFreeSync((NSSync*) task->taskData);\r
+ NSFreeSync((NSSyncInfo*) task->taskData);\r
NS_LOG(DEBUG, "fail to write cache");\r
}\r
\r
NS_LOG(DEBUG, "fail to write cache");\r
}\r
\r
- if (NSGetSubscriptionAccepter() == NS_ACCEPTER_PROVIDER)\r
+ if (NSGetSubscriptionAccepter() == NS_ACCESS_ALLOW)\r
{\r
NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_PROVIDER");\r
NSAskAcceptanceToUser(entityHandlerRequest);\r
}\r
{\r
NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_PROVIDER");\r
NSAskAcceptanceToUser(entityHandlerRequest);\r
}\r
- else if (NSGetSubscriptionAccepter() == NS_ACCEPTER_CONSUMER)\r
+ else if (NSGetSubscriptionAccepter() == NS_ACCESS_DENY)\r
{\r
NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_CONSUMER");\r
NSSendSubscriptionResponse(entityHandlerRequest, true);\r
{\r
NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_CONSUMER");\r
NSSendSubscriptionResponse(entityHandlerRequest, true);\r
}\r
\r
OCRepPayloadSetUri(payload, NS_COLLECTION_MESSAGE_URI);\r
}\r
\r
OCRepPayloadSetUri(payload, NS_COLLECTION_MESSAGE_URI);\r
- OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_ID, "0000-0000-0000-0000");\r
+ OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_MESSAGE_ID, "0000-0000-0000-0000");\r
OCRepPayloadSetPropBool(payload, NS_ATTRIBUTE_ACCPETANCE, accepted);\r
\r
NSCacheElement * element = NSStorageRead(consumerSubList, id);\r
OCRepPayloadSetPropBool(payload, NS_ATTRIBUTE_ACCPETANCE, accepted);\r
\r
NSCacheElement * element = NSStorageRead(consumerSubList, id);\r