Changeset 4037 for pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Apr 11, 2012 9:41:25 AM (12 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

File:

• pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_reg.c (modified) (2 diffs)

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);