Skip to content

G
gost
Commit b139c3bd authored by rui.zheng's avatar rui.zheng
Browse files
Options

fix socks4

parent 4b6ba653
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
socks.go
View file @ b139c3bd
...@@ -261,6 +261,9 @@ func (c *socks4Connector) Connect(conn net.Conn, addr string) (net.Conn, error) ...@@ -261,6 +261,9 @@ func (c *socks4Connector) Connect(conn net.Conn, addr string) (net.Conn, error)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(taddr.IP) == 0 {
taddr.IP = net.IPv4(0, 0, 0, 0)
}
req := gosocks4.NewRequest(gosocks4.CmdConnect, req := gosocks4.NewRequest(gosocks4.CmdConnect,
&gosocks4.Addr{ &gosocks4.Addr{
......
vendor/github.com/ginuerzh/gosocks4/socks4.go
View file @ b139c3bd
...@@ -56,7 +56,7 @@ func (addr *Addr) Decode(b []byte) error { ...@@ -56,7 +56,7 @@ func (addr *Addr) Decode(b []byte) error {
addr.Port = binary.BigEndian.Uint16(b[0:2]) addr.Port = binary.BigEndian.Uint16(b[0:2])
addr.Host = net.IP(b[2 : 2+net.IPv4len]).String() addr.Host = net.IP(b[2 : 2+net.IPv4len]).String()
if b[2]|b[3]|b[4] == 0 { if b[2]|b[3]|b[4] == 0 && b[5] != 0 {
addr.Type = AddrDomain addr.Type = AddrDomain
} }
......
vendor/vendor.json
View file @ b139c3bd
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
"revisionTime": "2016-08-31T15:17:26Z" "revisionTime": "2016-08-31T15:17:26Z"
}, },
{ {
"checksumSHA1": "aIhLeVAIrsjs63CwqmU3+GU8yT4=", "checksumSHA1": "AqX1ZPaQtMCpfiTiA2zGmWadYl0=",
"path": "github.com/ginuerzh/gosocks4", "path": "github.com/ginuerzh/gosocks4",
"revision": "fc196f9d34e35f19a813bff2f092a275131c23bc", "revision": "c3a6700bad67bd29718fd19212b3dd934aea89b3",
"revisionTime": "2017-02-09T14:09:51Z" "revisionTime": "2017-09-04T03:46:09Z"
}, },
{ {
"checksumSHA1": "4JEexBJToQeQm7fAo2PHVdCU3zM=", "checksumSHA1": "4JEexBJToQeQm7fAo2PHVdCU3zM=",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment