| commit | 02f3af0eb0a5659781f1f4f1b1a4da0bc12a3a96 | [log] [tgz] |
|---|---|---|
| author | daniel <dan.park@sk.com> | Thu Dec 17 18:44:52 2015 +0900 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu Dec 17 22:16:17 2015 +0000 |
| tree | e34a23bdc341e7c99b7007253e435aeb6ad602c9 | |
| parent | 365335e2deb3756de7e4a2791be2e585b1da3e8f [diff] |
[Falcon] Dhcp Bug Fix - buildReply method refers the leasetime stored in ipAssignment Change-Id: If0477861696bd76b3c1c14983f013968b4b8e8eb
diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java index a1707e0..572fb15 100644 --- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java +++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
@@ -354,7 +354,8 @@ option = new DHCPOption(); option.setCode(DHCP.DHCPOptionCode.OptionCode_LeaseTime.getValue()); option.setLength((byte) 4); - option.setData(ByteBuffer.allocate(4).putInt(leaseTime).array()); + option.setData(ByteBuffer.allocate(4) + .putInt(ipAssignment == null ? leaseTime : ipAssignment.leasePeriod()).array()); optionList.add(option); // IP Address Renewal Time.
diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java index 866fe61..3b1b947 100644 --- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java +++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
@@ -208,7 +208,7 @@ assignment = IpAssignment.builder() .ipAddress(ipAddr) .timestamp(new Date()) - .leasePeriod(leaseTime) + .leasePeriod(existingAssignment.leasePeriod()) .rangeNotEnforced(true) .assignmentStatus(IpAssignment.AssignmentStatus.Option_RangeNotEnforced) .subnetMask(existingAssignment.subnetMask())