/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * 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.
/* Provider interface to vconns, which provide a virtual connection to an
* OpenFlow device. */
-#include <assert.h>
-#include "vconn.h"
+#include "openvswitch/vconn.h"
+#include "util.h"
+#include "openflow/openflow-common.h"
\f
/* Active virtual connection to an OpenFlow device. */
-/* Active virtual connection to an OpenFlow device.
- *
- * This structure should be treated as opaque by vconn implementations. */
+/* This structure should be treated as opaque by vconn implementations. */
struct vconn {
- struct vconn_class *class;
+ const struct vconn_class *vclass;
int state;
int error;
- int min_version;
- int version;
- uint32_t remote_ip;
- uint16_t remote_port;
- uint32_t local_ip;
- uint16_t local_port;
+
+ /* 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 *, struct vconn_class *, int connect_status,
- const char *name);
-void vconn_set_remote_ip(struct vconn *, uint32_t remote_ip);
-void vconn_set_remote_port(struct vconn *, uint16_t remote_port);
-void vconn_set_local_ip(struct vconn *, uint32_t local_ip);
-void vconn_set_local_port(struct vconn *, uint16_t local_port);
+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)
{
- assert(vconn->class == class);
+ ovs_assert(vconn->vclass == vclass);
}
struct vconn_class {
* connection name provided by the user, e.g. "tcp:1.2.3.4". This name is
* useful for error messages but must not be modified.
*
+ * 'allowed_versions' is the OpenFlow versions that may be
+ * negotiated for a connection.
+ *
* 'suffix' is a copy of 'name' following the colon and may be modified.
+ * 'dscp' is the DSCP value that the new connection should use in the IP
+ * packets it sends.
*
* Returns 0 if successful, otherwise a positive errno value. If
* successful, stores a pointer to the new connection in '*vconnp'.
* If the connection cannot be completed immediately, it should return
* EAGAIN (not EINPROGRESS, as returned by the connect system call) and
* continue the connection in the background. */
- int (*open)(const char *name, char *suffix, struct vconn **vconnp);
+ int (*open)(const char *name, uint32_t allowed_versions,
+ char *suffix, struct vconn **vconnp, uint8_t dscp);
/* Closes 'vconn' and frees associated memory. */
void (*close)(struct vconn *vconn);
* accepted for transmission, it should return EAGAIN. */
int (*send)(struct vconn *vconn, struct ofpbuf *msg);
+ /* Allows 'vconn' to perform maintenance activities, such as flushing
+ * output buffers.
+ *
+ * May be null if 'vconn' doesn't have anything to do here. */
+ void (*run)(struct vconn *vconn);
+
+ /* Arranges for the poll loop to wake up when 'vconn' needs to perform
+ * maintenance activities.
+ *
+ * May be null if 'vconn' doesn't have anything to do here. */
+ void (*run_wait)(struct vconn *vconn);
+
/* Arranges for the poll loop to wake up when 'vconn' is ready to take an
* action of the given 'type'. */
void (*wait)(struct vconn *vconn, enum vconn_wait_type type);
};
\f
-/* Passive virtual connection to an OpenFlow device.
- *
- * This structure should be treated as opaque by vconn implementations. */
+/* Passive virtual connection to an OpenFlow device. */
+
+/* This structure should be treated as opaque by vconn implementations. */
struct pvconn {
- struct pvconn_class *class;
+ const struct pvconn_class *pvclass;
char *name;
+ uint32_t allowed_versions;
};
-
-void pvconn_init(struct pvconn *, struct pvconn_class *, const char *name);
+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)
{
- assert(pvconn->class == class);
+ ovs_assert(pvconn->pvclass == pvclass);
}
struct pvconn_class {
* full connection name provided by the user, e.g. "ptcp:1234". This name
* is useful for error messages but must not be modified.
*
+ * 'allowed_versions' is the OpenFlow protocol versions that may
+ * be negotiated for a session.
+ *
* 'suffix' is a copy of 'name' following the colon and may be modified.
+ * 'dscp' is the DSCP value that the new connection should use in the IP
+ * packets it sends.
*
* Returns 0 if successful, otherwise a positive errno value. If
* successful, stores a pointer to the new connection in '*pvconnp'.
* completed immediately, it should return EAGAIN (not EINPROGRESS, as
* returned by the connect system call) and continue the connection in the
* background. */
- int (*listen)(const char *name, char *suffix, struct pvconn **pvconnp);
+ int (*listen)(const char *name, uint32_t allowed_versions,
+ char *suffix, struct pvconn **pvconnp, uint8_t dscp);
/* Closes 'pvconn' and frees associated memory. */
void (*close)(struct pvconn *pvconn);
};
/* 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 */
projects / cascardo / ovs.git / blobdiff