mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-08 05:59:20 +02:00
fix override Inbounds in multi config
This commit is contained in:
parent
291061e9da
commit
4f8b73bb1f
|
@ -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
|
||||
if len(o.InboundConfigs) > 0 {
|
||||
if len(c.InboundConfigs) > 0 && len(o.InboundConfigs) == 1 {
|
||||
if idx := c.findInboundTag(o.InboundConfigs[0].Tag); idx > -1 {
|
||||
c.InboundConfigs[idx] = o.InboundConfigs[0]
|
||||
for i := range o.InboundConfigs {
|
||||
if idx := c.findInboundTag(o.InboundConfigs[i].Tag); idx > -1 {
|
||||
c.InboundConfigs[idx] = o.InboundConfigs[i]
|
||||
ctllog.Println("[", fn, "] updated inbound with tag: ", o.InboundConfigs[0].Tag)
|
||||
|
||||
} 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)
|
||||
}
|
||||
} else {
|
||||
c.InboundConfigs = o.InboundConfigs
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue