feat: add fw_counters_update function to streamline firewall counter …

…updates Signed-off-by: Dengfeng Liu <[email protected]>
liudf0716 · Feb 1, 2025 · 200484e · 200484e
1 parent 56206ef
commit 200484e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/firewall.c b/src/firewall.c
@@ -852,4 +852,15 @@ fw_del_anti_nat_permit_device(const char *mac)
 #else
 	nft_fw_del_anti_nat_permit(mac);
 #endif
+}
+
+int
+fw_counters_update()
+{
+	debug(LOG_DEBUG, "Update firewall counters");
+#ifdef AW_FW3
+	return iptables_fw_counters_update();
+#else
+	return nft_fw_counters_update();
+#endif
 }
diff --git a/src/firewall.h b/src/firewall.h
@@ -111,4 +111,6 @@ void conntrack_flush(const char *);
 void fw_add_anti_nat_permit_device(const char *);
 void fw_del_anti_nat_permit_device(const char *);
 
+int fw_counters_update();
+
 #endif                          /* _FIREWALL_H_ */
diff --git a/src/wdctl_thread.c b/src/wdctl_thread.c
@@ -244,11 +244,7 @@ wdctl_status(struct bufferevent *fd, const char *arg)
     const char *type = arg;
     char *status = NULL;
 
-#ifdef AW_FW3
-	if (-1 == iptables_fw_counters_update()) 
-#else
-	if (-1 == nft_fw_counters_update()) 
-#endif
+    if (fw_counters_update())
 	{
 		debug(LOG_ERR, "Could not get counters from firewall!");
 	}