code: refactor code structure.

plugin/demo/demo.c

@@ -1,11 +1,11 @@
 #include "demo.h"
-#include "dns_server.h"
-#include "util.h"
+#include "smartdns/dns_server.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <sys/socket.h>
-#include <tlog.h>
 
 static int demo_server_recv(struct dns_packet *packet, unsigned char *inpacket, int inpacket_len,
 							struct sockaddr_storage *local, socklen_t local_len, struct sockaddr_storage *from,

plugin/demo/demo.h

@@ -2,7 +2,7 @@
 #ifndef SMART_DNS_PLUGIN_DEMO_H
 #define SMART_DNS_PLUGIN_DEMO_H
 
-#include "dns_plugin.h"
+#include "smartdns/dns_plugin.h"
 
 #ifdef __cplusplus
 extern "C" {

plugin/smartdns-ui/build.rs

@@ -32,6 +32,7 @@ fn get_git_commit_version() {
 fn link_smartdns_lib() {
     let curr_source_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let smartdns_src_dir = format!("{}/../../src", curr_source_dir);
+    let smartdns_inc_dir = format!("{}/include", smartdns_src_dir);
     let smartdns_lib_file = format!("{}/libsmartdns-test.a", smartdns_src_dir);
 
     let cc = env::var("RUSTC_LINKER")
@@ -51,7 +52,7 @@ fn link_smartdns_lib() {
     let ignored_macros = IgnoreMacros(vec!["IPPORT_RESERVED".into()].into_iter().collect());
 
     let mut bindings_builder =
-        bindgen::Builder::default().header(format!("{}/smartdns.h", smartdns_src_dir));
+        bindgen::Builder::default().header(format!("{}/smartdns/smartdns.h", smartdns_inc_dir));
     if let Some(sysroot) = sysroot {
         bindings_builder = bindings_builder.clang_arg(format!("--sysroot={}", sysroot));
     }

src/.gitignore

@@ -3,3 +3,4 @@
 .DS_Store
 .swp.
 smartdns
+!smartdns/

src/Makefile

@@ -17,7 +17,7 @@
 BIN=smartdns
 SMARTDNS_LIB=libsmartdns.a
 SMARTDNS_TEST_LIB=libsmartdns-test.a
-OBJS_LIB=$(patsubst %.c,%.o,$(wildcard lib/*.c))
+OBJS_LIB=$(patsubst %.c,%.o,$(wildcard *.c)) $(patsubst %.c,%.o,$(wildcard */*.c))
 OBJS_MAIN=$(filter-out main.o, $(patsubst %.c,%.o,$(wildcard *.c)))
 TEST_OBJS=$(patsubst %.o,%_test.o,$(OBJS_MAIN) $(OBJS_LIB))
 MAIN_OBJ = main.o

src/dns.c

@@ -17,9 +17,9 @@
  */
 
 #define _GNU_SOURCE
-#include "dns.h"
-#include "stringutil.h"
-#include "tlog.h"
+#include "smartdns/dns.h"
+#include "smartdns/lib/stringutil.h"
+#include "smartdns/tlog.h"
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <stdint.h>

src/dns_cache.c

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dns_cache.h"
-#include "dns_stats.h"
-#include "stringutil.h"
-#include "timer.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/dns_cache.h"
+#include "smartdns/dns_stats.h"
+#include "smartdns/lib/stringutil.h"
+#include "smartdns/timer.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>

src/dns_client.c

@@ -17,19 +17,20 @@
  */
 
 #define _GNU_SOURCE
-#include "dns_client.h"
-#include "atomic.h"
-#include "dns.h"
-#include "dns_conf.h"
-#include "dns_server.h"
-#include "dns_stats.h"
-#include "fast_ping.h"
-#include "hashtable.h"
-#include "http_parse.h"
-#include "list.h"
-#include "proxy.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/dns_client.h"
+#include "smartdns/dns.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/dns_server.h"
+#include "smartdns/dns_stats.h"
+#include "smartdns/fast_ping.h"
+#include "smartdns/http_parse.h"
+#include "smartdns/lib/atomic.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/proxy.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>

src/dns_conf.c

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dns_conf.h"
-#include "idna.h"
-#include "list.h"
-#include "rbtree.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/lib/idna.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/lib/rbtree.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <errno.h>
 #include <getopt.h>
 #include <glob.h>

src/dns_plugin.c

@@ -16,21 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dns_plugin.h"
-
-#include "dns_conf.h"
-#include "include/conf.h"
-#include "include/hashtable.h"
-#include "include/list.h"
-#include "util.h"
+#include "smartdns/dns_plugin.h"
+
+#include "smartdns/dns_conf.h"
+#include "smartdns/lib/conf.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <dlfcn.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "tlog.h"
-
 struct dns_plugin_ops {
 	struct list_head list;
 	struct smartdns_operations ops;

src/dns_server.c

@@ -19,21 +19,21 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include "dns_server.h"
-#include "atomic.h"
-#include "dns.h"
-#include "dns_cache.h"
-#include "dns_client.h"
-#include "dns_conf.h"
-#include "dns_plugin.h"
-#include "dns_stats.h"
-#include "fast_ping.h"
-#include "hashtable.h"
-#include "http_parse.h"
-#include "list.h"
-#include "nftset.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/dns_server.h"
+#include "smartdns/dns.h"
+#include "smartdns/dns_cache.h"
+#include "smartdns/dns_client.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/dns_plugin.h"
+#include "smartdns/dns_stats.h"
+#include "smartdns/fast_ping.h"
+#include "smartdns/http_parse.h"
+#include "smartdns/lib/atomic.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/lib/nftset.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>

src/dns_stats.c

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dns_stats.h"
-#include "stddef.h"
-#include "string.h"
+#include "smartdns/dns_stats.h"
+#include <stddef.h>
+#include <string.h>
 
 struct dns_stats dns_stats;
 

src/fast_ping.c

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fast_ping.h"
-#include "atomic.h"
-#include "hashtable.h"
-#include "list.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/fast_ping.h"
+#include "smartdns/lib/atomic.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>

src/http_parse.c

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "http_parse.h"
-#include "hash.h"
-#include "hashtable.h"
-#include "jhash.h"
-#include "list.h"
-#include "qpack.h"
-#include "util.h"
+#include "smartdns/http_parse.h"
+#include "smartdns/lib/hash.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/jhash.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/lib/qpack.h"
+#include "smartdns/util.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/dns.h → src/include/smartdns/dns.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/dns_cache.h → src/include/smartdns/dns_cache.h

@@ -19,13 +19,13 @@
 #ifndef _SMARTDNS_CACHE_H
 #define _SMARTDNS_CACHE_H
 
-#include "atomic.h"
-#include "dns.h"
-#include "dns_conf.h"
-#include "hash.h"
-#include "hashtable.h"
-#include "list.h"
-#include "timer.h"
+#include "smartdns/dns.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/lib/atomic.h"
+#include "smartdns/lib/hash.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/timer.h"
 #include <stdlib.h>
 #include <time.h>
 

src/dns_client.h → src/include/smartdns/dns_client.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #ifndef _SMART_DNS_CLIENT_H
 #define _SMART_DNS_CLIENT_H
 
-#include "dns.h"
+#include "smartdns/dns.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dns_conf.h → src/include/smartdns/dns_conf.h

@@ -19,16 +19,16 @@
 #ifndef _DNS_CONF
 #define _DNS_CONF
 
-#include "art.h"
-#include "atomic.h"
-#include "conf.h"
-#include "dns.h"
-#include "dns_client.h"
-#include "hash.h"
-#include "hashtable.h"
-#include "list.h"
-#include "proxy.h"
-#include "radix.h"
+#include "smartdns/dns.h"
+#include "smartdns/dns_client.h"
+#include "smartdns/lib/art.h"
+#include "smartdns/lib/atomic.h"
+#include "smartdns/lib/conf.h"
+#include "smartdns/lib/hash.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/lib/radix.h"
+#include "smartdns/proxy.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dns_plugin.h → src/include/smartdns/dns_plugin.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2023 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #ifndef SMART_DNS_PLUGIN_H
 #define SMART_DNS_PLUGIN_H
 
-#include "dns.h"
+#include "smartdns/dns.h"
 #include <sys/socket.h>
 
 #ifdef __cplusplus

src/dns_server.h → src/include/smartdns/dns_server.h

@@ -19,8 +19,8 @@
 #ifndef _SMART_DNS_SERVER_H
 #define _SMART_DNS_SERVER_H
 
-#include "dns.h"
-#include "dns_client.h"
+#include "smartdns/dns.h"
+#include "smartdns/dns_client.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

src/dns_stats.h → src/include/smartdns/dns_stats.h

@@ -19,7 +19,7 @@
 #ifndef SMART_DNS_STATS_H
 #define SMART_DNS_STATS_H
 
-#include "atomic.h"
+#include "smartdns/lib/atomic.h"
 #include <stdint.h>
 
 #ifdef __cplusplus

src/fast_ping.h → src/include/smartdns/fast_ping.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/http_parse.h → src/include/smartdns/http_parse.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/atomic.h → src/include/smartdns/lib/atomic.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/bitmap.h → src/include/smartdns/lib/bitmap.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/bitops.h → src/include/smartdns/lib/bitops.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/conf.h → src/include/smartdns/lib/conf.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/findbit.h → src/include/smartdns/lib/findbit.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/gcc_builtin.h → src/include/smartdns/lib/gcc_builtin.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/hash.h → src/include/smartdns/lib/hash.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/hashtable.h → src/include/smartdns/lib/hashtable.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/idna.h → src/include/smartdns/lib/idna.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/jhash.h → src/include/smartdns/lib/jhash.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/list.h → src/include/smartdns/lib/list.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/rbtree.h → src/include/smartdns/lib/rbtree.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/stringutil.h → src/include/smartdns/lib/stringutil.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/include/timer_wheel.h → src/include/smartdns/lib/timer_wheel.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/proxy.h → src/include/smartdns/proxy.h

@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>.
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>.
  *
  * smartdns is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/smartdns.h → src/include/smartdns/smartdns.h

@@ -19,15 +19,14 @@
 #ifndef SMART_DNS_H
 #define SMART_DNS_H
 
-
-#include "dns_cache.h"
-#include "dns_client.h"
-#include "dns_conf.h"
-#include "dns_plugin.h"
-#include "dns_server.h"
-#include "fast_ping.h"
-#include "dns_stats.h"
-#include "util.h"
+#include "smartdns/dns_cache.h"
+#include "smartdns/dns_client.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/dns_plugin.h"
+#include "smartdns/dns_server.h"
+#include "smartdns/dns_stats.h"
+#include "smartdns/fast_ping.h"
+#include "smartdns/util.h"
 
 #ifdef __cplusplus
 extern "C" {

src/timer.h → src/include/smartdns/timer.h

@@ -19,7 +19,7 @@
 #ifndef SMART_DNS_TIMER_H
 #define SMART_DNS_TIMER_H
 
-#include "timer_wheel.h"
+#include "smartdns/lib/timer_wheel.h"
 
 #ifdef __cplusplus
 extern "C" {

src/tlog.h → src/include/smartdns/tlog.h

@@ -1,6 +1,6 @@
 /*
  * tinylog
- * Copyright (C) 2018-2025 Ruilin Peng (Nick) <[email protected]>
+ * Copyright (C) 2018-2024 Ruilin Peng (Nick) <[email protected]>
  * https://github.com/pymumu/tinylog
  */
 

src/util.h → src/include/smartdns/util.h

@@ -19,7 +19,7 @@
 #ifndef SMART_DNS_UTIL_H
 #define SMART_DNS_UTIL_H
 
-#include "stringutil.h"
+#include "smartdns/lib/stringutil.h"
 #include <netdb.h>
 #include <time.h>
 

src/lib/art.c

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <strings.h>
 #include <stdio.h>
 #include <assert.h>
-#include "art.h"
+#include "smartdns/lib/art.h"
 
 // #ifdef __i386__
 //     #include <emmintrin.h>

src/lib/bitops.c

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bitmap.h"
-#include "bitops.h"
+#include "smartdns/lib/bitmap.h"
+#include "smartdns/lib/bitops.h"
 
 /*
  * This is a common helper function for find_next_bit, find_next_zero_bit, and

src/lib/conf.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "conf.h"
+#include "smartdns/lib/conf.h"
 #include <errno.h>
 #include <getopt.h>
 #include <libgen.h>

src/lib/idna.c

@@ -18,7 +18,7 @@
  */
 
 #define _GNU_SOURCE
-#include "idna.h"
+#include "smartdns/lib/idna.h"
 #include <limits.h>
 
 static unsigned _utf8_decode_slow(const char **p, const char *pe, unsigned a)

src/lib/nftset.c

@@ -17,9 +17,9 @@
  */
 
 #define _GNU_SOURCE /* See feature_test_macros(7) */
-#include "nftset.h"
-#include "../dns_conf.h"
-#include "../tlog.h"
+#include "smartdns/lib/nftset.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/tlog.h"
 #include <errno.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>

src/lib/qpack.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "qpack.h"
+#include "smartdns/lib/qpack.h"
 
 static const uint8_t _qpack_huffman_bit[64] = {
 	249, 50,  115, 39,  38,  79, 147, 39, 38,  100, 249, 50,  114, 100, 242, 100, 228, 228, 206, 77,  52, 228,

src/lib/radix.c

@@ -60,7 +60,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "radix.h"
+#include "smartdns/lib/radix.h"
 
 /* $Id: radix.c,v 1.17 2007/10/24 06:04:31 djm Exp $ */
 

src/lib/rbtree.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rbtree.h"
+#include "smartdns/lib/rbtree.h"
 #include <stdbool.h>
 
 static inline void rb_set_black(struct rb_node *rb)

src/lib/timer_wheel.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bitops.h"
+#include "smartdns/lib/bitops.h"
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "timer_wheel.h"
+#include "smartdns/lib/timer_wheel.h"
 
 #define TVR_BITS 10
 #define TVN_BITS 6

src/main.c

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "smartdns.h"
+#include "smartdns/smartdns.h"
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

src/proxy.c

@@ -19,13 +19,13 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include "proxy.h"
-#include "dns_conf.h"
-#include "hashtable.h"
-#include "http_parse.h"
-#include "list.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/proxy.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/http_parse.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <errno.h>
 #include <pthread.h>

src/smartdns.c

@@ -18,15 +18,15 @@
 
 #define _GNU_SOURCE
 
-#include "smartdns.h"
-
-#include "art.h"
-#include "atomic.h"
-#include "hashtable.h"
-#include "list.h"
-#include "rbtree.h"
-#include "timer.h"
-#include "tlog.h"
+#include "smartdns/smartdns.h"
+
+#include "smartdns/lib/art.h"
+#include "smartdns/lib/atomic.h"
+#include "smartdns/lib/hashtable.h"
+#include "smartdns/lib/list.h"
+#include "smartdns/lib/rbtree.h"
+#include "smartdns/timer.h"
+#include "smartdns/tlog.h"
 
 #include <errno.h>
 #include <fcntl.h>

src/timer.c

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "timer.h"
-#include "timer_wheel.h"
+#include "smartdns/timer.h"
+#include "smartdns/lib/timer_wheel.h"
 
 static struct tw_base *dns_timer_base = NULL;
 

src/tlog.c

@@ -6,7 +6,7 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include "tlog.h"
+#include "smartdns/tlog.h"
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>

src/util.c

@@ -20,9 +20,9 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #endif
-#include "dns_conf.h"
-#include "tlog.h"
-#include "util.h"
+#include "smartdns/dns_conf.h"
+#include "smartdns/tlog.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <dirent.h>

test/cases/test-address.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-bootstrap.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-cache.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 
 /* clang-format off */
-#include "dns_cache.h"
+#include "smartdns/dns_cache.h"
 /* clang-format on */
 
 class Cache : public ::testing::Test

test/cases/test-client-rule.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-cname.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-ddns.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-discard-block-ip.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-dns64.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-domain-rule.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-domain-set.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-dualstack.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-edns.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-group.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-hosts.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-http.cc

@@ -17,11 +17,11 @@
  */
 
 #include "client.h"
-#include "dns.h"
-#include "http_parse.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/dns.h"
+#include "smartdns/http_parse.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 
@@ -133,7 +133,6 @@ TEST_F(HTTP, http1_1_response_serialize)
 	http_head_destroy(http_head);
 }
 
-
 TEST_F(HTTP, http3_0_parse)
 {
 	struct http_head *http_head = http_head_init(1024, HTTP_VERSION_3_0);

test/cases/test-https.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-idna.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-ip-alias.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-ip-rule.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-mdns.cc

@@ -17,8 +17,8 @@
  */
 
 #include "client.h"
-#include "dns.h"
-#include "dns_client.h"
+#include "smartdns/dns.h"
+#include "smartdns/dns_client.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-nameserver.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-perf.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-ping.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "fast_ping.h"
+#include "smartdns/fast_ping.h"
 #include "include/utils.h"
 #include "server.h"
-#include "tlog.h"
+#include "smartdns/tlog.h"
 #include "gtest/gtest.h"
 
 class Ping : public ::testing::Test

test/cases/test-ptr.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-qtype-soa.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-rule.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-same-pending-query.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-server.cc

@@ -17,7 +17,7 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
 #include "gtest/gtest.h"

test/cases/test-speed-check.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-srv.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/cases/test-subnet.cc

@@ -17,10 +17,10 @@
  */
 
 #include "client.h"
-#include "dns.h"
+#include "smartdns/dns.h"
 #include "include/utils.h"
 #include "server.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include "gtest/gtest.h"
 #include <fstream>
 

test/server.cc

@@ -17,11 +17,11 @@
  */
 
 #include "server.h"
-#include "dns_server.h"
-#include "fast_ping.h"
+#include "smartdns/dns_server.h"
+#include "smartdns/fast_ping.h"
 #include "include/utils.h"
-#include "smartdns.h"
-#include "util.h"
+#include "smartdns/smartdns.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <fstream>

test/server.h

@@ -19,8 +19,8 @@
 #ifndef _SMARTDNS_SERVER_
 #define _SMARTDNS_SERVER_
 
-#include "dns.h"
-#include "fast_ping.h"
+#include "smartdns/dns.h"
+#include "smartdns/fast_ping.h"
 #include "include/utils.h"
 #include <functional>
 #include <string>

test/utils.cc

@@ -1,5 +1,5 @@
 #include "include/utils.h"
-#include "util.h"
+#include "smartdns/util.h"
 #include <arpa/inet.h>
 #include <ifaddrs.h>
 #include <netinet/in.h>