Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tap: refactor existing flags
[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
1cc2aa6
..
e0ba9f9
100644
(file)
--- a/
src/vpp/api/custom_dump.c
+++ b/
src/vpp/api/custom_dump.c
@@
-587,6
+587,10
@@
static void *vl_api_tap_create_v2_t_print
s = format (s, "persist ");
if ((mp->tap_flags) & 0x8)
s = format (s, "attach ");
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;
}
FINISH;
}
@@
-1078,7
+1082,7
@@
static void *vl_api_sr_localsid_add_del_t_print
{
case SR_BEHAVIOR_END:
s = format (s, "Address: %U\nBehavior: End",
{
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:
s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
break;
case SR_BEHAVIOR_X:
@@
-1086,9
+1090,9
@@
static void *vl_api_sr_localsid_add_del_t_print
format (s,
"Address: %U\nBehavior: X (Endpoint with Layer-3 cross-connect)"
"\nIface: %U\nNext hop: %U", format_ip6_address,
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_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.ip
6);
s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
break;
case SR_BEHAVIOR_DX4:
s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False"));
break;
case SR_BEHAVIOR_DX4:
@@
-1096,25
+1100,25
@@
static void *vl_api_sr_localsid_add_del_t_print
format (s,
"Address: %U\nBehavior: DX4 (Endpoint with decapsulation with IPv4 cross-connect)"
"\nIface: %U\nNext hop: %U", format_ip6_address,
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_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.ip
4);
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,
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_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.ip
6);
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,
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_vnet_sw_if_index_name, vnm, (mp->sw_if_index));
break;
case SR_BEHAVIOR_DT6:
@@
-1122,20
+1126,20
@@
static void *vl_api_sr_localsid_add_del_t_print
format (s,
"Address: %U\nBehavior: DT6 (Endpoint with decapsulation and specific IPv6 table lookup)"
"\nTable: %u", format_ip6_address,
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,
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",
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
mp->behavior);
}
else
@@
-1162,11
+1166,13
@@
static void *vl_api_sr_steering_add_del_t_print
break;
case SR_STEER_IPV4:
s = format (s, "Traffic type: IPv4 %U/%u", format_ip4_address,
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,
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);
break;
default:
s = format (s, "Traffic type: Unknown(%u)", mp->traffic_type);
@@
-1210,7
+1216,7
@@
static void *vl_api_sr_policy_add_t_print
s = format (s, "FIB_table: %u", (mp->fib_table));
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 (s, "SID list weight: %u", (mp->weight));
@@
-1484,8
+1490,10
@@
static void *vl_api_vxlan_add_del_tunnel_t_print
u8 *s;
s = format (0, "SCRIPT: vxlan_add_del_tunnel ");
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";
u8 is_grp = ip46_address_is_multicast (&dst);
char *dst_name = is_grp ? "group" : "dst";
@@
-1730,9
+1738,11
@@
static void *vl_api_create_vhost_user_if_t_print
if (mp->disable_indirect_desc)
s = format (s, "disable_indirect_desc ");
if (mp->tag[0])
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)
if (mp->enable_gso)
- s = format (s, "gso");
+ s = format (s, "gso ");
+ if (mp->enable_packed)
+ s = format (s, "packed");
FINISH;
}
FINISH;
}
@@
-1751,7
+1761,9
@@
static void *vl_api_modify_vhost_user_if_t_print
if (mp->renumber)
s = format (s, "renumber %d ", (mp->custom_dev_instance));
if (mp->enable_gso)
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;
}
FINISH;
}
@@
-2603,7
+2615,7
@@
static void *vl_api_lisp_enable_disable_t_print
u8 *s;
s = format (0, "SCRIPT: lisp_enable_disable %s",
u8 *s;
s = format (0, "SCRIPT: lisp_enable_disable %s",
- mp->is_en ? "enable" : "disable");
+ mp->is_en
able
? "enable" : "disable");
FINISH;
}
FINISH;
}
@@
-2670,13
+2682,11
@@
static void *vl_api_lisp_add_del_remote_mapping_t_print
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", (mp->vni));
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)
{
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);
}
rloc_num = (mp->rloc_num);
@@
-2696,8
+2706,7
@@
static void *vl_api_lisp_add_del_adjacency_t_print
s = format (s, "%s ", mp->is_add ? "add" : "del");
s = format (s, "vni %d ", (mp->vni));
s = format (s, "reid %U leid %U ",
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;
}
FINISH;
}
@@
-2743,14
+2752,13
@@
static void *vl_api_lisp_add_del_local_eid_t_print
s = format (s, "del ");
s = format (s, "vni %d ", (mp->vni));
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);
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, "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;
}
}
FINISH;
}
@@
-2775,10
+2783,10
@@
static void *vl_api_lisp_add_del_map_resolver_t_print
if (!mp->is_add)
s = format (s, "del ");
if (!mp->is_add)
s = format (s, "del ");
- if (mp->i
s_ipv6
)
- s = format (s, "%U ", format_ip6_address, mp->ip_address);
+ if (mp->i
p_address.af
)
+ s = format (s, "%U ", format_ip6_address, mp->ip_address
.un.ip6
);
else
else
- s = format (s, "%U ", format_ip4_address, mp->ip_address);
+ s = format (s, "%U ", format_ip4_address, mp->ip_address
.un.ip4
);
FINISH;
}
FINISH;
}
@@
-2790,7
+2798,7
@@
static void *vl_api_gpe_enable_disable_t_print
s = format (0, "SCRIPT: gpe_enable_disable ");
s = format (0, "SCRIPT: gpe_enable_disable ");
- s = format (s, "%s ", mp->is_en ? "enable" : "disable");
+ s = format (s, "%s ", mp->is_en
able
? "enable" : "disable");
FINISH;
}
FINISH;
}
@@
-2862,16
+2870,7
@@
static void *vl_api_lisp_map_request_mode_t_print
s = format (0, "SCRIPT: lisp_map_request_mode ");
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;
}
FINISH;
}
@@
-2886,8
+2885,7
@@
static void *vl_api_lisp_eid_table_dump_t_print
if (mp->eid_set)
{
s = format (s, "vni %d ", (mp->vni));
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:
switch (mp->filter)
{
case 1:
@@
-2896,6
+2894,8
@@
static void *vl_api_lisp_eid_table_dump_t_print
case 2:
s = format (s, "remote ");
break;
case 2:
s = format (s, "remote ");
break;
+ default:
+ break;
}
}
FINISH;
}
}
FINISH;
@@
-2907,7
+2907,7
@@
static void *vl_api_lisp_rloc_probe_enable_disable_t_print
u8 *s;
s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
u8 *s;
s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable ");
- if (mp->is_enable
d
)
+ if (mp->is_enable)
s = format (s, "enable");
else
s = format (s, "disable");
s = format (s, "enable");
else
s = format (s, "disable");
@@
-2921,7
+2921,7
@@
static void *vl_api_lisp_map_register_enable_disable_t_print
u8 *s;
s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
u8 *s;
s = format (0, "SCRIPT: lisp_map_register_enable_disable ");
- if (mp->is_enable
d
)
+ if (mp->is_enable)
s = format (s, "enable");
else
s = format (s, "disable");
s = format (s, "enable");
else
s = format (s, "disable");