commit da5dc8c3c48c3c4daf5d8044350c6484019a8cab
author Charles Chan <rascov@gmail.com> Fri Jan 13 14:29:29 2017 -0800
committer Jonathan Hart <jono@onlab.us> Mon Jan 16 18:48:37 2017 +0000
tree a6c9888c63e35f8c81b61d23ae1a94d971f6ba3d
parent 7e41513371aa41332b0f9a04572c62717578503c

Bugfix for DHCP Relay

Relayed offer/ack should use relay agent IP as source and offered IP as destination

In addition,
   - Typo in log message
   - Remove unnecessary log

Change-Id: Id6331cc895884cd6025de6040bcf8ea60334ca5c

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java
index 553748a..f274ba0 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelay.java
@@ -413,6 +413,11 @@
             //set the ethernet frame.
             etherReply.setDestinationMACAddress(dhcpPayload.getClientHardwareAddress());
             udpPacket.setDestinationPort(UDP.DHCP_CLIENT_PORT);
+            // SRC_IP: relay agent IP
+            // DST_IP: offered IP
+            ipv4Packet.setSourceAddress(relayAgentIP.toInt());
+            ipv4Packet.setDestinationAddress(dhcpPayload.getYourIPAddress());
+
             udpPacket.setPayload(dhcpPayload);
             ipv4Packet.setPayload(udpPacket);
             etherReply.setPayload(ipv4Packet);