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

Reconnect when DNS is restored #15506

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Reconnect when DNS is restored #15506

merged 1 commit into from
Oct 18, 2022

Conversation

spylogsster
Copy link
Contributor

@spylogsster spylogsster commented Oct 18, 2022

Resolves brave/brave-browser#25773

  • Restore connections after sleep on win and mac.

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  • Steps from issue

@spylogsster spylogsster self-assigned this Oct 18, 2022
VLOG(2) << __func__ << " Should reconnect:" << reconnect_on_resume_;
if (reconnect_on_resume_) {
Connect();
reconnect_on_resume_ = false;
Copy link
Member

Choose a reason for hiding this comment

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

Instead of clearing reconnect_on_resme_ here, how about doing it in Connect()?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Connect can be called from another places and drop this flag, this actually happens with need_reconnect_ in old solution

Copy link
Member

Choose a reason for hiding this comment

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

Ok thanks!

Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

++

VLOG(2) << __func__ << " Should reconnect:" << reconnect_on_resume_;
if (reconnect_on_resume_) {
Connect();
reconnect_on_resume_ = false;
Copy link
Member

Choose a reason for hiding this comment

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

Ok thanks!


void BraveVpnService::OnDNSChanged() {
if (!IsNetworkAvailable() ||
// This event is triggered before going to sleep while vpn is still
Copy link
Member

Choose a reason for hiding this comment

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

nti: I think comments should be located before the if clause instead of between each condition.

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 comment explains why we add that second condition, will change in next PR

@spylogsster spylogsster merged commit 4443d84 into master Oct 18, 2022
@spylogsster spylogsster deleted the brave-25773 branch October 18, 2022 17:50
@github-actions github-actions bot added this to the 1.46.x - Nightly milestone Oct 18, 2022
bsclifton pushed a commit that referenced this pull request Oct 20, 2022
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.

VPN auto disconnects when device goes to sleep
2 participants