lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-08 23:06:01 -04:00
Code Issues Releases Wiki Activity

custom tcp listener and connection object

Browse Source
This commit is contained in:
v2ray
2016-01-27 22:11:31 +01:00
parent 3f634eb54f
commit 8ae8b3c9f5
8 changed files with 174 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
proxy/http/http.go
View File

@@ -13,9 +13,9 @@ import (
"github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/common/retry"
"github.com/v2ray/v2ray-core/common/serial"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport/listener"
"github.com/v2ray/v2ray-core/transport/ray"
)
@@ -24,7 +24,7 @@ type HttpProxyServer struct {
accepting bool
space app.Space
config *Config
tcpListener *net.TCPListener
tcpListener *listener.TCPListener
listeningPort v2net.Port
}
@@ -42,8 +42,8 @@ func (this *HttpProxyServer) Port() v2net.Port {
func (this *HttpProxyServer) Close() {
this.accepting = false
if this.tcpListener != nil {
this.tcpListener.Close()
this.Lock()
this.tcpListener.Close()
this.tcpListener = nil
this.Unlock()
}
@@ -59,40 +59,18 @@ func (this *HttpProxyServer) Listen(port v2net.Port) error {
}
this.listeningPort = port
tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
Port: int(port.Value()),
IP: []byte{0, 0, 0, 0},
})
tcpListener, err := listener.ListenTCP(port, this.handleConnection)
if err != nil {
log.Error("Http: Failed listen on port ", port, ": ", err)
return err
}
this.Lock()
this.tcpListener = tcpListener
this.Unlock()
this.accepting = true
go this.accept()
return nil
}
func (this *HttpProxyServer) accept() {
for this.accepting {
retry.Timed(100 /* times */, 100 /* ms */).On(func() error {
this.Lock()
defer this.Unlock()
if !this.accepting {
return nil
}
tcpConn, err := this.tcpListener.AcceptTCP()
if err != nil {
log.Error("Failed to accept HTTP connection: ", err)
return err
}
go this.handleConnection(tcpConn)
return nil
})
}
}
func parseHost(rawHost string, defaultPort v2net.Port) (v2net.Destination, error) {
port := defaultPort
host, rawPort, err := net.SplitHostPort(rawHost)
@@ -116,7 +94,7 @@ func parseHost(rawHost string, defaultPort v2net.Port) (v2net.Destination, error
return v2net.TCPDestination(v2net.DomainAddress(host), port), nil
}
func (this *HttpProxyServer) handleConnection(conn *net.TCPConn) {
func (this *HttpProxyServer) handleConnection(conn *listener.TCPConn) {
defer conn.Close()
reader := bufio.NewReader(conn)