Use binary.BigEndian to read port directly.

dearplain · Dec 27, 2012 · efec84e · efec84e
1 parent 7383f2a
commit efec84e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/cmd/shadowsocks-local/local.go b/cmd/shadowsocks-local/local.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"encoding/binary"
 	"errors"
 	"flag"
@@ -127,9 +126,7 @@ func getRequest(conn net.Conn) (rawaddr []byte, host string, err error) {
 			copy(addrIp, buf[idIP0:idIP0+4])
 			host = addrIp.String()
 		}
-		var port int16
-		sb := bytes.NewBuffer(buf[reqLen-2 : reqLen])
-		binary.Read(sb, binary.BigEndian, &port)
+		port := binary.BigEndian.Uint16(buf[reqLen-2 : reqLen])
 		host += ":" + strconv.Itoa(int(port))
 	}
 

diff --git a/cmd/shadowsocks-server/server.go b/cmd/shadowsocks-server/server.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"bufio"
-	"bytes"
 	"encoding/binary"
 	"encoding/gob"
 	"errors"
@@ -76,10 +75,7 @@ func getRequest(conn *ss.Conn) (host string, extra []byte, err error) {
 		host = addrIp.String()
 	}
 	// parse port
-	var port int16
-	sb := bytes.NewBuffer(buf[reqLen-2 : reqLen])
-	binary.Read(sb, binary.BigEndian, &port)
-
+	port := binary.BigEndian.Uint16(buf[reqLen-2 : reqLen])
 	host += ":" + strconv.Itoa(int(port))
 	return
 }
@@ -354,7 +350,7 @@ var config *ss.Config
 
 func main() {
 	log.SetOutput(os.Stdout)
-	
+
 	var cmdConfig ss.Config
 	var printVer bool