refactor: consolidate call parameters into callCtx struct - #47
Open
thorsager wants to merge 1 commit into
Open
Conversation
Introduce a callCtx struct to group the many parameters passed through the call handling functions. This improves readability and maintainability. Also cache the server port in the Handler struct to avoid repeated parsing.
6 tasks
Merging this branch will increase overall coverage
Coverage by fileChanged files (no unit tests)
Please note that the "Total", "Covered", and "Missed" counts above refer to code statements instead of lines of code. The value in brackets refers to the test coverage of that file in the old version of the code. |
There was a problem hiding this comment.
Pull request overview
This PR refactors the B2BUA call-bridging flow in internal/b2bua/handler.go by consolidating the shared per-call state that previously had to be threaded through long parameter lists, and by caching the server’s SIP listen port on the Handler to avoid repeated parsing.
Changes:
- Added
Handler.serverPort, initialized once inNewHandler, and replaced repeatednet.SplitHostPort(...)call sites withh.serverPort. - Introduced an unexported
callCtxstruct to hold shared call state (req/tx/targets, RTP conns, tags/Call-IDs, SDP state, etc.). - Refactored
trunkResponseLoop/handleTrunk200OKandb2buaResponseLoop/handleBob200OKto accept*callCtxplus only path-specific parameters, updating the invite handlers accordingly.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Closes #41
Refactor
internal/b2bua/handler.goto eliminate the long parameter lists in the B2BUA response loops.serverPortfield toHandler, initialized inNewHandler.net.SplitHostPort(h.serverAddr)recomputations withh.serverPort.callCtxstruct holding the shared call state.b2buaResponseLoop,handleBob200OK,trunkResponseLoop, andhandleTrunk200OKto accept*callCtxplus path-specific parameters.handleInternalInviteandhandleTrunkInvite.The optional visitor-pattern / shared
finalizeCallhelper is intentionally left for a follow-up (see #46).make testmake lintmake integrationtest