u32 *sas_in = NULL;
vec_add1 (sas_in, a->remote_sa_id);
- rv |= ipsec_tun_protect_update (sw_if_index, a->local_sa_id, sas_in);
+ rv |= ipsec_tun_protect_update (sw_if_index, NULL, a->local_sa_id, sas_in);
}
static int
}
if (~0 != sw_if_index)
- ipsec_tun_protect_del (sw_if_index);
+ ipsec_tun_protect_del (sw_if_index, NULL);
ipsec_sa_unlock_id (a->remote_sa_id);
ipsec_sa_unlock_id (a->local_sa_id);
/**
* Notification that an adjacency has been created
*/
-typedef u8 * (*adj_delegate_adj_created_t)(adj_index_t ai);
+typedef void (*adj_delegate_adj_created_t)(adj_index_t ai);
/**
* An ADJ delegate virtual function table
fib_protocol_t proto;
ip_adjacency_t *adj;
-
- for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+ FOR_EACH_FIB_IP_PROTOCOL(proto)
{
if (sw_if_index >= vec_len(adj_gleans[proto]) ||
ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
return (NULL);
}
- for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+ FOR_EACH_FIB_IP_PROTOCOL(proto)
{
if (sw_if_index >= vec_len(adj_gleans[proto]) ||
ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
return 0;
}
+bool
+ip_address_is_zero (const ip_address_t * ip)
+{
+ switch (ip_addr_version (ip))
+ {
+ case AF_IP4:
+ return (ip_addr_v4 (ip).as_u32 == 0);
+ case AF_IP6:
+ return (ip_addr_v6 (ip).as_u64[0] == 0 &&
+ ip_addr_v6 (ip).as_u64[1] == 0);
+ break;
+ }
+ return false;
+}
+
int
ip_address_cmp (const ip_address_t * ip1, const ip_address_t * ip2)
{
ip_addr_version (dst) = version;
}
-void
-ip_address_to_46 (const ip_address_t * addr,
- ip46_address_t * a, fib_protocol_t * proto)
+fib_protocol_t
+ip_address_to_46 (const ip_address_t * addr, ip46_address_t * a)
{
- *proto = (AF_IP4 == ip_addr_version (addr) ?
- FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
- switch (*proto)
+ fib_protocol_t proto;
+
+ proto = (AF_IP4 == ip_addr_version (addr) ?
+ FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
+ switch (proto)
{
case FIB_PROTOCOL_IP4:
ip46_address_set_ip4 (a, &addr->ip.v4);
ASSERT (0);
break;
}
+
+ return (proto);
+}
+
+void
+ip_address_from_46 (const ip46_address_t * nh,
+ fib_protocol_t fproto, ip_address_t * ip)
+{
+ switch (fproto)
+ {
+ case FIB_PROTOCOL_IP4:
+ clib_memset (ip, 0, sizeof (*ip));
+ ip_address_set (ip, &nh->ip4, AF_IP4);
+ break;
+ case FIB_PROTOCOL_IP6:
+ ip_address_set (ip, &nh->ip6, AF_IP6);
+ break;
+ default:
+ ASSERT (0);
+ break;
+ }
}
static void
} __clib_packed ip_address_t;
/* *INDENT-ON* */
+#define IP_ADDRESS_V4_ALL_0S {.ip.v4.as_u32 = 0, .version = AF_IP4}
+#define IP_ADDRESS_V6_ALL_0S {.ip.v4.as_u32 = 0, .version = AF_IP6}
+
#define ip_addr_addr(_a) (_a)->ip
#define ip_addr_v4(_a) (_a)->ip.v4
#define ip_addr_v6(_a) (_a)->ip.v6
#define ip_addr_version(_a) (_a)->version
+extern bool ip_address_is_zero (const ip_address_t * ip);
extern int ip_address_cmp (const ip_address_t * ip1,
const ip_address_t * ip2);
extern void ip_address_copy (ip_address_t * dst, const ip_address_t * src);
extern u16 ip_version_to_size (u8 ver);
extern u8 *format_ip_address (u8 * s, va_list * args);
extern uword unformat_ip_address (unformat_input_t * input, va_list * args);
-extern void ip_address_to_46 (const ip_address_t * addr,
- ip46_address_t * a, fib_protocol_t * proto);
+extern fib_protocol_t ip_address_to_46 (const ip_address_t * addr,
+ ip46_address_t * a);
+extern void ip_address_from_46 (const ip46_address_t * a,
+ fib_protocol_t fproto, ip_address_t * addr);
/* *INDENT-OFF* */
typedef struct ip_prefix
return (ip_address_union_decode (&in->un, in->af, out));
}
+void
+ip_address_decode2 (const vl_api_address_t * in, ip_address_t * out)
+{
+ switch (clib_net_to_host_u32 (in->af))
+ {
+ case ADDRESS_IP4:
+ clib_memset (out, 0, sizeof (*out));
+ clib_memcpy (&ip_addr_v4 (out), &in->un.ip4, sizeof (ip_addr_v4 (out)));
+ out->version = AF_IP4;
+ break;
+ case ADDRESS_IP6:
+ clib_memcpy (&ip_addr_v6 (out), &in->un.ip6, sizeof (ip_addr_v6 (out)));
+ out->version = AF_IP6;
+ break;
+ default:
+ ASSERT (!"Unknown address family in API address type");
+ break;
+ }
+}
+
static void
ip_address_union_encode (const ip46_address_t * in,
vl_api_address_family_t af,
ip_address_union_encode (in, out->af, &out->un);
}
+void
+ip_address_encode2 (const ip_address_t * in, vl_api_address_t * out)
+{
+ switch (in->version)
+ {
+ case AF_IP4:
+ out->af = clib_net_to_host_u32 (ADDRESS_IP4);
+ ip4_address_encode (&in->ip.v4, out->un.ip4);
+ break;
+ case AF_IP6:
+ out->af = clib_net_to_host_u32 (ADDRESS_IP6);
+ ip6_address_encode (&in->ip.v6, out->un.ip6);
+ break;
+ }
+}
+
void
ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out)
{
/**
* Decode/Encode for struct/union types
*/
-extern ip46_type_t ip_address_decode (const struct _vl_api_address *in,
+extern ip46_type_t ip_address_decode (const vl_api_address_t * in,
ip46_address_t * out);
extern void ip_address_encode (const ip46_address_t * in,
- ip46_type_t type, struct _vl_api_address *out);
+ ip46_type_t type, vl_api_address_t * out);
+extern void ip_address_decode2 (const vl_api_address_t * in,
+ ip_address_t * out);
+extern void ip_address_encode2 (const ip_address_t * in,
+ vl_api_address_t * out);
extern void ip6_address_encode (const ip6_address_t * in,
vl_api_ip6_address_t out);
extern void ip6_address_decode (const vl_api_ip6_address_t in,
extern void ip4_address_decode (const vl_api_ip4_address_t in,
ip4_address_t * out);
-extern void ip_prefix_decode (const struct _vl_api_prefix *in,
- fib_prefix_t * out);
-extern void ip_prefix_encode (const fib_prefix_t * in,
- struct _vl_api_prefix *out);
+extern void ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out);
+extern void ip_prefix_encode (const fib_prefix_t * in, vl_api_prefix_t * out);
-extern void ip_mprefix_decode (const struct _vl_api_mprefix *in,
+extern void ip_mprefix_decode (const vl_api_mprefix_t * in,
mfib_prefix_t * out);
extern void ip_mprefix_encode (const mfib_prefix_t * in,
- struct _vl_api_mprefix *out);
+ vl_api_mprefix_t * out);
#endif
#include <vnet/crypto/crypto.h>
#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ipsec_tun.h>
#include <vnet/ipsec/esp.h>
#define foreach_esp_encrypt_next \
if (is_tun)
{
/* we are on a ipsec tunnel's feature arc */
- u32 next0;
+ u32 next0 = 0;
config_index = b[0]->current_config_index;
- sa_index0 = *(u32 *) vnet_feature_next_with_data (&next0, b[0],
- sizeof
- (sa_index0));
- vnet_buffer (b[0])->ipsec.sad_index = sa_index0;
+ vnet_feature_next (&next0, b[0]);
next[0] = next0;
+ vnet_buffer (b[0])->ipsec.sad_index =
+ sa_index0 = ipsec_tun_protect_get_sa_out
+ (vnet_buffer (b[0])->ip.adj_index[VLIB_TX]);
}
else
sa_index0 = vnet_buffer (b[0])->ipsec.sad_index;
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param sw_id_index - Tunnel interface to protect
+ @param nh - The peer/next-hop on the tunnel to which the traffic
+ should be protected. For a P2P interface set this to the
+ all 0s address.
@param sa_in - The ID [set] of inbound SAs
@param sa_out - The ID of outbound SA
*/
typedef ipsec_tunnel_protect
{
vl_api_interface_index_t sw_if_index;
+ vl_api_address_t nh;
u32 sa_out;
u8 n_sa_in;
u32 sa_in[n_sa_in];
u32 context;
vl_api_interface_index_t sw_if_index;
+ vl_api_address_t nh;
};
/**
vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
vl_api_ipsec_tunnel_protect_update_reply_t *rmp;
u32 sw_if_index, ii, *sa_ins = NULL;
+ ip_address_t nh;
int rv;
sw_if_index = ntohl (mp->tunnel.sw_if_index);
for (ii = 0; ii < mp->tunnel.n_sa_in; ii++)
vec_add1 (sa_ins, ntohl (mp->tunnel.sa_in[ii]));
- rv = ipsec_tun_protect_update (sw_if_index,
+ ip_address_decode2 (&mp->tunnel.nh, &nh);
+
+ rv = ipsec_tun_protect_update (sw_if_index, &nh,
ntohl (mp->tunnel.sa_out), sa_ins);
#else
rv = VNET_API_ERROR_UNIMPLEMENTED;
{
vlib_main_t *vm __attribute__ ((unused)) = vlib_get_main ();
vl_api_ipsec_tunnel_protect_del_reply_t *rmp;
- int rv;
+ ip_address_t nh;
u32 sw_if_index;
+ int rv;
sw_if_index = ntohl (mp->sw_if_index);
VALIDATE_SW_IF_INDEX (mp);
#if WITH_LIBSSL > 0
- rv = ipsec_tun_protect_del (sw_if_index);
+ ip_address_decode2 (&mp->nh, &nh);
+ rv = ipsec_tun_protect_del (sw_if_index, &nh);
#else
rv = VNET_API_ERROR_UNIMPLEMENTED;
#endif
itp = ipsec_tun_protect_get (itpi);
-
mp = vl_msg_api_alloc (sizeof (*mp) + (sizeof (u32) * itp->itp_n_sa_in));
clib_memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_IPSEC_TUNNEL_PROTECT_DETAILS);
mp->context = ctx->context;
mp->tun.sw_if_index = htonl (itp->itp_sw_if_index);
+ ip_address_encode2 (itp->itp_key, &mp->tun.nh);
mp->tun.sa_out = htonl (itp->itp_out_sa);
mp->tun.n_sa_in = itp->itp_n_sa_in;
}
else
{
- index_t itpi;
-
- itpi = ipsec_tun_protect_find (sw_if_index);
-
- if (INDEX_INVALID != itpi)
- send_ipsec_tunnel_protect_details (itpi, &ctx);
+ ipsec_tun_protect_walk_itf (sw_if_index,
+ send_ipsec_tunnel_protect_details, &ctx);
}
#else
clib_warning ("unimplemented");
if (rv)
goto done;
- rv = ipsec_tun_protect_update_one (sw_if_index,
+ rv = ipsec_tun_protect_update_one (sw_if_index, NULL,
ipsec_tun_mk_output_sa_id
(sw_if_index),
ipsec_tun_mk_input_sa_id
if (NULL != t)
{
- rv = ipsec_tun_protect_del (t->sw_if_index);
+ rv = ipsec_tun_protect_del (t->sw_if_index, NULL);
ipip_del_tunnel (t->sw_if_index);
}
else
VALIDATE_SW_IF_INDEX(mp);
if (mp->is_outbound)
- rv = ipsec_tun_protect_update_out (ntohl (mp->sw_if_index),
+ rv = ipsec_tun_protect_update_out (ntohl (mp->sw_if_index), NULL,
ntohl (mp->sa_id));
else
- rv = ipsec_tun_protect_update_in (ntohl (mp->sw_if_index),
+ rv = ipsec_tun_protect_update_in (ntohl (mp->sw_if_index), NULL,
ntohl (mp->sa_id));
#else
static walk_rc_t
ipsec_tun_protect_show_one (index_t itpi, void *ctx)
{
- vlib_cli_output (ctx, "%U", format_ipsec_tun_protect, itpi);
+ vlib_cli_output (ctx, "%U", format_ipsec_tun_protect_index, itpi);
return (WALK_CONTINUE);
}
unformat_input_t _line_input, *line_input = &_line_input;
ip46_address_t local_ip = ip46_address_initializer;
ip46_address_t remote_ip = ip46_address_initializer;
+ ip_address_t nh = IP_ADDRESS_V4_ALL_0S;
ipsec_crypto_alg_t crypto_alg;
ipsec_integ_alg_t integ_alg;
ipsec_sa_flags_t flags;
;
else if (unformat (line_input, "del"))
is_add = 0;
+ else if (unformat (line_input, "nh &U", unformat_ip_address, &nh))
+ ;
else
{
error = clib_error_return (0, "unknown input `%U'",
clib_host_to_net_u32 (salt), &remote_ip,
&local_ip, NULL);
rv |=
- ipsec_tun_protect_update_one (sw_if_index,
+ ipsec_tun_protect_update_one (sw_if_index, &nh,
ipsec_tun_mk_local_sa_id (sw_if_index),
ipsec_tun_mk_remote_sa_id
(sw_if_index));
{
unformat_input_t _line_input, *line_input = &_line_input;
u32 sw_if_index, is_del, sa_in, sa_out, *sa_ins = NULL;
+ ip_address_t peer = { };
vnet_main_t *vnm;
is_del = 0;
else if (unformat (line_input, "%U",
unformat_vnet_sw_interface, vnm, &sw_if_index))
;
+ else if (unformat (line_input, "%U", unformat_ip_address, &peer))
+ ;
else
return (clib_error_return (0, "unknown input '%U'",
format_unformat_error, line_input));
}
if (!is_del)
- ipsec_tun_protect_update (sw_if_index, sa_out, sa_ins);
+ ipsec_tun_protect_update (sw_if_index, &peer, sa_out, sa_ins);
unformat_free (line_input);
return NULL;
}
u8 *
-format_ipsec_tun_protect (u8 * s, va_list * args)
+format_ipsec_tun_protect_index (u8 * s, va_list * args)
{
- u32 itpi = va_arg (*args, u32);
+ u32 itpi = va_arg (*args, index_t);
ipsec_tun_protect_t *itp;
- u32 sai;
- if (pool_is_free_index (ipsec_protect_pool, itpi))
- {
- s = format (s, "No such tunnel index: %d", itpi);
- goto done;
- }
+ if (pool_is_free_index (ipsec_tun_protect_pool, itpi))
+ return (format (s, "No such tunnel index: %d", itpi));
+
+ itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi);
+
+ return (format (s, "%U", format_ipsec_tun_protect, itp));
+}
- itp = pool_elt_at_index (ipsec_protect_pool, itpi);
+
+u8 *
+format_ipsec_tun_protect (u8 * s, va_list * args)
+{
+ ipsec_tun_protect_t *itp = va_arg (*args, ipsec_tun_protect_t *);
+ u32 sai;
s = format (s, "%U", format_vnet_sw_if_index_name,
vnet_get_main (), itp->itp_sw_if_index);
+ if (!ip_address_is_zero (itp->itp_key))
+ s = format (s, ": %U", format_ip_address, itp->itp_key);
s = format (s, "\n output-sa:");
- s =
- format (s, "\n %U", format_ipsec_sa, itp->itp_out_sa,
- IPSEC_FORMAT_BRIEF);
+ s = format (s, "\n %U", format_ipsec_sa, itp->itp_out_sa,
+ IPSEC_FORMAT_BRIEF);
s = format (s, "\n input-sa:");
/* *INDENT-OFF* */
}));
/* *INDENT-ON* */
-done:
return (s);
}
#include <vnet/ipsec/ipsec_tun.h>
#include <vnet/ipsec/esp.h>
#include <vnet/udp/udp.h>
+#include <vnet/adj/adj_delegate.h>
+#include <vnet/teib/teib.h>
+
+/**
+ * The logger
+ */
+vlib_log_class_t ipsec_tun_protect_logger;
/**
* Pool of tunnel protection objects
*/
-ipsec_tun_protect_t *ipsec_protect_pool;
+ipsec_tun_protect_t *ipsec_tun_protect_pool;
+
+/**
+ * Adj delegate registered type
+ */
+static adj_delegate_type_t ipsec_tun_adj_delegate_type;
+
+/**
+ * Adj index to TX SA mapping
+ */
+index_t *ipsec_tun_protect_sa_by_adj_index;
+
+const ip_address_t IP_ADDR_ALL_0 = IP_ADDRESS_V4_ALL_0S;
/**
- * DB of protected tunnels
+ * The DB of all added per-nh tunnel protectiond
*/
-typedef struct ipsec_protect_db_t_
+typedef struct ipsec_tun_protect_itf_db_t_
+{
+ /** A hash table key'd on IP (4 or 6) address */
+ uword *id_hash;
+ /** If the interface is P2P then there is only one protect
+ * object associated with the auto-adj for each NH proto */
+ index_t id_itp;
+} ipsec_tun_protect_itf_db_t;
+
+typedef struct ipsec_tun_protect_db_t_
{
- u32 *tunnels;
- u32 count;
-} ipsec_protect_db_t;
+ /** Per-interface vector */
+ ipsec_tun_protect_itf_db_t *id_itf;
+} ipsec_tun_protect_db_t;
+
+static ipsec_tun_protect_db_t itp_db;
+
+const static ipsec_tun_protect_itf_db_t IPSEC_TUN_PROTECT_DEFAULT_DB_ENTRY = {
+ .id_itp = INDEX_INVALID,
+};
+
+#define ITP_DBG(_itp, _fmt, _args...) \
+{ \
+ vlib_log_debug(ipsec_tun_protect_logger, \
+ "[%U]: " _fmt, \
+ format_ipsec_tun_protect, \
+ _itp, ##_args); \
+}
-static ipsec_protect_db_t ipsec_protect_db;
+#define ITP_DBG2(_fmt, _args...) \
+{ \
+ vlib_log_debug(ipsec_tun_protect_logger, \
+ _fmt, ##_args); \
+}
static void
-ipsec_tun_protect_feature_set (ipsec_tun_protect_t * itp, u8 enable)
+ipsec_tun_protect_add_adj (adj_index_t ai, index_t sai)
{
- u32 sai;
+ vec_validate_init_empty (ipsec_tun_protect_sa_by_adj_index, ai,
+ INDEX_INVALID);
+
+ ipsec_tun_protect_sa_by_adj_index[ai] = sai;
+}
+
+static inline const ipsec_tun_protect_t *
+ipsec_tun_protect_from_const_base (const adj_delegate_t * ad)
+{
+ if (ad == NULL)
+ return (NULL);
+ return (pool_elt_at_index (ipsec_tun_protect_pool, ad->ad_index));
+}
- sai = itp->itp_out_sa;
+static void
+ipsec_tun_protect_feature_set (ipsec_tun_protect_t * itp, u8 enable)
+{
+ ITP_DBG2 ("%s on %U", (enable ? "enable" : "disable"),
+ format_vnet_sw_if_index_name, vnet_get_main (),
+ itp->itp_sw_if_index);
if (itp->itp_flags & IPSEC_PROTECT_L2)
{
(ip46_address_is_ip4 (&itp->itp_tun.src) ?
"esp4-encrypt-tun" :
"esp6-encrypt-tun"),
- itp->itp_sw_if_index, enable,
- &sai, sizeof (sai));
+ itp->itp_sw_if_index, enable, NULL, 0);
}
else
{
+ u32 fi4, fi6, sai;
ipsec_main_t *im;
ipsec_sa_t *sa;
- u32 fi4, fi6;
im = &ipsec_main;
+ sai = itp->itp_out_sa;
sa = ipsec_sa_get (sai);
if (sa->crypto_alg == IPSEC_CRYPTO_ALG_NONE &&
vnet_feature_enable_disable_with_index
(vnet_get_feature_arc_index ("ip4-output"),
- fi4, itp->itp_sw_if_index, enable, &sai, sizeof (sai));
+ fi4, itp->itp_sw_if_index, enable, NULL, 0);
vnet_feature_enable_disable_with_index
(vnet_get_feature_arc_index ("ip6-output"),
- fi6, itp->itp_sw_if_index, enable, &sai, sizeof (sai));
+ fi6, itp->itp_sw_if_index, enable, NULL, 0);
+ }
+}
+
+static index_t
+ipsec_tun_protect_find (u32 sw_if_index, const ip_address_t * nh)
+{
+ ipsec_tun_protect_itf_db_t *idi;
+ uword *p;
+
+ if (vec_len (itp_db.id_itf) <= sw_if_index)
+ return INDEX_INVALID;
+
+ if (vnet_sw_interface_is_p2p (vnet_get_main (), sw_if_index))
+ return (itp_db.id_itf[sw_if_index].id_itp);
+
+ idi = &itp_db.id_itf[sw_if_index];
+ p = hash_get_mem (idi->id_hash, nh);
+
+ if (NULL == p)
+ {
+ return INDEX_INVALID;
}
+ return (p[0]);
}
static void
-ipsec_tun_protect_db_add (ipsec_main_t * im, const ipsec_tun_protect_t * itp)
+ipsec_tun_protect_rx_db_add (ipsec_main_t * im,
+ const ipsec_tun_protect_t * itp)
{
const ipsec_sa_t *sa;
u32 sai;
+ if (ip46_address_is_zero (&itp->itp_crypto.dst))
+ return;
+
/* *INDENT-OFF* */
FOR_EACH_IPSEC_PROTECT_INPUT_SAI(itp, sai,
({
sa = ipsec_sa_get (sai);
ipsec_tun_lkup_result_t res = {
- .tun_index = itp - ipsec_protect_pool,
+ .tun_index = itp - ipsec_tun_protect_pool,
.sa_index = sai,
};
};
hash_set (im->tun4_protect_by_key, key.as_u64, res.as_u64);
if (1 == hash_elts(im->tun4_protect_by_key))
- udp_register_dst_port (vlib_get_main(),
- UDP_DST_PORT_ipsec,
- ipsec4_tun_input_node.index, 1);
+ {
+ udp_register_dst_port (vlib_get_main(),
+ UDP_DST_PORT_ipsec,
+ ipsec4_tun_input_node.index, 1);
+ ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
+ ipsec4_tun_input_node.index);
+ }
}
else
{
.spi = clib_host_to_net_u32 (sa->spi),
};
hash_set_mem_alloc (&im->tun6_protect_by_key, &key, res.as_u64);
+
+ if (1 == hash_elts (im->tun6_protect_by_key))
+ ip6_register_protocol (IP_PROTOCOL_IPSEC_ESP,
+ ipsec6_tun_input_node.index);
}
}))
/* *INDENT-ON* */
}
+static adj_walk_rc_t
+ipsec_tun_protect_adj_add (adj_index_t ai, void *arg)
+{
+ ipsec_tun_protect_t *itp = arg;
+ adj_delegate_add (adj_get (ai), ipsec_tun_adj_delegate_type,
+ itp - ipsec_tun_protect_pool);
+ ipsec_tun_protect_add_adj (ai, itp->itp_out_sa);
+
+ return (ADJ_WALK_RC_CONTINUE);
+}
+
static void
-ipsec_tun_protect_db_remove (ipsec_main_t * im,
- const ipsec_tun_protect_t * itp)
+ipsec_tun_protect_tx_db_add (ipsec_tun_protect_t * itp)
+{
+ /*
+ * add the delegate to the adj
+ */
+ ipsec_tun_protect_itf_db_t *idi;
+ fib_protocol_t nh_proto;
+ ip46_address_t nh;
+
+ vec_validate_init_empty (itp_db.id_itf,
+ itp->itp_sw_if_index,
+ IPSEC_TUN_PROTECT_DEFAULT_DB_ENTRY);
+
+ idi = &itp_db.id_itf[itp->itp_sw_if_index];
+
+ if (vnet_sw_interface_is_p2p (vnet_get_main (), itp->itp_sw_if_index))
+ {
+ if (INDEX_INVALID == idi->id_itp)
+ {
+ ipsec_tun_protect_feature_set (itp, 1);
+ }
+ idi->id_itp = itp - ipsec_tun_protect_pool;
+
+ FOR_EACH_FIB_IP_PROTOCOL (nh_proto)
+ adj_nbr_walk (itp->itp_sw_if_index,
+ nh_proto, ipsec_tun_protect_adj_add, itp);
+ }
+ else
+ {
+ if (NULL == idi->id_hash)
+ {
+ idi->id_hash =
+ hash_create_mem (0, sizeof (ip_address_t), sizeof (uword));
+ /*
+ * enable the encrypt feature for egress if this is the first addition
+ * on this interface
+ */
+ ipsec_tun_protect_feature_set (itp, 1);
+ }
+
+ hash_set_mem (idi->id_hash, itp->itp_key, itp - ipsec_tun_protect_pool);
+
+ /*
+ * walk all the adjs with the same nh on this interface
+ * to associate them with this protection
+ */
+ nh_proto = ip_address_to_46 (itp->itp_key, &nh);
+
+ adj_nbr_walk_nh (itp->itp_sw_if_index,
+ nh_proto, &nh, ipsec_tun_protect_adj_add, itp);
+ }
+}
+
+static void
+ipsec_tun_protect_rx_db_remove (ipsec_main_t * im,
+ const ipsec_tun_protect_t * itp)
{
const ipsec_sa_t *sa;
/* *INDENT-ON* */
}
+static adj_walk_rc_t
+ipsec_tun_protect_adj_remove (adj_index_t ai, void *arg)
+{
+ adj_delegate_remove (ai, ipsec_tun_adj_delegate_type);
+ ipsec_tun_protect_add_adj (ai, INDEX_INVALID);
+
+ return (ADJ_WALK_RC_CONTINUE);
+}
+
static void
-ipsec_tun_protect_config (ipsec_main_t * im,
- ipsec_tun_protect_t * itp, u32 sa_out, u32 * sas_in)
+ipsec_tun_protect_tx_db_remove (ipsec_tun_protect_t * itp)
{
- ipsec_sa_t *sa;
- index_t sai;
- u32 ii;
+ ipsec_tun_protect_itf_db_t *idi;
+ fib_protocol_t nh_proto;
+ ip46_address_t nh;
- itp->itp_n_sa_in = vec_len (sas_in);
- for (ii = 0; ii < itp->itp_n_sa_in; ii++)
- itp->itp_in_sas[ii] = sas_in[ii];
- itp->itp_out_sa = sa_out;
+ nh_proto = ip_address_to_46 (itp->itp_key, &nh);
+ idi = &itp_db.id_itf[itp->itp_sw_if_index];
- ipsec_sa_lock (itp->itp_out_sa);
+ if (vnet_sw_interface_is_p2p (vnet_get_main (), itp->itp_sw_if_index))
+ {
+ ipsec_tun_protect_feature_set (itp, 0);
+ idi->id_itp = INDEX_INVALID;
+
+ FOR_EACH_FIB_IP_PROTOCOL (nh_proto)
+ adj_nbr_walk (itp->itp_sw_if_index,
+ nh_proto, ipsec_tun_protect_adj_remove, itp);
+ }
+ else
+ {
+ adj_nbr_walk_nh (itp->itp_sw_if_index,
+ nh_proto, &nh, ipsec_tun_protect_adj_remove, itp);
+
+ hash_unset_mem (idi->id_hash, itp->itp_key);
+
+ if (0 == hash_elts (idi->id_hash))
+ {
+ ipsec_tun_protect_feature_set (itp, 0);
+ hash_free (idi->id_hash);
+ idi->id_hash = NULL;
+ }
+ }
+}
+
+static void
+ipsec_tun_protect_set_crypto_addr (ipsec_tun_protect_t * itp)
+{
+ ipsec_sa_t *sa;
/* *INDENT-OFF* */
- FOR_EACH_IPSEC_PROTECT_INPUT_SAI(itp, sai,
- ({
- ipsec_sa_lock(sai);
- }));
FOR_EACH_IPSEC_PROTECT_INPUT_SA(itp, sa,
({
if (ipsec_sa_is_set_IS_TUNNEL (sa))
}
}));
/* *INDENT-ON* */
+}
+
+static void
+ipsec_tun_protect_config (ipsec_main_t * im,
+ ipsec_tun_protect_t * itp, u32 sa_out, u32 * sas_in)
+{
+ index_t sai;
+ u32 ii;
+
+ itp->itp_n_sa_in = vec_len (sas_in);
+ for (ii = 0; ii < itp->itp_n_sa_in; ii++)
+ itp->itp_in_sas[ii] = sas_in[ii];
+ itp->itp_out_sa = sa_out;
+
+ ipsec_sa_lock (itp->itp_out_sa);
+
+ /* *INDENT-OFF* */
+ FOR_EACH_IPSEC_PROTECT_INPUT_SAI(itp, sai,
+ ({
+ ipsec_sa_lock(sai);
+ }));
+ ipsec_tun_protect_set_crypto_addr(itp);
+ /* *INDENT-ON* */
/*
* add to the DB against each SA
*/
- ipsec_tun_protect_db_add (im, itp);
+ ipsec_tun_protect_rx_db_add (im, itp);
+ ipsec_tun_protect_tx_db_add (itp);
- /*
- * enable the encrypt feature for egress.
- */
- ipsec_tun_protect_feature_set (itp, 1);
+ ITP_DBG (itp, "configured");
}
static void
ipsec_sa_t *sa;
index_t sai;
- ipsec_tun_protect_feature_set (itp, 0);
-
/* *INDENT-OFF* */
FOR_EACH_IPSEC_PROTECT_INPUT_SA(itp, sa,
({
ipsec_sa_unset_IS_PROTECT (sa);
}));
- ipsec_tun_protect_db_remove (im, itp);
+ ipsec_tun_protect_rx_db_remove (im, itp);
+ ipsec_tun_protect_tx_db_remove (itp);
ipsec_sa_unlock(itp->itp_out_sa);
ipsec_sa_unlock(sai);
}));
/* *INDENT-ON* */
-}
-
-index_t
-ipsec_tun_protect_find (u32 sw_if_index)
-{
- if (vec_len (ipsec_protect_db.tunnels) < sw_if_index)
- return (INDEX_INVALID);
-
- return (ipsec_protect_db.tunnels[sw_if_index]);
+ ITP_DBG (itp, "unconfigured");
}
int
-ipsec_tun_protect_update_one (u32 sw_if_index, u32 sa_out, u32 sa_in)
+ipsec_tun_protect_update_one (u32 sw_if_index,
+ const ip_address_t * nh, u32 sa_out, u32 sa_in)
{
u32 *sas_in = NULL;
int rv;
vec_add1 (sas_in, sa_in);
- rv = ipsec_tun_protect_update (sw_if_index, sa_out, sas_in);
+ rv = ipsec_tun_protect_update (sw_if_index, nh, sa_out, sas_in);
return (rv);
}
int
-ipsec_tun_protect_update_out (u32 sw_if_index, u32 sa_out)
+ipsec_tun_protect_update_out (u32 sw_if_index,
+ const ip_address_t * nh, u32 sa_out)
{
u32 itpi, *sas_in, sai, *saip;
ipsec_tun_protect_t *itp;
sas_in = NULL;
rv = 0;
im = &ipsec_main;
- vec_validate_init_empty (ipsec_protect_db.tunnels, sw_if_index,
- INDEX_INVALID);
- itpi = ipsec_protect_db.tunnels[sw_if_index];
+
+ itpi = ipsec_tun_protect_find (sw_if_index, nh);
if (INDEX_INVALID == itpi)
{
return (VNET_API_ERROR_INVALID_INTERFACE);
}
- itp = pool_elt_at_index (ipsec_protect_pool, itpi);
+ itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi);
- /* *INDENT-0FF* */
- FOR_EACH_IPSEC_PROTECT_INPUT_SAI (itp, sai, (
- {
- ipsec_sa_lock (sai);
- vec_add1 (sas_in, sai);
- }
- ));
+ /* *INDENT-OFF* */
+ FOR_EACH_IPSEC_PROTECT_INPUT_SAI (itp, sai,
+ ({
+ ipsec_sa_lock (sai);
+ vec_add1 (sas_in, sai);
+ }));
/* *INDENT-ON* */
sa_out = ipsec_sa_find_and_lock (sa_out);
}
int
-ipsec_tun_protect_update_in (u32 sw_if_index, u32 sa_in)
+ipsec_tun_protect_update_in (u32 sw_if_index,
+ const ip_address_t * nh, u32 sa_in)
{
u32 itpi, *sas_in, sa_out;
ipsec_tun_protect_t *itp;
sas_in = NULL;
rv = 0;
im = &ipsec_main;
- vec_validate_init_empty (ipsec_protect_db.tunnels, sw_if_index,
- INDEX_INVALID);
- itpi = ipsec_protect_db.tunnels[sw_if_index];
+ itpi = ipsec_tun_protect_find (sw_if_index, nh);
if (INDEX_INVALID == itpi)
{
}
vec_add1 (sas_in, sa_in);
- itp = pool_elt_at_index (ipsec_protect_pool, itpi);
+ itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi);
sa_out = itp->itp_out_sa;
ipsec_sa_lock (sa_out);
return (rv);
}
+static void
+ipsec_tun_protect_update_from_teib (ipsec_tun_protect_t * itp,
+ const teib_entry_t * ne)
+{
+ if (NULL != ne)
+ {
+ const fib_prefix_t *pfx;
+
+ pfx = teib_entry_get_nh (ne);
+
+ ip46_address_copy (&itp->itp_tun.dst, &pfx->fp_addr);
+ }
+ else
+ ip46_address_reset (&itp->itp_tun.dst);
+}
+
int
-ipsec_tun_protect_update (u32 sw_if_index, u32 sa_out, u32 * sas_in)
+ipsec_tun_protect_update (u32 sw_if_index,
+ const ip_address_t * nh, u32 sa_out, u32 * sas_in)
{
ipsec_tun_protect_t *itp;
u32 itpi, ii, *saip;
ipsec_main_t *im;
int rv;
+ ITP_DBG2 ("update: %U/%U",
+ format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index,
+ format_ip_address, nh);
+
rv = 0;
im = &ipsec_main;
- vec_validate_init_empty (ipsec_protect_db.tunnels, sw_if_index,
- INDEX_INVALID);
- itpi = ipsec_protect_db.tunnels[sw_if_index];
+ if (NULL == nh)
+ nh = &IP_ADDR_ALL_0;
+ itpi = ipsec_tun_protect_find (sw_if_index, nh);
vec_foreach_index (ii, sas_in)
{
goto out;
}
- pool_get_zero (ipsec_protect_pool, itp);
+ pool_get_zero (ipsec_tun_protect_pool, itp);
itp->itp_sw_if_index = sw_if_index;
- ipsec_protect_db.tunnels[sw_if_index] = itp - ipsec_protect_pool;
- ipsec_protect_db.count++;
itp->itp_n_sa_in = vec_len (sas_in);
for (ii = 0; ii < itp->itp_n_sa_in; ii++)
itp->itp_in_sas[ii] = sas_in[ii];
itp->itp_out_sa = sa_out;
+ itp->itp_key = clib_mem_alloc (sizeof (*itp->itp_key));
+ ip_address_copy (itp->itp_key, nh);
+
rv = dev_class->ip_tun_desc (sw_if_index,
&itp->itp_tun.src,
&itp->itp_tun.dst, &is_l2);
if (rv)
goto out;
+ if (ip46_address_is_zero (&itp->itp_tun.dst))
+ {
+ /* tunnel has no destination address, presumably because it's p2mp
+ in which case we use the nh that this is protection for */
+ ip46_address_t peer;
+
+ ip_address_to_46 (nh, &peer);
+
+ ipsec_tun_protect_update_from_teib
+ (itp, teib_entry_find (sw_if_index, &peer));
+ }
+
if (is_l2)
itp->itp_flags |= IPSEC_PROTECT_L2;
* of the tunnel we are protecting, else it's dropped.
*/
ipsec_tun_protect_config (im, itp, sa_out, sas_in);
-
- if (1 == hash_elts (im->tun4_protect_by_key))
- ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
- ipsec4_tun_input_node.index);
- if (1 == hash_elts (im->tun6_protect_by_key))
- ip6_register_protocol (IP_PROTOCOL_IPSEC_ESP,
- ipsec6_tun_input_node.index);
}
else
{
/* updating SAs only */
- itp = pool_elt_at_index (ipsec_protect_pool, itpi);
+ itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi);
ipsec_tun_protect_unconfig (im, itp);
ipsec_tun_protect_config (im, itp, sa_out, sas_in);
}
int
-ipsec_tun_protect_del (u32 sw_if_index)
+ipsec_tun_protect_del (u32 sw_if_index, const ip_address_t * nh)
{
ipsec_tun_protect_t *itp;
ipsec_main_t *im;
index_t itpi;
+ ITP_DBG2 ("delete: %U/%U",
+ format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index,
+ format_ip_address, nh);
+
im = &ipsec_main;
+ if (NULL == nh)
+ nh = &IP_ADDR_ALL_0;
- vec_validate_init_empty (ipsec_protect_db.tunnels, sw_if_index,
- INDEX_INVALID);
- itpi = ipsec_protect_db.tunnels[sw_if_index];
+ itpi = ipsec_tun_protect_find (sw_if_index, nh);
if (INDEX_INVALID == itpi)
return (VNET_API_ERROR_NO_SUCH_ENTRY);
itp = ipsec_tun_protect_get (itpi);
ipsec_tun_protect_unconfig (im, itp);
- ipsec_protect_db.tunnels[itp->itp_sw_if_index] = INDEX_INVALID;
-
- pool_put (ipsec_protect_pool, itp);
+ clib_mem_free (itp->itp_key);
+ pool_put (ipsec_tun_protect_pool, itp);
if (0 == hash_elts (im->tun4_protect_by_key))
ip4_unregister_protocol (IP_PROTOCOL_IPSEC_ESP);
index_t itpi;
/* *INDENT-OFF* */
- pool_foreach_index(itpi, ipsec_protect_pool,
+ pool_foreach_index(itpi, ipsec_tun_protect_pool,
+ ({
+ fn (itpi, ctx);
+ }));
+ /* *INDENT-ON* */
+}
+
+void
+ipsec_tun_protect_walk_itf (u32 sw_if_index,
+ ipsec_tun_protect_walk_cb_t fn, void *ctx)
+{
+ ipsec_tun_protect_itf_db_t *idi;
+ ip_address_t *key;
+ index_t itpi;
+
+ if (vec_len (itp_db.id_itf) <= sw_if_index)
+ return;
+
+ idi = &itp_db.id_itf[sw_if_index];
+
+ /* *INDENT-OFF* */
+ hash_foreach(key, itpi, idi->id_hash,
({
fn (itpi, ctx);
}));
/* *INDENT-ON* */
+ if (INDEX_INVALID != idi->id_itp)
+ fn (idi->id_itp, ctx);
}
+static void
+ipsec_tun_protect_adj_delegate_adj_deleted (adj_delegate_t * ad)
+{
+ /* remove our delegate */
+ adj_delegate_remove (ad->ad_adj_index, ipsec_tun_adj_delegate_type);
+ ipsec_tun_protect_add_adj (ad->ad_adj_index, INDEX_INVALID);
+}
+
+static void
+ipsec_tun_protect_adj_delegate_adj_created (adj_index_t ai)
+{
+ /* add our delegate if there is protection for this neighbour */
+ ip_address_t ip = IP_ADDRESS_V4_ALL_0S;
+ ip_adjacency_t *adj;
+ index_t itpi;
+
+ adj = adj_get (ai);
+
+ if (adj->lookup_next_index != IP_LOOKUP_NEXT_MIDCHAIN)
+ return;
+
+ ip_address_from_46 (&adj->sub_type.midchain.next_hop,
+ adj->ia_nh_proto, &ip);
+
+ itpi = ipsec_tun_protect_find (adj->rewrite_header.sw_if_index, &ip);
+
+ if (INDEX_INVALID != itpi)
+ {
+ const ipsec_tun_protect_t *itp;
+
+ itp = ipsec_tun_protect_get (itpi);
+ adj_delegate_add (adj_get (ai), ipsec_tun_adj_delegate_type, itpi);
+ ipsec_tun_protect_add_adj (ai, itp->itp_out_sa);
+ }
+}
+
+static u8 *
+ipsec_tun_protect_adj_delegate_format (const adj_delegate_t * aed, u8 * s)
+{
+ const ipsec_tun_protect_t *itp;
+
+ itp = ipsec_tun_protect_from_const_base (aed);
+ s = format (s, "ipsec-tun-protect:\n%U", format_ipsec_tun_protect, itp);
+
+ return (s);
+}
+
+static void
+ipsec_tun_teib_entry_added (const teib_entry_t * ne)
+{
+ const ip46_address_t *peer46;
+ ipsec_tun_protect_t *itp;
+ ip_address_t peer;
+ index_t itpi;
+
+ peer46 = teib_entry_get_peer (ne);
+ ip_address_from_46 (peer46,
+ (ip46_address_is_ip4 (peer46) ?
+ FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6), &peer);
+
+ itpi = ipsec_tun_protect_find (teib_entry_get_sw_if_index (ne), &peer);
+
+ if (INDEX_INVALID == itpi)
+ return;
+
+ itp = ipsec_tun_protect_get (itpi);
+ ipsec_tun_protect_rx_db_remove (&ipsec_main, itp);
+ ipsec_tun_protect_update_from_teib (itp, ne);
+ ipsec_tun_protect_set_crypto_addr (itp);
+ ipsec_tun_protect_rx_db_add (&ipsec_main, itp);
+
+ ITP_DBG (itp, "teib-added");
+}
+
+static void
+ipsec_tun_teib_entry_deleted (const teib_entry_t * ne)
+{
+ const ip46_address_t *peer46;
+ ipsec_tun_protect_t *itp;
+ ip_address_t peer;
+ index_t itpi;
+
+ peer46 = teib_entry_get_peer (ne);
+ ip_address_from_46 (peer46,
+ (ip46_address_is_ip4 (peer46) ?
+ FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6), &peer);
+
+ itpi = ipsec_tun_protect_find (teib_entry_get_sw_if_index (ne), &peer);
+
+ if (INDEX_INVALID == itpi)
+ return;
+
+ itp = ipsec_tun_protect_get (itpi);
+ ipsec_tun_protect_rx_db_remove (&ipsec_main, itp);
+ ipsec_tun_protect_update_from_teib (itp, NULL);
+ ipsec_tun_protect_set_crypto_addr (itp);
+
+ ITP_DBG (itp, "teib-removed");
+}
+
+/**
+ * VFT registered with the adjacency delegate
+ */
+const static adj_delegate_vft_t ipsec_tun_adj_delegate_vft = {
+ .adv_adj_deleted = ipsec_tun_protect_adj_delegate_adj_deleted,
+ .adv_adj_created = ipsec_tun_protect_adj_delegate_adj_created,
+ .adv_format = ipsec_tun_protect_adj_delegate_format,
+};
+
+const static teib_vft_t ipsec_tun_teib_vft = {
+ .nv_added = ipsec_tun_teib_entry_added,
+ .nv_deleted = ipsec_tun_teib_entry_deleted,
+};
+
clib_error_t *
ipsec_tunnel_protect_init (vlib_main_t * vm)
{
ipsec_add_feature ("ip6-output", "esp6-no-crypto",
&im->esp6_no_crypto_tun_feature_index);
+ ipsec_tun_adj_delegate_type =
+ adj_delegate_register_new_type (&ipsec_tun_adj_delegate_vft);
+
+ ipsec_tun_protect_logger = vlib_log_register_class ("ipsec", "tun");
+
+ teib_register (&ipsec_tun_teib_vft);
+
return 0;
}
ipsec_ep_t itp_tun;
+ ip_address_t *itp_key;
+
} ipsec_tun_protect_t;
#define FOR_EACH_IPSEC_PROTECT_INPUT_SAI(_itp, _sai, body) \
} \
}
-extern int ipsec_tun_protect_update_one (u32 sw_if_index, u32 sa_out,
- u32 sa_in);
-extern int ipsec_tun_protect_update (u32 sw_if_index, u32 sa_out,
- u32 * sa_ins);
-extern int ipsec_tun_protect_update_in (u32 sw_if_index, u32 sa_in);
-extern int ipsec_tun_protect_update_out (u32 sw_if_index, u32 sa_out);
+extern int ipsec_tun_protect_update_one (u32 sw_if_index,
+ const ip_address_t * nh,
+ u32 sa_out, u32 sa_in);
+extern int ipsec_tun_protect_update (u32 sw_if_index,
+ const ip_address_t * nh,
+ u32 sa_out, u32 * sa_ins);
+extern int ipsec_tun_protect_update_in (u32 sw_if_index,
+ const ip_address_t * nh, u32 sa_in);
+extern int ipsec_tun_protect_update_out (u32 sw_if_index,
+ const ip_address_t * nh, u32 sa_out);
-extern int ipsec_tun_protect_del (u32 sw_if_index);
+extern int ipsec_tun_protect_del (u32 sw_if_index, const ip_address_t * nh);
typedef walk_rc_t (*ipsec_tun_protect_walk_cb_t) (index_t itpi, void *arg);
extern void ipsec_tun_protect_walk (ipsec_tun_protect_walk_cb_t fn,
void *cttx);
-extern index_t ipsec_tun_protect_find (u32 sw_if_index);
+extern void ipsec_tun_protect_walk_itf (u32 sw_if_index,
+ ipsec_tun_protect_walk_cb_t fn,
+ void *cttx);
extern u8 *format_ipsec_tun_protect (u8 * s, va_list * args);
+extern u8 *format_ipsec_tun_protect_index (u8 * s, va_list * args);
// FIXME
extern vlib_node_registration_t ipsec4_tun_input_node;
/*
* DP API
*/
-extern ipsec_tun_protect_t *ipsec_protect_pool;
+extern ipsec_tun_protect_t *ipsec_tun_protect_pool;
typedef struct ipsec_tun_lkup_result_t_
{
always_inline ipsec_tun_protect_t *
ipsec_tun_protect_get (u32 index)
{
- return (pool_elt_at_index (ipsec_protect_pool, index));
+ return (pool_elt_at_index (ipsec_tun_protect_pool, index));
+}
+
+extern index_t *ipsec_tun_protect_sa_by_adj_index;
+always_inline index_t
+ipsec_tun_protect_get_sa_out (adj_index_t ai)
+{
+ ASSERT (vec_len (ipsec_tun_protect_sa_by_adj_index) > ai);
+ ASSERT (INDEX_INVALID != ipsec_tun_protect_sa_by_adj_index[ai]);
+
+ return (ipsec_tun_protect_sa_by_adj_index[ai]);
}
/*
}
}
- itp0 = pool_elt_at_index (ipsec_protect_pool, itr0.tun_index);
+ itp0 = pool_elt_at_index (ipsec_tun_protect_pool, itr0.tun_index);
vnet_buffer (b[0])->ipsec.sad_index = itr0.sa_index;
vnet_buffer (b[0])->ipsec.protect_index = itr0.tun_index;
fib_protocol_t nh_proto;
ip46_address_t nh;
- ip_address_to_46 (&ladj->remote_rloc, &nh, &nh_proto);
+ nh_proto = ip_address_to_46 (&ladj->remote_rloc, &nh);
/*
* walk all the adjacencies on th lisp interface and restack them
ladj = lisp_gpe_adjacency_get (paths[ii].lisp_adj);
- ip_address_to_46 (&ladj->remote_rloc, &rpaths[ii].frp_addr, &fp);
+ fp = ip_address_to_46 (&ladj->remote_rloc, &rpaths[ii].frp_addr);
rpaths[ii].frp_proto = fib_proto_to_dpo (fp);
rpaths[ii].frp_sw_if_index = ladj->sw_if_index;
const teib_entry_t *ne;
const fib_prefix_t *pfx;
- mp = vl_msg_api_alloc (sizeof (*mp));
- clib_memset (mp, 0, sizeof (*mp));
+ mp = vl_msg_api_alloc_zero (sizeof (*mp));
mp->_vl_msg_id = ntohs (VL_API_TEIB_DETAILS + REPLY_MSG_ID_BASE);
mp->context = ctx->context;
self.remote_tun_if_host = '1.1.1.1'
self.remote_tun_if_host6 = '1111::1'
- self.scapy_tun_sa_id = 10
+ self.scapy_tun_sa_id = 100
self.scapy_tun_spi = 1001
- self.vpp_tun_sa_id = 20
+ self.vpp_tun_sa_id = 200
self.vpp_tun_spi = 1000
- self.scapy_tra_sa_id = 30
+ self.scapy_tra_sa_id = 300
self.scapy_tra_spi = 2001
- self.vpp_tra_sa_id = 40
+ self.vpp_tra_sa_id = 400
self.vpp_tra_spi = 2000
self.auth_algo_vpp_id = (VppEnum.vl_api_ipsec_integ_alg_t.
self.remote_tun_if_host = '1111:1111:1111:1111:1111:1111:1111:1111'
self.remote_tun_if_host4 = '1.1.1.1'
- self.scapy_tun_sa_id = 50
+ self.scapy_tun_sa_id = 500
self.scapy_tun_spi = 3001
- self.vpp_tun_sa_id = 60
+ self.vpp_tun_sa_id = 600
self.vpp_tun_spi = 3000
- self.scapy_tra_sa_id = 70
+ self.scapy_tra_sa_id = 700
self.scapy_tra_spi = 4001
- self.vpp_tra_sa_id = 80
+ self.vpp_tra_sa_id = 800
self.vpp_tra_spi = 4000
self.auth_algo_vpp_id = (VppEnum.vl_api_ipsec_integ_alg_t.
def show_commands_at_teardown(self):
self.logger.info(self.vapi.cli("show hardware"))
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=54):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=src, dst=dst) /
ICMP() / Raw(b'X' * payload_size))
for i in range(count)]
- def gen_encrypt_pkts6(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts6(self, p, sa, sw_intf, src, dst, count=1,
payload_size=54):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IPv6(src=src, dst=dst) /
self.vapi.cli("clear ipsec sa")
try:
p = self.params[socket.AF_INET]
- send_pkts = self.gen_encrypt_pkts(p.scapy_tra_sa, self.tra_if,
+ send_pkts = self.gen_encrypt_pkts(p, p.scapy_tra_sa, self.tra_if,
src=self.tra_if.remote_ip4,
dst=self.tra_if.local_ip4,
count=count,
self.vapi.cli("clear ipsec sa")
try:
p = self.params[socket.AF_INET6]
- send_pkts = self.gen_encrypt_pkts6(p.scapy_tra_sa, self.tra_if,
+ send_pkts = self.gen_encrypt_pkts6(p, p.scapy_tra_sa, self.tra_if,
src=self.tra_if.remote_ip6,
dst=self.tra_if.local_ip6,
count=count,
def verify_tun_44(self, p, count=1, payload_size=64, n_rx=None):
self.vapi.cli("clear errors")
self.vapi.cli("clear ipsec counters")
+ self.vapi.cli("clear ipsec sa")
if not n_rx:
n_rx = count
try:
- send_pkts = self.gen_encrypt_pkts(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip4,
count=count,
self.logger.info(self.vapi.ppcli("show ipsec sa 4"))
self.verify_counters4(p, count, n_rx)
+ def verify_tun_dropped_44(self, p, count=1, payload_size=64, n_rx=None):
+ self.vapi.cli("clear errors")
+ if not n_rx:
+ n_rx = count
+ try:
+ send_pkts = self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
+ src=p.remote_tun_if_host,
+ dst=self.pg1.remote_ip4,
+ count=count)
+ self.send_and_assert_no_replies(self.tun_if, send_pkts)
+
+ send_pkts = self.gen_pkts(self.pg1, src=self.pg1.remote_ip4,
+ dst=p.remote_tun_if_host, count=count,
+ payload_size=payload_size)
+ self.send_and_assert_no_replies(self.pg1, send_pkts)
+
+ finally:
+ self.logger.info(self.vapi.ppcli("show error"))
+ self.logger.info(self.vapi.ppcli("show ipsec all"))
+
def verify_tun_reass_44(self, p):
self.vapi.cli("clear errors")
self.vapi.ip_reassembly_enable_disable(
sw_if_index=self.tun_if.sw_if_index, enable_ip4=True)
try:
- send_pkts = self.gen_encrypt_pkts(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip4,
payload_size=1900,
def verify_tun_64(self, p, count=1):
self.vapi.cli("clear errors")
try:
- send_pkts = self.gen_encrypt_pkts6(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts6(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host6,
dst=self.pg1.remote_ip6,
count=count)
self.vapi.cli("clear errors")
self.vapi.cli("clear ipsec sa")
- send_pkts = self.gen_encrypt_pkts6(p_in.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts6(p_in, p_in.scapy_tun_sa,
+ self.tun_if,
src=p_in.remote_tun_if_host,
dst=self.pg1.remote_ip6,
count=count)
if not p_out:
p_out = p_in
try:
- send_pkts = self.gen_encrypt_pkts6(p_in.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts6(p_in, p_in.scapy_tun_sa,
+ self.tun_if,
src=p_in.remote_tun_if_host,
dst=self.pg1.remote_ip6,
count=count,
sw_if_index=self.tun_if.sw_if_index, enable_ip6=True)
try:
- send_pkts = self.gen_encrypt_pkts6(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts6(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip6,
count=1,
""" ipsec 4o6 tunnel basic test """
self.vapi.cli("clear errors")
try:
- send_pkts = self.gen_encrypt_pkts(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host4,
dst=self.pg1.remote_ip4,
count=count)
# inject alternately on worker 0 and 1. all counts on the SA
# should be against worker 0
for worker in [0, 1, 0, 1]:
- send_pkts = self.gen_encrypt_pkts6(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts6(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip6,
count=N_PKTS)
# inject alternately on worker 0 and 1. all counts on the SA
# should be against worker 0
for worker in [0, 1, 0, 1]:
- send_pkts = self.gen_encrypt_pkts(p.scapy_tun_sa, self.tun_if,
+ send_pkts = self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip4,
count=N_PKTS)
from framework import VppTestCase, VppTestRunner
from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint
from vpp_gre_interface import VppGreInterface
-from vpp_teib import VppNhrp
+from vpp_teib import VppTeib
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto
from util import ppp, ppc
route_via_tun.add_vpp_config()
#
- # Add a NHRP entry resolves the peer
+ # Add a TEIB entry resolves the peer
#
- teib = VppNhrp(self, gre_if,
+ teib = VppTeib(self, gre_if,
gre_if._remote_hosts[ii].ip4,
itf._remote_hosts[ii].ip4)
teib.add_vpp_config()
self.verify_decapped_4o4(self.pg0, rx, tx_i)
#
- # delete and re-add the NHRP
+ # delete and re-add the TEIB
#
teib.remove_vpp_config()
self.send_and_assert_no_replies(self.pg0, tx_e)
route_addr = "4::%d" % ii
#
- # Add a NHRP entry resolves the peer
+ # Add a TEIB entry resolves the peer
#
- teib = VppNhrp(self, gre_if,
+ teib = VppTeib(self, gre_if,
gre_if._remote_hosts[ii].ip6,
itf._remote_hosts[ii].ip6)
teib.add_vpp_config()
self.verify_decapped_6o6(self.pg0, rx, tx_i)
#
- # delete and re-add the NHRP
+ # delete and re-add the TEIB
#
teib.remove_vpp_config()
self.send_and_assert_no_replies(self.pg0, tx_e)
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto
from vpp_ipip_tun_interface import VppIpIpTunInterface
-from vpp_teib import VppNhrp
+from vpp_teib import VppTeib
from vpp_papi import VppEnum
from socket import AF_INET, AF_INET6, inet_pton
from util import reassemble4
route_via_tun.add_vpp_config()
#
- # Add a NHRP entry resolves the peer
+ # Add a TEIB entry resolves the peer
#
- teib = VppNhrp(self, ipip_if,
+ teib = VppTeib(self, ipip_if,
ipip_if._remote_hosts[ii].ip4,
itf._remote_hosts[ii].ip4)
teib.add_vpp_config()
rx = self.send_and_expect(self.pg0, tx_i, self.pg0)
#
- # delete and re-add the NHRP
+ # delete and re-add the TEIB
#
teib.remove_vpp_config()
self.send_and_assert_no_replies(self.pg0, tx_e)
from vpp_ipsec import VppIpsecSA, VppIpsecTunProtect
from vpp_l2 import VppBridgeDomain, VppBridgeDomainPort
from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint
+from vpp_teib import VppTeib
from util import ppp
from vpp_papi import VppEnum
""" Round-robin packets acrros multiple interface """
tx = []
for p in self.multi_params:
- tx = tx + self.gen_encrypt_pkts(p.scapy_tun_sa, self.tun_if,
+ tx = tx + self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip4)
rxs = self.send_and_expect(self.tun_if, tx, self.pg1)
encryption_type = ESP
omac = "00:11:22:33:44:55"
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=self.pg0.remote_ip4,
VppBridgeDomainPort(self, bd1, self.pg1).add_vpp_config()
self.vapi.cli("clear ipsec sa")
+ self.vapi.cli("sh adj")
+ self.vapi.cli("sh ipsec tun")
def tearDown(self):
p = self.ipv4_params
encryption_type = ESP
omac = "00:11:22:33:44:55"
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=self.pg0.remote_ip4,
encryption_type = ESP
omac = "00:11:22:33:44:55"
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=self.pg0.remote_ip4,
tun4_decrypt_node_name = "esp4-decrypt-tun"
encryption_type = ESP
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=self.pg0.remote_ip4,
tun4_decrypt_node_name = "esp4-decrypt-tun"
encryption_type = ESP
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=self.pg0.remote_ip4,
p = self.ipv4_params
- bd1 = VppBridgeDomain(self, 1)
- bd1.add_vpp_config()
-
p.tun_sa_out = VppIpsecSA(self, p.scapy_tun_sa_id, p.scapy_tun_spi,
p.auth_algo_vpp_id, p.auth_key,
p.crypt_algo_vpp_id, p.crypt_key,
tun6_decrypt_node_name = "esp6-decrypt-tun"
encryption_type = ESP
- def gen_encrypt_pkts6(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts6(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IPv6(src=self.pg0.remote_ip6,
super(TestIpsecGre6IfEspTra, self).tearDown()
+class TestIpsecMGreIfEspTra4(TemplateIpsec, IpsecTun4):
+ """ Ipsec mGRE ESP v4 TRA tests """
+ tun4_encrypt_node_name = "esp4-encrypt-tun"
+ tun4_decrypt_node_name = "esp4-decrypt-tun"
+ encryption_type = ESP
+
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
+ payload_size=100):
+ return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
+ sa.encrypt(IP(src=p.tun_dst,
+ dst=self.pg0.local_ip4) /
+ GRE() /
+ IP(src=self.pg1.local_ip4,
+ dst=self.pg1.remote_ip4) /
+ UDP(sport=1144, dport=2233) /
+ Raw(b'X' * payload_size))
+ for i in range(count)]
+
+ def gen_pkts(self, sw_intf, src, dst, count=1,
+ payload_size=100):
+ return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
+ IP(src="1.1.1.1", dst=dst) /
+ UDP(sport=1144, dport=2233) /
+ Raw(b'X' * payload_size)
+ for i in range(count)]
+
+ def verify_decrypted(self, p, rxs):
+ for rx in rxs:
+ self.assert_equal(rx[Ether].dst, self.pg1.remote_mac)
+ self.assert_equal(rx[IP].dst, self.pg1.remote_ip4)
+
+ def verify_encrypted(self, p, sa, rxs):
+ for rx in rxs:
+ try:
+ pkt = sa.decrypt(rx[IP])
+ if not pkt.haslayer(IP):
+ pkt = IP(pkt[Raw].load)
+ self.assert_packet_checksums_valid(pkt)
+ self.assertTrue(pkt.haslayer(GRE))
+ e = pkt[GRE]
+ self.assertEqual(e[IP].dst, p.remote_tun_if_host)
+ except (IndexError, AssertionError):
+ self.logger.debug(ppp("Unexpected packet:", rx))
+ try:
+ self.logger.debug(ppp("Decrypted packet:", pkt))
+ except:
+ pass
+ raise
+
+ def setUp(self):
+ super(TestIpsecMGreIfEspTra4, self).setUp()
+
+ N_NHS = 16
+ self.tun_if = self.pg0
+ p = self.ipv4_params
+ p.tun_if = VppGreInterface(self,
+ self.pg0.local_ip4,
+ "0.0.0.0",
+ mode=(VppEnum.vl_api_tunnel_mode_t.
+ TUNNEL_API_MODE_MP))
+ p.tun_if.add_vpp_config()
+ p.tun_if.admin_up()
+ p.tun_if.config_ip4()
+ p.tun_if.generate_remote_hosts(N_NHS)
+ self.pg0.generate_remote_hosts(N_NHS)
+ self.pg0.configure_ipv4_neighbors()
+
+ # setup some SAs for several next-hops on the interface
+ self.multi_params = []
+
+ for ii in range(N_NHS):
+ p = copy.copy(self.ipv4_params)
+
+ p.remote_tun_if_host = "1.1.1.%d" % (ii + 1)
+ p.scapy_tun_sa_id = p.scapy_tun_sa_id + ii
+ p.scapy_tun_spi = p.scapy_tun_spi + ii
+ p.vpp_tun_sa_id = p.vpp_tun_sa_id + ii
+ p.vpp_tun_spi = p.vpp_tun_spi + ii
+
+ p.scapy_tra_sa_id = p.scapy_tra_sa_id + ii
+ p.scapy_tra_spi = p.scapy_tra_spi + ii
+ p.vpp_tra_sa_id = p.vpp_tra_sa_id + ii
+ p.vpp_tra_spi = p.vpp_tra_spi + ii
+ p.tun_sa_out = VppIpsecSA(self, p.scapy_tun_sa_id, p.scapy_tun_spi,
+ p.auth_algo_vpp_id, p.auth_key,
+ p.crypt_algo_vpp_id, p.crypt_key,
+ self.vpp_esp_protocol)
+ p.tun_sa_out.add_vpp_config()
+
+ p.tun_sa_in = VppIpsecSA(self, p.vpp_tun_sa_id, p.vpp_tun_spi,
+ p.auth_algo_vpp_id, p.auth_key,
+ p.crypt_algo_vpp_id, p.crypt_key,
+ self.vpp_esp_protocol)
+ p.tun_sa_in.add_vpp_config()
+
+ p.tun_protect = VppIpsecTunProtect(
+ self,
+ p.tun_if,
+ p.tun_sa_out,
+ [p.tun_sa_in],
+ nh=p.tun_if.remote_hosts[ii].ip4)
+ p.tun_protect.add_vpp_config()
+ config_tra_params(p, self.encryption_type, p.tun_if)
+ self.multi_params.append(p)
+
+ VppIpRoute(self, p.remote_tun_if_host, 32,
+ [VppRoutePath(p.tun_if.remote_hosts[ii].ip4,
+ p.tun_if.sw_if_index)]).add_vpp_config()
+
+ # in this v4 variant add the teibs after the protect
+ p.teib = VppTeib(self, p.tun_if,
+ p.tun_if.remote_hosts[ii].ip4,
+ self.pg0.remote_hosts[ii].ip4).add_vpp_config()
+ p.tun_dst = self.pg0.remote_hosts[ii].ip4
+ self.logger.info(self.vapi.cli("sh ipsec protect-hash"))
+
+ def tearDown(self):
+ p = self.ipv4_params
+ p.tun_if.unconfig_ip4()
+ super(TestIpsecMGreIfEspTra4, self).tearDown()
+
+ def test_tun_44(self):
+ """mGRE IPSEC 44"""
+ N_PKTS = 63
+ for p in self.multi_params:
+ self.verify_tun_44(p, count=N_PKTS)
+ p.teib.remove_vpp_config()
+ self.verify_tun_dropped_44(p, count=N_PKTS)
+ p.teib.add_vpp_config()
+ self.verify_tun_44(p, count=N_PKTS)
+
+
+class TestIpsecMGreIfEspTra6(TemplateIpsec, IpsecTun6):
+ """ Ipsec mGRE ESP v6 TRA tests """
+ tun6_encrypt_node_name = "esp6-encrypt-tun"
+ tun6_decrypt_node_name = "esp6-decrypt-tun"
+ encryption_type = ESP
+
+ def gen_encrypt_pkts6(self, p, sa, sw_intf, src, dst, count=1,
+ payload_size=100):
+ return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
+ sa.encrypt(IPv6(src=p.tun_dst,
+ dst=self.pg0.local_ip6) /
+ GRE() /
+ IPv6(src=self.pg1.local_ip6,
+ dst=self.pg1.remote_ip6) /
+ UDP(sport=1144, dport=2233) /
+ Raw(b'X' * payload_size))
+ for i in range(count)]
+
+ def gen_pkts6(self, sw_intf, src, dst, count=1,
+ payload_size=100):
+ return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
+ IPv6(src="1::1", dst=dst) /
+ UDP(sport=1144, dport=2233) /
+ Raw(b'X' * payload_size)
+ for i in range(count)]
+
+ def verify_decrypted6(self, p, rxs):
+ for rx in rxs:
+ self.assert_equal(rx[Ether].dst, self.pg1.remote_mac)
+ self.assert_equal(rx[IPv6].dst, self.pg1.remote_ip6)
+
+ def verify_encrypted6(self, p, sa, rxs):
+ for rx in rxs:
+ try:
+ pkt = sa.decrypt(rx[IPv6])
+ if not pkt.haslayer(IPv6):
+ pkt = IPv6(pkt[Raw].load)
+ self.assert_packet_checksums_valid(pkt)
+ self.assertTrue(pkt.haslayer(GRE))
+ e = pkt[GRE]
+ self.assertEqual(e[IPv6].dst, p.remote_tun_if_host)
+ except (IndexError, AssertionError):
+ self.logger.debug(ppp("Unexpected packet:", rx))
+ try:
+ self.logger.debug(ppp("Decrypted packet:", pkt))
+ except:
+ pass
+ raise
+
+ def setUp(self):
+ super(TestIpsecMGreIfEspTra6, self).setUp()
+
+ self.vapi.cli("set logging class ipsec level debug")
+
+ N_NHS = 16
+ self.tun_if = self.pg0
+ p = self.ipv6_params
+ p.tun_if = VppGreInterface(self,
+ self.pg0.local_ip6,
+ "::",
+ mode=(VppEnum.vl_api_tunnel_mode_t.
+ TUNNEL_API_MODE_MP))
+ p.tun_if.add_vpp_config()
+ p.tun_if.admin_up()
+ p.tun_if.config_ip6()
+ p.tun_if.generate_remote_hosts(N_NHS)
+ self.pg0.generate_remote_hosts(N_NHS)
+ self.pg0.configure_ipv6_neighbors()
+
+ # setup some SAs for several next-hops on the interface
+ self.multi_params = []
+
+ for ii in range(N_NHS):
+ p = copy.copy(self.ipv6_params)
+
+ p.remote_tun_if_host = "1::%d" % (ii + 1)
+ p.scapy_tun_sa_id = p.scapy_tun_sa_id + ii
+ p.scapy_tun_spi = p.scapy_tun_spi + ii
+ p.vpp_tun_sa_id = p.vpp_tun_sa_id + ii
+ p.vpp_tun_spi = p.vpp_tun_spi + ii
+
+ p.scapy_tra_sa_id = p.scapy_tra_sa_id + ii
+ p.scapy_tra_spi = p.scapy_tra_spi + ii
+ p.vpp_tra_sa_id = p.vpp_tra_sa_id + ii
+ p.vpp_tra_spi = p.vpp_tra_spi + ii
+ p.tun_sa_out = VppIpsecSA(self, p.scapy_tun_sa_id, p.scapy_tun_spi,
+ p.auth_algo_vpp_id, p.auth_key,
+ p.crypt_algo_vpp_id, p.crypt_key,
+ self.vpp_esp_protocol)
+ p.tun_sa_out.add_vpp_config()
+
+ p.tun_sa_in = VppIpsecSA(self, p.vpp_tun_sa_id, p.vpp_tun_spi,
+ p.auth_algo_vpp_id, p.auth_key,
+ p.crypt_algo_vpp_id, p.crypt_key,
+ self.vpp_esp_protocol)
+ p.tun_sa_in.add_vpp_config()
+
+ # in this v6 variant add the teibs first then the protection
+ p.tun_dst = self.pg0.remote_hosts[ii].ip6
+ VppTeib(self, p.tun_if,
+ p.tun_if.remote_hosts[ii].ip6,
+ p.tun_dst).add_vpp_config()
+
+ p.tun_protect = VppIpsecTunProtect(
+ self,
+ p.tun_if,
+ p.tun_sa_out,
+ [p.tun_sa_in],
+ nh=p.tun_if.remote_hosts[ii].ip6)
+ p.tun_protect.add_vpp_config()
+ config_tra_params(p, self.encryption_type, p.tun_if)
+ self.multi_params.append(p)
+
+ VppIpRoute(self, p.remote_tun_if_host, 128,
+ [VppRoutePath(p.tun_if.remote_hosts[ii].ip6,
+ p.tun_if.sw_if_index)]).add_vpp_config()
+ p.tun_dst = self.pg0.remote_hosts[ii].ip6
+
+ self.logger.info(self.vapi.cli("sh log"))
+ self.logger.info(self.vapi.cli("sh ipsec protect-hash"))
+ self.logger.info(self.vapi.cli("sh adj 41"))
+
+ def tearDown(self):
+ p = self.ipv6_params
+ p.tun_if.unconfig_ip6()
+ super(TestIpsecMGreIfEspTra6, self).tearDown()
+
+ def test_tun_66(self):
+ """mGRE IPSec 66"""
+ for p in self.multi_params:
+ self.verify_tun_66(p, count=63)
+
+
class TemplateIpsec4TunProtect(object):
""" IPsec IPv4 Tunnel protect """
def tearDown(self):
super(TestIpsec4TunProtectTun, self).tearDown()
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=sw_intf.remote_ip4,
def tearDown(self):
super(TestIpsec4TunProtectTunDrop, self).tearDown()
- def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IP(src=sw_intf.remote_ip4,
self.config_sa_tun(p)
self.config_protect(p)
- tx = self.gen_encrypt_pkts(p.scapy_tun_sa, self.tun_if,
+ tx = self.gen_encrypt_pkts(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip4,
count=63)
def tearDown(self):
super(TestIpsec6TunProtectTun, self).tearDown()
- def gen_encrypt_pkts6(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts6(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
sa.encrypt(IPv6(src=sw_intf.remote_ip6,
def tearDown(self):
super(TestIpsec6TunProtectTunDrop, self).tearDown()
- def gen_encrypt_pkts5(self, sa, sw_intf, src, dst, count=1,
+ def gen_encrypt_pkts6(self, p, sa, sw_intf, src, dst, count=1,
payload_size=100):
# the IP destination of the revelaed packet does not match
# that assigned to the tunnel
self.config_sa_tun(p)
self.config_protect(p)
- tx = self.gen_encrypt_pkts6(p.scapy_tun_sa, self.tun_if,
+ tx = self.gen_encrypt_pkts6(p, p.scapy_tun_sa, self.tun_if,
src=p.remote_tun_if_host,
dst=self.pg1.remote_ip6,
count=63)
VPP IPSEC tunnel protection
"""
- def __init__(self, test, itf, sa_out, sas_in):
+ def __init__(self, test, itf, sa_out, sas_in, nh=None):
self.test = test
self.itf = itf
self.sas_in = []
for sa in sas_in:
self.sas_in.append(sa.id)
self.sa_out = sa_out.id
+ self.nh = nh
+ if not self.nh:
+ self.nh = "0.0.0.0"
def update_vpp_config(self, sa_out, sas_in):
self.sas_in = []
'sw_if_index': self.itf._sw_if_index,
'n_sa_in': len(self.sas_in),
'sa_out': self.sa_out,
- 'sa_in': self.sas_in})
+ 'sa_in': self.sas_in,
+ 'nh': self.nh})
def object_id(self):
- return "ipsec-tun-protect-%s" % self.itf
+ return "ipsec-tun-protect-%s-%s" % (self.itf, self.nh)
def add_vpp_config(self):
self.test.vapi.ipsec_tunnel_protect_update(
'sw_if_index': self.itf._sw_if_index,
'n_sa_in': len(self.sas_in),
'sa_out': self.sa_out,
- 'sa_in': self.sas_in})
+ 'sa_in': self.sas_in,
+ 'nh': self.nh})
self.test.registry.register(self, self.test.logger)
def remove_vpp_config(self):
self.test.vapi.ipsec_tunnel_protect_del(
- sw_if_index=self.itf.sw_if_index)
+ sw_if_index=self.itf.sw_if_index,
+ nh=self.nh)
def query_vpp_config(self):
bs = self.test.vapi.ipsec_tunnel_protect_dump(
sw_if_index=self.itf.sw_if_index)
for b in bs:
- if b.tun.sw_if_index == self.itf.sw_if_index:
+ if b.tun.sw_if_index == self.itf.sw_if_index and \
+ self.nh == str(b.tun.nh):
return True
return False
#!/usr/bin/env python
"""
- NHRP objects
+ TEIB objects
"""
from vpp_object import VppObject
return False
-class VppNhrp(VppObject):
+class VppTeib(VppObject):
def __init__(self, test, itf, peer, nh, table_id=0):
self._test = test
'nh': self.nh,
})
self._test.registry.register(self, self._test.logger)
+ return self
def remove_vpp_config(self):
r = self._test.vapi.teib_entry_add_del(
Code Review / vpp.git / commitdiff