홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles M.C. Chan
Committed by Pavlin Radoslavov
f91dbea8 1 parent 86a6ca43

ONOS-537 Provided maxLen setting to make sure packet data is sent with packet-in message. (OF1.3) 

Apply Thomas Vachuska's solution of ONOS-537 (#2177) to FlowModBuilderVer13.
This solves the exception mentioned in the comment of ONOS-540.
Tested with OpenvSwitch 2.3.0 in Mininet 2.2.0.

Change-Id: Ia6680c0403577053948c4ede3b3e8b5b846495be
Inline Side-by-side
Showing 1 changed file with 9 additions and 2 deletions
......@@ -20,6 +20,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.instructions.Instruction;
......@@ -41,6 +42,7 @@ import org.projectfloodlight.openflow.protocol.OFFlowDelete;
import org.projectfloodlight.openflow.protocol.OFFlowMod;
import org.projectfloodlight.openflow.protocol.OFFlowModFlags;
import org.projectfloodlight.openflow.protocol.action.OFAction;
import org.projectfloodlight.openflow.protocol.action.OFActionOutput;
import org.projectfloodlight.openflow.protocol.match.Match;
import org.projectfloodlight.openflow.protocol.oxm.OFOxm;
import org.projectfloodlight.openflow.types.CircuitSignalID;
......@@ -62,6 +64,7 @@ import org.slf4j.LoggerFactory;
public class FlowModBuilderVer13 extends FlowModBuilder {
private static final Logger log = LoggerFactory.getLogger(FlowModBuilderVer10.class);
private static final int OFPCML_NO_BUFFER = 0xffff;
private final TrafficTreatment treatment;
......@@ -174,8 +177,12 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
break;
case OUTPUT:
OutputInstruction out = (OutputInstruction) i;
actions.add(factory().actions().buildOutput().setPort(
OFPort.of((int) out.port().toLong())).build());
OFActionOutput.Builder action = factory().actions().buildOutput()
.setPort(OFPort.of((int) out.port().toLong()));
if (out.port().equals(PortNumber.CONTROLLER)) {
action.setMaxLen(OFPCML_NO_BUFFER);
}
actions.add(action.build());
break;
case GROUP:
default:
......