use binary.BigEndian

server/binary/marshal.go

@@ -1,6 +1,7 @@
 package binary
 
 import (
+	"encoding/binary"
 	"math"
 	"unicode/utf16"
 
@@ -1182,14 +1183,11 @@ func get8(src []byte) int {
 }
 
 func put16(dst []byte, val int64) {
-	dst[1] = byte(val & 0xff)
-	dst[0] = byte((val & 0xff00) >> 8)
+	binary.BigEndian.PutUint16(dst, uint16(val))
 }
 
 func get16(src []byte) int {
-	v := int(src[1])
-	v |= int(src[0]) << 8
-	return v
+	return int(binary.BigEndian.Uint16(src))
 }
 
 func put24(dst []byte, val int64) {
@@ -1206,39 +1204,17 @@ func get24(src []byte) int {
 }
 
 func put32(dst []byte, val int64) {
-	dst[3] = byte(val & 0xff)
-	dst[2] = byte((val & 0xff00) >> 8)
-	dst[1] = byte((val & 0xff0000) >> 16)
-	dst[0] = byte((val & 0xff000000) >> 24)
+	binary.BigEndian.PutUint32(dst, uint32(val))
 }
 
 func get32(src []byte) int64 {
-	i := int64(src[3])
-	i |= int64(src[2]) << 8
-	i |= int64(src[1]) << 16
-	i |= int64(src[0]) << 24
-	return i
+	return int64(binary.BigEndian.Uint32(src))
 }
 
 func put64(dst []byte, val uint64) {
-	dst[7] = byte(val & 0xff)
-	dst[6] = byte((val & 0xff00) >> 8)
-	dst[5] = byte((val & 0xff0000) >> 16)
-	dst[4] = byte((val & 0xff000000) >> 24)
-	dst[3] = byte((val & 0xff00000000) >> 32)
-	dst[2] = byte((val & 0xff0000000000) >> 40)
-	dst[1] = byte((val & 0xff000000000000) >> 48)
-	dst[0] = byte((val & 0xff00000000000000) >> 56)
+	binary.BigEndian.PutUint64(dst, val)
 }
 
 func get64(src []byte) uint64 {
-	i := uint64(src[7])
-	i |= uint64(src[6]) << 8
-	i |= uint64(src[5]) << 16
-	i |= uint64(src[4]) << 24
-	i |= uint64(src[3]) << 32
-	i |= uint64(src[2]) << 40
-	i |= uint64(src[1]) << 48
-	i |= uint64(src[0]) << 56
-	return i
+	return binary.BigEndian.Uint64(src)
 }