Changeset 2951

Timestamp:

Oct 16, 2009 6:28:56 AM (15 years ago)

Author:

nanang

Message:

Ticket #954 (issue no 2): Updated session timer to process 2xx response in mod_inv state handlers (was in mod_inv_on_rx_response()).

File:

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

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

@@ -109 +109 @@
                                    const pjmedia_sdp_session *local_sdp);
 
+static pj_status_t handle_timer_response(pjsip_inv_session *inv,
+                                         const pjsip_rx_data *rdata,
+                                         pj_bool_t end_sess_on_failure);
+
 static void (*inv_state_handler[])( pjsip_inv_session *inv, pjsip_event *e) = 
 {
@@ -478 +482 @@
 }
 
+/* This function will process Session Timer headers in received 
+ * 2xx or 422 response of INVITE/UPDATE request.
+ */
+static pj_status_t handle_timer_response(pjsip_inv_session *inv,
+                                         const pjsip_rx_data *rdata,
+                                         pj_bool_t end_sess_on_failure)
+{
+    pjsip_status_code st_code;
+    pj_status_t status;
+
+    status = pjsip_timer_process_resp(inv, rdata, &st_code);
+    if (status != PJ_SUCCESS && end_sess_on_failure) {
+        pjsip_tx_data *tdata;
+        pj_status_t status2;
+
+        status2 = pjsip_inv_end_session(inv, st_code, NULL, &tdata);
+        if (tdata && status2 == PJ_SUCCESS)
+            pjsip_inv_send_msg(inv, tdata);
+    }
+
+    return status;
+}
+
 /*
  * Module on_rx_response().
@@ -491 +518 @@
     pjsip_inv_session *inv;
     pjsip_msg *msg = rdata->msg_info.msg;
-    pj_status_t status;
-    pjsip_status_code st_code;
 
     dlg = pjsip_rdata_get_dlg(rdata);
@@ -518 +543 @@
         return PJ_TRUE;
 
-    }
-
-    /* Pass response to timer session module */
-    status = pjsip_timer_process_resp(inv, rdata, &st_code);
-    if (status != PJ_SUCCESS) {
-        pjsip_event e;
-        pjsip_tx_data *tdata;
-
-        PJSIP_EVENT_INIT_RX_MSG(e, rdata);
-        inv_send_ack(inv, &e);
-
-        status = pjsip_inv_end_session(inv, st_code, NULL, &tdata);
-        if (tdata && status == PJ_SUCCESS)
-            pjsip_inv_send_msg(inv, tdata);
-
-        return PJ_TRUE;
     }
 
@@ -2775 +2784 @@
     /* Handle 401/407 challenge. */
     if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
-        (tsx->status_code == 401 || tsx->status_code == 407)) {
-
+        (tsx->status_code == 401 || tsx->status_code == 407))
+    {
         pjsip_tx_data *tdata;
         
@@ -2799 +2808 @@
             status = pjsip_inv_send_msg(inv, tdata);
         }
+    }
+
+    /* Process 422 response */
+    else if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
+             tsx->status_code == 422)
+    {
+        status = handle_timer_response(inv, e->body.tsx_state.src.rdata,
+                                       PJ_FALSE);
+    }
 
     /* Process 2xx response */
-    } else 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)
     {
+        status = handle_timer_response(inv, e->body.tsx_state.src.rdata,
+                                       PJ_FALSE);
         status = inv_check_sdp_in_incoming_msg(inv, tsx, 
-                                            e->body.tsx_state.src.rdata);
-
-    } else {
-        /* Get/attach invite session's transaction data */
+                                             e->body.tsx_state.src.rdata);
+    }
+    
+    /* Get/attach invite session's transaction data */
+    else 
+    {
         tsx_inv_data = (struct tsx_inv_data*)tsx->mod_data[mod_inv.mod.id];
         if (tsx_inv_data == NULL) {
@@ -2975 +2997 @@
  *  - resend request on 401 or 407 response.
  *  - terminate dialog on 408 and 481 response.
+ *  - resend request on 422 response.
  */
 static pj_bool_t handle_uac_tsx_response(pjsip_inv_session *inv, 
@@ -3055 +3078 @@
 
         return PJ_TRUE; /* Handled */
+    }
+
+    /* Handle session timer 422 response. */
+    else if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
+             tsx->status_code == PJSIP_SC_SESSION_TIMER_TOO_SMALL) 
+    {
+        handle_timer_response(inv, e->body.tsx_state.src.rdata, 
+                              PJ_FALSE);
+
+        return PJ_TRUE; /* Handled */
 
     } else {
@@ -3142 +3175 @@
         }
 
+    } else if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
+               tsx->status_code == PJSIP_SC_SESSION_TIMER_TOO_SMALL) 
+    {
+        /* Handle session timer 422 response:
+         * Resend the request with requested session timer setting.
+         */
+        status = handle_timer_response(inv, e->body.tsx_state.src.rdata,
+                                       PJ_TRUE);
+
     } else if (PJSIP_IS_STATUS_IN_CLASS(tsx->status_code, 600)) {
         /* Global error */
@@ -3213 +3255 @@
         case PJSIP_TSX_STATE_COMPLETED:
             if (tsx->status_code/100 == 2) {
-                
+
                 /* This should not happen.
                  * When transaction receives 2xx, it should be terminated
                  */
                 pj_assert(0);
+
+                /* Process session timer response. */
+                status = handle_timer_response(inv,
+                                               e->body.tsx_state.src.rdata,
+                                               PJ_TRUE);
+                if (status != PJ_SUCCESS)
+                    break;
+
                 inv_set_state(inv, PJSIP_INV_STATE_CONNECTING, e);
     
@@ -3235 +3285 @@
             if (tsx->status_code/100 == 2) {
                 /* This must be receipt of 2xx response */
+
+                /* Process session timer response. */
+                status = handle_timer_response(inv,
+                                               e->body.tsx_state.src.rdata,
+                                               PJ_TRUE);
+                if (status != PJ_SUCCESS)
+                    break;
 
                 /* Set state to CONNECTING */
@@ -3387 +3444 @@
                 inv_set_state(inv, PJSIP_INV_STATE_CONNECTING, e);
                 if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) {
+                    pj_status_t status;
+
+                    /* Process session timer response. */
+                    status = handle_timer_response(inv, 
+                                                   e->body.tsx_state.src.rdata,
+                                                   PJ_TRUE);
+                    if (status != PJ_SUCCESS)
+                        break;
+
                     inv_check_sdp_in_incoming_msg(inv, tsx, 
                                                   e->body.tsx_state.src.rdata);
@@ -3418 +3484 @@
 
                 if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) {
+                    pj_status_t status;
+                    
+                    /* Process session timer response. */
+                    status = handle_timer_response(inv, 
+                                                   e->body.tsx_state.src.rdata,
+                                                   PJ_TRUE);
+                    if (status != PJ_SUCCESS)
+                        break;
+
                     inv_check_sdp_in_incoming_msg(inv, tsx, 
                                                   e->body.tsx_state.src.rdata);
@@ -3886 +3961 @@
                    tsx->status_code/100 == 2) 
         {
+            pj_status_t status;
 
             /* Re-INVITE was accepted. */
+
+            /* Process session timer response. */
+            status = handle_timer_response(inv, 
+                                           e->body.tsx_state.src.rdata,
+                                           PJ_TRUE);
+            if (status != PJ_SUCCESS)
+                return;
 
             /* Process SDP */
@@ -3946 +4029 @@
     } else if (tsx->role == PJSIP_ROLE_UAC) {
         /*
-         * Handle 401/407/408/481 response
+         * Handle 401/407/408/481/422 response
          */
         handle_uac_tsx_response(inv, e);
@@ -3993 +4076 @@
     } else if (tsx->role == PJSIP_ROLE_UAC) {
         /*
-         * Handle 401/407/408/481 response
+         * Handle 401/407/408/481/422 response
          */
         handle_uac_tsx_response(inv, e);