void onNotificationPosted(NSMessage * notification)
{
- printf("id : %lld\n", notification->messageId);
+ printf("id : %lld\n", (long long int)notification->messageId);
printf("title : %s\n", notification->title);
printf("content : %s\n", notification->contentText);
printf("source : %s\n", notification->sourceName);
void onNotificationSync(NSSyncInfo * sync)
{
- printf("Sync ID : %lld\n", sync->messageId);
+ printf("Sync ID : %lld\n", (long long int)sync->messageId);
printf("Sync STATE : %d\n", sync->state);
}
#ifndef _NS_COMMON_H_
#define _NS_COMMON_H_
+#include <stdint.h>
+
#define NS_ATTRIBUTE_POLICY "ACCEPTER"
#define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
#define NS_ATTRIBUTE_SYNC "SYNC_URI"
#include <stdlib.h>\r
#include <stdio.h>\r
#include <stdbool.h>\r
+#include <octypes.h>\r
#include "NSCommon.h"\r
#include "NSConstants.h"\r
\r
OICFree(providerId);
NS_LOG_V(DEBUG, "Provider ID : %s", retSync->providerId);
- NS_LOG_V(DEBUG, "Sync ID : %lld", retSync->messageId);
+ NS_LOG_V(DEBUG, "Sync ID : %lld", (long long int)retSync->messageId);
NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state);
NS_LOG(DEBUG, "NSGetSyncInfo - OUT");
NS_VERIFY_NOT_NULL(newMsg, NULL);
OICStrcpy(newMsg->providerId, NS_DEVICE_ID_LENGTH, msg->providerId);
- newMsg->i_addr = (OCDevAddr *)OICMalloc(sizeof(OCDevAddr));
- NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(newMsg, NULL, NSOICFree(newMsg));
- memcpy(newMsg->i_addr, msg->i_addr, sizeof(OCDevAddr));
newMsg->messageId = msg->messageId;
newMsg->title = OICStrdup(msg->title);
NSOICFree(msg->title);
NSOICFree(msg->contentText);
NSOICFree(msg->sourceName);
- NSOICFree(msg->i_addr);
+ NSOICFree(msg->dateTime);
+
+ // TODO change to remove function.
+ NSOICFree(msg->mediaContents);
NSOICFree(msg);
}
NSProviderConnectionInfo * tmp = conn;
NSProviderConnectionInfo * retInfo = NSCreateProviderConnections(tmp->addr);
+ NS_VERIFY_NOT_NULL(retInfo, NULL);
tmp = tmp->next;
NSProviderConnectionInfo * copyInfo = retInfo;
char * title;
char * contentText;
char * sourceName;
- NSMediaContents mediaContents;
+ NSMediaContents * mediaContents;
- OCDevAddr * i_addr;
- NSSyncType i_messageTypes;
} NSMessage_consumer;
bool NSIsStartedConsumer();
NS_LOG_V (DEBUG, "provider id: %s", pId);
NS_VERIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
- NS_LOG(DEBUG, "get provider address");
- OCDevAddr * addr = (OCDevAddr *)OICMalloc(sizeof(OCDevAddr));
- NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(addr, NULL, NSGetMessagePostClean(pId, addr));
- memcpy(addr, clientResponse->addr, sizeof(OCDevAddr));
-
NS_LOG(DEBUG, "create NSMessage");
NSMessage_consumer * retMsg = NSCreateMessage_internal(id, pId);
- NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(retMsg, NULL, NSGetMessagePostClean(pId, addr));
+ NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(retMsg, NULL, NSOICFree(pId));
NSOICFree(pId);
- retMsg->i_addr = addr;
- retMsg->i_messageTypes = NS_SYNC_UNREAD;
-
NS_LOG(DEBUG, "get msg optional field");
OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_TITLE, &retMsg->title);
OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_TEXT, &retMsg->contentText);
OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_DATETIME, &retMsg->dateTime);
OCRepPayloadGetPropInt(payload, NS_ATTRIBUTE_TTL, (int64_t *)&retMsg->ttl);
- NS_LOG_V(DEBUG, "Msg Address : %s", retMsg->i_addr->addr);
- NS_LOG_V(DEBUG, "Msg ID : %lld", retMsg->messageId);
+ NS_LOG_V(DEBUG, "Msg ID : %lld", (long long int)retMsg->messageId);
NS_LOG_V(DEBUG, "Msg Title : %s", retMsg->title);
NS_LOG_V(DEBUG, "Msg Content : %s", retMsg->contentText);
NS_LOG_V(DEBUG, "Msg Source : %s", retMsg->sourceName);
NS_LOG_V(DEBUG, "Msg Type : %d", retMsg->type);
NS_LOG_V(DEBUG, "Msg Date : %s", retMsg->dateTime);
- NS_LOG_V(DEBUG, "Msg ttl : %lld", retMsg->ttl);
+ NS_LOG_V(DEBUG, "Msg ttl : %lld", (long long int)retMsg->ttl);
return retMsg;
}
NSSyncInfo * retSync = NSCreateSyncInfo_consumer(id, pId, (NSSyncType)state);
NS_VERIFY_NOT_NULL(retSync, NULL);
- NS_LOG_V(DEBUG, "Sync ID : %lld", retSync->messageId);
+ NS_LOG_V(DEBUG, "Sync ID : %lld", (long long int)retSync->messageId);
NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state);
NS_LOG_V(DEBUG, "Sync Provider ID : %s", retSync->providerId);
retMsg->type = NS_MESSAGE_INFO;
retMsg->dateTime = NULL;
retMsg->ttl = 0;
- retMsg->i_addr = NULL;
+ retMsg->mediaContents = NULL;
return retMsg;
}
NSMessage * NSConsumerGetMessage(uint64_t messageId)
{
char msgId[NS_DEVICE_ID_LENGTH] = { 0, };
- snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", messageId);
+ snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", (long long int)messageId);
return (NSMessage *) NSConsumerFindNSMessage(msgId);
}
void NSConsumerHandleProviderDeleted(NSProvider_internal * provider)
{
- // TODO delete provider infomation on storage list.
- (void) provider;
+ NS_VERIFY_NOT_NULL_V(provider);
+
+ NSCacheList * providerCache = *(NSGetProviderCacheList());
+ NS_VERIFY_NOT_NULL_V(providerCache);
+
+ NSResult ret = NSStorageDelete(providerCache, provider->providerId);
+ NS_VERIFY_NOT_NULL_V(ret == NS_OK ? (void *)1 : NULL);
}
void NSConsumerHandleRecvSubscriptionConfirmed(NSMessage_consumer * msg)
NS_VERIFY_NOT_NULL_V(sync);
char msgId[NS_DEVICE_ID_LENGTH] = { 0, };
- snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", sync->messageId);
+ snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", (long long int)sync->messageId);
NSMessage_consumer * msg = NSMessageCacheFind(msgId);
NS_VERIFY_NOT_NULL_V(msg);
break;
}
case TASK_CONSUMER_REQ_SUBSCRIBE:
- case TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL:
case TASK_SEND_SYNCINFO:
{
NSConsumerCommunicationTaskProcessing(task);
break;
}
+ case TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL:
+ {
+ NSProvider_internal * data = NSCopyProvider((NSProvider_internal *)task->taskData);
+ NS_VERIFY_NOT_NULL_V(data);
+ NSTask * conTask = NSMakeTask(TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL, data);
+ NS_VERIFY_NOT_NULL_V(conTask);
+ NSConsumerCommunicationTaskProcessing(task);
+ NSConsumerInternalTaskProcessing(conTask);
+ break;
+ }
case TASK_RECV_SYNCINFO:
case TASK_CONSUMER_RECV_MESSAGE:
case TASK_CONSUMER_PROVIDER_DISCOVERED:
pthread_mutex_unlock(mutex);
char msgId[NS_DEVICE_ID_LENGTH] = {0, };
- snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", newMsgObj->messageId);
+ snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", (long long int)newMsgObj->messageId);
NSCacheElement * it = NSStorageRead(list, msgId);
pthread_mutex_lock(mutex);
NSMessage_consumer * msg = (NSMessage_consumer *) data;
char msgId[NS_DEVICE_ID_LENGTH] = {0, };
- snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", msg->messageId);
+ snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", (long long int)msg->messageId);
if (!strcmp(msgId, id))
{
return true;