mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-17 22:57:10 +00:00
Update socks implementation
This commit is contained in:
1 parent
fe6e139e74
commit
af8baa144d
2 files changed
+19
-11
No files matched your search
@@ -5,6 +5,7 @@ import (
|
||||
"net"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/v2ray/v2ray-core"
|
||||
"github.com/v2ray/v2ray-core/common/errors"
|
||||
@@ -148,12 +149,12 @@ func (server *SocksServer) handleSocks5(reader *v2net.TimeOutReader, writer io.W
|
||||
response.Error = protocol.ErrorSuccess
|
||||
|
||||
// Some SOCKS software requires a value other than dest. Let's fake one:
|
||||
response.Port = uint16(38294)
|
||||
response.Port = uint16(1717)
|
||||
response.AddrType = protocol.AddrTypeIPv4
|
||||
response.IPv4[0] = 127
|
||||
response.IPv4[0] = 0
|
||||
response.IPv4[1] = 0
|
||||
response.IPv4[2] = 0
|
||||
response.IPv4[3] = 1
|
||||
response.IPv4[3] = 0
|
||||
|
||||
err = protocol.WriteResponse(writer, response)
|
||||
if err != nil {
|
||||
@@ -197,8 +198,11 @@ func (server *SocksServer) handleUDP(reader *v2net.TimeOutReader, writer io.Writ
|
||||
}
|
||||
|
||||
reader.SetTimeOut(300) /* 5 minutes */
|
||||
buffer := make([]byte, 1024)
|
||||
reader.Read(buffer)
|
||||
v2net.ReadFrom(reader) // Just in case of anything left in the socket
|
||||
// The TCP connection closes after this method returns. We need to wait until
|
||||
// the client closes it.
|
||||
// TODO: get notified from UDP part
|
||||
<-time.After(5 * time.Minute)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user