From 1e6b2e60bcbf0e36c40bf6482d17c868b988e1c5 Mon Sep 17 00:00:00 2001
From: "Y. T. Chung" <zonyitoo@gmail.com>
Date: Thu, 12 Oct 2017 02:23:29 +0800
Subject: [PATCH] Fixed bug, filter return false will be filtered, updated
 error messages

---
 src/relay/tcprelay/mod.rs    | 2 +-
 src/relay/tcprelay/server.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/relay/tcprelay/mod.rs b/src/relay/tcprelay/mod.rs
index 99523f0f..e0b3899a 100644
--- a/src/relay/tcprelay/mod.rs
+++ b/src/relay/tcprelay/mod.rs
@@ -220,7 +220,7 @@ impl<I: Iterator<Item = SocketAddr>> Future for TcpStreamConnect<I> {
             TcpStreamConnect::Connect { last_err, .. } => {
                 match last_err {
                     None => {
-                        let err = io::Error::new(ErrorKind::Other, "Connect without any addresses");
+                        let err = io::Error::new(ErrorKind::Other, "connect TCP without any addresses");
                         Err(err)
                     }
                     Some(err) => Err(err),
diff --git a/src/relay/tcprelay/server.rs b/src/relay/tcprelay/server.rs
index f4ae4d2f..bad1a39b 100644
--- a/src/relay/tcprelay/server.rs
+++ b/src/relay/tcprelay/server.rs
@@ -76,7 +76,7 @@ impl TcpRelayClientPending {
 
                     if forbidden_ip.contains(&addr.ip()) {
                         info!("{} has been forbidden", addr);
-                        let err = io::Error::new(ErrorKind::Other, format!("{} forbidden address", addr));
+                        let err = io::Error::new(ErrorKind::Other, format!("{} is forbidden", addr));
                         Err(err)
                     } else {
                         Ok(vec![addr])
@@ -95,9 +95,9 @@ impl TcpRelayClientPending {
                             let v = ip_addr.iter()
                                            .filter(|ipaddr| if forbidden_ip.contains(ipaddr) {
                                                        info!("{} has been forbidden", ipaddr);
-                                                       true
-                                                   } else {
                                                        false
+                                                   } else {
+                                                       true
                                                    })
                                            .map(|ip| match *ip {
                                                     IpAddr::V4(v4) => SocketAddr::V4(SocketAddrV4::new(v4, port)),