ip: reassembly - add a way to disable for forus

[vpp.git] / src / vnet / ip / ip4_input.h

diff --git a/src/vnet/ip/ip4_input.h b/src/vnet/ip/ip4_input.h
index 889b423..57aef0b 100644 (file)
--- a/src/vnet/ip/ip4_input.h
+++ b/src/vnet/ip/ip4_input.h
@@ -42,17 +42,16 @@
 
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
-
-extern char *ip4_error_strings[];
+#include <vppinfra/vector/ip_csum.h>
 
 typedef enum
 {
   IP4_INPUT_NEXT_DROP,
   IP4_INPUT_NEXT_PUNT,
+  IP4_INPUT_NEXT_OPTIONS,
   IP4_INPUT_NEXT_LOOKUP,
   IP4_INPUT_NEXT_LOOKUP_MULTICAST,
   IP4_INPUT_NEXT_ICMP_ERROR,
-  IP4_INPUT_NEXT_REASSEMBLY,
   IP4_INPUT_N_NEXT,
 } ip4_input_next_t;
 
@@ -64,15 +63,16 @@ check_ver_opt_csum (ip4_header_t * ip, u8 * error, int verify_checksum)
       if ((ip->ip_version_and_header_length & 0xf) != 5)
        {
          *error = IP4_ERROR_OPTIONS;
-         if (verify_checksum && ip_csum (ip, ip4_header_bytes (ip)) != 0)
+         if (verify_checksum &&
+             clib_ip_csum ((u8 *) ip, ip4_header_bytes (ip)) != 0)
            *error = IP4_ERROR_BAD_CHECKSUM;
        }
       else
        *error = IP4_ERROR_VERSION;
     }
-  else
-    if (PREDICT_FALSE (verify_checksum &&
-                      ip_csum (ip, sizeof (ip4_header_t)) != 0))
+  else if (PREDICT_FALSE (verify_checksum &&
+                         clib_ip_csum ((u8 *) ip, sizeof (ip4_header_t)) !=
+                           0))
     *error = IP4_ERROR_BAD_CHECKSUM;
 }
 
@@ -153,7 +153,7 @@ ip4_input_check_x4 (vlib_main_t * vm,
        }
       else
        next[0] = error0 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p[0]->error = error_node->errors[error0];
     }
   if (PREDICT_FALSE (error1 != IP4_ERROR_NONE))
@@ -167,7 +167,7 @@ ip4_input_check_x4 (vlib_main_t * vm,
        }
       else
        next[1] = error1 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p[1]->error = error_node->errors[error1];
     }
   if (PREDICT_FALSE (error2 != IP4_ERROR_NONE))
@@ -181,7 +181,7 @@ ip4_input_check_x4 (vlib_main_t * vm,
        }
       else
        next[2] = error2 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p[2]->error = error_node->errors[error2];
     }
   if (PREDICT_FALSE (error3 != IP4_ERROR_NONE))
@@ -195,7 +195,7 @@ ip4_input_check_x4 (vlib_main_t * vm,
        }
       else
        next[3] = error3 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p[3]->error = error_node->errors[error3];
     }
 }
@@ -256,7 +256,7 @@ ip4_input_check_x2 (vlib_main_t * vm,
        }
       else
        *next0 = error0 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p0->error = error_node->errors[error0];
     }
   if (PREDICT_FALSE (error1 != IP4_ERROR_NONE))
@@ -270,10 +270,9 @@ ip4_input_check_x2 (vlib_main_t * vm,
        }
       else
        *next1 = error1 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p1->error = error_node->errors[error1];
     }
-
 }
 
 always_inline void
@@ -290,10 +289,8 @@ ip4_input_check_x1 (vlib_main_t * vm,
 
   check_ver_opt_csum (ip0, &error0, verify_checksum);
 
-  /* Punt packets with options or wrong version. */
-  if (PREDICT_FALSE (ip0->ip_version_and_header_length != 0x45))
-    error0 = (ip0->ip_version_and_header_length & 0xf) != 5 ?
-      IP4_ERROR_OPTIONS : IP4_ERROR_VERSION;
+  if (PREDICT_FALSE (ip0->ttl < 1))
+    error0 = IP4_ERROR_TIME_EXPIRED;
 
   /* Drop fragmentation offset 1 packets. */
   error0 = ip4_get_fragment_offset (ip0) == 1 ?
@@ -322,10 +319,9 @@ ip4_input_check_x1 (vlib_main_t * vm,
        }
       else
        *next0 = error0 != IP4_ERROR_OPTIONS ?
-         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+         IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_OPTIONS;
       p0->error = error_node->errors[error0];
     }
-
 }
 
 /*