Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean code #21

Merged
merged 3 commits into from
Jun 20, 2023
Merged

Clean code #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef15366
move very.util to web-sugar
timzaak Jun 20, 2023
fba6ace
mv win-tun-driver to simple-windows-tun
timzaak Jun 20, 2023
5dc467e
Merge branch 'main' into clean_code
timzaak Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
[submodule "third/web-sugar"]
path = third/web-sugar
url = [email protected]:ForNetCode/web-sugar.git
[submodule "third/simple-windows-tun"]
path = third/simple-windows-tun
url = [email protected]:ForNetCode/simple-windows-tun.git
2 changes: 1 addition & 1 deletion client/lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ path = "../../third/boringtun/boringtun"
tun = { version = "0.5", features = ["async"], path = "../../third/rust-tun"}
nix = { version = "0.25" } #compatible with boringtun
[target.'cfg(windows)'.dependencies]
fortun-cli = {version = "0.0.1", path = "../../win-tun-driver/ForTunCli" }
fortun-cli = {version = "0.0.1", path = "../../third/simple-windows-tun/ForTunCli" }
windows = {version = "0.44", features=["Win32_Networking_WinSock"]}
cidr-utils = "0.5.10"
#winapi = {version = "0.3", features=["ws2def"]}
Expand Down
1 change: 1 addition & 0 deletions third/simple-windows-tun
Open in desktop
Submodule simple-windows-tun added at aeb8b3
33 changes: 0 additions & 33 deletions win-tun-driver/.gitignore
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions win-tun-driver/ForTun/Adapter.c
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions win-tun-driver/ForTun/Adapter.h
View file
Open in desktop

This file was deleted.

158 changes: 0 additions & 158 deletions win-tun-driver/ForTun/Device.c
View file
Open in desktop

This file was deleted.

Loading