completely fix detour config

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
+2 -3
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)
+2 -2
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),
}