lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-26 12:05:35 -05:00
Code Issues Releases Wiki Activity

get rid of annoying firewall warnings

Browse Source
This commit is contained in:
v2ray
2016-05-29 16:37:52 +02:00
parent c3aa839227
commit b47c1ca609
34 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
proxy/socks/server.go
View File

@@ -34,6 +34,7 @@ type Server struct {
udpAddress v2net.Destination
udpServer *hub.UDPServer
listeningPort v2net.Port
listeningAddress v2net.Address
}
// NewServer creates a new Server object.
@@ -67,17 +68,18 @@ func (this *Server) Close() {
}
// Listen implements InboundHandler.Listen().
func (this *Server) Listen(port v2net.Port) error {
func (this *Server) Listen(address v2net.Address, port v2net.Port) error {
if this.accepting {
if this.listeningPort == port {
if this.listeningPort == port && this.listeningAddress.Equals(address) {
return nil
} else {
return proxy.ErrorAlreadyListening
}
}
this.listeningPort = port
this.listeningAddress = address
listener, err := hub.ListenTCP(port, this.handleConnection, nil)
listener, err := hub.ListenTCP(address, port, this.handleConnection, nil)
if err != nil {
log.Error("Socks: failed to listen on port ", port, ": ", err)
return err
@@ -87,7 +89,7 @@ func (this *Server) Listen(port v2net.Port) error {
this.tcpListener = listener
this.tcpMutex.Unlock()
if this.config.UDPEnabled {
this.listenUDP(port)
this.listenUDP(address, port)
}
return nil
}