Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: linux external tun

Browse Source
This commit is contained in:
armv9
2024-07-03 16:55:16 +09:00
parent cd9bb8f72d
commit 7c783308a7
4 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/ConfigBuilder.cpp
View File

@@ -777,7 +777,7 @@ namespace NekoGui {
return QFileInfo(file).absoluteFilePath(); return QFileInfo(file).absoluteFilePath();
} }
QString WriteVPNLinuxScript(const QString &protectPath, const QString &configPath) { QString WriteVPNLinuxScript(const QString &configPath) {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return {}; return {};
#endif #endif
@@ -786,9 +786,7 @@ namespace NekoGui {
if (QFile::exists("vpn/vpn-run-root.sh")) scriptFn = "vpn/vpn-run-root.sh"; if (QFile::exists("vpn/vpn-run-root.sh")) scriptFn = "vpn/vpn-run-root.sh";
auto script = ReadFileText(scriptFn) auto script = ReadFileText(scriptFn)
.replace("./nekobox_core", QApplication::applicationDirPath() + "/nekobox_core") .replace("./nekobox_core", QApplication::applicationDirPath() + "/nekobox_core")
.replace("$PROTECT_LISTEN_PATH", protectPath) .replace("$CONFIG_PATH", configPath);
.replace("$CONFIG_PATH", configPath)
.replace("$TABLE_FWMARK", "514");
// write script // write script
QFile file2; QFile file2;
file2.setFileName(QFileInfo(scriptFn).fileName()); file2.setFileName(QFileInfo(scriptFn).fileName());

2
db/ConfigBuilder.hpp
View File

@@ -55,5 +55,5 @@ namespace NekoGui {
QString WriteVPNSingBoxConfig(); QString WriteVPNSingBoxConfig();
QString WriteVPNLinuxScript(const QString &protectPath, const QString &configPath); QString WriteVPNLinuxScript(const QString &configPath);
} // namespace NekoGui } // namespace NekoGui

19
res/vpn/vpn-run-root.sh
View File

@@ -6,40 +6,25 @@ if [ "$EUID" -ne 0 ]; then
echo "[Warning] Tun script not running as root" echo "[Warning] Tun script not running as root"
fi fi
if [ "$(uname)" == "Darwin" ]; then
IS_MACOS=1
fi
[ -z $TABLE_FWMARK ] && echo "Please set env TABLE_FWMARK" && exit
command -v pkill >/dev/null 2>&1 || echo "[Warning] pkill not found" command -v pkill >/dev/null 2>&1 || echo "[Warning] pkill not found"
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
cd $BASEDIR cd $BASEDIR
pre_start_linux() { pre_start_linux() {
# set bypass: fwmark
ip rule add pref 8999 fwmark $TABLE_FWMARK table main || return
ip -6 rule add pref 8999 fwmark $TABLE_FWMARK table main || return
# for Tun2Socket # for Tun2Socket
iptables -I INPUT -s 172.19.0.2 -d 172.19.0.1 -p tcp -j ACCEPT iptables -I INPUT -s 172.19.0.2 -d 172.19.0.1 -p tcp -j ACCEPT
ip6tables -I INPUT -s fdfe:dcba:9876::2 -d fdfe:dcba:9876::1 -p tcp -j ACCEPT ip6tables -I INPUT -s fdfe:dcba:9876::2 -d fdfe:dcba:9876::1 -p tcp -j ACCEPT
} }
start() { start() {
[ -z $IS_MACOS ] && pre_start_linux pre_start_linux
"./nekobox_core" run -c "$CONFIG_PATH" --protect-listen-path "$PROTECT_LISTEN_PATH" --protect-fwmark $TABLE_FWMARK "./nekobox_core" run -c "$CONFIG_PATH"
} }
stop() { stop() {
[ -z $IS_MACOS ] || return
for local in $BYPASS_IPS; do
ip rule del to $local table main
done
iptables -D INPUT -s 172.19.0.2 -d 172.19.0.1 -p tcp -j ACCEPT iptables -D INPUT -s 172.19.0.2 -d 172.19.0.1 -p tcp -j ACCEPT
ip6tables -D INPUT -s fdfe:dcba:9876::2 -d fdfe:dcba:9876::1 -p tcp -j ACCEPT ip6tables -D INPUT -s fdfe:dcba:9876::2 -d fdfe:dcba:9876::1 -p tcp -j ACCEPT
ip rule del fwmark $TABLE_FWMARK
ip -6 rule del fwmark $TABLE_FWMARK
} }
if [ "$1" != "stop" ]; then if [ "$1" != "stop" ]; then

8
ui/mainwindow.cpp
View File

@@ -1776,9 +1776,8 @@ bool MainWindow::StartVPNProcess() {
return true; return true;
} }
// //
auto protectPath = QDir::currentPath() + "/protect";
auto configPath = NekoGui::WriteVPNSingBoxConfig(); auto configPath = NekoGui::WriteVPNSingBoxConfig();
auto scriptPath = NekoGui::WriteVPNLinuxScript(protectPath, configPath); auto scriptPath = NekoGui::WriteVPNLinuxScript(configPath);
// //
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
runOnNewThread([=] { runOnNewThread([=] {
@@ -1790,11 +1789,6 @@ bool MainWindow::StartVPNProcess() {
runOnUiThread([=] { neko_set_spmode_vpn(false); }); runOnUiThread([=] { neko_set_spmode_vpn(false); });
}); });
#else #else
QFile::remove(protectPath);
if (QFile::exists(protectPath)) {
MessageBoxWarning("Error", "protect cannot be removed");
return false;
}
// //
auto vpn_process = new QProcess; auto vpn_process = new QProcess;
QProcess::connect(vpn_process, &QProcess::stateChanged, this, [=](QProcess::ProcessState state) { QProcess::connect(vpn_process, &QProcess::stateChanged, this, [=](QProcess::ProcessState state) {