diff --git a/cmd/lk/sip.go b/cmd/lk/sip.go index 7dac4056..315bd25d 100644 --- a/cmd/lk/sip.go +++ b/cmd/lk/sip.go @@ -616,6 +616,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 +} + // createSIPClient returns the SIP API: server-sdk-go's client with an API // key, or the Public API under --user-auth. func createSIPClient(ctx context.Context, cmd *cli.Command) (sipAPI, error) { @@ -655,9 +669,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 { @@ -777,9 +789,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 { @@ -1142,9 +1152,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 00000000..08189bb0 --- /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) + } +}