root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #165 #179

Browse Source
This commit is contained in:
rui.zheng 2017-11-06 17:59:33 +08:00
parent dedd08530a
commit e42d27c368
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ss.go
View File

@ -124,11 +124,15 @@ func (h *shadowHandler) Handle(conn net.Conn) {
log.Logf("[ss] %s - %s", conn.RemoteAddr(), conn.LocalAddr()) log.Logf("[ss] %s - %s", conn.RemoteAddr(), conn.LocalAddr())
conn.SetReadDeadline(time.Now().Add(ReadTimeout))
addr, err := h.getRequest(conn) addr, err := h.getRequest(conn)
if err != nil { if err != nil {
log.Logf("[ss] %s - %s : %s", conn.RemoteAddr(), conn.LocalAddr(), err) log.Logf("[ss] %s - %s : %s", conn.RemoteAddr(), conn.LocalAddr(), err)
return return
} }
// clear timer
conn.SetReadDeadline(time.Time{})
log.Logf("[ss] %s -> %s", conn.RemoteAddr(), addr) log.Logf("[ss] %s -> %s", conn.RemoteAddr(), addr)
if !Can("tcp", addr, h.options.Whitelist, h.options.Blacklist) { if !Can("tcp", addr, h.options.Whitelist, h.options.Blacklist) {
@ -165,19 +169,16 @@ const (
) )
// This function is copied from shadowsocks library with some modification. // This function is copied from shadowsocks library with some modification.
func (h *shadowHandler) getRequest(conn net.Conn) (host string, err error) { func (h *shadowHandler) getRequest(r io.Reader) (host string, err error) {
// buf size should at least have the same size with the largest possible // buf size should at least have the same size with the largest possible
// request size (when addrType is 3, domain name has at most 256 bytes) // request size (when addrType is 3, domain name has at most 256 bytes)
// 1(addrType) + 1(lenByte) + 256(max length address) + 2(port) // 1(addrType) + 1(lenByte) + 256(max length address) + 2(port)
buf := make([]byte, smallBufferSize) buf := make([]byte, smallBufferSize)
// read till we get possible domain length field // read till we get possible domain length field
conn.SetReadDeadline(time.Now().Add(ReadTimeout)) if _, err = io.ReadFull(r, buf[:idType+1]); err != nil {
if _, err = io.ReadFull(conn, buf[:idType+1]); err != nil {
return return
} }
// clear timer
conn.SetReadDeadline(time.Time{})
var reqStart, reqEnd int var reqStart, reqEnd int
addrType := buf[idType] addrType := buf[idType]
@ -187,16 +188,16 @@ func (h *shadowHandler) getRequest(conn net.Conn) (host string, err error) {
case typeIPv6: case typeIPv6:
reqStart, reqEnd = idIP0, idIP0+lenIPv6 reqStart, reqEnd = idIP0, idIP0+lenIPv6
case typeDm: case typeDm:
if _, err = io.ReadFull(conn, buf[idType+1:idDmLen+1]); err != nil { if _, err = io.ReadFull(r, buf[idType+1:idDmLen+1]); err != nil {
return return
} }
reqStart, reqEnd = idDm0, int(idDm0+buf[idDmLen]+lenDmBase) reqStart, reqEnd = idDm0, idDm0+int(buf[idDmLen])+lenDmBase
default: default:
err = fmt.Errorf("addr type %d not supported", addrType&ss.AddrMask) err = fmt.Errorf("addr type %d not supported", addrType&ss.AddrMask)
return return
} }
if _, err = io.ReadFull(conn, buf[reqStart:reqEnd]); err != nil { if _, err = io.ReadFull(r, buf[reqStart:reqEnd]); err != nil {
return return
} }
@ -209,7 +210,7 @@ func (h *shadowHandler) getRequest(conn net.Conn) (host string, err error) {
case typeIPv6: case typeIPv6:
host = net.IP(buf[idIP0 : idIP0+net.IPv6len]).String() host = net.IP(buf[idIP0 : idIP0+net.IPv6len]).String()
case typeDm: case typeDm:
host = string(buf[idDm0 : idDm0+buf[idDmLen]]) host = string(buf[idDm0 : idDm0+int(buf[idDmLen])])
} }
// parse port // parse port
port := binary.BigEndian.Uint16(buf[reqEnd-2 : reqEnd]) port := binary.BigEndian.Uint16(buf[reqEnd-2 : reqEnd])