commit f84591d3facc79f9e67cc3fd97a3b8ae413a1cd8
author Jonathan Hart <jono@onlab.us> Fri Jan 16 14:33:43 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Sat Jan 17 16:43:38 2015 +0000
tree 1f80e2a73a9ecb6aadb596a4aca6c0a23c133f17
parent 422916f1db4c758aae024852bdc9afb9200617fe

Don't flood ARP packets out the port they came in on.

Also renamed ProxyArpService#known(Ip4Address) to
ProxyArpService#isKnown(Ip4Address)

Fixes ONOS-722.

Change-Id: I136c65e58693926e87b822cb0f4ec1c4ba0e3780

core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
index 2bb9c4f..90bc15e 100644
--- a/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
+++ b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
@@ -116,7 +116,7 @@
     }
 
     @Override
-    public boolean known(Ip4Address addr) {
+    public boolean isKnown(Ip4Address addr) {
         checkNotNull(addr, MAC_ADDR_NULL);
         Set<Host> hosts = hostService.getHostsByIp(addr);
         return !hosts.isEmpty();
@@ -189,7 +189,7 @@
         }
 
         if (src == null || dst == null) {
-            flood(eth);
+            flood(eth, inPort);
             return;
         }
 
@@ -263,7 +263,7 @@
     }
 
     @Override
-    public void forward(Ethernet eth) {
+    public void forward(Ethernet eth, ConnectPoint inPort) {
         checkNotNull(eth, REQUEST_NULL);
         checkArgument(eth.getEtherType() == Ethernet.TYPE_ARP,
                 REQUEST_NOT_ARP);
@@ -274,7 +274,7 @@
                 VlanId.vlanId(eth.getVlanID())));
 
         if (h == null) {
-            flood(eth);
+            flood(eth, inPort);
         } else {
             TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder();
             builder.setOutput(h.location().port());
@@ -291,7 +291,7 @@
         if (ethPkt != null && ethPkt.getEtherType() == Ethernet.TYPE_ARP) {
             ARP arp = (ARP) ethPkt.getPayload();
             if (arp.getOpCode() == ARP.OP_REPLY) {
-                forward(ethPkt);
+                forward(ethPkt, context.inPacket().receivedFrom());
             } else if (arp.getOpCode() == ARP.OP_REQUEST) {
                 reply(ethPkt, context.inPacket().receivedFrom());
             }
@@ -305,14 +305,14 @@
      * Flood the arp request at all edges in the network.
      * @param request the arp request.
      */
-    private void flood(Ethernet request) {
+    private void flood(Ethernet request, ConnectPoint inPort) {
         TrafficTreatment.Builder builder = null;
         ByteBuffer buf = ByteBuffer.wrap(request.serialize());
 
         synchronized (externalPorts) {
             for (Entry<Device, PortNumber> entry : externalPorts.entries()) {
                 ConnectPoint cp = new ConnectPoint(entry.getKey().id(), entry.getValue());
-                if (isOutsidePort(cp)) {
+                if (isOutsidePort(cp) || cp.equals(inPort)) {
                     continue;
                 }