aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-02-08 11:06:06 +0000
committerGerrit Code Review <gerrit@fd.io>2019-02-08 11:06:06 +0000
commitd6c91e037e394bd61dfa8a3f904199a6aeb1bd45 (patch)
tree51bee862f47d940b047345d36e7531ffabe8e20d
parent4741be2a5d7d6d0dd79dab0ea372c47f97f48719 (diff)
parentc93d0904254871ec3c8563559bc157ad5a11f3e0 (diff)
Merge "[HICN-42] reuse HICN_MAX_LIFETIME in messageHandler"
-rw-r--r--hicn-light/src/core/messageHandler.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/hicn-light/src/core/messageHandler.h b/hicn-light/src/core/messageHandler.h
index cf8ab3672..f469ac5b0 100644
--- a/hicn-light/src/core/messageHandler.h
+++ b/hicn-light/src/core/messageHandler.h
@@ -41,8 +41,6 @@
#define PATH_LABEL_MASK 0x8000 // 1000 0000 0000 0000
#define NOT_PATH_LABEL_MASK 0x7fff // 0111 0000 0000 0000
#define UINT16_T_MASK 0x0000ffff // 1111 1111 1111 1111
-#define NEVER_EXPIRE \
- 16777216 // 2^16 (max urgent pointer) * 2^8 (max reserved + NS bits)
/*** HICN ALLOWED PORTS ***/
#define CONTROL_PORT 9695
@@ -435,7 +433,7 @@ static inline bool messageHandler_HasContentExpiryTime(const uint8_t *message) {
hicn_data_get_expiry_time((hicn_header_t *)message, &expirationTime);
if (res < 0) return false;
- if (expirationTime == NEVER_EXPIRE) return false;
+ if (expirationTime == HICN_MAX_LIFETIME) return false;
return true;
}