Changeset 2271 for pjproject/trunk

Timestamp:

Sep 11, 2008 8:00:47 AM (16 years ago)

Author:

bennylp

Message:

Ticket #620: PRACK is sent to the wrong UAS when 100rel is used and the dialog forks (thanks Ruud Klaver for the report)

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-ua/sip_100rel.c (modified) (1 diff)
• pjsip/sip_dialog.c (modified) (2 diffs)

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

@@ -418 +418 @@
     pj_status_t status;
 
-    dd = (dlg_data*) inv->dlg->mod_data[mod_100rel.mod.id];
-    PJ_ASSERT_RETURN(dd != NULL, PJSIP_ENOTINITIALIZED);
-
     tsx = pjsip_rdata_get_tsx(rdata);
     pj_assert(tsx != NULL);
 
     msg = rdata->msg_info.msg;
+
+    dd = (dlg_data*) inv->dlg->mod_data[mod_100rel.mod.id];
+    if (dd == NULL) {
+        /* UAC sends us PRACK while we didn't send reliable provisional 
+         * response. Respond with 400 (?) 
+         */
+        const pj_str_t reason = pj_str("Unexpected PRACK");
+
+        status = pjsip_dlg_create_response(inv->dlg, rdata, 400, 
+                                           &reason, &tdata);
+        if (status == PJ_SUCCESS) {
+            status = pjsip_dlg_send_response(inv->dlg, tsx, tdata);
+        }
+        return PJSIP_ENOTINITIALIZED;
+    }
 
     /* Always reply with 200/OK for PRACK */

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

@@ -1697 +1697 @@
      * The workaround for this is to take the To tag received in the
      * 2xx response and set it as remote tag.
+     *
+     * New update:
+     * We also need to update the dialog for 1xx responses, to handle the
+     * case when 100rel is used, otherwise PRACK will be sent to the 
+     * wrong target.
      */
     if ((dlg->state == PJSIP_DIALOG_STATE_NULL && 
@@ -1705 +1710 @@
         (dlg->role==PJSIP_ROLE_UAC &&
          !dlg->uac_has_2xx &&
-         res_code/100 == 2 &&
+         res_code/100 <= 2 &&
          pjsip_method_creates_dialog(&rdata->msg_info.cseq->method) &&
          pj_strcmp(&dlg->remote.info->tag, &rdata->msg_info.to->tag)))