Changeset 4094 for pjproject/trunk

Timestamp:

Apr 26, 2012 9:31:00 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: merged r4081-r4093

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/include/pjsip/sip_config.h (modified) (1 diff)
• pjsip/src/pjsip/sip_transport.c (modified) (3 diffs)
• pjsip/src/test/regc_test.c (modified) (1 diff)

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

@@ -432 +432 @@
  * seconds.
  *
- * Default: 30
+ * Note that if the value is put lower than 33 seconds, it may cause some
+ * pjsip test units to fail. See the comment on the following link:
+ * https://trac.pjsip.org/repos/ticket/1465#comment:4
+ *
+ * Default: 33
  */
 #ifndef PJSIP_TRANSPORT_IDLE_TIME
-#   define PJSIP_TRANSPORT_IDLE_TIME    30
+#   define PJSIP_TRANSPORT_IDLE_TIME    33
 #endif
 

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -660 +660 @@
     }
 
+    /* Add reference to prevent deletion, and to cancel idle timer if
+     * it's running.
+     */
+    pjsip_transport_add_ref(tr);
+
     /* Fill in tp_info. */
     tdata->tp_info.transport = tr;
@@ -677 +682 @@
     if (tr->tpmgr->on_tx_msg) {
         status = (*tr->tpmgr->on_tx_msg)(tr->endpt, tdata);
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
+            pjsip_transport_dec_ref(tr);
             return status;
+        }
     }
 
@@ -700 +707 @@
     }
 
+    pjsip_transport_dec_ref(tr);
     return status;
 }

pjproject/trunk/pjsip/src/test/regc_test.c

@@ -773 +773 @@
             /* client expected results: */
             /* error    code    have_reg    expiration  contact_cnt auth?*/
-            { PJ_FALSE, 503,    PJ_FALSE,   -1,         0,          PJ_FALSE}
+            { PJ_FALSE, 502,    PJ_FALSE,   -1,         0,          PJ_FALSE}
         },