홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
Committed by Gerrit Code Review
20318990 1 parent 24077f15

Renamed private method to avoid naming confusion 

  DefaultOpenFlowPacketContext.inport() -> pktinInPort()

There is a public method DefaultOpenFlowPacketContext.inPort()
and having another method called inport() is confusing.

Change-Id: I6b703eb640edab24fb0112bd2019395eeb3d8421
Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
......@@ -60,7 +60,7 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
OFPacketOut.Builder builder = sw.factory().buildPacketOut();
OFAction act = buildOutput(outPort.getPortNumber());
pktout = builder.setXid(pktin.getXid())
.setInPort(inport())
.setInPort(pktinInPort())
.setBufferId(OFBufferId.NO_BUFFER)
.setData(pktin.getData())
// .setBufferId(pktin.getBufferId())
......@@ -77,7 +77,7 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
OFAction act = buildOutput(outPort.getPortNumber());
pktout = builder.setXid(pktin.getXid())
.setBufferId(OFBufferId.NO_BUFFER)
.setInPort(inport())
.setInPort(pktinInPort())
.setActions(Collections.singletonList(act))
.setData(ethFrame.serialize())
.build();
......@@ -106,11 +106,10 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
@Override
public Integer inPort() {
return inport().getPortNumber();
return pktinInPort().getPortNumber();
}
private OFPort inport() {
private OFPort pktinInPort() {
//FIXME: this has to change in loxi
try {
return pktin.getInPort();
......