X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-print.c;h=f1eeebb44aa98b735128b3ffc4c13270839b9999;hb=0e553d9c1063be047824c6f1afce9ffc6db6c671;hp=30ecdbf876a7908ddd6fa1d94d6ea6fe4bf181d8;hpb=80d5aefd65b9dd953d873f9995b949bc8b8d19d5;p=sliver-openvswitch.git diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 30ecdbf87..f1eeebb44 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -194,6 +194,7 @@ ofp_print_action(struct ds *s, const union ofp_action *a, const struct nx_action_multipath *nam; const struct nx_action_autopath *naa; const struct nx_action_output_reg *naor; + const struct nx_action_fin_timeout *naft; struct mf_subfield subfield; uint16_t port; @@ -356,6 +357,21 @@ ofp_print_action(struct ds *s, const union ofp_action *a, ds_put_cstr(s, "exit"); break; + case OFPUTIL_NXAST_FIN_TIMEOUT: + naft = (const struct nx_action_fin_timeout *) a; + ds_put_cstr(s, "fin_timeout("); + if (naft->fin_idle_timeout) { + ds_put_format(s, "idle_timeout=%"PRIu16",", + ntohs(naft->fin_idle_timeout)); + } + if (naft->fin_hard_timeout) { + ds_put_format(s, "hard_timeout=%"PRIu16",", + ntohs(naft->fin_hard_timeout)); + } + ds_chomp(s, ','); + ds_put_char(s, ')'); + break; + default: break; } @@ -410,7 +426,7 @@ ofp_print_packet_out(struct ds *string, const struct ofp_packet_out *opo, ofp_print_actions(string, po.actions, po.n_actions); if (po.buffer_id == UINT32_MAX) { - ds_put_format(string, " data_len=%d", po.packet_len); + ds_put_format(string, " data_len=%zu", po.packet_len); if (verbosity > 0 && po.packet_len > 0) { char *packet = ofp_packet_to_string(po.packet, po.packet_len); ds_put_char(string, '\n');