From e87a16900e6417e9f1ce1230f9fc09764a3ea282 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Sun, 8 Jan 2017 01:36:03 +0100
Subject: [PATCH] remove debug info

---
 proxy/freedom/freedom_test.go |  2 --
 proxy/socks/protocol.go       | 16 ----------------
 2 files changed, 18 deletions(-)

diff --git a/proxy/freedom/freedom_test.go b/proxy/freedom/freedom_test.go
index 6daf58115..51c016a98 100644
--- a/proxy/freedom/freedom_test.go
+++ b/proxy/freedom/freedom_test.go
@@ -1,7 +1,6 @@
 package freedom_test
 
 import (
-	"fmt"
 	"testing"
 
 	"v2ray.com/core/app"
@@ -55,7 +54,6 @@ func TestSinglePacket(t *testing.T) {
 	payload.Append([]byte(data2Send))
 	traffic.InboundInput().Write(payload)
 
-	fmt.Println(tcpServerAddr.Network, tcpServerAddr.Address, tcpServerAddr.Port)
 	go freedom.Dispatch(tcpServerAddr, traffic)
 	traffic.InboundInput().Close()
 
diff --git a/proxy/socks/protocol.go b/proxy/socks/protocol.go
index 31f2db4f6..9100e0314 100644
--- a/proxy/socks/protocol.go
+++ b/proxy/socks/protocol.go
@@ -3,8 +3,6 @@ package socks
 import (
 	"io"
 
-	"fmt"
-
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/errors"
 	v2net "v2ray.com/core/common/net"
@@ -105,13 +103,11 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
 			return nil, err
 		}
 
-		fmt.Println("s a")
 		if expectedAuth == authPassword {
 			username, password, err := readUsernamePassword(reader)
 			if err != nil {
 				return nil, errors.Base(err).Message("Socks|Server: Failed to read username or password.")
 			}
-			fmt.Println("s b")
 			if !s.config.HasAccount(username, password) {
 				writeSocks5AuthenticationResponse(writer, 0xFF)
 				return nil, errors.Base(err).Message("Socks|Server: Invalid username or password.")
@@ -121,7 +117,6 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
 				return nil, err
 			}
 		}
-		fmt.Println("s c")
 		buffer.Clear()
 		if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, 4)); err != nil {
 			return nil, err
@@ -202,27 +197,23 @@ func readUsernamePassword(reader io.Reader) (string, string, error) {
 		return "", "", err
 	}
 	nUsername := int(buffer.Byte(1))
-	fmt.Println("s username", nUsername)
 
 	buffer.Clear()
 	if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, nUsername)); err != nil {
 		return "", "", err
 	}
 	username := buffer.String()
-	fmt.Println("s username", username)
 	buffer.Clear()
 
 	if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, 1)); err != nil {
 		return "", "", err
 	}
 	nPassword := int(buffer.Byte(0))
-	fmt.Println("s pwd", nPassword)
 	buffer.Clear()
 	if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, nPassword)); err != nil {
 		return "", "", err
 	}
 	password := buffer.String()
-	fmt.Println("s pwd", password)
 	return username, password, nil
 }
 
@@ -411,23 +402,18 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
 		}
 		account := rawAccount.(*Account)
 
-		fmt.Println("c username", account.Username)
-		fmt.Println("c pwd", account.Password)
 		b.Clear()
 		b.AppendBytes(socks5Version, byte(len(account.Username)))
 		b.Append([]byte(account.Username))
 		b.AppendBytes(byte(len(account.Password)))
 		b.Append([]byte(account.Password))
-		fmt.Println("c a")
 		if _, err := writer.Write(b.Bytes()); err != nil {
 			return nil, err
 		}
-		fmt.Println("c b")
 		b.Clear()
 		if err := b.AppendSupplier(buf.ReadFullFrom(reader, 2)); err != nil {
 			return nil, err
 		}
-		fmt.Println("c c")
 		if b.Byte(1) != 0x00 {
 			return nil, errors.New("Socks|Client: Server rejects account: ", b.Byte(1))
 		}
@@ -441,13 +427,11 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
 	}
 	b.AppendBytes(socks5Version, command, 0x00 /* reserved */)
 	appendAddress(b, request.Address, request.Port)
-	fmt.Println("c e")
 	if _, err := writer.Write(b.Bytes()); err != nil {
 		return nil, err
 	}
 
 	b.Clear()
-	fmt.Println("c f")
 	if err := b.AppendSupplier(buf.ReadFullFrom(reader, 4)); err != nil {
 		return nil, err
 	}