From c38aefc7bd33e7e341dd49aeff2c4acb308a798c Mon Sep 17 00:00:00 2001 From: Jackarain Date: Mon, 30 Oct 2023 10:41:59 +0800 Subject: [PATCH] Rename program option socks_server to server_listen. --- server/proxy_server/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/proxy_server/main.cpp b/server/proxy_server/main.cpp index 80318c5b9e..d1755d19aa 100644 --- a/server/proxy_server/main.cpp +++ b/server/proxy_server/main.cpp @@ -51,7 +51,7 @@ std::string ssl_dhparam; std::string ssl_sni; std::string ssl_ciphers; -std::string socks_listen; +std::string server_listen; std::string doc_directory; std::string log_directory; @@ -71,9 +71,9 @@ start_proxy_server(net::io_context& ioc, server_ptr& server) std::string host, port; bool v6only = false; - if (!parse_endpoint_string(socks_listen, host, port, v6only)) + if (!parse_endpoint_string(server_listen, host, port, v6only)) { - std::cerr << "Parse endpoint fail: " << socks_listen << std::endl; + std::cerr << "Parse endpoint fail: " << server_listen << std::endl; co_return; } @@ -208,7 +208,7 @@ int main(int argc, char** argv) ("help,h", "Help message.") ("config", po::value(&config)->value_name("config.conf"), "Load configuration options from specified file.") - ("socks_server", po::value(&socks_listen)->default_value("[::0]:1080")->value_name("ip:port"), "Specify SOCKS4/5 server listening address and port.") + ("server_listen", po::value(&server_listen)->default_value("[::0]:1080")->value_name("ip:port"), "Specify server listening address and port.") ("reuse_port", po::value(&reuse_port)->default_value(false), "Enable TCP SO_REUSEPORT option (available since Linux 3.9).") ("happyeyeballs", po::value(&happyeyeballs)->default_value(true), "Enable Happy Eyeballs algorithm for TCP connections.") @@ -279,7 +279,7 @@ int main(int argc, char** argv) print_args(argc, argv, vm); - LOG_DBG << "Start socks server: " << socks_listen; + LOG_DBG << "Start socks server: " << server_listen; net::io_context ioc(1); server_ptr server;