Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/v2ray/v2ray-core
Browse files Browse the repository at this point in the history
  • Loading branch information
DarienRaymond committed Dec 3, 2015
2 parents 88d75fd + 9c1a31c commit f3f1c09
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions shell/point/inbound_detour.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type InboundConnectionHandlerWithPort struct {
handler connhandler.InboundConnectionHandler
}

// Handler for inbound detour connections.
type InboundDetourHandler struct {
point *Point
config config.InboundDetourConfig
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions shell/point/point.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit f3f1c09

Please sign in to comment.