chrony: add configuration parameters

The existing config sections were anonymous, implying multiple can
coexist. Those are now named so that only one shall exist.

Added:
- smoothtime (in case of large frequency offsets)
- systemclock parameters
- logchange (increase awareness of clock drift in syslog)
- maxsources (for peers; internal default: 4)
- prefer (one server over others)
- interleave (xleave - more accurate transmit timestamps - good to have)

Refactored handle_allow() to handle 'list interface' instead of option.
Then only a single section is required.

Signed-off-by: Paul Donald <[email protected]>

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 67ec8f8947591dc5887afd7f88b16eafe11c158a..b285efe96bb7934e7ad569fef69f305e0550e92b 100644 (file)
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chrony
 PKG_VERSION:=4.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://chrony-project.org/releases/

diff --git a/net/chrony/files/chrony.config b/net/chrony/files/chrony.config
index 7214ce430f7a7f38922a20e914f43c1583554add..f9d838c2a487c40054bab72db3233b6945ef9b56 100644 (file)
--- a/net/chrony/files/chrony.config
+++ b/net/chrony/files/chrony.config
@@ -1,19 +1,34 @@
 config pool
        option hostname '2.openwrt.pool.ntp.org'
        option maxpoll '12'
-       option iburst 'yes'
+       option maxsources '4'
+       option iburst '1'
+       option prefer '0'
+       # option xleave '0'
 
-config dhcp_ntp_server
-       option iburst 'yes'
-       option disabled 'no'
+config dhcp_ntp_server 'dhcp_ntp_server'
+       option iburst '1'
+       option disabled '0'
 
-config allow
+config allow 'allow'
        option interface 'lan'
 
-config makestep
+config makestep 'makestep'
        option threshold '1.0'
        option limit '3'
 
-config nts
-       option rtccheck 'yes'
-       option systemcerts 'yes'
+config nts 'nts'
+       option rtccheck '1'
+       option systemcerts '1'
+
+#config smoothtime 'smoothtime'
+       # option maxppm '400'
+       # option maxwander '0.01'
+       # option leaponly '0'
+
+#config systemclock 'systemclock'
+       # option precision '8e-6'
+       # option leapsecmode 'slew'
+
+#config logging 'logging'
+       # option logchange '0.01'

diff --git a/net/chrony/files/chronyd.init b/net/chrony/files/chronyd.init
index a043224ec5b50441dabb691d537dd461ac0c8481..85de475dffe0e3a93a214f73bd51e615db43e599 100644 (file)
--- a/net/chrony/files/chronyd.init
+++ b/net/chrony/files/chronyd.init
@@ -11,6 +11,7 @@ RTCDEVICE=/dev/rtc0
 
 handle_source() {
        local cfg=$1 sourcetype=$2 disabled hostname minpoll maxpoll iburst nts
+       local prefer xleave maxdelay mindelay maxsamples minsamples port ntsport maxsources
 
        config_get_bool disabled "$cfg" disabled 0
        [ "$disabled" = "1" ] && return
@@ -21,12 +22,30 @@ handle_source() {
        config_get maxpoll "$cfg" maxpoll
        config_get_bool iburst "$cfg" iburst 0
        config_get_bool nts "$cfg" nts 0
+       config_get_bool prefer "$cfg" prefer 0
+       config_get_bool xleave "$cfg" xleave 0
+       config_get maxdelay "$cfg" maxdelay
+       config_get mindelay "$cfg" mindelay
+       config_get maxsamples "$cfg" maxsamples
+       config_get minsamples "$cfg" minsamples
+       config_get port "$cfg" port
+       config_get ntsport "$cfg" ntsport
+       config_get maxsources "$cfg" maxsources
        echo $(
                echo $sourcetype $hostname
                [ -n "$minpoll" ] && echo minpoll $minpoll
                [ -n "$maxpoll" ] && echo maxpoll $maxpoll
                [ "$iburst" = "1" ] && echo iburst
                [ "$nts" = "1" ] && echo nts
+               [ "$prefer" = "1" ] && echo prefer
+               [ "$xleave" = "1" ] && echo xleave
+               [ -n "$maxdelay" ] && echo maxdelay $maxdelay
+               [ -n "$mindelay" ] && echo mindelay $mindelay
+               [ -n "$maxsamples" ] && echo maxsamples "$maxsamples"
+               [ -n "$minsamples" ] && echo minsamples "$minsamples"
+               [ -n "$port" ] && [ "$nts" = "0" ] && echo port $port
+               [ -n "$ntsport" ] && [ "$nts" = "1" ] && echo ntsport $ntsport
+               [ -n "$maxsources" ] && [ "$cfg" = "pool" ] && echo maxsources $maxsources
        )
 }
 
@@ -35,19 +54,21 @@ handle_allow() {
 
        network_find_wan wan_iface true
        network_find_wan6 wan6_iface true
-       config_get iface "$cfg" interface
-
-       if [ "$wan_iface" = "$iface" ]; then
-               echo allow 0/0
-       elif [ "$wan6_iface" = "$iface" ]; then
-               echo allow ::/0
-       else
-               network_get_subnets subnets $iface
-               network_get_subnets6 subnets6 $iface
-               for subnet in $subnets $subnets6; do
-                       echo allow $subnet
-               done
-       fi
+       config_get ifaces "$cfg" interface
+
+       for iface in $ifaces; do
+               if [ "$wan_iface" = "$iface" ]; then
+                       echo allow 0/0
+               elif [ "$wan6_iface" = "$iface" ]; then
+                       echo allow ::/0
+               else
+                       network_get_subnets subnets $iface
+                       network_get_subnets6 subnets6 $iface
+                       for subnet in $subnets $subnets6; do
+                               echo allow $subnet
+                       done
+               fi
+       done
 }
 
 handle_makestep() {
@@ -60,7 +81,7 @@ handle_makestep() {
 }
 
 handle_nts() {
-       local cfg=$1 threshold limit
+       local cfg=$1 rtccheck systemcerts trustedcerts
 
        config_get_bool rtccheck "$cfg" rtccheck 0
        config_get_bool systemcerts "$cfg" systemcerts 1
@@ -71,6 +92,31 @@ handle_nts() {
        [ -n "$trustedcerts" ] && echo ntstrustedcerts "$trustedcerts"
 }
 
+handle_smoothtime() {
+       local cfg=$1 maxppm maxwander leaponly suffix
+       config_get maxppm "$cfg" maxppm
+       config_get maxwander "$cfg" maxwander
+       config_get_bool leaponly "$cfg" leaponly 0
+       [ "$leaponly" = "1" ] && suffix=leaponly
+       [ -n "$maxppm" ] && [ -n "$maxwander" ] && echo smoothtime "$maxppm" "$maxwander" "$suffix"
+}
+
+handle_systemclock() {
+       # system clock specific settings
+       local cfg=$1 precision leapsecmode
+       config_get precision "$cfg" precision
+       config_get leapsecmode "$cfg" leapsecmode
+       [ -n "$precision" ] && echo clockprecision "$precision"
+       [ -n "$leapsecmode" ] && echo clockleapsecmode "$leapsecmode"
+}
+
+handle_logging() {
+       local cfg=$1 logchange
+
+       config_get logchange "$cfg" logchange
+       [ -n "$logchange" ] && echo logchange "$logchange"
+}
+
 start_service() {
        . /lib/functions/network.sh
 
@@ -93,6 +139,9 @@ start_service() {
                config_foreach handle_source peer peer
                config_foreach handle_allow allow
                config_foreach handle_makestep makestep
+               config_foreach handle_smoothtime smoothtime
+               config_foreach handle_systemclock systemclock
                config_foreach handle_nts nts
+               config_foreach handle_logging logging
        ) > $INCLUDEFILE
 }