diff --git a/core/controllers/ConnectionController.py b/core/controllers/ConnectionController.py index a08e3a3..d117273 100644 --- a/core/controllers/ConnectionController.py +++ b/core/controllers/ConnectionController.py @@ -4,7 +4,7 @@ from core.errors.logger import logger from core.services.networking.general_connection_tools.testing_evaluating import await_connection, system_uses_wireguard_interface, await_network_interface from core.services.networking.systemwide.systemwide_wireguard import establish_system_connection, terminate_system_connection -from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint +from core.services.config_tools.endpoint_verification import verify_wireguard_endpoint from core.observers.TicketObserver import TicketObserver from core.services.networking.systemwide.general_tools.test_any_protocol import test_session_ip from core.models.enum_models import ProtocolChoice diff --git a/core/services/keys_and_verifications/endpoint_verification.py b/core/services/config_tools/endpoint_verification.py similarity index 100% rename from core/services/keys_and_verifications/endpoint_verification.py rename to core/services/config_tools/endpoint_verification.py diff --git a/core/services/keys_and_verifications/wireguard_keys.py b/core/services/config_tools/wireguard_configs.py similarity index 100% rename from core/services/keys_and_verifications/wireguard_keys.py rename to core/services/config_tools/wireguard_configs.py diff --git a/core/services/networking/general_connection_tools/connection_enable.py b/core/services/networking/general_connection_tools/connection_enable.py index 135c7a1..97816fb 100644 --- a/core/services/networking/general_connection_tools/connection_enable.py +++ b/core/services/networking/general_connection_tools/connection_enable.py @@ -3,8 +3,7 @@ from core.services.networking.systemwide.encrypted_proxy.launch_proxy import lau # from core.services.networking.api_requests.ApiResponseModel import BackoffStrategy from core.services.networking.general_connection_tools.testing_evaluating import system_uses_wireguard_interface from core.services.networking.systemwide.systemwide_wireguard import establish_system_connection, terminate_system_connection -from core.services.keys_and_verifications.wireguard_keys import register_wireguard_session -# from core.services.subscriptions.subscriptions import activate_subscription +from core.services.config_tools.wireguard_configs import register_wireguard_session #, get_encrypted_proxy_billing_code # from core.services.networking.systemwide.encrypted_proxy.configure_singbox import configure_singbox # from core.services.networking.systemwide.encrypted_proxy.singbox_runner import start_singbox diff --git a/core/services/networking/mtu/mtu_orchestrator.py b/core/services/networking/mtu/mtu_orchestrator.py index 3d9ca24..4f4a912 100644 --- a/core/services/networking/mtu/mtu_orchestrator.py +++ b/core/services/networking/mtu/mtu_orchestrator.py @@ -1,5 +1,5 @@ from core.models.ConnectionRecovery import ConnectionRecovery -from core.services.keys_and_verifications.wireguard_keys import get_mtu, insert_mtu_into_config_on_disk +from core.services.config_tools.wireguard_configs import get_mtu, insert_mtu_into_config_on_disk from core.services.networking.mtu.mtu_tools import loop_through_testing_mtu, mtu_is_fine, MIN_MTU, MAX_MTU from core.observers.Notifications import Notifications, EventType from core.models.BaseProfile import BaseProfile as Profile diff --git a/core/services/networking/session/session_networking.py b/core/services/networking/session/session_networking.py index c5a17f0..2ae9871 100644 --- a/core/services/networking/session/session_networking.py +++ b/core/services/networking/session/session_networking.py @@ -7,7 +7,7 @@ from core.services.networking.ports.port_change import ask_to_change_port from core.models.ConnectionRecovery import ConnectionRecovery from core.services.networking.session.tor_session import start_tor_session_networking from essentials.services.ConnectionService import ConnectionService -from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint +from core.services.config_tools.endpoint_verification import verify_wireguard_endpoint from core.controllers.SessionStateController import SessionStateController from core.models.session.SessionProfile import SessionProfile from core.observers.ConnectionObserver import ConnectionObserver diff --git a/core/services/networking/systemwide/systemwide_wireguard.py b/core/services/networking/systemwide/systemwide_wireguard.py index 4b18f5b..8fe2bd8 100644 --- a/core/services/networking/systemwide/systemwide_wireguard.py +++ b/core/services/networking/systemwide/systemwide_wireguard.py @@ -1,8 +1,7 @@ from core.models.ConnectionRecovery import ConnectionRecovery -from core.services.keys_and_verifications.wireguard_keys import register_wireguard_session +from core.services.config_tools.wireguard_configs import register_wireguard_session from core.services.networking.ports.port_orchestrator import get_wg_port, ask_to_change_port, get_random_different_port, change_wg_port from core.services.networking.mtu.mtu_orchestrator import passed_initial_mtu_screen -# from core.services.keys_and_verifications.wireguard_keys import get_mtu from core.models.BaseProfile import BaseProfile as Profile from core.services.networking.general_connection_tools.location_evaluation import evaluate_location_and_internet @@ -10,7 +9,7 @@ from core.services.networking.api_requests.ApiResponseModel import BackoffStrate from core.models.enum_models import ProtocolChoice, SINGBOX_PROTOCOLS from core.controllers.profile_state.get_profile_data import get_protocol_enum from core.services.networking.general_connection_tools.testing_evaluating import system_uses_wireguard_interface, terminate_tor_connection -from core.services.keys_and_verifications.endpoint_verification import verify_wireguard_endpoint +from core.services.config_tools.endpoint_verification import verify_wireguard_endpoint from core.models.Result import Result, ResultError from core.services.networking.systemwide.systemwide_utils import extract_wg_interface_name, check_system_prereqs from core.observers.Notifications import Notifications, EventType diff --git a/core/services/networking/wireguard/renegotation.py b/core/services/networking/wireguard/renegotation.py index a2ad7f9..cce6c9e 100644 --- a/core/services/networking/wireguard/renegotation.py +++ b/core/services/networking/wireguard/renegotation.py @@ -1,4 +1,4 @@ -from core.services.keys_and_verifications.wireguard_keys import register_wireguard_session +from core.services.config_tools.wireguard_configs import register_wireguard_session from core.models.BaseProfile import BaseProfile as Profile from core.observers.Notifications import Notifications, EventType from core.errors.logger import logger