ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add LISP RTR support

Browse Source 
Change-Id: I8a3770f8f1cd1fde6765b81d35aacaaf4ff98b82
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
This commit is contained in:
Filip Tehlar
2016-05-19 14:25:44 +02:00
parent 071d610dc4
commit 53f09e36f9
7 changed files with 394 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
vnet/vnet/lisp-cp/control.c
View File

File diff suppressed because it is too large Load Diff

9
vnet/vnet/lisp-cp/control.h
View File

@ -100,6 +100,12 @@ typedef struct
/* Number of src prefixes in a vni that use an interface */
uword * dp_if_refcount_by_vni;
/* Proxy ETR map index */
u32 pitr_map_index;
/* LISP PITR mode */
u8 lisp_pitr;
/* commodity */
ip4_main_t * im4;
ip6_main_t * im6;
@ -179,4 +185,7 @@ int
vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid,
ip_address_t * dlocs, u8 action, u8 is_add);
int
vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add);
#endif /* VNET_CONTROL_H_ */

10
vnet/vnet/lisp-cp/lisp_cp_messages.h
View File

@ -416,12 +416,12 @@ void mapping_record_init_hdr(mapping_record_hdr_t *h);
#define MAP_REC_EID(h) (u8 *)(h)+sizeof(mapping_record_hdr_t)
#define MAP_REC_VERSION(h) (h)->version_hi << 8 | (h)->version_low
typedef enum lisp_actions
typedef enum
{
ACT_NO_ACTION = 0,
ACT_NATIVE_FWD,
ACT_SEND_MREQ,
ACT_DROP
ACTION_NONE,
ACTION_NATIVELY_FORWARDED,
ACTION_SEND_MAP_REQUEST,
ACTION_DROP
} lisp_action_e;
typedef enum lisp_authoritative

31
vnet/vnet/lisp-gpe/lisp_gpe.c
View File

@ -195,7 +195,14 @@ add_del_negative_fwd_entry (lisp_gpe_main_t * lgm,
/* TODO check if route/next-hop for eid exists in fib and add
* more specific for the eid with the next-hop found */
case SEND_MAP_REQUEST:
/* TODO insert tunnel that always sends map-request */
/* insert tunnel that always sends map-request */
adj.rewrite_header.sw_if_index = ~0;
adj.lookup_next_index = (u32) (ip_prefix_version(dpref) == IP4) ?
LGPE_IP4_LOOKUP_NEXT_LISP_CP_LOOKUP:
LGPE_IP6_LOOKUP_NEXT_LISP_CP_LOOKUP;
/* add/delete route for prefix */
return ip_sd_fib_add_del_route (lgm, dpref, spref, a->table_id, &adj,
a->is_add);
case DROP:
/* for drop fwd entries, just add route, no need to add encap tunnel */
adj.lookup_next_index = (u32) (ip_prefix_version(dpref) == IP4 ?
@ -204,7 +211,6 @@ add_del_negative_fwd_entry (lisp_gpe_main_t * lgm,
/* add/delete route for prefix */
return ip_sd_fib_add_del_route (lgm, dpref, spref, a->table_id, &adj,
a->is_add);
break;
default:
return -1;
}
@ -546,6 +552,27 @@ VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = {
.function = lisp_gpe_enable_disable_command_fn,
};
static clib_error_t *
lisp_show_iface_command_fn (vlib_main_t * vm,
unformat_input_t * input,
vlib_cli_command_t * cmd)
{
lisp_gpe_main_t * lgm = &lisp_gpe_main;
hash_pair_t * p;
vlib_cli_output (vm, "%=10s%=12s", "vrf", "hw_if_index");
hash_foreach_pair (p, lgm->lisp_gpe_hw_if_index_by_table_id, ({
vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
}));
return 0;
}
VLIB_CLI_COMMAND (lisp_show_iface_command) = {
.path = "show lisp gpe interface",
.short_help = "show lisp gpe interface",
.function = lisp_show_iface_command_fn,
};
clib_error_t *
lisp_gpe_init (vlib_main_t *vm)
{

58
vpp-api-test/vat/api_format.c
View File

@ -2351,6 +2351,7 @@ _(lisp_add_del_map_resolver_reply) \
_(lisp_gpe_enable_disable_reply) \
_(lisp_gpe_add_del_iface_reply) \
_(lisp_enable_disable_reply) \
_(lisp_pitr_set_locator_set_reply) \
_(vxlan_gpe_add_del_tunnel_reply) \
_(af_packet_create_reply) \
_(af_packet_delete_reply) \
@ -2528,6 +2529,7 @@ _(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply) \
_(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply) \
_(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply) \
_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply) \
_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply) \
_(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply) \
_(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details) \
_(LISP_LOCAL_EID_TABLE_DETAILS, lisp_local_eid_table_details) \
@ -9998,6 +10000,58 @@ typedef CLIB_PACKED(struct
u8 addr[16]; /**< IPv4/IPv6 address */
}) rloc_t;
/**
* Enable/disable LISP proxy ITR.
*
* @param vam vpp API test context
* @return return code
*/
static int
api_lisp_pitr_set_locator_set (vat_main_t * vam)
{
f64 timeout = ~0;
u8 ls_name_set = 0;
unformat_input_t * input = vam->input;
vl_api_lisp_pitr_set_locator_set_t * mp;
u8 is_add = 1;
u8 * ls_name = 0;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "del"))
is_add = 0;
else if (unformat (input, "locator-set %s", &ls_name))
ls_name_set = 1;
else
{
errmsg ("parse error '%U'", format_unformat_error, input);
return -99;
}
}
if (!ls_name_set)
{
errmsg ("locator-set name not set!");
return -99;
}
M(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
mp->is_add = is_add;
clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
vec_free (ls_name);
/* send */
S;
/* wait for reply */
W;
/* notreached*/
return 0;
}
/**
* Add/del remote mapping from LISP control plane and updates
* forwarding entries in data-plane accordingly.
@ -11057,9 +11111,11 @@ _(lisp_add_del_map_resolver, "<ip4|6-addr> [del]") \
_(lisp_gpe_enable_disable, "enable|disable") \
_(lisp_enable_disable, "enable|disable") \
_(lisp_gpe_add_del_iface, "up|down") \
_(lisp_add_del_remote_mapping, "add|del vni <vni> deid <dest-eid> seid" \
_(lisp_add_del_remote_mapping, "add|del vni <vni> table-id <id> " \
"deid <dest-eid> seid" \
" <src-eid> rloc <locator> " \
"[rloc <loc> ... ]") \
_(lisp_pitr_set_locator_set, "locator-set <loc-set-name> | del") \
_(lisp_locator_set_dump, "") \
_(lisp_local_eid_table_dump, "") \
_(lisp_gpe_tunnel_dump, "") \

16
vpp/api/api.c
View File

@ -329,6 +329,7 @@ _(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable) \
_(LISP_ENABLE_DISABLE, lisp_enable_disable) \
_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface) \
_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping) \
_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set) \
_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \
_(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_dump) \
_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump) \
@ -4830,6 +4831,21 @@ vl_api_lisp_gpe_add_del_iface_t_handler(
REPLY_MACRO(VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
}
static void
vl_api_lisp_pitr_set_locator_set_t_handler(
vl_api_lisp_pitr_set_locator_set_t *mp)
{
vl_api_lisp_pitr_set_locator_set_reply_t *rmp;
int rv = 0;
u8 * ls_name = 0;
ls_name = format (0, "%s", mp->ls_name);
rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
vec_free (ls_name);
REPLY_MACRO(VL_API_LISP_PITR_SET_LOCATOR_SET_REPLY);
}
/** Used for transferring locators via VPP API */
typedef CLIB_PACKED(struct
{

22
vpp/api/vpe.api
View File

@ -2325,6 +2325,28 @@ define lisp_gpe_add_del_iface_reply {
i32 retval;
};
/** \brief configure or disable LISP PITR node
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param ls_name - locator set name
@param is_add - add locator set if non-zero, else disable pitr
*/
define lisp_pitr_set_locator_set {
u32 client_index;
u32 context;
u8 is_add;
u8 ls_name[64];
};
/** \brief Reply for lisp_pitr_set_locator_set
@param context - returned sender context, to match reply w/ request
@param retval - return code
*/
define lisp_pitr_set_locator_set_reply {
u32 context;
i32 retval;
};
/** \brief add or delete remote static mapping
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request