Skip to content

nest: close PeerConnection/RTSP client on failed dial (fd + ICE mDNS socket leak) #2378

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
ajplotkin wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Open

nest: close PeerConnection/RTSP client on failed dial (fd + ICE mDNS socket leak) #2378

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
7 changes: 7 additions & 0 deletions pkg/nest/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,17 @@ func rtcConn(nestAPI *API, rawURL, projectID, deviceID string) (*WebRTCClient, e
// 3. Create offer with candidates
offer, err := conn.CreateCompleteOffer(medias)
if err != nil {
_ = pc.Close()
return nil, err
}

// 4. Exchange SDP via Hass
answer, err := nestAPI.ExchangeSDP(projectID, deviceID, offer)
if err != nil {
// close the failed PeerConnection: it never reaches ICE connectivity
// (no answer is set), so pion's connection-state auto-close never fires
// and its ICE agent's mDNS sockets (:5353) would leak on every retry.
_ = pc.Close()
lastErr = err
if attempt < maxRetries-1 {
time.Sleep(retryDelay)
Expand All @@ -146,6 +151,7 @@ func rtcConn(nestAPI *API, rawURL, projectID, deviceID string) (*WebRTCClient, e

// 5. Set answer with remote medias
if err = conn.SetAnswer(answer); err != nil {
_ = pc.Close()
return nil, err
}

Expand All @@ -166,6 +172,7 @@ func rtspConn(nestAPI *API, rawURL, projectID, deviceID string) (*RTSPClient, er
return nil, err
}
if err := rtspClient.Describe(); err != nil {
_ = rtspClient.Close()
return nil, err
}

Expand Down