From 1c76348f5d86303df1c3da9d78bacd55ec63205f Mon Sep 17 00:00:00 2001 From: Giovanni Meo Date: Fri, 29 Nov 2013 09:05:27 +0000 Subject: [PATCH] Revert "Fix bug 171. EchoReply payload must be the same as the correspoding EchoRequest payload" because is causing the switches to periodically disconnect. This reverts commit e4f47d259077775ceeb1554c807eed8841263865. Change-Id: I0aa07d67ca6e6651e4d29a03c4282d5d6d2168da Signed-off-by: Giovanni Meo --- .../openflow/core/internal/SwitchHandler.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java index ed79d5c5a8..6fddef06a8 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java @@ -38,7 +38,6 @@ import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitch; import org.openflow.protocol.OFBarrierReply; import org.openflow.protocol.OFBarrierRequest; import org.openflow.protocol.OFEchoReply; -import org.openflow.protocol.OFEchoRequest; import org.openflow.protocol.OFError; import org.openflow.protocol.OFFeaturesReply; import org.openflow.protocol.OFFlowMod; @@ -372,12 +371,6 @@ public class SwitchHandler implements ISwitch { break; case ECHO_REQUEST: OFEchoReply echoReply = (OFEchoReply) factory.getMessage(OFType.ECHO_REPLY); - - // the EchoReply must have the same payload as the request - byte []payload = ((OFEchoRequest)msg).getPayload(); - echoReply.setPayload(payload); - echoReply.setLength( (short) (echoReply.getLength() + payload.length )); - // respond immediately asyncSendNow(echoReply, msg.getXid()); -- 2.36.6