Changeset 908 for pjproject

Timestamp:

Jan 26, 2007 5:13:56 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #81: registration refresh crashed when NIC is plugged-off

File:

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

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

@@ -526 +526 @@
 
 
+    if (!regc->cb)
+        return;
+
     cbparam.regc = regc;
     cbparam.token = regc->token;
@@ -551 +554 @@
     PJ_UNUSED_ARG(timer_heap);
 
+    /* Temporarily increase busy flag to prevent regc from being deleted
+     * in pjsip_regc_send()
+     */
+    regc->busy++;
+
     entry->id = 0;
     status = pjsip_regc_register(regc, 1, &tdata);
@@ -557 +565 @@
     } 
     
-    if (status != PJ_SUCCESS) {
+    if (status != PJ_SUCCESS && regc->cb) {
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
         call_callback(regc, status, 400, &reason, NULL, -1, 0, NULL);
+    }
+
+    regc->busy--;
+
+    /* Delete the record if user destroy regc during the callback. */
+    if (regc->_delete_flag && regc->busy==0) {
+        pjsip_regc_destroy(regc);
     }
 }