summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d3c0b7c)
This reverts commit
d386e3797794d970b5e96c25fc00780c80b2a6fe.
Native iotcon ITC fail issues are occured with this patchset in
FHub 6.0 image. After re-checking the patchset, we will apply.
Change-Id: I34e07c6e07f1c6b602cbf861ea51459a639ab80e
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
uint16_t messageId;
char token[CA_MAX_TOKEN_LEN];
uint8_t tokenLength;
uint16_t messageId;
char token[CA_MAX_TOKEN_LEN];
uint8_t tokenLength;
} CAHistoryItem_t;
typedef struct
} CAHistoryItem_t;
typedef struct
{
CAHistoryItem_t *item = &(history->items[i]);
if (id == item->messageId && tokenLength == item->tokenLength
{
CAHistoryItem_t *item = &(history->items[i]);
if (id == item->messageId && tokenLength == item->tokenLength
- && ep->ifindex == item->ifindex && memcmp(item->token, token, tokenLength) == 0)
+ && memcmp(item->token, token, tokenLength) == 0)
- OIC_LOG_V(INFO, TAG, "IPv%c duplicate message ignored",
- familyFlags & CA_IPV6 ? '6' : '4');
- ret = true;
- break;
+ if ((familyFlags ^ item->flags) == CA_IPFAMILY_MASK)
+ {
+ OIC_LOG_V(INFO, TAG, "IPv%c duplicate message ignored",
+ familyFlags & CA_IPV6 ? '6' : '4');
+ ret = true;
+ break;
+ }
}
}
history->items[history->nextIndex].flags = familyFlags;
history->items[history->nextIndex].messageId = id;
}
}
history->items[history->nextIndex].flags = familyFlags;
history->items[history->nextIndex].messageId = id;
- history->items[history->nextIndex].ifindex = ep->ifindex;
if (token && tokenLength)
{
memcpy(history->items[history->nextIndex].token, token, tokenLength);
if (token && tokenLength)
{
memcpy(history->items[history->nextIndex].token, token, tokenLength);