Skip to content

chore: do network integration tests in isolated net ns #13117

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

Merged
merged 3 commits into from
May 3, 2024
Merged

chore: do network integration tests in isolated net ns #13117

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85bb13d
chore: do network integration tests in isolated net ns
deansheather May 1, 2024
92c6b65
Merge branch 'main' into dean/integration-test-ns
deansheather May 3, 2024
65f1944
fixup! Merge branch 'main' into dean/integration-test-ns
deansheather May 3, 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
Prev Previous commit
Next Next commit
Merge branch 'main' into dean/integration-test-ns
  • Loading branch information
@deansheather
deansheather committed May 3, 2024
commit 92c6b65e016a2dccc3b42ccc39d99600b8c97f87
3 changes: 3 additions & 0 deletions tailnet/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ type Options struct {
BlockEndpoints bool
Logger slog.Logger
ListenPort uint16
// CaptureHook is a callback that captures Disco packets and packets sent
// into the tailnet tunnel.
CaptureHook capture.Callback
// ForceNetworkUp forces the network to be considered up. magicsock will not
// do anything if it thinks it can't reach the internet.
ForceNetworkUp bool
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.