Changeset 5090 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

Timestamp:

May 11, 2015 5:57:50 AM (9 years ago)

Author:

ming

Message:

Fixed #1851: Runtime configuration of TCP and TLS keep alive intervals

Thanks to Michele Cicciotti for the patch.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -1282 +1282 @@
     } else {
         /* Start keep-alive timer */
-        if (PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
-            pj_time_val delay = {PJSIP_TLS_KEEP_ALIVE_INTERVAL, 0};
+        if (pjsip_cfg()->tls.keep_alive_interval) {
+            pj_time_val delay = {pjsip_cfg()->tls.keep_alive_interval, 0};
             pjsip_endpt_schedule_timer(listener->endpt, 
                                        &tls->ka_timer, 
@@ -1748 +1748 @@
 
     /* Start keep-alive timer */
-    if (PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
-        pj_time_val delay = { PJSIP_TLS_KEEP_ALIVE_INTERVAL, 0 };
+    if (pjsip_cfg()->tls.keep_alive_interval) {
+        pj_time_val delay = { pjsip_cfg()->tls.keep_alive_interval, 0 };
         pjsip_endpt_schedule_timer(tls->base.endpt, &tls->ka_timer, 
                                    &delay);
@@ -1781 +1781 @@
     PJ_TIME_VAL_SUB(now, tls->last_activity);
 
-    if (now.sec > 0 && now.sec < PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
+    if (now.sec > 0 && now.sec < pjsip_cfg()->tls.keep_alive_interval) {
         /* There has been activity, so don't send keep-alive */
-        delay.sec = PJSIP_TLS_KEEP_ALIVE_INTERVAL - now.sec;
+        delay.sec = pjsip_cfg()->tls.keep_alive_interval - now.sec;
         delay.msec = 0;
 
@@ -1811 +1811 @@
 
     /* Register next keep-alive */
-    delay.sec = PJSIP_TLS_KEEP_ALIVE_INTERVAL;
+    delay.sec = pjsip_cfg()->tls.keep_alive_interval;
     delay.msec = 0;