]>
Commit | Line | Data |
---|---|---|
5af29fb3 MT |
1 | ==== ntpd/ntp_proto.c ==== |
2 | 2010-10-22 01:55:45-04:00, stenn@deacon.udel.edu +2 -5 | |
3 | [Bug 1670] Fix peer->bias and broadcastdelay | |
4 | ||
5 | --- 1.307/ntpd/ntp_proto.c 2010-10-11 21:06:05 -07:00 | |
6 | +++ 1.308/ntpd/ntp_proto.c 2010-10-21 22:55:45 -07:00 | |
7 | @@ -929,7 +929,6 @@ receive( | |
8 | ||
9 | } else { | |
10 | peer->delay = sys_bdelay; | |
11 | - peer->bias = -sys_bdelay / 2.; | |
12 | } | |
13 | break; | |
14 | } | |
15 | @@ -1570,7 +1569,6 @@ process_packet( | |
16 | p_del = fabs(t21 - t34); | |
17 | p_offset = (t21 + t34) / 2.; | |
18 | } | |
19 | - p_offset += peer->bias; | |
20 | p_disp = LOGTOD(sys_precision) + LOGTOD(peer->precision) + | |
21 | clock_phi * p_del; | |
22 | ||
23 | @@ -1647,7 +1645,7 @@ process_packet( | |
24 | /* | |
25 | * That was awesome. Now hand off to the clock filter. | |
26 | */ | |
27 | - clock_filter(peer, p_offset, p_del, p_disp); | |
28 | + clock_filter(peer, p_offset + peer->bias, p_del, p_disp); | |
29 | ||
30 | /* | |
31 | * If we are in broadcast calibrate mode, return to broadcast |