From: Ben Pfaff <blp@nicira.com>
Date: Wed, 16 Jun 2010 23:01:41 +0000 (-0700)
Subject: vswitch: Datapath IDs are now 16 hex digits.
X-Git-Tag: v1.1.0pre1~280
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fc09119a4a2e12807975145ea004b93aed116a22;p=sliver-openvswitch.git

vswitch: Datapath IDs are now 16 hex digits.

OpenFlow 1.0 datapath IDs are 64 bits long, so the "datapath_id" column
should have 16 hex digits.  The documentation had this right, but the
code didn't implement it correctly.

Reported-by: Arthur van Kleef <arthur.vankleef@os3.nl>
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 9097e6b21..f6079928f 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -719,7 +719,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
         dpid = bridge_pick_datapath_id(br, ea, hw_addr_iface);
         ofproto_set_datapath_id(br->ofproto, dpid);
 
-        dpid_string = xasprintf("%012"PRIx64, dpid);
+        dpid_string = xasprintf("%016"PRIx64, dpid);
         ovsrec_bridge_set_datapath_id(br->cfg, dpid_string);
         free(dpid_string);