3 files changed, 62 insertions, 24 deletions

diff --git a/hicn-plugin/src/faces/face_node.c b/hicn-plugin/src/faces/face_node.c
index fd8649e6b..48d97ad51 100644
--- a/hicn-plugin/src/faces/face_node.c
+++ b/hicn-plugin/src/faces/face_node.c
@@ -16,6 +16,7 @@
 #include <vnet/adj/adj.h>
 
 #include "face.h"
+#include "inlines.h"
 #include "face_node.h"
 #include "../strategy_dpo_manager.h"
 #include "face.h"
@@ -558,7 +559,6 @@ hicn_face_rewrite_interest (vlib_main_t * vm, vlib_buffer_t * b0,
   /*   return; */
 
   hicn_header_t *hicn = vlib_buffer_get_current (b0);
-  size_t l3_header_size = sizeof(ip6_header_t);
 
   //hicn_face_ip_t *ip_face = (hicn_face_ip_t *) face->data;
 
@@ -568,24 +568,10 @@ hicn_face_rewrite_interest (vlib_main_t * vm, vlib_buffer_t * b0,
   int ret = hicn_ops_vft[type.l1]->rewrite_interest (type, &hicn->protocol,
                                                      &face->nat_addr, &temp_addr);
 
-  if (ip46_address_is_ip4(&face->nat_addr)) {
-    b0->flags |= VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
-    l3_header_size = sizeof(ip4_header_t);
-  }
-
-  if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED) {
-    b0->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
-
-    /* Make sure l3_hdr_offset and l4_hdr_offset are set */
-    if (!(b0->flags & VNET_BUFFER_F_L3_HDR_OFFSET_VALID)) {
-      b0->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
-      vnet_buffer (b0)->l3_hdr_offset = b0->current_data;
-    }
-    if (!(b0->flags & VNET_BUFFER_F_L4_HDR_OFFSET_VALID)) {
-      b0->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID;
-      vnet_buffer (b0)->l4_hdr_offset = vnet_buffer (b0)->l3_hdr_offset + l3_header_size;
+  if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED)
+    {
+      ensure_offload_flags(b0, ip46_address_is_ip4(&face->nat_addr));
     }
-  }
 
   ASSERT(face->flags & HICN_FACE_FLAGS_FACE);
 
diff --git a/hicn-plugin/src/faces/iface_node.c b/hicn-plugin/src/faces/iface_node.c
index 433cf0b02..a4fd1885c 100644
--- a/hicn-plugin/src/faces/iface_node.c
+++ b/hicn-plugin/src/faces/iface_node.c
@@ -14,6 +14,7 @@
  */
 
 #include "face.h"
+#include "inlines.h"
 #include "../strategy_dpo_manager.h"
 #include "../hicn.h"
 #include "../infra.h"
@@ -554,9 +555,13 @@ hicn_rewrite_iface_data4 (vlib_main_t * vm, vlib_buffer_t * b0,
   ip46_address_t temp_addr;
   ip46_address_reset (&temp_addr);
   hicn_type_t type = hicn_get_buffer (b0)->type;
-  hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol,
-				       &(iface->nat_addr), &(temp_addr),
-				       iface->pl_id);
+  int ret = hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol,
+				                 &(iface->nat_addr), &(temp_addr),
+				                 iface->pl_id);
+  if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED)
+    {
+      ensure_offload_flags(b0, 1 /* is_v4 */);
+    }
 }
 
 static inline void
@@ -583,9 +588,14 @@ hicn_rewrite_iface_data6 (vlib_main_t * vm, vlib_buffer_t * b0,
   ip46_address_t temp_addr;
   ip46_address_reset (&temp_addr);
   hicn_type_t type = hicn_get_buffer (b0)->type;
-  hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol,
-				       &(iface->nat_addr), &(temp_addr),
-				       iface->pl_id);
+  int ret = hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol,
+				                 &(iface->nat_addr), &(temp_addr),
+				                 iface->pl_id);
+
+  if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED)
+    {
+      ensure_offload_flags(b0, 0 /* is_v4 */);
+    }
 }
 
 #define iface_output_x1(ipv)                                            \
diff --git a/hicn-plugin/src/faces/inlines.h b/hicn-plugin/src/faces/inlines.h
new file mode 100644
index 000000000..bfe56c8e6
--- /dev/null
+++ b/hicn-plugin/src/faces/inlines.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020 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:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __HICN_FACE_INLINES_H__
+#define __HICN_FACE_INLINES_H__
+
+#include <vlib/buffer.h>
+
+always_inline void
+ensure_offload_flags (vlib_buffer_t * b, int is_v4)
+{
+  b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
+  b->flags |= is_v4 * VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
+  size_t l3_header_size = is_v4 * sizeof(ip4_header_t) + (!is_v4) * sizeof(ip6_header_t);
+
+  /* Make sure l3_hdr_offset and l4_hdr_offset are set */
+  if (!(b->flags & VNET_BUFFER_F_L3_HDR_OFFSET_VALID))
+    {
+      b->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
+      vnet_buffer(b)->l3_hdr_offset = b->current_data;
+    }
+  if (!(b->flags & VNET_BUFFER_F_L4_HDR_OFFSET_VALID))
+    {
+      b->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID;
+      vnet_buffer(b)->l4_hdr_offset =
+          vnet_buffer(b)->l3_hdr_offset + l3_header_size;
+    }
+}
+
+#endif /* __HICN_FACE_INLINES_H__ */
\ No newline at end of file