adding packet types
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java b/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java
new file mode 100644
index 0000000..988b809
--- /dev/null
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java
@@ -0,0 +1,62 @@
+package org.onlab.onos.of.controller;
+
+import org.onlab.packet.Ethernet;
+import org.projectfloodlight.openflow.protocol.OFPacketIn;
+import org.projectfloodlight.openflow.protocol.OFPacketOut;
+import org.projectfloodlight.openflow.types.OFPort;
+
+public class DefaultPacketContext implements PacketContext {
+
+ private boolean free = true;
+ private boolean isBuilt = false;
+ private final OpenFlowSwitch sw;
+ private final OFPacketIn pktin;
+ private final OFPacketOut pktout = null;
+
+ private DefaultPacketContext(OpenFlowSwitch s, OFPacketIn pkt) {
+ this.sw = s;
+ this.pktin = pkt;
+ }
+
+ @Override
+ public void block() {
+ free = false;
+ }
+
+ @Override
+ public void send() {
+ if (free && isBuilt) {
+ sw.sendMsg(pktout);
+ }
+
+ }
+
+ @Override
+ public void build(OFPort outPort) {
+ isBuilt = true;
+
+ }
+
+ @Override
+ public void build(Ethernet ethFrame, OFPort outPort) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Ethernet parsed() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Dpid dpid() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public static PacketContext PacketContextFromPacketIn(OpenFlowSwitch s, OFPacketIn pkt) {
+ return new DefaultPacketContext(s, pkt);
+ }
+
+}
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java b/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java
index 5aec885..ab80eee 100644
--- a/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowController.java
@@ -87,9 +87,10 @@
/**
* Process a message and notify the appropriate listeners.
*
+ * @param dpid the dpid the message arrived on
* @param msg the message to process.
*/
- public void processPacket(OFMessage msg);
+ public void processPacket(Dpid dpid, OFMessage msg);
/**
* Sets the role for a given switch.
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/PacketContext.java b/of/api/src/main/java/org/onlab/onos/of/controller/PacketContext.java
index bc06e93..f7d434d 100644
--- a/of/api/src/main/java/org/onlab/onos/of/controller/PacketContext.java
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/PacketContext.java
@@ -1,5 +1,6 @@
package org.onlab.onos.of.controller;
+import org.onlab.packet.Ethernet;
import org.projectfloodlight.openflow.types.OFPort;
/**
@@ -34,13 +35,13 @@
* @param ethFrame the actual packet to send out.
* @param outPort the out port to send to packet out of.
*/
- public void build(Object ethFrame, OFPort outPort);
+ public void build(Ethernet ethFrame, OFPort outPort);
/**
* Provided a handle onto the parsed payload.
* @return the parsed form of the payload.
*/
- public Object parsed();
+ public Ethernet parsed();
/**
* Provide the dpid of the switch where the packet in arrived.
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java b/of/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java
index 0a83360..3c573d3 100644
--- a/of/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/driver/AbstractOpenFlowSwitch.java
@@ -159,7 +159,7 @@
*/
@Override
public final void handleMessage(OFMessage m) {
- this.agent.processMessage(m);
+ this.agent.processMessage(dpid, m);
}
@Override
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowAgent.java b/of/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowAgent.java
index a0f64e2..0d37666 100644
--- a/of/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowAgent.java
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/driver/OpenFlowAgent.java
@@ -69,7 +69,9 @@
/**
* Process a message coming from a switch.
+ *
+ * @param dpid the dpid the message came on.
* @param m the message to process
*/
- public void processMessage(OFMessage m);
+ public void processMessage(Dpid dpid, OFMessage m);
}