sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ticket #522: Enable keep-alive for UDP transport even when STUN is not configured 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1908 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2008-04-04 10:50:21 +00:00
parent 6d24ca5e00
commit 7fff9f9778
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pjsip/include/pjsua-lib/pjsua.h
View File

@ -2045,11 +2045,6 @@ typedef struct pjsua_acc_config
* The keep-alive transmission will be sent to the registrar's address,
* after successful registration.
*
* Even if this setting is enabled, keep-alive transmission is only done
* when STUN is enabled in the global #pjsua_config, and the transport
* used for registration is UDP. For TCP and TLS transports, keep-alive
* is done by the transport themselves.
*
* Default: 15 (seconds)
*/
unsigned ka_interval;

13
pjsip/src/pjsua-lib/pjsua_acc.c
View File

@ -777,11 +777,20 @@ static void update_keep_alive(pjsua_acc *acc, pj_bool_t start,
pj_status_t status;
/* Only do keep-alive if:
* - STUN is enabled in global config, and
* - ka_interval is not zero in the account, and
* - transport is UDP.
*
* Previously we only enabled keep-alive when STUN is enabled, since
* we thought that keep-alive is only needed in Internet situation.
* But it has been discovered that Windows Firewall on WinXP also
* needs to be kept-alive, otherwise incoming packets will be dropped.
* So because of this, now keep-alive is always enabled for UDP,
* regardless of whether STUN is enabled or not.
*
* Note that this applies only for UDP. For TCP/TLS, the keep-alive
* is done by the transport layer.
*/
if (pjsua_var.stun_srv.ipv4.sin_family == 0 ||
if (/*pjsua_var.stun_srv.ipv4.sin_family == 0 ||*/
acc->cfg.ka_interval == 0 ||
param->rdata->tp_info.transport->key.type != PJSIP_TRANSPORT_UDP)
{