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

Timestamp:

Aug 11, 2009 4:26:20 PM (15 years ago)

Author:

nanang

Message:

Ticket #833:

• Renamed pjsip_timer_default_setting() to pjsip_timer_setting_default().
• Updated session timer settings in pjsua-lib as whole session timer setting struct (pyhton version remains using se & min_se).
• Added output param SIP status code in pjsip_timer_process_resp() and pjsip_timer_process_req() to specify the corresponding SIP status code when function returning non-PJ_SUCCESS.
• Fixed print header functions in sip_timer.c to have buffer check.
• Added PJSIP_SESS_TIMER_DEF_SE setting to specify the default value of session timer interval.
• Fixed role reference of the refresher, it is transaction role, not dialog role.

File:

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

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

@@ -485 +485 @@
     pjsip_msg *msg = rdata->msg_info.msg;
     pj_status_t status;
+    pjsip_status_code st_code;
 
     dlg = pjsip_rdata_get_dlg(rdata);
@@ -513 +514 @@
 
     /* Pass response to timer session module */
-    status = pjsip_timer_process_resp(inv, rdata);
+    status = pjsip_timer_process_resp(inv, rdata, &st_code);
     if (status != PJ_SUCCESS) {
         pjsip_event e;
@@ -521 +522 @@
         inv_send_ack(inv, &e);
 
-        status = pjsip_inv_end_session(inv, PJSIP_ERRNO_TO_SIP_STATUS(status),
-                                       NULL, &tdata);
+        status = pjsip_inv_end_session(inv, st_code, NULL, &tdata);
         if (tdata && status == PJ_SUCCESS)
             pjsip_inv_send_msg(inv, tdata);
@@ -975 +975 @@
     if ( ((*options & PJSIP_INV_REQUIRE_100REL)!=0 && 
           (rem_option & PJSIP_INV_SUPPORT_100REL)==0) ||
-         ((*options & PJSIP_INV_REQUIRE_100REL)!=0 && 
-          (rem_option & PJSIP_INV_SUPPORT_100REL)==0))
+         ((*options & PJSIP_INV_REQUIRE_TIMER)!=0 && 
+          (rem_option & PJSIP_INV_SUPPORT_TIMER)==0))
     {
         code = PJSIP_SC_EXTENSION_REQUIRED;
@@ -1756 +1756 @@
     pjsip_tx_data *tdata;
     pj_status_t status;
+    pjsip_status_code st_code2;
 
     /* Verify arguments. */
@@ -1772 +1773 @@
 
     /* Invoke Session Timers module */
-    status = pjsip_timer_process_req(inv, rdata);
+    status = pjsip_timer_process_req(inv, rdata, &st_code2);
     if (status != PJ_SUCCESS) {
         pj_status_t status2;
 
-        status2 = pjsip_dlg_modify_response(inv->dlg, tdata, 
-                                            PJSIP_ERRNO_TO_SIP_STATUS(status),
-                                            NULL);
+        status2 = pjsip_dlg_modify_response(inv->dlg, tdata, st_code2, NULL);
         if (status2 != PJ_SUCCESS) {
             pjsip_tx_data_dec_ref(tdata);
@@ -2639 +2638 @@
     pj_status_t status;
     pjsip_tx_data *tdata = NULL;
+    pjsip_status_code st_code;
 
     /* Invoke Session Timers module */
-    status = pjsip_timer_process_req(inv, rdata);
+    status = pjsip_timer_process_req(inv, rdata, &st_code);
     if (status != PJ_SUCCESS) {
-        status = pjsip_dlg_create_response(inv->dlg, rdata, 
-                                           PJSIP_ERRNO_TO_SIP_STATUS(status),
+        status = pjsip_dlg_create_response(inv->dlg, rdata, st_code,
                                            NULL, &tdata);
         goto on_return;
@@ -3660 +3659 @@
             pjsip_tx_data *tdata;
             pj_status_t status;
+            pjsip_status_code st_code;
 
             /* Check if we have INVITE pending. */
@@ -3683 +3683 @@
 
             /* Process session timers headers in the re-INVITE */
-            status = pjsip_timer_process_req(inv, rdata);
+            status = pjsip_timer_process_req(inv, rdata, &st_code);
             if (status != PJ_SUCCESS) {
-                status = pjsip_dlg_create_response(inv->dlg, rdata, 
-                                           PJSIP_ERRNO_TO_SIP_STATUS(status), 
-                                           NULL, &tdata);
+                status = pjsip_dlg_create_response(inv->dlg, rdata, st_code,
+                                                   NULL, &tdata);
                 if (status != PJ_SUCCESS)
                     return;