mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
911a999c64
* fix: xray heap corruption * fix: use proper configuration for split-tunneled apps * chore: enable killswitch * chore: xray windows split-tunneling cleanup * chore: proper xray killswitch log * feat: add wait for the tun device * chore: update amnezia_xray deps for macos * fix: add nullptr check for split-tunnel on win * fix: modernize vpnAdapter grabbing function * fix: remove network watcher due to its fragileness * chore: xrayprotocol cleanup * fix: correct wrong iface index on win * chore: move tun2socks implementation to the client from the service * chore: xrayprotocol cleanup * chore: more xrayprotocol cleanup * fix: consistent tun device with GUID specified * chore: tun2socks logs * chore: PrivilegedProcess cleanup * better error handling in establishment phase * terminate&kill ops for remote process * fix: straighforward killing the process on windows * fix: finally remove GUID setting from tun2socks due to instability * fix: add sanitizer to ipc process * chore: do not collect sensitive info from tun2socks
217 lines
7.4 KiB
CMake
217 lines
7.4 KiB
CMake
set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/migrations.h
|
|
${CLIENT_ROOT_DIR}/../ipc/ipc.h
|
|
${CLIENT_ROOT_DIR}/amnezia_application.h
|
|
${CLIENT_ROOT_DIR}/containers/containers_defs.h
|
|
${CLIENT_ROOT_DIR}/core/defs.h
|
|
${CLIENT_ROOT_DIR}/core/errorstrings.h
|
|
${CLIENT_ROOT_DIR}/core/scripts_registry.h
|
|
${CLIENT_ROOT_DIR}/core/server_defs.h
|
|
${CLIENT_ROOT_DIR}/core/api/apiDefs.h
|
|
${CLIENT_ROOT_DIR}/core/qrCodeUtils.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/coreController.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/gatewayController.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/serverController.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/vpnConfigurationController.h
|
|
${CLIENT_ROOT_DIR}/protocols/protocols_defs.h
|
|
${CLIENT_ROOT_DIR}/protocols/qml_register_protocols.h
|
|
${CLIENT_ROOT_DIR}/ui/pages.h
|
|
${CLIENT_ROOT_DIR}/ui/qautostart.h
|
|
${CLIENT_ROOT_DIR}/protocols/vpnprotocol.h
|
|
${CMAKE_CURRENT_BINARY_DIR}/version.h
|
|
${CLIENT_ROOT_DIR}/core/sshclient.h
|
|
${CLIENT_ROOT_DIR}/core/networkUtilities.h
|
|
${CLIENT_ROOT_DIR}/core/serialization/serialization.h
|
|
${CLIENT_ROOT_DIR}/core/serialization/transfer.h
|
|
${CLIENT_ROOT_DIR}/../common/logger/logger.h
|
|
${CLIENT_ROOT_DIR}/utils/qmlUtils.h
|
|
${CLIENT_ROOT_DIR}/core/api/apiUtils.h
|
|
${CLIENT_ROOT_DIR}/core/osSignalHandler.h
|
|
)
|
|
|
|
# Mozilla headres
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/mozilla/models/server.h
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.h
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.h
|
|
${CLIENT_ROOT_DIR}/mozilla/controllerimpl.h
|
|
)
|
|
|
|
if(NOT IOS AND NOT MACOS_NE)
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.h
|
|
)
|
|
endif()
|
|
|
|
if(NOT ANDROID)
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/ui/notificationhandler.h
|
|
)
|
|
endif()
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/migrations.cpp
|
|
${CLIENT_ROOT_DIR}/amnezia_application.cpp
|
|
${CLIENT_ROOT_DIR}/containers/containers_defs.cpp
|
|
${CLIENT_ROOT_DIR}/core/errorstrings.cpp
|
|
${CLIENT_ROOT_DIR}/core/scripts_registry.cpp
|
|
${CLIENT_ROOT_DIR}/core/server_defs.cpp
|
|
${CLIENT_ROOT_DIR}/core/qrCodeUtils.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/coreController.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/gatewayController.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/serverController.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/vpnConfigurationController.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/protocols_defs.cpp
|
|
${CLIENT_ROOT_DIR}/ui/qautostart.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/vpnprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/core/sshclient.cpp
|
|
${CLIENT_ROOT_DIR}/core/networkUtilities.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/outbound.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/inbound.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/ss.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/ssd.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/vless.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/trojan.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/vmess.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/vmess_new.cpp
|
|
${CLIENT_ROOT_DIR}/../common/logger/logger.cpp
|
|
${CLIENT_ROOT_DIR}/utils/qmlUtils.cpp
|
|
${CLIENT_ROOT_DIR}/core/api/apiUtils.cpp
|
|
${CLIENT_ROOT_DIR}/core/osSignalHandler.cpp
|
|
)
|
|
|
|
# Mozilla sources
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/mozilla/models/server.cpp
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.cpp
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.cpp
|
|
)
|
|
|
|
if(NOT IOS AND NOT MACOS_NE)
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.cpp
|
|
)
|
|
endif()
|
|
|
|
# Include native macOS platform helpers (dock/status-item)
|
|
if(APPLE AND NOT IOS)
|
|
list(APPEND HEADERS
|
|
${CLIENT_ROOT_DIR}/platforms/macos/macosutils.h
|
|
${CLIENT_ROOT_DIR}/platforms/macos/macosstatusicon.h
|
|
${CLIENT_ROOT_DIR}/ui/macos_util.h
|
|
)
|
|
list(APPEND SOURCES
|
|
${CLIENT_ROOT_DIR}/platforms/macos/macosutils.mm
|
|
${CLIENT_ROOT_DIR}/platforms/macos/macosstatusicon.mm
|
|
${CLIENT_ROOT_DIR}/ui/macos_util.mm
|
|
)
|
|
endif()
|
|
|
|
if(NOT ANDROID)
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/ui/notificationhandler.cpp
|
|
)
|
|
endif()
|
|
|
|
file(GLOB COMMON_FILES_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/*.h)
|
|
file(GLOB COMMON_FILES_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/*.cpp)
|
|
|
|
file(GLOB_RECURSE PAGE_LOGIC_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_logic/*.h)
|
|
file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_logic/*.cpp)
|
|
|
|
file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.h)
|
|
file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.cpp)
|
|
|
|
file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/models/*.h
|
|
${CLIENT_ROOT_DIR}/ui/models/protocols/*.h
|
|
${CLIENT_ROOT_DIR}/ui/models/services/*.h
|
|
${CLIENT_ROOT_DIR}/ui/models/api/*.h
|
|
)
|
|
file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/models/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/models/protocols/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/models/services/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/models/api/*.cpp
|
|
)
|
|
|
|
file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/controllers/*.h
|
|
${CLIENT_ROOT_DIR}/ui/controllers/api/*.h
|
|
)
|
|
file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/controllers/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/controllers/api/*.cpp
|
|
)
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${COMMON_FILES_H}
|
|
${PAGE_LOGIC_H}
|
|
${CONFIGURATORS_H}
|
|
${UI_MODELS_H}
|
|
${UI_CONTROLLERS_H}
|
|
)
|
|
set(SOURCES ${SOURCES}
|
|
${COMMON_FILES_CPP}
|
|
${PAGE_LOGIC_CPP}
|
|
${CONFIGURATORS_CPP}
|
|
${UI_MODELS_CPP}
|
|
${UI_CONTROLLERS_CPP}
|
|
)
|
|
|
|
if(WIN32)
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.h
|
|
)
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.cpp
|
|
)
|
|
|
|
set(RESOURCES ${RESOURCES}
|
|
${CMAKE_CURRENT_BINARY_DIR}/amneziavpn.rc
|
|
)
|
|
endif()
|
|
|
|
if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))
|
|
message("Client desktop build")
|
|
add_compile_definitions(AMNEZIA_DESKTOP)
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/core/ipcclient.h
|
|
${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.h
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/shadowsocksvpnprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/xrayprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/awgprotocol.h
|
|
${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.h
|
|
)
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/core/ipcclient.cpp
|
|
${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.cpp
|
|
${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/shadowsocksvpnprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/xrayprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/awgprotocol.cpp
|
|
)
|
|
endif()
|
|
|
|
if(APPLE AND MACOS_NE)
|
|
# Include only the tray notification handler in NE builds
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.h
|
|
)
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.cpp
|
|
)
|
|
endif()
|