Changeset 2095 for pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

Timestamp:

Jul 1, 2008 7:11:55 PM (16 years ago)

Author:

bennylp

Message:

Ticket #553: PUBLISH callback is not called when authentication fails (thanks Ruud Klaver for the report)

File:

• pjproject/trunk/pjsip/src/pjsip-simple/publishc.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -436 +436 @@
     entry->id = 0;
     status = pjsip_publishc_publish(pubc, 1, &tdata);
-    if (status == PJ_SUCCESS) {
-        status = pjsip_publishc_send(pubc, tdata);
-    } 
-    
-    // Callback should have been called.
-    // Calling it here will crash the system since pubc might have been
-    // destroyed
-    //
-    //if (status != PJ_SUCCESS) {
-    //  char errmsg[PJ_ERR_MSG_SIZE];
-    //  pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
-    //  call_callback(pubc, status, 400, &reason, NULL, -1);
-    //}
+    if (status != PJ_SUCCESS) {
+        char errmsg[PJ_ERR_MSG_SIZE];
+        pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
+        call_callback(pubc, status, 400, &reason, NULL, -1);
+        return;
+    }
+
+    status = pjsip_publishc_send(pubc, tdata);
+    /* No need to call callback as it should have been called */
 }
 
@@ -479 +475 @@
                                             tsx->last_tx,  
                                             &tdata);
-
-        if (status == PJ_SUCCESS) {
-            status = pjsip_publishc_send(pubc, tdata);
-        } 
-        
-        // Callback should have been called.
-        // Calling it here will crash the system since pubc might have been
-        // destroyed
-        //
-        //if (status != PJ_SUCCESS) {
-        //    call_callback(pubc, status, tsx->status_code, 
-        //                &rdata->msg_info.msg->line.status.reason,
-        //                rdata, -1);
-        //}
-
-        return;
+        if (status != PJ_SUCCESS) {
+            call_callback(pubc, status, tsx->status_code, 
+                          &rdata->msg_info.msg->line.status.reason,
+                          rdata, -1);
+        } else {
+            status = pjsip_publishc_send(pubc, tdata);
+        }
 
     } else {