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: tonarino/innernet
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.4
Choose a base ref
...
head repository: tonarino/innernet
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
22 contributors
Loading
Showing with 4,605 additions and 2,236 deletions.
  1. +1 −1 .github/workflows/docker-tests.yml
  2. +0 −71 .github/workflows/release-artifacts.yml
  3. +17 −6 .github/workflows/rust.yml
  4. +920 −413 Cargo.lock
  5. +11 −2 Cargo.toml
  6. +34 −12 README.md
  7. +0 −1 client/.rpm/innernet.spec
  8. +17 −9 client/Cargo.toml
  9. +19 −17 client/src/data_store.rs
  10. +110 −67 client/src/main.rs
  11. +23 −18 client/src/nat.rs
  12. +48 −13 client/src/util.rs
  13. +38 −34 doc/innernet-server.8
  14. BIN doc/innernet-server.8.gz
  15. +248 −27 doc/innernet-server.completions.bash
  16. +64 −20 doc/innernet-server.completions.elvish
  17. +29 −13 doc/innernet-server.completions.fish
  18. +77 −20 doc/innernet-server.completions.powershell
  19. +186 −33 doc/innernet-server.completions.zsh
  20. +35 −37 doc/innernet.8
  21. BIN doc/innernet.8.gz
  22. +391 −51 doc/innernet.completions.bash
  23. +102 −42 doc/innernet.completions.elvish
  24. +47 −27 doc/innernet.completions.fish
  25. +122 −42 doc/innernet.completions.powershell
  26. +271 −55 doc/innernet.completions.zsh
  27. +10 −8 docker-tests/Dockerfile.innernet
  28. +1 −1 docker-tests/build-docker-images.sh
  29. +172 −115 docker-tests/run-docker-tests.sh
  30. +6 −1 docker-tests/start-client.sh
  31. +1 −0 hostsfile/Cargo.toml
  32. +93 −31 hostsfile/src/lib.rs
  33. +16 −6 netlink-request/Cargo.toml
  34. +5 −0 netlink-request/README.md
  35. +38 −18 netlink-request/src/lib.rs
  36. +2 −1 publicip/Cargo.toml
  37. +12 −5 publicip/src/lib.rs
  38. +2 −2 release.sh
  39. +0 −1 release.toml
  40. +2 −2 rpm/Dockerfile
  41. +66 −23 server/Cargo.toml
  42. +1 −1 server/src/api/admin/association.rs
  43. +19 −2 server/src/api/admin/cidr.rs
  44. +14 −5 server/src/api/mod.rs
  45. +89 −0 server/src/api/user.rs
  46. +24 −1 server/src/db/cidr.rs
  47. +1 −1 server/src/db/mod.rs
  48. +5 −7 server/src/db/peer.rs
  49. +12 −8 server/src/initialize.rs
  50. +724 −0 server/src/lib.rs
  51. +52 −659 server/src/main.rs
  52. +29 −16 server/src/test.rs
  53. +15 −10 shared/Cargo.toml
  54. +3 −1 shared/src/interface_config.rs
  55. +12 −4 shared/src/lib.rs
  56. +70 −67 shared/src/netlink.rs
  57. +83 −30 shared/src/prompts.rs
  58. +119 −81 shared/src/types.rs
  59. +13 −11 wireguard-control/Cargo.toml
  60. +1 −1 wireguard-control/README.md
  61. +1 −1 wireguard-control/examples/enumerate.rs
  62. +41 −43 wireguard-control/src/backends/kernel.rs
  63. +34 −33 wireguard-control/src/backends/userspace.rs
  64. +1 −1 wireguard-control/src/device.rs
  65. +6 −8 wireguard-control/src/key.rs
2 changes: 1 addition & 1 deletion .github/workflows/docker-tests.yml
View file
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@ jobs:
- name: Build the Docker images
run: docker-tests/build-docker-images.sh
- name: Run the Docker tests
run: docker-tests/run-docker-tests.sh userspace
run: docker-tests/run-docker-tests.sh --userspace --verbose

71 changes: 0 additions & 71 deletions .github/workflows/release-artifacts.yml
View file

This file was deleted.

23 changes: 17 additions & 6 deletions .github/workflows/rust.yml
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ jobs:
- name: Install Dependencies (if Ubuntu)
env:
ACCEPT_EULA: Y
run: sudo apt-get -y update && sudo apt-get install -f && sudo apt-get -y install libsqlite3-dev libclang-9-dev
run: sudo apt-get -y update && sudo apt-get install -f && sudo apt-get -y install libsqlite3-dev libclang-11-dev
if: contains(runner.os, 'Linux')
- uses: Swatinem/rust-cache@v1
- name: Build
@@ -46,11 +46,6 @@ jobs:
with:
command: test
args: --features v6-test --verbose
- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-targets -- -D warnings

fmt:
runs-on: ubuntu-latest
@@ -67,3 +62,19 @@ jobs:
with:
command: fmt
args: --all -- --check

clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
components: clippy
- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-targets -- -D warnings
Loading