| commit | 7edf764dae5798474fdf0b746f63d1c9e73d9947 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Mon Oct 09 11:07:25 2017 -0400 |
| committer | Charles Chan <rascov@gmail.com> | Tue Oct 10 10:00:03 2017 -0400 |
| tree | 99c8ab84337ce1eb7c9cac81c530a5d2800dea8d | |
| parent | fbf0864b413feb8470b84d1be07e9cd113831198 [diff] |
[CORD-2055] Set hop limit to 64 when relaying DHCPv6 Change-Id: Ic8189eaff52fe2fb743e9fdef6a96609081dce16
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 85540c6..f8ee711 100644 --- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java +++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -586,6 +586,7 @@ udpPacket.setSourcePort(UDP.DHCP_SERVER_PORT); udpPacket.setDestinationPort(UDP.DHCP_SERVER_PORT); ipv4Packet.setPayload(udpPacket); + ipv4Packet.setTtl((byte) 64); etherReply.setPayload(ipv4Packet); return etherReply; }
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java index d5afdb7..ff654ba 100644 --- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java +++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -896,11 +896,10 @@ log.debug("interfaceId write srcMac {} portString {}", HexString.toHexString(clientSoureMacBytes, ":"), inPortString); dhcp6Relay.setOptions(options); - //dhcp6Packet.setPayload(dhcp6Relay); - //udpPacket.setPayload(dhcp6Packet); udpPacket.setPayload(dhcp6Relay); udpPacket.resetChecksum(); ipv6Packet.setPayload(udpPacket); + ipv6Packet.setHopLimit((byte) 64); etherReply.setPayload(ipv6Packet);