From 3461af861e665bc73cb0c4f3de9ad50243538539 Mon Sep 17 00:00:00 2001
From: ssrlive <30760636+ssrlive@users.noreply.github.com>
Date: Tue, 3 Oct 2023 11:22:23 +0800
Subject: [PATCH] rename bypass_ip to bypass

---
 README.md            |  2 +-
 docker/entrypoint.sh |  2 +-
 src/lib.rs           |  6 +++---
 src/main.rs          | 12 ++++++------
 src/tun2proxy.rs     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 691c7eb..db598a7 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Options:
       --dns-addr <IP>      DNS resolver address [default: 8.8.8.8]
   -6, --ipv6-enabled       IPv6 enabled
   -s, --setup <method>     Routing and system setup [possible values: auto]
-      --bypass-ip <IP>     Public proxy IP used in routing setup which should bypassing the tunnel
+  -b, --bypass <IP>        Public proxy IP used in routing setup which should bypassing the tunnel
   -v, --verbosity <level>  Verbosity level [default: info] [possible values: off, error, warn, info, debug, trace]
   -h, --help               Print help
   -V, --version            Print version
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index a923180..f0e9e5c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,7 +3,7 @@
 
 run() {
   if [ -n "$BYPASS_IP" ]; then
-    BYPASS_IP="--bypass-ip $BYPASS_IP"
+    BYPASS_IP="--bypass $BYPASS_IP"
   fi
 
   if [ -n "$DNS" ]; then
diff --git a/src/lib.rs b/src/lib.rs
index 85e9768..537f0c2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -102,7 +102,7 @@ pub struct Options {
     dns_over_tcp: bool,
     dns_addr: Option<std::net::IpAddr>,
     ipv6_enabled: bool,
-    bypass_ip: Option<std::net::IpAddr>,
+    bypass: Option<std::net::IpAddr>,
 }
 
 impl Options {
@@ -137,8 +137,8 @@ impl Options {
         self
     }
 
-    pub fn with_bypass_ip(mut self, ip: Option<std::net::IpAddr>) -> Self {
-        self.bypass_ip = ip;
+    pub fn with_bypass(mut self, ip: Option<std::net::IpAddr>) -> Self {
+        self.bypass = ip;
         self
     }
 }
diff --git a/src/main.rs b/src/main.rs
index dfaae3d..404c341 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -42,8 +42,8 @@ struct Args {
     setup: Option<ArgSetup>,
 
     /// Public proxy IP used in routing setup which should bypassing the tunnel
-    #[arg(long, value_name = "IP")]
-    bypass_ip: Option<IpAddr>,
+    #[arg(short, long, value_name = "IP")]
+    bypass: Option<IpAddr>,
 
     /// Verbosity level
     #[arg(short, long, value_name = "level", value_enum, default_value = "info")]
@@ -116,22 +116,22 @@ fn main() -> ExitCode {
         }
     };
 
-    let bypass_tun_ip = match args.bypass_ip {
+    let bypass_tun_ip = match args.bypass {
         Some(addr) => addr,
         None => args.proxy.addr.ip(),
     };
-    options = options.with_bypass_ip(Some(bypass_tun_ip));
+    options = options.with_bypass(Some(bypass_tun_ip));
 
     let block = || -> Result<(), Error> {
         #[cfg(target_os = "linux")]
         {
             let mut setup: Setup;
             if args.setup == Some(ArgSetup::Auto) {
-                let bypass_tun_ip = match args.bypass_ip {
+                let bypass_tun_ip = match args.bypass {
                     Some(addr) => addr,
                     None => args.proxy.addr.ip(),
                 };
-                setup = Setup::new(&args.tun, &bypass_tun_ip, get_default_cidrs(), args.bypass_ip.is_some());
+                setup = Setup::new(&args.tun, &bypass_tun_ip, get_default_cidrs(), args.bypass.is_some());
 
                 setup.configure()?;
 
diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs
index f23d3dd..6ae46ba 100644
--- a/src/tun2proxy.rs
+++ b/src/tun2proxy.rs
@@ -1154,7 +1154,7 @@ impl<'a> TunToProxy<'a> {
                         count += 1;
                     }
                     Err(err) => {
-                        println!("Failed to send exit signal: \"{}\"", err);
+                        log::error!("Failed to send exit signal: \"{}\"", err);
                         break;
                     }
                 }