1 files changed, 118 insertions, 82 deletions

diff --git a/lib/src/protocol/ah.c b/lib/src/protocol/ah.c
index 13340eae1..ea028d559 100644
--- a/lib/src/protocol/ah.c
+++ b/lib/src/protocol/ah.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2022 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -18,12 +18,12 @@
  * @brief hICN operations for AH header
  */
 
-#include <string.h> // memcpy
 #include <hicn/common.h>
 #include <hicn/error.h>
-#include <hicn/header.h>
-#include <hicn/ops.h>
-#include <hicn/protocol/ah.h>
+#include <string.h> // memcpy
+
+#include "../ops.h"
+#include "ah.h"
 
 DECLARE_get_interest_locator (ah, UNEXPECTED);
 DECLARE_set_interest_locator (ah, UNEXPECTED);
@@ -31,206 +31,242 @@ DECLARE_get_interest_name (ah, UNEXPECTED);
 DECLARE_set_interest_name (ah, UNEXPECTED);
 DECLARE_get_interest_name_suffix (ah, UNEXPECTED);
 DECLARE_set_interest_name_suffix (ah, UNEXPECTED);
-DECLARE_mark_packet_as_interest (ah, UNEXPECTED);
-DECLARE_mark_packet_as_data (ah, UNEXPECTED);
+DECLARE_get_type (ah, UNEXPECTED);
+DECLARE_set_type (ah, UNEXPECTED);
 DECLARE_get_data_locator (ah, UNEXPECTED);
 DECLARE_set_data_locator (ah, UNEXPECTED);
 DECLARE_get_data_name (ah, UNEXPECTED);
 DECLARE_set_data_name (ah, UNEXPECTED);
 DECLARE_get_data_name_suffix (ah, UNEXPECTED);
 DECLARE_set_data_name_suffix (ah, UNEXPECTED);
-DECLARE_get_data_pathlabel (ah, UNEXPECTED);
-DECLARE_set_data_pathlabel (ah, UNEXPECTED);
-DECLARE_update_data_pathlabel (ah, UNEXPECTED);
+DECLARE_get_data_path_label (ah, UNEXPECTED);
+DECLARE_set_data_path_label (ah, UNEXPECTED);
+DECLARE_update_data_path_label (ah, UNEXPECTED);
 DECLARE_get_lifetime (ah, UNEXPECTED);
 DECLARE_set_lifetime (ah, UNEXPECTED);
-DECLARE_get_payload_length (ah, UNEXPECTED);
-DECLARE_set_payload_length (ah, UNEXPECTED);
+// DECLARE_get_payload_len (ah, UNEXPECTED);
+DECLARE_set_payload_len (ah, UNEXPECTED);
+DECLARE_get_payload_type (ah, UNEXPECTED);
+DECLARE_set_payload_type (ah, UNEXPECTED);
+DECLARE_is_last_data (ah, UNEXPECTED);
+DECLARE_set_last_data (ah, UNEXPECTED);
 
 int
-ah_init_packet_header (hicn_type_t type, hicn_protocol_t *h)
+ah_init_packet_header (hicn_packet_buffer_t *pkbuf, size_t pos)
 {
-  /* *INDENT-OFF* */
-  h->ah = (_ah_header_t){
+  pkbuf->ah = pkbuf->len;
+  if (AH_HDRLEN > pkbuf->buffer_size - pkbuf->len)
+    return -1;
+  pkbuf->len += AH_HDRLEN;
+
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  /* clang-format off */
+  *ah = (_ah_header_t){
     .nh = (u8) 0,
     .payloadlen = (u8) 0,
     .reserved = (u16) 0,
   };
-  /* *INDENT-ON* */
-  return CHILD_OPS (init_packet_header, type, h);
+  /* clang-format on */
+  return CALL_CHILD (init_packet_header, pkbuf, pos);
 }
 
 int
-ah_reset_interest_for_hash (hicn_type_t type, hicn_protocol_t *h)
+ah_reset_interest_for_hash (hicn_packet_buffer_t *pkbuf, size_t pos)
 {
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
   size_t signature_size;
-  int rc =
-    hicn_ops_vft[type.l1]->get_signature_size (type, h, &signature_size);
+  int rc = CALL (get_signature_size, pkbuf, &signature_size);
   if (rc < 0)
     return rc;
-  memset (&(h->ah.validationPayload), 0, signature_size);
-  return CHILD_OPS (reset_interest_for_hash, type, h);
+  memset (&(ah->validationPayload), 0, signature_size);
+  ah->signaturePadding = 0;
+  return CALL_CHILD (reset_interest_for_hash, pkbuf, pos);
 }
 
 int
-ah_reset_data_for_hash (hicn_type_t type, hicn_protocol_t *h)
+ah_reset_data_for_hash (hicn_packet_buffer_t *pkbuf, size_t pos)
 {
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
   size_t signature_size;
-  int rc =
-    hicn_ops_vft[type.l1]->get_signature_size (type, h, &signature_size);
+  int rc = CALL (get_signature_size, pkbuf, &signature_size);
   if (rc < 0)
     return rc;
-  memset (&(h->ah.validationPayload), 0, signature_size);
-  return CHILD_OPS (reset_interest_for_hash, type, h);
+  memset (&(ah->validationPayload), 0, signature_size);
+  ah->signaturePadding = 0;
+  return CALL_CHILD (reset_interest_for_hash, pkbuf, pos);
 }
 
 int
-ah_update_checksums (hicn_type_t type, hicn_protocol_t *h, u16 partial_csum,
-		     size_t payload_length)
+ah_update_checksums (const hicn_packet_buffer_t *pkbuf, size_t pos,
+		     u16 partial_csum, size_t payload_len)
 {
   /* Nothing to do as there is no checksum in AH */
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_verify_checksums (hicn_type_t type, hicn_protocol_t *h, u16 partial_csum,
-		     size_t payload_length)
+ah_update_checksums_incremental (const hicn_packet_buffer_t *pkbuf, size_t pos,
+				 u16 *old_val, u16 *new_val, u8 size,
+				 bool skip_first)
 {
-  /* Nothing to do as there is no checksum in AH */
-  return HICN_LIB_ERROR_NONE;
+  return CALL_CHILD (update_checksums_incremental, pkbuf, pos, old_val,
+		     new_val, size, false);
 }
 
 int
-ah_rewrite_interest (hicn_type_t type, hicn_protocol_t *h,
-		     const ip46_address_t *addr_new, ip46_address_t *addr_old)
+ah_verify_checksums (const hicn_packet_buffer_t *pkbuf, size_t pos,
+		     u16 partial_csum, size_t payload_len)
 {
-  /* Nothing to do on signature */
+  /* Nothing to do as there is no checksum in AH */
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_rewrite_data (hicn_type_t type, hicn_protocol_t *h,
-		 const ip46_address_t *addr_new, ip46_address_t *addr_old,
-		 const hicn_faceid_t face_id, u8 reset_pl)
+ah_rewrite_interest (const hicn_packet_buffer_t *pkbuf, size_t pos,
+		     const hicn_ip_address_t *addr_new,
+		     hicn_ip_address_t *addr_old)
 {
   /* Nothing to do on signature */
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_length (hicn_type_t type, const hicn_protocol_t *h, size_t *length)
-{
-  return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-}
-
-int
-ah_get_current_header_length (hicn_type_t type, const hicn_protocol_t *h,
-			      size_t *header_length)
+ah_rewrite_data (const hicn_packet_buffer_t *pkbuf, size_t pos,
+		 const hicn_ip_address_t *addr_new,
+		 hicn_ip_address_t *addr_old, const hicn_faceid_t face_id,
+		 u8 reset_pl)
 {
-  *header_length = AH_HDRLEN + (h->ah.payloadlen << 2);
+  /* Nothing to do on signature */
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_header_length (hicn_type_t type, const hicn_protocol_t *h,
-		      size_t *header_length)
+ah_get_signature (const hicn_packet_buffer_t *pkbuf, size_t pos,
+		  uint8_t **signature)
 {
-  size_t child_header_length = 0;
-  int rc = CHILD_OPS (get_header_length, type, h, &child_header_length);
-  if (rc < 0)
-    return rc;
-  *header_length = AH_HDRLEN + (h->ah.payloadlen << 2) + child_header_length;
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  *signature = ah->validationPayload;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_signature (hicn_type_t type, hicn_protocol_t *h, uint8_t **signature)
+ah_has_signature (const hicn_packet_buffer_t *pkbuf, size_t pos, bool *flag)
 {
-  *signature = h->ah.validationPayload;
+  *flag = true;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_signature_size (hicn_type_t type, const hicn_protocol_t *h,
+ah_get_signature_size (const hicn_packet_buffer_t *pkbuf, size_t pos,
 		       size_t *signature_size)
 {
-  *signature_size = h->ah.payloadlen << 2;
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  *signature_size = ah->payloadlen << 2;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_set_signature_size (hicn_type_t type, hicn_protocol_t *h,
-		       const size_t signature_size)
+ah_set_signature_size (const hicn_packet_buffer_t *pkbuf, size_t pos,
+		       size_t signature_size)
 {
-  h->ah.payloadlen = (u8) (signature_size >> 2);
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  ah->payloadlen = signature_size >> 2;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_set_signature_timestamp (hicn_type_t type, hicn_protocol_t *h,
+ah_set_signature_timestamp (const hicn_packet_buffer_t *pkbuf, size_t pos,
 			    uint64_t signature_timestamp)
 {
-  uint64_t netwok_order_timestamp = htonll (signature_timestamp);
-  memcpy (h->ah.timestamp_as_u8, &netwok_order_timestamp, sizeof (uint64_t));
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  uint64_t netwok_order_timestamp = hicn_net_to_host_64 (signature_timestamp);
+  memcpy (ah->timestamp_as_u8, &netwok_order_timestamp, sizeof (uint64_t));
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_signature_timestamp (hicn_type_t type, const hicn_protocol_t *h,
+ah_get_signature_timestamp (const hicn_packet_buffer_t *pkbuf, size_t pos,
 			    uint64_t *signature_timestamp)
 {
-  memcpy (signature_timestamp, h->ah.timestamp_as_u8, sizeof (uint64_t));
-  *signature_timestamp = ntohll (*signature_timestamp);
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  memcpy (signature_timestamp, ah->timestamp_as_u8, sizeof (uint64_t));
+  *signature_timestamp = hicn_host_to_net_64 (*signature_timestamp);
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_set_validation_algorithm (hicn_type_t type, hicn_protocol_t *h,
+ah_set_validation_algorithm (const hicn_packet_buffer_t *pkbuf, size_t pos,
 			     uint8_t validation_algorithm)
 {
-  h->ah.validationAlgorithm = validation_algorithm;
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  ah->validationAlgorithm = validation_algorithm;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_validation_algorithm (hicn_type_t type, const hicn_protocol_t *h,
+ah_get_validation_algorithm (const hicn_packet_buffer_t *pkbuf, size_t pos,
 			     uint8_t *validation_algorithm)
 {
-  *validation_algorithm = h->ah.validationAlgorithm;
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  *validation_algorithm = ah->validationAlgorithm;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_set_signature_gap (hicn_type_t type, hicn_protocol_t *h, uint8_t gap)
+ah_set_signature_padding (const hicn_packet_buffer_t *pkbuf, size_t pos,
+			  size_t padding)
 {
-  h->ah.signatureGap = gap;
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  ah->signaturePadding = padding;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_signature_gap (hicn_type_t type, const hicn_protocol_t *h, uint8_t *gap)
+ah_get_signature_padding (const hicn_packet_buffer_t *pkbuf, size_t pos,
+			  size_t *padding)
 {
-  *gap = h->ah.signatureGap;
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  *padding = ah->signaturePadding;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_set_key_id (hicn_type_t type, hicn_protocol_t *h, uint8_t *key_id)
+ah_set_key_id (const hicn_packet_buffer_t *pkbuf, size_t pos, uint8_t *key_id,
+	       size_t size)
 {
-  memcpy (h->ah.keyId, key_id, sizeof (h->ah.keyId));
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  if (size != sizeof (ah->keyId))
+    return HICN_LIB_ERROR_INVALID_PARAMETER;
+
+  memcpy (ah->keyId, key_id, sizeof (ah->keyId));
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-ah_get_key_id (hicn_type_t type, hicn_protocol_t *h, uint8_t **key_id,
+ah_get_key_id (const hicn_packet_buffer_t *pkbuf, size_t pos, uint8_t **key_id,
 	       uint8_t *key_id_size)
 {
-  *key_id = h->ah.keyId;
-  *key_id_size = sizeof (h->ah.keyId);
+  _ah_header_t *ah = pkbuf_get_ah (pkbuf);
+
+  *key_id = ah->keyId;
+  *key_id_size = sizeof (ah->keyId);
   return HICN_LIB_ERROR_NONE;
 }
 
-DECLARE_HICN_OPS (ah);
+DECLARE_HICN_OPS (ah, AH_HDRLEN);
 
 /*
  * fd.io coding-style-patch-verification: ON