#include <vnet/vnet.h>
#include <vnet/ip/ip.h>
-#include <vnet/ip/ip_neighbor.h>
+#include <vnet/ip-neighbor/ip_neighbor.h>
#include <vnet/ip/ip_types_api.h>
#include <vnet/fib/fib_api.h>
#include <vnet/unix/tuntap.h>
s = format (s, "host-ns %s ", mp->host_namespace);
if (mp->host_bridge_set)
s = format (s, "host-bridge %s ", mp->host_bridge);
- if (mp->host_ip4_addr_set)
+ if (mp->host_ip4_prefix_set)
s = format (s, "host-ip4-addr %U/%d ", format_ip4_address,
- mp->host_ip4_addr, mp->host_ip4_prefix_len);
- if (mp->host_ip6_addr_set)
+ mp->host_ip4_prefix.address, mp->host_ip4_prefix.len);
+ if (mp->host_ip6_prefix_set)
s = format (s, "host-ip6-addr %U/%d ", format_ip6_address,
- mp->host_ip6_addr, mp->host_ip6_prefix_len);
+ mp->host_ip6_prefix.address, mp->host_ip6_prefix.len);
if (mp->host_ip4_gw_set)
- s = format (s, "host-ip4-gw %U ", format_ip4_address, mp->host_ip4_addr);
+ s =
+ format (s, "host-ip4-gw %U ", format_ip4_address,
+ mp->host_ip4_prefix.address);
if (mp->host_ip6_gw_set)
- s = format (s, "host-ip6-gw %U ", format_ip6_address, mp->host_ip6_addr);
+ s =
+ format (s, "host-ip6-gw %U ", format_ip6_address,
+ mp->host_ip6_prefix.address);
+ if (mp->num_rx_queues)
+ s = format (s, "num_rx_queues %u ", mp->num_rx_queues);
if (mp->tx_ring_sz)
s = format (s, "tx-ring-size %u ", (mp->tx_ring_sz));
if (mp->rx_ring_sz)
if (mp->host_mtu_set)
s = format (s, "host-mtu-size %u ", (mp->host_mtu_size));
if ((mp->tap_flags) & 0x1)
- s = format (s, "gso-enabled");
+ s = format (s, "gso-enabled ");
+ if ((mp->tap_flags) & 0x2)
+ s = format (s, "csum-offload-enabled ");
+ if ((mp->tap_flags) & 0x4)
+ s = format (s, "persist ");
+ if ((mp->tap_flags) & 0x8)
+ s = format (s, "attach ");
+ if ((mp->tap_flags) & 0x16)
+ s = format (s, "tun ");
+ if ((mp->tap_flags) & 0x32)
+ s = format (s, "gro-coalesce-enabled ");
FINISH;
}
if (mp->features)
s = format (s, "features 0x%llx ", clib_net_to_host_u64 (mp->features));
if (mp->gso_enabled)
- s = format (s, "gso-enabled");
+ s = format (s, "gso-enabled ");
+ if (mp->checksum_offload_enabled)
+ s = format (s, "checksum_offload_enabled");
FINISH;
}
FINISH;
}
-static void *vl_api_proxy_arp_add_del_t_print
- (vl_api_proxy_arp_add_del_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: proxy_arp_add_del ");
-
- s = format (s, "%U - %U ",
- format_vl_api_ip4_address, mp->proxy.low,
- format_vl_api_ip4_address, mp->proxy.hi);
-
- s = format (s, "table %d ", (mp->proxy.table_id));
-
- if (mp->is_add == 0)
- s = format (s, "del ");
-
- FINISH;
-}
-
-static void *vl_api_proxy_arp_intfc_enable_disable_t_print
- (vl_api_proxy_arp_intfc_enable_disable_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: proxy_arp_intfc_enable_disable ");
-
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
-
- s = format (s, "enable %d ", mp->enable_disable);
-
- FINISH;
-}
-
static void *vl_api_mpls_tunnel_add_del_t_print
(vl_api_mpls_tunnel_add_del_t * mp, void *handle)
{
if (mp->weight != htonl ((u32) 1))
s = format (s, "%d ", (mp->weight));
- if (mp->type)
+ if (mp->is_spray)
s = format (s, "spray ");
if (mp->n_segments)
FINISH;
}
-static void *vl_api_ip_neighbor_add_del_t_print
- (vl_api_ip_neighbor_add_del_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: ip_neighbor_add_del ");
-
- s = format (s, "sw_if_index %d ", (mp->neighbor.sw_if_index));
-
- if (IP_API_NEIGHBOR_FLAG_STATIC & (mp->neighbor.flags))
- s = format (s, "is_static ");
-
- if (IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY & (mp->neighbor.flags))
- s = format (s, "is_no_fib_entry ");
-
- s = format (s, "mac %U ", format_vl_api_mac_address,
- &mp->neighbor.mac_address);
-
- s = format (s, "dst %U ", format_vl_api_address, &mp->neighbor.ip_address);
-
- if (mp->is_add == 0)
- s = format (s, "del ");
-
- FINISH;
-}
-
-
static void *vl_api_create_vlan_subif_t_print
(vl_api_create_vlan_subif_t * mp, void *handle)
{
}
static void *
-vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
+vl_api_ip_table_replace_begin_t_print (vl_api_ip_table_replace_begin_t * mp,
+ void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: reset_fib ");
+ s = format (0, "SCRIPT: ip_table_replace_begin ");
- if (mp->vrf_id)
- s = format (s, "vrf %d ", (mp->vrf_id));
+ s = format (s, "v%s-table %d ",
+ mp->table.is_ip6 ? "6" : "4", (mp->table.table_id));
- if (mp->is_ipv6 != 0)
- s = format (s, "ipv6 ");
+ FINISH;
+}
+
+static void *
+vl_api_ip_table_flush_t_print (vl_api_ip_table_flush_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: ip_table_flush ");
+
+ s = format (s, "v%s-table %d ",
+ mp->table.is_ip6 ? "6" : "4", (mp->table.table_id));
+
+ FINISH;
+}
+
+static void *
+vl_api_ip_table_replace_end_t_print (vl_api_ip_table_replace_end_t * mp,
+ void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: ip_table_replace_end ");
+
+ s = format (s, "v%s-table %d ",
+ mp->table.is_ip6 ? "6" : "4", (mp->table.table_id));
FINISH;
}
FINISH;
}
-static void *vl_api_sw_interface_ip6nd_ra_prefix_t_print
- (vl_api_sw_interface_ip6nd_ra_prefix_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: sw_interface_ip6nd_ra_prefix ");
-
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
-
- s = format (s, "%U ", format_vl_api_prefix, &mp->prefix);
-
- s = format (s, "val_life %d ", (mp->val_lifetime));
-
- s = format (s, "pref_life %d ", (mp->pref_lifetime));
-
- if (mp->use_default)
- s = format (s, "def ");
-
- if (mp->no_advertise)
- s = format (s, "noadv ");
-
- if (mp->off_link)
- s = format (s, "offl ");
-
- if (mp->no_autoconfig)
- s = format (s, "noauto ");
-
- if (mp->no_onlink)
- s = format (s, "nolink ");
-
- if (mp->is_no)
- s = format (s, "isno ");
-
- FINISH;
-}
-
-static void *vl_api_sw_interface_ip6nd_ra_config_t_print
- (vl_api_sw_interface_ip6nd_ra_config_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: sw_interface_ip6nd_ra_config ");
-
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
-
- s = format (s, "maxint %d ", (mp->max_interval));
-
- s = format (s, "minint %d ", (mp->min_interval));
-
- s = format (s, "life %d ", (mp->lifetime));
-
- s = format (s, "count %d ", (mp->initial_count));
-
- s = format (s, "interval %d ", (mp->initial_interval));
-
- if (mp->suppress)
- s = format (s, "suppress ");
-
- if (mp->managed)
- s = format (s, "managed ");
-
- if (mp->other)
- s = format (s, "other ");
-
- if (mp->ll_option)
- s = format (s, "ll ");
-
- if (mp->send_unicast)
- s = format (s, "send ");
-
- if (mp->cease)
- s = format (s, "cease ");
-
- if (mp->is_no)
- s = format (s, "isno ");
-
- if (mp->default_router)
- s = format (s, "def ");
-
- FINISH;
-}
-
-static void *vl_api_set_arp_neighbor_limit_t_print
- (vl_api_set_arp_neighbor_limit_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: set_arp_neighbor_limit ");
-
- s = format (s, "arp_nbr_limit %d ", (mp->arp_neighbor_limit));
-
- if (mp->is_ipv6 != 0)
- s = format (s, "ipv6 ");
-
- FINISH;
-}
static void *vl_api_l2_patch_add_del_t_print
(vl_api_l2_patch_add_del_t * mp, void *handle)
{
case SR_BEHAVIOR_END:
s = format (s, "Address: %U\nBehavior: End",
- format_ip6_address, (ip6_address_t *) mp->localsid.addr);
+ format_ip6_address, (ip6_address_t *) mp->localsid);
s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
break;
case SR_BEHAVIOR_X:
format (s,
"Address: %U\nBehavior: X (Endpoint with Layer-3 cross-connect)"
"\nIface: %U\nNext hop: %U", format_ip6_address,
- (ip6_address_t *) mp->localsid.addr,
+ (ip6_address_t *) mp->localsid,
format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
- format_ip6_address, (ip6_address_t *) mp->nh_addr6);
+ format_ip6_address, (ip6_address_t *) mp->nh_addr.un.ip6);
s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
break;
case SR_BEHAVIOR_DX4:
format (s,
"Address: %U\nBehavior: DX4 (Endpoint with decapsulation with IPv4 cross-connect)"
"\nIface: %U\nNext hop: %U", format_ip6_address,
- (ip6_address_t *) mp->localsid.addr,
+ (ip6_address_t *) mp->localsid,
format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
- format_ip4_address, (ip4_address_t *) mp->nh_addr4);
+ format_ip4_address, (ip4_address_t *) mp->nh_addr.un.ip4);
break;
case SR_BEHAVIOR_DX6:
s =
format (s,
"Address: %U\nBehavior: DX6 (Endpoint with decapsulation with IPv6 cross-connect)"
"\nIface: %UNext hop: %U", format_ip6_address,
- (ip6_address_t *) mp->localsid.addr,
+ (ip6_address_t *) mp->localsid,
format_vnet_sw_if_index_name, vnm, (mp->sw_if_index),
- format_ip6_address, (ip6_address_t *) mp->nh_addr6);
+ format_ip6_address, (ip6_address_t *) mp->nh_addr.un.ip6);
break;
case SR_BEHAVIOR_DX2:
s =
format (s,
"Address: %U\nBehavior: DX2 (Endpoint with decapulation and Layer-2 cross-connect)"
"\nIface: %U", format_ip6_address,
- (ip6_address_t *) mp->localsid.addr,
+ (ip6_address_t *) mp->localsid,
format_vnet_sw_if_index_name, vnm, (mp->sw_if_index));
break;
case SR_BEHAVIOR_DT6:
format (s,
"Address: %U\nBehavior: DT6 (Endpoint with decapsulation and specific IPv6 table lookup)"
"\nTable: %u", format_ip6_address,
- (ip6_address_t *) mp->localsid.addr, (mp->fib_table));
+ (ip6_address_t *) mp->localsid, (mp->fib_table));
break;
case SR_BEHAVIOR_DT4:
s =
format (s,
"Address: %U\nBehavior: DT4 (Endpoint with decapsulation and specific IPv4 table lookup)"
"\nTable: %u", format_ip6_address,
- (ip6_address_t *) mp->localsid.addr, (mp->fib_table));
+ (ip6_address_t *) mp->localsid, (mp->fib_table));
break;
default:
if (mp->behavior >= SR_BEHAVIOR_LAST)
{
s = format (s, "Address: %U\n Behavior: %u",
- format_ip6_address, (ip6_address_t *) mp->localsid.addr,
+ format_ip6_address, (ip6_address_t *) mp->localsid,
mp->behavior);
}
else
break;
case SR_STEER_IPV4:
s = format (s, "Traffic type: IPv4 %U/%u", format_ip4_address,
- (ip4_address_t *) mp->prefix_addr, (mp->mask_width));
+ (ip4_address_t *) mp->prefix.address.un.ip4,
+ (mp->prefix.len));
break;
case SR_STEER_IPV6:
s = format (s, "Traffic type: IPv6 %U/%u", format_ip6_address,
- (ip6_address_t *) mp->prefix_addr, (mp->mask_width));
+ (ip6_address_t *) mp->prefix.address.un.ip6,
+ (mp->prefix.len));
break;
default:
s = format (s, "Traffic type: Unknown(%u)", mp->traffic_type);
s = format (s, "FIB_table: %u", (mp->fib_table));
- s = format (s, (mp->type ? "Type: Default" : "Type: Spray"));
+ s = format (s, (mp->is_spray ? "Type: Default" : "Type: Spray"));
s = format (s, "SID list weight: %u", (mp->weight));
s = format (0, "SCRIPT: l2tpv3_create_tunnel ");
s = format (s, "client_address %U our_address %U ",
- format_ip6_address, (ip6_address_t *) (mp->client_address),
- format_ip6_address, (ip6_address_t *) (mp->our_address));
+ format_ip6_address,
+ (ip6_address_t *) (mp->client_address.un.ip6),
+ format_ip6_address, (ip6_address_t *) (mp->our_address.un.ip6));
s = format (s, "local_session_id %d ", (mp->local_session_id));
s = format (s, "remote_session_id %d ", (mp->remote_session_id));
s = format (s, "local_cookie %lld ",
u8 *s;
s = format (0, "SCRIPT: vxlan_add_del_tunnel ");
- ip46_address_t src = to_ip46 (mp->is_ipv6, mp->src_address);
- ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->dst_address);
+ ip46_address_t src =
+ to_ip46 (mp->src_address.af, (u8 *) & mp->src_address.un);
+ ip46_address_t dst =
+ to_ip46 (mp->dst_address.af, (u8 *) & mp->dst_address.un);
u8 is_grp = ip46_address_is_multicast (&dst);
char *dst_name = is_grp ? "group" : "dst";
if (mp->tunnel.type == GRE_API_TUNNEL_TYPE_ERSPAN)
s = format (s, "erspan %d ", (mp->tunnel.session_id));
- if (mp->tunnel.outer_fib_id)
- s = format (s, "outer-fib-id %d ", (mp->tunnel.outer_fib_id));
+ if (mp->tunnel.outer_table_id)
+ s = format (s, "outer-table-id %d ", mp->tunnel.outer_table_id);
if (mp->is_add == 0)
s = format (s, "del ");
if (mp->disable_indirect_desc)
s = format (s, "disable_indirect_desc ");
if (mp->tag[0])
- s = format (s, "tag %s", mp->tag);
+ s = format (s, "tag %s ", mp->tag);
if (mp->enable_gso)
- s = format (s, "gso");
+ s = format (s, "gso ");
+ if (mp->enable_packed)
+ s = format (s, "packed");
FINISH;
}
if (mp->renumber)
s = format (s, "renumber %d ", (mp->custom_dev_instance));
if (mp->enable_gso)
- s = format (s, "gso");
+ s = format (s, "gso ");
+ if (mp->enable_packed)
+ s = format (s, "packed");
FINISH;
}
u8 *s;
s = format (0, "SCRIPT: sw_interface_vhost_user_dump ");
+ s = format (s, "sw_if_index %d ", (mp->sw_if_index));
FINISH;
}
s = format (0, "SCRIPT: sw_interface_dump ");
if (mp->name_filter_valid)
- s = format (s, "name_filter %s ", mp->name_filter);
+ {
+ u8 *v = vl_api_from_api_to_new_vec (mp, &mp->name_filter);
+ s = format (s, "name_filter %v ", v);
+ vec_free (v);
+ }
else
s = format (s, "all ");
{
u8 *s;
u8 *cmd = 0;
- u32 length = vl_api_string_len (&mp->cmd);
- vec_validate (cmd, length);
- clib_memcpy (cmd, vl_api_from_api_string (&mp->cmd), length);
+ cmd = vl_api_from_api_to_new_vec (mp, &mp->cmd);
s = format (0, "SCRIPT: exec %v ", cmd);
s = format (0, "SCRIPT: vxlan_gpe_add_del_tunnel ");
- ip46_address_t local = to_ip46 (mp->is_ipv6, mp->local);
- ip46_address_t remote = to_ip46 (mp->is_ipv6, mp->remote);
+ ip46_address_t local, remote;
+
+ ip_address_decode (&mp->local, &local);
+ ip_address_decode (&mp->remote, &remote);
u8 is_grp = ip46_address_is_multicast (&remote);
char *remote_name = is_grp ? "group" : "remote";
FINISH;
}
-static void *vl_api_ip_probe_neighbor_t_print
- (vl_api_ip_probe_neighbor_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: ip_probe_neighbor ");
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
- s = format (s, "address %U ", format_vl_api_address, &mp->dst);
-
- FINISH;
-}
-
-static void *vl_api_ip_scan_neighbor_enable_disable_t_print
- (vl_api_ip_scan_neighbor_enable_disable_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: ip_scan_neighbor_enable_disable ");
-
- switch (mp->mode)
- {
- case IP_SCAN_V4_NEIGHBORS:
- s = format (s, "ip4 ");
- break;
- case IP_SCAN_V6_NEIGHBORS:
- s = format (s, "ip6 ");
- break;
- case IP_SCAN_V46_NEIGHBORS:
- s = format (s, "both ");
- break;
- default:
- s = format (s, "disable ");
- }
-
- s = format (s, "interval %d ", mp->scan_interval);
- s = format (s, "max-time %d ", mp->max_proc_time);
- s = format (s, "max-update %d ", mp->max_update);
- s = format (s, "delay %d ", mp->scan_int_delay);
- s = format (s, "stale %d ", mp->stale_threshold);
-
- FINISH;
-}
-
-static void *vl_api_want_ip4_arp_events_t_print
- (vl_api_want_ip4_arp_events_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: want_ip4_arp_events ");
- s = format (s, "pid %d address %U ", (mp->pid), format_ip4_address, mp->ip);
- if (mp->enable_disable == 0)
- s = format (s, "del ");
-
- 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_vl_api_ip6_address, mp->ip);
- if (mp->enable_disable == 0)
- s = format (s, "del ");
-
- FINISH;
-}
-
static void *vl_api_want_l2_macs_events_t_print
(vl_api_want_l2_macs_events_t * mp, void *handle)
{
}
s = format (s, "conform_action %U ", format_policer_action,
- mp->conform_action_type, mp->conform_dscp);
+ mp->conform_action.type, mp->conform_action.dscp);
s = format (s, "exceed_action %U ", format_policer_action,
- mp->exceed_action_type, mp->exceed_dscp);
+ mp->exceed_action.type, mp->exceed_action.dscp);
s = format (s, "violate_action %U ", format_policer_action,
- mp->violate_action_type, mp->violate_dscp);
+ mp->violate_action.type, mp->violate_action.dscp);
if (mp->color_aware)
s = format (s, "color-aware ");
s = format (0, "SCRIPT: policer_classify_dump ");
switch (mp->type)
{
- case POLICER_CLASSIFY_TABLE_IP4:
+ case POLICER_CLASSIFY_API_TABLE_IP4:
s = format (s, "type ip4 ");
break;
- case POLICER_CLASSIFY_TABLE_IP6:
+ case POLICER_CLASSIFY_API_TABLE_IP6:
s = format (s, "type ip6 ");
break;
- case POLICER_CLASSIFY_TABLE_L2:
+ case POLICER_CLASSIFY_API_TABLE_L2:
s = format (s, "type l2 ");
break;
default:
u8 *s;
s = format (0, "SCRIPT: pg_enable_disable ");
- if ((mp->stream_name_length) > 0)
- s = format (s, "stream %s", mp->stream_name);
+ if (vl_api_string_len (&mp->stream_name) > 0)
+ s =
+ format (s, "stream %s",
+ vl_api_from_api_to_new_c_string (&mp->stream_name));
if (!mp->is_enabled)
s = format (s, "disable");
u8 *s;
s = format (0, "SCRIPT: lisp_enable_disable %s",
- mp->is_en ? "enable" : "disable");
+ mp->is_enable ? "enable" : "disable");
FINISH;
}
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", (mp->vni));
- s = format (s, "eid %U ", format_lisp_flat_eid,
- mp->eid_type, mp->eid, mp->eid_len);
+ s = format (s, "eid %U ", format_lisp_flat_eid, mp->deid);
if (mp->is_src_dst)
{
- s = format (s, "seid %U ", format_lisp_flat_eid,
- mp->eid_type, mp->seid, mp->seid_len);
+ s = format (s, "seid %U ", format_lisp_flat_eid, mp->seid);
}
rloc_num = (mp->rloc_num);
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", (mp->vni));
s = format (s, "reid %U leid %U ",
- format_lisp_flat_eid, mp->eid_type, mp->reid, mp->reid_len,
- format_lisp_flat_eid, mp->eid_type, mp->leid, mp->leid_len);
+ format_lisp_flat_eid, mp->reid, format_lisp_flat_eid, mp->leid);
FINISH;
}
s = format (s, "del ");
s = format (s, "vni %d ", (mp->vni));
- s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type, mp->eid,
- mp->prefix_len);
+ s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid);
s = format (s, "locator-set %s ", mp->locator_set_name);
- if (*mp->key)
+ if (mp->key.id)
{
- u32 key_id = mp->key_id;
+ u32 key_id = mp->key.id;
s = format (s, "key-id %U", format_hmac_key_id, key_id);
- s = format (s, "secret-key %s", mp->key);
+ s = format (s, "secret-key %s", mp->key.key);
}
FINISH;
}
if (!mp->is_add)
s = format (s, "del ");
- if (mp->is_ipv6)
- s = format (s, "%U ", format_ip6_address, mp->ip_address);
+ if (mp->ip_address.af)
+ s = format (s, "%U ", format_ip6_address, mp->ip_address.un.ip6);
else
- s = format (s, "%U ", format_ip4_address, mp->ip_address);
+ s = format (s, "%U ", format_ip4_address, mp->ip_address.un.ip4);
FINISH;
}
s = format (0, "SCRIPT: gpe_enable_disable ");
- s = format (s, "%s ", mp->is_en ? "enable" : "disable");
+ s = format (s, "%s ", mp->is_enable ? "enable" : "disable");
FINISH;
}
s = format (0, "SCRIPT: lisp_map_request_mode ");
- switch (mp->mode)
- {
- case 0:
- s = format (s, "dst-only");
- break;
- case 1:
- s = format (s, "src-dst");
- default:
- break;
- }
+ s = mp->is_src_dst ? format (s, "src-dst") : format (s, "dst-only");
FINISH;
}
if (mp->eid_set)
{
s = format (s, "vni %d ", (mp->vni));
- s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid_type,
- mp->eid, mp->prefix_length);
+ s = format (s, "eid %U ", format_lisp_flat_eid, mp->eid);
switch (mp->filter)
{
case 1:
case 2:
s = format (s, "remote ");
break;
+ default:
+ break;
}
}
FINISH;
u8 *s;
s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
- if (mp->is_enabled)
+ if (mp->is_enable)
s = format (s, "enable");
else
s = format (s, "disable");
u8 *s;
s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
- if (mp->is_enabled)
+ if (mp->is_enable)
s = format (s, "enable");
else
s = format (s, "disable");
s = format (0, "SCRIPT: flow_classify_dump ");
switch (mp->type)
{
- case FLOW_CLASSIFY_TABLE_IP4:
+ case FLOW_CLASSIFY_API_TABLE_IP4:
s = format (s, "type ip4 ");
break;
- case FLOW_CLASSIFY_TABLE_IP6:
+ case FLOW_CLASSIFY_API_TABLE_IP6:
s = format (s, "type ip6 ");
break;
default:
u8 *s;
s = format (0, "SCRIPT: tcp_configure_src_addresses ");
- if (mp->is_ipv6)
- s = format (s, "%U - %U ",
- format_ip6_address, (ip6_address_t *) mp->first_address,
- format_ip6_address, (ip6_address_t *) mp->last_address);
- else
- s = format (s, "%U - %U ",
- format_ip4_address, (ip4_address_t *) mp->first_address,
- format_ip4_address, (ip4_address_t *) mp->last_address);
+ s = format (s, "%U - %U ",
+ format_vl_api_address, &mp->first_address,
+ format_vl_api_address, &mp->last_address);
if (mp->vrf_id)
s = format (s, "vrf %d ", (mp->vrf_id));
(vl_api_app_namespace_add_del_t * mp, void *handle)
{
u8 *s;
- u8 len = clib_min (mp->namespace_id_len,
- ARRAY_LEN (mp->namespace_id) - 1);
- mp->namespace_id[len] = 0;
+
s = format (0, "SCRIPT: app_namespace_add_del ");
s = format (s, "ns-id %s secret %lu sw_if_index %d ipv4_fib_id %d "
- "ipv6_fib_id %d", (char *) mp->namespace_id, mp->secret,
- (mp->sw_if_index), (mp->ip4_fib_id), (mp->ip6_fib_id));
+ "ipv6_fib_id %d",
+ vl_api_from_api_to_new_c_string (&mp->namespace_id),
+ mp->secret, (mp->sw_if_index), (mp->ip4_fib_id),
+ (mp->ip6_fib_id));
FINISH;
}
s = format (0, "SCRIPT: sw_interface_set_lldp ");
s = format (s, "sw_if_index %d ", (mp->sw_if_index));
- if (memcmp (mp->port_desc, null_data, sizeof (mp->port_desc)))
+ if (memcmp (&mp->port_desc, null_data, sizeof (mp->port_desc)))
s = format (s, "port_desc %s ", mp->port_desc);
if (memcmp (mp->mgmt_ip4, null_data, sizeof (mp->mgmt_ip4)))
(vl_api_session_rule_add_del_t * mp, void *handle)
{
u8 *s;
+ fib_prefix_t lcl, rmt;
char *proto = mp->transport_proto == 0 ? "tcp" : "udp";
s = format (0, "SCRIPT: session_rule_add_del ");
mp->tag[sizeof (mp->tag) - 1] = 0;
- if (mp->is_ip4)
+ ip_prefix_decode (&mp->lcl, &lcl);
+ ip_prefix_decode (&mp->rmt, &rmt);
+
+ if (lcl.fp_proto == FIB_PROTOCOL_IP4)
s = format (s, "appns %d scope %d %s %U/%d %d %U/%d %d action %u tag %s",
mp->appns_index, mp->scope, proto, format_ip4_address,
- (ip4_address_t *) mp->lcl_ip, mp->lcl_plen,
- format_ip4_address, (ip4_address_t *) mp->rmt_ip,
- mp->rmt_plen, mp->action_index, mp->tag);
+ &lcl.fp_addr.ip4, lcl.fp_len,
+ format_ip4_address, &rmt.fp_addr.ip4,
+ rmt.fp_len, mp->action_index, mp->tag);
else
s = format (s, "appns %d scope %d %s %U/%d %d %U/%d %d action %u tag %s",
mp->appns_index, mp->scope, proto, format_ip6_address,
- (ip6_address_t *) mp->lcl_ip, mp->lcl_plen,
- format_ip6_address, (ip6_address_t *) mp->rmt_ip,
- mp->rmt_plen, mp->action_index, mp->tag);
+ &lcl.fp_addr.ip6, lcl.fp_len,
+ format_ip6_address, &rmt.fp_addr.ip6,
+ rmt.fp_len, mp->action_index, mp->tag);
FINISH;
}
_(MPLS_ROUTE_ADD_DEL, mpls_route_add_del) \
_(MPLS_TABLE_ADD_DEL, mpls_table_add_del) \
_(IP_ROUTE_ADD_DEL, ip_route_add_del) \
-_(PROXY_ARP_ADD_DEL, proxy_arp_add_del) \
-_(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable) \
_(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del) \
_(SR_MPLS_POLICY_ADD, sr_mpls_policy_add) \
_(SR_MPLS_POLICY_DEL, sr_mpls_policy_del) \
_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered) \
-_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del) \
_(CREATE_VLAN_SUBIF, create_vlan_subif) \
_(CREATE_SUBIF, create_subif) \
-_(RESET_FIB, reset_fib) \
+_(IP_TABLE_REPLACE_BEGIN, ip_table_replace_begin) \
+_(IP_TABLE_FLUSH, ip_table_flush) \
+_(IP_TABLE_REPLACE_END, ip_table_replace_end) \
_(SET_IP_FLOW_HASH, set_ip_flow_hash) \
-_(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix) \
-_(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config) \
-_(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit) \
_(L2_PATCH_ADD_DEL, l2_patch_add_del) \
_(SR_LOCALSID_ADD_DEL, sr_localsid_add_del) \
_(SR_STEERING_ADD_DEL, sr_steering_add_del) \
_(VXLAN_GBP_TUNNEL_DUMP, vxlan_gbp_tunnel_dump) \
_(SW_INTERFACE_SET_VXLAN_GBP_BYPASS, sw_interface_set_vxlan_gbp_bypass) \
_(INTERFACE_NAME_RENUMBER, interface_name_renumber) \
-_(IP_PROBE_NEIGHBOR, ip_probe_neighbor) \
-_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE, ip_scan_neighbor_enable_disable) \
-_(WANT_IP4_ARP_EVENTS, want_ip4_arp_events) \
-_(WANT_IP6_ND_EVENTS, want_ip6_nd_events) \
_(WANT_L2_MACS_EVENTS, want_l2_macs_events) \
_(INPUT_ACL_SET_INTERFACE, input_acl_set_interface) \
_(IP_ADDRESS_DUMP, ip_address_dump) \