X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=lib%2Fvconn-provider.h;h=523f26f391a57ade2bc34b66040bade16dea480c;hb=HEAD;hp=ada61368ce9c9dda49a00ebcd5195534659c2267;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=cascardo%2Fovs.git diff --git a/lib/vconn-provider.h b/lib/vconn-provider.h index ada61368c..523f26f39 100644 --- a/lib/vconn-provider.h +++ b/lib/vconn-provider.h @@ -1,5 +1,5 @@ /* - * 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. @@ -20,31 +20,34 @@ /* Provider interface to vconns, which provide a virtual connection to an * OpenFlow device. */ -#include -#include "vconn.h" +#include "openvswitch/vconn.h" +#include "util.h" +#include "openflow/openflow-common.h" /* 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 ip; + + /* 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; - bool reconnectable; }; -void vconn_init(struct vconn *, struct vconn_class *, int connect_status, - uint32_t ip, const char *name, bool reconnectable); +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 { @@ -55,7 +58,12 @@ 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'. @@ -64,7 +72,8 @@ struct vconn_class { * 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); @@ -102,24 +111,37 @@ struct vconn_class { * 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); }; -/* 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 { @@ -130,7 +152,12 @@ 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'. @@ -139,7 +166,8 @@ struct pvconn_class { * 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); @@ -158,13 +186,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 */