ipsec: remove dependency on DPDK > 0

ipsec code is not depenent on dpdk anymore.

Change-Id: Iff3f960ca0f0435f66bcb575998d2fcea3377701
Signed-off-by: Damjan Marion <[email protected]>

diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 67280df..aac7d89 100644 (file)
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -37,12 +37,9 @@
 #include <vnet/classify/policer_classify.h>
 #include <vnet/classify/flow_classify.h>
 #include <vnet/mpls/mpls.h>
-#if DPDK > 0
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/ikev2.h>
-#else
 #include <inttypes.h>
-#endif
 #include <vnet/map/map.h>
 #include <vnet/cop/cop.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
@@ -248,7 +245,6 @@ unformat_ip6_address (unformat_input_t * input, va_list * args)
 uword
 unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
 {
-#if DPDK > 0
   u32 *r = va_arg (*args, u32 *);
 
   if (0);
@@ -258,15 +254,11 @@ unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
     else
     return 0;
   return 1;
-#else
-  return 0;
-#endif
 }
 
 uword
 unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
 {
-#if DPDK > 0
   u32 *r = va_arg (*args, u32 *);
 
   if (0);
@@ -276,15 +268,11 @@ unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
     else
     return 0;
   return 1;
-#else
-  return 0;
-#endif
 }
 
 u8 *
 format_ipsec_crypto_alg (u8 * s, va_list * args)
 {
-#if DPDK > 0
   u32 i = va_arg (*args, u32);
   u8 *t = 0;
 
@@ -297,15 +285,11 @@ format_ipsec_crypto_alg (u8 * s, va_list * args)
       return format (s, "unknown");
     }
   return format (s, "%s", t);
-#else
-  return format (s, "Unimplemented");
-#endif
 }
 
 uword
 unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
 {
-#if DPDK > 0
   u32 *r = va_arg (*args, u32 *);
 
   if (0);
@@ -315,15 +299,11 @@ unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
     else
     return 0;
   return 1;
-#else
-  return 0;
-#endif
 }
 
 u8 *
 format_ipsec_integ_alg (u8 * s, va_list * args)
 {
-#if DPDK > 0
   u32 i = va_arg (*args, u32);
   u8 *t = 0;
 
@@ -336,15 +316,11 @@ format_ipsec_integ_alg (u8 * s, va_list * args)
       return format (s, "unknown");
     }
   return format (s, "%s", t);
-#else
-  return format (s, "Unsupported");
-#endif
 }
 
 uword
 unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
 {
-#if DPDK > 0
   u32 *r = va_arg (*args, u32 *);
 
   if (0);
@@ -354,15 +330,11 @@ unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
     else
     return 0;
   return 1;
-#else
-  return 0;
-#endif
 }
 
 uword
 unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
 {
-#if DPDK > 0
   u32 *r = va_arg (*args, u32 *);
 
   if (0);
@@ -372,9 +344,6 @@ unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
     else
     return 0;
   return 1;
-#else
-  return 0;
-#endif
 }
 
 uword
@@ -11405,7 +11374,6 @@ api_ip_dump (vat_main_t * vam)
 static int
 api_ipsec_spd_add_del (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ipsec_spd_add_del_t *mp;
   f64 timeout;
@@ -11439,16 +11407,11 @@ api_ipsec_spd_add_del (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ipsec_interface_add_del_spd (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ipsec_interface_add_del_spd_t *mp;
   f64 timeout;
@@ -11497,16 +11460,11 @@ api_ipsec_interface_add_del_spd (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ipsec_spd_add_del_entry (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ipsec_spd_add_del_entry_t *mp;
   f64 timeout;
@@ -11660,16 +11618,11 @@ api_ipsec_spd_add_del_entry (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ipsec_sad_add_del_entry (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ipsec_sad_add_del_entry_t *mp;
   f64 timeout;
@@ -11797,16 +11750,11 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ipsec_sa_set_key (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ipsec_sa_set_key_t *mp;
   f64 timeout;
@@ -11849,16 +11797,11 @@ api_ipsec_sa_set_key (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ikev2_profile_add_del (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ikev2_profile_add_del_t *mp;
   f64 timeout;
@@ -11902,16 +11845,11 @@ api_ikev2_profile_add_del (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ikev2_profile_set_auth (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ikev2_profile_set_auth_t *mp;
   f64 timeout;
@@ -11978,16 +11916,11 @@ api_ikev2_profile_set_auth (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ikev2_profile_set_id (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ikev2_profile_set_id_t *mp;
   f64 timeout;
@@ -12063,16 +11996,11 @@ api_ikev2_profile_set_id (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ikev2_profile_set_ts (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ikev2_profile_set_ts_t *mp;
   f64 timeout;
@@ -12139,16 +12067,11 @@ api_ikev2_profile_set_ts (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 static int
 api_ikev2_set_local_key (vat_main_t * vam)
 {
-#if DPDK > 0
   unformat_input_t *i = vam->input;
   vl_api_ikev2_set_local_key_t *mp;
   f64 timeout;
@@ -12186,10 +12109,6 @@ api_ikev2_set_local_key (vat_main_t * vam)
   W;
   /* NOTREACHED */
   return 0;
-#else
-  clib_warning ("unsupported (no dpdk)");
-  return -99;
-#endif
 }
 
 /*