base-files (#7316) - improve rdate reliability - make rdate config more ntp like - move time server list to /etc/config/timeserver - bump package revision
SVN-Revision: 21495master
parent
80bd4f6603
commit
da55c9639a
@ -0,0 +1,24 @@ |
||||
config timeserver |
||||
option hostname ac-ntp0.net.cmu.edu |
||||
# option interface wan |
||||
|
||||
config timeserver |
||||
option hostname ptbtime1.ptb.de |
||||
|
||||
config timeserver |
||||
option hostname ac-ntp1.net.cmu.edu |
||||
|
||||
config timeserver |
||||
option hostname tick.greyware.com |
||||
|
||||
config timeserver |
||||
option hostname ntp.xs4all.nl |
||||
|
||||
config timeserver |
||||
option hostname ptbtime2.ptb.de |
||||
|
||||
config timeserver |
||||
option hostname cudns.cit.cornell.edu |
||||
|
||||
config timeserver |
||||
option hostname ptbtime3.ptb.de |
@ -1,46 +1,63 @@ |
||||
uci_get_one() |
||||
{ |
||||
for var in "$@"; do |
||||
uci -P /var/state get "$var" 2>/dev/null && break |
||||
done |
||||
} |
||||
IFACE_GLOBAL=$(uci_get "system.@rdate[0].interface") |
||||
SERVERS= |
||||
MAX=0 |
||||
SYNCED= |
||||
|
||||
rand() |
||||
do_rdate() |
||||
{ |
||||
random=$(awk 'BEGIN { srand(); print int(rand() * 10 + 1); }') |
||||
} |
||||
local server="$1" |
||||
|
||||
sync_rdate() |
||||
{ |
||||
local servers=$(uci_get_one "network.$INTERFACE.lease_timesrv" \ |
||||
"system.@rdate[0].server") |
||||
|
||||
if [ -n "$servers" ]; then |
||||
match=0 |
||||
tries=3 |
||||
rand |
||||
|
||||
while [ $match = 0 ] && [ $tries != 0 ]; do |
||||
for server in $servers; do |
||||
if [ $((--random)) = 0 ]; then |
||||
rdate -s $server >/dev/null 2>/dev/null && { |
||||
rdate -s "$server" >/dev/null 2>/dev/null && { |
||||
logger -t rdate "Synced with $server" |
||||
match=1 |
||||
SYNCED="$server" |
||||
} || { |
||||
logger -t rdate "Failed to sync with $server" |
||||
let tries="$tries - 1" |
||||
rand |
||||
} |
||||
} |
||||
|
||||
add_server() |
||||
{ |
||||
local section="$1" |
||||
|
||||
local server |
||||
config_get server "$section" hostname |
||||
[ -z "$server" ] && return |
||||
|
||||
break |
||||
fi |
||||
local iface |
||||
config_get iface "$section" interface |
||||
[ -z "$iface" ] && iface=$IFACE_GLOBAL |
||||
[ -n "$iface" ] && { |
||||
[ "$iface" = "$INTERFACE" ] || return |
||||
} |
||||
|
||||
SERVERS="${SERVERS} $server"; : $((MAX++)) |
||||
} |
||||
|
||||
sync_time() |
||||
{ |
||||
local server |
||||
server=$(uci_get_state "network.$INTERFACE.lease_timesrv") |
||||
[ -n "$server" ] && do_rdate "$server" |
||||
[ -n "$SYNCED" ] && return |
||||
|
||||
config_load timeserver |
||||
config_foreach add_server timeserver |
||||
|
||||
local servers |
||||
while [ $MAX -gt 0 ] && [ -z "$SYNCED" ]; do |
||||
unset servers; random=$(awk "BEGIN { srand(); print int(rand() * $MAX + 1); }") |
||||
for server in $SERVERS; do |
||||
[ $((--random)) -eq 0 ] && { do_rdate "$server"; continue; } |
||||
servers="${servers} $server" |
||||
done |
||||
SERVERS="${servers}"; : $((MAX--)) |
||||
done |
||||
else |
||||
logger -t rdate "No usable time server found" |
||||
fi |
||||
|
||||
[ -z "$SYNCED" ] && logger -t rdate "No usable time server for $INTERFACE found" |
||||
} |
||||
|
||||
case "$ACTION" in |
||||
ifup) route -n | grep -q ^0.0.0.0 && sync_rdate;; |
||||
case "${ACTION:-ifup}" in |
||||
ifup) |
||||
sync_time |
||||
;; |
||||
esac |
||||
|
Loading…
Reference in new issue