#include <vlibmemory/api.h>
#include <vnet/lisp-cp/lisp_types.h>
#include <vnet/qos/qos_types.h>
-#include <vpp/stats/stats.h>
#include <vpp/oam/oam.h>
#include <vnet/ethernet/ethernet.h>
FINISH;
}
+static void *vl_api_sw_interface_rx_placement_dump_t_print
+ (vl_api_sw_interface_rx_placement_dump_t * mp, void *handle)
+{
+ u8 *s;
+ u32 sw_if_index = ntohl (mp->sw_if_index);
+
+ s = format (0, "SCRIPT: sw_interface_rx_placement_dump ");
+
+ if (sw_if_index != ~0)
+ s = format (s, "sw_if_index %d ", sw_if_index);
+
+ FINISH;
+}
+
static void *vl_api_sw_interface_event_t_print
(vl_api_sw_interface_event_t * mp, void *handle)
{
if (mp->enable)
{
- s = format (s, "bd_id %d shg %d %senable ", ntohl (mp->bd_id),
- mp->shg, ((mp->bvi) ? "bvi " : " "));
+ s = format (s, "bd_id %d shg %d ", ntohl (mp->bd_id), mp->shg);
+ if (L2_API_PORT_TYPE_BVI == ntohl (mp->port_type))
+ s = format (s, "bvi ");
+ if (L2_API_PORT_TYPE_UU_FWD == ntohl (mp->port_type))
+ s = format (s, "uu-fwd ");
+ s = format (s, "enable");
}
else
s = format (s, "disable ");
(vl_api_bridge_flags_t * mp, void *handle)
{
u8 *s;
- u32 flags = ntohl (mp->feature_bitmap);
+ u32 flags = ntohl (mp->flags);
s = format (0, "SCRIPT: bridge_flags ");
s = format (s, "bd_id %d ", ntohl (mp->bd_id));
- if (flags & L2_LEARN)
+ if (flags & BRIDGE_API_FLAG_LEARN)
s = format (s, "learn ");
- if (flags & L2_FWD)
+ if (flags & BRIDGE_API_FLAG_FWD)
s = format (s, "forward ");
- if (flags & L2_FLOOD)
+ if (flags & BRIDGE_API_FLAG_FLOOD)
s = format (s, "flood ");
- if (flags & L2_UU_FLOOD)
+ if (flags & BRIDGE_API_FLAG_UU_FLOOD)
s = format (s, "uu-flood ");
- if (flags & L2_ARP_TERM)
+ if (flags & BRIDGE_API_FLAG_ARP_TERM)
s = format (s, "arp-term ");
if (mp->is_set == 0)
if (mp->next_hop_n_out_labels)
{
- for (u8 i = 0; i < mp->next_hop_n_out_labels; i++)
+ u8 i;
+ for (i = 0; i < mp->next_hop_n_out_labels; i++)
{
s = format (s, "out-label %d ",
ntohl (mp->next_hop_out_label_stack[i].label));
if (mp->mr_next_hop_n_out_labels)
{
- for (u8 i = 0; i < mp->mr_next_hop_n_out_labels; i++)
+ u8 i;
+ for (i = 0; i < mp->mr_next_hop_n_out_labels; i++)
{
s = format (s, "out-label %d ",
ntohl (mp->mr_next_hop_out_label_stack[i].label));
s = format (0, "SCRIPT: mpls_tunnel_add_del ");
- if (mp->mt_next_hop_sw_if_index)
- s = format (s, "sw_if_index %d ", ntohl (mp->mt_next_hop_sw_if_index));
+ if (mp->mt_is_add == 0)
+ s = format (s, "del sw_if_index %d ", ntohl (mp->mt_sw_if_index));
- if (mp->mt_next_hop_proto_is_ip4)
- s = format (s, "%U ", format_ip4_address, mp->mt_next_hop);
+ mpls_label_t label = ntohl (mp->mt_next_hop_via_label);
+ if (label != MPLS_LABEL_INVALID)
+ s = format (s, "via-label %d ", label);
+ else if (mp->mt_next_hop_proto_is_ip4)
+ s = format (s, "via %U ", format_ip4_address, mp->mt_next_hop);
else
- s = format (s, "%U ", format_ip6_address, mp->mt_next_hop);
+ s = format (s, "via %U ", format_ip6_address, mp->mt_next_hop);
+
+ if (mp->mt_next_hop_sw_if_index != ~0)
+ s = format (s, "sw_if_index %d ", ntohl (mp->mt_next_hop_sw_if_index));
+ else if (mp->mt_next_hop_table_id)
+ s = format (s, "next-hop-table %d ", ntohl (mp->mt_next_hop_table_id));
if (mp->mt_l2_only)
s = format (s, "l2-only ");
- if (mp->mt_is_add == 0)
- s = format (s, "del ");
+ if (mp->mt_next_hop_n_out_labels)
+ {
+ u8 i;
+ for (i = 0; i < mp->mt_next_hop_n_out_labels; i++)
+ {
+ s = format (s, "out-label %d ",
+ ntohl (mp->mt_next_hop_out_label_stack[i].label));
+ }
+ }
FINISH;
}
if (mp->n_segments)
{
- for (int i = 0; i < mp->n_segments; i++)
+ int i;
+ for (i = 0; i < mp->n_segments; i++)
s = format (s, "next %d ", ntohl (mp->segments[i]));
}
FINISH;
}
+static void *vl_api_show_threads_t_print
+ (vl_api_show_threads_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: show_threads ");
+
+ FINISH;
+}
+
static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
(vl_api_vxlan_gpe_add_del_tunnel_t * mp, void *handle)
{
s = format (0, "SCRIPT: mpls_tunnel_dump ");
- s = format (s, "tunnel_index %d ", ntohl (mp->tunnel_index));
+ s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
FINISH;
}