Changeset 4032

Timestamp:

Apr 10, 2012 3:48:22 AM (12 years ago)

Author:

bennylp

Message:

More re #1465: introduce separate idle timeout setting for server side TCP/TLS connection and set the default to 600 seconds

Location:

pjproject/branches/1.x/pjsip

Files:

• include/pjsip/sip_config.h (modified) (2 diffs)
• src/pjsip/sip_transport.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/include/pjsip/sip_config.h

@@ -428 +428 @@
 
 /**
- * Idle timeout interval to be applied to transports with no usage
- * before the transport is destroyed. Value is in seconds.
+ * Idle timeout interval to be applied to outgoing transports (i.e. client
+ * side) with no usage before the transport is destroyed. Value is in
+ * seconds.
  *
  * Default: 30
@@ -435 +436 @@
 #ifndef PJSIP_TRANSPORT_IDLE_TIME
 #   define PJSIP_TRANSPORT_IDLE_TIME    30
+#endif
+
+
+/**
+ * Idle timeout interval to be applied to incoming transports (i.e. server
+ * side) with no usage before the transport is destroyed. Server typically
+ * should let client close the connection, hence set this interval to a large
+ * value. Value is in seconds.
+ *
+ * Default: 600
+ */
+#ifndef PJSIP_TRANSPORT_SERVER_IDLE_TIME
+#   define PJSIP_TRANSPORT_SERVER_IDLE_TIME     600
 #endif
 

pjproject/branches/1.x/pjsip/src/pjsip/sip_transport.c

@@ -858 +858 @@
                 delay.sec = delay.msec = 0;
             } else {
-                delay.sec = PJSIP_TRANSPORT_IDLE_TIME;
+                delay.sec = (tp->dir==PJSIP_TP_DIR_OUTGOING) ?
+                                PJSIP_TRANSPORT_IDLE_TIME :
+                                PJSIP_TRANSPORT_SERVER_IDLE_TIME;
                 delay.msec = 0;
             }