mwan3: dump iptables and ipset command for debugging

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/net/mwan3/files/lib/mwan3/common.sh b/net/mwan3/files/lib/mwan3/common.sh
index 5f08fdfa5af4f10a0e50a8eb94189a7cf3fcfc55..fb951d5a6d6f9b862b32d5cc2d1b44d801a6b621 100644 (file)
--- a/net/mwan3/files/lib/mwan3/common.sh
+++ b/net/mwan3/files/lib/mwan3/common.sh
@@ -5,6 +5,7 @@ IP6="ip -6"
 SCRIPTNAME="$(basename "$0")"
 
 MWAN3_STATUS_DIR="/var/run/mwan3"
+MWAN3_STATUS_IPTABLES_LOG_DIR="${MWAN3_STATUS_DIR}/iptables_log"
 MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
 
 MWAN3_INTERFACE_MAX=""
@@ -118,6 +119,7 @@ mwan3_init()
        config_load mwan3
 
        [ -d $MWAN3_STATUS_DIR ] || mkdir -p $MWAN3_STATUS_DIR/iface_state
+       [ -d "$MWAN3_STATUS_IPTABLES_LOG_DIR" ] || mkdir -p "$MWAN3_STATUS_IPTABLES_LOG_DIR"
 
        # mwan3's MARKing mask (at least 3 bits should be set)
        if [ -e "${MWAN3_STATUS_DIR}/mmx_mask" ]; then

diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index 74023569343c38473b7a4970f0f6865aa36661c7..ec627be689d2abd1bde5e6ef9b3fdd593e263cc3 100644 (file)
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -142,6 +142,7 @@ mwan3_set_custom_ipset()
                config_list_foreach "globals" "rt_table_lookup" mwan3_set_custom_ipset_v6
        fi
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/ipset-set_custom_ipset.dump"
        error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_custom_ipset: $error"
 }
 
@@ -179,6 +180,7 @@ mwan3_set_connected_ipv4()
 
        mwan3_push_update add mwan3_connected_ipv4 224.0.0.0/3
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/ipset-set_connected_ipv4.dump"
        error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_connected_ipv4: $error"
 }
 
@@ -195,6 +197,7 @@ mwan3_set_connected_ipv6()
                mwan3_push_update -! add mwan3_connected_ipv6 "$connected_network_v6"
        done
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/ipset-set_connected_ipv6.dump"
        error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_connected_ipv6: $error"
 }
 
@@ -211,6 +214,7 @@ mwan3_set_connected_ipset()
                mwan3_push_update flush mwan3_connected_ipv6
        fi
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/ipset-set_connected_ipset.dump"
        error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_connected_ipset: $error"
 }
 
@@ -227,6 +231,7 @@ mwan3_set_dynamic_ipset()
                mwan3_push_update flush mwan3_dynamic_ipv6
        fi
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/ipset-set_dynamic_ipset.dump"
        error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_dynamic_ipset: $error"
 }
 
@@ -341,6 +346,8 @@ mwan3_set_general_iptables()
                fi
                mwan3_push_update COMMIT
                mwan3_push_update ""
+
+               echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/iptables-set_general_iptables-${family}.dump"
                if [ "$IPT" = "$IPT4" ]; then
                        error=$(echo "$update" | $IPT4R 2>&1) || LOG error "set_general_iptables (${family}): $error"
                else
@@ -405,8 +412,9 @@ mwan3_create_iface_iptables()
 
        mwan3_push_update COMMIT
        mwan3_push_update ""
-       error=$(echo "$update" | $IPTR 2>&1) || LOG error "create_iface_iptables (${1}): $error"
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/iptables-create_iface_iptables-${1}.dump"
+       error=$(echo "$update" | $IPTR 2>&1) || LOG error "create_iface_iptables (${1}): $error"
 }
 
 mwan3_delete_iface_iptables()
@@ -434,6 +442,7 @@ mwan3_delete_iface_iptables()
        mwan3_push_update COMMIT
        mwan3_push_update ""
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/iptables-delete_iface_iptables-${1}.dump"
        error=$(echo "$update" | $IPTR 2>&1) || LOG error "delete_iface_iptables (${1}): $error"
 }
 
@@ -652,8 +661,9 @@ mwan3_set_policy()
        fi
        mwan3_push_update COMMIT
        mwan3_push_update ""
-       error=$(echo "$update" | $IPTR 2>&1) || LOG error "set_policy ($1): $error"
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/iptables-set_policy-${1}.dump"
+       error=$(echo "$update" | $IPTR 2>&1) || LOG error "set_policy ($1): $error"
 }
 
 mwan3_create_policies_iptables()
@@ -700,6 +710,8 @@ mwan3_create_policies_iptables()
                esac
                mwan3_push_update COMMIT
                mwan3_push_update ""
+
+               echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/iptables-create_policies_iptables-${1}.dump"
                if [ "$IPT" = "$IPT4" ]; then
                        error=$(echo "$update" | $IPT4R 2>&1) || LOG error "create_policies_iptables ($1): $error"
                else
@@ -766,6 +778,7 @@ mwan3_set_sticky_ipset()
                        hash:ip,mark markmask "$mmx" \
                        timeout "$timeout" family inet6
 
+       echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/ipset-set_sticky_ipset-${rule}.dump"
        error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_sticky_ipset (${rule}): $error"
 }
 
@@ -969,6 +982,8 @@ mwan3_set_user_rules()
 
                mwan3_push_update COMMIT
                mwan3_push_update ""
+
+               echo "$update" > "${MWAN3_STATUS_IPTABLES_LOG_DIR}/iptables-set_user_rules-${ipv}.dump"
                error=$(echo "$update" | $IPTR 2>&1) || LOG error "set_user_rules (${ipv}): $error"
        done