diff --git a/rust/relay/ebpf-shared/src/lib.rs b/rust/relay/ebpf-shared/src/lib.rs index cb88aa5aa..16615b86c 100644 --- a/rust/relay/ebpf-shared/src/lib.rs +++ b/rust/relay/ebpf-shared/src/lib.rs @@ -204,7 +204,6 @@ impl PortAndPeerV6 { #[derive(Clone, Copy, PartialEq, Eq)] #[cfg_attr(feature = "std", derive(Debug))] pub struct Config { - pub relaying_enabled: bool, pub udp_checksum_enabled: bool, pub lowest_allocation_port: u16, pub highest_allocation_port: u16, @@ -213,7 +212,6 @@ pub struct Config { impl Default for Config { fn default() -> Self { Self { - relaying_enabled: true, udp_checksum_enabled: true, lowest_allocation_port: 49152, highest_allocation_port: 65535, diff --git a/rust/relay/ebpf-turn-router/src/config.rs b/rust/relay/ebpf-turn-router/src/config.rs index 33aea8630..4e89a35c6 100644 --- a/rust/relay/ebpf-turn-router/src/config.rs +++ b/rust/relay/ebpf-turn-router/src/config.rs @@ -11,10 +11,6 @@ pub fn udp_checksum_enabled() -> bool { config().udp_checksum_enabled } -pub fn relaying_enabled() -> bool { - config().relaying_enabled -} - pub fn allocation_range() -> RangeInclusive { let config = config(); diff --git a/rust/relay/ebpf-turn-router/src/main.rs b/rust/relay/ebpf-turn-router/src/main.rs index 4b5fa24d6..f47af7e11 100644 --- a/rust/relay/ebpf-turn-router/src/main.rs +++ b/rust/relay/ebpf-turn-router/src/main.rs @@ -97,10 +97,6 @@ pub fn handle_turn(ctx: XdpContext) -> u32 { #[inline(always)] fn try_handle_turn(ctx: &XdpContext) -> Result { - if !config::relaying_enabled() { - return Ok(xdp_action::XDP_PASS); - } - let eth = Eth::parse(ctx)?; match eth.ether_type() { diff --git a/rust/relay/server/src/main.rs b/rust/relay/server/src/main.rs index 55eaf17e5..823a8b7f2 100644 --- a/rust/relay/server/src/main.rs +++ b/rust/relay/server/src/main.rs @@ -117,7 +117,6 @@ fn main() { VERSION.unwrap_or("unknown"), RELAY_DSN, ); - Telemetry::set_firezone_id(uuid::Uuid::new_v4().to_string()); } let runtime = tokio::runtime::Builder::new_current_thread() @@ -148,7 +147,6 @@ async fn try_main(args: Args) -> Result<()> { if let Some(ebpf) = ebpf.as_mut() { ebpf.set_config(Config { - relaying_enabled: true, udp_checksum_enabled: true, lowest_allocation_port: args.lowest_port, highest_allocation_port: args.highest_port, @@ -649,21 +647,6 @@ where ready = true; } - if let Some(ebpf) = self.ebpf.as_mut() { - let is_enabled = ebpf.config().relaying_enabled; - let should_be_enabled = - firezone_telemetry::feature_flags::ebpf_turn_router_enabled(); - - if is_enabled != should_be_enabled { - tracing::info!(%is_enabled, %should_be_enabled, "eBPF router feature-flag changed"); - - ebpf.set_config(Config { - relaying_enabled: should_be_enabled, - ..ebpf.config() - })?; - } - } - if !ready { break Poll::Pending; } diff --git a/rust/telemetry/src/feature_flags.rs b/rust/telemetry/src/feature_flags.rs index 730fecca6..3643a951c 100644 --- a/rust/telemetry/src/feature_flags.rs +++ b/rust/telemetry/src/feature_flags.rs @@ -24,10 +24,6 @@ pub fn drop_llmnr_nxdomain_responses() -> bool { FEATURE_FLAGS.read().drop_llmnr_nxdomain_responses } -pub fn ebpf_turn_router_enabled() -> bool { - FEATURE_FLAGS.read().ebpf_turn_router_enabled -} - pub(crate) fn reevaluate(user_id: String, env: &str) { let api_key = match env { crate::env::PRODUCTION => POSTHOG_API_KEY_PROD, @@ -134,8 +130,6 @@ struct FeatureFlags { icmp_unreachable_instead_of_nat64: bool, #[serde(default)] drop_llmnr_nxdomain_responses: bool, - #[serde(default)] - ebpf_turn_router_enabled: bool, } fn sentry_flag_context(flags: FeatureFlags) -> sentry::protocol::Context { @@ -144,14 +138,12 @@ fn sentry_flag_context(flags: FeatureFlags) -> sentry::protocol::Context { enum SentryFlag { IcmpUnreachableInsteadOfNat64 { result: bool }, DropLlmnrNxdomainResponses { result: bool }, - EbpfTurnRouterEnabled { result: bool }, } // Exhaustive destruction so we don't forget to update this when we add a flag. let FeatureFlags { icmp_unreachable_instead_of_nat64, drop_llmnr_nxdomain_responses, - ebpf_turn_router_enabled, } = flags; let value = serde_json::json!({ @@ -160,7 +152,6 @@ fn sentry_flag_context(flags: FeatureFlags) -> sentry::protocol::Context { result: icmp_unreachable_instead_of_nat64, }, SentryFlag::DropLlmnrNxdomainResponses { result: drop_llmnr_nxdomain_responses }, - SentryFlag::EbpfTurnRouterEnabled { result: ebpf_turn_router_enabled } ] });