From 5d18a177d89f8188e2cca67ad9afd84052f0e6c9 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 17 May 2010 19:54:35 +0000 Subject: [package] base-files (#7316) - improve rdate reliability - make rdate config more ntp like - move time server list to /etc/config/timeserver - bump package revision git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21495 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../base-files/files/etc/hotplug.d/iface/40-rdate | 87 +++++++++++++--------- 1 file changed, 52 insertions(+), 35 deletions(-) (limited to 'package/base-files/files/etc/hotplug.d/iface/40-rdate') diff --git a/package/base-files/files/etc/hotplug.d/iface/40-rdate b/package/base-files/files/etc/hotplug.d/iface/40-rdate index cf56c02ac..c5abaf011 100644 --- a/package/base-files/files/etc/hotplug.d/iface/40-rdate +++ b/package/base-files/files/etc/hotplug.d/iface/40-rdate @@ -1,46 +1,63 @@ -uci_get_one() +IFACE_GLOBAL=$(uci_get "system.@rdate[0].interface") +SERVERS= +MAX=0 +SYNCED= + +do_rdate() { - for var in "$@"; do - uci -P /var/state get "$var" 2>/dev/null && break - done + local server="$1" + + rdate -s "$server" >/dev/null 2>/dev/null && { + logger -t rdate "Synced with $server" + SYNCED="$server" + } || { + logger -t rdate "Failed to sync with $server" + } } -rand() +add_server() { - random=$(awk 'BEGIN { srand(); print int(rand() * 10 + 1); }') + local section="$1" + + local server + config_get server "$section" hostname + [ -z "$server" ] && return + + local iface + config_get iface "$section" interface + [ -z "$iface" ] && iface=$IFACE_GLOBAL + [ -n "$iface" ] && { + [ "$iface" = "$INTERFACE" ] || return + } + + SERVERS="${SERVERS} $server"; : $((MAX++)) } -sync_rdate() +sync_time() { - 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 && { - logger -t rdate "Synced with $server" - match=1 - } || { - logger -t rdate "Failed to sync with $server" - let tries="$tries - 1" - rand - } - - break - fi - done + 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 - else - logger -t rdate "No usable time server found" - fi + SERVERS="${servers}"; : $((MAX--)) + done + + [ -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 -- cgit v1.2.3