kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 12:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_nat: Adjust when contact should be rewritten." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-06-29 11:57:00 -05:00
committed by Gerrit Code Review
parent d84247a481 24eec5a10b
commit bfa5d38a1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_nat.c
View File

@@ -63,7 +63,7 @@ static int rewrite_route_set(pjsip_rx_data *rdata, pjsip_dialog *dlg)
if (rr) { if (rr) {
uri = pjsip_uri_get_uri(&rr->name_addr); uri = pjsip_uri_get_uri(&rr->name_addr);
rewrite_uri(rdata, uri); 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; pjsip_routing_hdr *route = dlg->route_set.next;
uri = pjsip_uri_get_uri(&route->name_addr); uri = pjsip_uri_get_uri(&route->name_addr);
rewrite_uri(rdata, uri); rewrite_uri(rdata, uri);
@@ -85,7 +85,7 @@ static int rewrite_contact(pjsip_rx_data *rdata, pjsip_dialog *dlg)
rewrite_uri(rdata, uri); 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))) { || 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->remote.contact = (pjsip_contact_hdr*)pjsip_hdr_clone(dlg->pool, contact);
dlg->target = dlg->remote.contact->uri; dlg->target = dlg->remote.contact->uri;