Changeset 1908 for pjproject/trunk

Timestamp:

Apr 4, 2008 10:50:21 AM (17 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2046 +2046 @@
      * 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)
      */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -778 +778 @@
 
         /* 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)