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

Timestamp:

Aug 8, 2006 2:04:21 PM (18 years ago)

Author:

bennylp

Message:

Fixed bugs in client registration (sip_regc.c): when re-registration failed to send the request, application callback is not called.

File:

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

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

@@ -470 +470 @@
     status = pjsip_regc_register(regc, 1, &tdata);
     if (status == PJ_SUCCESS) {
-        pjsip_regc_send(regc, tdata);
-    } else {
+        status = pjsip_regc_send(regc, tdata);
+    } 
+    
+    if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
@@ -508 +510 @@
 
         if (status == PJ_SUCCESS) {
-            pjsip_regc_send(regc, tdata);
-            return;
-        } else {
+            status = pjsip_regc_send(regc, tdata);
+        } 
+        
+        if (status != PJ_SUCCESS) {
             call_callback(regc, status, tsx->status_code, 
                           &rdata->msg_info.msg->line.status.reason,
                           rdata, -1, 0, NULL);
         }
+
+        return;
+
     } else {
         int contact_cnt = 0;