vconn: Fix vconn_get_version().

It's documented to return -1 if the version isn't yet known, but in fact
it returned 0.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/vconn.c b/lib/vconn.c
index eb848ba827c858644652e0c1c77da812a270b82b..8b53b060b7c489f13d429ba31f141883d5498738 100644 (file)
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -368,10 +368,10 @@ vconn_get_local_port(const struct vconn *vconn)
  *
  * A vconn that has successfully connected (that is, vconn_connect() or
  * vconn_send() or vconn_recv() has returned 0) always negotiated a version. */
-enum ofp_version
+int
 vconn_get_version(const struct vconn *vconn)
 {
-    return vconn->version;
+    return vconn->version ? vconn->version : -1;
 }
 
 static void

diff --git a/lib/vconn.h b/lib/vconn.h
index 3bb44507fdd86f7b049f71cbfa98f81ca86c32db..1a0bc60e4136d87f3c0b7de2643bb95f52abfa59 100644 (file)
--- a/lib/vconn.h
+++ b/lib/vconn.h
@@ -19,6 +19,7 @@
 
 #include <stdbool.h>
 #include "openvswitch/types.h"
+#include "openflow/openflow.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,7 +42,7 @@ ovs_be32 vconn_get_remote_ip(const struct vconn *);
 ovs_be16 vconn_get_remote_port(const struct vconn *);
 ovs_be32 vconn_get_local_ip(const struct vconn *);
 ovs_be16 vconn_get_local_port(const struct vconn *);
-enum ofp_version vconn_get_version(const struct vconn *);
+int vconn_get_version(const struct vconn *);
 int vconn_connect(struct vconn *);
 int vconn_recv(struct vconn *, struct ofpbuf **);
 int vconn_send(struct vconn *, struct ofpbuf *);