-
Notifications
You must be signed in to change notification settings - Fork 233
fix: bind SIP media sockets to signaling interface #784
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AlexanderMatveev
wants to merge
4
commits into
livekit:main
Choose a base branch
from
AlexanderMatveev:fix/sip-bindip
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
85aeb72
fix: bind SIP media sockets to signaling interface
AlexanderMatveev 7b4f124
fix: safely resolve RTP bind IP for NAT and multi-homed hosts
AlexanderMatveev 3f62e9d
fix: make RTP bind IP opt-in via media_listen_ip/listen_ip
AlexanderMatveev a96065e
fix: validate media_listen_ip at config init
AlexanderMatveev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright 2026 LiveKit, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestConfigInitMediaListenIP(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| t.Run("empty ok", func(t *testing.T) { | ||
| c := &Config{} | ||
| require.NoError(t, c.Init()) | ||
| }) | ||
|
|
||
| t.Run("specific address ok", func(t *testing.T) { | ||
| c := &Config{MediaListenIP: "127.0.0.1"} | ||
| require.NoError(t, c.Init()) | ||
| }) | ||
|
|
||
| t.Run("invalid address", func(t *testing.T) { | ||
| c := &Config{MediaListenIP: "10.0.0.5x"} | ||
| err := c.Init() | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), "media_listen_ip") | ||
| }) | ||
|
|
||
| t.Run("unspecified rejected", func(t *testing.T) { | ||
| c := &Config{MediaListenIP: "0.0.0.0"} | ||
| err := c.Init() | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), "media_listen_ip") | ||
| }) | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // Copyright 2026 LiveKit, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package sip | ||
|
|
||
| import ( | ||
| "net/netip" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/livekit/sip/pkg/config" | ||
| ) | ||
|
|
||
| func TestParseSpecificListenIP(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| ip, ok := parseSpecificListenIP("127.0.0.1") | ||
| require.True(t, ok) | ||
| require.Equal(t, netip.MustParseAddr("127.0.0.1"), ip) | ||
|
|
||
| _, ok = parseSpecificListenIP("") | ||
| require.False(t, ok) | ||
| _, ok = parseSpecificListenIP("0.0.0.0") | ||
| require.False(t, ok) | ||
| _, ok = parseSpecificListenIP("::") | ||
| require.False(t, ok) | ||
| _, ok = parseSpecificListenIP("not-an-ip") | ||
| require.False(t, ok) | ||
| } | ||
|
|
||
| func TestResolveMediaBindIP(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| loopback := netip.MustParseAddr("127.0.0.1") | ||
|
|
||
| t.Run("media_listen_ip wins", func(t *testing.T) { | ||
| got := resolveMediaBindIP(&config.Config{ | ||
| MediaListenIP: "127.0.0.1", | ||
| ListenIP: "10.0.0.1", | ||
| }) | ||
| require.Equal(t, loopback, got) | ||
| }) | ||
|
|
||
| t.Run("listen_ip when media_listen_ip empty", func(t *testing.T) { | ||
| got := resolveMediaBindIP(&config.Config{ | ||
| ListenIP: "127.0.0.1", | ||
| }) | ||
| require.Equal(t, loopback, got) | ||
| }) | ||
|
|
||
| t.Run("wildcard listen_ip ignored", func(t *testing.T) { | ||
| got := resolveMediaBindIP(&config.Config{ | ||
| ListenIP: "0.0.0.0", | ||
| }) | ||
| require.False(t, got.IsValid()) | ||
| }) | ||
|
|
||
| t.Run("default remains unspecified", func(t *testing.T) { | ||
| got := resolveMediaBindIP(&config.Config{}) | ||
| require.False(t, got.IsValid(), "without explicit listen config RTP must stay on 0.0.0.0") | ||
| }) | ||
|
|
||
| t.Run("nil config", func(t *testing.T) { | ||
| got := resolveMediaBindIP(nil) | ||
| require.False(t, got.IsValid()) | ||
| }) | ||
| } |
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
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
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.