Merge "FRM logging improvements"

[controller.git] / opendaylight / arphandler / src / main / java / org / opendaylight / controller / arphandler / internal / ArpHandler.java

diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
index a9667d805494f92e2caa23b3f2f703e9f234549f..d4c1fd3045971611bf074d30f92f8288f21bd3e7 100644 (file)
--- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
+++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java
@@ -71,7 +71,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket {
 
     void unsetDataPacketService(IDataPacketService s) {
         if (this.dataPacketService == s) {
-            this.dataPacketService = s;
+            this.dataPacketService = null;
         }
     }
 
@@ -284,27 +284,31 @@ public class ArpHandler implements IHostFinder, IListenDataPacket {
             ARP arp = new ARP();
             byte[] senderIP = subnet.getNetworkAddress().getAddress();
             byte[] targetIPB = targetIP.getAddress();
-            arp.setHardwareType(ARP.HW_TYPE_ETHERNET).setProtocolType(
-                    EtherTypes.IPv4.shortValue()).setHardwareAddressLength(
-                    (byte) 6).setProtocolAddressLength((byte) 4).setOpCode(
-                    ARP.REQUEST).setSenderHardwareAddress(getControllerMAC())
-                    .setSenderProtocolAddress(senderIP)
-                    .setTargetHardwareAddress(
-                            new byte[] { (byte) 0, (byte) 0, (byte) 0,
-                                    (byte) 0, (byte) 0, (byte) 0 })
-                    .setTargetProtocolAddress(targetIPB);
+            arp.setHardwareType(ARP.HW_TYPE_ETHERNET)
+               .setProtocolType(EtherTypes.IPv4.shortValue())
+               .setHardwareAddressLength((byte) 6)
+               .setProtocolAddressLength((byte) 4)
+               .setOpCode(ARP.REQUEST)
+               .setSenderHardwareAddress(getControllerMAC())
+               .setSenderProtocolAddress(senderIP)
+               .setTargetHardwareAddress(new byte[] { (byte) 0, (byte) 0,
+                                                     (byte) 0, (byte) 0,
+                                                     (byte) 0, (byte) 0 })
+               .setTargetProtocolAddress(targetIPB);
 
             Ethernet ethernet = new Ethernet();
             ethernet.setSourceMACAddress(getControllerMAC())
-                    .setDestinationMACAddress(
-                            new byte[] { (byte) -1, (byte) -1, (byte) -1,
-                                    (byte) -1, (byte) -1, (byte) -1 })
+                    .setDestinationMACAddress(new byte[] { (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1,
+                                                          (byte) -1 })
                     .setEtherType(EtherTypes.ARP.shortValue()).setPayload(arp);
 
             // TODO For now send port-by-port, see how to optimize to
             // send to a bunch of port on the same node in a shoot
-            RawPacket destPkt = this.dataPacketService
-                    .encodeDataPacket(ethernet);
+            RawPacket destPkt = this.dataPacketService.encodeDataPacket(ethernet);
             destPkt.setOutgoingNodeConnector(p);
 
             this.dataPacketService.transmitDataPacket(destPkt);