From aaf7284234cb4f0d824afd9ec5f46eaaa8aca25e Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 31 Jul 2015 18:50:30 +0800
Subject: [PATCH] avoid protect socket every time

---
 src/tunnel.c   |  1 -
 src/udprelay.c | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/tunnel.c b/src/tunnel.c
index 1407319f..ee8b781a 100644
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -616,7 +616,6 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
     }
 #endif
 
-
     setsockopt(remotefd, SOL_TCP, TCP_NODELAY, &opt, sizeof(opt));
 #ifdef SO_NOSIGPIPE
     setsockopt(remotefd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
diff --git a/src/udprelay.c b/src/udprelay.c
index 9d3fa677..da0dcfa2 100644
--- a/src/udprelay.c
+++ b/src/udprelay.c
@@ -1042,6 +1042,16 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
         }
 #endif
 
+#ifdef ANDROID
+        if (vpn) {
+            if (protect_socket(remotefd) == -1) {
+                ERROR("protect_socket");
+                close(remotefd);
+                goto CLEAN_UP;
+            }
+        }
+#endif
+
         // Init remote_ctx
         remote_ctx = new_remote(remotefd, server_ctx);
         remote_ctx->src_addr = src_addr;
@@ -1055,6 +1065,7 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
         // Start remote io
         ev_io_start(EV_A_ & remote_ctx->io);
         ev_timer_start(EV_A_ & remote_ctx->watcher);
+
     }
 
     if (offset > 0) {
@@ -1064,15 +1075,6 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
 
     buf = ss_encrypt_all(BUF_SIZE, buf, &buf_len, server_ctx->method);
 
-#ifdef ANDROID
-    if (vpn) {
-        if (protect_socket(remote_ctx->fd) == -1) {
-            ERROR("protect_socket");
-            close_and_free_remote(EV_A_ remote_ctx);
-            goto CLEAN_UP;
-        }
-    }
-#endif
     int s = sendto(remote_ctx->fd, buf, buf_len, 0, remote_addr, remote_addr_len);
 
     if (s == -1) {