Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
policer: API cleanup
[vpp.git]
/
src
/
vpp
/
api
/
custom_dump.c
diff --git
a/src/vpp/api/custom_dump.c
b/src/vpp/api/custom_dump.c
index
9156104
..
1cc2aa6
100644
(file)
--- a/
src/vpp/api/custom_dump.c
+++ b/
src/vpp/api/custom_dump.c
@@
-582,7
+582,11
@@
static void *vl_api_tap_create_v2_t_print
if ((mp->tap_flags) & 0x1)
s = format (s, "gso-enabled ");
if ((mp->tap_flags) & 0x2)
if ((mp->tap_flags) & 0x1)
s = format (s, "gso-enabled ");
if ((mp->tap_flags) & 0x2)
- s = format (s, "csum-offload-enabled");
+ s = format (s, "csum-offload-enabled ");
+ if ((mp->tap_flags) & 0x4)
+ s = format (s, "persist ");
+ if ((mp->tap_flags) & 0x8)
+ s = format (s, "attach ");
FINISH;
}
FINISH;
}
@@
-1898,8
+1902,10
@@
static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
s = format (0, "SCRIPT: vxlan_gpe_add_del_tunnel ");
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";
u8 is_grp = ip46_address_is_multicast (&remote);
char *remote_name = is_grp ? "group" : "remote";
@@
-2183,11
+2189,11
@@
static void *vl_api_policer_add_del_t_print
}
s = format (s, "conform_action %U ", format_policer_action,
}
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,
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,
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 ");
if (mp->color_aware)
s = format (s, "color-aware ");
@@
-3376,13
+3382,13
@@
static void *vl_api_app_namespace_add_del_t_print
(vl_api_app_namespace_add_del_t * mp, void *handle)
{
u8 *s;
(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 "
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;
}
FINISH;
}
@@
-3397,7
+3403,7
@@
static void *vl_api_sw_interface_set_lldp_t_print
s = format (0, "SCRIPT: sw_interface_set_lldp ");
s = format (s, "sw_if_index %d ", (mp->sw_if_index));
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)))
s = format (s, "port_desc %s ", mp->port_desc);
if (memcmp (mp->mgmt_ip4, null_data, sizeof (mp->mgmt_ip4)))
@@
-3431,21
+3437,25
@@
static void *vl_api_session_rule_add_del_t_print
(vl_api_session_rule_add_del_t * mp, void *handle)
{
u8 *s;
(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;
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,
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_p
len,
- format_ip4_address,
(ip4_address_t *) mp->rmt_ip
,
-
mp->rmt_p
len, 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,
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_p
len,
- format_ip6_address,
(ip6_address_t *) mp->rmt_ip
,
-
mp->rmt_p
len, 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;
}
FINISH;
}