diff options
| author | Mark Michelson <mmichelson@digium.com> | 2015-06-26 16:12:33 -0500 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2015-06-26 16:17:35 -0500 |
| commit | 24eec5a10b43c7642ac555b75ed05b054b5e51df (patch) | |
| tree | af95808472285157e58ee09dc14c6c3571886fab | |
| parent | 0a1700d286ad130ab29ce70e8b291fa1f2f567a7 (diff) | |
res_pjsip_nat: Adjust when contact should be rewritten.
A previous change made the contact only get rewritten if the dialog's
route set was not marked frozen. Unfortunately, while the intent of this
is correct, the dialog's route set actually gets marked as frozen
earlier than expected, especially for UAS dialogs.
Instead, the idea is that the contact needs to not be rewritten if there
is a pre-existing route set on the dialog. This is now accomplished by
checking the dialog's route set list instead of checking if the route
set is frozen.
Doing this causes some broken tests to begin passing again.
ASTERISK-25196
Reported by Mark Michelson
Change-Id: I525ab251fd40a52ede327a52a2810a56deb0529e
| -rw-r--r-- | res/res_pjsip_nat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c index e47dd542c..c32b71d76 100644 --- a/res/res_pjsip_nat.c +++ b/res/res_pjsip_nat.c @@ -63,7 +63,7 @@ static int rewrite_route_set(pjsip_rx_data *rdata, pjsip_dialog *dlg) if (rr) { uri = pjsip_uri_get_uri(&rr->name_addr); rewrite_uri(rdata, uri); - if (dlg && dlg->route_set.next && !dlg->route_set_frozen) { + if (dlg && !pj_list_empty(&dlg->route_set) && !dlg->route_set_frozen) { pjsip_routing_hdr *route = dlg->route_set.next; uri = pjsip_uri_get_uri(&route->name_addr); rewrite_uri(rdata, uri); @@ -85,7 +85,7 @@ static int rewrite_contact(pjsip_rx_data *rdata, pjsip_dialog *dlg) rewrite_uri(rdata, uri); - if (dlg && !dlg->route_set_frozen && (!dlg->remote.contact + if (dlg && pj_list_empty(&dlg->route_set) && (!dlg->remote.contact || pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, dlg->remote.contact->uri, contact->uri))) { dlg->remote.contact = (pjsip_contact_hdr*)pjsip_hdr_clone(dlg->pool, contact); dlg->target = dlg->remote.contact->uri; |