X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn-provider.h;h=640c5b66aab1c7f65e9f459e1b8d27b8cd0731db;hb=591cb419cf3694e0ae66a95973e73c61bad9e03d;hp=a26d9c55753efd1300103465315b3295566c1012;hpb=7a25bd99246a548891427d62ccefb65f765bbc48;p=sliver-openvswitch.git

diff --git a/lib/vconn-provider.h b/lib/vconn-provider.h
index a26d9c557..640c5b66a 100644
--- a/lib/vconn-provider.h
+++ b/lib/vconn-provider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 /* Provider interface to vconns, which provide a virtual connection to an
  * OpenFlow device. */
 
-#include <assert.h>
 #include "vconn.h"
+#include "util.h"
 #include "openflow/openflow-common.h"
 
 /* Active virtual connection to an OpenFlow device. */
@@ -30,20 +30,25 @@
  *
  * This structure should be treated as opaque by vconn implementations. */
 struct vconn {
-    struct vconn_class *class;
+    const struct vconn_class *class;
     int state;
     int error;
-    uint32_t allowed_versions;
-    uint32_t peer_versions;
-    enum ofp_version version;
+
+    /* OpenFlow versions. */
+    uint32_t allowed_versions;  /* Bitmap of versions we will accept. */
+    uint32_t peer_versions;     /* Peer's bitmap of versions it will accept. */
+    enum ofp_version version;   /* Negotiated version (or 0). */
+    bool recv_any_version;      /* True to receive a message of any version. */
+
     ovs_be32 remote_ip;
     ovs_be16 remote_port;
     ovs_be32 local_ip;
     ovs_be16 local_port;
+
     char *name;
 };
 
-void vconn_init(struct vconn *, struct vconn_class *, int connect_status,
+void vconn_init(struct vconn *, const struct vconn_class *, int connect_status,
                 const char *name, uint32_t allowed_versions);
 void vconn_free_data(struct vconn *vconn);
 void vconn_set_remote_ip(struct vconn *, ovs_be32 remote_ip);
@@ -53,7 +58,7 @@ void vconn_set_local_port(struct vconn *, ovs_be16 local_port);
 static inline void vconn_assert_class(const struct vconn *vconn,
                                       const struct vconn_class *class)
 {
-    assert(vconn->class == class);
+    ovs_assert(vconn->class == class);
 }
 
 struct vconn_class {
@@ -138,17 +143,17 @@ struct vconn_class {
  *
  * This structure should be treated as opaque by vconn implementations. */
 struct pvconn {
-    struct pvconn_class *class;
+    const struct pvconn_class *class;
     char *name;
     uint32_t allowed_versions;
 };
 
-void pvconn_init(struct pvconn *pvconn, struct pvconn_class *class,
+void pvconn_init(struct pvconn *pvconn, const struct pvconn_class *class,
                  const char *name, uint32_t allowed_versions);
 static inline void pvconn_assert_class(const struct pvconn *pvconn,
                                        const struct pvconn_class *class)
 {
-    assert(pvconn->class == class);
+    ovs_assert(pvconn->class == class);
 }
 
 struct pvconn_class {
@@ -193,13 +198,13 @@ struct pvconn_class {
 };
 
 /* Active and passive vconn classes. */
-extern struct vconn_class tcp_vconn_class;
-extern struct pvconn_class ptcp_pvconn_class;
-extern struct vconn_class unix_vconn_class;
-extern struct pvconn_class punix_pvconn_class;
+extern const struct vconn_class tcp_vconn_class;
+extern const struct pvconn_class ptcp_pvconn_class;
+extern const struct vconn_class unix_vconn_class;
+extern const struct pvconn_class punix_pvconn_class;
 #ifdef HAVE_OPENSSL
-extern struct vconn_class ssl_vconn_class;
-extern struct pvconn_class pssl_pvconn_class;
+extern const struct vconn_class ssl_vconn_class;
+extern const struct pvconn_class pssl_pvconn_class;
 #endif
 
 #endif /* vconn-provider.h */