mirror of
https://github.com/SagerNet/sing-box.git
synced 2025-06-13 21:54:13 +08:00
Compare commits
44 Commits
75f526cb29
...
32c43a8f87
Author | SHA1 | Date | |
---|---|---|---|
![]() |
32c43a8f87 | ||
![]() |
c0ecfedce6 | ||
![]() |
0595567594 | ||
![]() |
2dbadb8789 | ||
![]() |
f5429fdf31 | ||
![]() |
7843b7473d | ||
![]() |
1d7bf3cbf8 | ||
![]() |
06321ec655 | ||
![]() |
4e202f8ed7 | ||
![]() |
8fa4dfce91 | ||
![]() |
ce0036ae56 | ||
![]() |
5c85409eb8 | ||
![]() |
0bb55be50f | ||
![]() |
99776a199e | ||
![]() |
ec0902623c | ||
![]() |
97e99daeef | ||
![]() |
d11143ead8 | ||
![]() |
5a1ca90c70 | ||
![]() |
bf70b096bf | ||
![]() |
46c8bafae5 | ||
![]() |
ee8cd25b31 | ||
![]() |
587a74311b | ||
![]() |
0c5e5f7ab8 | ||
![]() |
1908dd0672 | ||
![]() |
6e5bddccaa | ||
![]() |
b646949449 | ||
![]() |
db973cf246 | ||
![]() |
6e06ce55ab | ||
![]() |
6b29c2e8e3 | ||
![]() |
ba0cf49ae3 | ||
![]() |
46c743cdee | ||
![]() |
7dc1d66857 | ||
![]() |
1b1f3a12b2 | ||
![]() |
0eee4abdad | ||
![]() |
cfcf77bb4f | ||
![]() |
7a1f014094 | ||
![]() |
45d785c256 | ||
![]() |
ab01bbf79e | ||
![]() |
d6825fa358 | ||
![]() |
9d6cee976e | ||
![]() |
476552eeb4 | ||
![]() |
f81518ea82 | ||
![]() |
3ae036e997 | ||
![]() |
5da2d1d470 |
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -155,7 +155,7 @@ jobs:
|
||||
uses: goreleaser/goreleaser-action@v6
|
||||
with:
|
||||
distribution: goreleaser-pro
|
||||
version: nightly
|
||||
version: '~> v2'
|
||||
install-only: true
|
||||
- name: Extract signing key
|
||||
run: |-
|
||||
@ -551,7 +551,7 @@ jobs:
|
||||
uses: goreleaser/goreleaser-action@v6
|
||||
with:
|
||||
distribution: goreleaser-pro
|
||||
version: 2.5.1
|
||||
version: '~> v2'
|
||||
install-only: true
|
||||
- name: Cache ghr
|
||||
uses: actions/cache@v4
|
||||
|
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@ -28,7 +28,7 @@ jobs:
|
||||
uses: goreleaser/goreleaser-action@v6
|
||||
with:
|
||||
distribution: goreleaser-pro
|
||||
version: latest
|
||||
version: '~> v2'
|
||||
args: release -f .goreleaser.fury.yaml --clean
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
@ -383,7 +383,8 @@ func (r *Router) Lookup(ctx context.Context, domain string, options adapter.DNSQ
|
||||
ruleIndex = -1
|
||||
for {
|
||||
dnsCtx := adapter.OverrideContext(ctx)
|
||||
transport, rule, ruleIndex = r.matchDNS(ctx, false, ruleIndex, true, &options)
|
||||
dnsOptions := options
|
||||
transport, rule, ruleIndex = r.matchDNS(ctx, false, ruleIndex, true, &dnsOptions)
|
||||
if rule != nil {
|
||||
switch action := rule.Action().(type) {
|
||||
case *R.RuleActionReject:
|
||||
@ -416,10 +417,10 @@ func (r *Router) Lookup(ctx context.Context, domain string, options adapter.DNSQ
|
||||
return rule.MatchAddressLimit(metadata)
|
||||
}
|
||||
}
|
||||
if options.Strategy == C.DomainStrategyAsIS {
|
||||
options.Strategy = r.defaultDomainStrategy
|
||||
if dnsOptions.Strategy == C.DomainStrategyAsIS {
|
||||
dnsOptions.Strategy = r.defaultDomainStrategy
|
||||
}
|
||||
responseAddrs, err = r.client.Lookup(dnsCtx, transport, domain, options, responseCheck)
|
||||
responseAddrs, err = r.client.Lookup(dnsCtx, transport, domain, dnsOptions, responseCheck)
|
||||
if responseCheck == nil || err == nil {
|
||||
break
|
||||
}
|
||||
|
@ -23,7 +23,6 @@ import (
|
||||
"github.com/sagernet/sing/common/bufio"
|
||||
E "github.com/sagernet/sing/common/exceptions"
|
||||
"github.com/sagernet/sing/common/logger"
|
||||
M "github.com/sagernet/sing/common/metadata"
|
||||
N "github.com/sagernet/sing/common/network"
|
||||
sHTTP "github.com/sagernet/sing/protocol/http"
|
||||
|
||||
@ -101,8 +100,7 @@ func NewHTTP3(ctx context.Context, logger log.ContextLogger, tag string, options
|
||||
headers: headers,
|
||||
transport: &http3.Transport{
|
||||
Dial: func(ctx context.Context, addr string, tlsCfg *tls.STDConfig, cfg *quic.Config) (quic.EarlyConnection, error) {
|
||||
destinationAddr := M.ParseSocksaddr(addr)
|
||||
conn, dialErr := transportDialer.DialContext(ctx, N.NetworkUDP, destinationAddr)
|
||||
conn, dialErr := transportDialer.DialContext(ctx, N.NetworkUDP, serverAddr)
|
||||
if dialErr != nil {
|
||||
return nil, dialErr
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
icon: material/alert-decagram
|
||||
---
|
||||
|
||||
#### 1.12.0-alpha.14
|
||||
#### 1.12.0-alpha.15
|
||||
|
||||
* Fixes and improvements
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user