From d25909af4daf5c19983cca7cba3953ab3ade8d80 Mon Sep 17 00:00:00 2001 From: Alex Castillo Date: Sat, 31 Oct 2026 17:35:00 -0400 Subject: [PATCH] fix(sip): keep media settings from JSON when no media flags are set 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. --- cmd/lk/sip.go | 26 ++++++++++++++-------- cmd/lk/sip_media_test.go | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 cmd/lk/sip_media_test.go diff --git a/cmd/lk/sip.go b/cmd/lk/sip.go index ee51ce9b8..3d75c84a5 100644 --- a/cmd/lk/sip.go +++ b/cmd/lk/sip.go @@ -584,6 +584,20 @@ func parseSIPMediaConfig(cmd *cli.Command) (*livekit.SIPMediaConfig, error) { return m, nil } +// mergeSIPMediaConfig applies media settings given as flags to dst. If no media +// flags were set, dst is left untouched so values read from a JSON request +// file are not discarded. +func mergeSIPMediaConfig(cmd *cli.Command, dst **livekit.SIPMediaConfig) error { + m, err := parseSIPMediaConfig(cmd) + if err != nil { + return err + } + if m != nil { + *dst = m + } + return nil +} + func createSIPClient(ctx context.Context, cmd *cli.Command) (*lksdk.SIPClient, error) { _, err := requireProjectForSDK(ctx, cmd) if err != nil { @@ -608,9 +622,7 @@ func createSIPInboundTrunk(ctx context.Context, cmd *cli.Command) error { if val, ok := listSetFlag(cmd, "numbers"); ok { p.Numbers = val } - if m, err := parseSIPMediaConfig(cmd); err == nil { - p.Media = m - } else if err != nil { + if err := mergeSIPMediaConfig(cmd, &p.Media); err != nil { return err } if enc, err := parseSIPMediaEnc(cmd); err == nil && enc != nil { @@ -730,9 +742,7 @@ func createSIPOutboundTrunk(ctx context.Context, cmd *cli.Command) error { if val := cmd.String("destination-country"); val != "" { p.DestinationCountry = val } - if m, err := parseSIPMediaConfig(cmd); err == nil { - p.Media = m - } else if err != nil { + if err := mergeSIPMediaConfig(cmd, &p.Media); err != nil { return err } if enc, err := parseSIPMediaEnc(cmd); err == nil && enc != nil { @@ -1019,9 +1029,7 @@ func createSIPDispatchRule(ctx context.Context, cmd *cli.Command) error { if val, ok := listSetFlag(cmd, "trunks"); ok { p.TrunkIds = val } - if m, err := parseSIPMediaConfig(cmd); err == nil { - p.Media = m - } else if err != nil { + if err := mergeSIPMediaConfig(cmd, &p.Media); err != nil { return err } if enc, err := parseSIPMediaEnc(cmd); err == nil && enc != nil { diff --git a/cmd/lk/sip_media_test.go b/cmd/lk/sip_media_test.go new file mode 100644 index 000000000..08189bb09 --- /dev/null +++ b/cmd/lk/sip_media_test.go @@ -0,0 +1,48 @@ +package main + +import ( + "context" + "testing" + + "github.com/livekit/protocol/livekit" + "github.com/urfave/cli/v3" +) + +func runMergeSIPMedia(t *testing.T, args []string, dst **livekit.SIPMediaConfig) error { + t.Helper() + var mergeErr error + cmd := &cli.Command{ + Name: "test", + Flags: appendSIPMediaFlags(nil), + Action: func(ctx context.Context, cmd *cli.Command) error { + mergeErr = mergeSIPMediaConfig(cmd, dst) + return nil + }, + } + if err := cmd.Run(context.Background(), append([]string{"test"}, args...)); err != nil { + t.Fatal(err) + } + return mergeErr +} + +func TestMergeSIPMediaConfigKeepsJSONValuesWithoutFlags(t *testing.T) { + enc := livekit.SIPMediaEncryption_SIP_MEDIA_ENCRYPT_REQUIRE + fromJSON := &livekit.SIPMediaConfig{Encryption: &enc} + media := fromJSON + if err := runMergeSIPMedia(t, nil, &media); err != nil { + t.Fatal(err) + } + if media != fromJSON { + t.Fatalf("media from JSON was discarded: got %v", media) + } +} + +func TestMergeSIPMediaConfigFlagsOverride(t *testing.T) { + media := &livekit.SIPMediaConfig{} + if err := runMergeSIPMedia(t, []string{"--media-enc", "SIP_MEDIA_ENCRYPT_REQUIRE"}, &media); err != nil { + t.Fatal(err) + } + if media == nil || media.Encryption == nil || *media.Encryption != livekit.SIPMediaEncryption_SIP_MEDIA_ENCRYPT_REQUIRE { + t.Fatalf("flag not applied: got %v", media) + } +}