Changeset 4038

Timestamp:

Apr 11, 2012 10:01:00 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: merged r4031-r4037

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/include/pjsip-ua/sip_regc.h (modified) (1 diff)
• pjsip/include/pjsip/sip_config.h (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_regc.h

@@ -266 +266 @@
                                               const pjsip_tpselector *sel);
 
+/**
+ * Release the reference to current transport being used by the regc, if any.
+ * The regc keeps the reference to the last transport being used in order
+ * to prevent it from being destroyed. In some situation however, such as
+ * when the transport is disconnected, it is necessary to instruct the
+ * regc to release this reference so that the transport can be destroyed.
+ * See https://trac.pjsip.org/repos/ticket/1481 for background info.
+ *
+ * @param regc      The client registration instance.
+ *
+ * @return          PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsip_regc_release_transport(pjsip_regc *regc);
 
 /**

pjproject/trunk/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/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -441 +441 @@
 }
 
+/* Release transport */
+PJ_DEF(pj_status_t) pjsip_regc_release_transport(pjsip_regc *regc)
+{
+    PJ_ASSERT_RETURN(regc, PJ_EINVAL);
+    if (regc->last_transport) {
+        pjsip_transport_dec_ref(regc->last_transport);
+        regc->last_transport = NULL;
+    }
+    return PJ_SUCCESS;
+}
+
 
 PJ_DEF(pj_status_t) pjsip_regc_add_headers( pjsip_regc *regc,
@@ -1270 +1281 @@
 
     /* Get last transport used and add reference to it */
-    if (tdata->tp_info.transport != regc->last_transport) {
+    if (tdata->tp_info.transport != regc->last_transport &&
+        status==PJ_SUCCESS)
+    {
         if (regc->last_transport) {
             pjsip_transport_dec_ref(regc->last_transport);

pjproject/trunk/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;
             }

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

@@ -2883 +2883 @@
         }
 
+        /* Release regc transport immediately
+         * See https://trac.pjsip.org/repos/ticket/1481
+         */
+        if (pjsua_var.acc[i].regc) {
+            pjsip_regc_release_transport(pjsua_var.acc[i].regc);
+        }
+
         /* Schedule reregistration for this account */
         schedule_reregistration(acc);