Merge branch 'emiago:main' into main

InnovativeUS · Jun 20, 2024 · d3dee7e · d3dee7e
2 parents 4b89c68 + cbd22c0
commit d3dee7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/dialog_client.go b/dialog_client.go
@@ -238,7 +238,13 @@ func (s *DialogClientSession) TransactionRequest(ctx context.Context, req *sip.R
 		}
 
 		if rr := s.InviteResponse.RecordRoute(); rr != nil {
-			req.SetDestination(rr.Address.HostPort())
+			if rr.Address.UriParams.Has("lr") {
+				req.AppendHeader(&sip.RouteHeader{
+					Address: rr.Address,
+				})
+			} else {
+				req.SetDestination(rr.Address.HostPort())
+			}
 		}
 	}
 

diff --git a/sip/request.go b/sip/request.go
@@ -235,8 +235,8 @@ func NewAckRequest(inviteRequest *Request, inviteResponse *Response, body []byte
 		// https://datatracker.ietf.org/doc/html/rfc2543#section-6.29
 		hdrs := inviteResponse.GetHeaders("Record-Route")
 		for i := len(hdrs) - 1; i >= 0; i-- {
-			h := hdrs[i].headerClone()
-			ackRequest.AppendHeader(h)
+			recordRoute := hdrs[i]
+			ackRequest.AppendHeader(NewHeader("Route", recordRoute.Value()))
 		}
 	}