netdev-dpdk: fix mbuf leaks

[cascardo/ovs.git] / lib / vconn-provider.h

diff --git a/lib/vconn-provider.h b/lib/vconn-provider.h
index 7a41ee6..523f26f 100644 (file)
--- a/lib/vconn-provider.h
+++ b/lib/vconn-provider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,28 @@
 \f
 /* Active virtual connection to an OpenFlow device. */
 
+/* This structure should be treated as opaque by vconn implementations. */
+struct vconn {
+    const struct vconn_class *vclass;
+    int state;
+    int error;
+
+    /* 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. */
+
+    char *name;
+};
+
 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);
 static inline void vconn_assert_class(const struct vconn *vconn,
-                                      const struct vconn_class *class)
+                                      const struct vconn_class *vclass)
 {
-    ovs_assert(vconn->class == class);
+    ovs_assert(vconn->vclass == vclass);
 }
 
 struct vconn_class {
@@ -115,12 +130,18 @@ struct vconn_class {
 \f
 /* Passive virtual connection to an OpenFlow device. */
 
-void pvconn_init(struct pvconn *pvconn, const struct pvconn_class *class,
+/* This structure should be treated as opaque by vconn implementations. */
+struct pvconn {
+    const struct pvconn_class *pvclass;
+    char *name;
+    uint32_t allowed_versions;
+};
+void pvconn_init(struct pvconn *pvconn, const struct pvconn_class *pvclass,
                  const char *name, uint32_t allowed_versions);
 static inline void pvconn_assert_class(const struct pvconn *pvconn,
-                                       const struct pvconn_class *class)
+                                       const struct pvconn_class *pvclass)
 {
-    ovs_assert(pvconn->class == class);
+    ovs_assert(pvconn->pvclass == pvclass);
 }
 
 struct pvconn_class {