black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 10:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix override Inbounds in multi config

Browse source
This commit is contained in:
hossinasaadi 2023-10-21 15:43:37 +04:00 committed by yuhan6665
parent 291061e9da
commit 4f8b73bb1f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
infra/conf/xray.go
View file

@ -489,16 +489,16 @@ func (c *Config) Override(o *Config, fn string) {
// update the Inbound in slice if the only one in overide config has same tag // update the Inbound in slice if the only one in overide config has same tag
if len(o.InboundConfigs) > 0 { if len(o.InboundConfigs) > 0 {
if len(c.InboundConfigs) > 0 && len(o.InboundConfigs) == 1 { for i := range o.InboundConfigs {
if idx := c.findInboundTag(o.InboundConfigs[0].Tag); idx > -1 { if idx := c.findInboundTag(o.InboundConfigs[i].Tag); idx > -1 {
c.InboundConfigs[idx] = o.InboundConfigs[0] c.InboundConfigs[idx] = o.InboundConfigs[i]
ctllog.Println("[", fn, "] updated inbound with tag: ", o.InboundConfigs[0].Tag) ctllog.Println("[", fn, "] updated inbound with tag: ", o.InboundConfigs[0].Tag)
} else { } else {
c.InboundConfigs = append(c.InboundConfigs, o.InboundConfigs[0]) c.InboundConfigs = append(c.InboundConfigs, o.InboundConfigs[i])
ctllog.Println("[", fn, "] appended inbound with tag: ", o.InboundConfigs[0].Tag) ctllog.Println("[", fn, "] appended inbound with tag: ", o.InboundConfigs[0].Tag)
} }
} else {
c.InboundConfigs = o.InboundConfigs
} }
} }