Changeset 5090

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.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (3 diffs)
• src/pjsip/sip_config.c (modified) (1 diff)
• src/pjsip/sip_transport_tcp.c (modified) (4 diffs)
• src/pjsip/sip_transport_tls.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -218 +218 @@
     } regc;
 
+    /** TCP transport settings */
+    struct {
+        /**
+         * Set the interval to send keep-alive packet for TCP transports.
+         * If the value is zero, keep-alive will be disabled for TCP.
+         *
+         * Default is PJSIP_TCP_KEEP_ALIVE_INTERVAL.
+         */
+        long keep_alive_interval;
+
+    } tcp;
+
+    /** TLS transport settings */
+    struct {
+        /**
+         * Set the interval to send keep-alive packet for TLS transports.
+         * If the value is zero, keep-alive will be disabled for TLS.
+         *
+         * Default is PJSIP_TLS_KEEP_ALIVE_INTERVAL.
+         */
+        long keep_alive_interval;
+
+    } tls;
+
 } pjsip_cfg_t;
 
@@ -650 +674 @@
  * If the value is zero, keep-alive will be disabled for TCP.
  *
+ * This option can be changed in run-time by settting
+ * \a tcp.keep_alive_interval field of pjsip_cfg().
+ *
  * Default: 90 (seconds)
  *
@@ -672 +699 @@
  * Set the interval to send keep-alive packet for TLS transports.
  * If the value is zero, keep-alive will be disabled for TLS.
+ *
+ * This option can be changed in run-time by settting
+ * \a tls.keep_alive_interval field of pjsip_cfg().
  *
  * Default: 90 (seconds)

pjproject/trunk/pjsip/src/pjsip/sip_config.c

@@ -50 +50 @@
     {
         PJSIP_REGISTER_CLIENT_CHECK_CONTACT
+    },
+
+    /* TCP transport settings */
+    {
+        PJSIP_TCP_KEEP_ALIVE_INTERVAL
+    },
+
+    /* TLS transport settings */
+    {
+        PJSIP_TLS_KEEP_ALIVE_INTERVAL
     }
 };

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -1141 +1141 @@
             }
             /* Start keep-alive timer */
-            if (PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
-                pj_time_val delay = {PJSIP_TCP_KEEP_ALIVE_INTERVAL, 0};
+            if (pjsip_cfg()->tcp.keep_alive_interval) {
+                pj_time_val delay = {pjsip_cfg()->tcp.keep_alive_interval, 0};
                 pjsip_endpt_schedule_timer(listener->endpt, 
                                            &tcp->ka_timer, 
@@ -1500 +1500 @@
 
     /* Start keep-alive timer */
-    if (PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
-        pj_time_val delay = { PJSIP_TCP_KEEP_ALIVE_INTERVAL, 0 };
+    if (pjsip_cfg()->tcp.keep_alive_interval) {
+        pj_time_val delay = { pjsip_cfg()->tcp.keep_alive_interval, 0 };
         pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->ka_timer, 
                                    &delay);
@@ -1527 +1527 @@
     PJ_TIME_VAL_SUB(now, tcp->last_activity);
 
-    if (now.sec > 0 && now.sec < PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
+    if (now.sec > 0 && now.sec < pjsip_cfg()->tcp.keep_alive_interval) {
         /* There has been activity, so don't send keep-alive */
-        delay.sec = PJSIP_TCP_KEEP_ALIVE_INTERVAL - now.sec;
+        delay.sec = pjsip_cfg()->tcp.keep_alive_interval - now.sec;
         delay.msec = 0;
 
@@ -1556 +1556 @@
 
     /* Register next keep-alive */
-    delay.sec = PJSIP_TCP_KEEP_ALIVE_INTERVAL;
+    delay.sec = pjsip_cfg()->tcp.keep_alive_interval;
     delay.msec = 0;
 

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;