Sing-Box v1.13.0

core/register.go

@@ -36,11 +36,12 @@ import (
 	"github.com/sagernet/sing-box/protocol/vless"
 	"github.com/sagernet/sing-box/protocol/vmess"
 	"github.com/sagernet/sing-box/protocol/wireguard"
+	"github.com/sagernet/sing-box/service/ccm"
 	"github.com/sagernet/sing-box/service/derp"
+	"github.com/sagernet/sing-box/service/ocm"
 	"github.com/sagernet/sing-box/service/resolved"
 	"github.com/sagernet/sing-box/service/ssmapi"
 	_ "github.com/sagernet/sing-box/transport/v2rayquic"
-	_ "github.com/sagernet/sing-dns/quic"
 )
 
 func InboundRegistry() *inbound.Registry {
@@ -86,6 +87,7 @@ func OutboundRegistry() *outbound.Registry {
 	shadowsocks.RegisterOutbound(registry)
 	vmess.RegisterOutbound(registry)
 	trojan.RegisterOutbound(registry)
+	registerNaiveOutbound(registry)
 	tor.RegisterOutbound(registry)
 	ssh.RegisterOutbound(registry)
 	shadowtls.RegisterOutbound(registry)
@@ -104,7 +106,7 @@ func EndpointRegistry() *endpoint.Registry {
 	registry := endpoint.NewRegistry()
 
 	wireguard.RegisterEndpoint(registry)
-	registerTailscaleEndpoint(registry)
+	tailscale.RegisterEndpoint(registry)
 
 	return registry
 }
@@ -120,32 +122,12 @@ func DNSTransportRegistry() *dns.TransportRegistry {
 	local.RegisterTransport(registry)
 	fakeip.RegisterTransport(registry)
 
-	registerQUICTransports(registry)
-	registerDHCPTransport(registry)
-	registerTailscaleTransport(registry)
-
-	return registry
-}
-
-func registerTailscaleEndpoint(registry *endpoint.Registry) {
-	tailscale.RegisterEndpoint(registry)
-}
-
-func registerTailscaleTransport(registry *dns.TransportRegistry) {
-	tailscale.RegistryTransport(registry)
-}
-
-func registerDERPService(registry *service.Registry) {
-	derp.Register(registry)
-}
-
-func registerQUICTransports(registry *dns.TransportRegistry) {
 	quic.RegisterTransport(registry)
 	quic.RegisterHTTP3Transport(registry)
-}
-
-func registerDHCPTransport(registry *dns.TransportRegistry) {
 	dhcp.RegisterTransport(registry)
+	tailscale.RegistryTransport(registry)
+
+	return registry
 }
 
 func ServiceRegistry() *service.Registry {
@@ -154,7 +136,9 @@ func ServiceRegistry() *service.Registry {
 	resolved.RegisterService(registry)
 	ssmapi.RegisterService(registry)
 
-	registerDERPService(registry)
+	derp.Register(registry)
+	ccm.RegisterService(registry)
+	ocm.RegisterService(registry)
 
 	return registry
 }