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

Timestamp:

Sep 18, 2011 2:59:56 PM (13 years ago)

Author:

bennylp

Message:

Modified the libraries to use the new log indentation feature re #1372

File:

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

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

@@ -1917 +1917 @@
     PJ_ASSERT_RETURN(inv->invite_tsx, PJ_EBUG);
 
+    pj_log_push_indent();
+
     pjsip_dlg_inc_lock(inv->dlg);
 
@@ -1964 +1966 @@
 on_return:
     pjsip_dlg_dec_lock(inv->dlg);
+    pj_log_pop_indent();
     return status;
 }
@@ -1990 +1993 @@
     PJ_ASSERT_RETURN(inv->last_answer, PJ_EINVALIDOP);
 
+    pj_log_push_indent();
+
     pjsip_dlg_inc_lock(inv->dlg);
 
@@ -2017 +2022 @@
 on_return:
     pjsip_dlg_dec_lock(inv->dlg);
+    pj_log_pop_indent();
     return status;
 }
@@ -2052 +2058 @@
     /* Verify arguments. */
     PJ_ASSERT_RETURN(inv && p_tdata, PJ_EINVAL);
+
+    pj_log_push_indent();
 
     /* Set cause code. */
@@ -2082 +2090 @@
                 PJ_LOG(4, (inv->obj_name, "Delaying CANCEL since no "
                            "provisional response is received yet"));
+                pj_log_pop_indent();
                 return PJ_SUCCESS;
             }
@@ -2093 +2102 @@
                                                inv->invite_tsx->last_tx,
                                                &tdata);
-            if (status != PJ_SUCCESS)
+            if (status != PJ_SUCCESS) {
+                pj_log_pop_indent();
                 return status;
+            }
 
             /* Set timeout for the INVITE transaction, in case UAS is not
@@ -2126 +2137 @@
     case PJSIP_INV_STATE_DISCONNECTED:
         /* No need to do anything. */
+        pj_log_pop_indent();
         return PJSIP_ESESSIONTERMINATED;
 
     default:
         pj_assert("!Invalid operation!");
+        pj_log_pop_indent();
         return PJ_EINVALIDOP;
     }
 
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        pj_log_pop_indent();
         return status;
+    }
 
 
@@ -2142 +2157 @@
     *p_tdata = tdata;
 
+    pj_log_pop_indent();
     return PJ_SUCCESS;
 }
@@ -2364 +2380 @@
         return PJ_EINVALIDOP;
 
+    pj_log_push_indent();
 
     pjsip_dlg_inc_lock(inv->dlg);
@@ -2434 +2451 @@
 on_return:
     pjsip_dlg_dec_lock(inv->dlg);
+    pj_log_pop_indent();
     return status;
 }
@@ -2460 +2478 @@
     PJ_ASSERT_RETURN(inv->state < PJSIP_INV_STATE_DISCONNECTED,
                      PJ_EINVALIDOP);
+
+    pj_log_push_indent();
 
     /* Lock dialog. */
@@ -2523 +2543 @@
     *p_tdata = tdata;
 
+    pj_log_pop_indent();
     return PJ_SUCCESS;
 
@@ -2532 +2553 @@
     pjsip_dlg_dec_lock(inv->dlg);
 
+    pj_log_pop_indent();
     return status;
 }
@@ -2594 +2616 @@
     PJ_ASSERT_RETURN(inv && tdata, PJ_EINVAL);
 
+    pj_log_push_indent();
+
     PJ_LOG(5,(inv->obj_name, "Sending %s", 
               pjsip_tx_data_get_info(tdata)));
@@ -2608 +2632 @@
             pjsip_tx_data_dec_ref(tdata);
             pjsip_dlg_dec_lock(inv->dlg);
-            return PJ_EINVALIDOP;
+            status = PJ_EINVALIDOP;
+            goto on_error;
         }
 
@@ -2619 +2644 @@
         status = pjsip_dlg_send_request(inv->dlg, tdata, mod_inv.mod.id, 
                                         tsx_inv_data);
-        if (status != PJ_SUCCESS)
-            return status;
+        if (status != PJ_SUCCESS) {
+            goto on_error;
+        }
 
     } else {
@@ -2639 +2665 @@
         }
 
-        if (status != PJ_SUCCESS)
-            return status;
-    }
-
-    /* Done (?) */
+        if (status != PJ_SUCCESS) {
+            goto on_error;
+        }
+    }
+
+    /* Done */
+    pj_log_pop_indent();
     return PJ_SUCCESS;
+
+on_error:
+    pj_log_pop_indent();
+    return status;
 }