ds_put_format(string, " table_id=%"PRIu8, pin.table_id);
}
- if (pin.cookie) {
+ if (pin.cookie != OVS_BE64_MAX) {
ds_put_format(string, " cookie=0x%"PRIx64, ntohll(pin.cookie));
}
- ds_put_format(string, " total_len=%"PRIu16" in_port=", pin.total_len);
+ ds_put_format(string, " total_len=%zu in_port=", pin.total_len);
ofputil_format_port(pin.fmd.in_port, string);
if (pin.fmd.tun_id != htonll(0)) {
ds_put_cstr(string, " in_port=");
ofputil_format_port(po.in_port, string);
- ds_put_char(string, ' ');
+ ds_put_cstr(string, " actions=");
ofpacts_format(po.ofpacts, po.ofpacts_len, string);
if (po.buffer_id == UINT32_MAX) {
if (ds_last(s) != ' ') {
ds_put_char(s, ' ');
}
- if (fm.new_cookie != htonll(0) && fm.new_cookie != htonll(UINT64_MAX)) {
+ if (fm.new_cookie != htonll(0) && fm.new_cookie != OVS_BE64_MAX) {
ds_put_format(s, "cookie:0x%"PRIx64" ", ntohll(fm.new_cookie));
}
if (fm.cookie_mask != htonll(0)) {
}
ofp_print_flow_flags(s, fm.flags);
+ ds_put_cstr(s, "actions=");
ofpacts_format(fm.ofpacts, fm.ofpacts_len, s);
ofpbuf_uninit(&ofpacts);
}
ds_put_char(string, ' ');
}
+ ds_put_cstr(string, "actions=");
ofpacts_format(fs->ofpacts, fs->ofpacts_len, string);
}
if (string->string[string->length - 1] != ' ') {
ds_put_char(string, ' ');
}
+ ds_put_cstr(string, "actions=");
ofpacts_format(update.ofpacts, update.ofpacts_len, string);
}
}
ds_put_format(s, "watch_group:%"PRIu32",", bucket->watch_group);
}
+ ds_put_cstr(s, "actions=");
ofpacts_format(bucket->ofpacts, bucket->ofpacts_len, s);
}
}
struct ofputil_group_desc gd;
int retval;
- retval = ofputil_decode_group_desc_reply(&gd, &b);
+ retval = ofputil_decode_group_desc_reply(&gd, &b, oh->version);
if (retval) {
if (retval != EOF) {
ds_put_cstr(s, " ***parse error***");