Changeset 576 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Jul 2, 2006 2:53:05 PM (18 years ago)

Author:

bennylp

Message:

Final changeset from the PROTOS testing, fixed misc. crashes. See
mailing list archive for the details

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -703 +703 @@
     --dlg->sess_count;
 
-    if (dlg->sess_count==0 && dlg->tsx_count==0)
+    if (dlg->sess_count==0 && dlg->tsx_count==0) {
+        pj_mutex_unlock(dlg->mutex);
+        pj_mutex_lock(dlg->mutex);
         unregister_and_destroy_dialog(dlg);
-    else {
+    } else {
         pj_mutex_unlock(dlg->mutex);
     }
@@ -972 +974 @@
      */
     if (msg->line.req.method.id != PJSIP_ACK_METHOD) {
+        int tsx_count;
+
         status = pjsip_tsx_create_uac(dlg->ua, tdata, &tsx);
         if (status != PJ_SUCCESS)
@@ -986 +990 @@
 
         /* Increment transaction counter. */
-        ++dlg->tsx_count;
+        tsx_count = ++dlg->tsx_count;
 
         /* Send the message. */
         status = pjsip_tsx_send_msg(tsx, tdata);
         if (status != PJ_SUCCESS) {
-            pjsip_tsx_terminate(tsx, tsx->status_code);
+            if (dlg->tsx_count == tsx_count)
+                pjsip_tsx_terminate(tsx, tsx->status_code);
             goto on_error;
         }
@@ -1260 +1265 @@
     pj_status_t status;
     pjsip_transaction *tsx = NULL;
+    pj_bool_t processed = PJ_FALSE;
     unsigned i;
 
@@ -1317 +1323 @@
     /* Report the request to dialog usages. */
     for (i=0; i<dlg->usage_cnt; ++i) {
-        pj_bool_t processed;
 
         if (!dlg->usage[i]->on_rx_request)
@@ -1331 +1336 @@
     if (tsx)
         pjsip_tsx_recv_msg(tsx, rdata);
+
+    /* If no dialog usages has claimed the processing of the transaction,
+     * and if transaction has not sent final response, respond with
+     * 500/Internal Server Error.
+     */
+    if (!processed && tsx && tsx->status_code < 200) {
+        pjsip_tx_data *tdata;
+        const pj_str_t reason = { "No session found", 16};
+
+        PJ_LOG(4,(tsx->obj_name, "Incoming request was unhandled by "
+                                 "dialog usages, sending 500 response"));
+
+        status = pjsip_dlg_create_response(dlg, rdata, 500, &reason, &tdata);
+        if (status == PJ_SUCCESS) {
+            status = pjsip_dlg_send_response(dlg, tsx, tdata);
+        }
+    }
 
 on_return: