ovs-ofctl: Fix OpenFlow versions with '--bundle'
authorJarno Rajahalme <jrajahalme@nicira.com>
Mon, 19 Oct 2015 22:00:39 +0000 (15:00 -0700)
committerJarno Rajahalme <jrajahalme@nicira.com>
Mon, 19 Oct 2015 22:00:39 +0000 (15:00 -0700)
commit5f8c05ad9da5a6e2cbadd0b1ae74a4b2f24e62ea
treef0b4e8e426897694e628b403745fd8ecd4436c48
parent4b69263d2a4a2144aebb52c21305363d0edd2ee5
ovs-ofctl: Fix OpenFlow versions with '--bundle'

While the presence of the '--bundle' option implicitly added the
OpenFlow 1.4 to the allowed protocols, it failed to remove OpenFlow
1.0 from the allowed protocols.  This is changed so that '--bundle'
option now also implicitly removes versions lesser than 1.4 from the
allowed protocols.  This has no behavioral difference when ovs-ofctl
is paired with OVS that supports OpenFlow 1.4, as the greatest common
version is negotiated, but prevents negotiation of OpenFlow 1.0 when
OVS does not support OpenFlow 1.4.

Found by inspection.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: YAMAMOTO Takashi <yamamoto@midokura.com>
tests/ofproto.at
tests/ovs-ofctl.at
utilities/ovs-ofctl.c