[hamradio-commits] [dump1090-mutability] 88/172: More time_t -> milliseconds conversions. This lets us support fractional net flush times among other things, which is handy.

[Matteo F. Vescovi]

This is an automated email from the git hooks/post-receive script.

mfv pushed a commit to branch master
in repository dump1090-mutability.

commit 31d1a5ad86e758d6a1539792530106a89978d95b
Author: Oliver Jowett <oliver at mutability.co.uk>
Date:   Tue Feb 10 22:24:22 2015 +0000

    More time_t -> milliseconds conversions.
    This lets us support fractional net flush times among other things, which is handy.
---
 debian/dump1090-mutability.config    | 14 +++++++++++---
 debian/dump1090-mutability.templates |  8 ++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/dump1090-mutability.config b/debian/dump1090-mutability.config
index 871c483..8901f89 100644
--- a/debian/dump1090-mutability.config
+++ b/debian/dump1090-mutability.config
@@ -136,6 +136,14 @@ is_number() {
   if echo "$1" | grep -Eq '^([+-]?[0-9][0-9]*)(\.[0-9]+)?$'; then return 0; else return 1; fi
 }
 
+is_unsigned_number() {
+  if echo "$1" | grep -Eq '^([+]?[0-9][0-9]*)(\.[0-9]+)?$'; then return 0; else return 1; fi
+}
+
+is_positive_number() {
+  if echo "$1" | grep -Eq '^(([+]?0\.[0-9]*[1-9]+[0-9]*)|([+]?[1-9][0-9]*)(\.[0-9]+)?)$'; then return 0; else return 1; fi
+}
+
 is_number_or_empty() {
   if [ -z "$1" ]; then return 0
   elif is_number "$1"; then return 0;
@@ -198,15 +206,15 @@ db_go || true; db_get $NAME/auto-start; if [ "$RET" = "true" ]; then
  db_input_verify low $NAME/net-bo-port is_port_number || true
  db_input_verify low $NAME/net-sbs-port is_port_number || true
  db_input_verify low $NAME/net-fatsv-port is_port_number || true
- db_input_verify low $NAME/net-heartbeat is_unsigned_int || true
+ db_input_verify low $NAME/net-heartbeat is_unsigned_number || true
  db_input_verify low $NAME/net-out-size is_unsigned_int || true
- db_input_verify low $NAME/net-out-interval is_unsigned_int || true
+ db_input_verify low $NAME/net-out-interval is_unsigned_number || true
  db_input_verify low $NAME/net-buffer is_unsigned_int || true
  db_input_verify medium $NAME/net-bind-address is_ipaddrish_or_empty || true
 
  db_input_verify low $NAME/stats-interval is_unsigned_int || true
 
- db_input_verify low $NAME/json-interval is_positive_int || true
+ db_input_verify low $NAME/json-interval is_positive_number || true
  db_input low $NAME/json-location-accuracy || true
  db_input low $NAME/json-dir || true
 
diff --git a/debian/dump1090-mutability.templates b/debian/dump1090-mutability.templates
index 7fbd89e..5152930 100644
--- a/debian/dump1090-mutability.templates
+++ b/debian/dump1090-mutability.templates
@@ -317,10 +317,18 @@ Template: dump1090-mutability/invalid-is_ipaddrish_or_empty
 Description: Value must be an IP address or empty.
 Type: error
 
+Template: dump1090-mutability/invalid-is_number
+Description: Value must be a decimal number
+Type: error
+
 Template: dump1090-mutability/invalid-is_number_or_empty
 Description: Value must be a decimal number or empty.
 Type: error
 
+Template: dump1090-mutability/invalid-is_unsigned_number
+Description: Value must be a non-negative number.
+Type: error
+
 Template: dump1090-mutability/invalid-is_valid_gain
 Description: Value must be a numeric gain value, or "max", or "agc".
 Type: error

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090-mutability.git