mirror of
https://github.com/SagerNet/sing-box.git
synced 2025-06-13 21:54:13 +08:00
Compare commits
2 Commits
b37e1e7616
...
45798b10c8
Author | SHA1 | Date | |
---|---|---|---|
![]() |
45798b10c8 | ||
![]() |
0f8bd01aad |
@ -93,11 +93,10 @@ func NewHTTPS(ctx context.Context, logger log.ContextLogger, tag string, options
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
serverAddr := options.DNSServerAddressOptions.Build()
|
serverAddr := options.DNSServerAddressOptions.Build()
|
||||||
if serverAddr.Port == 0 {
|
if !serverAddr.Addr.IsValid() {
|
||||||
serverAddr.Port = 443
|
|
||||||
}
|
|
||||||
if !serverAddr.IsValid() {
|
|
||||||
return nil, E.New("invalid server address: ", serverAddr)
|
return nil, E.New("invalid server address: ", serverAddr)
|
||||||
|
} else if serverAddr.Port == 0 {
|
||||||
|
serverAddr.Port = 443
|
||||||
}
|
}
|
||||||
return NewHTTPSRaw(
|
return NewHTTPSRaw(
|
||||||
dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeHTTPS, tag, options.RemoteDNSServerOptions),
|
dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeHTTPS, tag, options.RemoteDNSServerOptions),
|
||||||
|
@ -89,11 +89,10 @@ func NewHTTP3(ctx context.Context, logger log.ContextLogger, tag string, options
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
serverAddr := options.DNSServerAddressOptions.Build()
|
serverAddr := options.DNSServerAddressOptions.Build()
|
||||||
if serverAddr.Port == 0 {
|
if !serverAddr.Addr.IsValid() {
|
||||||
serverAddr.Port = 443
|
|
||||||
}
|
|
||||||
if !serverAddr.IsValid() {
|
|
||||||
return nil, E.New("invalid server address: ", serverAddr)
|
return nil, E.New("invalid server address: ", serverAddr)
|
||||||
|
} else if serverAddr.Port == 0 {
|
||||||
|
serverAddr.Port = 443
|
||||||
}
|
}
|
||||||
return &HTTP3Transport{
|
return &HTTP3Transport{
|
||||||
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeHTTP3, tag, options.RemoteDNSServerOptions),
|
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeHTTP3, tag, options.RemoteDNSServerOptions),
|
||||||
|
@ -56,11 +56,10 @@ func NewQUIC(ctx context.Context, logger log.ContextLogger, tag string, options
|
|||||||
tlsConfig.SetNextProtos([]string{"doq"})
|
tlsConfig.SetNextProtos([]string{"doq"})
|
||||||
}
|
}
|
||||||
serverAddr := options.DNSServerAddressOptions.Build()
|
serverAddr := options.DNSServerAddressOptions.Build()
|
||||||
if serverAddr.Port == 0 {
|
if !serverAddr.Addr.IsValid() {
|
||||||
serverAddr.Port = 853
|
|
||||||
}
|
|
||||||
if !serverAddr.IsValid() {
|
|
||||||
return nil, E.New("invalid server address: ", serverAddr)
|
return nil, E.New("invalid server address: ", serverAddr)
|
||||||
|
} else if serverAddr.Port == 0 {
|
||||||
|
serverAddr.Port = 853
|
||||||
}
|
}
|
||||||
return &Transport{
|
return &Transport{
|
||||||
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeQUIC, tag, options.RemoteDNSServerOptions),
|
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeQUIC, tag, options.RemoteDNSServerOptions),
|
||||||
|
@ -38,11 +38,10 @@ func NewTCP(ctx context.Context, logger log.ContextLogger, tag string, options o
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
serverAddr := options.DNSServerAddressOptions.Build()
|
serverAddr := options.DNSServerAddressOptions.Build()
|
||||||
if serverAddr.Port == 0 {
|
if !serverAddr.Addr.IsValid() {
|
||||||
serverAddr.Port = 53
|
|
||||||
}
|
|
||||||
if !serverAddr.IsValid() {
|
|
||||||
return nil, E.New("invalid server address: ", serverAddr)
|
return nil, E.New("invalid server address: ", serverAddr)
|
||||||
|
} else if serverAddr.Port == 0 {
|
||||||
|
serverAddr.Port = 53
|
||||||
}
|
}
|
||||||
return &TCPTransport{
|
return &TCPTransport{
|
||||||
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeTCP, tag, options),
|
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeTCP, tag, options),
|
||||||
|
@ -54,11 +54,10 @@ func NewTLS(ctx context.Context, logger log.ContextLogger, tag string, options o
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
serverAddr := options.DNSServerAddressOptions.Build()
|
serverAddr := options.DNSServerAddressOptions.Build()
|
||||||
if serverAddr.Port == 0 {
|
if !serverAddr.Addr.IsValid() {
|
||||||
serverAddr.Port = 853
|
|
||||||
}
|
|
||||||
if !serverAddr.IsValid() {
|
|
||||||
return nil, E.New("invalid server address: ", serverAddr)
|
return nil, E.New("invalid server address: ", serverAddr)
|
||||||
|
} else if serverAddr.Port == 0 {
|
||||||
|
serverAddr.Port = 853
|
||||||
}
|
}
|
||||||
return &TLSTransport{
|
return &TLSTransport{
|
||||||
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeTLS, tag, options.RemoteDNSServerOptions),
|
TransportAdapter: dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeTLS, tag, options.RemoteDNSServerOptions),
|
||||||
|
@ -45,11 +45,10 @@ func NewUDP(ctx context.Context, logger log.ContextLogger, tag string, options o
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
serverAddr := options.DNSServerAddressOptions.Build()
|
serverAddr := options.DNSServerAddressOptions.Build()
|
||||||
if serverAddr.Port == 0 {
|
if !serverAddr.Addr.IsValid() {
|
||||||
serverAddr.Port = 53
|
|
||||||
}
|
|
||||||
if !serverAddr.IsValid() {
|
|
||||||
return nil, E.New("invalid server address: ", serverAddr)
|
return nil, E.New("invalid server address: ", serverAddr)
|
||||||
|
} else if serverAddr.Port == 0 {
|
||||||
|
serverAddr.Port = 53
|
||||||
}
|
}
|
||||||
return NewUDPRaw(logger, dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeUDP, tag, options), transportDialer, serverAddr), nil
|
return NewUDPRaw(logger, dns.NewTransportAdapterWithRemoteOptions(C.DNSTypeUDP, tag, options), transportDialer, serverAddr), nil
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
icon: material/alert-decagram
|
icon: material/alert-decagram
|
||||||
---
|
---
|
||||||
|
|
||||||
#### 1.12.0-beta.7
|
#### 1.12.0-beta.6
|
||||||
|
|
||||||
* Fixes and improvements
|
* Fixes and improvements
|
||||||
|
|
||||||
|
@ -42,18 +42,16 @@ AnyTLS padding scheme line array.
|
|||||||
|
|
||||||
Default padding scheme:
|
Default padding scheme:
|
||||||
|
|
||||||
```json
|
```
|
||||||
[
|
stop=8
|
||||||
"stop=8",
|
0=30-30
|
||||||
"0=30-30",
|
1=100-400
|
||||||
"1=100-400",
|
2=400-500,c,500-1000,c,500-1000,c,500-1000,c,500-1000
|
||||||
"2=400-500,c,500-1000,c,500-1000,c,500-1000,c,500-1000",
|
3=9-9,500-1000
|
||||||
"3=9-9,500-1000",
|
4=500-1000
|
||||||
"4=500-1000",
|
5=500-1000
|
||||||
"5=500-1000",
|
6=500-1000
|
||||||
"6=500-1000",
|
7=500-1000
|
||||||
"7=500-1000"
|
|
||||||
]
|
|
||||||
```
|
```
|
||||||
|
|
||||||
#### tls
|
#### tls
|
||||||
|
@ -42,18 +42,16 @@ AnyTLS 填充方案行数组。
|
|||||||
|
|
||||||
默认填充方案:
|
默认填充方案:
|
||||||
|
|
||||||
```json
|
```
|
||||||
[
|
stop=8
|
||||||
"stop=8",
|
0=30-30
|
||||||
"0=30-30",
|
1=100-400
|
||||||
"1=100-400",
|
2=400-500,c,500-1000,c,500-1000,c,500-1000,c,500-1000
|
||||||
"2=400-500,c,500-1000,c,500-1000,c,500-1000,c,500-1000",
|
3=9-9,500-1000
|
||||||
"3=9-9,500-1000",
|
4=500-1000
|
||||||
"4=500-1000",
|
5=500-1000
|
||||||
"5=500-1000",
|
6=500-1000
|
||||||
"6=500-1000",
|
7=500-1000
|
||||||
"7=500-1000"
|
|
||||||
]
|
|
||||||
```
|
```
|
||||||
|
|
||||||
#### tls
|
#### tls
|
||||||
|
Loading…
x
Reference in New Issue
Block a user