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

Check environment variable for transit relay server #281

Merged
merged 3 commits into from
Dec 21, 2024
Merged

Check environment variable for transit relay server #281

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
34f443c
check env var for transit relay server
kernelPanic0x Dec 16, 2024
4c6dfb9
env name compatibility with python impl
kernelPanic0x Dec 16, 2024
6f5adf0
mailbox url env
kernelPanic0x Dec 17, 2024
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
2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ rand = { workspace = true }

# CLI specific dependencies
magic-wormhole = { path = "..", version = "0.7", features = ["all", "entropy"] }
clap = { workspace = true, features = ["cargo", "derive", "help"] }
clap = { workspace = true, features = ["cargo", "derive", "help", "env"] }
clap_complete = { workspace = true }
env_logger = { workspace = true }
console = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,11 @@ struct CommonArgs {
action = clap::ArgAction::Append,
value_name = "tcp://HOSTNAME:PORT",
value_hint = clap::ValueHint::Url,
env = "WORMHOLE_RELAY_URL",
)]
relay_server: Vec<url::Url>,
/// Use a custom rendezvous server. Both sides need to use the same value in order to find each other.
#[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url)]
#[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url, env = "WORMHOLE_MAILBOX_URL")]
rendezvous_server: Option<url::Url>,
/// Disable the relay server support and force a direct connection.
#[arg(long)]
Expand Down
Loading