[ovs-git] Open vSwitch: ofproto, connmgr: Parameterise OpenFlow versions for adding controller (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  1d9ffc175a68bf05c57797fa3715476f9e426b55 (commit)
       via  e182670b0262e58a982a659dc5248aa5874264e2 (commit)
       via  6042457bd537a2b5140e17e4abceacbaafff6b57 (commit)
      from  681ea7a0e98edf156aab79b062425d7ac638e415 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d9ffc175a68bf05c57797fa3715476f9e426b55
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=1d9ffc175a68bf05c57797fa3715476f9e426b55
Author: Simon Horman <horms at verge.net.au>
		
ofproto, connmgr: Parameterise OpenFlow versions for adding controller
		
Allow allowed Open Flow versions to be passed rather
than relying on hard-coded defaults.

This is in preparation for allowing configuration of the
allowed OpenFlow versions.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit e182670b0262e58a982a659dc5248aa5874264e2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e182670b0262e58a982a659dc5248aa5874264e2
Author: Simon Horman <horms at verge.net.au>
		
vonn: Allow snoops to use the OpenFlow version of the controller connection
		
Override the allowed versions of the snoop vconn so that
only the version of the controller connection is allowed.
This is because the snoop will see the same messages as the
controller.

Without this change the snoop will try to negotiate a connection
using the default allowed versions, or in other words only
allow OpenFlow 1.0. This breaks snoops for controller connections
using other OpenFlow versions, that is OpenFlow 1.2.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 6042457bd537a2b5140e17e4abceacbaafff6b57
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6042457bd537a2b5140e17e4abceacbaafff6b57
Author: Simon Horman <horms at verge.net.au>
		
rconn: Add allowed OpenFlow versions
		
Add allowed OpenFlow versions to struct rconn to allow
reconnect to use these parameters rather than hard-coded defaults.

This is in preparation for allowing configuration of the
allowed OpenFlow versions.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/rconn.c                |   33 ++++++++++++++++++++++++++++++---
 lib/rconn.h                |    4 +++-
 lib/vconn.c                |    8 ++++++++
 lib/vconn.h                |    2 ++
 ofproto/connmgr.c          |   18 +++++++++++-------
 ofproto/connmgr.h          |    3 ++-
 ofproto/ofproto.c          |    5 +++--
 ofproto/ofproto.h          |    3 ++-
 utilities/ovs-controller.c |    2 +-
 vswitchd/bridge.c          |    2 +-
 10 files changed, 63 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Open vSwitch