From 83d5a0851595deeb2a112ece9149aefa45fb6283 Mon Sep 17 00:00:00 2001
From: Jochen Dolze <jochen.dolze@schulergroup.com>
Date: Wed, 25 Oct 2023 16:58:12 +0000
Subject: [PATCH] apinger: fixed bugs in apinger.init and apinger.rpc

Fix bug in init_apinger_config - debug/status_interval/rrd_interval were never set correctly
Fix bug in apinger_status - send and receive were swapped
Fix bug in apinger_status - added ability to use ipv6 on wan6

Signed-off-by: Jochen Dolze <jochen.dolze@schulergroup.com>
---
 net/apinger/Makefile           |  2 +-
 net/apinger/files/apinger.init | 21 +++++++++++++--------
 net/apinger/files/apinger.rpc  |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/net/apinger/Makefile b/net/apinger/Makefile
index b2f5372752..244df96849 100644
--- a/net/apinger/Makefile
+++ b/net/apinger/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=apinger
 PKG_SOURCE_DATE:=2015-04-09
 PKG_SOURCE_VERSION:=78eb328721ba1a10571c19df95acddcb5f0c17c8
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Jajcus/apinger
diff --git a/net/apinger/files/apinger.init b/net/apinger/files/apinger.init
index 7a287c03b5..745ba6b633 100644
--- a/net/apinger/files/apinger.init
+++ b/net/apinger/files/apinger.init
@@ -54,10 +54,15 @@ append_target() {
 	config_get_bool rrd               "$target" rrd 0
 
 	[ -z "$address" ] && return 0
-
-	srcip=$(uci_get network "$interface" ipaddr)
-	[ -z "$srcip" ] && network_get_ipaddr srcip "$interface"
-	srcip="${srcip:-0.0.0.0}"
+	if [ -z $(echo "$address"|sed "/:/d") ]; then
+		srcip=$(uci_get network "$interface" ip6addr)
+		[ -z "$srcip"] && network_get_ipaddr6 srcip "$interface"
+		srcip="${srcip:-::}"
+	else
+		srcip=$(uci_get network "$interface" ipaddr)
+		[ -z "$srcip"] && network_get_ipaddr srcip "$interface"
+		srcip="${srcip:-0.0.0.0}"
+	fi
 
 	alarms=${alarm_down:+\"${alarm_down}\"}
 	alarms=${alarm_delay:+${alarms:+${alarms}, }}${alarm_delay:+\"${alarm_delay}\"}
@@ -115,7 +120,7 @@ append_alarm_loss() {
 	local percent_low percent_high
 
 	config_get percent_low  "$alarm" percent_low
-	config_get percent_high "$alarm" percent_low
+	config_get percent_high "$alarm" percent_high
 
 	if [ -z "$percent_low" ] || [ -z "$percent_high" ]; then
 		return
@@ -132,9 +137,9 @@ init_apinger_config() {
 	local debug status_interval rrd_interval instance
 	instance=$1
 
-	config_get_bool debug             apinger debug 0
-	config_get      status_interval   apinger status_interval 1
-	config_get      rrd_interval      apinger rrd_interval 30
+	config_get_bool debug             "$instance" debug 0
+	config_get      status_interval   "$instance" status_interval 1
+	config_get      rrd_interval      "$instance" rrd_interval 30
 
 	[ "$debug" = "1" ] && debug=on || debug=off
 
diff --git a/net/apinger/files/apinger.rpc b/net/apinger/files/apinger.rpc
index 0be6e16572..360d473e27 100644
--- a/net/apinger/files/apinger.rpc
+++ b/net/apinger/files/apinger.rpc
@@ -38,7 +38,7 @@ apinger_status() {
 		if [ -f "$status_file" ]; then
 			_IFS="$IFS"
 			IFS="|"
-			while read -r address srcip target received sent timestamp latency loss alarm; do
+			while read -r address srcip target sent received timestamp latency loss alarm; do
 				json_add_object targets
 				json_add_string interface "$iface"
 				json_add_string target "$target"
-- 
2.30.2