diff options
author | DoHyun Pyun <dh79.pyun@samsung.com> | 2020-04-14 13:13:18 +0900 |
---|---|---|
committer | DoHyun Pyun <dh79.pyun@samsung.com> | 2020-04-14 13:38:41 +0900 |
commit | 32806a4cfb76b08b7a455cb6c3978d2a7a808675 (patch) | |
tree | 4ad5f7a49eb613474d8ebd9030e32b46377df8b9 /resource/csdk | |
parent | d3c0b7cd0d04949e39cbbce410949cfe63a2dd2f (diff) | |
download | iotivity-32806a4cfb76b08b7a455cb6c3978d2a7a808675.tar.gz iotivity-32806a4cfb76b08b7a455cb6c3978d2a7a808675.tar.bz2 iotivity-32806a4cfb76b08b7a455cb6c3978d2a7a808675.zip |
Revert "[CONPRO-1568] Ignoring duplicate IPv6/Ipv4 messages"submit/tizen/20200414.045530accepted/tizen/unified/20200416.001142
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>
Diffstat (limited to 'resource/csdk')
-rwxr-xr-x[-rw-r--r--] | resource/csdk/connectivity/api/cacommon.h | 1 | ||||
-rw-r--r-- | resource/csdk/connectivity/src/camessagehandler.c | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h index f23696800..d1e53f75f 100644..100755 --- a/resource/csdk/connectivity/api/cacommon.h +++ b/resource/csdk/connectivity/api/cacommon.h @@ -547,7 +547,6 @@ typedef struct uint16_t messageId; char token[CA_MAX_TOKEN_LEN]; uint8_t tokenLength; - uint32_t ifindex; } CAHistoryItem_t; typedef struct diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c index 5a92d153f..da4320d30 100644 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -768,18 +768,20 @@ static bool CADropSecondMessage(CAHistory_t *history, const CAEndpoint_t *ep, ui { 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].ifindex = ep->ifindex; if (token && tokenLength) { memcpy(history->items[history->nextIndex].token, token, tokenLength); |