projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
geneve-map-rename: rename geneve-map to tlv-map.
[cascardo/ovs.git]
/
lib
/
ofp-print.c
diff --git
a/lib/ofp-print.c
b/lib/ofp-print.c
index
d4f1972
..
930b01a
100644
(file)
--- a/
lib/ofp-print.c
+++ b/
lib/ofp-print.c
@@
-3031,9
+3031,9
@@
ofp_print_bundle_add(struct ds *s, const struct ofp_header *oh, int verbosity)
}
static void
}
static void
-print_
geneve
_table(struct ds *s, struct ovs_list *mappings)
+print_
tlv
_table(struct ds *s, struct ovs_list *mappings)
{
{
- struct ofputil_
geneve
_map *map;
+ struct ofputil_
tlv
_map *map;
ds_put_cstr(s, " mapping table:\n");
ds_put_cstr(s, " class\ttype\tlength\tmatch field\n");
ds_put_cstr(s, " mapping table:\n");
ds_put_cstr(s, " class\ttype\tlength\tmatch field\n");
@@
-3048,12
+3048,12
@@
print_geneve_table(struct ds *s, struct ovs_list *mappings)
}
static void
}
static void
-ofp_print_
geneve
_table_mod(struct ds *s, const struct ofp_header *oh)
+ofp_print_
tlv
_table_mod(struct ds *s, const struct ofp_header *oh)
{
int error;
{
int error;
- struct ofputil_
geneve_table_mod g
tm;
+ struct ofputil_
tlv_table_mod t
tm;
- error = ofputil_decode_
geneve_table_mod(oh, &g
tm);
+ error = ofputil_decode_
tlv_table_mod(oh, &t
tm);
if (error) {
ofp_print_error(s, error);
return;
if (error) {
ofp_print_error(s, error);
return;
@@
-3061,34
+3061,34
@@
ofp_print_geneve_table_mod(struct ds *s, const struct ofp_header *oh)
ds_put_cstr(s, "\n ");
ds_put_cstr(s, "\n ");
- switch (
g
tm.command) {
- case NX
G
TMC_ADD:
+ switch (
t
tm.command) {
+ case NX
T
TMC_ADD:
ds_put_cstr(s, "ADD");
break;
ds_put_cstr(s, "ADD");
break;
- case NX
G
TMC_DELETE:
+ case NX
T
TMC_DELETE:
ds_put_cstr(s, "DEL");
break;
ds_put_cstr(s, "DEL");
break;
- case NX
G
TMC_CLEAR:
+ case NX
T
TMC_CLEAR:
ds_put_cstr(s, "CLEAR");
break;
}
ds_put_cstr(s, "CLEAR");
break;
}
- if (
gtm.command != NXG
TMC_CLEAR) {
- print_
geneve_table(s, &g
tm.mappings);
+ if (
ttm.command != NXT
TMC_CLEAR) {
+ print_
tlv_table(s, &t
tm.mappings);
}
}
- ofputil_uninit_
geneve_table(&g
tm.mappings);
+ ofputil_uninit_
tlv_table(&t
tm.mappings);
}
static void
}
static void
-ofp_print_
geneve
_table_reply(struct ds *s, const struct ofp_header *oh)
+ofp_print_
tlv
_table_reply(struct ds *s, const struct ofp_header *oh)
{
int error;
{
int error;
- struct ofputil_
geneve_table_reply g
tr;
- struct ofputil_
geneve
_map *map;
+ struct ofputil_
tlv_table_reply t
tr;
+ struct ofputil_
tlv
_map *map;
int allocated_space = 0;
int allocated_space = 0;
- error = ofputil_decode_
geneve_table_reply(oh, &g
tr);
+ error = ofputil_decode_
tlv_table_reply(oh, &t
tr);
if (error) {
ofp_print_error(s, error);
return;
if (error) {
ofp_print_error(s, error);
return;
@@
-3096,17
+3096,17
@@
ofp_print_geneve_table_reply(struct ds *s, const struct ofp_header *oh)
ds_put_char(s, '\n');
ds_put_char(s, '\n');
- LIST_FOR_EACH (map, list_node, &
g
tr.mappings) {
+ LIST_FOR_EACH (map, list_node, &
t
tr.mappings) {
allocated_space += map->option_len;
}
ds_put_format(s, " max option space=%"PRIu32" max fields=%"PRIu16"\n",
allocated_space += map->option_len;
}
ds_put_format(s, " max option space=%"PRIu32" max fields=%"PRIu16"\n",
-
gtr.max_option_space, g
tr.max_fields);
+
ttr.max_option_space, t
tr.max_fields);
ds_put_format(s, " allocated option space=%d\n", allocated_space);
ds_put_char(s, '\n');
ds_put_format(s, " allocated option space=%d\n", allocated_space);
ds_put_char(s, '\n');
- print_
geneve_table(s, &g
tr.mappings);
+ print_
tlv_table(s, &t
tr.mappings);
- ofputil_uninit_
geneve_table(&g
tr.mappings);
+ ofputil_uninit_
tlv_table(&t
tr.mappings);
}
/* This function will print the request forward message. The reason for
}
/* This function will print the request forward message. The reason for
@@
-3410,15
+3410,15
@@
ofp_to_string__(const struct ofp_header *oh, enum ofpraw raw,
ofp_print_bundle_add(string, msg, verbosity);
break;
ofp_print_bundle_add(string, msg, verbosity);
break;
- case OFPTYPE_NXT_
GENEVE
_TABLE_MOD:
- ofp_print_
geneve
_table_mod(string, msg);
+ case OFPTYPE_NXT_
TLV
_TABLE_MOD:
+ ofp_print_
tlv
_table_mod(string, msg);
break;
break;
- case OFPTYPE_NXT_
GENEVE
_TABLE_REQUEST:
+ case OFPTYPE_NXT_
TLV
_TABLE_REQUEST:
break;
break;
- case OFPTYPE_NXT_
GENEVE
_TABLE_REPLY:
- ofp_print_
geneve
_table_reply(string, msg);
+ case OFPTYPE_NXT_
TLV
_TABLE_REPLY:
+ ofp_print_
tlv
_table_reply(string, msg);
break;
}
break;
}