]>
Commit | Line | Data |
---|---|---|
efbd3a9a MT |
1 | From 7c0f2543a7e761d1ec82738374556beeb8a35bef Mon Sep 17 00:00:00 2001 |
2 | From: Simon Kelley <simon@thekelleys.org.uk> | |
3 | Date: Thu, 14 May 2015 21:16:18 +0100 | |
697b4f04 | 4 | Subject: [PATCH 093/113] Tweak last commit. |
efbd3a9a MT |
5 | |
6 | --- | |
7 | src/rfc2131.c | 8 ++++---- | |
8 | 1 file changed, 4 insertions(+), 4 deletions(-) | |
9 | ||
10 | diff --git a/src/rfc2131.c b/src/rfc2131.c | |
11 | index a10e499ef768..b95f9beadf59 100644 | |
12 | --- a/src/rfc2131.c | |
13 | +++ b/src/rfc2131.c | |
14 | @@ -2275,16 +2275,16 @@ static void do_options(struct dhcp_context *context, | |
15 | t2val = hval; | |
16 | } | |
17 | ||
18 | + /* ensure T1 is still < T2 */ | |
19 | + if (t2val <= t1val) | |
20 | + t1val = t2val - 1; | |
21 | + | |
22 | while (fuzz > (t1val/8)) | |
23 | fuzz = fuzz/2; | |
24 | ||
25 | t1val -= fuzz; | |
26 | t2val -= fuzz; | |
27 | ||
28 | - /* ensure T1 is still < T2 */ | |
29 | - if (t2val <= t1val) | |
30 | - t1val = t2val - 1; | |
31 | - | |
32 | option_put(mess, end, OPTION_T1, 4, t1val); | |
33 | option_put(mess, end, OPTION_T2, 4, t2val); | |
34 | } | |
35 | -- | |
36 | 2.1.0 | |
37 |