Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
lisp: 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
657a580
..
a5c3fdb
100644
(file)
--- a/
src/vpp/api/custom_dump.c
+++ b/
src/vpp/api/custom_dump.c
@@
-1734,9
+1734,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;
}
@@
-1755,7
+1757,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;
}
@@
-2607,7
+2611,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;
}
@@
-2674,13
+2678,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);
@@
-2700,8
+2702,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;
}
@@
-2747,14
+2748,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;
}
@@
-2779,10
+2779,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;
}
@@
-2794,7
+2794,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;
}
@@
-2866,16
+2866,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;
}
@@
-2890,8
+2881,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:
@@
-2900,6
+2890,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;
@@
-2911,7
+2903,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");
@@
-2925,7
+2917,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");