lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00
Code Issues Releases Wiki Activity

completely fix detour config

Browse Source
This commit is contained in:
v2ray 2016-06-01 22:45:12 +02:00
parent 957eaf38db
commit 9713bf9adf
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxy/vmess/inbound/command.go
View File

@ -6,9 +6,8 @@ import (
)
func (this *VMessInboundHandler) generateCommand(request *protocol.RequestHeader) protocol.ResponseCommand {
if this.features != nil && this.features.Detour != nil {
tag := this.features.Detour.ToTag
if this.detours != nil {
tag := this.detours.ToTag
if this.inboundHandlerManager != nil {
handler, availableMin := this.inboundHandlerManager.GetHandler(tag)
inboundHandler, ok := handler.(*VMessInboundHandler)

4
proxy/vmess/inbound/inbound.go
View File

@ -72,7 +72,7 @@ type VMessInboundHandler struct {
usersByEmail *userByEmail
accepting bool
listener *hub.TCPHub
features *FeaturesConfig
detours *DetourConfig
listeningPort v2net.Port
listeningAddress v2net.Address
}
@ -232,7 +232,7 @@ func init() {
handler := &VMessInboundHandler{
packetDispatcher: space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher),
clients: allowedClients,
features: config.Features,
detours: config.DetourConfig,
usersByEmail: NewUserByEmail(config.AllowedUsers, config.Defaults),
}

6
shell/point/point.go
View File

@ -138,7 +138,7 @@ func NewPoint(pConfig *Config) (*Point, error) {
for _, detourConfig := range outboundDetours {
detourHandler, err := proxyrepo.CreateOutboundHandler(detourConfig.Protocol, vpoint.space, detourConfig.Settings)
if err != nil {
log.Error("Failed to create detour outbound connection handler: ", err)
log.Error("Point: Failed to create detour outbound connection handler: ", err)
return nil, err
}
vpoint.odh[detourConfig.Tag] = detourHandler
@ -164,7 +164,7 @@ func (this *Point) Close() {
// In the case of any errors, the state of the server is unpredicatable.
func (this *Point) Start() error {
if this.port <= 0 {
log.Error("Invalid port ", this.port)
log.Error("Point: Invalid port ", this.port)
return ErrorBadConfiguration
}
@ -173,7 +173,7 @@ func (this *Point) Start() error {
if err != nil {
return err
}
log.Warning("Point server started on port ", this.port)
log.Warning("Point: started on port ", this.port)
return nil
})
if err != nil {