Merge "[HICN-43] Fixed packet lifetime and setting AH flag when a data packet carries a signature"

3 files changed, 9 insertions, 5 deletions

diff --git a/lib/src/base.h b/lib/src/base.h
index 0fcf2a9c2..d8a79a9c2 100644
--- a/lib/src/base.h
+++ b/lib/src/base.h
@@ -30,9 +30,9 @@ typedef u32 hicn_faceid_t;
 typedef u8 hicn_pathlabel_t;
 typedef u32 hicn_lifetime_t;
 
-#define HICN_MAX_LIFETIME HICN_MAX_LIFETIME_SCALED << HICN_MAX_LIFETIME_MULTIPLIER
 #define HICN_MAX_LIFETIME_SCALED 0xFFFF
-#define HICN_MAX_LIFETIME_MULTIPLIER 0xF	/* 4 bits */
+#define HICN_MAX_LIFETIME_MULTIPLIER 0x0F	/* 4 bits */
+#define HICN_MAX_LIFETIME HICN_MAX_LIFETIME_SCALED << HICN_MAX_LIFETIME_MULTIPLIER
 
 /**
  * @brief hICN packet format type
diff --git a/lib/src/compat.c b/lib/src/compat.c
index 56504fe5e..fba826ab0 100644
--- a/lib/src/compat.c
+++ b/lib/src/compat.c
@@ -1137,7 +1137,7 @@ int
 hicn_data_reset_for_hash (hicn_format_t format, hicn_header_t * packet)
 {
   hicn_type_t type = hicn_format_to_type (format);
-  return hicn_ops_vft[type.l1]->reset_interest_for_hash (type,
+  return hicn_ops_vft[type.l1]->reset_data_for_hash (type,
 							 &packet->protocol);
 
 }
diff --git a/lib/src/protocol/tcp.c b/lib/src/protocol/tcp.c
index 08a1c73ef..92ded5c29 100644
--- a/lib/src/protocol/tcp.c
+++ b/lib/src/protocol/tcp.c
@@ -58,6 +58,10 @@ tcp_init_packet_header (hicn_type_t type, hicn_protocol_t * h)
       TCP_DEFAULT_SYN << 1 | TCP_DEFAULT_FIN << 0,.window =
       htons (TCP_DEFAULT_WINDOW_SIZE),.csum = 0,.urg_ptr = 65000,};
 
+  uint8_t ah_flag = type.l2 == IPPROTO_AH ? AH_FLAG : ~AH_FLAG;
+
+  h->tcp.flags |= ah_flag;
+
   return CHILD_OPS (init_packet_header, type, h);
 }
 
@@ -166,7 +170,7 @@ tcp_set_lifetime (hicn_type_t type, hicn_protocol_t * h,
       h->tcp.urg_ptr = htons (HICN_MAX_LIFETIME_SCALED);
       h->tcp.data_offset_and_reserved =
 	(h->
-	 tcp.data_offset_and_reserved & ~0xF) | HICN_MAX_LIFETIME_MULTIPLIER;
+	 tcp.data_offset_and_reserved & ~0x0F) | HICN_MAX_LIFETIME_MULTIPLIER;
       return HICN_LIB_ERROR_NONE;
     }
 
@@ -179,7 +183,7 @@ tcp_set_lifetime (hicn_type_t type, hicn_protocol_t * h,
 
   h->tcp.urg_ptr = htons (lifetime_scaled);
   h->tcp.data_offset_and_reserved =
-    (h->tcp.data_offset_and_reserved & ~0xF) | multiplier;
+    (h->tcp.data_offset_and_reserved & ~0x0F) | multiplier;
 
   return HICN_LIB_ERROR_NONE;
 }