lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-28 10:15:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/v2ray/v2ray-core

Browse Source
This commit is contained in:
v2ray 2015-12-03 15:19:45 +01:00
commit f3f1c09e49
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/point/inbound_detour.go
View File

@ -13,6 +13,7 @@ type InboundConnectionHandlerWithPort struct {
handler connhandler.InboundConnectionHandler
}
// Handler for inbound detour connections.
type InboundDetourHandler struct {
point *Point
config config.InboundDetourConfig
@ -43,6 +44,7 @@ func (this *InboundDetourHandler) Initialize() error {
return nil
}
// Starts the inbound connection handler.
func (this *InboundDetourHandler) Start() error {
for _, ich := range this.ich {
return retry.Timed(100 /* times */, 100 /* ms */).On(func() error {

3
shell/point/point.go
View File

@ -129,6 +129,9 @@ func (this *Point) Start() error {
return nil
}
// Dispatches a Packet to an OutboundConnection.
// The packet will be passed through the router (if configured), and then sent to an outbound
// connection with matching tag.
func (this *Point) DispatchToOutbound(packet v2net.Packet) ray.InboundRay {
direct := ray.NewRay()
dest := packet.Destination()