[asterisk-commits] res pjsip session: Fix cherry pick to master compile error. (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Jun 2 16:52:22 CDT 2015


Matt Jordan has submitted this change and it was merged.

Change subject: res_pjsip_session: Fix cherry pick to master compile error.
......................................................................


res_pjsip_session: Fix cherry pick to master compile error.

ASTERISK-25131
Reported by: Richard Mudgett

Change-Id: I87c9c96ae4a8fe2bc8a0ddea6958a2ad9cefd8e3
---
M res/res_pjsip_session.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Matt Jordan: Looks good to me, approved; Verified



diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index ca89d76..91e3abe 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -1467,8 +1467,8 @@
 
 	session = inv->mod_data[session_module.id];
 
-	if (ast_sip_create_request_with_auth(&session->endpoint->outbound_auths, rdata, tsx,
-		&tdata)) {
+	if (ast_sip_create_request_with_auth(&session->endpoint->outbound_auths, rdata,
+		tsx->last_tx, &tdata)) {
 		return PJ_FALSE;
 	}
 
@@ -2370,7 +2370,7 @@
 						if ((tsx->status_code == 401 || tsx->status_code == 407)
 							&& !ast_sip_create_request_with_auth(
 								&session->endpoint->outbound_auths,
-								e->body.tsx_state.src.rdata, tsx, &tdata)) {
+								e->body.tsx_state.src.rdata, tsx->last_tx, &tdata)) {
 							/* Send authed reINVITE */
 							ast_sip_session_send_request_with_cb(session, tdata, cb);
 							return;
@@ -2407,7 +2407,7 @@
 					if ((tsx->status_code == 401 || tsx->status_code == 407)
 						&& !ast_sip_create_request_with_auth(
 							&session->endpoint->outbound_auths,
-							e->body.tsx_state.src.rdata, tsx, &tdata)) {
+							e->body.tsx_state.src.rdata, tsx->last_tx, &tdata)) {
 						/* Send authed version of the method */
 						ast_sip_session_send_request_with_cb(session, tdata, cb);
 						return;

-- 
To view, visit https://gerrit.asterisk.org/568
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I87c9c96ae4a8fe2bc8a0ddea6958a2ad9cefd8e3
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>



More information about the asterisk-commits mailing list