From 65aca127561e26251d0b617c9a575924c0dd3361 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Wed, 15 Nov 2023 22:15:10 +0900 Subject: [PATCH] chore: fix dir name --- .github/dependabot.yml | 4 ++-- Cargo.toml | 2 +- {dap-bin => proxy-bin}/Cargo.toml | 2 +- {dap-bin => proxy-bin}/src/config/mod.rs | 0 {dap-bin => proxy-bin}/src/config/parse.rs | 0 {dap-bin => proxy-bin}/src/config/plugins.rs | 0 {dap-bin => proxy-bin}/src/config/target_config.rs | 0 {dap-bin => proxy-bin}/src/config/toml.rs | 0 {dap-bin => proxy-bin}/src/config/utils_verifier.rs | 0 {dap-bin => proxy-bin}/src/constants.rs | 0 {dap-bin => proxy-bin}/src/error.rs | 0 {dap-bin => proxy-bin}/src/log.rs | 0 {dap-bin => proxy-bin}/src/main.rs | 0 {dap-lib => proxy-lib}/Cargo.toml | 0 {dap-lib => proxy-lib}/src/auth/auth_main.rs | 0 {dap-lib => proxy-lib}/src/auth/auth_service.rs | 0 {dap-lib => proxy-lib}/src/auth/mod.rs | 0 {dap-lib => proxy-lib}/src/bootstrap.rs | 0 {dap-lib => proxy-lib}/src/constants.rs | 0 {dap-lib => proxy-lib}/src/doh_client/cache.rs | 0 {dap-lib => proxy-lib}/src/doh_client/dns_message.rs | 0 .../src/doh_client/doh_client_healthcheck.rs | 0 {dap-lib => proxy-lib}/src/doh_client/doh_client_main.rs | 0 .../src/doh_client/manipulation/domain_block.rs | 0 .../src/doh_client/manipulation/domain_override.rs | 0 {dap-lib => proxy-lib}/src/doh_client/manipulation/mod.rs | 0 .../src/doh_client/manipulation/regexp_vals.rs | 0 {dap-lib => proxy-lib}/src/doh_client/mod.rs | 0 {dap-lib => proxy-lib}/src/doh_client/odoh.rs | 0 {dap-lib => proxy-lib}/src/doh_client/odoh_config_store.rs | 0 {dap-lib => proxy-lib}/src/doh_client/path_manage.rs | 0 {dap-lib => proxy-lib}/src/error.rs | 0 {dap-lib => proxy-lib}/src/globals.rs | 0 {dap-lib => proxy-lib}/src/http_client/http_client_main.rs | 0 {dap-lib => proxy-lib}/src/http_client/http_client_service.rs | 0 {dap-lib => proxy-lib}/src/http_client/mod.rs | 0 {dap-lib => proxy-lib}/src/lib.rs | 0 {dap-lib => proxy-lib}/src/log.rs | 0 {dap-lib => proxy-lib}/src/proxy/counter.rs | 0 {dap-lib => proxy-lib}/src/proxy/mod.rs | 0 {dap-lib => proxy-lib}/src/proxy/proxy_main.rs | 0 {dap-lib => proxy-lib}/src/proxy/proxy_tcp.rs | 0 {dap-lib => proxy-lib}/src/proxy/proxy_udp.rs | 0 {dap-lib => proxy-lib}/src/proxy/socket.rs | 0 {dap-lib => proxy-lib}/src/trait_resolve_ips.rs | 0 45 files changed, 4 insertions(+), 4 deletions(-) rename {dap-bin => proxy-bin}/Cargo.toml (96%) rename {dap-bin => proxy-bin}/src/config/mod.rs (100%) rename {dap-bin => proxy-bin}/src/config/parse.rs (100%) rename {dap-bin => proxy-bin}/src/config/plugins.rs (100%) rename {dap-bin => proxy-bin}/src/config/target_config.rs (100%) rename {dap-bin => proxy-bin}/src/config/toml.rs (100%) rename {dap-bin => proxy-bin}/src/config/utils_verifier.rs (100%) rename {dap-bin => proxy-bin}/src/constants.rs (100%) rename {dap-bin => proxy-bin}/src/error.rs (100%) rename {dap-bin => proxy-bin}/src/log.rs (100%) rename {dap-bin => proxy-bin}/src/main.rs (100%) rename {dap-lib => proxy-lib}/Cargo.toml (100%) rename {dap-lib => proxy-lib}/src/auth/auth_main.rs (100%) rename {dap-lib => proxy-lib}/src/auth/auth_service.rs (100%) rename {dap-lib => proxy-lib}/src/auth/mod.rs (100%) rename {dap-lib => proxy-lib}/src/bootstrap.rs (100%) rename {dap-lib => proxy-lib}/src/constants.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/cache.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/dns_message.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/doh_client_healthcheck.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/doh_client_main.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/manipulation/domain_block.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/manipulation/domain_override.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/manipulation/mod.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/manipulation/regexp_vals.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/mod.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/odoh.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/odoh_config_store.rs (100%) rename {dap-lib => proxy-lib}/src/doh_client/path_manage.rs (100%) rename {dap-lib => proxy-lib}/src/error.rs (100%) rename {dap-lib => proxy-lib}/src/globals.rs (100%) rename {dap-lib => proxy-lib}/src/http_client/http_client_main.rs (100%) rename {dap-lib => proxy-lib}/src/http_client/http_client_service.rs (100%) rename {dap-lib => proxy-lib}/src/http_client/mod.rs (100%) rename {dap-lib => proxy-lib}/src/lib.rs (100%) rename {dap-lib => proxy-lib}/src/log.rs (100%) rename {dap-lib => proxy-lib}/src/proxy/counter.rs (100%) rename {dap-lib => proxy-lib}/src/proxy/mod.rs (100%) rename {dap-lib => proxy-lib}/src/proxy/proxy_main.rs (100%) rename {dap-lib => proxy-lib}/src/proxy/proxy_tcp.rs (100%) rename {dap-lib => proxy-lib}/src/proxy/proxy_udp.rs (100%) rename {dap-lib => proxy-lib}/src/proxy/socket.rs (100%) rename {dap-lib => proxy-lib}/src/trait_resolve_ips.rs (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0e41607..47e074f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,11 +9,11 @@ updates: schedule: interval: "daily" - package-ecosystem: "cargo" - directory: "/dap-bin" + directory: "/proxy-bin" schedule: interval: "daily" - package-ecosystem: "cargo" - directory: "/dap-lib" + directory: "/proxy-lib" schedule: interval: "daily" - package-ecosystem: "cargo" diff --git a/Cargo.toml b/Cargo.toml index 4308eaa..f014522 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] -members = ["dap-bin", "dap-lib", "legacy"] +members = ["proxy-bin", "proxy-lib", "legacy"] exclude = ["legacy"] resolver = "2" diff --git a/dap-bin/Cargo.toml b/proxy-bin/Cargo.toml similarity index 96% rename from dap-bin/Cargo.toml rename to proxy-bin/Cargo.toml index 9fdbff5..95e6434 100644 --- a/dap-bin/Cargo.toml +++ b/proxy-bin/Cargo.toml @@ -32,7 +32,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -doh-auth-proxy-lib = { path = "../dap-lib/" } +doh-auth-proxy-lib = { path = "../proxy-lib/" } anyhow = "1.0.75" mimalloc = { version = "*", default-features = false } diff --git a/dap-bin/src/config/mod.rs b/proxy-bin/src/config/mod.rs similarity index 100% rename from dap-bin/src/config/mod.rs rename to proxy-bin/src/config/mod.rs diff --git a/dap-bin/src/config/parse.rs b/proxy-bin/src/config/parse.rs similarity index 100% rename from dap-bin/src/config/parse.rs rename to proxy-bin/src/config/parse.rs diff --git a/dap-bin/src/config/plugins.rs b/proxy-bin/src/config/plugins.rs similarity index 100% rename from dap-bin/src/config/plugins.rs rename to proxy-bin/src/config/plugins.rs diff --git a/dap-bin/src/config/target_config.rs b/proxy-bin/src/config/target_config.rs similarity index 100% rename from dap-bin/src/config/target_config.rs rename to proxy-bin/src/config/target_config.rs diff --git a/dap-bin/src/config/toml.rs b/proxy-bin/src/config/toml.rs similarity index 100% rename from dap-bin/src/config/toml.rs rename to proxy-bin/src/config/toml.rs diff --git a/dap-bin/src/config/utils_verifier.rs b/proxy-bin/src/config/utils_verifier.rs similarity index 100% rename from dap-bin/src/config/utils_verifier.rs rename to proxy-bin/src/config/utils_verifier.rs diff --git a/dap-bin/src/constants.rs b/proxy-bin/src/constants.rs similarity index 100% rename from dap-bin/src/constants.rs rename to proxy-bin/src/constants.rs diff --git a/dap-bin/src/error.rs b/proxy-bin/src/error.rs similarity index 100% rename from dap-bin/src/error.rs rename to proxy-bin/src/error.rs diff --git a/dap-bin/src/log.rs b/proxy-bin/src/log.rs similarity index 100% rename from dap-bin/src/log.rs rename to proxy-bin/src/log.rs diff --git a/dap-bin/src/main.rs b/proxy-bin/src/main.rs similarity index 100% rename from dap-bin/src/main.rs rename to proxy-bin/src/main.rs diff --git a/dap-lib/Cargo.toml b/proxy-lib/Cargo.toml similarity index 100% rename from dap-lib/Cargo.toml rename to proxy-lib/Cargo.toml diff --git a/dap-lib/src/auth/auth_main.rs b/proxy-lib/src/auth/auth_main.rs similarity index 100% rename from dap-lib/src/auth/auth_main.rs rename to proxy-lib/src/auth/auth_main.rs diff --git a/dap-lib/src/auth/auth_service.rs b/proxy-lib/src/auth/auth_service.rs similarity index 100% rename from dap-lib/src/auth/auth_service.rs rename to proxy-lib/src/auth/auth_service.rs diff --git a/dap-lib/src/auth/mod.rs b/proxy-lib/src/auth/mod.rs similarity index 100% rename from dap-lib/src/auth/mod.rs rename to proxy-lib/src/auth/mod.rs diff --git a/dap-lib/src/bootstrap.rs b/proxy-lib/src/bootstrap.rs similarity index 100% rename from dap-lib/src/bootstrap.rs rename to proxy-lib/src/bootstrap.rs diff --git a/dap-lib/src/constants.rs b/proxy-lib/src/constants.rs similarity index 100% rename from dap-lib/src/constants.rs rename to proxy-lib/src/constants.rs diff --git a/dap-lib/src/doh_client/cache.rs b/proxy-lib/src/doh_client/cache.rs similarity index 100% rename from dap-lib/src/doh_client/cache.rs rename to proxy-lib/src/doh_client/cache.rs diff --git a/dap-lib/src/doh_client/dns_message.rs b/proxy-lib/src/doh_client/dns_message.rs similarity index 100% rename from dap-lib/src/doh_client/dns_message.rs rename to proxy-lib/src/doh_client/dns_message.rs diff --git a/dap-lib/src/doh_client/doh_client_healthcheck.rs b/proxy-lib/src/doh_client/doh_client_healthcheck.rs similarity index 100% rename from dap-lib/src/doh_client/doh_client_healthcheck.rs rename to proxy-lib/src/doh_client/doh_client_healthcheck.rs diff --git a/dap-lib/src/doh_client/doh_client_main.rs b/proxy-lib/src/doh_client/doh_client_main.rs similarity index 100% rename from dap-lib/src/doh_client/doh_client_main.rs rename to proxy-lib/src/doh_client/doh_client_main.rs diff --git a/dap-lib/src/doh_client/manipulation/domain_block.rs b/proxy-lib/src/doh_client/manipulation/domain_block.rs similarity index 100% rename from dap-lib/src/doh_client/manipulation/domain_block.rs rename to proxy-lib/src/doh_client/manipulation/domain_block.rs diff --git a/dap-lib/src/doh_client/manipulation/domain_override.rs b/proxy-lib/src/doh_client/manipulation/domain_override.rs similarity index 100% rename from dap-lib/src/doh_client/manipulation/domain_override.rs rename to proxy-lib/src/doh_client/manipulation/domain_override.rs diff --git a/dap-lib/src/doh_client/manipulation/mod.rs b/proxy-lib/src/doh_client/manipulation/mod.rs similarity index 100% rename from dap-lib/src/doh_client/manipulation/mod.rs rename to proxy-lib/src/doh_client/manipulation/mod.rs diff --git a/dap-lib/src/doh_client/manipulation/regexp_vals.rs b/proxy-lib/src/doh_client/manipulation/regexp_vals.rs similarity index 100% rename from dap-lib/src/doh_client/manipulation/regexp_vals.rs rename to proxy-lib/src/doh_client/manipulation/regexp_vals.rs diff --git a/dap-lib/src/doh_client/mod.rs b/proxy-lib/src/doh_client/mod.rs similarity index 100% rename from dap-lib/src/doh_client/mod.rs rename to proxy-lib/src/doh_client/mod.rs diff --git a/dap-lib/src/doh_client/odoh.rs b/proxy-lib/src/doh_client/odoh.rs similarity index 100% rename from dap-lib/src/doh_client/odoh.rs rename to proxy-lib/src/doh_client/odoh.rs diff --git a/dap-lib/src/doh_client/odoh_config_store.rs b/proxy-lib/src/doh_client/odoh_config_store.rs similarity index 100% rename from dap-lib/src/doh_client/odoh_config_store.rs rename to proxy-lib/src/doh_client/odoh_config_store.rs diff --git a/dap-lib/src/doh_client/path_manage.rs b/proxy-lib/src/doh_client/path_manage.rs similarity index 100% rename from dap-lib/src/doh_client/path_manage.rs rename to proxy-lib/src/doh_client/path_manage.rs diff --git a/dap-lib/src/error.rs b/proxy-lib/src/error.rs similarity index 100% rename from dap-lib/src/error.rs rename to proxy-lib/src/error.rs diff --git a/dap-lib/src/globals.rs b/proxy-lib/src/globals.rs similarity index 100% rename from dap-lib/src/globals.rs rename to proxy-lib/src/globals.rs diff --git a/dap-lib/src/http_client/http_client_main.rs b/proxy-lib/src/http_client/http_client_main.rs similarity index 100% rename from dap-lib/src/http_client/http_client_main.rs rename to proxy-lib/src/http_client/http_client_main.rs diff --git a/dap-lib/src/http_client/http_client_service.rs b/proxy-lib/src/http_client/http_client_service.rs similarity index 100% rename from dap-lib/src/http_client/http_client_service.rs rename to proxy-lib/src/http_client/http_client_service.rs diff --git a/dap-lib/src/http_client/mod.rs b/proxy-lib/src/http_client/mod.rs similarity index 100% rename from dap-lib/src/http_client/mod.rs rename to proxy-lib/src/http_client/mod.rs diff --git a/dap-lib/src/lib.rs b/proxy-lib/src/lib.rs similarity index 100% rename from dap-lib/src/lib.rs rename to proxy-lib/src/lib.rs diff --git a/dap-lib/src/log.rs b/proxy-lib/src/log.rs similarity index 100% rename from dap-lib/src/log.rs rename to proxy-lib/src/log.rs diff --git a/dap-lib/src/proxy/counter.rs b/proxy-lib/src/proxy/counter.rs similarity index 100% rename from dap-lib/src/proxy/counter.rs rename to proxy-lib/src/proxy/counter.rs diff --git a/dap-lib/src/proxy/mod.rs b/proxy-lib/src/proxy/mod.rs similarity index 100% rename from dap-lib/src/proxy/mod.rs rename to proxy-lib/src/proxy/mod.rs diff --git a/dap-lib/src/proxy/proxy_main.rs b/proxy-lib/src/proxy/proxy_main.rs similarity index 100% rename from dap-lib/src/proxy/proxy_main.rs rename to proxy-lib/src/proxy/proxy_main.rs diff --git a/dap-lib/src/proxy/proxy_tcp.rs b/proxy-lib/src/proxy/proxy_tcp.rs similarity index 100% rename from dap-lib/src/proxy/proxy_tcp.rs rename to proxy-lib/src/proxy/proxy_tcp.rs diff --git a/dap-lib/src/proxy/proxy_udp.rs b/proxy-lib/src/proxy/proxy_udp.rs similarity index 100% rename from dap-lib/src/proxy/proxy_udp.rs rename to proxy-lib/src/proxy/proxy_udp.rs diff --git a/dap-lib/src/proxy/socket.rs b/proxy-lib/src/proxy/socket.rs similarity index 100% rename from dap-lib/src/proxy/socket.rs rename to proxy-lib/src/proxy/socket.rs diff --git a/dap-lib/src/trait_resolve_ips.rs b/proxy-lib/src/trait_resolve_ips.rs similarity index 100% rename from dap-lib/src/trait_resolve_ips.rs rename to proxy-lib/src/trait_resolve_ips.rs