|
|
@@ -7,6 +7,7 @@ import (
|
|
|
"errors"
|
|
|
"net"
|
|
|
|
|
|
+ mDNS "github.com/miekg/dns"
|
|
|
"github.com/sagernet/sing-box/adapter"
|
|
|
C "github.com/sagernet/sing-box/constant"
|
|
|
"github.com/sagernet/sing-box/dns"
|
|
|
@@ -19,8 +20,6 @@ import (
|
|
|
M "github.com/sagernet/sing/common/metadata"
|
|
|
N "github.com/sagernet/sing/common/network"
|
|
|
"github.com/sagernet/sing/service"
|
|
|
-
|
|
|
- mDNS "github.com/miekg/dns"
|
|
|
)
|
|
|
|
|
|
func RegisterTransport(registry *dns.TransportRegistry) {
|
|
|
@@ -74,12 +73,14 @@ func (t *Transport) Start(stage adapter.StartStage) error {
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
- if t.fallback {
|
|
|
- t.dhcpTransport = newDHCPTransport(t.TransportAdapter, log.ContextWithOverrideLevel(t.ctx, log.LevelDebug), t.dialer, t.logger)
|
|
|
- if t.dhcpTransport != nil {
|
|
|
- err := t.dhcpTransport.Start(stage)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
+ if !C.IsIos {
|
|
|
+ if t.fallback {
|
|
|
+ t.dhcpTransport = newDHCPTransport(t.TransportAdapter, log.ContextWithOverrideLevel(t.ctx, log.LevelDebug), t.dialer, t.logger)
|
|
|
+ if t.dhcpTransport != nil {
|
|
|
+ err := t.dhcpTransport.Start(stage)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -104,10 +105,12 @@ func (t *Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg,
|
|
|
if !t.fallback {
|
|
|
return t.exchange(ctx, message, domain)
|
|
|
}
|
|
|
- if t.dhcpTransport != nil {
|
|
|
- dhcpTransports, _ := t.dhcpTransport.Fetch()
|
|
|
- if len(dhcpTransports) > 0 {
|
|
|
- return t.dhcpTransport.Exchange0(ctx, message, dhcpTransports)
|
|
|
+ if !C.IsIos {
|
|
|
+ if t.dhcpTransport != nil {
|
|
|
+ dhcpTransports, _ := t.dhcpTransport.Fetch()
|
|
|
+ if len(dhcpTransports) > 0 {
|
|
|
+ return t.dhcpTransport.Exchange0(ctx, message, dhcpTransports)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if t.preferGo {
|
|
|
@@ -131,5 +134,9 @@ func (t *Transport) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg,
|
|
|
}
|
|
|
return dns.FixedResponse(message.Id, question, addresses, C.DefaultDNSTTL), nil
|
|
|
}
|
|
|
- return nil, E.New("only A and AAAA queries are supported on Apple platforms when using TUN and DHCP unavailable.")
|
|
|
+ if C.IsIos {
|
|
|
+ return nil, E.New("only A and AAAA queries are supported on iOS and tvOS when using NetworkExtension.")
|
|
|
+ } else {
|
|
|
+ return nil, E.New("only A and AAAA queries are supported on macOS when using NetworkExtension and DHCP unavailable.")
|
|
|
+ }
|
|
|
}
|