Changeset 1467

Timestamp:

Oct 1, 2007 12:22:52 PM (17 years ago)

Author:

bennylp

Message:

Related to ticket #385: bug in 100rel causing 2xx response to be queued indefinitely when UAS previously sent 1xx response with SDP

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_100rel.c (modified) (4 diffs)

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

@@ -102 +102 @@
         pj_int32_t       cseq;
         pj_uint32_t      rseq;  /* Initialized to -1 */
-        pj_bool_t        has_sdp;
         tx_data_list_t   tx_data_list;
         unsigned         retransmit_count;
@@ -616 +615 @@
 }
 
+/* Check if pending response has SDP */
+static pj_bool_t has_sdp(dlg_data *dd)
+{
+        tx_data_list_t *tl;
+
+        tl = dd->uas_state->tx_data_list.next;
+        while (tl != &dd->uas_state->tx_data_list) {
+                if (tl->tdata->msg->body)
+                        return PJ_TRUE;
+                tl = tl->next;
+        }
+
+        return PJ_FALSE;
+}
+
+
+/* Send response reliably */
 PJ_DEF(pj_status_t) pjsip_100rel_tx_response(pjsip_inv_session *inv,
                                              pjsip_tx_data *tdata)
@@ -679 +695 @@
                 */
 
-                if (dd->uas_state && dd->uas_state->has_sdp) {
+                if (dd->uas_state && has_sdp(dd)) {
                         /* Yes we have transmitted 1xx with SDP reliably.
                          * In this case, must queue the 2xx response.
@@ -821 +837 @@
                 }
 
-                /* Update SDP flag. Need to call this after the response
-                 * is scheduled for transmission.
-                 */
-                dd->uas_state->has_sdp |= (tdata->msg->body != NULL);
         }