From: Ben Pfaff <blp@nicira.com>
Date: Wed, 28 Jan 2009 20:18:33 +0000 (-0800)
Subject: Make flow_print() print nw_proto.  Print vlan in decimal.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6810e43b171a8615aa121b7db0454267d69882d2;p=openvswitch

Make flow_print() print nw_proto.  Print vlan in decimal.
---

diff --git a/lib/flow.c b/lib/flow.c
index 489540a6..d627648c 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+/* Copyright (c) 2008, 2009 The Board of Trustees of The Leland Stanford
  * Junior University
  * 
  * We are making the OpenFlow specification and associated documentation
@@ -223,11 +223,11 @@ void
 flow_print(FILE *stream, const struct flow *flow) 
 {
     fprintf(stream,
-            "port%04x:vlan%04x mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT" "
-            "proto%04x ip"IP_FMT"->"IP_FMT" port%d->%d",
+            "port%04x:vlan%d mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT" "
+            "type%04x proto%"PRId8" ip"IP_FMT"->"IP_FMT" port%d->%d",
             ntohs(flow->in_port), ntohs(flow->dl_vlan),
             ETH_ADDR_ARGS(flow->dl_src), ETH_ADDR_ARGS(flow->dl_dst),
-            ntohs(flow->dl_type),
+            ntohs(flow->dl_type), flow->nw_proto,
             IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst),
             ntohs(flow->tp_src), ntohs(flow->tp_dst));
 }