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

apply coding style

Browse Source
This commit is contained in:
Shelikhoo 2021-04-13 16:06:48 +01:00
parent 8323add330
commit d7c9a98d76
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/dispatcher/fakednssniffer.go
View File

@ -74,10 +74,7 @@ type DNSThenOthersSniffResult struct {
} }
func (f DNSThenOthersSniffResult) IsProtoSubsetOf(protocolName string) bool { func (f DNSThenOthersSniffResult) IsProtoSubsetOf(protocolName string) bool {
if strings.HasPrefix(protocolName, f.protocolOriginalName) { return strings.HasPrefix(protocolName, f.protocolOriginalName)
return true
}
return false
} }
func (DNSThenOthersSniffResult) Protocol() string { func (DNSThenOthersSniffResult) Protocol() string {
@ -88,7 +85,10 @@ func (f DNSThenOthersSniffResult) Domain() string {
return f.domainName return f.domainName
} }
func newFakeDNSThenOthers(ctx context.Context, fakeDNSSniffer protocolSnifferWithMetadata, others []protocolSnifferWithMetadata) (protocolSnifferWithMetadata, error) { func newFakeDNSThenOthers(ctx context.Context, fakeDNSSniffer protocolSnifferWithMetadata, others []protocolSnifferWithMetadata) (
protocolSnifferWithMetadata, error) { // nolint: unparam
// ctx may be used in the future
_ = ctx
return protocolSnifferWithMetadata{ return protocolSnifferWithMetadata{
protocolSniffer: func(ctx context.Context, bytes []byte) (SniffResult, error) { protocolSniffer: func(ctx context.Context, bytes []byte) (SniffResult, error) {
ipAddressInRangeValue := &ipAddressInRangeOpt{} ipAddressInRangeValue := &ipAddressInRangeOpt{}
@ -98,7 +98,7 @@ func newFakeDNSThenOthers(ctx context.Context, fakeDNSSniffer protocolSnifferWit
return result, nil return result, nil
} }
if ipAddressInRangeValue.addressInRange != nil { if ipAddressInRangeValue.addressInRange != nil {
if *ipAddressInRangeValue.addressInRange == true { if *ipAddressInRangeValue.addressInRange {
for _, v := range others { for _, v := range others {
if v.metadataSniffer || bytes != nil { if v.metadataSniffer || bytes != nil {
if result, err := v.protocolSniffer(ctx, bytes); err == nil { if result, err := v.protocolSniffer(ctx, bytes); err == nil {

1
app/dns/fakedns/fakedns_test.go
View File

@ -127,6 +127,7 @@ func TestFakeDNSMulti(t *testing.T) {
}}, }},
}, },
) )
common.Must(err)
err = fakeMulti.Start() err = fakeMulti.Start()

6
app/observatory/observer.go
View File

@ -73,7 +73,6 @@ func (o *Observer) background() {
} }
time.Sleep(time.Second * 10) time.Sleep(time.Second * 10)
} }
} }
} }
@ -81,6 +80,7 @@ func (o *Observer) updateStatus(outbounds []string) {
o.statusLock.Lock() o.statusLock.Lock()
defer o.statusLock.Unlock() defer o.statusLock.Unlock()
// TODO should remove old inbound that is removed // TODO should remove old inbound that is removed
_ = outbounds
} }
func (o *Observer) probe(outbound string) ProbeResult { func (o *Observer) probe(outbound string) ProbeResult {
@ -111,7 +111,7 @@ func (o *Observer) probe(outbound string) ProbeResult {
} }
return connection, nil return connection, nil
}, },
TLSHandshakeTimeout: time.Duration(time.Second * 5), TLSHandshakeTimeout: time.Second * 5,
} }
httpClient := &http.Client{ httpClient := &http.Client{
Transport: &httpTransport, Transport: &httpTransport,
@ -119,7 +119,7 @@ func (o *Observer) probe(outbound string) ProbeResult {
return http.ErrUseLastResponse return http.ErrUseLastResponse
}, },
Jar: nil, Jar: nil,
Timeout: time.Duration(time.Second * 5), Timeout: time.Second * 5,
} }
var GETTime time.Duration var GETTime time.Duration
err := task.Run(o.ctx, func() error { err := task.Run(o.ctx, func() error {

1
app/router/config.go
View File

@ -175,6 +175,5 @@ func (br *BalancingRule) Build(ohm outbound.Manager) (*Balancer, error) {
strategy: &RandomStrategy{}, strategy: &RandomStrategy{},
ohm: ohm, ohm: ohm,
}, nil }, nil
} }
} }

1
app/router/router.go
View File

@ -6,6 +6,7 @@ package router
import ( import (
"context" "context"
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/features/dns" "github.com/v2fly/v2ray-core/v4/features/dns"