Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: editso/fuso
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.4-alpha
Choose a base ref
...
head repository: editso/fuso
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Dec 9, 2021

  1. 修复bug

    editso committed Dec 9, 2021
    Copy the full SHA
    a07af23 View commit details
  2. Merge pull request #13 from editso/dev

    修复加密导致数据传输不完整问题
    editso authored Dec 9, 2021
    Copy the full SHA
    45f238d View commit details

Commits on Dec 10, 2021

  1. 独立udp转发 & 修改符号

    editso committed Dec 10, 2021
    Copy the full SHA
    b1fe446 View commit details
  2. Merge pull request #14 from editso/dev

    独立udp转发 & 修改符号
    editso authored Dec 10, 2021
    Copy the full SHA
    34930fb View commit details

Commits on Dec 13, 2021

  1. 更新readme

    editso committed Dec 13, 2021
    Copy the full SHA
    aac3cdc View commit details
  2. Copy the full SHA
    cdc05b8 View commit details
  3. 更新readme

    editso committed Dec 13, 2021
    Copy the full SHA
    34c7742 View commit details
  4. Merge pull request #16 from editso/dev

    Dev
    editso authored Dec 13, 2021
    Copy the full SHA
    06dd56e View commit details
  5. 添加认证方式

    editso committed Dec 13, 2021
    Copy the full SHA
    31d435e View commit details
  6. Copy the full SHA
    09eda31 View commit details

Commits on Dec 15, 2021

  1. Copy the full SHA
    7368287 View commit details
  2. Merge pull request #17 from editso/dev

    实现会话rsa加密
    editso authored Dec 15, 2021
    Copy the full SHA
    f8aa8c8 View commit details

Commits on Dec 16, 2021

  1. 修复bug & 实现aes加密

    editso committed Dec 16, 2021
    Copy the full SHA
    7e7a252 View commit details
  2. Merge pull request #19 from editso/dev

    修复bug & 实现aes加密
    editso authored Dec 16, 2021
    Copy the full SHA
    753029b View commit details
  3. 服务端参数问题

    editso committed Dec 16, 2021
    Copy the full SHA
    287bf38 View commit details
  4. Merge pull request #20 from editso/dev

    服务端参数问题
    editso authored Dec 16, 2021
    Copy the full SHA
    a11c99b View commit details

Commits on Dec 18, 2021

  1. Copy the full SHA
    4fae152 View commit details

Commits on Dec 19, 2021

  1. 优化代码

    editso committed Dec 19, 2021
    Copy the full SHA
    68d3e39 View commit details
  2. Merge pull request #21 from editso/dev

    优化代码
    editso authored Dec 19, 2021
    Copy the full SHA
    71081bf View commit details

Commits on Jan 27, 2022

  1. Update README.md

    年后计划..
    editso authored Jan 27, 2022
    Copy the full SHA
    8c68fd6 View commit details

Commits on Feb 19, 2022

  1. Create README.md

    准备实现tokio支持
    editso authored Feb 19, 2022
    Copy the full SHA
    8da1265 View commit details

Commits on Mar 2, 2022

  1. Update README.md

    editso authored Mar 2, 2022
    Copy the full SHA
    e0d1827 View commit details

Commits on Apr 6, 2022

  1. 修复bug

    editso committed Apr 6, 2022
    Copy the full SHA
    5312318 View commit details
  2. refactor

    editso committed Apr 6, 2022
    Copy the full SHA
    3769994 View commit details
  3. Copy the full SHA
    70dcb22 View commit details
  4. fixs bugs

    editso committed Apr 6, 2022
    Copy the full SHA
    cc5c5d8 View commit details

Commits on Apr 14, 2022

  1. 重构计划

    editso committed Apr 14, 2022
    Copy the full SHA
    d2ea223 View commit details
  2. fix: 解决合并冲突

    editso committed Apr 14, 2022
    Copy the full SHA
    45823b5 View commit details

Commits on Aug 6, 2022

  1. refactory

    editso committed Aug 6, 2022
    Copy the full SHA
    ecd3b8b View commit details
  2. readme

    editso committed Aug 6, 2022
    Copy the full SHA
    3c18869 View commit details
Showing with 18,417 additions and 4,886 deletions.
  1. +4 −4 .cargo/config
  2. +1 −1 .github/release-drafter.yml
  3. +140 −139 .github/workflows/release-all.yml
  4. +10 −2 .gitignore
  5. +0 −3 .gitmodules
  6. +892 −157 Cargo.lock
  7. +143 −39 Cargo.toml
  8. +674 −674 LICENSE
  9. +118 −76 README.md
  10. +7 −0 build.rs
  11. +0 −19 fuso-api/Cargo.toml
  12. +0 −168 fuso-api/src/buffer.rs
  13. +0 −497 fuso-api/src/core.rs
  14. +0 −121 fuso-api/src/error.rs
  15. +0 −168 fuso-api/src/lib.rs
  16. +0 −117 fuso-api/src/stream.rs
  17. +0 −273 fuso-api/src/udp.rs
  18. +0 −18 fuso-core/Cargo.toml
  19. +0 −102 fuso-core/src/bridge.rs
  20. +0 −204 fuso-core/src/ciphe.rs
  21. +0 −264 fuso-core/src/client.rs
  22. +0 −11 fuso-core/src/cmd.rs
  23. +0 −530 fuso-core/src/core.rs
  24. +0 −114 fuso-core/src/dispatch.rs
  25. +0 −81 fuso-core/src/handler.rs
  26. +0 −175 fuso-core/src/lib.rs
  27. +0 −272 fuso-core/src/packet.rs
  28. +0 −156 fuso-core/src/retain.rs
  29. +0 −3 fuso-core/src/udp.rs
  30. +0 −1 fuso-socks
  31. +506 −0 rfc1928
  32. +112 −0 rfc1929
  33. +0 −55 src/assets/client-cfg.yml
  34. +235 −0 src/async/ext.rs
  35. +219 −0 src/async/io.rs
  36. +130 −0 src/async/join.rs
  37. +9 −0 src/async/macro.rs
  38. +267 −0 src/async/mod.rs
  39. +53 −0 src/async/select.rs
  40. +5 −0 src/async/sync.rs
  41. +34 −0 src/async/time.rs
  42. +157 −0 src/bin/client-quite.rs
  43. +174 −0 src/bin/client.rs
  44. +124 −0 src/bin/server.rs
  45. +0 −219 src/client.rs
  46. +57 −0 src/client/builder.rs
  47. +131 −0 src/client/mod.rs
  48. +262 −0 src/core/accepter.rs
  49. +73 −0 src/core/boxed.rs
  50. +534 −0 src/core/compress/lz4/mod.rs
  51. +24 −0 src/core/compress/lz4/third_party/lib/LICENSE
  52. +2,573 −0 src/core/compress/lz4/third_party/lib/lz4.c
  53. +778 −0 src/core/compress/lz4/third_party/lib/lz4.h
  54. +72 −0 src/core/compress/lz4/third_party/mod.rs
  55. +23 −0 src/core/compress/mod.rs
  56. +244 −0 src/core/encryption/aes/mod.rs
  57. +27 −0 src/core/encryption/mod.rs
  58. +239 −0 src/core/encryption/rsa/mod.rs
  59. +34 −0 src/core/generator.rs
  60. +105 −0 src/core/guard/buffer.rs
  61. +217 −0 src/core/guard/fallback.rs
  62. +7 −0 src/core/guard/mod.rs
  63. +222 −0 src/core/guard/timer.rs
  64. +125 −0 src/core/mixing.rs
  65. +180 −0 src/core/mod.rs
  66. +69 −0 src/core/observer.rs
  67. +63 −0 src/core/processor.rs
  68. +473 −0 src/core/protocol/local/mod.rs
  69. +227 −0 src/core/protocol/mod.rs
  70. +101 −0 src/core/protocol/proto.rs
  71. +1 −0 src/core/protocol/serde/mod.rs
  72. +163 −0 src/core/provider.rs
  73. +519 −0 src/core/socket.rs
  74. +467 −0 src/error/mod.rs
  75. +5 −0 src/http/mod.rs
  76. +1 −0 src/http/pages/mod.rs
  77. +1 −0 src/http/routes/mod.rs
  78. +14 −31 src/lib.rs
  79. +93 −0 src/net/kcp/builder.rs
  80. +817 −0 src/net/kcp/mod.rs
  81. +255 −0 src/net/kcp/stream.rs
  82. +21 −0 src/net/kcp/third_party/LICENSE
  83. +95 −0 src/net/kcp/third_party/error.rs
  84. +1,293 −0 src/net/kcp/third_party/mod.rs
  85. +17 −0 src/net/mod.rs
  86. +69 −0 src/net/penetrate/accepter.rs
  87. +90 −0 src/net/penetrate/bridge/mod.rs
  88. +253 −0 src/net/penetrate/builder.rs
  89. +395 −0 src/net/penetrate/client.rs
  90. +160 −0 src/net/penetrate/handshake/mod.rs
  91. +30 −0 src/net/penetrate/mock/direct.rs
  92. +36 −0 src/net/penetrate/mock/mod.rs
  93. +330 −0 src/net/penetrate/mock/socks.rs
  94. +19 −0 src/net/penetrate/mod.rs
  95. +62 −0 src/net/penetrate/observer.rs
  96. +79 −0 src/net/penetrate/selector.rs
  97. +590 −0 src/net/penetrate/server.rs
  98. +1 −0 src/net/proxy/mod.rs
  99. +1 −0 src/net/quic/mod.rs
  100. +232 −0 src/net/socks/auth.rs
  101. +456 −0 src/net/socks/mod.rs
  102. +1 −0 src/net/tun/mod.rs
  103. +219 −0 src/net/udp/mod.rs
  104. +9 −0 src/runtime/mod.rs
  105. +156 −0 src/runtime/smol/mod.rs
  106. +266 −0 src/runtime/tokio/mod.rs
  107. +9 −0 src/runtime/tokio/penetrate/client.rs
  108. +129 −0 src/runtime/tokio/penetrate/connector.rs
  109. +2 −0 src/runtime/tokio/penetrate/mod.rs
  110. +0 −192 src/server.rs
  111. +43 −0 src/server/builder.rs
  112. +144 −0 src/server/mod.rs
8 changes: 4 additions & 4 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]

[target.i686-pc-windows-msvc]
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
[target.i686-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
2 changes: 1 addition & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
template: |
template: |
$CHANGES
279 changes: 140 additions & 139 deletions .github/workflows/release-all.yml
Original file line number Diff line number Diff line change
@@ -1,139 +1,140 @@
name: Release ALL

on:
workflow_dispatch:

jobs:
build-mac-release:
runs-on: macos-11
strategy:
matrix:
arch:
- x86_64-apple-darwin

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.arch }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.arch }}

- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.arch }}
path: target/${{ matrix.arch }}/release/fu*

- run: zip -j ${{ matrix.arch }} ./target/${{ matrix.arch }}/release/fu*

- name: Release Drafter
id: create_release
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ matrix.arch }}.zip
asset_name: ${{ matrix.arch }}.zip
asset_content_type: application/zip

build-windows-release:
runs-on: windows-latest
strategy:
matrix:
arch:
- x86_64-pc-windows-msvc
- i686-pc-windows-msvc

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.arch }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.arch }}
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.arch }}
path: target/${{ matrix.arch }}/release/fu*

- run: ./zip/zip.exe -j ${{ matrix.arch }} ./target/${{ matrix.arch }}/release/fu*

- name: Release Drafter
id: create_release
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ matrix.arch }}.zip
asset_name: ${{ matrix.arch }}.zip
asset_content_type: application/zip

build-linux-release:
runs-on: ubuntu-latest
strategy:
matrix:
arch:
- x86_64-unknown-linux-musl
- i686-unknown-linux-musl

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.arch }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.arch }}

- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.arch }}
path: target/${{ matrix.arch }}/release/fu*

- run: zip -j ${{ matrix.arch }} ./target/${{ matrix.arch }}/release/fu*

- name: Release Drafter
id: create_release
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ matrix.arch }}.zip
asset_name: ${{ matrix.arch }}.zip
asset_content_type: application/zip

name: Release ALL

on:
workflow_dispatch:

jobs:
build-mac-release:
runs-on: macos-11
strategy:
matrix:
arch:
- x86_64-apple-darwin

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.arch }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.arch }} --features "fuso-log"

- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.arch }}
path: target/${{ matrix.arch }}/release/fu*

- run: zip -j ${{ matrix.arch }} ./target/${{ matrix.arch }}/release/fu*

- name: Release Drafter
id: create_release
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ matrix.arch }}.zip
asset_name: ${{ matrix.arch }}.zip
asset_content_type: application/zip

build-windows-release:
runs-on: windows-latest
strategy:
matrix:
arch:
- x86_64-pc-windows-msvc
- i686-pc-windows-msvc

steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.arch }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.arch }} --features "fuso-log"
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.arch }}
path: target/${{ matrix.arch }}/release/fu*

- run: ./zip/zip.exe -j ${{ matrix.arch }} ./target/${{ matrix.arch }}/release/fu*

- name: Release Drafter
id: create_release
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ matrix.arch }}.zip
asset_name: ${{ matrix.arch }}.zip
asset_content_type: application/zip

build-linux-release:
runs-on: ubuntu-latest
strategy:
matrix:
arch:
- x86_64-unknown-linux-musl
- i686-unknown-linux-musl

steps:
- run: sudo apt -y install musl-tools
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.arch }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --release --target ${{ matrix.arch }} --features "fuso-log"

- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.arch }}
path: target/${{ matrix.arch }}/release/fu*

- run: zip -j ${{ matrix.arch }} ./target/${{ matrix.arch }}/release/fu*

- name: Release Drafter
id: create_release
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ matrix.arch }}.zip
asset_name: ${{ matrix.arch }}.zip
asset_content_type: application/zip

12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
/target
build-release.sh
/target
build-release.sh
.vscode


# Added by cargo
#
# already existing elements were commented out

#/target
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

Loading