diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 0c1ec00d..ad9e0055 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -35,7 +35,7 @@ jobs: release_name: v1.6.6.${{ steps.date.outputs.today }} draft: false prerelease: false - body: "1. 适配OpenWrt的NAT\r\n2. 测试打包ipk\r\n3. 不要更新，不要更新，不要更新，请使用v1.6.5" + body: "1. 适配OpenWrt的NAT\r\n2. 打包ipk\r\n3. 修复首次启动网卡未启动bug" - name: publish projects run: ./publish.bat - name: upload-win-x86-oss diff --git a/publish.bat b/publish.bat index 71157799..4abf4480 100644 --- a/publish.bat +++ b/publish.bat @@ -25,7 +25,7 @@ for %%r in (win-x86,win-x64,win-arm64) do ( for %%r in (win-x86,win-x64,win-arm64,linux-x64,linux-arm,linux-arm64,linux-musl-x64,linux-musl-arm,linux-musl-arm64,osx-x64,osx-arm64) do ( - dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish/%%r/linker-%%r -r %%r -p:PublishSingleFile=true --self-contained true -p:TrimMode=partial -p:TieredPGO=true -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false + dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish/%%r/linker-%%r -r %%r -p:PublishSingleFile=true --self-contained true -p:TrimMode=partial -p:TieredPGO=true -p:DebugType=full -p:EventSourceSupport=false -p:DebugSymbols=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true -p:MetadataUpdaterSupport=false -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false echo F|xcopy "public\\extends\\%%r\\linker-%%r\\*" "public\\publish\\%%r\\linker-%%r\\*" /s /f /h /y echo F|xcopy "public\\extends\\any\\*" "public\\publish\\%%r\\linker-%%r\\*" /s /f /h /y diff --git a/src/linker.doc.web/docs/2、首次运行/2.3、安装方法（openwrt）.md b/src/linker.doc.web/docs/2、首次运行/2.3、安装方法（openwrt）.md index cf08a5c9..6182ae2f 100644 --- a/src/linker.doc.web/docs/2、首次运行/2.3、安装方法（openwrt）.md +++ b/src/linker.doc.web/docs/2、首次运行/2.3、安装方法（openwrt）.md @@ -9,6 +9,15 @@ sidebar_position: 2 1. 在 `System(系统)`、`Software(软件包)`、`Update Package(更新列表)`先更新一下 2. 下载对应架构的ipk文件，在`System(系统)`、`Software(软件包)`、`Upload Package(上传软件包)`上传ipk文件安装 3. 如果ui无法安装，或者安装失败，可以尝试使用命令安装，`opkg install --force-depends linker-xxx.ipk` 忽略依赖安装错误 + +``` +wget https://musl.libc.org/releases/musl-1.2.2.tar.gz +tar -xvzf musl-1.2.2.tar.gz +cd musl-1.2.2 +./configure +make +make install +``` ::: ## 2、手动 init.d diff --git a/src/linker.libs/linker.libs.csproj b/src/linker.libs/linker.libs.csproj index 63a2bd15..1060715f 100644 --- a/src/linker.libs/linker.libs.csproj +++ b/src/linker.libs/linker.libs.csproj @@ -23,8 +23,14 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.access/linker.messenger.access.csproj b/src/linker.messenger.access/linker.messenger.access.csproj index e74b63ad..b6f2e573 100644 --- a/src/linker.messenger.access/linker.messenger.access.csproj +++ b/src/linker.messenger.access/linker.messenger.access.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.action/linker.messenger.action.csproj b/src/linker.messenger.action/linker.messenger.action.csproj index 9be83052..bbc666d9 100644 --- a/src/linker.messenger.action/linker.messenger.action.csproj +++ b/src/linker.messenger.action/linker.messenger.action.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.api/linker.messenger.api.csproj b/src/linker.messenger.api/linker.messenger.api.csproj index d3f86288..19d49458 100644 --- a/src/linker.messenger.api/linker.messenger.api.csproj +++ b/src/linker.messenger.api/linker.messenger.api.csproj @@ -27,10 +27,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.channel/linker.messenger.channel.csproj b/src/linker.messenger.channel/linker.messenger.channel.csproj index ffb28982..9307b397 100644 --- a/src/linker.messenger.channel/linker.messenger.channel.csproj +++ b/src/linker.messenger.channel/linker.messenger.channel.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.decenter/linker.messenger.decenter.csproj b/src/linker.messenger.decenter/linker.messenger.decenter.csproj index 90226e2f..de9c2c52 100644 --- a/src/linker.messenger.decenter/linker.messenger.decenter.csproj +++ b/src/linker.messenger.decenter/linker.messenger.decenter.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.entry/linker.messenger.entry.csproj b/src/linker.messenger.entry/linker.messenger.entry.csproj index cf779645..2d67305c 100644 --- a/src/linker.messenger.entry/linker.messenger.entry.csproj +++ b/src/linker.messenger.entry/linker.messenger.entry.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.exroute/linker.messenger.exroute.csproj b/src/linker.messenger.exroute/linker.messenger.exroute.csproj index e8005601..178286b3 100644 --- a/src/linker.messenger.exroute/linker.messenger.exroute.csproj +++ b/src/linker.messenger.exroute/linker.messenger.exroute.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.flow/linker.messenger.flow.csproj b/src/linker.messenger.flow/linker.messenger.flow.csproj index efbd7405..0346b801 100644 --- a/src/linker.messenger.flow/linker.messenger.flow.csproj +++ b/src/linker.messenger.flow/linker.messenger.flow.csproj @@ -27,10 +27,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.forward/linker.messenger.forward.csproj b/src/linker.messenger.forward/linker.messenger.forward.csproj index 97861835..4c4f143e 100644 --- a/src/linker.messenger.forward/linker.messenger.forward.csproj +++ b/src/linker.messenger.forward/linker.messenger.forward.csproj @@ -27,10 +27,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.listen/linker.messenger.listen.csproj b/src/linker.messenger.listen/linker.messenger.listen.csproj index 646a2a77..4f6b3a7d 100644 --- a/src/linker.messenger.listen/linker.messenger.listen.csproj +++ b/src/linker.messenger.listen/linker.messenger.listen.csproj @@ -27,10 +27,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.logger/linker.messenger.logger.csproj b/src/linker.messenger.logger/linker.messenger.logger.csproj index 768bc188..ca5681fe 100644 --- a/src/linker.messenger.logger/linker.messenger.logger.csproj +++ b/src/linker.messenger.logger/linker.messenger.logger.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.pcp/linker.messenger.pcp.csproj b/src/linker.messenger.pcp/linker.messenger.pcp.csproj index e8badd8f..a3385a6b 100644 --- a/src/linker.messenger.pcp/linker.messenger.pcp.csproj +++ b/src/linker.messenger.pcp/linker.messenger.pcp.csproj @@ -27,10 +27,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.relay/linker.messenger.relay.csproj b/src/linker.messenger.relay/linker.messenger.relay.csproj index 3b9c7078..80c186e8 100644 --- a/src/linker.messenger.relay/linker.messenger.relay.csproj +++ b/src/linker.messenger.relay/linker.messenger.relay.csproj @@ -28,10 +28,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.serializer.aot/linker.messenger.serializer.aot.csproj b/src/linker.messenger.serializer.aot/linker.messenger.serializer.aot.csproj index 46310f67..76f013dd 100644 --- a/src/linker.messenger.serializer.aot/linker.messenger.serializer.aot.csproj +++ b/src/linker.messenger.serializer.aot/linker.messenger.serializer.aot.csproj @@ -26,8 +26,14 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj b/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj index 6b7393dc..1d93bf4a 100644 --- a/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj +++ b/src/linker.messenger.serializer.memorypack/linker.messenger.serializer.memorypack.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.sforward/linker.messenger.sforward.csproj b/src/linker.messenger.sforward/linker.messenger.sforward.csproj index b596d94d..6c58afb4 100644 --- a/src/linker.messenger.sforward/linker.messenger.sforward.csproj +++ b/src/linker.messenger.sforward/linker.messenger.sforward.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.signin/linker.messenger.signin.csproj b/src/linker.messenger.signin/linker.messenger.signin.csproj index 3323656c..1647e3cc 100644 --- a/src/linker.messenger.signin/linker.messenger.signin.csproj +++ b/src/linker.messenger.signin/linker.messenger.signin.csproj @@ -27,10 +27,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.socks5/linker.messenger.socks5.csproj b/src/linker.messenger.socks5/linker.messenger.socks5.csproj index 50b90410..b86d8db0 100644 --- a/src/linker.messenger.socks5/linker.messenger.socks5.csproj +++ b/src/linker.messenger.socks5/linker.messenger.socks5.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.store.file/linker.messenger.store.file.csproj b/src/linker.messenger.store.file/linker.messenger.store.file.csproj index 4e2bc0cb..c3d4c167 100644 --- a/src/linker.messenger.store.file/linker.messenger.store.file.csproj +++ b/src/linker.messenger.store.file/linker.messenger.store.file.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.sync/linker.messenger.sync.csproj b/src/linker.messenger.sync/linker.messenger.sync.csproj index 48debd50..e2999bc3 100644 --- a/src/linker.messenger.sync/linker.messenger.sync.csproj +++ b/src/linker.messenger.sync/linker.messenger.sync.csproj @@ -28,10 +28,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj b/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj index 66c778fc..869b40dd 100644 --- a/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj +++ b/src/linker.messenger.tunnel/linker.messenger.tunnel.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.tuntap/TuntapAdapter.cs b/src/linker.messenger.tuntap/TuntapAdapter.cs index e4206c08..8cc23246 100644 --- a/src/linker.messenger.tuntap/TuntapAdapter.cs +++ b/src/linker.messenger.tuntap/TuntapAdapter.cs @@ -46,12 +46,12 @@ namespace linker.messenger.tuntap //隧道回调 tuntapProxy.Callback = this; - CheckDeviceTask(); } private ulong configVersion = 0; + private ulong firstTimes = 0; private OperatingManager checking = new OperatingManager(); private void CheckDeviceTask() { @@ -76,8 +76,9 @@ namespace linker.messenger.tuntap } //配置发生变化，或者网卡不可用 - if (tuntapConfigTransfer.Version.Eq(configVersion, out ulong version) == false || await tuntapTransfer.CheckAvailable() == false) + if (tuntapConfigTransfer.Version.Eq(configVersion, out ulong version) == false || firstTimes == 0 || await tuntapTransfer.CheckAvailable() == false) { + firstTimes++; if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) LoggerHelper.Instance.Warning($"tuntap config version changed, restarting device"); configVersion = version; diff --git a/src/linker.messenger.tuntap/TuntapConfigTransfer.cs b/src/linker.messenger.tuntap/TuntapConfigTransfer.cs index 2e09d729..10dfe323 100644 --- a/src/linker.messenger.tuntap/TuntapConfigTransfer.cs +++ b/src/linker.messenger.tuntap/TuntapConfigTransfer.cs @@ -31,6 +31,7 @@ namespace linker.messenger.tuntap this.tuntapStore = tuntapStore; this.leaseClientTreansfer = leaseClientTreansfer; this.signInClientStore = signInClientStore; + } /// diff --git a/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj b/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj index 1b8f75a7..dc74827e 100644 --- a/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj +++ b/src/linker.messenger.tuntap/linker.messenger.tuntap.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger.updater/UpdaterClientTransfer.cs b/src/linker.messenger.updater/UpdaterClientTransfer.cs index 21ccf606..0bb8d86f 100644 --- a/src/linker.messenger.updater/UpdaterClientTransfer.cs +++ b/src/linker.messenger.updater/UpdaterClientTransfer.cs @@ -125,7 +125,8 @@ namespace linker.messenger.updater { if (updaterCommonTransfer.CheckUpdate) { - LoggerHelper.Instance.Info($"auto check update"); + if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG) + LoggerHelper.Instance.Info($"auto check update"); await updaterHelper.GetUpdateInfo(updateInfo); } return true; diff --git a/src/linker.messenger.updater/linker.messenger.updater.csproj b/src/linker.messenger.updater/linker.messenger.updater.csproj index 1f7bb826..641dd5c2 100644 --- a/src/linker.messenger.updater/linker.messenger.updater.csproj +++ b/src/linker.messenger.updater/linker.messenger.updater.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.messenger/linker.messenger.csproj b/src/linker.messenger/linker.messenger.csproj index 97bbdb99..1ac089dd 100644 --- a/src/linker.messenger/linker.messenger.csproj +++ b/src/linker.messenger/linker.messenger.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.tun/linker.tun.csproj b/src/linker.tun/linker.tun.csproj index 1e565a5f..02a69628 100644 --- a/src/linker.tun/linker.tun.csproj +++ b/src/linker.tun/linker.tun.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker.tunnel/linker.tunnel.csproj b/src/linker.tunnel/linker.tunnel.csproj index 60a6be49..b5396772 100644 --- a/src/linker.tunnel/linker.tunnel.csproj +++ b/src/linker.tunnel/linker.tunnel.csproj @@ -26,10 +26,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/src/linker/linker.csproj b/src/linker/linker.csproj index 73aa95ed..58deae75 100644 --- a/src/linker/linker.csproj +++ b/src/linker/linker.csproj @@ -21,8 +21,8 @@ snltty snltty 1. 适配OpenWrt的NAT -2. 测试打包ipk -3. 不要更新，不要更新，不要更新，请使用v1.6.5 +2. 打包ipk +3. 修复首次启动网卡未启动bug snltty https://github.com/snltty/linker https://github.com/snltty/linker @@ -39,10 +39,16 @@ true - none - false + full + true True + + embedded + + + embedded + diff --git a/version.txt b/version.txt index 94bcb4c6..757da699 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ v1.6.6 -2025-02-07 21:58:55 +2025-02-08 15:42:31 1. 适配OpenWrt的NAT -2. 测试打包ipk -3. 不要更新，不要更新，不要更新，请使用v1.6.5 \ No newline at end of file +2. 打包ipk +3. 修复首次启动网卡未启动bug \ No newline at end of file