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

Timestamp:

Feb 8, 2006 10:44:25 PM (18 years ago)

Author:

bennylp

Message:

Finished invite session UAS implementation

File:

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

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

@@ -110 +110 @@
 
 /*
+ * Set session state.
+ */
+void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state,
+                   pjsip_event *e)
+{
+    inv->state = state;
+    if (mod_inv.cb.on_state_changed)
+        (*mod_inv.cb.on_state_changed)(inv, e);
+
+    if (inv->state == PJSIP_INV_STATE_DISCONNECTED)
+        pjsip_dlg_dec_session(inv->dlg);
+}
+
+
+/*
  * Send ACK for 2xx response.
  */
@@ -146 +161 @@
 {
     pjsip_method *method;
+    pjsip_dialog *dlg;
+    pjsip_inv_session *inv;
 
     /* Only wants to receive request from a dialog. */
-    if (pjsip_rdata_get_dlg(rdata) == NULL)
+    dlg = pjsip_rdata_get_dlg(rdata);
+    if (dlg == NULL)
         return PJ_FALSE;
+
+    inv = dlg->mod_data[mod_inv.mod.id];
 
     /* Report to dialog that we handle INVITE, CANCEL, BYE, ACK. 
@@ -159 +179 @@
     if (method->id == PJSIP_INVITE_METHOD ||
         method->id == PJSIP_CANCEL_METHOD ||
-        method->id == PJSIP_ACK_METHOD ||
         method->id == PJSIP_BYE_METHOD)
     {
         return PJ_TRUE;
+    }
+
+    /* On receipt ACK request, when state is CONNECTING,
+     * move state to CONFIRMED.
+     */
+    if (method->id == PJSIP_ACK_METHOD && inv &&
+        inv->state == PJSIP_INV_STATE_CONFIRMED)
+    {
+        pjsip_event event;
+
+        PJSIP_EVENT_INIT_RX_MSG(event, rdata);
+        inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, &event);
     }
 
@@ -703 +734 @@
     inv->pool = dlg->pool;
     inv->role = PJSIP_ROLE_UAS;
-    inv->state = PJSIP_INV_STATE_INCOMING;
+    inv->state = PJSIP_INV_STATE_NULL;
     inv->dlg = dlg;
     inv->options = options;
@@ -1067 +1098 @@
 
 
-void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state,
-                   pjsip_event *e)
-{
-    inv->state = state;
-    if (mod_inv.cb.on_state_changed)
-        (*mod_inv.cb.on_state_changed)(inv, e);
-
-    if (inv->state == PJSIP_INV_STATE_DISCONNECTED)
-        pjsip_dlg_dec_session(inv->dlg);
-}
-
-
-
 /*
  * Respond to incoming CANCEL request.
@@ -1164 +1182 @@
     if (inv->state != PJSIP_INV_STATE_DISCONNECTED)
         inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+}
+
+/*
+ * Respond to BYE request.
+ */
+static void inv_handle_bye_response( pjsip_inv_session *inv,
+                                     pjsip_transaction *tsx,
+                                     pjsip_rx_data *rdata,
+                                     pjsip_event *e )
+{
+    pj_status_t status;
+    
+    if (e->body.tsx_state.type != PJSIP_EVENT_RX_MSG) {
+        inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+        return;
+    }
+
+    /* Handle 401/407 challenge. */
+    if (tsx->status_code == 401 || tsx->status_code == 407) {
+
+        pjsip_tx_data *tdata;
+        
+        status = pjsip_auth_clt_reinit_req( &inv->dlg->auth_sess, 
+                                            rdata,
+                                            tsx->last_tx,
+                                            &tdata);
+        
+        if (status != PJ_SUCCESS) {
+            
+            /* Does not have proper credentials. 
+             * End the session anyway.
+             */
+            inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+            
+        } else {
+            /* Re-send BYE. */
+            status = pjsip_inv_send_msg(inv, tdata, NULL );
+        }
+
+    } else {
+
+        /* End the session. */
+
+        inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
+    }
+
 }
 
@@ -1197 +1261 @@
             case PJSIP_TSX_STATE_TRYING:
                 inv_set_state(inv, PJSIP_INV_STATE_INCOMING, e);
+                break;
+            case PJSIP_TSX_STATE_PROCEEDING:
+                inv_set_state(inv, PJSIP_INV_STATE_INCOMING, e);
+                if (tsx->status_code > 100)
+                    inv_set_state(inv, PJSIP_INV_STATE_EARLY, e);
                 break;
             default:
@@ -1464 +1533 @@
 
         case PJSIP_TSX_STATE_CONFIRMED:
+            if (tsx->status_code/100 == 2)
+                inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, e);
             break;
 
@@ -1496 +1567 @@
         inv_respond_incoming_bye( inv, tsx, e->body.tsx_state.src.rdata, e );
 
-    }
+    } else if (tsx->method.id == PJSIP_BYE_METHOD &&
+               tsx->role == PJSIP_ROLE_UAC &&
+               tsx->state == PJSIP_TSX_STATE_COMPLETED)
+    {
+
+        /*
+         * Outgoing BYE
+         */
+        inv_handle_bye_response( inv, tsx, e->body.tsx_state.src.rdata, e);
+
+    }
+
 }
 
@@ -1514 +1596 @@
         tsx->state == PJSIP_TSX_STATE_COMPLETED)
     {
+
         /*
-         * Outgoing BYE.
+         * Outgoing BYE
          */
-        pj_status_t status;
-        
-        /* Handle 401/407 challenge. */
-        if (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_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
-                
-            } else {
-                /* Re-send BYE. */
-                status = pjsip_inv_send_msg(inv, tdata, NULL );
-            }
-
-        } else {
-
-            /* End the session. */
-
+
+        if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+            inv_handle_bye_response( inv, tsx, e->body.tsx_state.src.rdata, e);
+        else
             inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e);
-        }
 
     }