banip: fix the local uplink lookup of the GeoIP map

- better extract Uplink addresses
- the map array anchor was written inside the runtime file branch,
  so a missing runtime file dropped the entire map instead of just the local marker

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/banip/Makefile b/net/banip/Makefile
index 95c27b4eadb6d99f43f11cf3a29498b2c390a294..6b368bc435f1c4020cabed4aed7f3e24ac6ebf56 100644 (file)
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=1.8.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh
index 8d172097354e594a47a766cc6c0f2617736191b0..a0f58bbc823a7f2bb2b6c9ca1d2f432058aeebcd 100644 (file)
--- a/net/banip/files/banip-functions.sh
+++ b/net/banip/files/banip-functions.sh
@@ -2047,7 +2047,7 @@ f_lookup() {
 f_report() {
        local report_jsn report_txt tmp_val table_json item sep table_sets set_cnt set_inbound set_outbound set_cntinbound set_cntoutbound set_proto set_dport set_details
        local cnt ip expr detail jsnval timestamp autoadd_allow autoadd_block sum_sets sum_setinbound sum_setoutbound sum_cntelements sum_cntinbound sum_cntoutbound quantity
-       local chunk jsn table_jsn set_jsn map_jsn chain set_elements sum_setelements sum_synflood sum_udpflood sum_icmpflood sum_ctinvalid sum_tcpinvalid sum_setports sum_bcp38 output="${1}"
+       local chunk jsn table_jsn set_jsn map_jsn chain set_elements uplink_ip uplink_list sum_setelements sum_synflood sum_udpflood sum_icmpflood sum_ctinvalid sum_tcpinvalid sum_setports sum_bcp38 output="${1}"
 
        f_conf
        f_mkdir "${ban_reportdir}"
@@ -2255,19 +2255,25 @@ f_report() {
                if [ "${ban_nftcount}" = "1" ] && [ "${ban_map}" = "1" ] && [ -s "${report_jsn}" ]; then
                        cnt="1"
                        f_getdl
+                       printf '%s' ",[{}" >>"${map_jsn}"
                        json_init
                        if json_load_file "${ban_rtfile}" >/dev/null 2>&1; then
                                json_get_values jsnval "active_uplink" >/dev/null 2>&1
-                               jsnval="${jsnval//\/[0-9][0-9]/}"
-                               jsnval="${jsnval//\/[0-9]/}"
-                               jsnval="\"${jsnval// /\", \"}\""
-                               if [ "${jsnval}" != '""' ]; then
-                                       {
-                                               printf '%s' ",[{}"
-                                               "${ban_fetchcmd}" ${ban_geoparm} "[ ${jsnval} ]" "${ban_geourl}" 2>>"${ban_errorlog}" |
-                                                       "${ban_jsoncmd}" -qe '@[*&&@.status="success"]' | "${ban_awkcmd}" -v feed="homeIP" '{printf ",{\"%s\": %s}\n",feed,$0}'
-                                       } >>"${map_jsn}"
+                               for uplink_ip in ${jsnval}; do
+                                       uplink_ip="${uplink_ip%%/*}"
+                                       if [ -n "${uplink_ip}" ] && [ "${uplink_ip}" != "-" ]; then
+                                               uplink_list="${uplink_list}${uplink_list:+, }\"${uplink_ip}\""
+                                       fi
+                               done
+                       fi
+                       if [ -n "${uplink_list}" ]; then
+                               "${ban_fetchcmd}" ${ban_geoparm} "[ ${uplink_list} ]" "${ban_geourl}" 2>>"${ban_errorlog}" |
+                                       "${ban_jsoncmd}" -qe '@[*&&@.status="success"]' |
+                                       "${ban_awkcmd}" -v feed="homeIP" '{printf ",{\"%s\": %s}\n",feed,$0}' >"${map_jsn}.home"
+                               if [ -s "${map_jsn}.home" ]; then
+                                       "${ban_catcmd}" "${map_jsn}.home" >>"${map_jsn}"
                                fi
+                               "${ban_rmcmd}" -f "${map_jsn}.home"
                        fi
                        if [ -s "${map_jsn}" ]; then
                                json_init