From 91e778a7c51a289334f0ba46defe34f8bbf4b583 Mon Sep 17 00:00:00 2001
From: netbyte <alex.tsai@protonmail.com>
Date: Sun, 22 May 2022 00:43:04 +0800
Subject: [PATCH] clean code

---
 quic/quicserver.go | 10 +++-------
 tcp/tcpclient.go   |  3 +--
 tcp/tcpserver.go   |  5 ++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/quic/quicserver.go b/quic/quicserver.go
index 09be2fa..1669d90 100644
--- a/quic/quicserver.go
+++ b/quic/quicserver.go
@@ -3,7 +3,6 @@ package quic
 import (
 	"context"
 	"crypto/tls"
-	"io"
 	"log"
 	"time"
 
@@ -50,7 +49,7 @@ func toClient(config config.Config, iface *water.Interface) {
 	packet := make([]byte, config.MTU)
 	for {
 		n, err := iface.Read(packet)
-		if err != nil || err == io.EOF || n == 0 {
+		if err != nil || n == 0 {
 			continue
 		}
 		b := packet[:n]
@@ -59,10 +58,7 @@ func toClient(config config.Config, iface *water.Interface) {
 				if config.Obfs {
 					b = cipher.XOR(b)
 				}
-				_, err := v.(quic.Stream).Write(b)
-				if err != nil {
-					cache.GetCache().Delete(key)
-				}
+				v.(quic.Stream).Write(b)
 			}
 		}
 	}
@@ -79,7 +75,7 @@ func toServer(config config.Config, session quic.Session, iface *water.Interface
 	for {
 		stream.SetReadDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))
 		n, err := stream.Read(packet)
-		if err != nil || err == io.EOF {
+		if err != nil {
 			break
 		}
 		b := packet[:n]
diff --git a/tcp/tcpclient.go b/tcp/tcpclient.go
index 8cf4f83..c39c6af 100644
--- a/tcp/tcpclient.go
+++ b/tcp/tcpclient.go
@@ -1,7 +1,6 @@
 package tcp
 
 import (
-	"io"
 	"log"
 	"net"
 	"time"
@@ -59,7 +58,7 @@ func tcpToTun(config config.Config, tcpconn net.Conn, iface *water.Interface) {
 	for {
 		tcpconn.SetReadDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))
 		n, err := tcpconn.Read(packet)
-		if err != nil || err == io.EOF {
+		if err != nil {
 			break
 		}
 		b := packet[:n]
diff --git a/tcp/tcpserver.go b/tcp/tcpserver.go
index 03fb881..ba4b9e2 100644
--- a/tcp/tcpserver.go
+++ b/tcp/tcpserver.go
@@ -1,7 +1,6 @@
 package tcp
 
 import (
-	"io"
 	"log"
 	"net"
 	"time"
@@ -40,7 +39,7 @@ func toClient(config config.Config, iface *water.Interface) {
 	packet := make([]byte, config.MTU)
 	for {
 		n, err := iface.Read(packet)
-		if err != nil || err == io.EOF || n == 0 {
+		if err != nil || n == 0 {
 			continue
 		}
 		b := packet[:n]
@@ -61,7 +60,7 @@ func toServer(config config.Config, tcpconn net.Conn, iface *water.Interface) {
 	for {
 		tcpconn.SetReadDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))
 		n, err := tcpconn.Read(packet)
-		if err != nil || err == io.EOF {
+		if err != nil {
 			break
 		}
 		b := packet[:n]