[pull] main from livekit:main

.changeset/ringing-timeout-status.md

@@ -0,0 +1,6 @@
+---
+"github.com/livekit/protocol": patch
+"@livekit/protocol": patch
+---
+
+Add ringing_timeout_status to SIPInboundTrunkInfo & EvaluateSIPDispatchRulesResponse

livekit/sip.go

@@ -614,6 +614,9 @@ func (p *SIPInboundTrunkInfo) ValidateResult() ValidationResult {
 	if err := p.Media.Validate(); err != nil {
 		return ValidationFailure(err)
 	}
+	if c := p.RingingTimeoutStatus; c != SIPStatusCode_SIP_STATUS_UNKNOWN && (c < 400 || c > 699) {
+		return ValidationFailure(psrpc.NewErrorf(psrpc.InvalidArgument, "ringing timeout status must be 4xx-6xx, got %d", c))
+	}
 
 	result := validateHeaders(p.Headers)
 	if !result.OK() {

livekit/sip_test.go

@@ -133,6 +133,30 @@ func TestSIPValidate(t *testing.T) {
 				exp:          true,
 				wantSoftErrs: true,
 			},
+			{
+				name: "inbound ringing timeout status",
+				req: &SIPInboundTrunkInfo{
+					Numbers:              []string{"+1111"},
+					RingingTimeoutStatus: SIPStatusCode_SIP_STATUS_TEMPORARILY_UNAVAILABLE,
+				},
+				exp: true,
+			},
+			{
+				name: "inbound ringing timeout status 2xx",
+				req: &SIPInboundTrunkInfo{
+					Numbers:              []string{"+1111"},
+					RingingTimeoutStatus: SIPStatusCode_SIP_STATUS_OK,
+				},
+				exp: false,
+			},
+			{
+				name: "inbound ringing timeout status out of range",
+				req: &SIPInboundTrunkInfo{
+					Numbers:              []string{"+1111"},
+					RingingTimeoutStatus: SIPStatusCode(700),
+				},
+				exp: false,
+			},
 		},
 		"SIPOutboundTrunkInfo": {
 			{

protobufs/livekit_sip.proto

@@ -362,6 +362,8 @@ message SIPInboundTrunkInfo {
 
   // Max time for the caller to wait for track subscription.
   google.protobuf.Duration ringing_timeout = 11;
+  // SIP status code if ringing_timeout elapses. Unset means using system default.
+  SIPStatusCode ringing_timeout_status = 21;
   // Max call duration.
   google.protobuf.Duration max_call_duration = 12;
 
@@ -372,7 +374,7 @@ message SIPInboundTrunkInfo {
   google.protobuf.Timestamp created_at = 17;
   google.protobuf.Timestamp updated_at = 18;
 
-  // NEXT ID: 21
+  // NEXT ID: 22
 }
 
 message SIPInboundTrunkUpdate {

protobufs/rpc/io.proto

@@ -248,6 +248,8 @@ message EvaluateSIPDispatchRulesResponse {
 
   // Max time for the caller to wait for track subscription.
   google.protobuf.Duration ringing_timeout = 16;
+  // SIP status code if ringing_timeout elapses. Unset means using system default.
+  livekit.SIPStatusCode ringing_timeout_status = 25;
   // Max call duration.
   google.protobuf.Duration max_call_duration = 17;
 
@@ -262,7 +264,7 @@ message EvaluateSIPDispatchRulesResponse {
 
   map<string, string> feature_flags = 23;
 
-  // NEXT ID: 25
+  // NEXT ID: 26
 }
 
 message SIPCallObservability {