[backfire] merge r21495, r25478 and r25479

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25480 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/base-files/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=43.11
+PKG_RELEASE:=43.12
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

package/base-files/files/etc/config/system

@@ -3,10 +3,4 @@ config system
 	option timezone	UTC
 
 config rdate
-	list server ac-ntp0.net.cmu.edu
+	option interface	wan
-	list server ptbtime1.ptb.de
-	list server ac-ntp1.net.cmu.edu
-	list server ntp.xs4all.nl
-	list server ptbtime2.ptb.de
-	list server cudns.cit.cornell.edu
-	list server ptbtime3.ptb.de

package/base-files/files/etc/config/timeserver

@@ -0,0 +1,15 @@
+config timeserver
+	option hostname	ptbtime1.ptb.de
+#	option interface	wan
+
+config timeserver
+	option hostname	time-a.nist.gov
+
+config timeserver
+	option hostname	ntp.xs4all.nl
+
+config timeserver
+	option hostname	ptbtime2.ptb.de
+
+config timeserver
+	option hostname	time-b.nist.gov

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
+	local server="$1"
-		uci -P /var/state get "$var" 2>/dev/null && break
+
-	done
+	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" \
+	local server
-		"system.@rdate[0].server")
+	server=$(uci_get_state "network.$INTERFACE.lease_timesrv")
+	[ -n "$server" ] && do_rdate "$server"
+	[ -n "$SYNCED" ] && return
 
-	if [ -n "$servers" ]; then
+	config_load timeserver
-		match=0
+	config_foreach add_server timeserver
-		tries=3
-		rand
 
-		while [ $match = 0 ] && [ $tries != 0 ]; do
+	local servers
-			for server in $servers; do
+	while [ $MAX -gt 0 ] && [ -z "$SYNCED" ]; do
-				if [ $((--random)) = 0 ]; then
+		unset servers; random=$(awk "BEGIN { srand(); print int(rand() * $MAX + 1); }")
-					rdate -s $server >/dev/null 2>/dev/null && {
+		for server in $SERVERS; do
-						logger -t rdate "Synced with $server"
+			[ $((--random)) -eq 0 ] && { do_rdate "$server"; continue; }
-						match=1
+			servers="${servers} $server"
-					} || {
-						logger -t rdate "Failed to sync with $server"
-						let tries="$tries - 1"
-						rand
-					}
-
-					break
-				fi
-			done
 		done
-	else
+		SERVERS="${servers}"; : $((MAX--))
-		logger -t rdate "No usable time server found"
+	done
-	fi
+
+	[ -z "$SYNCED" ] && logger -t rdate "No usable time server for $INTERFACE found"
 }
 
-case "$ACTION" in
+case "${ACTION:-ifup}" in
-	ifup) route -n | grep -q ^0.0.0.0 && sync_rdate;;
+	ifup)
+		sync_time
+	;;
 esac