Merge into the main branch (#4)

* 整理include

* 增加编译信息

* 递增版本号

---------

Co-authored-by: bytesharky <fish@doffish.com>

Author: bytesharky

.gitignore

@@ -1,2 +1,3 @@
 .vscode/
 .VSCodeCounter/
+.vs/

include/config.h

@@ -1,9 +1,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
-#include <stddef.h>
-#include "helper.h"
+#include <stddef.h>  // for size_t
 
-#define VERSION "1.1.0"
+#define VERSION "1.1.1"
 #define LISTEN_PORT_ENV "LISTEN_PORT"
 #define FORWARD_DNS_ENV "FORWARD_DNS"
 #define GATEWAY_ENV "GATEWAY_NAME"
@@ -34,7 +33,7 @@ extern char container_name[256];
 extern char gateway_name[64];
 extern char suffix_domain[64];
 
-void init_config_env();
+void init_config_env(void);
 void init_config_argc(int argc, char *argv[]);
 int* str2int(const char *nptr);
 void read_env(const char *env_name, const char *default_val, char *dest, size_t dest_size);

include/dns.h

@@ -1,17 +1,22 @@
 #ifndef DNS_H
 #define DNS_H
+#include <stdint.h>         // for uint8_t
+#include <sys/socket.h>     // for socklen_t, ssize_t
+// #include <ldns/packet.h>    // for ldns_pkt
+// #include <ldns/rdata.h>     // for ldns_rdf
+// #include <ldns/resolver.h>  // for ldns_resolver
 #include <ldns/ldns.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
+
+struct sockaddr_in;
 
 #define QUEUE_SIZE 1024
 
-int test_forward_dns();
+int test_forward_dns(void);
 int is_match_suffix(const char *name);
+void strip_dot(char *name);
 void strip_suffix(char *name);
-ldns_resolver* create_fresh_resolver();
+ldns_resolver* create_fresh_resolver(void);
 ldns_pkt* modify_query_domain(ldns_pkt *original_pkt,  ldns_rdf *new_domain);
-void process_dns_query(int sockfd, const char *buf, ssize_t len,
+void process_dns_query(int sockfd, const uint8_t *buf, ssize_t len,
                         struct sockaddr_in *client, socklen_t client_len);
 #endif

include/gateway.h

@@ -1,12 +1,14 @@
 #ifndef GATEWAY_H
 #define GATEWAY_H
+#include <netinet/in.h>   // for in_addr
+// #include <ldns/packet.h>  // for ldns_pkt
+// #include <ldns/rr.h>      // for ldns_rr
 #include <ldns/ldns.h>
-#include <netinet/in.h>
 
 extern struct in_addr gateway_addr; 
 
 int is_gateway_domain(const char *name);
-int resolve_gateway_ip();
+int resolve_gateway_ip(void);
 ldns_pkt* handle_gateway_query(ldns_pkt *query_pkt, ldns_rr *qrr, 
     struct in_addr client_addr);
 

include/helper.h

@@ -17,6 +17,31 @@ typedef enum {
     OPT_VERSION
 } OptionType;
 
+#if defined(__linux__)
+#define OS_NAME "Linux"
+#elif defined(__APPLE__)
+#define OS_NAME "macOS"
+#elif defined(_WIN32) || defined(_WIN64)
+#define OS_NAME "Windows"
+#else
+#define OS_NAME "Unknown"
+#endif
+
+#if defined(__x86_64__)
+#define ARCH_NAME "x86_64"
+#elif defined(__i386__)
+#define ARCH_NAME "i386"
+#elif defined(__aarch64__)
+#define ARCH_NAME "ARM64"
+#elif defined(__arm__)
+#define ARCH_NAME "ARM32"
+#elif defined(__riscv)
+#define ARCH_NAME "RISC-V"
+#else
+#define ARCH_NAME "Unknown"
+#endif
+
+void print_version(void);
 void print_help(const char *progname);
 OptionType get_option_type(const char* arg);
-#endif
+#endif

include/logging.h

@@ -1,6 +1,7 @@
 #ifndef LOGGING_H
 #define LOGGING_H
-#include <stdarg.h>
+
+#include <stdio.h>  // for va_list
 
 typedef enum {
     LOG_DEBUG = 0,

include/loop_marker.h

@@ -1,8 +1,9 @@
 #ifndef LOOP_MARKER_H
 #define LOOP_MARKER_H
-#include <ldns/ldns.h>
-#include <ldns/edns.h>
-#include <arpa/inet.h>
+
+#include <stdint.h>       // for uint16_t
+// #include <ldns/packet.h>  // for ldns_pkt
+#include <ldns/ldns.h> 
 
 #define MY_OPTION_CODE 65001
 #define HOP_COUNT_DATA_LEN 2

include/queue.h

@@ -1,8 +1,9 @@
 #ifndef QUEUE_H
 #define QUEUE_H
-#include <pthread.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
+#include <netinet/in.h>  // for sockaddr_in
+#include <pthread.h>     // for pthread_cond_t, pthread_mutex_t
+#include <stdint.h>      // for uint8_t
+#include <sys/socket.h>  // for size_t, socklen_t
 
 #define BUF_SIZE 4096
 #define QUEUE_SIZE 1024
@@ -20,5 +21,5 @@ extern pthread_mutex_t q_mutex;
 extern pthread_cond_t q_cond;
 
 void enqueue_request(dns_request_t *req);
-int dequeue_request(dns_request_t *req);
+void dequeue_request(dns_request_t *req);
 #endif

include/sigterm.h

@@ -1,6 +1,6 @@
 #ifndef SIGNAL_H
 #define SIGNAL_H
-#include <signal.h>
+#include <signal.h>   // for sig_atomic_t
 
 extern volatile sig_atomic_t stop;
 

src/config.c

@@ -1,10 +1,11 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include "logging.h"
 #include "config.h"
+#include "helper.h"   // for print_help, get_option_type, OPT_CONTAINER, OPT...
+#include "logging.h"  // for log_msg, LOG_FATAL, parse_log_level, log_level
+#include <errno.h>    // for errno, ERANGE
+#include <limits.h>   // for INT_MAX, INT_MIN, LONG_MAX, LONG_MIN
+#include <stdio.h>    // for fprintf, printf, stderr
+#include <stdlib.h>   // for exit, free, getenv, malloc, strtol
+#include <string.h>   // for strncpy, memmove, strlen
 
 int max_hops = MAX_HOPS_DEFAULT;
 int num_workers = NUM_WORKERS_DEFAULT;
@@ -17,7 +18,7 @@ char gateway_name[64] = {0};
 char suffix_domain[64] = {0};
 
 // 初始化配置(环境变量)
-void init_config_env() {
+void init_config_env(void) {
 
     // 从环境变量读取
     log_level = parse_log_level(getenv(LOG_LEVEL_ENV), LOG_INFO);
@@ -203,7 +204,7 @@ void init_config_argc(int argc, char *argv[]) {
                 print_help(argv[0]);
                 exit(0);
             case OPT_VERSION: 
-                printf("version: %s\n", VERSION);
+                print_version();
                 exit(0);
             case OPT_UNKNOWN:
                 fprintf(stderr, "Error: Unknown option '%s'\n", argv[i]);