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

Move api.rs from mullvad-daemon to mullvad-api #7788

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+817 −730
Open

Move api.rs from mullvad-daemon to mullvad-api #7788

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7eb8c6c
Move the allowed_clients implementation to a separate structure
buggmagnet Mar 5, 2025
f64cf22
Fix building for Android
buggmagnet Mar 7, 2025
e93d7b5
Remove unneeded namespacing
buggmagnet Mar 12, 2025
e3d85a7
Reduce the number of cfg directives in the relay_list example
buggmagnet Mar 12, 2025
b428f7a
Use a generic implementation instead of a boxed trait
buggmagnet Mar 12, 2025
85528be
Use a static trait implementation instead of a dynamic dispatch
buggmagnet Mar 12, 2025
6443300
Rename api to access_mode in mullvad-api
buggmagnet Mar 12, 2025
f17a901
Remove unneeded trait and complexity
buggmagnet Mar 13, 2025
faba3b2
Remove dependency on relay-selector in mullvad-api
buggmagnet Mar 13, 2025
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions mullvad-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ log = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = [
"macros",
"time",
"rt-multi-thread",
"net",
"io-std",
"io-util",
"fs",
"macros",
"time",
"rt-multi-thread",
"net",
"io-std",
"io-util",
"fs",
] }
tokio-rustls = { version = "0.26.0", features = [
"logging",
"tls12",
"ring",
"logging",
"tls12",
"ring",
], default-features = false }
tokio-socks = "0.5.1"
rustls-pemfile = "2.1.3"
Expand All @@ -52,6 +52,7 @@ mullvad-fs = { path = "../mullvad-fs" }
mullvad-types = { path = "../mullvad-types" }
talpid-types = { path = "../talpid-types" }
talpid-time = { path = "../talpid-time" }
mullvad-relay-selector = { path = "../mullvad-relay-selector" }

shadowsocks = { workspace = true, features = ["stream-cipher"] }

Expand Down
Loading
Loading