foreach_create_subif_bit;
#undef _
+ FINISH;
+}
+
+static void *vl_api_delete_subif_t_print
+ (vl_api_delete_subif_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: delete_subif ");
+ s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
FINISH;
}
s = format (s, "ip4-table %d ", ntohl (mp->ip4_table_index));
s = format (s, "ip6-table %d ", ntohl (mp->ip6_table_index));
s = format (s, "other-table %d ", ntohl (mp->other_table_index));
+ s = format (s, "is-input %d ", mp->is_input);
FINISH;
}
FINISH;
}
+static void *vl_api_cli_inband_t_print
+ (vl_api_cli_inband_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: cli_inband ");
+
+ FINISH;
+}
+
static void *vl_api_memclnt_create_t_print
(vl_api_memclnt_create_t * mp, void *handle)
{
FINISH;
}
+static void *vl_api_want_ip6_nd_events_t_print
+ (vl_api_want_ip6_nd_events_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: want_ip6_nd_events ");
+ s = format (s, "pid %d address %U ", mp->pid,
+ format_ip6_address, mp->address);
+ if (mp->enable_disable == 0)
+ s = format (s, "del ");
+
+ FINISH;
+}
+
static void *vl_api_input_acl_set_interface_t_print
(vl_api_input_acl_set_interface_t * mp, void *handle)
{
}
static void *vl_api_lisp_enable_disable_t_print
- (vl_api_lisp_enable_disable_t * mp, void * handle)
+ (vl_api_lisp_enable_disable_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_enable_disable %s",
- mp->is_en ? "enable" : "disable");
+ mp->is_en ? "enable" : "disable");
FINISH;
}
static void *vl_api_lisp_gpe_add_del_iface_t_print
- (vl_api_lisp_gpe_add_del_iface_t * mp, void * handle)
+ (vl_api_lisp_gpe_add_del_iface_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_gpe_add_del_iface ");
}
static void *vl_api_lisp_pitr_set_locator_set_t_print
- (vl_api_lisp_pitr_set_locator_set_t * mp, void * handle)
+ (vl_api_lisp_pitr_set_locator_set_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_pitr_set_locator_set ");
FINISH;
}
-static u8 * format_lisp_flat_eid (u8 * s, va_list * args)
+static u8 *
+format_lisp_flat_eid (u8 * s, va_list * args)
{
u32 type = va_arg (*args, u32);
- u8 * eid = va_arg (*args, u8 *);
+ u8 *eid = va_arg (*args, u8 *);
u32 eid_len = va_arg (*args, u32);
switch (type)
return 0;
}
-static u8 * format_lisp_eid_vat (u8 * s, va_list * args)
+static u8 *
+format_lisp_eid_vat (u8 * s, va_list * args)
{
u32 type = va_arg (*args, u32);
- u8 * eid = va_arg (*args, u8 *);
+ u8 *eid = va_arg (*args, u8 *);
u32 eid_len = va_arg (*args, u32);
- u8 * seid = va_arg (*args, u8 *);
+ u8 *seid = va_arg (*args, u8 *);
u32 seid_len = va_arg (*args, u32);
u32 is_src_dst = va_arg (*args, u32);
}
/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
- u8 is_ip4; /**< is locator an IPv4 address */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
- u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
+typedef CLIB_PACKED (struct
+ {
+ u8 is_ip4;
+ /**< is locator an IPv4 address */
+ u8 priority;
+ /**< locator priority */
+ u8 weight;
+ /**< locator weight */
+ u8 addr[16];
+ /**< IPv4/IPv6 address */
+ }) rloc_t;
-static u8 * format_rloc (u8 * s, va_list * args)
+static u8 *
+format_rloc (u8 * s, va_list * args)
{
- rloc_t * rloc = va_arg (*args, rloc_t *);
+ rloc_t *rloc = va_arg (*args, rloc_t *);
if (rloc->is_ip4)
s = format (s, "%U ", format_ip4_address, rloc->addr);
}
static void *vl_api_lisp_add_del_remote_mapping_t_print
- (vl_api_lisp_add_del_remote_mapping_t * mp, void * handle)
+ (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
u32 i, rloc_num = 0;
s = format (0, "SCRIPT: lisp_add_del_remote_mapping ");
s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
s = format (s, "deid %U ", format_lisp_eid_vat,
- mp->eid_type, mp->eid, mp->eid_len, mp->seid, mp->seid_len,
- mp->is_src_dst);
+ mp->eid_type, mp->eid, mp->eid_len, mp->seid, mp->seid_len,
+ mp->is_src_dst);
- rloc_num = mp->rloc_num;
+ rloc_num = clib_net_to_host_u32 (mp->rloc_num);
if (0 == rloc_num)
s = format (s, "action %d", mp->action);
else
{
- rloc_t * rloc = (rloc_t *) mp->rlocs;
+ rloc_t *rloc = (rloc_t *) mp->rlocs;
for (i = 0; i < rloc_num; i++)
- s = format (s, "%U ", format_rloc, &rloc[i]);
+ s = format (s, "%U ", format_rloc, &rloc[i]);
}
FINISH;
}
static void *vl_api_lisp_add_del_adjacency_t_print
- (vl_api_lisp_add_del_adjacency_t * mp, void * handle)
+ (vl_api_lisp_add_del_adjacency_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_add_del_adjacency ");
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
s = format (s, "deid %U seid %U ",
- format_lisp_flat_eid, mp->eid_type, mp->deid, mp->deid_len,
- format_lisp_flat_eid, mp->eid_type, mp->seid, mp->seid_len);
+ format_lisp_flat_eid, mp->eid_type, mp->deid, mp->deid_len,
+ format_lisp_flat_eid, mp->eid_type, mp->seid, mp->seid_len);
FINISH;
}
static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print
- (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void * handle)
+ (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_add_del_map_request_itr_rlocs ");
}
static void *vl_api_lisp_eid_table_add_del_map_t_print
- (vl_api_lisp_eid_table_add_del_map_t * mp, void * handle)
+ (vl_api_lisp_eid_table_add_del_map_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_eid_table_add_del_map ");
s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
s = format (s, "%s %d ",
- mp->is_l2 ? "bd_index" : "vrf",
- clib_net_to_host_u32 (mp->dp_table));
+ mp->is_l2 ? "bd_index" : "vrf",
+ clib_net_to_host_u32 (mp->dp_table));
FINISH;
}
static void *vl_api_lisp_add_del_local_eid_t_print
- (vl_api_lisp_add_del_local_eid_t * mp, void * handle)
+ (vl_api_lisp_add_del_local_eid_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_add_del_local_eid ");
s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type, mp->eid,
- mp->prefix_len);
+ mp->prefix_len);
s = format (s, "locator-set %s ", mp->locator_set_name);
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)
+ (vl_api_lisp_gpe_add_del_fwd_entry_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_gpe_add_del_fwd_entry TODO");
}
static void *vl_api_lisp_add_del_map_resolver_t_print
- (vl_api_lisp_add_del_map_resolver_t * mp, void * handle)
+ (vl_api_lisp_add_del_map_resolver_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_add_del_map_resolver ");
}
static void *vl_api_lisp_gpe_enable_disable_t_print
- (vl_api_lisp_gpe_enable_disable_t * mp, void * handle)
+ (vl_api_lisp_gpe_enable_disable_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_gpe_enable_disable ");
FINISH;
}
-typedef CLIB_PACKED(struct
-{
- u32 sw_if_index; /**< locator sw_if_index */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
-}) ls_locator_t;
+typedef CLIB_PACKED (struct
+ {
+ u32 sw_if_index;
+ /**< locator sw_if_index */
+ u8 priority;
+ /**< locator priority */
+ u8 weight;
+ /**< locator weight */
+ }) ls_locator_t;
static u8 *
format_locator (u8 * s, va_list * args)
{
- ls_locator_t * l = va_arg (*args, ls_locator_t *);
+ ls_locator_t *l = va_arg (*args, ls_locator_t *);
return format (s, "sw_if_index %d p %d w %d",
- l->sw_if_index, l->priority, l->weight);
+ l->sw_if_index, l->priority, l->weight);
}
static void *vl_api_lisp_add_del_locator_set_t_print
- (vl_api_lisp_add_del_locator_set_t * mp, void * handle)
+ (vl_api_lisp_add_del_locator_set_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
u32 loc_num = 0, i;
- ls_locator_t * locs;
+ ls_locator_t *locs;
s = format (0, "SCRIPT: lisp_add_del_locator_set ");
s = format (s, "locator-set %s ", mp->locator_set_name);
- loc_num = mp->locator_num;
+ loc_num = clib_net_to_host_u32 (mp->locator_num);
locs = (ls_locator_t *) mp->locators;
for (i = 0; i < loc_num; i++)
}
static void *vl_api_lisp_add_del_locator_t_print
- (vl_api_lisp_add_del_locator_t * mp, void * handle)
+ (vl_api_lisp_add_del_locator_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_add_del_locator ");
}
static void *vl_api_lisp_locator_set_dump_t_print
- (vl_api_lisp_locator_set_dump_t * mp, void * handle)
+ (vl_api_lisp_locator_set_dump_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_locator_set_dump ");
}
static void *vl_api_lisp_eid_table_dump_t_print
- (vl_api_lisp_eid_table_dump_t * mp, void * handle)
+ (vl_api_lisp_eid_table_dump_t * mp, void *handle)
{
- u8 * s;
+ u8 *s;
s = format (0, "SCRIPT: lisp_eid_table_dump ");
{
s = format (s, "vni %d ", clib_net_to_host_u32 (mp->vni));
s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type,
- mp->eid, mp->prefix_length);
+ mp->eid, mp->prefix_length);
switch (mp->filter)
- {
- case 1:
- s = format (s, "local ");
- break;
- case 2:
- s = format (s, "remote ");
- break;
- }
+ {
+ case 1:
+ s = format (s, "local ");
+ break;
+ case 2:
+ s = format (s, "remote ");
+ break;
+ }
}
FINISH;
}
+static void *vl_api_lisp_eid_table_map_dump_t_print
+ (vl_api_lisp_eid_table_map_dump_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: lisp_eid_table_map_dump ");
+
+ if (mp->is_l2)
+ s = format (s, "l2");
+ else
+ s = format (s, "l3");
+
+ FINISH;
+}
+
+static void *vl_api_ipsec_gre_add_del_tunnel_t_print
+ (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel ");
+
+ s = format (s, "dst %U ", format_ip4_address,
+ (ip4_address_t *) & (mp->dst_address));
+
+ s = format (s, "src %U ", format_ip4_address,
+ (ip4_address_t *) & (mp->src_address));
+
+ s = format (s, "local_sa %d ", ntohl (mp->local_sa_id));
+
+ s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id));
+
+ if (mp->is_add == 0)
+ s = format (s, "del ");
+
+ FINISH;
+}
+
+static void *vl_api_ipsec_gre_tunnel_dump_t_print
+ (vl_api_ipsec_gre_tunnel_dump_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: ipsec_gre_tunnel_dump ");
+
+ if (mp->sw_if_index != ~0)
+ s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+ FINISH;
+}
+
#define foreach_custom_print_no_arg_function \
-_(lisp_eid_table_map_dump) \
+_(lisp_eid_table_vni_dump) \
_(lisp_map_resolver_dump) \
_(lisp_gpe_tunnel_dump)
}
foreach_custom_print_no_arg_function
#undef _
-
#define foreach_custom_print_function \
_(CREATE_LOOPBACK, create_loopback) \
_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \
_(CONTROL_PING, control_ping) \
_(WANT_INTERFACE_EVENTS, want_interface_events) \
_(CLI_REQUEST, cli_request) \
+_(CLI_INBAND, cli_inband) \
_(MEMCLNT_CREATE, memclnt_create) \
_(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump) \
_(SHOW_VERSION, show_version) \
_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump) \
_(INTERFACE_NAME_RENUMBER, interface_name_renumber) \
_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events) \
+_(WANT_IP6_ND_EVENTS, want_ip6_nd_events) \
_(INPUT_ACL_SET_INTERFACE, input_acl_set_interface) \
_(IP_ADDRESS_DUMP, ip_address_dump) \
_(IP_DUMP, ip_dump) \
_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator) \
_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump) \
_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump) \
+_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump) \
_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump) \
_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump) \
-_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump)
-
-
-void
+_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \
+_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \
+_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel) \
+_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump) \
+_(DELETE_SUBIF, delete_subif)
+ void
vl_msg_api_custom_dump_configure (api_main_t * am)
{
#define _(n,f) am->msg_print_handlers[VL_API_##n] \
Code Review / vpp.git / blobdiff