diff --git a/proxy/vmess/inbound/command.go b/proxy/vmess/inbound/command.go index fcadef768..9e8a388c6 100644 --- a/proxy/vmess/inbound/command.go +++ b/proxy/vmess/inbound/command.go @@ -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) diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index 441d5b927..6263ca8a7 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -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), } diff --git a/shell/point/point.go b/shell/point/point.go index d131bcbbf..2131d86fb 100644 --- a/shell/point/point.go +++ b/shell/point/point.go @@ -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 {