commit 93fa37253ee2851715377c65f1b3492633c7802c
author Angelos Mimidis <agmimi@fotonik.dtu.dk> Mon Apr 23 16:37:55 2018 +0200
committer Jonathan Hart <jono@opennetworking.org> Wed Apr 25 15:52:21 2018 +0000
tree 4d24355f72c331e7ff46438e9d838b4e370be994
parent b6534c2f6ed69cd37422d39446a42dab3753880a

Fix to allign the ONOS-VTN app with the DHCP RFC. Contributed by the NGPaaS EU project

Change-Id: Ib6b9ed2571093f26a0944d11fabc1f699dd73926
(cherry picked from commit a601c785b378eaaba5f660b29d4b61d222e31815)

src/main/java/org/opencord/cordvtn/impl/CordVtnDhcpProxy.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/CordVtnDhcpProxy.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnDhcpProxy.java
index e63cdcf..54f6987 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnDhcpProxy.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnDhcpProxy.java
@@ -97,6 +97,7 @@
     private static final byte DHCP_OPTION_CLASSLESS_STATIC_ROUTE = (byte) 121;
 
     private static final Ip4Address DEFAULT_DNS = Ip4Address.valueOf("8.8.8.8");
+    private static final Ip4Address IP_BROADCAST = Ip4Address.valueOf("255.255.255.255");
     private static final byte DEFAULT_PACKET_TTL = (byte) 127;
     private static final byte[] DHCP_DATA_LEASE_INFINITE =
             ByteBuffer.allocate(4).putInt(-1).array();
@@ -283,6 +284,14 @@
             DHCP dhcpReply = buildDhcpReply(
                     dhcpRequest, packetType, reqInstance.ipAddress(), snet);
 
+           // Overwrite the DstIP and DstMac if broadcast flag is set in DHCP header.
+           // This Fix alligns the ONOS-VTN app with the DHCP RFC
+            if ((dhcpRequest.getFlags() & 0x8000) != 0) {
+                ipv4Reply.setDestinationAddress(IP_BROADCAST.toInt());
+                ethReply.setDestinationMACAddress(MacAddress.BROADCAST);
+            }
+           // End of DHCP Fix.
+
             udpReply.setPayload(dhcpReply);
             ipv4Reply.setPayload(udpReply);
             ethReply.setPayload(ipv4Reply);
@@ -318,8 +327,8 @@
             dhcpReply.setHardwareAddressLength((byte) 6);
             dhcpReply.setTransactionId(request.getTransactionId());
             dhcpReply.setFlags(request.getFlags());
-            dhcpReply.setYourIPAddress(yourIp.toInt());
             dhcpReply.setServerIPAddress(serverIp.toInt());
+            dhcpReply.setYourIPAddress(yourIp.toInt());
             dhcpReply.setClientHardwareAddress(request.getClientHardwareAddress());
 
             List<DhcpOption> options = Lists.newArrayList();
@@ -450,3 +459,4 @@
         }
     }
 }
+