summaryrefslogtreecommitdiff
path: root/pjsip/src/pjsua-lib/pjsua_acc.c
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2016-05-19 06:55:16 +0000
committerLiong Sauw Ming <ming@teluu.com>2016-05-19 06:55:16 +0000
commitb897438fb3b3f6efcd62b87f2c9902ced7e01be3 (patch)
tree0829db82d9346eec812f6d07c893b3641654a6f2 /pjsip/src/pjsua-lib/pjsua_acc.c
parent68958ad7d2304c6c78ca899ddb09827bcd993891 (diff)
Fixed #1921: Add support to handle IPv6 transports in pjsua_transport API and transport keep alive
Also: - add more detailed transport info for TCP and TLS transport - fixed pjsua sample app which tries to get IPv4 local address from IPv6 transport. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5308 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_acc.c')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_acc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 2eee77d4..15746cef 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -1944,7 +1944,7 @@ static void keep_alive_timer_cb(pj_timer_heap_t *th, pj_timer_entry *te)
/* Send raw packet */
status = pjsip_tpmgr_send_raw(pjsip_endpt_get_tpmgr(pjsua_var.endpt),
- PJSIP_TRANSPORT_UDP, &tp_sel,
+ acc->ka_transport->key.type, &tp_sel,
NULL, acc->cfg.ka_data.ptr,
acc->cfg.ka_data.slen,
&acc->ka_target, acc->ka_target_len,
@@ -2011,7 +2011,8 @@ static void update_keep_alive(pjsua_acc *acc, pj_bool_t start,
*/
if (/*pjsua_var.stun_srv.ipv4.sin_family == 0 ||*/
acc->cfg.ka_interval == 0 ||
- param->rdata->tp_info.transport->key.type != PJSIP_TRANSPORT_UDP)
+ (param->rdata->tp_info.transport->key.type & PJSIP_TRANSPORT_UDP)!=
+ PJSIP_TRANSPORT_UDP)
{
/* Keep alive is not necessary */
return;