Changeset 1561 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Nov 8, 2007 9:24:30 AM (16 years ago)

Author:

bennylp

Message:

• Added option to send empty Authorization header in outgoing requests
• When UAS has sent answer in reliable 1xx, do not put SDP in 2xx
• Handle the case when UPDATE is challenged with 401/407
• Obsolete --service-route option in pjsua

File:

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

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

@@ -1564 +1564 @@
     /* Include SDP when it's available for 2xx and 18x (but not 180) response.
      * Subsequent response will include this SDP.
+     *
+     * Note note:
+     *  - When offer/answer has been completed in reliable 183, we MUST NOT
+     *    send SDP in 2xx response. So if we don't have SDP to send, clear
+     *    the SDP in the message body ONLY if 100rel is active in this 
+     *    session.
      */
     if (sdp) {
         tdata->msg->body = create_sdp_body(tdata->pool, sdp);
+    } else {
+        if (inv->options & PJSIP_INV_REQUIRE_100REL) {
+            tdata->msg->body = NULL;
+        }
     }
 
@@ -2227 +2237 @@
     pj_status_t status = -1;
 
+    /* Handle 401/407 challenge. */
+    if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
+        (tsx->status_code == 401 || tsx->status_code == 407)) {
+
+        pjsip_tx_data *tdata;
+        
+        status = pjsip_auth_clt_reinit_req( &inv->dlg->auth_sess, 
+                                            e->body.tsx_state.src.rdata,
+                                            tsx->last_tx,
+                                            &tdata);
+        
+        if (status != PJ_SUCCESS) {
+            
+            /* Does not have proper credentials. 
+             * End the session anyway.
+             */
+            inv_set_cause(inv, PJSIP_SC_OK, NULL);
+            inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+            
+        } else {
+            /* Re-send BYE. */
+            status = pjsip_inv_send_msg(inv, tdata);
+        }
+
     /* Process 2xx response */
-    if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
+    } else if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
         tsx->status_code/100 == 2 &&
         e->body.tsx_state.src.rdata->msg_info.msg->body)