From c39f2b95fb5db751ea44b86f8e7ba10849953f63 Mon Sep 17 00:00:00 2001
From: p4gefau1t <p4gefau1t@gmail.com>
Date: Tue, 24 Mar 2020 09:48:32 -0400
Subject: [PATCH] nil pointer fixed

---
 README.md       |  4 ++--
 proxy/server.go | 28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 4c09f0257..8534f5f2e 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ client-mux.json
     "remote_addr": "your_awesome_server",
     "remote_port": 443,
     "password": [
-	    "your_awesome_password"
+        "your_awesome_password"
     ],
     "ssl": {
         "cert": "server.crt",
@@ -273,7 +273,7 @@ client.json
     "remote_addr": "your_awesome_server",
     "remote_port": 443,
     "password": [
-	    "your_awesome_password"
+        "your_awesome_password"
     ],
     "ssl": {
         "cert": "server.crt",
diff --git a/proxy/server.go b/proxy/server.go
index ae5472ffc..497003884 100644
--- a/proxy/server.go
+++ b/proxy/server.go
@@ -109,8 +109,6 @@ func (s *Server) handleConn(conn net.Conn) {
 }
 
 func (s *Server) handleInvalidConn(conn net.Conn, tlsConn *tls.Conn) {
-	//HACK
-	//obtain the bytes buffered by the tls conn
 
 	if len(s.config.TLS.HTTPResponse) > 0 {
 		logger.Warn("trying to response a plain http response")
@@ -119,17 +117,25 @@ func (s *Server) handleInvalidConn(conn net.Conn, tlsConn *tls.Conn) {
 		return
 	}
 
-	v := reflect.ValueOf(*tlsConn)
-	buf := v.FieldByName("rawInput").FieldByName("buf").Bytes()
-	logger.Debug("payload:" + string(buf))
+	if s.config.TLS.FallbackAddr != nil {
+		//HACK
+		//obtain the bytes buffered by the tls conn
+		v := reflect.ValueOf(*tlsConn)
+		buf := v.FieldByName("rawInput").FieldByName("buf").Bytes()
+		logger.Debug("payload:" + string(buf))
 
-	remote, err := net.Dial("tcp", s.config.TLS.FallbackAddr.String())
-	if err != nil {
-		logger.Warn(common.NewError("failed to dial to tls fallback server").Base(err))
+		remote, err := net.Dial("tcp", s.config.TLS.FallbackAddr.String())
+		if err != nil {
+			logger.Warn(common.NewError("failed to dial to tls fallback server").Base(err))
+		}
+		logger.Warn("proxying this invalid tls conn to the tls fallback server")
+		remote.Write(buf)
+		go proxyConn(conn, remote)
+	} else {
+		logger.Warn("fallback port is unspecified, closing")
+		conn.Close()
 	}
-	logger.Warn("proxying this invalid tls conn to the tls fallback server")
-	remote.Write(buf)
-	go proxyConn(conn, remote)
+
 }
 
 func (s *Server) Run() error {