Add AttrSIPTrunkHostName for SIP trunk host identification

Author: serhiynovos

livekit/attrs.go

@@ -12,7 +12,8 @@ const (
 	AttrSIPDispatchRuleID = AttrSIPPrefix + "ruleID"
 	// AttrSIPTrunkNumber attribute contains number associate with LiveKit SIP Trunk.
 	// This attribute will be omitted if HidePhoneNumber is set.
-	AttrSIPTrunkNumber = AttrSIPPrefix + "trunkPhoneNumber"
+	AttrSIPTrunkNumber   = AttrSIPPrefix + "trunkPhoneNumber"
+	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"

rpc/sip.go

@@ -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

rpc/sip_test.go

@@ -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: "sip2.example.com",
+			livekit.AttrSIPPhoneNumber:   "+3333",
+			livekit.AttrSIPHostName:      "sip.example.com",
 		},
 		Headers: map[string]string{
 			"X-A": "A",

sip/sip.go

@@ -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)

sip/sip_test.go

@@ -673,6 +673,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)