Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .changeset/brave-coats-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"github.com/livekit/protocol": patch
"@livekit/protocol": patch
---

Fix recursive call to CreateSIPInboundTrunkRequest.ValidateResult.
13 changes: 8 additions & 5 deletions livekit/sip.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,18 @@ func ValidationFailure(err error) ValidationResult {
}

func validateHeaders(headers map[string]string) ValidationResult {
ret := ValidationResult{}
for headerName, headerValue := range headers {
if err := ValidateHeaderName(headerName, true); err != nil {
return ValidationFailure(fmt.Errorf("invalid header name: %w", err))
return ret.WithError(fmt.Errorf("invalid header name: %w", err))
}
if err := ValidateHeaderValue(headerName, headerValue); err != nil {
return ValidationFailure(fmt.Errorf("invalid header value for %s: %w", headerName, err))
result := ValidateHeaderValueResult(headerName, headerValue)
if !result.OK() {
return ret.WithError(fmt.Errorf("invalid header value for %s: %w", headerName, result.Error()))
}
ret = ret.Combine(result)
}
return ValidationResult{}
return ret
}

// validateHeaderNames Makes sure the values of the given map correspond to valid SIP header names
Expand Down Expand Up @@ -441,7 +444,7 @@ func (p *CreateSIPInboundTrunkRequest) ValidateResult() ValidationResult {
if p.Trunk.SipTrunkId != "" {
return ValidationFailure(errors.New("trunk id must not be set"))
}
return p.ValidateResult()
return p.Trunk.ValidateResult()
}

func (p *UpdateSIPOutboundTrunkRequest) Validate() error {
Expand Down
Loading
Loading