Changeset 776 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Oct 16, 2006 8:05:27 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug in client registration when pjsip_endpt_send_request() returns immediate error

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -582 +582 @@
         }
 
+        /* Increment pending_tsx temporarily to prevent regc from
+         * being destroyed.
+         */
+        ++regc->pending_tsx;
 
         /* Call callback. */
@@ -591 +595 @@
                       contact_cnt, contact);
 
+        /* Decrement pending_tsx */
+        --regc->pending_tsx;
     }
 
@@ -624 +630 @@
      * may be called even before send_request() returns!
      */
-    ++regc->pending_tsx;
+    regc->pending_tsx += 2;
     status = pjsip_endpt_send_request(regc->endpt, tdata, -1, regc, &tsx_callback);
     if (status!=PJ_SUCCESS) {
-        --regc->pending_tsx;
         PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
     }
+    --regc->pending_tsx;
+
+    /* Delete the record if user destroy regc during the callback. */
+    if (regc->_delete_flag && regc->pending_tsx==0) {
+        pjsip_regc_destroy(regc);
+    }
 
     return status;