From 23166594b7ee345e44e045a76596bd48e77debbb Mon Sep 17 00:00:00 2001
From: sushen339 <sushen339@gmail.com>
Date: Tue, 18 Nov 2025 13:42:10 +0800
Subject: [PATCH]

---
 blockip/Makefile    |  6 +++---
 blockip/src/stats.c | 51 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/blockip/Makefile b/blockip/Makefile
index 5102f6b..d79fa3e 100644
--- a/blockip/Makefile
+++ b/blockip/Makefile
@@ -55,7 +55,7 @@ install: $(TARGET)
 	fi
 	install -m 755 $(TARGET) $(INSTALL_PATH)/$(TARGET)
 	@echo "已安装到: $(INSTALL_PATH)/$(TARGET)"
-	@echo "运行 'block-ip install' 来完成系统配置"
+	@echo "运行 'bip install' 来完成系统配置"
 
 # 卸载
 uninstall:
@@ -75,7 +75,7 @@ clean:
 # 清理所有文件（包括配置）
 distclean: clean
 	rm -rf /etc/blockip
-	rm -f /var/log/block-ip.log /var/log/block-ip.log.1
+	rm -f /var/log/bip.log /var/log/bip.log.1
 	@echo "深度清理完成"
 
 # 调试版本
@@ -88,7 +88,7 @@ static: clean $(TARGET)
 
 # 显示帮助
 help:
-	@echo "Block-IP 构建系统"
+	@echo "BIP 构建系统"
 	@echo ""
 	@echo "可用目标:"
 	@echo "  make          - 编译程序"
diff --git a/blockip/src/stats.c b/blockip/src/stats.c
index 9714d71..e73afc5 100644
--- a/blockip/src/stats.c
+++ b/blockip/src/stats.c
@@ -7,19 +7,12 @@
 void show_active_bans(void) {
     msg(C_CYAN, "=== 🔥 活跃封禁列表 (最新 5 条) ===");
     
-    /* 获取IPv4和IPv6黑名单 */
-    char buffer_v4[8192] = {0};
-    char buffer_v6[8192] = {0};
-    
-    nft_list_set_elements(NFT_SET, buffer_v4, sizeof(buffer_v4));
-    nft_list_set_elements(NFT_SET_V6, buffer_v6, sizeof(buffer_v6));
-    
     /* 解析并提取IP和过期时间 */
     char command[MAX_COMMAND_LEN];
     snprintf(command, sizeof(command),
              "{ nft list set %s %s 2>/dev/null; nft list set %s %s 2>/dev/null; } | "
-             "sed 's/,/\\n/g' | sed 's/elements = {//g; s/}//g' | "
-             "awk '{for(i=1;i<=NF;i++) if($i==\"expires\") {time=$(i+1); gsub(\"ms\",\"\",time); print $1, time}}' | "
+             "grep -E 'expires [0-9]+(s|m|h|d|ms)' | "
+             "awk '{ip=\"\"; time=\"\"; for(i=1;i<=NF;i++) { if($i==\"expires\") time=$(i+1); else if(index($i,\".\")>0 || index($i,\":\")>0) ip=$i } if(ip && time) print ip\" \"time}' | "
              "sort -t' ' -k2 | tail -n 5",
              NFT_TABLE, NFT_SET, NFT_TABLE, NFT_SET_V6);
     
@@ -38,8 +31,44 @@ void show_active_bans(void) {
     while (fgets(line, sizeof(line), fp)) {
         line[strcspn(line, "\n")] = 0;
         if (strlen(line) > 0) {
-            printf("%s\n", line);
-            count++;
+            char ip[MAX_IP_LEN] = {0};
+            char time_raw[64] = {0};
+            if (sscanf(line, "%s %s", ip, time_raw) == 2) {
+                // 解析nft时间格式：86394588ms, 23h59m54s等
+                long long total_s = 0;
+                char *p = time_raw;
+                long long num = 0;
+                
+                while (*p) {
+                    if (isdigit(*p)) {
+                        num = num * 10 + (*p - '0');
+                    } else {
+                        if (*p == 'd') total_s += num * 86400;
+                        else if (*p == 'h') total_s += num * 3600;
+                        else if (*p == 'm' && *(p+1) == 's') { total_s += num / 1000; p++; }
+                        else if (*p == 'm') total_s += num * 60;
+                        else if (*p == 's') total_s += num;
+                        num = 0;
+                    }
+                    p++;
+                }
+                
+                long long h = total_s / 3600;
+                long long m = (total_s % 3600) / 60;
+                long long s = total_s % 60;
+                
+                char time_str[64];
+                if (h > 0) {
+                    snprintf(time_str, sizeof(time_str), "%lldh%lldm%llds", h, m, s);
+                } else if (m > 0) {
+                    snprintf(time_str, sizeof(time_str), "%lldm%llds", m, s);
+                } else {
+                    snprintf(time_str, sizeof(time_str), "%llds", s);
+                }
+                
+                printf("%-20s %s\n", ip, time_str);
+                count++;
+            }
         }
     }