X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fofp-print.c;fp=lib%2Fofp-print.c;h=25317f557b5ee363bf84d280d702ad70b60834ed;hb=16f5f39c5db116b8ce90cbb8250cd9716dd04ce7;hp=1443842537b1f52b46b5b589fe1e9faa806957a6;hpb=98704941ec95258281da2ac147ce5f3e03436ba4;p=sliver-openvswitch.git diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 144384253..25317f557 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -735,7 +735,8 @@ ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, default: ds_put_format(string, " cmd:%d ", ntohs(ofm->command)); } - ds_put_format(string, "idle:%d hard:%d pri:%d buf:%#x flags:%"PRIx16" ", + ds_put_format(string, "cookie:%"PRIx64" idle:%d hard:%d pri:%d " + "buf:%#x flags:%"PRIx16" ", ntohll(ofm->cookie), ntohs(ofm->idle_timeout), ntohs(ofm->hard_timeout), ofm->match.wildcards ? ntohs(ofm->priority) : (uint16_t)-1, ntohl(ofm->buffer_id), ntohs(ofm->flags)); @@ -769,8 +770,8 @@ ofp_print_flow_removed(struct ds *string, const void *oh, size_t len UNUSED, break; } ds_put_format(string, - " pri%"PRIu16" secs%"PRIu32" idle%"PRIu16" pkts%"PRIu64 - " bytes%"PRIu64"\n", + " cookie%"PRIx64" pri%"PRIu16" secs%"PRIu32" idle%"PRIu16 + " pkts%"PRIu64" bytes%"PRIu64"\n", ntohll(ofr->cookie), ofr->match.wildcards ? ntohs(ofr->priority) : (uint16_t)-1, ntohl(ofr->duration), ntohs(ofr->idle_timeout), ntohll(ofr->packet_count), ntohll(ofr->byte_count)); @@ -984,7 +985,8 @@ ofp_flow_stats_reply(struct ds *string, const void *body_, size_t len, break; } - ds_put_format(string, " duration=%"PRIu32"s, ", ntohl(fs->duration)); + ds_put_format(string, " cookie=%"PRIu64"s, ", ntohll(fs->cookie)); + ds_put_format(string, "duration=%"PRIu32"s, ", ntohl(fs->duration)); ds_put_format(string, "table_id=%"PRIu8", ", fs->table_id); ds_put_format(string, "priority=%"PRIu16", ", fs->match.wildcards ? ntohs(fs->priority) : (uint16_t)-1);