diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 999c0ef..047c5b1 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "adler32" version = "1.0.4" @@ -127,7 +125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" dependencies = [ "backtrace-sys", - "cfg-if", + "cfg-if 0.1.10", "libc", "rustc-demangle", ] @@ -230,7 +228,7 @@ dependencies = [ "arrayref", "arrayvec", "cc", - "cfg-if", + "cfg-if 0.1.10", "constant_time_eq", "crypto-mac", "digest", @@ -330,6 +328,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chrono" version = "0.4.10" @@ -378,7 +382,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -394,7 +398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" dependencies = [ "autocfg 0.1.7", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -438,7 +442,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs-sys", ] @@ -448,7 +452,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_users", "winapi 0.3.8", @@ -523,7 +527,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi 0.3.8", @@ -541,7 +545,7 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crc32fast", "libc", "miniz_oxide", @@ -657,7 +661,7 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] @@ -861,9 +865,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.66" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libflate" @@ -912,7 +916,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "serde", ] @@ -974,7 +978,7 @@ version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", @@ -1044,7 +1048,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.8", ] @@ -1335,6 +1339,7 @@ dependencies = [ "lazy_static", "libc", "silentdragonxlitelib", + "socket2", ] [[package]] @@ -1849,7 +1854,7 @@ dependencies = [ [[package]] name = "silentdragonxlitelib" version = "0.1.0" -source = "git+https://git.hush.is/dragonx/silentdragonxlite-cli?rev=39ec5f36662ba7370dffa6c8346f93633dfa29ce#39ec5f36662ba7370dffa6c8346f93633dfa29ce" +source = "git+https://git.hush.is/dragonx/silentdragonxlite-cli?rev=3eaa2fcf939af9821df10b458af11b185f49e287#3eaa2fcf939af9821df10b458af11b185f49e287" dependencies = [ "base58", "bellman", @@ -1908,13 +1913,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.3.11" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", - "redox_syscall", "winapi 0.3.8", ] @@ -2011,7 +2015,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand 0.7.3", "redox_syscall", @@ -2367,7 +2371,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e213bd24252abeb86a0b7060e02df677d367ce6cb772cef17e9214b8390a8d3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "log", "tracing-attributes", "tracing-core", @@ -2507,7 +2511,7 @@ version = "0.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen-macro", ] diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 704af59..5db7be1 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -12,4 +12,5 @@ crate-type = ["staticlib"] libc = "0.2.58" lazy_static = "1.4.0" blake3 = "0.3.4" -silentdragonxlitelib = { git = "https://git.hush.is/dragonx/silentdragonxlite-cli", rev = "39ec5f36662ba7370dffa6c8346f93633dfa29ce" } +silentdragonxlitelib = { git = "https://git.hush.is/dragonx/silentdragonxlite-cli", rev = "3eaa2fcf939af9821df10b458af11b185f49e287" } +socket2 = "0.3.11" diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index edd8a0a..9d42b58 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -847,6 +847,10 @@ void MainWindow::setupSettingsModal() { // List of default servers settings.cmbServer->addItem("https://lite.dragonx.is"); + settings.cmbServer->addItem("https://lite1.dragonx.is"); + settings.cmbServer->addItem("https://lite2.dragonx.is"); + settings.cmbServer->addItem("https://lite3.dragonx.is"); + settings.cmbServer->addItem("https://lite4.dragonx.is"); settings.cmbServer->addItem("https://dragonlite.printogre.com"); //TODO: seperate lists of https/Tor servers, only show user or attempt diff --git a/src/settings.cpp b/src/settings.cpp index c048ce2..72e4e23 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -307,6 +307,10 @@ QString Settings::getRandomServer() { // The more servers from different TLDs, the better QList servers = { "https://lite.dragonx.is", + "https://lite1.dragonx.is", + "https://lite2.dragonx.is", + "https://lite3.dragonx.is", + "https://lite4.dragonx.is", "https://dragonlite.printogre.com" }; diff --git a/win-static-build.sh b/win-static-build.sh index 16ff3de..4f8b1c2 100755 --- a/win-static-build.sh +++ b/win-static-build.sh @@ -3,12 +3,12 @@ VERSION=$(cat src/version.h |cut -d\" -f2) echo "Compiling SilentDragonXLite $VERSION .exe with $JOBS threads..." -CONF=silentdragon-lite.pro +CONF=silentdragonx-lite.pro set -e echo 'source $HOME/.cargo/env' >> $HOME/.bashrc CC_x86_64_pc_windows_gnu="x86_64-w64-mingw32.static-gcc" -PATH="/home/$USER/git/mxe/usr/bin:${PATH}" +PATH="/home/$USER/mxe/usr/bin:${PATH}" if [ ! -d "release" ] then @@ -17,7 +17,7 @@ fi cp src/precompiled.h release/ qbuild () { - /home/$USER/git/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 $CONF CONFIG+=release + /home/$USER/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 $CONF CONFIG+=release #lupdate $CONF #lrelease $CONF