Fix framed keepalive ping handling#2
Open
iteemoo6 wants to merge 1 commit into
Open
Conversation
5 tasks
iteemoo6
marked this pull request as ready for review
July 24, 2026 05:50
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.
Summary
Root cause
The peer session checks for
openVPNDataChannelPingPayloadbefore client data framing is decoded. When LZO framing wraps a keepalive, the peer-level check sees the marker plus the ping and does not recognize it.dataChannelFraming.Decodelater removes the marker, but the restored 16-byte keepalive is then queued as tunnel data and reaches the sing-box IP stack as a non-IP packet.The rejected payload was:
This change repeats the keepalive check immediately after framing decode, before packets enter the client data queue.
Related to SagerNet/sing-box#4344.
Validation
go vet ./...go test ./...go -C test test ./...64b754d1c277in both receive paths and passes with this changeinvalid IP packeton the first ping