Repository navigation
macos: retry UDP sends during flow divert handoff - #328
Merged
Merged
Conversation
On macOS, local mode's flow divert can briefly clear the connected state of mitmproxy's own outgoing UDP socket while handing it back to the regular UDP stack. `send()` then fails with `EDESTADDRREQ` or `ENOTCONN` and the connection is torn down. Retry these errors a bounded number of times before giving up. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0822dee1-89da-4338-994f-bf1a11052c0e
mhils
reviewed
Sep 30, 2026
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0822dee1-89da-4338-994f-bf1a11052c0e
mhils
approved these changes
Sep 30, 2026
mhils
left a comment
mhils
left a comment
Member
There was a problem hiding this comment.
Thank you for digging into this!
mhils
enabled auto-merge (squash)
September 30, 2026 23:40
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In macOS local mode, flow divert can briefly clear the connected state of mitmproxy's own outgoing UDP socket while handing it back to the regular UDP stack.
send()then fails withEDESTADDRREQ/ENOTCONNand the UDP client task errors out.This retries those two errors up to 10 times, 1 ms apart, before giving up. Other errors are unchanged. This is macOS-only. Adds tokio's
timefeature and a macOSlibcdependency tomitmproxy-rs.