}
static void
-api_lisp_gpe_fwd_entry_net_to_host (vl_api_lisp_gpe_fwd_entry_t * e)
+api_gpe_fwd_entry_net_to_host (vl_api_gpe_fwd_entry_t * e)
{
e->dp_table = clib_net_to_host_u32 (e->dp_table);
e->fwd_entry_index = clib_net_to_host_u32 (e->fwd_entry_index);
}
static void
- lisp_gpe_fwd_entries_get_reply_t_net_to_host
- (vl_api_lisp_gpe_fwd_entries_get_reply_t * mp)
+ gpe_fwd_entries_get_reply_t_net_to_host
+ (vl_api_gpe_fwd_entries_get_reply_t * mp)
{
u32 i;
mp->count = clib_net_to_host_u32 (mp->count);
for (i = 0; i < mp->count; i++)
{
- api_lisp_gpe_fwd_entry_net_to_host (&mp->entries[i]);
+ api_gpe_fwd_entry_net_to_host (&mp->entries[i]);
}
}
static void
- vl_api_lisp_gpe_fwd_entry_path_details_t_handler
- (vl_api_lisp_gpe_fwd_entry_path_details_t * mp)
+ vl_api_gpe_fwd_entry_path_details_t_handler
+ (vl_api_gpe_fwd_entry_path_details_t * mp)
{
vat_main_t *vam = &vat_main;
u8 *(*format_ip_address_fcn) (u8 *, va_list *) = 0;
}
static void
-lisp_fill_locator_node (vat_json_node_t * n, vl_api_lisp_gpe_locator_t * loc)
+lisp_fill_locator_node (vat_json_node_t * n, vl_api_gpe_locator_t * loc)
{
struct in6_addr ip6;
struct in_addr ip4;
}
static void
- vl_api_lisp_gpe_fwd_entry_path_details_t_handler_json
- (vl_api_lisp_gpe_fwd_entry_path_details_t * mp)
+ vl_api_gpe_fwd_entry_path_details_t_handler_json
+ (vl_api_gpe_fwd_entry_path_details_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
}
static void
- vl_api_lisp_gpe_fwd_entries_get_reply_t_handler
- (vl_api_lisp_gpe_fwd_entries_get_reply_t * mp)
+ vl_api_gpe_fwd_entries_get_reply_t_handler
+ (vl_api_gpe_fwd_entries_get_reply_t * mp)
{
vat_main_t *vam = &vat_main;
u32 i;
int retval = clib_net_to_host_u32 (mp->retval);
- vl_api_lisp_gpe_fwd_entry_t *e;
+ vl_api_gpe_fwd_entry_t *e;
if (retval)
goto end;
- lisp_gpe_fwd_entries_get_reply_t_net_to_host (mp);
+ gpe_fwd_entries_get_reply_t_net_to_host (mp);
for (i = 0; i < mp->count; i++)
{
}
static void
- vl_api_lisp_gpe_fwd_entries_get_reply_t_handler_json
- (vl_api_lisp_gpe_fwd_entries_get_reply_t * mp)
+ vl_api_gpe_fwd_entries_get_reply_t_handler_json
+ (vl_api_gpe_fwd_entries_get_reply_t * mp)
{
u8 *s = 0;
vat_main_t *vam = &vat_main;
vat_json_node_t *e = 0, root;
u32 i;
int retval = clib_net_to_host_u32 (mp->retval);
- vl_api_lisp_gpe_fwd_entry_t *fwd;
+ vl_api_gpe_fwd_entry_t *fwd;
if (retval)
goto end;
- lisp_gpe_fwd_entries_get_reply_t_net_to_host (mp);
+ gpe_fwd_entries_get_reply_t_net_to_host (mp);
vat_json_init_array (&root);
for (i = 0; i < mp->count; i++)
_(lisp_add_del_local_eid_reply) \
_(lisp_add_del_remote_mapping_reply) \
_(lisp_add_del_adjacency_reply) \
-_(lisp_gpe_add_del_fwd_entry_reply) \
+_(gpe_add_del_fwd_entry_reply) \
_(lisp_add_del_map_resolver_reply) \
_(lisp_add_del_map_server_reply) \
-_(lisp_gpe_enable_disable_reply) \
-_(lisp_gpe_add_del_iface_reply) \
+_(gpe_enable_disable_reply) \
+_(gpe_add_del_iface_reply) \
_(lisp_enable_disable_reply) \
_(lisp_rloc_probe_enable_disable_reply) \
_(lisp_map_register_enable_disable_reply) \
_(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply) \
_(LISP_ADD_DEL_REMOTE_MAPPING_REPLY, lisp_add_del_remote_mapping_reply) \
_(LISP_ADD_DEL_ADJACENCY_REPLY, lisp_add_del_adjacency_reply) \
-_(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply) \
+_(GPE_ADD_DEL_FWD_ENTRY_REPLY, gpe_add_del_fwd_entry_reply) \
_(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply) \
_(LISP_ADD_DEL_MAP_SERVER_REPLY, lisp_add_del_map_server_reply) \
-_(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply) \
+_(GPE_ENABLE_DISABLE_REPLY, gpe_enable_disable_reply) \
_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply) \
_(LISP_MAP_REGISTER_ENABLE_DISABLE_REPLY, \
lisp_map_register_enable_disable_reply) \
_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply) \
_(LISP_MAP_REQUEST_MODE_REPLY, lisp_map_request_mode_reply) \
_(LISP_EID_TABLE_ADD_DEL_MAP_REPLY, lisp_eid_table_add_del_map_reply) \
-_(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply) \
+_(GPE_ADD_DEL_IFACE_REPLY, gpe_add_del_iface_reply) \
_(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details) \
_(LISP_LOCATOR_DETAILS, lisp_locator_details) \
_(LISP_EID_TABLE_DETAILS, lisp_eid_table_details) \
_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details) \
_(LISP_MAP_SERVER_DETAILS, lisp_map_server_details) \
_(LISP_ADJACENCIES_GET_REPLY, lisp_adjacencies_get_reply) \
-_(LISP_GPE_FWD_ENTRIES_GET_REPLY, lisp_gpe_fwd_entries_get_reply) \
-_(LISP_GPE_FWD_ENTRY_PATH_DETAILS, \
- lisp_gpe_fwd_entry_path_details) \
+_(GPE_FWD_ENTRIES_GET_REPLY, gpe_fwd_entries_get_reply) \
+_(GPE_FWD_ENTRY_PATH_DETAILS, \
+ gpe_fwd_entry_path_details) \
_(SHOW_LISP_STATUS_REPLY, show_lisp_status_reply) \
_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \
lisp_add_del_map_request_itr_rlocs_reply) \
{
u32 dp_table = 0, vni = 0;;
unformat_input_t *input = vam->input;
- vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
+ vl_api_gpe_add_del_fwd_entry_t *mp;
u8 is_add = 1;
lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid;
lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid;
u32 action = ~0, w;
ip4_address_t rmt_rloc4, lcl_rloc4;
ip6_address_t rmt_rloc6, lcl_rloc6;
- vl_api_lisp_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc =
- 0;
+ vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
int ret;
memset (&rloc, 0, sizeof (rloc));
}
/* Construct the API message */
- M2 (LISP_GPE_ADD_DEL_FWD_ENTRY, mp,
- sizeof (vl_api_lisp_gpe_locator_t) * vec_len (rmt_locs) * 2);
+ M2 (GPE_ADD_DEL_FWD_ENTRY, mp,
+ sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs) * 2);
mp->is_add = is_add;
lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
{
mp->loc_num = clib_host_to_net_u32 (vec_len (rmt_locs) * 2);
clib_memcpy (mp->locs, lcl_locs,
- (sizeof (vl_api_lisp_gpe_locator_t) * vec_len (lcl_locs)));
+ (sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs)));
- u32 offset = sizeof (vl_api_lisp_gpe_locator_t) * vec_len (lcl_locs);
+ u32 offset = sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs);
clib_memcpy (((u8 *) mp->locs) + offset, rmt_locs,
- (sizeof (vl_api_lisp_gpe_locator_t) * vec_len (rmt_locs)));
+ (sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs)));
}
vec_free (lcl_locs);
vec_free (rmt_locs);
api_lisp_gpe_enable_disable (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_lisp_gpe_enable_disable_t *mp;
+ vl_api_gpe_enable_disable_t *mp;
u8 is_set = 0;
u8 is_en = 1;
int ret;
}
/* Construct the API message */
- M (LISP_GPE_ENABLE_DISABLE, mp);
+ M (GPE_ENABLE_DISABLE, mp);
mp->is_en = is_en;
api_lisp_gpe_add_del_iface (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_lisp_gpe_add_del_iface_t *mp;
+ vl_api_gpe_add_del_iface_t *mp;
u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0;
u32 dp_table = 0, vni = 0;
int ret;
}
/* Construct the API message */
- M (LISP_GPE_ADD_DEL_IFACE, mp);
+ M (GPE_ADD_DEL_IFACE, mp);
mp->is_add = is_add;
mp->dp_table = dp_table;
api_lisp_gpe_fwd_entries_get (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_lisp_gpe_fwd_entries_get_t *mp;
+ vl_api_gpe_fwd_entries_get_t *mp;
u8 vni_set = 0;
u32 vni = ~0;
int ret;
"leid", "reid");
}
- M (LISP_GPE_FWD_ENTRIES_GET, mp);
+ M (GPE_FWD_ENTRIES_GET, mp);
mp->vni = clib_host_to_net_u32 (vni);
/* send it... */
return ret;
}
-#define vl_api_lisp_gpe_fwd_entries_get_reply_t_endian vl_noop_handler
-#define vl_api_lisp_gpe_fwd_entries_get_reply_t_print vl_noop_handler
-#define vl_api_lisp_gpe_fwd_entry_path_details_t_endian vl_noop_handler
-#define vl_api_lisp_gpe_fwd_entry_path_details_t_print vl_noop_handler
+#define vl_api_gpe_fwd_entries_get_reply_t_endian vl_noop_handler
+#define vl_api_gpe_fwd_entries_get_reply_t_print vl_noop_handler
+#define vl_api_gpe_fwd_entry_path_details_t_endian vl_noop_handler
+#define vl_api_gpe_fwd_entry_path_details_t_print vl_noop_handler
static int
api_lisp_adjacencies_get (vat_main_t * vam)
static int
api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam)
{
- vl_api_lisp_gpe_fwd_entry_path_dump_t *mp;
+ vl_api_gpe_fwd_entry_path_dump_t *mp;
vl_api_control_ping_t *mp_ping;
unformat_input_t *i = vam->input;
u32 fwd_entry_index = ~0;
print (vam->ofp, "first line");
}
- M (LISP_GPE_FWD_ENTRY_PATH_DUMP, mp);
+ M (GPE_FWD_ENTRY_PATH_DUMP, mp);
/* send it... */
S (mp);
"<ipv4|ipv6>/<prefix> | <L2 address> " \
"locator-set <locator_name> [del]" \
"[key-id sha1|sha256 secret-key <secret-key>]") \
-_(lisp_gpe_add_del_fwd_entry, "reid <eid> [leid <eid>] vni <vni>" \
- "vrf/bd <dp_table> loc-pair <lcl_loc> <rmt_loc> w <weight>... [del]") \
_(lisp_add_del_map_resolver, "<ip4|6-addr> [del]") \
_(lisp_add_del_map_server, "<ip4|6-addr> [del]") \
-_(lisp_gpe_enable_disable, "enable|disable") \
_(lisp_enable_disable, "enable|disable") \
_(lisp_map_register_enable_disable, "enable|disable") \
_(lisp_rloc_probe_enable_disable, "enable|disable") \
-_(lisp_gpe_add_del_iface, "up|down") \
_(lisp_add_del_remote_mapping, "add|del vni <vni> eid <dest-eid> " \
"[seid <seid>] " \
"rloc <locator> p <prio> " \
_(lisp_adjacencies_get, "vni <vni>") \
_(lisp_gpe_fwd_entries_get, "vni <vni>") \
_(lisp_gpe_fwd_entry_path_dump, "index <fwd_entry_index>") \
+_(lisp_gpe_add_del_iface, "up|down") \
+_(lisp_gpe_enable_disable, "enable|disable") \
+_(lisp_gpe_add_del_fwd_entry, "reid <eid> [leid <eid>] vni <vni>" \
+ "vrf/bd <dp_table> loc-pair <lcl_loc> <rmt_loc> w <weight>... [del]") \
_(show_lisp_rloc_probe_state, "") \
_(show_lisp_map_register_state, "") \
_(show_lisp_status, "") \
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (add_del_lisp_gpe_iface_command, static) = {
- .path = "lisp gpe iface",
- .short_help = "lisp gpe iface add/del vni <vni> vrf <vrf>",
+ .path = "gpe iface",
+ .short_help = "gpe iface add/del vni <vni> vrf <vrf>",
.function = lisp_gpe_add_del_iface_command_fn,
};
/* *INDENT-ON* */
* limitations under the License.
*/
-/** \brief LISP locator structure
+/** \brief GPE locator structure
@param is_ip4 - whether addr is IPv4 or v6
@param weight - locator weight
@param addr - IPv4/6 address
*/
-typeonly manual_print manual_endian define lisp_gpe_locator
+typeonly manual_print manual_endian define gpe_locator
{
u8 is_ip4;
u8 weight;
u8 addr[16];
};
-/** \brief add or delete lisp gpe tunnel
+/** \brief add or delete GPE tunnel
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param is_add - add address if non-zero, else delete
@param loc_num - number of locators
@param locs - array of remote locators
*/
-manual_print manual_endian define lisp_gpe_add_del_fwd_entry
+manual_print manual_endian define gpe_add_del_fwd_entry
{
u32 client_index;
u32 context;
u32 dp_table;
u8 action;
u32 loc_num;
- vl_api_lisp_gpe_locator_t locs[loc_num];
+ vl_api_gpe_locator_t locs[loc_num];
};
/** \brief Reply for gpe_fwd_entry add/del
@param context - returned sender context, to match reply w/ request
@param retval - return code
*/
-define lisp_gpe_add_del_fwd_entry_reply
+define gpe_add_del_fwd_entry_reply
{
u32 context;
i32 retval;
};
-/** \brief enable or disable lisp-gpe protocol
+/** \brief enable or disable gpe protocol
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param is_en - enable protocol if non-zero, else disable
*/
-define lisp_gpe_enable_disable
+define gpe_enable_disable
{
u32 client_index;
u32 context;
@param context - returned sender context, to match reply w/ request
@param retval - return code
*/
-define lisp_gpe_enable_disable_reply
+define gpe_enable_disable_reply
{
u32 context;
i32 retval;
@param context - sender context, to match reply w/ request
@param is_add - add address if non-zero, else delete
*/
-define lisp_gpe_add_del_iface
+define gpe_add_del_iface
{
u32 client_index;
u32 context;
@param context - returned sender context, to match reply w/ request
@param retval - return code
*/
-define lisp_gpe_add_del_iface_reply
+define gpe_add_del_iface_reply
{
u32 context;
i32 retval;
};
-define lisp_gpe_fwd_entries_get
+define gpe_fwd_entries_get
{
u32 client_index;
u32 context;
u32 vni;
};
-typeonly manual_print manual_endian define lisp_gpe_fwd_entry
+typeonly manual_print manual_endian define gpe_fwd_entry
{
u32 fwd_entry_index;
u32 dp_table;
u8 reid[16];
};
-manual_print manual_endian define lisp_gpe_fwd_entries_get_reply
+manual_print manual_endian define gpe_fwd_entries_get_reply
{
u32 context;
i32 retval;
u32 count;
- vl_api_lisp_gpe_fwd_entry_t entries[count];
+ vl_api_gpe_fwd_entry_t entries[count];
};
-define lisp_gpe_fwd_entry_path_dump
+define gpe_fwd_entry_path_dump
{
u32 client_index;
u32 context;
u32 fwd_entry_index;
};
-manual_endian manual_print define lisp_gpe_fwd_entry_path_details
+manual_endian manual_print define gpe_fwd_entry_path_details
{
u32 client_index;
u32 context;
- vl_api_lisp_gpe_locator_t lcl_loc;
- vl_api_lisp_gpe_locator_t rmt_loc;
+ vl_api_gpe_locator_t lcl_loc;
+ vl_api_gpe_locator_t rmt_loc;
};
/*
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_gpe_add_del_fwd_entry_command, static) = {
- .path = "lisp gpe entry",
- .short_help = "lisp gpe entry add/del vni <vni> vrf/bd <id> [leid <leid>]"
+ .path = "gpe entry",
+ .short_help = "gpe entry add/del vni <vni> vrf/bd <id> [leid <leid>]"
"reid <reid> [loc-pair <lloc> <rloc> w <weight>] "
"[negative action <action>]",
.function = lisp_gpe_add_del_fwd_entry_command_fn,
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (enable_disable_lisp_gpe_command, static) = {
- .path = "lisp gpe",
- .short_help = "lisp gpe [enable|disable]",
+ .path = "gpe",
+ .short_help = "gpe [enable|disable]",
.function = lisp_gpe_enable_disable_command_fn,
};
/* *INDENT-ON* */
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_show_iface_command) = {
- .path = "show lisp gpe interface",
- .short_help = "show lisp gpe interface",
+ .path = "show gpe interface",
+ .short_help = "show gpe interface",
.function = lisp_show_iface_command_fn,
};
/* *INDENT-ON* */
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) =
{
- .path = "show lisp gpe adjacency",
+ .path = "show gpe adjacency",
.function = lisp_gpe_adjacency_show,
};
/* *INDENT-ON* */
#include <vnet/vnet_msg_enum.h>
-#define vl_api_lisp_gpe_locator_pair_t_endian vl_noop_handler
-#define vl_api_lisp_gpe_locator_pair_t_print vl_noop_handler
-#define vl_api_lisp_gpe_add_del_fwd_entry_t_endian vl_noop_handler
-#define vl_api_lisp_gpe_add_del_fwd_entry_t_print vl_noop_handler
+#define vl_api_gpe_locator_pair_t_endian vl_noop_handler
+#define vl_api_gpe_locator_pair_t_print vl_noop_handler
+#define vl_api_gpe_add_del_fwd_entry_t_endian vl_noop_handler
+#define vl_api_gpe_add_del_fwd_entry_t_print vl_noop_handler
#define vl_typedefs /* define message structures */
#include <vnet/vnet_all_api_h.h>
#include <vlibapi/api_helper_macros.h>
#define foreach_vpe_api_msg \
-_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry) \
-_(LISP_GPE_FWD_ENTRIES_GET, lisp_gpe_fwd_entries_get) \
-_(LISP_GPE_FWD_ENTRY_PATH_DUMP, lisp_gpe_fwd_entry_path_dump) \
-_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable) \
-_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface)
+_(GPE_ADD_DEL_FWD_ENTRY, gpe_add_del_fwd_entry) \
+_(GPE_FWD_ENTRIES_GET, gpe_fwd_entries_get) \
+_(GPE_FWD_ENTRY_PATH_DUMP, gpe_fwd_entry_path_dump) \
+_(GPE_ENABLE_DISABLE, gpe_enable_disable) \
+_(GPE_ADD_DEL_IFACE, gpe_add_del_iface)
static locator_pair_t *
-unformat_lisp_loc_pairs (void *locs, u32 rloc_num)
+unformat_gpe_loc_pairs (void *locs, u32 rloc_num)
{
u32 i;
locator_pair_t *pairs = 0, pair, *p;
- vl_api_lisp_gpe_locator_t *r;
+ vl_api_gpe_locator_t *r;
for (i = 0; i < rloc_num; i++)
{
/* local locator */
- r = &((vl_api_lisp_gpe_locator_t *) locs)[i];
+ r = &((vl_api_gpe_locator_t *) locs)[i];
memset (&pair, 0, sizeof (pair));
ip_address_set (&pair.lcl_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
for (i = rloc_num; i < rloc_num * 2; i++)
{
/* remote locators */
- r = &((vl_api_lisp_gpe_locator_t *) locs)[i];
+ r = &((vl_api_gpe_locator_t *) locs)[i];
p = &pairs[i - rloc_num];
ip_address_set (&p->rmt_loc, &r->addr, r->is_ip4 ? IP4 : IP6);
}
}
static void
- lisp_gpe_fwd_entry_path_dump_t_net_to_host
- (vl_api_lisp_gpe_fwd_entry_path_dump_t * mp)
+ gpe_fwd_entry_path_dump_t_net_to_host
+ (vl_api_gpe_fwd_entry_path_dump_t * mp)
{
mp->fwd_entry_index = clib_net_to_host_u32 (mp->fwd_entry_index);
}
static void
-lisp_api_set_locator (vl_api_lisp_gpe_locator_t * loc,
+lisp_api_set_locator (vl_api_gpe_locator_t * loc,
const ip_address_t * addr, u8 weight)
{
loc->weight = weight;
}
static void
- vl_api_lisp_gpe_fwd_entry_path_dump_t_handler
- (vl_api_lisp_gpe_fwd_entry_path_dump_t * mp)
+ vl_api_gpe_fwd_entry_path_dump_t_handler
+ (vl_api_gpe_fwd_entry_path_dump_t * mp)
{
lisp_fwd_path_t *path;
- vl_api_lisp_gpe_fwd_entry_path_details_t *rmp = NULL;
+ vl_api_gpe_fwd_entry_path_details_t *rmp = NULL;
lisp_gpe_main_t *lgm = &lisp_gpe_main;
unix_shared_memory_queue_t *q = NULL;
lisp_gpe_fwd_entry_t *lfe;
- lisp_gpe_fwd_entry_path_dump_t_net_to_host (mp);
+ gpe_fwd_entry_path_dump_t_net_to_host (mp);
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0)
const lisp_gpe_tunnel_t *lgt;
rmp->_vl_msg_id =
- clib_host_to_net_u16 (VL_API_LISP_GPE_FWD_ENTRY_PATH_DETAILS);
+ clib_host_to_net_u16 (VL_API_GPE_FWD_ENTRY_PATH_DETAILS);
const lisp_gpe_adjacency_t *ladj =
lisp_gpe_adjacency_get (path->lisp_adj);
}
static void
-lisp_gpe_fwd_entries_copy (vl_api_lisp_gpe_fwd_entry_t * dst,
- lisp_api_gpe_fwd_entry_t * src)
+gpe_fwd_entries_copy (vl_api_gpe_fwd_entry_t * dst,
+ lisp_api_gpe_fwd_entry_t * src)
{
lisp_api_gpe_fwd_entry_t *e;
u32 i = 0;
}
static void
- lisp_gpe_fwd_entries_get_t_net_to_host
- (vl_api_lisp_gpe_fwd_entries_get_t * mp)
+gpe_fwd_entries_get_t_net_to_host (vl_api_gpe_fwd_entries_get_t * mp)
{
mp->vni = clib_net_to_host_u32 (mp->vni);
}
static void
-lisp_gpe_entry_t_host_to_net (vl_api_lisp_gpe_fwd_entry_t * e)
+gpe_entry_t_host_to_net (vl_api_gpe_fwd_entry_t * e)
{
e->fwd_entry_index = clib_host_to_net_u32 (e->fwd_entry_index);
e->dp_table = clib_host_to_net_u32 (e->dp_table);
}
static void
- lisp_gpe_fwd_entries_get_reply_t_host_to_net
- (vl_api_lisp_gpe_fwd_entries_get_reply_t * mp)
+ gpe_fwd_entries_get_reply_t_host_to_net
+ (vl_api_gpe_fwd_entries_get_reply_t * mp)
{
u32 i;
- vl_api_lisp_gpe_fwd_entry_t *e;
+ vl_api_gpe_fwd_entry_t *e;
for (i = 0; i < mp->count; i++)
{
e = &mp->entries[i];
- lisp_gpe_entry_t_host_to_net (e);
+ gpe_entry_t_host_to_net (e);
}
mp->count = clib_host_to_net_u32 (mp->count);
}
static void
- vl_api_lisp_gpe_fwd_entries_get_t_handler
- (vl_api_lisp_gpe_fwd_entries_get_t * mp)
+vl_api_gpe_fwd_entries_get_t_handler (vl_api_gpe_fwd_entries_get_t * mp)
{
lisp_api_gpe_fwd_entry_t *e;
- vl_api_lisp_gpe_fwd_entries_get_reply_t *rmp = 0;
+ vl_api_gpe_fwd_entries_get_reply_t *rmp = 0;
u32 size = 0;
int rv = 0;
- lisp_gpe_fwd_entries_get_t_net_to_host (mp);
+ gpe_fwd_entries_get_t_net_to_host (mp);
e = vnet_lisp_gpe_fwd_entries_get_by_vni (mp->vni);
- size = vec_len (e) * sizeof (vl_api_lisp_gpe_fwd_entry_t);
+ size = vec_len (e) * sizeof (vl_api_gpe_fwd_entry_t);
/* *INDENT-OFF* */
- REPLY_MACRO4 (VL_API_LISP_GPE_FWD_ENTRIES_GET_REPLY, size,
+ REPLY_MACRO4 (VL_API_GPE_FWD_ENTRIES_GET_REPLY, size,
{
rmp->count = vec_len (e);
- lisp_gpe_fwd_entries_copy (rmp->entries, e);
- lisp_gpe_fwd_entries_get_reply_t_host_to_net (rmp);
+ gpe_fwd_entries_copy (rmp->entries, e);
+ gpe_fwd_entries_get_reply_t_host_to_net (rmp);
});
/* *INDENT-ON* */
}
static void
- lisp_gpe_add_del_fwd_entry_t_net_to_host
- (vl_api_lisp_gpe_add_del_fwd_entry_t * mp)
+gpe_add_del_fwd_entry_t_net_to_host (vl_api_gpe_add_del_fwd_entry_t * mp)
{
mp->vni = clib_net_to_host_u32 (mp->vni);
mp->dp_table = clib_net_to_host_u32 (mp->dp_table);
}
static void
- vl_api_lisp_gpe_add_del_fwd_entry_t_handler
- (vl_api_lisp_gpe_add_del_fwd_entry_t * mp)
+vl_api_gpe_add_del_fwd_entry_t_handler (vl_api_gpe_add_del_fwd_entry_t * mp)
{
- vl_api_lisp_gpe_add_del_fwd_entry_reply_t *rmp;
+ vl_api_gpe_add_del_fwd_entry_reply_t *rmp;
vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
locator_pair_t *pairs = 0;
int rv = 0;
- lisp_gpe_add_del_fwd_entry_t_net_to_host (mp);
+ gpe_add_del_fwd_entry_t_net_to_host (mp);
memset (a, 0, sizeof (a[0]));
rv = unformat_lisp_eid_api (&a->rmt_eid, mp->vni, mp->eid_type,
rv = -1;
goto send_reply;
}
- pairs = unformat_lisp_loc_pairs (mp->locs, mp->loc_num / 2);
+ pairs = unformat_gpe_loc_pairs (mp->locs, mp->loc_num / 2);
if (rv || 0 == pairs)
goto send_reply;
rv = vnet_lisp_gpe_add_del_fwd_entry (a, 0);
vec_free (pairs);
send_reply:
- REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY);
+ REPLY_MACRO (VL_API_GPE_ADD_DEL_FWD_ENTRY_REPLY);
}
static void
-vl_api_lisp_gpe_enable_disable_t_handler (vl_api_lisp_gpe_enable_disable_t *
- mp)
+vl_api_gpe_enable_disable_t_handler (vl_api_gpe_enable_disable_t * mp)
{
- vl_api_lisp_gpe_enable_disable_reply_t *rmp;
+ vl_api_gpe_enable_disable_reply_t *rmp;
int rv = 0;
vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
a->is_en = mp->is_en;
vnet_lisp_gpe_enable_disable (a);
- REPLY_MACRO (VL_API_LISP_GPE_ENABLE_DISABLE_REPLY);
+ REPLY_MACRO (VL_API_GPE_ENABLE_DISABLE_REPLY);
}
static void
-vl_api_lisp_gpe_add_del_iface_t_handler (vl_api_lisp_gpe_add_del_iface_t * mp)
+vl_api_gpe_add_del_iface_t_handler (vl_api_gpe_add_del_iface_t * mp)
{
- vl_api_lisp_gpe_add_del_iface_reply_t *rmp;
+ vl_api_gpe_add_del_iface_reply_t *rmp;
int rv = 0;
if (mp->is_l2)
lisp_gpe_tenant_l3_iface_unlock (mp->vni);
}
- REPLY_MACRO (VL_API_LISP_GPE_ADD_DEL_IFACE_REPLY);
+ REPLY_MACRO (VL_API_GPE_ADD_DEL_IFACE_REPLY);
}
/*
- * lisp_gpe_api_hookup
+ * gpe_api_hookup
* Add vpe's API message handlers to the table.
* vlib has alread mapped shared memory and
* added the client registration handlers.
}
static clib_error_t *
-lisp_gpe_api_hookup (vlib_main_t * vm)
+gpe_api_hookup (vlib_main_t * vm)
{
api_main_t *am = &api_main;
return 0;
}
-VLIB_API_INIT_FUNCTION (lisp_gpe_api_hookup);
+VLIB_API_INIT_FUNCTION (gpe_api_hookup);
/*
* fd.io coding-style-patch-verification: ON
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_gpe_fwd_entry_show_command, static) = {
- .path = "show lisp gpe entry",
- .short_help = "show lisp gpe entry vni <vni> vrf <vrf> [leid <leid>] reid <reid>",
+ .path = "show gpe entry",
+ .short_help = "show gpe entry vni <vni> vrf <vrf> [leid <leid>] reid <reid>",
.function = lisp_gpe_fwd_entry_show,
};
/* *INDENT-ON* */
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_gpe_sub_interface_command) = {
- .path = "show lisp gpe sub-interface",
- .short_help = "show lisp gpe sub-interface",
+ .path = "show gpe sub-interface",
+ .short_help = "show gpe sub-interface",
.function = lisp_gpe_sub_interface_show,
};
/* *INDENT-ON* */
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_gpe_tenant_command) = {
- .path = "show lisp gpe tenant",
- .short_help = "show lisp gpe tenant",
+ .path = "show gpe tenant",
+ .short_help = "show gpe tenant",
.function = lisp_gpe_tenant_show,
};
/* *INDENT-ON* */
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (show_lisp_gpe_tunnel_command, static) =
{
- .path = "show lisp gpe tunnel",
+ .path = "show gpe tunnel",
.function = show_lisp_gpe_tunnel_command_fn,
};
/* *INDENT-ON* */
FINISH;
}
-static void *vl_api_lisp_gpe_add_del_iface_t_print
- (vl_api_lisp_gpe_add_del_iface_t * mp, void *handle)
+static void *vl_api_gpe_add_del_iface_t_print
+ (vl_api_gpe_add_del_iface_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: lisp_gpe_add_del_iface ");
+ s = format (0, "SCRIPT: gpe_add_del_iface ");
s = format (s, "%s ", mp->is_add ? "up" : "down");
s = format (s, "vni %d ", mp->vni);
FINISH;
}
-static void *vl_api_lisp_gpe_add_del_fwd_entry_t_print
- (vl_api_lisp_gpe_add_del_fwd_entry_t * mp, void *handle)
+static void *vl_api_gpe_add_del_fwd_entry_t_print
+ (vl_api_gpe_add_del_fwd_entry_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: lisp_gpe_add_del_fwd_entry TODO");
+ s = format (0, "SCRIPT: gpe_add_del_fwd_entry TODO");
FINISH;
}
FINISH;
}
-static void *vl_api_lisp_gpe_enable_disable_t_print
- (vl_api_lisp_gpe_enable_disable_t * mp, void *handle)
+static void *vl_api_gpe_enable_disable_t_print
+ (vl_api_gpe_enable_disable_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: lisp_gpe_enable_disable ");
+ s = format (0, "SCRIPT: gpe_enable_disable ");
s = format (s, "%s ", mp->is_en ? "enable" : "disable");
_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, \
ip_source_and_port_range_check_interface_add_del) \
_(LISP_ENABLE_DISABLE, lisp_enable_disable) \
-_(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable) \
-_(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface) \
+_(GPE_ENABLE_DISABLE, gpe_enable_disable) \
+_(GPE_ADD_DEL_IFACE, gpe_add_del_iface) \
_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set) \
_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode) \
_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode) \
lisp_add_del_map_request_itr_rlocs) \
_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map) \
_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid) \
-_(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry) \
+_(GPE_ADD_DEL_FWD_ENTRY, gpe_add_del_fwd_entry) \
_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set) \
_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver) \
_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator) \
Code Review / vpp.git / commitdiff