fix switch negociation for non spec compliant devices.
ONOS now waits for switches to advertise their highest version via a hello
message. ONOS then replies with a hello of the appropriate version.
[Merged from 1.0]
Change-Id: I6ebe3f1b8f513920dc62016347a40f503de01457
(cherry picked from commit d9b2f4043291b60f54fccbfee612baec10815600)
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
index a60b49f..ccd0f59 100644
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
@@ -185,11 +185,17 @@
if (m.getVersion() == OFVersion.OF_13) {
log.debug("Received {} Hello from {}", m.getVersion(),
h.channel.getRemoteAddress());
+ h.sendHandshakeHelloMessage();
h.ofVersion = OFVersion.OF_13;
} else if (m.getVersion() == OFVersion.OF_10) {
log.debug("Received {} Hello from {} - switching to OF "
+ "version 1.0", m.getVersion(),
h.channel.getRemoteAddress());
+ OFHello hi =
+ h.factory10.buildHello()
+ .setXid(h.handshakeTransactionIds--)
+ .build();
+ h.channel.write(Collections.singletonList(hi));
h.ofVersion = OFVersion.OF_10;
} else {
log.error("Received Hello of version {} from switch at {}. "
@@ -1026,7 +1032,12 @@
channel = e.getChannel();
log.info("New switch connection from {}",
channel.getRemoteAddress());
- sendHandshakeHelloMessage();
+ /*
+ hack to wait for the switch to tell us what it's
+ max version is. This is not spec compliant and should
+ be removed as soon as switches behave better.
+ */
+ //sendHandshakeHelloMessage();
setState(ChannelState.WAIT_HELLO);
}