From 2cf2ff3f330ffd119c6a4bc9c0a89cc6ba05f894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 24 Mar 2026 16:40:21 +0800 Subject: [PATCH] Rename cloudflare-tunnel type to cloudflared --- constant/proxy.go | 6 +++--- include/cloudflare_tunnel_stub.go | 20 ------------------- .../{cloudflare_tunnel.go => cloudflared.go} | 4 ++-- include/cloudflared_stub.go | 20 +++++++++++++++++++ include/registry.go | 2 +- .../{cloudflare_tunnel.go => cloudflared.go} | 2 +- protocol/cloudflare/access.go | 5 +++-- protocol/cloudflare/access_test.go | 4 ++-- protocol/cloudflare/config_decode_test.go | 4 ++-- protocol/cloudflare/connection_http2.go | 2 +- protocol/cloudflare/connection_quic.go | 2 +- protocol/cloudflare/connection_quic_test.go | 2 +- protocol/cloudflare/control.go | 2 +- protocol/cloudflare/credentials.go | 2 +- protocol/cloudflare/credentials_test.go | 2 +- protocol/cloudflare/datagram_v2.go | 2 +- protocol/cloudflare/datagram_v3.go | 2 +- protocol/cloudflare/datagram_v3_test.go | 6 +++--- protocol/cloudflare/direct_origin_test.go | 2 +- protocol/cloudflare/dispatch.go | 2 +- protocol/cloudflare/dispatch_test.go | 2 +- protocol/cloudflare/edge_discovery.go | 2 +- protocol/cloudflare/edge_discovery_test.go | 2 +- protocol/cloudflare/flow_limiter.go | 2 +- protocol/cloudflare/flow_limiter_test.go | 4 ++-- protocol/cloudflare/header.go | 2 +- protocol/cloudflare/helpers_test.go | 4 ++-- protocol/cloudflare/icmp.go | 2 +- protocol/cloudflare/icmp_test.go | 10 +++++----- protocol/cloudflare/inbound.go | 14 ++++++------- protocol/cloudflare/ingress_test.go | 2 +- protocol/cloudflare/integration_test.go | 2 +- protocol/cloudflare/ip_rule_policy.go | 2 +- protocol/cloudflare/origin_request_test.go | 2 +- protocol/cloudflare/root_ca.go | 2 +- protocol/cloudflare/runtime_config.go | 2 +- protocol/cloudflare/special_service.go | 2 +- protocol/cloudflare/special_service_test.go | 4 ++-- protocol/cloudflare/stream.go | 2 +- protocol/cloudflare/stream_test.go | 2 +- release/DEFAULT_BUILD_TAGS | 2 +- release/DEFAULT_BUILD_TAGS_OTHERS | 2 +- release/DEFAULT_BUILD_TAGS_WINDOWS | 2 +- 43 files changed, 83 insertions(+), 82 deletions(-) delete mode 100644 include/cloudflare_tunnel_stub.go rename include/{cloudflare_tunnel.go => cloudflared.go} (62%) create mode 100644 include/cloudflared_stub.go rename option/{cloudflare_tunnel.go => cloudflared.go} (93%) diff --git a/constant/proxy.go b/constant/proxy.go index 91b3bc98e..ffec80250 100644 --- a/constant/proxy.go +++ b/constant/proxy.go @@ -25,7 +25,7 @@ const ( TypeTUIC = "tuic" TypeHysteria2 = "hysteria2" TypeTailscale = "tailscale" - TypeCloudflareTunnel = "cloudflare-tunnel" + TypeCloudflared = "cloudflared" TypeDERP = "derp" TypeResolved = "resolved" TypeSSMAPI = "ssm-api" @@ -91,8 +91,8 @@ func ProxyDisplayName(proxyType string) string { return "AnyTLS" case TypeTailscale: return "Tailscale" - case TypeCloudflareTunnel: - return "Cloudflare Tunnel" + case TypeCloudflared: + return "Cloudflared" case TypeSelector: return "Selector" case TypeURLTest: diff --git a/include/cloudflare_tunnel_stub.go b/include/cloudflare_tunnel_stub.go deleted file mode 100644 index 65c676ab0..000000000 --- a/include/cloudflare_tunnel_stub.go +++ /dev/null @@ -1,20 +0,0 @@ -//go:build !with_cloudflare_tunnel - -package include - -import ( - "context" - - "github.com/sagernet/sing-box/adapter" - "github.com/sagernet/sing-box/adapter/inbound" - C "github.com/sagernet/sing-box/constant" - "github.com/sagernet/sing-box/log" - "github.com/sagernet/sing-box/option" - E "github.com/sagernet/sing/common/exceptions" -) - -func registerCloudflareTunnelInbound(registry *inbound.Registry) { - inbound.Register[option.CloudflareTunnelInboundOptions](registry, C.TypeCloudflareTunnel, func(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.CloudflareTunnelInboundOptions) (adapter.Inbound, error) { - return nil, E.New(`Cloudflare Tunnel is not included in this build, rebuild with -tags with_cloudflare_tunnel`) - }) -} diff --git a/include/cloudflare_tunnel.go b/include/cloudflared.go similarity index 62% rename from include/cloudflare_tunnel.go rename to include/cloudflared.go index 80273a313..632001082 100644 --- a/include/cloudflare_tunnel.go +++ b/include/cloudflared.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package include @@ -7,6 +7,6 @@ import ( "github.com/sagernet/sing-box/protocol/cloudflare" ) -func registerCloudflareTunnelInbound(registry *inbound.Registry) { +func registerCloudflaredInbound(registry *inbound.Registry) { cloudflare.RegisterInbound(registry) } diff --git a/include/cloudflared_stub.go b/include/cloudflared_stub.go new file mode 100644 index 000000000..8f49aecc6 --- /dev/null +++ b/include/cloudflared_stub.go @@ -0,0 +1,20 @@ +//go:build !with_cloudflared + +package include + +import ( + "context" + + "github.com/sagernet/sing-box/adapter" + "github.com/sagernet/sing-box/adapter/inbound" + C "github.com/sagernet/sing-box/constant" + "github.com/sagernet/sing-box/log" + "github.com/sagernet/sing-box/option" + E "github.com/sagernet/sing/common/exceptions" +) + +func registerCloudflaredInbound(registry *inbound.Registry) { + inbound.Register[option.CloudflaredInboundOptions](registry, C.TypeCloudflared, func(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.CloudflaredInboundOptions) (adapter.Inbound, error) { + return nil, E.New(`Cloudflared is not included in this build, rebuild with -tags with_cloudflared`) + }) +} diff --git a/include/registry.go b/include/registry.go index 4cecfcda0..5a1a2f973 100644 --- a/include/registry.go +++ b/include/registry.go @@ -66,7 +66,7 @@ func InboundRegistry() *inbound.Registry { anytls.RegisterInbound(registry) registerQUICInbounds(registry) - registerCloudflareTunnelInbound(registry) + registerCloudflaredInbound(registry) registerStubForRemovedInbounds(registry) return registry diff --git a/option/cloudflare_tunnel.go b/option/cloudflared.go similarity index 93% rename from option/cloudflare_tunnel.go rename to option/cloudflared.go index 74b511eef..e597ebb77 100644 --- a/option/cloudflare_tunnel.go +++ b/option/cloudflared.go @@ -2,7 +2,7 @@ package option import "github.com/sagernet/sing/common/json/badoption" -type CloudflareTunnelInboundOptions struct { +type CloudflaredInboundOptions struct { Token string `json:"token,omitempty"` HAConnections int `json:"ha_connections,omitempty"` Protocol string `json:"protocol,omitempty"` diff --git a/protocol/cloudflare/access.go b/protocol/cloudflare/access.go index 75c1e8ada..fc40e7233 100644 --- a/protocol/cloudflare/access.go +++ b/protocol/cloudflare/access.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -10,10 +10,11 @@ import ( "strings" "sync" - "github.com/coreos/go-oidc/v3/oidc" E "github.com/sagernet/sing/common/exceptions" M "github.com/sagernet/sing/common/metadata" N "github.com/sagernet/sing/common/network" + + "github.com/coreos/go-oidc/v3/oidc" ) const accessJWTAssertionHeader = "Cf-Access-Jwt-Assertion" diff --git a/protocol/cloudflare/access_test.go b/protocol/cloudflare/access_test.go index 8c7d2b9e1..3cceb155e 100644 --- a/protocol/cloudflare/access_test.go +++ b/protocol/cloudflare/access_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -32,7 +32,7 @@ func newAccessTestInbound(t *testing.T) *Inbound { t.Fatal(err) } return &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), logger: logFactory.NewLogger("test"), accessCache: &accessValidatorCache{values: make(map[string]accessValidator), dialer: N.SystemDialer}, router: &testRouter{}, diff --git a/protocol/cloudflare/config_decode_test.go b/protocol/cloudflare/config_decode_test.go index 588e0355e..4addd1f99 100644 --- a/protocol/cloudflare/config_decode_test.go +++ b/protocol/cloudflare/config_decode_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -11,7 +11,7 @@ import ( ) func TestNewInboundRequiresToken(t *testing.T) { - _, err := NewInbound(context.Background(), nil, log.NewNOPFactory().NewLogger("test"), "test", option.CloudflareTunnelInboundOptions{}) + _, err := NewInbound(context.Background(), nil, log.NewNOPFactory().NewLogger("test"), "test", option.CloudflaredInboundOptions{}) if err == nil { t.Fatal("expected missing token error") } diff --git a/protocol/cloudflare/connection_http2.go b/protocol/cloudflare/connection_http2.go index 24ddadd6c..ef7f46035 100644 --- a/protocol/cloudflare/connection_http2.go +++ b/protocol/cloudflare/connection_http2.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/connection_quic.go b/protocol/cloudflare/connection_quic.go index 2a02a06d0..c674828e3 100644 --- a/protocol/cloudflare/connection_quic.go +++ b/protocol/cloudflare/connection_quic.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/connection_quic_test.go b/protocol/cloudflare/connection_quic_test.go index 7ea4a8690..ac7f58aba 100644 --- a/protocol/cloudflare/connection_quic_test.go +++ b/protocol/cloudflare/connection_quic_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/control.go b/protocol/cloudflare/control.go index f72d627f0..80d2cbc63 100644 --- a/protocol/cloudflare/control.go +++ b/protocol/cloudflare/control.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/credentials.go b/protocol/cloudflare/credentials.go index 443da061c..0b11d5ee7 100644 --- a/protocol/cloudflare/credentials.go +++ b/protocol/cloudflare/credentials.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/credentials_test.go b/protocol/cloudflare/credentials_test.go index 506d8601a..1c3d7fd6b 100644 --- a/protocol/cloudflare/credentials_test.go +++ b/protocol/cloudflare/credentials_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/datagram_v2.go b/protocol/cloudflare/datagram_v2.go index a17e7c5cc..318ce5b0b 100644 --- a/protocol/cloudflare/datagram_v2.go +++ b/protocol/cloudflare/datagram_v2.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/datagram_v3.go b/protocol/cloudflare/datagram_v3.go index ea23ed21c..42e758584 100644 --- a/protocol/cloudflare/datagram_v3.go +++ b/protocol/cloudflare/datagram_v3.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/datagram_v3_test.go b/protocol/cloudflare/datagram_v3_test.go index 5703310c0..08d8704ec 100644 --- a/protocol/cloudflare/datagram_v3_test.go +++ b/protocol/cloudflare/datagram_v3_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -14,7 +14,7 @@ import ( func TestDatagramV3RegistrationDestinationUnreachable(t *testing.T) { sender := &captureDatagramSender{} inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), flowLimiter: &FlowLimiter{}, } muxer := NewDatagramV3Muxer(inboundInstance, sender, nil) @@ -40,7 +40,7 @@ func TestDatagramV3RegistrationDestinationUnreachable(t *testing.T) { func TestDatagramV3RegistrationErrorWithMessage(t *testing.T) { sender := &captureDatagramSender{} inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), flowLimiter: &FlowLimiter{}, } muxer := NewDatagramV3Muxer(inboundInstance, sender, nil) diff --git a/protocol/cloudflare/direct_origin_test.go b/protocol/cloudflare/direct_origin_test.go index f38c96e22..85e1b9d8c 100644 --- a/protocol/cloudflare/direct_origin_test.go +++ b/protocol/cloudflare/direct_origin_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/dispatch.go b/protocol/cloudflare/dispatch.go index e8089858c..8d447f6ac 100644 --- a/protocol/cloudflare/dispatch.go +++ b/protocol/cloudflare/dispatch.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/dispatch_test.go b/protocol/cloudflare/dispatch_test.go index e4645cbd3..3afeb3ad9 100644 --- a/protocol/cloudflare/dispatch_test.go +++ b/protocol/cloudflare/dispatch_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/edge_discovery.go b/protocol/cloudflare/edge_discovery.go index 922063ce4..b8555fa16 100644 --- a/protocol/cloudflare/edge_discovery.go +++ b/protocol/cloudflare/edge_discovery.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/edge_discovery_test.go b/protocol/cloudflare/edge_discovery_test.go index 930fd46be..28dda352e 100644 --- a/protocol/cloudflare/edge_discovery_test.go +++ b/protocol/cloudflare/edge_discovery_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/flow_limiter.go b/protocol/cloudflare/flow_limiter.go index cfe753f6b..b26b619b2 100644 --- a/protocol/cloudflare/flow_limiter.go +++ b/protocol/cloudflare/flow_limiter.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/flow_limiter_test.go b/protocol/cloudflare/flow_limiter_test.go index b8e69aeeb..12eaa6dba 100644 --- a/protocol/cloudflare/flow_limiter_test.go +++ b/protocol/cloudflare/flow_limiter_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -31,7 +31,7 @@ func newLimitedInbound(t *testing.T, limit uint64) *Inbound { config.WarpRouting.MaxActiveFlows = limit configManager.activeConfig = config return &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), router: &testRouter{}, logger: logFactory.NewLogger("test"), configManager: configManager, diff --git a/protocol/cloudflare/header.go b/protocol/cloudflare/header.go index 05aa3765d..3a40d9581 100644 --- a/protocol/cloudflare/header.go +++ b/protocol/cloudflare/header.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/helpers_test.go b/protocol/cloudflare/helpers_test.go index 8dbec9c7a..4fd13ef77 100644 --- a/protocol/cloudflare/helpers_test.go +++ b/protocol/cloudflare/helpers_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -177,7 +177,7 @@ func newTestInbound(t *testing.T, token string, protocol string, haConnections i ctx, cancel := context.WithCancel(context.Background()) inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), ctx: ctx, cancel: cancel, router: &testRouter{}, diff --git a/protocol/cloudflare/icmp.go b/protocol/cloudflare/icmp.go index 8e000c0db..1070a2d83 100644 --- a/protocol/cloudflare/icmp.go +++ b/protocol/cloudflare/icmp.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/icmp_test.go b/protocol/cloudflare/icmp_test.go index 6f985050f..9557fa16f 100644 --- a/protocol/cloudflare/icmp_test.go +++ b/protocol/cloudflare/icmp_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -71,7 +71,7 @@ func TestICMPBridgeHandleV2RoutesEchoRequest(t *testing.T) { }, } inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), router: router, } sender := &captureDatagramSender{} @@ -117,7 +117,7 @@ func TestICMPBridgeHandleV2TracedReply(t *testing.T) { }, } inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), router: router, } bridge := NewICMPBridge(inboundInstance, sender, icmpWireV2) @@ -151,7 +151,7 @@ func TestICMPBridgeHandleV3Reply(t *testing.T) { }, } inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), router: router, } bridge := NewICMPBridge(inboundInstance, sender, icmpWireV3) @@ -178,7 +178,7 @@ func TestICMPBridgeDropsNonEcho(t *testing.T) { }, } inboundInstance := &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), router: router, } sender := &captureDatagramSender{} diff --git a/protocol/cloudflare/inbound.go b/protocol/cloudflare/inbound.go index 038a6a909..c794df3b5 100644 --- a/protocol/cloudflare/inbound.go +++ b/protocol/cloudflare/inbound.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -30,10 +30,10 @@ import ( ) func RegisterInbound(registry *inbound.Registry) { - inbound.Register[option.CloudflareTunnelInboundOptions](registry, C.TypeCloudflareTunnel, NewInbound) + inbound.Register[option.CloudflaredInboundOptions](registry, C.TypeCloudflared, NewInbound) } -var ErrNonRemoteManagedTunnelUnsupported = errors.New("cloudflare tunnel only supports remote-managed tunnels") +var ErrNonRemoteManagedTunnelUnsupported = errors.New("cloudflared only supports remote-managed tunnels") type Inbound struct { inbound.Adapter @@ -71,7 +71,7 @@ type Inbound struct { connectedNotify chan uint8 } -func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.CloudflareTunnelInboundOptions) (adapter.Inbound, error) { +func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.CloudflaredInboundOptions) (adapter.Inbound, error) { if options.Token == "" { return nil, E.New("missing token") } @@ -107,7 +107,7 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo configManager, err := NewConfigManager() if err != nil { - return nil, E.Cause(err, "build cloudflare tunnel runtime config") + return nil, E.Cause(err, "build cloudflared runtime config") } controlDialer, err := boxDialer.NewWithOptions(boxDialer.Options{ Context: ctx, @@ -115,7 +115,7 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo RemoteIsDomain: true, }) if err != nil { - return nil, E.Cause(err, "build cloudflare tunnel control dialer") + return nil, E.Cause(err, "build cloudflared control dialer") } region := options.Region @@ -129,7 +129,7 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo inboundCtx, cancel := context.WithCancel(ctx) return &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, tag), + Adapter: inbound.NewAdapter(C.TypeCloudflared, tag), ctx: inboundCtx, cancel: cancel, router: router, diff --git a/protocol/cloudflare/ingress_test.go b/protocol/cloudflare/ingress_test.go index f73db11a1..a742e794d 100644 --- a/protocol/cloudflare/ingress_test.go +++ b/protocol/cloudflare/ingress_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/integration_test.go b/protocol/cloudflare/integration_test.go index d1ca5799a..8d1900048 100644 --- a/protocol/cloudflare/integration_test.go +++ b/protocol/cloudflare/integration_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/ip_rule_policy.go b/protocol/cloudflare/ip_rule_policy.go index d2526306d..191d7a147 100644 --- a/protocol/cloudflare/ip_rule_policy.go +++ b/protocol/cloudflare/ip_rule_policy.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/origin_request_test.go b/protocol/cloudflare/origin_request_test.go index d8a6716ab..72aa3aeab 100644 --- a/protocol/cloudflare/origin_request_test.go +++ b/protocol/cloudflare/origin_request_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/root_ca.go b/protocol/cloudflare/root_ca.go index bfca9a4c5..6436514c8 100644 --- a/protocol/cloudflare/root_ca.go +++ b/protocol/cloudflare/root_ca.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/runtime_config.go b/protocol/cloudflare/runtime_config.go index d46e1062f..5c5ae8824 100644 --- a/protocol/cloudflare/runtime_config.go +++ b/protocol/cloudflare/runtime_config.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/special_service.go b/protocol/cloudflare/special_service.go index bf4833b9d..e60edfa0d 100644 --- a/protocol/cloudflare/special_service.go +++ b/protocol/cloudflare/special_service.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/special_service_test.go b/protocol/cloudflare/special_service_test.go index 9b29c0a0e..35d8245fc 100644 --- a/protocol/cloudflare/special_service_test.go +++ b/protocol/cloudflare/special_service_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare @@ -64,7 +64,7 @@ func newSpecialServiceInboundWithRouter(t *testing.T, router adapter.Router) *In t.Fatal(err) } return &Inbound{ - Adapter: inbound.NewAdapter(C.TypeCloudflareTunnel, "test"), + Adapter: inbound.NewAdapter(C.TypeCloudflared, "test"), router: router, logger: logFactory.NewLogger("test"), configManager: configManager, diff --git a/protocol/cloudflare/stream.go b/protocol/cloudflare/stream.go index 0cd92d30e..e9dcfa55f 100644 --- a/protocol/cloudflare/stream.go +++ b/protocol/cloudflare/stream.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/protocol/cloudflare/stream_test.go b/protocol/cloudflare/stream_test.go index 56e60e85b..78378ce86 100644 --- a/protocol/cloudflare/stream_test.go +++ b/protocol/cloudflare/stream_test.go @@ -1,4 +1,4 @@ -//go:build with_cloudflare_tunnel +//go:build with_cloudflared package cloudflare diff --git a/release/DEFAULT_BUILD_TAGS b/release/DEFAULT_BUILD_TAGS index cc2c039d8..e06bc120e 100644 --- a/release/DEFAULT_BUILD_TAGS +++ b/release/DEFAULT_BUILD_TAGS @@ -1 +1 @@ -with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale,with_ccm,with_ocm,with_cloudflare_tunnel,with_naive_outbound,badlinkname,tfogo_checklinkname0 \ No newline at end of file +with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale,with_ccm,with_ocm,with_cloudflared,with_naive_outbound,badlinkname,tfogo_checklinkname0 \ No newline at end of file diff --git a/release/DEFAULT_BUILD_TAGS_OTHERS b/release/DEFAULT_BUILD_TAGS_OTHERS index 7100c5ad5..a28e900e9 100644 --- a/release/DEFAULT_BUILD_TAGS_OTHERS +++ b/release/DEFAULT_BUILD_TAGS_OTHERS @@ -1 +1 @@ -with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale,with_ccm,with_ocm,with_cloudflare_tunnel,badlinkname,tfogo_checklinkname0 \ No newline at end of file +with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale,with_ccm,with_ocm,with_cloudflared,badlinkname,tfogo_checklinkname0 \ No newline at end of file diff --git a/release/DEFAULT_BUILD_TAGS_WINDOWS b/release/DEFAULT_BUILD_TAGS_WINDOWS index 7d5dd55ad..af4fe4162 100644 --- a/release/DEFAULT_BUILD_TAGS_WINDOWS +++ b/release/DEFAULT_BUILD_TAGS_WINDOWS @@ -1 +1 @@ -with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale,with_ccm,with_ocm,with_cloudflare_tunnel,with_naive_outbound,with_purego,badlinkname,tfogo_checklinkname0 \ No newline at end of file +with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api,with_tailscale,with_ccm,with_ocm,with_cloudflared,with_naive_outbound,with_purego,badlinkname,tfogo_checklinkname0 \ No newline at end of file