Changeset 4037 for pjproject

Timestamp:

Apr 11, 2012 9:41:25 AM (13 years ago)

Author:

bennylp

Message:

More re #1481: Destroying the regc may lead to dangling binding in the register, so instead of destroying the regc, instruct it to release the transport instead

Location:

pjproject/branches/1.x/pjsip

Files:

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

pjproject/branches/1.x/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/branches/1.x/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/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

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