From d7a1589793139c702a8902dd1f40635525674086 Mon Sep 17 00:00:00 2001 From: Colin Dixon Date: Sat, 20 Apr 2013 13:46:36 -0700 Subject: [PATCH] reformatting packet creation to be more readable Change-Id: I1c22139c45b61530faf5a1a5891ff507deda28ff Signed-off-by: Colin Dixon --- .../arphandler/internal/ArpHandler.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) 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 da818d79ee..d4c1fd3045 100644 --- 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 @@ -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); -- 2.36.6