commit 3014983309027553f06ef68f4b70ae008af40276
author Mayank Tiwari <mike.tiwari@gmail.com> Fri Oct 19 12:12:44 2018 -0400
committer Charles Chan <rascov@gmail.com> Mon Oct 29 13:54:17 2018 -0700
tree 79436624d75aee79fa6647db6cfbf3b1bc361616
parent b7109091854733cd47a44cc1df6ebc2c20baa973

Source IP to be set to Relay Agent IP in DHCP packet from client

Change-Id: I5e5e0afca20d2eda7f6631a27d1be429412884c2

apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java

diff --git a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index 14ee700..59310b5 100644
--- a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -884,7 +884,11 @@
                     // Sets relay agent IP
                     int effectiveRelayAgentIp = relayAgentIp != null ?
                             relayAgentIp.toInt() : clientInterfaceIp.toInt();
+                    Ip4Address effectiveRealRealyAgentIP = relayAgentIp != null ?
+                            relayAgentIp : clientInterfaceIp;
                     dhcpPacket.setGatewayIPAddress(effectiveRelayAgentIp);
+                    ipv4Packet.setSourceAddress(effectiveRealRealyAgentIP.toInt());
+                    log.debug("Source IP address set as relay agent IP with value: {}", effectiveRealRealyAgentIP);
                 }
             }