Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions livekit/attrs.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ const (
// AttrSIPTrunkNumber attribute contains number associate with LiveKit SIP Trunk.
// This attribute will be omitted if HidePhoneNumber is set.
AttrSIPTrunkNumber = AttrSIPPrefix + "trunkPhoneNumber"
// AttrSIPTrunkHostName attribute contains host name associate with LiveKit SIP Trunk.
// This attribute will be omitted if HidePhoneNumber is set.
AttrSIPTrunkHostName = AttrSIPPrefix + "trunkHostName"
// AttrSIPPhoneNumber attribute contains number external to LiveKit SIP (caller for inbound and called number for outbound).
// This attribute will be omitted if HidePhoneNumber is set.
AttrSIPPhoneNumber = AttrSIPPrefix + "phoneNumber"
Expand Down
1 change: 1 addition & 0 deletions rpc/sip.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ func NewCreateSIPParticipantRequest(
attrs[livekit.AttrSIPPhoneNumber] = req.SipCallTo
attrs[livekit.AttrSIPHostName] = hostname
attrs[livekit.AttrSIPTrunkNumber] = outboundNumber
attrs[livekit.AttrSIPTrunkHostName] = ownHostname
}

var features []livekit.SIPFeature
Expand Down
13 changes: 7 additions & 6 deletions rpc/sip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@ func TestNewCreateSIPParticipantRequest(t *testing.T) {
Dtmf: "1234#",
PlayDialtone: true,
ParticipantAttributes: map[string]string{
"extra": "1",
livekit.AttrSIPCallID: "call-id",
livekit.AttrSIPTrunkID: "trunk",
livekit.AttrSIPTrunkNumber: "+1111",
livekit.AttrSIPPhoneNumber: "+3333",
livekit.AttrSIPHostName: "sip.example.com",
"extra": "1",
livekit.AttrSIPCallID: "call-id",
livekit.AttrSIPTrunkID: "trunk",
livekit.AttrSIPTrunkNumber: "+1111",
livekit.AttrSIPTrunkHostName: "xyz.sip.livekit.cloud",
livekit.AttrSIPPhoneNumber: "+3333",
livekit.AttrSIPHostName: "sip.example.com",
},
Headers: map[string]string{
"X-A": "A",
Expand Down
1 change: 1 addition & 0 deletions sip/sip.go
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ func EvaluateDispatchRule(projectID string, trunk *livekit.SIPInboundTrunkInfo,
attrs[livekit.AttrSIPPhoneNumber] = call.From.User
attrs[livekit.AttrSIPHostName] = call.From.Host
attrs[livekit.AttrSIPTrunkNumber] = call.To.User
attrs[livekit.AttrSIPTrunkHostName] = call.To.Host
}

room, rulePin, err := GetPinAndRoom(rule)
Expand Down
6 changes: 5 additions & 1 deletion sip/sip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -649,11 +649,14 @@ func TestEvaluateDispatchRule(t *testing.T) {
CallingNumber: "+11112222",
CallingHost: "sip.example.com",
CalledNumber: "+3333",
CalledHost: "sip2.example.com",
ExtraAttributes: map[string]string{
"prov-attr": "1",
},
}
tr := &livekit.SIPInboundTrunkInfo{SipTrunkId: "trunk"}
tr := &livekit.SIPInboundTrunkInfo{
SipTrunkId: "trunk",
}
res, err := EvaluateDispatchRule("p_123", tr, d, r)
require.NoError(t, err)
require.Equal(t, &rpc.EvaluateSIPDispatchRulesResponse{
Expand All @@ -673,6 +676,7 @@ func TestEvaluateDispatchRule(t *testing.T) {
livekit.AttrSIPDispatchRuleID: "rule",
livekit.AttrSIPPhoneNumber: "+11112222",
livekit.AttrSIPTrunkNumber: "+3333",
livekit.AttrSIPTrunkHostName: "sip2.example.com",
livekit.AttrSIPHostName: "sip.example.com",
},
}, res)
Expand Down
Loading