Repository navigation
fix(sip): keep media settings from JSON when no media flags are set - #1091
Open
pcbeingused333 wants to merge 1 commit into
Open
pcbeingused333 wants to merge 1 commit into
pcbeingused333 wants to merge 1 commit into
Conversation
createSIPInboundTrunk, createSIPOutboundTrunk and createSIPDispatchRule assigned the result of parseSIPMediaConfig to the request unconditionally. Without media flags it is nil, which wiped the media config read from the JSON request file. Only override when a flag was given.
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.
lk sip inbound create,lk sip outbound createandlk sip dispatch createaccept a JSON request file whose values can be overridden by flags. For themediafield this override was unconditional:parseSIPMediaConfigreturnsnilwhen no media flags (--media-enc,--codecs) are given, and thatnilwas assigned toMediaon the request, discarding the media config read from the JSON file.Fix
A small helper,
mergeSIPMediaConfig, only replaces the media config when a media flag was actually set, and is used at the three create sites. The update paths build their request from flags only and are unchanged.Test
cmd/lk/sip_media_test.gochecks that media from the JSON request survives when no flags are set and that flags still take effect. The first test fails with the previous unconditional assignment and passes now.This PR was prepared with the help of an AI assistant (Claude Code).