commit 72b599a8bc5b9ac85d465e6186805e2579005e0f
author Yi Tseng <yi@opennetworking.org> Thu Sep 14 13:24:21 2017 -0700
committer Yi Tseng <yi@opennetworking.org> Thu Sep 14 21:04:12 2017 +0000
tree ea8124822b6b3caa1338df0b0137911ba0bc0555
parent f26412c5199d584422dc5ec1d890df74b9550762

[CORD-1715] The dest udp port for DHCP reply packets should be 68

Change-Id: I57ca054b452fda7e80da3c2c46e65fe14efd25d8

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

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index 39e53ff..2ef43b7 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -722,7 +722,10 @@
             udpPacket.setDestinationPort(UDP.DHCP_CLIENT_PORT);
         } else {
             // forward to another dhcp relay
-            udpPacket.setDestinationPort(UDP.DHCP_SERVER_PORT);
+            // FIXME: Currently we assume the DHCP comes from a L2 relay with
+            // Option 82, this might not work if DHCP message comes from
+            // L3 relay.
+            udpPacket.setDestinationPort(UDP.DHCP_CLIENT_PORT);
         }
 
         udpPacket.setPayload(dhcpPayload);