Cherry-pick from https://gerrit.onos.onlab.us/#/c/338/
Lower the frequency of bug that PacketIn doesn't occur. (ONOS-1002)
Fixed a bug ProxyArpManager frequently deletes device from DB.
Change-Id: Ida1f8e36dee201b8d8dbd40325a2ee4a5c8736be
Fix compilation failure.
Change-Id: I0c3e253c6caa6f6b5315b30f2a647bb45d9c6b36
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java b/src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java
index 1919d87..d654f67 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java
@@ -1,5 +1,8 @@
package net.onrc.onos.ofcontroller.proxyarp;
+import java.net.InetAddress;
+
+// TODO This class is too generic to be handled by ProxyArpService.
/**
* Notification to another ONOS instance to send a packet out a single port.
*
@@ -8,13 +11,15 @@
private static final long serialVersionUID = 1L;
+ private final InetAddress address;
private final long outSwitch;
private final short outPort;
- public SinglePacketOutNotification(byte[] packet, long outSwitch,
- short outPort) {
+ public SinglePacketOutNotification(byte[] packet, InetAddress address,
+ long outSwitch, short outPort) {
super(packet);
+ this.address = address;
this.outSwitch = outSwitch;
this.outPort = outPort;
}
@@ -27,4 +32,7 @@
return outPort;
}
+ public InetAddress getTargetAddress() {
+ return address;
+ }
}