From db6c30c9c3facd7f8650e3f181bb2f3ab29b81ba Mon Sep 17 00:00:00 2001
From: xvzc <pkhu2000@gmail.com>
Date: Tue, 11 Jan 2022 04:27:12 +0900
Subject: [PATCH] delete unnecessary call by reference

---
 packet/http.go  | 88 ++++++++++++++++++++++++-------------------------
 packet/https.go | 10 +++---
 proxy/https.go  |  4 +--
 proxy/proxy.go  | 14 ++++----
 4 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/packet/http.go b/packet/http.go
index e2975e2..31fd66f 100644
--- a/packet/http.go
+++ b/packet/http.go
@@ -4,14 +4,50 @@ import (
 	"strings"
 )
 
+var validMethod = map[string]struct{}{
+	"DELETE":      {},
+	"GET":         {},
+	"HEAD":        {},
+	"POST":        {},
+	"PUT":         {},
+	"CONNECT":     {},
+	"OPTIONS":     {},
+	"TRACE":       {},
+	"COPY":        {},
+	"LOCK":        {},
+	"MKCOL":       {},
+	"MOVE":        {},
+	"PROPFIND":    {},
+	"PROPPATCH":   {},
+	"SEARCH":      {},
+	"UNLOCK":      {},
+	"BIND":        {},
+	"REBIND":      {},
+	"UNBIND":      {},
+	"ACL":         {},
+	"REPORT":      {},
+	"MKACTIVITY":  {},
+	"CHECKOUT":    {},
+	"MERGE":       {},
+	"M-SEARCH":    {},
+	"NOTIFY":      {},
+	"SUBSCRIBE":   {},
+	"UNSUBSCRIBE": {},
+	"PATCH":       {},
+	"PURGE":       {},
+	"MKCALENDAR":  {},
+	"LINK":        {},
+	"UNLINK":      {},
+}
+
 type HttpPacket struct {
-	Raw     *[]byte
+	Raw     []byte
 	Method  string
 	Domain  string
 	Version string
 }
 
-func NewHttpPacket(raw *[]byte) HttpPacket {
+func NewHttpPacket(raw []byte) HttpPacket {
 	method, domain, version := parse(raw)
 	return HttpPacket{
 		Raw:     raw,
@@ -22,7 +58,7 @@ func NewHttpPacket(raw *[]byte) HttpPacket {
 }
 
 func (r *HttpPacket) IsValidMethod() bool {
-	if _, exists := getValidMethods()[r.Method]; exists {
+	if _, exists := validMethod[r.Method]; exists {
 		return true
 	}
 
@@ -33,11 +69,11 @@ func (r *HttpPacket) IsConnectMethod() bool {
 	return r.Method == "CONNECT"
 }
 
-func parse(raw *[]byte) (string, string, string) {
+func parse(raw []byte) (string, string, string) {
 	var firstLine string
-	for i := 0; i < len(*raw); i++ {
-		if (*raw)[i] == '\n' {
-			firstLine = string((*raw)[:i])
+	for i := 0; i < len(raw); i++ {
+		if (raw)[i] == '\n' {
+			firstLine = string((raw)[:i])
 		}
 	}
 
@@ -54,41 +90,3 @@ func parse(raw *[]byte) (string, string, string) {
 
 	return method, domain, version
 }
-
-func getValidMethods() map[string]struct{} {
-	return map[string]struct{}{
-		"DELETE":      {},
-		"GET":         {},
-		"HEAD":        {},
-		"POST":        {},
-		"PUT":         {},
-		"CONNECT":     {},
-		"OPTIONS":     {},
-		"TRACE":       {},
-		"COPY":        {},
-		"LOCK":        {},
-		"MKCOL":       {},
-		"MOVE":        {},
-		"PROPFIND":    {},
-		"PROPPATCH":   {},
-		"SEARCH":      {},
-		"UNLOCK":      {},
-		"BIND":        {},
-		"REBIND":      {},
-		"UNBIND":      {},
-		"ACL":         {},
-		"REPORT":      {},
-		"MKACTIVITY":  {},
-		"CHECKOUT":    {},
-		"MERGE":       {},
-		"M-SEARCH":    {},
-		"NOTIFY":      {},
-		"SUBSCRIBE":   {},
-		"UNSUBSCRIBE": {},
-		"PATCH":       {},
-		"PURGE":       {},
-		"MKCALENDAR":  {},
-		"LINK":        {},
-		"UNLINK":      {},
-	}
-}
diff --git a/packet/https.go b/packet/https.go
index 151e250..f8ac370 100644
--- a/packet/https.go
+++ b/packet/https.go
@@ -1,19 +1,19 @@
 package packet
 
 type HttpsPacket struct {
-	Raw *[]byte
+	Raw []byte
 }
 
-func NewHttpsPacket(raw *[]byte) HttpsPacket {
+func NewHttpsPacket(raw []byte) HttpsPacket {
 	return HttpsPacket{
 		Raw: raw,
 	}
 }
 
 func (r HttpsPacket) SplitInChunks() [][]byte {
-	if len(*r.Raw) < 1 {
-		return [][]byte{*r.Raw}
+	if len(r.Raw) < 1 {
+		return [][]byte{r.Raw}
 	}
 
-	return [][]byte{(*r.Raw)[:1], (*r.Raw)[1:]}
+	return [][]byte{(r.Raw)[:1], (r.Raw)[1:]}
 }
diff --git a/proxy/https.go b/proxy/https.go
index 90be871..57eefa3 100644
--- a/proxy/https.go
+++ b/proxy/https.go
@@ -20,7 +20,7 @@ func HandleHttp(clientConn net.Conn, ip string, p *packet.HttpPacket) {
 	go remoteConn.Serve(clientConn, "HTTP")
 
 	// util.Debug("[HTTP] Sending request to the server")
-	fmt.Fprintf(remoteConn.Conn, string(*p.Raw))
+	fmt.Fprintf(remoteConn.Conn, string(p.Raw))
 
 	go clientConn.Serve(remoteConn, "HTTP")
 }
@@ -52,7 +52,7 @@ func HandleHttps(clientConn net.Conn, ip string, r *packet.HttpPacket) {
 	// Generate a go routine that reads from the server
 	go remoteConn.Serve(clientConn, "HTTPS")
 
-	pkt := packet.NewHttpsPacket(&clientHello)
+	pkt := packet.NewHttpsPacket(clientHello)
 
 	chunks := pkt.SplitInChunks()
 
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 3c89ab7..8a6ec22 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -20,7 +20,7 @@ func New(port string) *Proxy {
 }
 
 func (p *Proxy) Start() {
-	listener, err := net.Listen("tcp", ":"+p.Port)
+	l, err := net.Listen("tcp", ":"+p.Port)
 	if err != nil {
 		log.Fatal("Error creating listener: ", err)
 		os.Exit(1)
@@ -29,7 +29,7 @@ func (p *Proxy) Start() {
 	// util.Debug("Created a listener")
 
 	for {
-		clientConn, err := listener.Accept()
+		conn, err := l.Accept()
 		if err != nil {
 			log.Fatal("Error accepting connection: ", err)
 			continue
@@ -38,16 +38,16 @@ func (p *Proxy) Start() {
 		// util.Debug("Accepted a new connection.", clientConn.RemoteAddr())
 
 		go func() {
-			defer clientConn.Close()
+			defer conn.Close()
 
-			b, err := clientConn.ReadBytes()
+			b, err := conn.ReadBytes()
 			if err != nil {
 				return
 			}
 
 			// util.Debug("Client sent data: ", len(b))
 
-			r := packet.NewHttpPacket(&b)
+			r := packet.NewHttpPacket(b)
 			// util.Debug("Request: \n" + string(*r.Raw))
 
 			if !r.IsValidMethod() {
@@ -66,10 +66,10 @@ func (p *Proxy) Start() {
 
 			if r.IsConnectMethod() {
 				// util.Debug("HTTPS Requested")
-				HandleHttps(clientConn, ip, &r)
+				HandleHttps(conn, ip, &r)
 			} else {
 				// util.Debug("HTTP Requested.")
-				HandleHttp(clientConn, ip, &r)
+				HandleHttp(conn, ip, &r)
 			}
 		}()
 	}