From 8e69f7842a49e2baa3c187cdced8fb5bca3d9cda Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Wed, 27 Feb 2013 14:18:20 +0000 Subject: Re #1607: backported to 1.x git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4398 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/src/pjsua-lib/pjsua_acc.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 6888e3fd..f488db00 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -1667,9 +1667,26 @@ static void update_keep_alive(pjsua_acc *acc, pj_bool_t start, /* Save transport and destination address. */ acc->ka_transport = param->rdata->tp_info.transport; pjsip_transport_add_ref(acc->ka_transport); - pj_memcpy(&acc->ka_target, ¶m->rdata->pkt_info.src_addr, - param->rdata->pkt_info.src_addr_len); - acc->ka_target_len = param->rdata->pkt_info.src_addr_len; + + /* https://trac.pjsip.org/repos/ticket/1607: + * Calculate the destination address from the original request. Some + * (broken) servers send the response using different source address + * than the one that receives the request, which is forbidden by RFC + * 3581. + */ + { + pjsip_transaction *tsx; + pjsip_tx_data *req; + + tsx = pjsip_rdata_get_tsx(param->rdata); + PJ_ASSERT_ON_FAIL(tsx, return); + + req = tsx->last_tx; + + pj_memcpy(&acc->ka_target, &req->tp_info.dst_addr, + req->tp_info.dst_addr_len); + acc->ka_target_len = req->tp_info.dst_addr_len; + } /* Setup and start the timer */ acc->ka_timer.cb = &keep_alive_timer_cb; -- cgit v1.2.3