Skip to content

Allow setting contact IP in siptest. #415

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.

Sign up for GitHub

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Allow setting contact IP in siptest. #415

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8613afb
Allow setting contact IP in siptest.
dennwc Jul 15, 2025
f65ed5a
Add Via with contact IP in siptest.
dennwc Jul 16, 2025
c42798b
Add Via with contact IP in siptest.
dennwc Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion pkg/siptest/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (

"github.com/at-wat/ebml-go"
"github.com/at-wat/ebml-go/webm"
sip2 "github.com/emiago/sipgo/sip"
"github.com/frostbyte73/core"
"github.com/icholy/digest"
"github.com/pion/sdp/v3"
Expand All @@ -54,6 +55,7 @@ import (

type ClientConfig struct {
IP netip.Addr
ContactIP netip.Addr
Number string
AuthUser string
AuthPass string
Expand Down Expand Up @@ -85,6 +87,10 @@ func NewClient(id string, conf ClientConfig) (*Client, error) {
conf.IP = localIP
conf.Log.Debug("setting local address", "ip", localIP)
}
if !conf.ContactIP.IsValid() {
conf.ContactIP = conf.IP
conf.Log.Debug("setting contact address", "ip", conf.ContactIP)
}
if conf.Number == "" {
conf.Number = "1000"
}
Expand Down Expand Up @@ -352,8 +358,25 @@ func (c *Client) attemptInvite(ip, uri, number string, offer []byte, authHeader
req.SetDestination(ip)
req.SetBody(offer)
req.AppendHeader(sip.NewHeader("Content-Type", "application/sdp"))
req.AppendHeader(sip.NewHeader("Contact", fmt.Sprintf("<sip:livekit@%s:5060>", c.conf.IP)))
req.AppendHeader(sip.NewHeader("Contact", fmt.Sprintf("<sip:livekit@%s:5060>", c.conf.ContactIP)))
req.AppendHeader(sip.NewHeader("Allow", "INVITE, ACK, CANCEL, BYE, NOTIFY, REFER, MESSAGE, OPTIONS, INFO, SUBSCRIBE"))
if c.conf.IP != c.conf.ContactIP {
p := make(sip2.HeaderParams)
p.Add("alias", "")
p.Add("branch", sip2.GenerateBranch())
if false {
// TODO: check if it matters
p.Add("rport", "")
}
req.PrependHeader(&sip.ViaHeader{
ProtocolName: "SIP",
ProtocolVersion: "2.0",
Transport: "UDP", // TODO
Host: c.conf.ContactIP.String(),
Port: 5060,
Params: p,
})
}
if c.id != "" {
req.AppendHeader(sip.NewHeader("X-Lk-Test-Id", c.id))
}
Expand Down