lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

fix proto merging logic

Browse Source
This commit is contained in:
Darien Raymond 2017-11-27 23:25:43 +01:00
parent 5f91257018
commit 973ce07db9
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/policy/config.go
View File

@ -2,8 +2,6 @@ package policy
import ( import (
"time" "time"
"github.com/golang/protobuf/proto"
) )
func (s *Second) Duration() time.Duration { func (s *Second) Duration() time.Duration {
@ -11,5 +9,18 @@ func (s *Second) Duration() time.Duration {
} }
func (p *Policy) OverrideWith(another *Policy) { func (p *Policy) OverrideWith(another *Policy) {
proto.Merge(p, another) if another.Timeout != nil {
if another.Timeout.Handshake != nil {
p.Timeout.Handshake = another.Timeout.Handshake
}
if another.Timeout.ConnectionIdle != nil {
p.Timeout.ConnectionIdle = another.Timeout.ConnectionIdle
}
if another.Timeout.UplinkOnly != nil {
p.Timeout.UplinkOnly = another.Timeout.UplinkOnly
}
if another.Timeout.DownlinkOnly != nil {
p.Timeout.DownlinkOnly = another.Timeout.DownlinkOnly
}
}
} }