mirror of
https://github.com/snltty/linker.git
synced 2025-10-30 04:02:13 +08:00
167
This commit is contained in:
snltty
8
.github/workflows/docker.yml
vendored
8
.github/workflows/docker.yml
vendored
@@ -57,9 +57,9 @@ jobs:
|
||||
docker tag snltty/linker-musl-x64:latest snltty/linker-musl:amd64 && \
|
||||
docker push snltty/linker-musl:amd64 && \
|
||||
docker manifest create snltty/linker-musl:latest snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
|
||||
docker manifest create snltty/linker-musl:v1.6.6 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
|
||||
docker manifest create snltty/linker-musl:v1.6.7 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
|
||||
docker manifest push snltty/linker-musl:latest && \
|
||||
docker manifest push snltty/linker-musl:v1.6.6 && \
|
||||
docker manifest push snltty/linker-musl:v1.6.7 && \
|
||||
docker pull --platform linux/arm/v7 snltty/linker-debian-arm:latest && \
|
||||
docker tag snltty/linker-debian-arm:latest snltty/linker-debian:arm && \
|
||||
docker push snltty/linker-debian:arm && \
|
||||
@@ -70,6 +70,6 @@ jobs:
|
||||
docker tag snltty/linker-debian-x64:latest snltty/linker-debian:amd64 && \
|
||||
docker push snltty/linker-debian:amd64 && \
|
||||
docker manifest create snltty/linker-debian:latest snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
|
||||
docker manifest create snltty/linker-debian:v1.6.6 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
|
||||
docker manifest create snltty/linker-debian:v1.6.7 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
|
||||
docker manifest push snltty/linker-debian:latest && \
|
||||
docker manifest push snltty/linker-debian:v1.6.6
|
||||
docker manifest push snltty/linker-debian:v1.6.7
|
||||
30
.github/workflows/dotnet.yml
vendored
30
.github/workflows/dotnet.yml
vendored
@@ -31,11 +31,11 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
||||
with:
|
||||
tag_name: v1.6.6
|
||||
release_name: v1.6.6.${{ steps.date.outputs.today }}
|
||||
tag_name: v1.6.7
|
||||
release_name: v1.6.7.${{ steps.date.outputs.today }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
body: "1. 适配OpenWrt的NAT\r\n2. 打包ipk\r\n3. 修复首次启动网卡未启动bug\r\n4. 设置工作目录\r\n5. 接口密码BUG\r\n6. 自定义网卡名\r\n7. 可禁用NAT\r\n8. 修复网卡端口转发BUG"
|
||||
body: "1. 修复首次启动网卡未启动bug\r\n2. 自定义网卡名\r\n3. 可禁用NAT\r\n4. 修复网卡端口转发BUG"
|
||||
- name: publish projects
|
||||
run: ./publish.bat
|
||||
- name: upload-win-x86-oss
|
||||
@@ -47,7 +47,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-win-x86.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-win-x86.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-win-x86.zip
|
||||
- name: upload-win-x86
|
||||
id: upload-win-x86
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -67,7 +67,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-win-x64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-win-x64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-win-x64.zip
|
||||
- name: upload-win-x64
|
||||
id: upload-win-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -87,7 +87,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-win-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-win-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-win-arm64.zip
|
||||
- name: upload-win-arm64
|
||||
id: upload-win-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -107,7 +107,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-linux-x64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-linux-x64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-linux-x64.zip
|
||||
- name: upload-linux-x64
|
||||
id: upload-linux-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -127,7 +127,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-linux-arm.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-linux-arm.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-linux-arm.zip
|
||||
- name: upload-linux-arm
|
||||
id: upload-linux-arm
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -147,7 +147,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-linux-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-linux-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-linux-arm64.zip
|
||||
- name: upload-linux-arm64
|
||||
id: upload-linux-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -167,7 +167,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-linux-musl-x64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-linux-musl-x64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-linux-musl-x64.zip
|
||||
- name: upload-linux-musl-x64
|
||||
id: upload-linux-musl-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -187,7 +187,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-linux-musl-arm.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-linux-musl-arm.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-linux-musl-arm.zip
|
||||
- name: upload-linux-musl-arm
|
||||
id: upload-linux-musl-arm
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -207,7 +207,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-linux-musl-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-linux-musl-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-linux-musl-arm64.zip
|
||||
- name: upload-linux-musl-arm64
|
||||
id: upload-linux-musl-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -227,7 +227,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-osx-x64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-osx-x64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-osx-x64.zip
|
||||
- name: upload-osx-x64
|
||||
id: upload-osx-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -247,7 +247,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-osx-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-osx-arm64.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-osx-arm64.zip
|
||||
- name: upload-osx-arm64
|
||||
id: upload-osx-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -277,7 +277,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker-windows-route.zip
|
||||
target-path: /downloads/linker/v1.6.6/linker-windows-route.zip
|
||||
target-path: /downloads/linker/v1.6.7/linker-windows-route.zip
|
||||
- name: upload-version-oss
|
||||
id: upload-version-oss
|
||||
uses: tvrcgo/oss-action@v0.1.1
|
||||
|
||||
6
.github/workflows/ipk.yml
vendored
6
.github/workflows/ipk.yml
vendored
@@ -44,7 +44,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-ipk/x64/linker-x64.ipk
|
||||
target-path: /downloads/linker/v1.6.6/linker-x64.ipk
|
||||
target-path: /downloads/linker/v1.6.7/linker-x64.ipk
|
||||
- name: upload-x64
|
||||
id: upload-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-ipk/arm/linker-arm.ipk
|
||||
target-path: /downloads/linker/v1.6.6/linker-arm.ipk
|
||||
target-path: /downloads/linker/v1.6.7/linker-arm.ipk
|
||||
- name: upload-arm
|
||||
id: upload-arm
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -84,7 +84,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-ipk/arm64/linker-arm64.ipk
|
||||
target-path: /downloads/linker/v1.6.6/linker-arm64.ipk
|
||||
target-path: /downloads/linker/v1.6.7/linker-arm64.ipk
|
||||
- name: upload-arm64
|
||||
id: upload-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
|
||||
52
.github/workflows/nuget.yml
vendored
52
.github/workflows/nuget.yml
vendored
@@ -79,29 +79,29 @@ jobs:
|
||||
|
||||
- name: Push
|
||||
run: |
|
||||
dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger/bin/release/linker.messenger.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.access/bin/release/linker.messenger.access.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.action/bin/release/linker.messenger.action.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.api/bin/release/linker.messenger.api.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.channel/bin/release/linker.messenger.channel.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.decenter/bin/release/linker.messenger.decenter.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.entry/bin/release/linker.messenger.entry.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.exroute/bin/release/linker.messenger.exroute.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.flow/bin/release/linker.messenger.flow.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.forward/bin/release/linker.messenger.forward.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.listen/bin/release/linker.messenger.listen.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.logger/bin/release/linker.messenger.logger.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.socks5/bin/release/linker.messenger.socks5.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.store.file/bin/release/linker.messenger.store.file.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sync/bin/release/linker.messenger.sync.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.updater/bin/release/linker.messenger.updater.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tun/bin/release/linker.tun.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tunnel/bin/release/linker.tunnel.1.6.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger/bin/release/linker.messenger.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.access/bin/release/linker.messenger.access.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.action/bin/release/linker.messenger.action.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.api/bin/release/linker.messenger.api.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.channel/bin/release/linker.messenger.channel.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.decenter/bin/release/linker.messenger.decenter.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.entry/bin/release/linker.messenger.entry.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.exroute/bin/release/linker.messenger.exroute.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.flow/bin/release/linker.messenger.flow.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.forward/bin/release/linker.messenger.forward.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.listen/bin/release/linker.messenger.listen.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.logger/bin/release/linker.messenger.logger.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.socks5/bin/release/linker.messenger.socks5.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.store.file/bin/release/linker.messenger.store.file.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sync/bin/release/linker.messenger.sync.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.updater/bin/release/linker.messenger.updater.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tun/bin/release/linker.tun.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tunnel/bin/release/linker.tunnel.1.6.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
|
||||
@@ -33,16 +33,16 @@ do
|
||||
fi
|
||||
done
|
||||
cd public/publish/docker/linux-${p}-x64/${f}
|
||||
docker buildx build -f ${target}/public/publish/docker/linux-${p}-x64/${f}/Dockerfile-${p} --platform="linux/x86_64" --force-rm -t "${image}-${p}-x64:latest" -t "${image}-${p}-x64:v1.6.6" . --push
|
||||
docker buildx build -f ${target}/public/publish/docker/linux-${p}-x64/${f}/Dockerfile-${p} --platform="linux/x86_64" --force-rm -t "${image}-${p}-x64:latest" -t "${image}-${p}-x64:v1.6.7" . --push
|
||||
cd ../../../../../
|
||||
|
||||
|
||||
cd public/publish/docker/linux-${p}-arm64/${f}
|
||||
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm64/${f}/Dockerfile-${p} --platform="linux/arm64" --force-rm -t "${image}-${p}-arm64:latest" -t "${image}-${p}-arm64:v1.6.6" . --push
|
||||
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm64/${f}/Dockerfile-${p} --platform="linux/arm64" --force-rm -t "${image}-${p}-arm64:latest" -t "${image}-${p}-arm64:v1.6.7" . --push
|
||||
cd ../../../../../
|
||||
|
||||
cd public/publish/docker/linux-${p}-arm/${f}
|
||||
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm/${f}/Dockerfile-${p} --platform="linux/arm/v7" --force-rm -t "${image}-${p}-arm:latest" -t "${image}-${p}-arm:v1.6.6" . --push
|
||||
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm/${f}/Dockerfile-${p} --platform="linux/arm/v7" --force-rm -t "${image}-${p}-arm:latest" -t "${image}-${p}-arm:v1.6.7" . --push
|
||||
cd ../../../../../
|
||||
done
|
||||
done
|
||||
@@ -22,7 +22,7 @@ do
|
||||
mkdir -p public/publish-ipk/${r}/data/usr/bin/linker
|
||||
cp -rf public/publish/${r}/* public/publish-ipk/${r}/data/usr/bin/linker/
|
||||
|
||||
sed -i "s|{version}|1.6.6|g" public/publish-ipk/${r}/control/control
|
||||
sed -i "s|{version}|1.6.7|g" public/publish-ipk/${r}/control/control
|
||||
sed -i 's/\r$//' public/publish-ipk/${r}/data/etc/init.d/linker
|
||||
sed -i 's/\r$//' public/publish-ipk/${r}/control/control
|
||||
sed -i 's/\r$//' public/publish-ipk/${r}/control/postinst
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
<Copyright>snltty</Copyright>
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<DebugType>full</DebugType>
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger api access</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger api action</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger api</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger channel</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger decenter</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger entry</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger exroute</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger flow</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger forward</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger listen</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger logger</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger pcp</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger relay</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger serializer aot</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger serializer memorypack</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger sforward</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger signin</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger socks5</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger store file</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger sync</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger tunnel</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -37,6 +37,7 @@ namespace linker.messenger.tuntap
|
||||
//网卡状态发生变化，同步一下信息
|
||||
tuntapTransfer.OnSetupBefore += () =>
|
||||
{
|
||||
tuntapConfigTransfer.SetRunning(true);
|
||||
tuntapDecenter.Refresh();
|
||||
if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
|
||||
LoggerHelper.Instance.Warning("tuntap setup before");
|
||||
@@ -50,7 +51,6 @@ namespace linker.messenger.tuntap
|
||||
tuntapTransfer.OnSetupSuccess += () =>
|
||||
{
|
||||
AddForward();
|
||||
tuntapConfigTransfer.SetRunning(true);
|
||||
};
|
||||
tuntapTransfer.OnShutdownBefore += () =>
|
||||
{
|
||||
@@ -60,9 +60,10 @@ namespace linker.messenger.tuntap
|
||||
};
|
||||
tuntapTransfer.OnShutdownAfter += () =>
|
||||
{
|
||||
tuntapDecenter.Refresh(); DeleteForward(); tuntapConfigTransfer.SetRunning(false);
|
||||
tuntapDecenter.Refresh(); DeleteForward();
|
||||
if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
|
||||
LoggerHelper.Instance.Warning("tuntap shutdown after");
|
||||
tuntapConfigTransfer.SetRunning(false);
|
||||
};
|
||||
|
||||
//配置有更新，去同步一下
|
||||
@@ -177,10 +178,13 @@ namespace linker.messenger.tuntap
|
||||
tuntapTransfer.RemoveForward(removes.ToList());
|
||||
}
|
||||
forwardItems = temp;
|
||||
if (tuntapTransfer.Status != TuntapStatus.Normal)
|
||||
{
|
||||
if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
|
||||
LoggerHelper.Instance.Debug($"add tuntap forward {forwardItems.ToJson()}");
|
||||
tuntapTransfer.AddForward(forwardItems);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 删除端口转发
|
||||
/// </summary>
|
||||
|
||||
@@ -51,13 +51,13 @@ namespace linker.messenger.tuntap
|
||||
}
|
||||
TimerHelper.Async(() =>
|
||||
{
|
||||
OnSetupBefore();
|
||||
try
|
||||
{
|
||||
if (ip.Equals(IPAddress.Any))
|
||||
{
|
||||
return;
|
||||
}
|
||||
OnSetupBefore();
|
||||
linkerTunDeviceAdapter.Setup(name, ip, prefixLength, 1400);
|
||||
if (string.IsNullOrWhiteSpace(linkerTunDeviceAdapter.SetupError) == false)
|
||||
{
|
||||
@@ -81,8 +81,9 @@ namespace linker.messenger.tuntap
|
||||
}
|
||||
finally
|
||||
{
|
||||
operatingManager.StopOperation();
|
||||
|
||||
OnSetupAfter();
|
||||
operatingManager.StopOperation();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -112,8 +113,8 @@ namespace linker.messenger.tuntap
|
||||
}
|
||||
finally
|
||||
{
|
||||
operatingManager.StopOperation();
|
||||
OnShutdownAfter();
|
||||
operatingManager.StopOperation();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger tuntap</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -125,8 +125,6 @@ namespace linker.messenger.updater
|
||||
{
|
||||
if (updaterCommonTransfer.CheckUpdate)
|
||||
{
|
||||
if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
|
||||
LoggerHelper.Instance.Info($"auto check update");
|
||||
await updaterHelper.GetUpdateInfo(updateInfo);
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger updater</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -19,14 +19,14 @@ namespace linker.tun
|
||||
public string NatError => natError;
|
||||
|
||||
|
||||
private uint operating = 0;
|
||||
private OperatingManager operatingManager = new OperatingManager();
|
||||
public LinkerTunDeviceStatus Status
|
||||
{
|
||||
get
|
||||
{
|
||||
if (linkerTunDevice == null) return LinkerTunDeviceStatus.Normal;
|
||||
|
||||
return operating == 1
|
||||
return operatingManager.Operating
|
||||
? LinkerTunDeviceStatus.Operating
|
||||
: linkerTunDevice.Running
|
||||
? LinkerTunDeviceStatus.Running
|
||||
@@ -42,7 +42,7 @@ namespace linker.tun
|
||||
/// 初始化
|
||||
/// </summary>
|
||||
/// <param name="linkerTunDeviceCallback">读取数据回调</param>
|
||||
public void Initialize( ILinkerTunDeviceCallback linkerTunDeviceCallback)
|
||||
public void Initialize(ILinkerTunDeviceCallback linkerTunDeviceCallback)
|
||||
{
|
||||
this.linkerTunDeviceCallback = linkerTunDeviceCallback;
|
||||
if (linkerTunDevice == null)
|
||||
@@ -73,7 +73,7 @@ namespace linker.tun
|
||||
/// <param name="mtu">mtu</param>
|
||||
public bool Setup(string deviceName, IPAddress address, byte prefixLength, int mtu)
|
||||
{
|
||||
if (Interlocked.CompareExchange(ref operating, 1, 0) == 1)
|
||||
if (operatingManager.StartOperation() == false)
|
||||
{
|
||||
setupError = $"setup are operating";
|
||||
return false;
|
||||
@@ -85,23 +85,22 @@ namespace linker.tun
|
||||
setupError = $"{System.Runtime.InteropServices.RuntimeInformation.OSDescription} not support";
|
||||
return false;
|
||||
}
|
||||
linkerTunDevice.Setup(deviceName,address, NetworkHelper.ToGatewayIP(address, prefixLength), prefixLength, out setupError);
|
||||
linkerTunDevice.Setup(deviceName, address, NetworkHelper.ToGatewayIP(address, prefixLength), prefixLength, out setupError);
|
||||
if (string.IsNullOrWhiteSpace(setupError) == false)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
//mtu = 4 * 1024 - 4;
|
||||
linkerTunDevice.SetMtu(mtu);
|
||||
Read();
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
setupError = ex + "";
|
||||
setupError = ex.Message;
|
||||
}
|
||||
finally
|
||||
{
|
||||
Interlocked.Exchange(ref operating, 0);
|
||||
operatingManager.StopOperation();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -111,7 +110,7 @@ namespace linker.tun
|
||||
/// </summary>
|
||||
public bool Shutdown()
|
||||
{
|
||||
if (Interlocked.CompareExchange(ref operating, 1, 0) == 1)
|
||||
if (operatingManager.StartOperation() == false)
|
||||
{
|
||||
setupError = $"shutdown are operating";
|
||||
return false;
|
||||
@@ -124,10 +123,11 @@ namespace linker.tun
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
|
||||
finally
|
||||
{
|
||||
operatingManager.StopOperation();
|
||||
}
|
||||
setupError = string.Empty;
|
||||
Interlocked.Exchange(ref operating, 0);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker tun</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -165,13 +165,7 @@ namespace linker.tunnel.connection
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
callback.Receive(this, packet, this.userToken);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
await callback.Receive(this, packet, this.userToken);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -178,13 +178,7 @@ namespace linker.tunnel.connection
|
||||
return;
|
||||
}
|
||||
}
|
||||
try
|
||||
{
|
||||
callback.Receive(this, packet, this.userToken);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
await callback.Receive(this, packet, this.userToken);
|
||||
}
|
||||
|
||||
private async Task ProcessHeart()
|
||||
|
||||
@@ -153,8 +153,6 @@ namespace linker.tunnel.connection
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
if (SSL)
|
||||
{
|
||||
@@ -162,11 +160,7 @@ namespace linker.tunnel.connection
|
||||
packet = Crypto.Decode(decodeBuffer, 0, packet.Length);
|
||||
}
|
||||
|
||||
callback.Receive(this, packet.Slice(4), this.userToken);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
await callback.Receive(this, packet.Slice(4), this.userToken);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker tunnel</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -20,21 +20,17 @@
|
||||
<Title>linker</Title>
|
||||
<Authors>snltty</Authors>
|
||||
<Company>snltty</Company>
|
||||
<Description>1. 适配OpenWrt的NAT
|
||||
2. 打包ipk
|
||||
3. 修复首次启动网卡未启动bug
|
||||
4. 设置工作目录
|
||||
5. 接口密码BUG
|
||||
6. 自定义网卡名
|
||||
7. 可禁用NAT
|
||||
8. 修复网卡端口转发BUG</Description>
|
||||
<Description>1. 修复首次启动网卡未启动bug
|
||||
2. 自定义网卡名
|
||||
3. 可禁用NAT
|
||||
4. 修复网卡端口转发BUG</Description>
|
||||
<Copyright>snltty</Copyright>
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker</PackageReleaseNotes>
|
||||
<Version>1.6.6</Version>
|
||||
<AssemblyVersion>1.6.6</AssemblyVersion>
|
||||
<FileVersion>1.6.6</FileVersion>
|
||||
<Version>1.6.7</Version>
|
||||
<AssemblyVersion>1.6.7</AssemblyVersion>
|
||||
<FileVersion>1.6.7</FileVersion>
|
||||
<DelaySign>False</DelaySign>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
16
version.txt
16
version.txt
@@ -1,10 +1,6 @@
|
||||
v1.6.6
|
||||
2025-02-14 16:16:47
|
||||
1. 适配OpenWrt的NAT
|
||||
2. 打包ipk
|
||||
3. 修复首次启动网卡未启动bug
|
||||
4. 设置工作目录
|
||||
5. 接口密码BUG
|
||||
6. 自定义网卡名
|
||||
7. 可禁用NAT
|
||||
8. 修复网卡端口转发BUG
|
||||
v1.6.7
|
||||
2025-02-15 15:27:23
|
||||
1. 修复首次启动网卡未启动bug
|
||||
2. 自定义网卡名
|
||||
3. 可禁用NAT
|
||||
4. 修复网卡端口转发BUG
|
||||
Reference in New Issue
Block a user