Add constructFromFactory API to accommodate parsing layers from custom functions.
#2052
+153
−34
Conversation
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
Dimi1010
commented
Jan 25, 2026
Comment on lines
117
to
122
| else if (SipLayer::isSipPort(portDst) || SipLayer::isSipPort(portSrc)) | ||
| { | ||
| setNextLayer(SipLayer::parseSipLayer(udpData, udpDataLen, this, getAttachedPacket(), portSrc, portDst)); | ||
| if (!hasNextLayer()) | ||
| { | ||
| constructNextLayer<PayloadLayer>(udpData, udpDataLen, getAttachedPacket()); | ||
| } | ||
| // Resolves the overload of parseSipLayer, without static_casting a function pointer. | ||
| auto* (*fac)(uint8_t*, size_t, Layer*, Packet*, uint16_t, uint16_t) = SipLayer::parseSipLayer; | ||
| tryConstructNextLayerFromFactoryWithFallback<PayloadLayer>(fac, udpData, udpDataLen, portSrc, portDst); | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
This is a bit ugly, but it is the most readable way I could figure out to disambiguate the overloads of SipLayer::parseSipLayer.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #2052 +/- ##
==========================================
- Coverage 83.89% 83.83% -0.06%
==========================================
Files 312 312
Lines 55550 55630 +80
Branches 11513 11839 +326
==========================================
+ Hits 46603 46638 +35
- Misses 7769 8333 +564
+ Partials 1178 659 -519
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
seladb
approved these changes
Jan 26, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The PR expands the Layer construct API with two new additions:
constructNextLayerFromFactorytryConstructNextLayerFromFactoryWithFallbackThe new API mimics previous behaviour of
construct***andtryConstruct***functions, but allows usages of custom functors to parse the layer.The new API is intended to replace usages such as:
with
constructNextLayerFromFactory(BgpLayer::parseBgpLayer, payload, payloadLen);The change both reduces the boilerplate of automatically deducing
thisandgetAttachedPacket(), and also including the standardized check for already existing next layer protecting against overwrites.