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

Timestamp:

Feb 23, 2006 1:49:28 PM (18 years ago)

Author:

bennylp

Message:

Added support for NULL frame in rtp stream, fixed bugs here and there in INVITE (e.g. dont send SDP on 180), and set version to 0.5.1.2

File:

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

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

@@ -880 +880 @@
                      PJ_EINVALIDOP);
 
+    /* Lock dialog. */
+    pjsip_dlg_inc_lock(inv->dlg);
+
     /* Create the INVITE request. */
     status = pjsip_dlg_create_request(inv->dlg, &pjsip_invite_method, -1,
                                       &tdata);
     if (status != PJ_SUCCESS)
-        return status;
+        goto on_return;
+
 
     /* If this is the first INVITE, then copy the headers from inv_hdr.
@@ -921 +925 @@
         status = pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
         if (status != PJ_SUCCESS)
-            return status;
+            goto on_return;
 
         tdata->msg->body = create_sdp_body(tdata->pool, offer);
@@ -946 +950 @@
     *p_tdata = tdata;
 
-    return PJ_SUCCESS;
+
+on_return:
+    pjsip_dlg_dec_lock(inv->dlg);
+    return status;
 }
 
@@ -1105 +1112 @@
 static pj_status_t process_answer( pjsip_inv_session *inv,
                                    int st_code,
-                                   pjsip_tx_data *tdata )
+                                   pjsip_tx_data *tdata,
+                                   const pjmedia_sdp_session *local_sdp)
 {
     pj_status_t status;
     pjmedia_sdp_session *sdp = NULL;
-
-    /* Include SDP for 18x and 2xx response. 
-     * Also if SDP negotiator is ready, start negotiation.
-     */
-    if (st_code/10 == 18 || st_code/10 == 20) {
-
-        pjmedia_sdp_neg_state neg_state;
-
-        neg_state = inv->neg ? pjmedia_sdp_neg_get_state(inv->neg) :
-                    PJMEDIA_SDP_NEG_STATE_NULL;
-
-        if (neg_state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) {
-
-            status = pjmedia_sdp_neg_get_neg_local(inv->neg, &sdp);
-
-        } else if (neg_state == PJMEDIA_SDP_NEG_STATE_WAIT_NEGO &&
-                   pjmedia_sdp_neg_has_local_answer(inv->neg) )
-        {
-
-            status = inv_negotiate_sdp(inv);
-            if (status != PJ_SUCCESS)
-                return status;
-            
-            status = pjmedia_sdp_neg_get_active_local(inv->neg, &sdp);
-        }
-
-    }
-
-
-
-    /* Include SDP when it's available.
-     * Subsequent response will include this SDP.
-     */
-    if (sdp) {
-        tdata->msg->body = create_sdp_body(tdata->pool, sdp);
-    }
-
-    /* Remove message body if this is a non-2xx final response */
-    if (st_code >= 300)
-        tdata->msg->body = NULL;
-
-
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Answer initial INVITE
- * Re-INVITE will be answered automatically, and will not use this function.
- */ 
-PJ_DEF(pj_status_t) pjsip_inv_answer(   pjsip_inv_session *inv,
-                                        int st_code,
-                                        const pj_str_t *st_text,
-                                        const pjmedia_sdp_session *local_sdp,
-                                        pjsip_tx_data **p_tdata )
-{
-    pjsip_tx_data *last_res;
-    pj_status_t status;
-
-    /* Verify arguments. */
-    PJ_ASSERT_RETURN(inv && p_tdata, PJ_EINVAL);
-
-    /* Must have INVITE transaction. */
-    PJ_ASSERT_RETURN(inv->invite_tsx, PJ_EBUG);
-
-    /* INVITE transaction MUST have transmitted a response (e.g. 100) */
-    PJ_ASSERT_RETURN(inv->invite_tsx->last_tx, PJ_EINVALIDOP);
 
     /* If local_sdp is specified, then we MUST NOT have answered the
@@ -1199 +1140 @@
         if (status != PJ_SUCCESS)
             return status;
-    }
-
-
-
+
+    }
+
+
+     /* If SDP negotiator is ready, start negotiation. */
+    if (st_code/100==2 || (st_code/10==18 && st_code!=180)) {
+
+        pjmedia_sdp_neg_state neg_state;
+
+        /* Start nego when appropriate. */
+        neg_state = inv->neg ? pjmedia_sdp_neg_get_state(inv->neg) :
+                    PJMEDIA_SDP_NEG_STATE_NULL;
+
+        if (neg_state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) {
+
+            status = pjmedia_sdp_neg_get_neg_local(inv->neg, &sdp);
+
+        } else if (neg_state == PJMEDIA_SDP_NEG_STATE_WAIT_NEGO &&
+                   pjmedia_sdp_neg_has_local_answer(inv->neg) )
+        {
+
+            status = inv_negotiate_sdp(inv);
+            if (status != PJ_SUCCESS)
+                return status;
+            
+            status = pjmedia_sdp_neg_get_active_local(inv->neg, &sdp);
+        }
+    }
+
+    /* Include SDP when it's available for 2xx and 18x (but not 180) response.
+     * Subsequent response will include this SDP.
+     */
+    if (sdp) {
+        tdata->msg->body = create_sdp_body(tdata->pool, sdp);
+    }
+
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Create first response to INVITE
+ */
+PJ_DEF(pj_status_t) pjsip_inv_initial_answer(   pjsip_inv_session *inv,
+                                                pjsip_rx_data *rdata,
+                                                int st_code,
+                                                const pj_str_t *st_text,
+                                                const pjmedia_sdp_session *sdp,
+                                                pjsip_tx_data **p_tdata)
+{
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+
+    /* Verify arguments. */
+    PJ_ASSERT_RETURN(inv && p_tdata, PJ_EINVAL);
+
+    /* Must have INVITE transaction. */
+    PJ_ASSERT_RETURN(inv->invite_tsx, PJ_EBUG);
+
+    pjsip_dlg_inc_lock(inv->dlg);
+
+    /* Create response */
+    status = pjsip_dlg_create_response(inv->dlg, rdata, st_code, st_text,
+                                       &tdata);
+    if (status != PJ_SUCCESS)
+        goto on_return;
+
+    /* Process SDP in answer */
+    status = process_answer(inv, st_code, tdata, sdp);
+    if (status != PJ_SUCCESS) {
+        pjsip_tx_data_dec_ref(tdata);
+        goto on_return;
+    }
+
+    *p_tdata = tdata;
+
+on_return:
+    pjsip_dlg_dec_lock(inv->dlg);
+    return status;
+}
+
+
+/*
+ * Answer initial INVITE
+ * Re-INVITE will be answered automatically, and will not use this function.
+ */ 
+PJ_DEF(pj_status_t) pjsip_inv_answer(   pjsip_inv_session *inv,
+                                        int st_code,
+                                        const pj_str_t *st_text,
+                                        const pjmedia_sdp_session *local_sdp,
+                                        pjsip_tx_data **p_tdata )
+{
+    pjsip_tx_data *last_res;
+    pj_status_t status;
+
+    /* Verify arguments. */
+    PJ_ASSERT_RETURN(inv && p_tdata, PJ_EINVAL);
+
+    /* Must have INVITE transaction. */
+    PJ_ASSERT_RETURN(inv->invite_tsx, PJ_EBUG);
+
+    /* INVITE transaction MUST have transmitted a response (e.g. 100) */
+    PJ_ASSERT_RETURN(inv->invite_tsx->last_tx, PJ_EINVALIDOP);
+
+    pjsip_dlg_inc_lock(inv->dlg);
 
     /* Modify last response. */
@@ -1208 +1251 @@
     status = pjsip_dlg_modify_response(inv->dlg, last_res, st_code, st_text);
     if (status != PJ_SUCCESS)
-        return status;
+        goto on_return;
 
 
     /* Process SDP in answer */
-    status = process_answer(inv, st_code, last_res);
-    if (status != PJ_SUCCESS)
-        return status;
+    status = process_answer(inv, st_code, last_res, local_sdp);
+    if (status != PJ_SUCCESS) {
+        pjsip_tx_data_dec_ref(last_res);
+        goto on_return;
+    }
 
 
     *p_tdata = last_res;
 
-    return PJ_SUCCESS;
+on_return:
+    pjsip_dlg_dec_lock(inv->dlg);
+    return status;
 }
 
@@ -1467 +1514 @@
          * request.
          */
-        PJ_ASSERT_RETURN((cseq=pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CSEQ, NULL)) != NULL &&
-                         (cseq->cseq == inv->invite_tsx->cseq),
+        PJ_ASSERT_RETURN((cseq=pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CSEQ, NULL))!=NULL
+                          && (cseq->cseq == inv->invite_tsx->cseq),
                          PJ_EINVALIDOP);
 
@@ -1625 +1672 @@
     if (tsx->method.id == PJSIP_INVITE_METHOD) {
 
+        /* Keep the initial INVITE transaction. */
+        if (inv->invite_tsx == NULL)
+            inv->invite_tsx = tsx;
+
         if (dlg->role == PJSIP_ROLE_UAC) {
-
-            /* Keep the initial INVITE transaction. */
-            if (inv->invite_tsx == NULL)
-                inv->invite_tsx = tsx;
 
             switch (tsx->state) {
@@ -1636 +1683 @@
                 break;
             default:
-                pj_assert(!"Unexpected state");
+                inv_on_state_calling(inv, e);
                 break;
             }
@@ -1651 +1698 @@
                 break;
             default:
-                pj_assert(!"Unexpected state");
+                inv_on_state_incoming(inv, e);
+                break;
             }
         }
@@ -1675 +1723 @@
 
         switch (tsx->state) {
+
+        case PJSIP_TSX_STATE_CALLING:
+            inv_set_state(inv, PJSIP_INV_STATE_CALLING, e);
+            break;
 
         case PJSIP_TSX_STATE_PROCEEDING:
@@ -1807 +1859 @@
         switch (tsx->state) {
 
+        case PJSIP_TSX_STATE_TRYING:
+            inv_set_state(inv, PJSIP_INV_STATE_INCOMING, e);
+            break;
+
         case PJSIP_TSX_STATE_PROCEEDING:
             /*
@@ -2130 +2186 @@
 
             /* Process SDP in the answer */
-            status = process_answer(inv, 200, tdata);
+            status = process_answer(inv, 200, tdata, NULL);
             if (status != PJ_SUCCESS)
                 return;