Skip to content

fix(dns): add timeout context for DBus checkResolved calls #4165

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

Open
hklcf wants to merge 1 commit into
base: testing
Choose a base branch
from
+6 −2
Open

fix(dns): add timeout context for DBus checkResolved calls #4165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions dns/transport/local/local_resolved_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ func (t *DBusResolvedResolver) Exchange(ctx context.Context, message *mDNS.Msg)
serverSet := t.savedServerSet.Load()
if serverSet == nil {
var err error
serverSet, err = t.checkResolved(context.Background())
checkCtx, checkCancel := context.WithTimeout(context.Background(), C.DNSTimeout)
defer checkCancel()
serverSet, err = t.checkResolved(checkCtx)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -183,7 +185,9 @@ func (t *DBusResolvedResolver) loopUpdateStatus() {
}

func (t *DBusResolvedResolver) updateStatus() {
serverSet, err := t.checkResolved(context.Background())
checkCtx, checkCancel := context.WithTimeout(context.Background(), C.DNSTimeout)
defer checkCancel()
serverSet, err := t.checkResolved(checkCtx)
oldServerSet := t.savedServerSet.Swap(serverSet)
if oldServerSet != nil {
_ = oldServerSet.Close()
Expand Down