X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Farphandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Farphandler%2Finternal%2FArpHandler.java;h=fe456f3f8ebe6f6237352cb09f5b6a7dc8056398;hp=abe104a40638f1a58e47fdcc5f91eda6b1f87359;hb=6f9fda057ddadd8d4eef643bca398cea65dd2007;hpb=18a090d8e17e83debe6748b4db865435aeab88c8 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 abe104a406..fe456f3f8e 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 @@ -1,4 +1,3 @@ - /* * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. * @@ -37,6 +36,8 @@ import org.opendaylight.controller.clustering.services.ICacheUpdateAware; import org.opendaylight.controller.clustering.services.IClusterContainerServices; import org.opendaylight.controller.clustering.services.IClusterServices; import org.opendaylight.controller.connectionmanager.IConnectionManager; +import org.opendaylight.controller.hosttracker.HostIdFactory; +import org.opendaylight.controller.hosttracker.IHostId; import org.opendaylight.controller.hosttracker.IfHostListener; import org.opendaylight.controller.hosttracker.IfIptoHost; import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector; @@ -48,12 +49,12 @@ import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.packet.ARP; import org.opendaylight.controller.sal.packet.Ethernet; import org.opendaylight.controller.sal.packet.IDataPacketService; +import org.opendaylight.controller.sal.packet.IEEE8021Q; import org.opendaylight.controller.sal.packet.IListenDataPacket; import org.opendaylight.controller.sal.packet.IPv4; import org.opendaylight.controller.sal.packet.Packet; import org.opendaylight.controller.sal.packet.PacketResult; import org.opendaylight.controller.sal.packet.RawPacket; -import org.opendaylight.controller.sal.routing.IRouting; import org.opendaylight.controller.sal.utils.EtherTypes; import org.opendaylight.controller.sal.utils.HexEncode; import org.opendaylight.controller.sal.utils.NetUtils; @@ -63,6 +64,31 @@ import org.opendaylight.controller.topologymanager.ITopologyManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * The ArpHandler offers services to react on ARP requests and replies + * sent by network hosts. Moreover it allows for creating ARP messages + * by the controller itself. + * + * The ARP Handler on ODL doesn't use the requester MAC address in + * order to avoid to have to build a spanning tree where to forward + * ARP Requests. The ARP requests are broadcast packets so in order to + * reach everywhere need to be flooded, when you flood in a network + * that is not a tree (all the networks has some level of redundancy) + * that would create forwarding loops without a spanning tree. Given + * the need is only to send out the ARP requests toward all the hosts + * we actually don't need to implement a flooding mechanism in software + * (which would be expensive) we just send out the ARP request toward + * all the ports that are suspected to be host ports on all the + * switches (from the controller). Now the condition for which a port + * is marked as host port could potentially be incorrect so when the + * controller sends out the ARP Request that could come back to the + * controller and could cause another request not needed. So changing + * the source MAC address of the request to be the one of the controller, + * controller can protect itself from honoring twice the same request. + * This enables an ARP handler resolution, without the need of spanning + * tree and limiting software flooding to the minimum required. + */ + public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateAware { private static final Logger log = LoggerFactory.getLogger(ArpHandler.class); static final String ARP_EVENT_CACHE_NAME = "arphandler.arpRequestReplyEvent"; @@ -70,7 +96,6 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA private ISwitchManager switchManager; private ITopologyManager topologyManager; private IDataPacketService dataPacketService; - private IRouting routing; private IClusterContainerServices clusterContainerService; private IConnectionManager connectionManager; private Set hostListeners = new CopyOnWriteArraySet(); @@ -80,27 +105,29 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA private BlockingQueue ARPCacheEvents = new LinkedBlockingQueue(); private Thread cacheEventHandler; private boolean stopping = false; + /* * A cluster allocated cache. Used for synchronizing ARP request/reply - * events across all cluster controllers. To raise an event, we put() a specific - * event object (as key) and all nodes handle it in the entryUpdated callback. + * events across all cluster controllers. To raise an event, we put() a + * specific event object (as key) and all nodes handle it in the + * entryUpdated callback. * * In case of ARPReply, we put true value to send replies to any requestors * by calling generateAndSendReply */ private ConcurrentMap arpRequestReplyEvent; - void setConnectionManager(IConnectionManager cm){ + void setConnectionManager(IConnectionManager cm) { this.connectionManager = cm; } - void unsetConnectionManager(IConnectionManager cm){ - if (this.connectionManager == cm){ + void unsetConnectionManager(IConnectionManager cm) { + if (this.connectionManager == cm) { connectionManager = null; } } - void setClusterContainerService(IClusterContainerServices s){ + void setClusterContainerService(IClusterContainerServices s) { this.clusterContainerService = s; } @@ -110,16 +137,6 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } } - void setRouting(IRouting r) { - this.routing = r; - } - - void unsetRouting(IRouting r) { - if (this.routing == r) { - this.routing = null; - } - } - void setHostListener(IfHostListener s) { if (this.hostListeners != null) { this.hostListeners.add(s); @@ -164,13 +181,18 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } } - protected void sendARPReply(NodeConnector p, byte[] sMAC, InetAddress sIP, - byte[] tMAC, InetAddress tIP) { + protected void sendARPReply(NodeConnector p, byte[] sMAC, InetAddress sIP, byte[] tMAC, InetAddress tIP, short vlan) { byte[] senderIP = sIP.getAddress(); byte[] targetIP = tIP.getAddress(); - ARP arp = createARP(ARP.REPLY,sMAC,senderIP,tMAC,targetIP); + ARP arp = createARP(ARP.REPLY, sMAC, senderIP, tMAC, targetIP); - Ethernet ethernet = createEthernet(sMAC, tMAC, arp); + if(log.isTraceEnabled()) { + log.trace("Sending Arp Reply with srcMac {} - srcIp {} - dstMac {} - dstIp {} - outport {}", + HexEncode.bytesToHexString(sMAC), + sIP, HexEncode.bytesToHexString(tMAC), tIP, p); + } + + Ethernet ethernet = createEthernet(sMAC, tMAC, arp, vlan); RawPacket destPkt = this.dataPacketService.encodeDataPacket(ethernet); destPkt.setOutgoingNodeConnector(p); @@ -178,7 +200,25 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA this.dataPacketService.transmitDataPacket(destPkt); } - protected void handleARPPacket(Ethernet eHeader, ARP pkt, NodeConnector p) { + private void logArpPacket(ARP pkt, NodeConnector p, short vlan) { + try { + log.trace("Received Arp {} with srcMac {} - srcIp {} - dstMac {} - dstIp {} - inport {} {}", + ((pkt.getOpCode() == ARP.REQUEST) ? "Request" : "Reply"), + HexEncode.bytesToHexString(pkt.getSenderHardwareAddress()), + InetAddress.getByAddress(pkt.getSenderProtocolAddress()), + HexEncode.bytesToHexString(pkt.getTargetHardwareAddress()), + InetAddress.getByAddress(pkt.getTargetProtocolAddress()), p, (vlan != 0 ? "on vlan " + vlan : "")); + + } catch (UnknownHostException e) { + log.warn("Illegal Ip Address in the ARP packet", e); + } + } + + protected void handleARPPacket(Ethernet eHeader, ARP pkt, NodeConnector p, short vlan) { + + if(log.isTraceEnabled()) { + logArpPacket(pkt, p, vlan); + } byte[] sourceMAC = eHeader.getSourceMACAddress(); byte[] targetMAC = eHeader.getDestinationMACAddress(); @@ -214,15 +254,14 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA // Make sure that the host is a legitimate member of this subnet if (!subnet.hasNodeConnector(p)) { - log.debug("{} showing up on {} does not belong to {}", - new Object[] { sourceIP, p, subnet }); + log.debug("{} showing up on {} does not belong to {}", new Object[] { sourceIP, p, subnet }); return; } HostNodeConnector requestor = null; if (NetUtils.isUnicastMACAddr(sourceMAC) && p.getNode() != null) { try { - requestor = new HostNodeConnector(sourceMAC, sourceIP, p, subnet.getVlan()); + requestor = new HostNodeConnector(sourceMAC, sourceIP, p, vlan); } catch (ConstructionException e) { log.debug("Received ARP packet with invalid MAC: {}", HexEncode.bytesToHexString(sourceMAC)); return; @@ -237,9 +276,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /* - * OpCode != request -> ARP Reply. If there are hosts (in - * arpRequestors) waiting for the ARP reply for this sourceIP, it's - * time to generate the reply and send it to these hosts. + * OpCode != request -> ARP Reply. If there are hosts (in arpRequestors) + * waiting for the ARP reply for this sourceIP, it's time to generate + * the reply and send it to these hosts. * * If sourceIP==targetIP, it is a Gratuitous ARP. If there are hosts (in * arpRequestors) waiting for the ARP reply for this sourceIP, it's time @@ -247,41 +286,44 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA */ if (pkt.getOpCode() != ARP.REQUEST || sourceIP.equals(targetIP)) { - // Raise a reply event so that any waiting requestors will be sent a reply - // the true value indicates we should generate replies to requestors across the cluster + // Raise a reply event so that any waiting requestors will be sent a + // reply + // the true value indicates we should generate replies to requestors + // across the cluster log.trace("Received ARP reply packet from {}, reply to all requestors.", sourceIP); - arpRequestReplyEvent.put(new ARPReply(sourceIP, sourceMAC), true); + arpRequestReplyEvent.put(new ARPReply(sourceIP, sourceMAC, vlan), true); return; } /* - * ARP Request Handling: - * If targetIP is the IP of the subnet, reply with ARP REPLY - * If targetIP is a known host, PROXY ARP (by sending ARP REPLY) on behalf of known target hosts. - * For unknown target hosts, generate and send an ARP request to ALL switches/ports using - * the IP address defined in the subnet as source address + * ARP Request Handling: If targetIP is the IP of the subnet, reply with + * ARP REPLY If targetIP is a known host, PROXY ARP (by sending ARP + * REPLY) on behalf of known target hosts. For unknown target hosts, + * generate and send an ARP request to ALL switches/ports using the IP + * address defined in the subnet as source address */ /* * If target IP is gateway IP, Send ARP reply */ if ((targetIP.equals(subnet.getNetworkAddress())) && (NetUtils.isBroadcastMACAddr(targetMAC) || Arrays.equals(targetMAC, getControllerMAC()))) { - if (connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL){ - if (log.isTraceEnabled()){ + if (connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) { + if (log.isTraceEnabled()) { log.trace("Received local ARP req. for default gateway. Replying with controller MAC: {}", HexEncode.bytesToHexString(getControllerMAC())); } - sendARPReply(p, getControllerMAC(), targetIP, pkt.getSenderHardwareAddress(), sourceIP); + sendARPReply(p, getControllerMAC(), targetIP, pkt.getSenderHardwareAddress(), sourceIP, vlan); } else { log.trace("Received non-local ARP req. for default gateway. Raising reply event"); arpRequestReplyEvent.put( - new ARPReply(p, targetIP, getControllerMAC(), sourceIP, pkt.getSenderHardwareAddress()), false); + new ARPReply(p, targetIP, getControllerMAC(), sourceIP, pkt.getSenderHardwareAddress(), vlan), false); } return; } - - HostNodeConnector host = hostTracker.hostQuery(targetIP); + // Hosttracker hosts db key implementation + IHostId id = HostIdFactory.create(targetIP, null); + HostNodeConnector host = hostTracker.hostQuery(id); // unknown host, initiate ARP request if (host == null) { // add the requestor to the list so that we can replay the reply @@ -293,48 +335,40 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA arpRequestors.put(targetIP, requestorSet); } requestorSet.add(requestor); - countDownTimers.put(targetIP, (short) 2); // reset timeout to 2sec + countDownTimers.put(targetIP, (short) 2); // reset timeout to + // 2sec } - //Raise a bcast request event, all controllers need to send one + // Raise a bcast request event, all controllers need to send one log.trace("Sending a bcast ARP request for {}", targetIP); arpRequestReplyEvent.put(new ARPRequest(targetIP, subnet), false); } else { /* - * Target host known (across the cluster), send ARP REPLY make sure that targetMAC - * matches the host's MAC if it is not broadcastMAC + * Target host known (across the cluster), send ARP REPLY make sure + * that targetMAC matches the host's MAC if it is not broadcastMAC */ if (NetUtils.isBroadcastMACAddr(targetMAC) || Arrays.equals(host.getDataLayerAddressBytes(), targetMAC)) { log.trace("Received ARP req. for known host {}, sending reply...", targetIP); if (connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) { - sendARPReply(p, - host.getDataLayerAddressBytes(), - host.getNetworkAddress(), - pkt.getSenderHardwareAddress(), - sourceIP); + sendARPReply(p, host.getDataLayerAddressBytes(), host.getNetworkAddress(), + pkt.getSenderHardwareAddress(), sourceIP, vlan); } else { - arpRequestReplyEvent.put(new ARPReply( - p, - host.getNetworkAddress(), - host.getDataLayerAddressBytes(), - sourceIP, - pkt.getSenderHardwareAddress()), false); + arpRequestReplyEvent.put(new ARPReply(p, host.getNetworkAddress(), host.getDataLayerAddressBytes(), + sourceIP, pkt.getSenderHardwareAddress(), vlan), false); } } else { /* - * Target MAC has been changed. For now, discard it. - * TODO: We may need to send unicast ARP REQUEST on behalf of - * the target back to the sender to trigger the sender to update - * its table + * Target MAC has been changed. For now, discard it. TODO: We + * may need to send unicast ARP REQUEST on behalf of the target + * back to the sender to trigger the sender to update its table */ } } } /** - * Send a broadcast ARP Request to the switch/ ports using - * the networkAddress of the subnet as sender IP - * the controller's MAC as sender MAC - * the targetIP as the target Network Address + * Send a broadcast ARP Request to the switch/ ports using the + * networkAddress of the subnet as sender IP the controller's MAC as sender + * MAC the targetIP as the target Network Address */ protected void sendBcastARPRequest(InetAddress targetIP, Subnet subnet) { log.trace("sendBcatARPRequest targetIP:{} subnet:{}", targetIP, subnet); @@ -349,10 +383,11 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } byte[] targetHardwareAddress = new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0 }; - //TODO: should use IBroadcastHandler instead + // TODO: should use IBroadcastHandler instead for (NodeConnector p : nodeConnectors) { - //filter out any non-local or internal ports - if (!(connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) || topologyManager.isInternal(p)) { + // filter out any non-local or internal ports + if (!(connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) + || topologyManager.isInternal(p)) { continue; } log.trace("Sending toward nodeConnector:{}", p); @@ -360,8 +395,13 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA byte[] targetIPByte = targetIP.getAddress(); ARP arp = createARP(ARP.REQUEST, getControllerMAC(), senderIP, targetHardwareAddress, targetIPByte); + if(log.isTraceEnabled()) { + log.trace("Sending Broadcast Arp Request with srcMac {} - srcIp {} - dstMac {} - dstIp {} - outport {}", HexEncode.bytesToHexString(getControllerMAC()), + subnet.getNetworkAddress(), HexEncode.bytesToHexString(targetHardwareAddress), targetIP, p); + } + byte[] destMACAddress = NetUtils.getBroadcastMACAddr(); - Ethernet ethernet = createEthernet(getControllerMAC(), destMACAddress, arp); + Ethernet ethernet = createEthernet(getControllerMAC(), destMACAddress, arp, (short)0); // TODO For now send port-by-port, see how to optimize to // send to multiple ports at once @@ -373,10 +413,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * Send a unicast ARP Request to the known host on a specific switch/port as - * defined in the host. - * The sender IP is the networkAddress of the subnet - * The sender MAC is the controller's MAC + * Send a unicast ARP Request to the known host on specific (switch/port, + * vlan) as defined in the host. The sender IP is the networkAddress of the + * subnet The sender MAC is the controller's MAC */ protected void sendUcastARPRequest(HostNodeConnector host, Subnet subnet) { log.trace("sendUcastARPRequest host:{} subnet:{}", host, subnet); @@ -391,7 +430,14 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA byte[] targetMAC = host.getDataLayerAddressBytes(); ARP arp = createARP(ARP.REQUEST, getControllerMAC(), senderIP, targetMAC, targetIP); - Ethernet ethernet = createEthernet(getControllerMAC(), targetMAC, arp); + if(log.isTraceEnabled()) { + log.trace("Sending Unicast Arp Request with srcMac {} - srcIp {} - dstMac {} - dstIp {} - outport {}", + HexEncode.bytesToHexString(getControllerMAC()), + subnet.getNetworkAddress(), HexEncode.bytesToHexString(targetMAC), host.getNetworkAddress(), + outPort); + } + + Ethernet ethernet = createEthernet(getControllerMAC(), targetMAC, arp, host.getVlan()); RawPacket destPkt = this.dataPacketService.encodeDataPacket(ethernet); destPkt.setOutgoingNodeConnector(outPort); @@ -425,15 +471,14 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA Subnet subnet = null; if (switchManager != null) { - subnet = switchManager.getSubnetByNetworkAddress(host - .getNetworkAddress()); + subnet = switchManager.getSubnetByNetworkAddress(host.getNetworkAddress()); } if (subnet == null) { log.debug("can't find subnet matching {}", host.getNetworkAddress()); return; } - if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL){ + if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL) { log.trace("Send a ucast ARP req. to: {}", host); sendUcastARPRequest(host, subnet); } else { @@ -443,18 +488,18 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * An IP packet is punted to the controller, this means that the - * destination host is not known to the controller. - * Need to discover it by sending a Broadcast ARP Request + * An IP packet is punted to the controller, this means that the destination + * host is not known to the controller. Need to discover it by sending a + * Broadcast ARP Request * * @param pkt * @param p */ - protected void handlePuntedIPPacket(IPv4 pkt, NodeConnector p) { + protected void handlePuntedIPPacket(IPv4 pkt, NodeConnector p, short vlan) { InetAddress dIP = NetUtils.getInetAddress(pkt.getDestinationAddress()); if (dIP == null) { - return; + return; } // try to find a matching subnet @@ -466,42 +511,26 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA log.debug("Can't find subnet matching {}, drop packet", dIP); return; } + // If packet is sent to the default gw (us), ignore it for now + if (subnet.getNetworkAddress().equals(dIP)) { + log.trace("Ignore IP packet destined to default gw"); + return; + } // see if we know about the host + // Hosttracker hosts db key implementation HostNodeConnector host = hostTracker.hostFind(dIP); if (host == null) { - // if we don't, know about the host, try to find it - log.trace("Punted IP pkt to {}, sending bcast ARP event...", - dIP); + // if we don't know about the host, try to find it + log.trace("Punted IP pkt to {}, sending bcast ARP event...", dIP); /* * unknown destination host, initiate bcast ARP request */ arpRequestReplyEvent.put(new ARPRequest(dIP, subnet), false); - } else if (routing == null || - routing.getRoute(p.getNode(), host.getnodeconnectorNode()) != null) { - /* if IRouting is available, make sure that this packet can get it's - * destination normally before teleporting it there. If it's not - * available, then assume it's reachable. - * - * TODO: come up with a way to do this in the absence of IRouting - */ - - log.trace("forwarding punted IP pkt to {} received at {}", dIP, p); - - /* if we know where the host is and there's a path from where this - * packet was punted to where the host is, then deliver it to the - * host for now */ - NodeConnector nc = host.getnodeConnector(); - - // re-encode the Ethernet packet (the parent of the IPv4 packet) - RawPacket rp = this.dataPacketService.encodeDataPacket(pkt.getParent()); - rp.setOutgoingNodeConnector(nc); - this.dataPacketService.transmitDataPacket(rp); } else { - log.trace("ignoring punted IP pkt to {} because there is no route from {}", - dIP, p); + log.trace("Ignoring punted IP pkt to known host: {} (received on: {})", dIP, p); } } @@ -524,19 +553,20 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA allocateCaches(); retrieveCaches(); + } @SuppressWarnings({ "unchecked" }) private void retrieveCaches() { - ConcurrentMap map; + ConcurrentMap map; - if (this.clusterContainerService == null){ + if (this.clusterContainerService == null) { log.error("Cluster service unavailable, can't retieve ARPHandler caches!"); return; } map = clusterContainerService.getCache(ARP_EVENT_CACHE_NAME); - if (map != null){ + if (map != null) { this.arpRequestReplyEvent = (ConcurrentMap) map; } else { log.error("Cache allocation failed for {}", ARP_EVENT_CACHE_NAME); @@ -544,30 +574,31 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } private void allocateCaches() { - if (clusterContainerService == null){ + if (clusterContainerService == null) { nonClusterObjectCreate(); log.error("Clustering service unavailable. Allocated non-cluster caches for ARPHandler."); return; } - try{ + try { clusterContainerService.createCache(ARP_EVENT_CACHE_NAME, EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - } catch (CacheConfigException e){ + } catch (CacheConfigException e) { log.error("ARPHandler cache configuration invalid!"); - } catch (CacheExistException e){ + } catch (CacheExistException e) { log.debug("ARPHandler cache exists, skipped allocation."); } } - private void nonClusterObjectCreate(){ + private void nonClusterObjectCreate() { arpRequestReplyEvent = new ConcurrentHashMap(); } + /** - * Function called by the dependency manager when at least one - * dependency become unsatisfied or when the component is shutting - * down because for example bundle is being stopped. + * Function called by the dependency manager when at least one dependency + * become unsatisfied or when the component is shutting down because for + * example bundle is being stopped. * */ void destroy() { @@ -575,9 +606,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * Function called by dependency manager after "init ()" is called - * and after the services provided by the class are registered in - * the service registry + * Function called by dependency manager after "init ()" is called and after + * the services provided by the class are registered in the service registry * */ void start() { @@ -587,12 +617,12 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * Function called by the dependency manager before the services - * exported by the component are unregistered, this will be - * followed by a "destroy ()" calls + * Function called by the dependency manager before the services exported by + * the component are unregistered, this will be followed by a "destroy ()" + * calls * */ - void stop(){ + void stop() { } void stopping() { @@ -620,39 +650,54 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA log.trace("Received a frame of size: {}", inPkt.getPacketData().length); Packet formattedPak = this.dataPacketService.decodeDataPacket(inPkt); if (formattedPak instanceof Ethernet) { - Object nextPak = formattedPak.getPayload(); + Packet nextPak = formattedPak.getPayload(); + short vlan = 0; + if (nextPak instanceof IEEE8021Q) { + vlan = ((IEEE8021Q) nextPak).getVid(); + log.trace("Moved after the dot1Q header"); + nextPak = ((IEEE8021Q) nextPak).getPayload(); + } if (nextPak instanceof IPv4) { log.trace("Handle IP packet: {}", formattedPak); - handlePuntedIPPacket((IPv4) nextPak, inPkt.getIncomingNodeConnector()); + handlePuntedIPPacket((IPv4) nextPak, inPkt.getIncomingNodeConnector(), vlan); } else if (nextPak instanceof ARP) { log.trace("Handle ARP packet: {}", formattedPak); - handleARPPacket((Ethernet) formattedPak, (ARP) nextPak, inPkt - .getIncomingNodeConnector()); + handleARPPacket((Ethernet) formattedPak, (ARP) nextPak, inPkt.getIncomingNodeConnector(), vlan); } } return PacketResult.IGNORED; } - private ARP createARP(short opCode, byte[] senderMacAddress, byte[] senderIP, byte[] targetMacAddress, byte[] targetIP) { - ARP arp = new ARP(); - arp.setHardwareType(ARP.HW_TYPE_ETHERNET); - arp.setProtocolType(EtherTypes.IPv4.shortValue()); - arp.setHardwareAddressLength((byte) 6); - arp.setProtocolAddressLength((byte) 4); - arp.setOpCode(opCode); - arp.setSenderHardwareAddress(senderMacAddress) ; - arp.setSenderProtocolAddress(senderIP); - arp.setTargetHardwareAddress(targetMacAddress); - arp.setTargetProtocolAddress(targetIP); - return arp; + private ARP createARP(short opCode, byte[] senderMacAddress, byte[] senderIP, byte[] targetMacAddress, + byte[] targetIP) { + ARP arp = new ARP(); + arp.setHardwareType(ARP.HW_TYPE_ETHERNET); + arp.setProtocolType(EtherTypes.IPv4.shortValue()); + arp.setHardwareAddressLength((byte) 6); + arp.setProtocolAddressLength((byte) 4); + arp.setOpCode(opCode); + arp.setSenderHardwareAddress(senderMacAddress); + arp.setSenderProtocolAddress(senderIP); + arp.setTargetHardwareAddress(targetMacAddress); + arp.setTargetProtocolAddress(targetIP); + return arp; } - private Ethernet createEthernet(byte[] sourceMAC, byte[] targetMAC, ARP arp) { + private Ethernet createEthernet(byte[] sourceMAC, byte[] targetMAC, ARP arp, short vlan) { Ethernet ethernet = new Ethernet(); ethernet.setSourceMACAddress(sourceMAC); ethernet.setDestinationMACAddress(targetMAC); - ethernet.setEtherType(EtherTypes.ARP.shortValue()); - ethernet.setPayload(arp); + if (vlan == 0) { + ethernet.setEtherType(EtherTypes.ARP.shortValue()); + ethernet.setPayload(arp); + } else { + IEEE8021Q dot1q = new IEEE8021Q(); + dot1q.setVid(vlan); + dot1q.setEtherType(EtherTypes.ARP.shortValue()); + dot1q.setPayload(arp); + ethernet.setEtherType(EtherTypes.VLANTAGGED.shortValue()); + ethernet.setPayload(dot1q); + } return ethernet; } @@ -682,10 +727,10 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA // Clean up ARP event cache try { - if (clusterContainerService.amICoordinator() && ! arpRequestReplyEvent.isEmpty()){ + if (clusterContainerService.amICoordinator() && !arpRequestReplyEvent.isEmpty()) { arpRequestReplyEvent.clear(); } - } catch (Exception e){ + } catch (Exception e) { log.warn("ARPHandler: A cluster member failed to clear event cache."); } } @@ -698,10 +743,10 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } } - private void generateAndSendReply(InetAddress sourceIP, byte[] sourceMAC) { + private void generateAndSendReply(InetAddress sourceIP, byte[] sourceMAC, short vlan) { if (log.isTraceEnabled()) { log.trace("generateAndSendReply called with params sourceIP:{} sourceMAC:{}", sourceIP, - HexEncode.bytesToHexString(sourceMAC)); + HexEncode.bytesToHexString(sourceMAC)); } Set hosts = arpRequestors.remove(sourceIP); if ((hosts == null) || hosts.isEmpty()) { @@ -711,38 +756,28 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA countDownTimers.remove(sourceIP); for (HostNodeConnector host : hosts) { if (log.isTraceEnabled()) { - log.trace("Sending ARP Reply with src {}/{}, target {}/{}", - new Object[] { - HexEncode.bytesToHexString(sourceMAC), - sourceIP, - HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), - host.getNetworkAddress() }); + log.trace( + "Sending ARP Reply with src {}/{}, target {}/{} {}", + new Object[] { HexEncode.bytesToHexString(sourceMAC), sourceIP, + HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), host.getNetworkAddress(), + (vlan != 0 ? "on vlan " + vlan : "") }); } - if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL){ - sendARPReply(host.getnodeConnector(), - sourceMAC, - sourceIP, - host.getDataLayerAddressBytes(), - host.getNetworkAddress()); + if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL) { + sendARPReply(host.getnodeConnector(), sourceMAC, sourceIP, host.getDataLayerAddressBytes(), + host.getNetworkAddress(), vlan); } else { /* - * In the remote event a requestor moved to another - * controller it may turn out it now we need to send - * the ARP reply from a different controller, this - * cover the case + * In the remote event a requestor moved to another controller + * it may turn out it now we need to send the ARP reply from a + * different controller, this cover the case */ arpRequestReplyEvent.put( - new ARPReply( - host.getnodeConnector(), - sourceIP, - sourceMAC, - host.getNetworkAddress(), - host.getDataLayerAddressBytes()), false); + new ARPReply(host.getnodeConnector(), sourceIP, sourceMAC, host.getNetworkAddress(), host + .getDataLayerAddressBytes(), vlan), false); } } } - @Override public void entryUpdated(ARPEvent key, Boolean new_value, String cacheName, boolean originLocal) { log.trace("Got and entryUpdated for cacheName {} key {} isNew {}", cacheName, key, new_value); @@ -753,12 +788,13 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA public void entryCreated(ARPEvent key, String cacheName, boolean originLocal) { // nothing to do } + @Override public void entryDeleted(ARPEvent key, String cacheName, boolean originLocal) { // nothing to do } - private void enqueueARPCacheEvent (ARPEvent event, boolean new_value) { + private void enqueueARPCacheEvent(ARPEvent event, boolean new_value) { try { ARPCacheEvent cacheEvent = new ARPCacheEvent(event, new_value); if (!ARPCacheEvents.contains(cacheEvent)) { @@ -771,7 +807,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /* - * this thread monitors the connectionEvent queue for new incoming events from + * this thread monitors the connectionEvent queue for new incoming events + * from */ private class ARPCacheEventHandler implements Runnable { @Override @@ -787,25 +824,23 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA log.trace("Trigger and ARP Broadcast Request upon receipt of {}", req); sendBcastARPRequest(req.getTargetIP(), req.getSubnet()); - //If unicast and local, send reply + // If unicast and local, send reply } else if (connectionManager.getLocalityStatus(req.getHost().getnodeconnectorNode()) == ConnectionLocality.LOCAL) { log.trace("ARPCacheEventHandler - sendUcatARPRequest upon receipt of {}", req); sendUcastARPRequest(req.getHost(), req.getSubnet()); } } else if (event instanceof ARPReply) { ARPReply rep = (ARPReply) event; - // New reply received by controller, notify all awaiting requestors across the cluster + // New reply received by controller, notify all awaiting + // requestors across the cluster if (ev.isNewReply()) { log.trace("Trigger a generateAndSendReply in response to {}", rep); - generateAndSendReply(rep.getTargetIP(), rep.getTargetMac()); - // Otherwise, a specific reply. If local, send out. + generateAndSendReply(rep.getTargetIP(), rep.getTargetMac(), rep.getVlan()); + // Otherwise, a specific reply. If local, send out. } else if (connectionManager.getLocalityStatus(rep.getPort().getNode()) == ConnectionLocality.LOCAL) { log.trace("ARPCacheEventHandler - sendUcatARPReply locally in response to {}", rep); - sendARPReply(rep.getPort(), - rep.getSourceMac(), - rep.getSourceIP(), - rep.getTargetMac(), - rep.getTargetIP()); + sendARPReply(rep.getPort(), rep.getSourceMac(), rep.getSourceIP(), rep.getTargetMac(), + rep.getTargetIP(), rep.getVlan()); } } } catch (InterruptedException e) {