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.

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

Remove an unnecessary step when stopping the tunnel #1102

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Nov 28, 2024

Task/Issue URL: https://app.asana.com/0/1207603085593419/1208865941226621/f

iOS PR: duckduckgo/iOS#3639
macOS PR: duckduckgo/macos-browser#3608

What kind of version bump will this require?: Patch

Description

Removes a duplicated step from the tunnel stop logic that was causing some trouble in the logs.

Testing

Use the macOS PR to test.


Internal references:

Software Engineering Expectations
Technical Design Template

@@ -895,10 +896,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
private func stopAdapter() async throws {
try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
adapter.stop { [weak self] error in
if let self {
self.handleAdapterStopped()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing some trouble in the stop pixels not firing, likely because this was causing a delay and the tunnel was killed.

This isn't necessary as it's already done in line 889 anyway.

@diegoreymendez diegoreymendez changed the title macOS VPN: App update causing tunnel to sometimes stop Remove an unnecessary step when stopping the tunnel Nov 28, 2024
@diegoreymendez diegoreymendez marked this pull request as ready for review November 28, 2024 13:20
@diegoreymendez diegoreymendez merged commit db9c29a into main Nov 28, 2024
13 checks passed
@diegoreymendez diegoreymendez deleted the diego/tunnel-restart-improvements branch November 28, 2024 22:03
diegoreymendez added a commit to duckduckgo/macos-browser that referenced this pull request Nov 28, 2024
Task/Issue URL:
https://app.asana.com/0/1207603085593419/1208865941226621/f

BSK PR: duckduckgo/BrowserServicesKit#1102
iOS PR: duckduckgo/iOS#3639

## Description

Changes how the tunnel is restarted on app update so that it won't fail
to start again..
diegoreymendez added a commit to duckduckgo/iOS that referenced this pull request Nov 28, 2024
Task/Issue URL:
https://app.asana.com/0/1207603085593419/1208865941226621/f

BSK PR: duckduckgo/BrowserServicesKit#1102
macOS PR: duckduckgo/macos-browser#3608

## Description

Removes a duplicated step from the tunnel stop logic that was causing
some trouble in the logs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants