diff --git a/IP_region_query/ipquery b/IP_region_query/ipquery index 18fb866..66e0d95 100644 Binary files a/IP_region_query/ipquery and b/IP_region_query/ipquery differ diff --git a/IP_region_query/main.go b/IP_region_query/main.go index 42e89eb..9f910c5 100644 --- a/IP_region_query/main.go +++ b/IP_region_query/main.go @@ -3,7 +3,7 @@ package main import ( "encoding/json" "fmt" - "io/ioutil" + "io" "log" "net/http" "os" @@ -21,7 +21,7 @@ type IPInfo struct { func main() { if len(os.Args) < 2 { - log.Fatalf("Usage: %s ", os.Args[0]) + log.Fatalf("用法: %s ", os.Args[0]) } // 目标 URL @@ -30,23 +30,22 @@ func main() { // 发送 GET 请求 resp, err := http.Get(url) if err != nil { - log.Fatalf("Error making GET request: %v", err) + log.Fatalf("发送 GET 请求时出错: %v", err) } defer resp.Body.Close() // 读取响应体 - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { - log.Fatalf("Error reading response body: %v", err) + log.Fatalf("读取响应体时出错: %v", err) } // 解析 JSON 数据 var ipInfo IPInfo if err := json.Unmarshal(body, &ipInfo); err != nil { - log.Fatalf("Error parsing JSON: %v", err) + log.Fatalf("解析 JSON 时出错: %v", err) } // 提取并打印 continent 和 country 字段 fmt.Printf("%s%s\n", ipInfo.Data.Continent, ipInfo.Data.Country) - } diff --git a/denyip b/denyip index c02ca96..302e30f 100644 Binary files a/denyip and b/denyip differ diff --git a/main.c b/main.c index e69d163..1804081 100644 --- a/main.c +++ b/main.c @@ -1,24 +1,4 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ip2region.h" -#include "qqwry.h" -#include "common.h" - -#define RED "\033[31m" -#define RESET "\033[0m" -#define WHITELIST_IP_NUM 1024 -#define MAXIPSET 65534 - -char *xdb_path = "ip2region.xdb"; -pid_t pid1, pid2; // 保存子进程的 PID +#include "main.h" int is_valid_ip(const char *ip) diff --git a/main.h b/main.h new file mode 100644 index 0000000..d5fe63e --- /dev/null +++ b/main.h @@ -0,0 +1,26 @@ +#ifndef MAIN_H +#define MAIN_h + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ip2region.h" +#include "qqwry.h" +#include "common.h" + +#define RED "\033[31m" +#define RESET "\033[0m" +#define WHITELIST_IP_NUM 1024 +#define MAXIPSET 65534 + +char *xdb_path = "ip2region.xdb"; +pid_t pid1, pid2; // 保存子进程的 PID + +#endif diff --git a/main.o b/main.o index c0c112f..ca7f4b9 100644 Binary files a/main.o and b/main.o differ