From 123aa435a26853e2d25930f017e2574a57616853 Mon Sep 17 00:00:00 2001
From: AndreMantas <andremantas7@gmail.com>
Date: Sat, 6 Jun 2015 23:46:03 +0100
Subject: [PATCH] Update LearningSwitch.java
writePacketOutForPacketIn now calls OFMessageUtils.writePacketOutForPacketIn
---
.../learningswitch/LearningSwitch.java | 21 +------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
index bbc1a0104..562c64d93 100644
--- a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
+++ b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
@@ -354,27 +354,8 @@ implements IFloodlightModule, ILearningSwitchService, IOFMessageListener {
* @param egressPort The switchport to output the PacketOut.
*/
private void writePacketOutForPacketIn(IOFSwitch sw, OFPacketIn packetInMessage, OFPort egressPort) {
- OFPacketOut.Builder pob = sw.getOFFactory().buildPacketOut();
-
- // Set buffer_id, in_port, actions_len
- pob.setBufferId(packetInMessage.getBufferId());
- pob.setInPort(packetInMessage.getVersion().compareTo(OFVersion.OF_12) < 0 ? packetInMessage.getInPort() : packetInMessage.getMatch().get(MatchField.IN_PORT));
-
- // set actions
- List<OFAction> actions = new ArrayList<OFAction>(1);
- actions.add(sw.getOFFactory().actions().buildOutput().setPort(egressPort).setMaxLen(0xffFFffFF).build());
- pob.setActions(actions);
-
- // set data - only if buffer_id == -1
- if (packetInMessage.getBufferId() == OFBufferId.NO_BUFFER) {
- byte[] packetData = packetInMessage.getData();
- pob.setData(packetData);
- }
-
- // and write it out
+ OFMessageUtils.writePacketOutForPacketIn(sw, packetInMessage, egressPort);
counterPacketOut.increment();
- sw.write(pob.build());
-
}
protected Match createMatchFromPacket(IOFSwitch sw, OFPort inPort, FloodlightContext cntx) {
--
GitLab