Changeset 841

Timestamp:

Dec 1, 2006 8:50:01 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #34: unable to send REGISTER in the registration callback

File:

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

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

@@ -47 +47 @@
     pjsip_endpoint              *endpt;
     pj_bool_t                    _delete_flag;
-    int                          pending_tsx;
+    pj_bool_t                    has_tsx;
+    pj_int32_t                   busy;
 
     void                        *token;
@@ -120 +121 @@
     PJ_ASSERT_RETURN(regc, PJ_EINVAL);
 
-    if (regc->pending_tsx) {
+    if (regc->has_tsx || regc->busy) {
         regc->_delete_flag = 1;
         regc->cb = NULL;
@@ -138 +139 @@
     info->server_uri = regc->str_srv_url;
     info->client_uri = regc->from_uri;
-    info->is_busy = (regc->pending_tsx != 0);
+    info->is_busy = (regc->busy || regc->has_tsx);
     info->auto_reg = regc->auto_reg;
     info->interval = regc->expires;
     
-    if (regc->pending_tsx)
+    if (regc->has_tsx)
         info->next_reg = 0;
     else if (regc->auto_reg == 0)
@@ -522 +523 @@
     
     /* Decrement pending transaction counter. */
-    pj_assert(regc->pending_tsx > 0);
-    --regc->pending_tsx;
+    pj_assert(regc->has_tsx);
+    regc->has_tsx = PJ_FALSE;
 
     /* If registration data has been deleted by user then remove registration 
@@ -615 +616 @@
         }
 
-        /* Increment pending_tsx temporarily to prevent regc from
+        /* Increment busy flag temporarily to prevent regc from
          * being destroyed.
          */
-        ++regc->pending_tsx;
+        ++regc->busy;
 
         /* Call callback. */
@@ -628 +629 @@
                       contact_cnt, contact);
 
-        /* Decrement pending_tsx */
-        --regc->pending_tsx;
+        /* Decrement busy flag */
+        --regc->busy;
     }
 
     /* Delete the record if user destroy regc during the callback. */
-    if (regc->_delete_flag && regc->pending_tsx==0) {
+    if (regc->_delete_flag && regc->busy==0) {
         pjsip_regc_destroy(regc);
     }
@@ -645 +646 @@
 
     /* Make sure we don't have pending transaction. */
-    if (regc->pending_tsx) {
+    if (regc->has_tsx) {
         PJ_LOG(4,(THIS_FILE, "Unable to send request, regc has another "
                              "transaction pending"));
@@ -663 +664 @@
      * may be called even before send_request() returns!
      */
-    regc->pending_tsx += 2;
+    regc->has_tsx = PJ_TRUE;
+    ++regc->busy;
     status = pjsip_endpt_send_request(regc->endpt, tdata, -1, regc, &tsx_callback);
     if (status!=PJ_SUCCESS) {
         PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
     }
-    --regc->pending_tsx;
+    --regc->busy;
 
     /* Delete the record if user destroy regc during the callback. */
-    if (regc->_delete_flag && regc->pending_tsx==0) {
+    if (regc->_delete_flag && regc->busy==0) {
         pjsip_regc_destroy(regc);
     }