Fixing wireguard breaking due to changes in systemwide state from singbox kill checking wireguard first

This commit is contained in:
SimplifiedPrivacy 2026-10-15 19:13:57 -04:00
parent 6107a355f9
commit 0931200c79
2 changed files with 5 additions and 3 deletions

View file

@ -146,7 +146,7 @@ def end_singbox() -> Result:
# 1. WireGuard Cleanup. In case, it was a different protocol. # 1. WireGuard Cleanup. In case, it was a different protocol.
if current_state and get_protocol_enum(current_state.profile_id) == ProtocolChoice.WIREGUARD: if current_state and get_protocol_enum(current_state.profile_id) == ProtocolChoice.WIREGUARD:
from core.services.networking.systemwide_wireguard import terminate_system_connection from core.services.networking.systemwide.systemwide_wireguard import terminate_system_connection
terminate_system_connection( terminate_system_connection(
firewall_setting=current_state.firewalled, firewall_setting=current_state.firewalled,
dns_setting=current_state.dns_set dns_setting=current_state.dns_set

View file

@ -1,3 +1,4 @@
from core.models.enum_models import ProtocolChoice
from core.services.networking.general_connection_tools.testing_evaluating import await_connection, system_uses_wireguard_interface, terminate_tor_connection from core.services.networking.general_connection_tools.testing_evaluating import await_connection, system_uses_wireguard_interface, terminate_tor_connection
from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint
from core.models.Result import Result, ResultError from core.models.Result import Result, ResultError
@ -141,9 +142,10 @@ def __establish_system_connection(
current_state = SystemStateController.create( current_state = SystemStateController.create(
profile_id=profile.id, profile_id=profile.id,
firewalled=firewall_setting, # intended setting, not result yet firewalled=firewall_setting, # intended setting, not result yet
dns_set=dns_setting # intended setting, not result yet dns_set=dns_setting, # intended setting, not result yet,
protocol=ProtocolChoice.WIREGUARD
) )
# ============= PREP SETTINGS ============= # ============= PREP SETTINGS =============
if connection_observer: if connection_observer:
connection_observer.notify("connecting", "Getting Interface Name..") connection_observer.notify("connecting", "Getting Interface Name..")