Changeset 3753 for pjproject/trunk/pjnath/src/pjnath/ice_strans.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/pjnath/src/pjnath/ice_strans.c (modified) (17 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -406 +406 @@
                       comp_id));
 
+            pj_log_push_indent();
+
             /* Start Binding resolution */
             status = pj_stun_sock_start(comp->stun_sock, 
@@ -413 +415 @@
             if (status != PJ_SUCCESS) {
                 ///sess_dec_ref(ice_st);
+                pj_log_pop_indent();
                 return status;
             }
@@ -420 +423 @@
             if (status != PJ_SUCCESS) {
                 ///sess_dec_ref(ice_st);
+                pj_log_pop_indent();
                 return status;
             }
@@ -438 +442 @@
             comp->default_cand = cand - comp->cand_list;
 
+            pj_log_pop_indent();
         }
 
@@ -537 +542 @@
               "Creating ICE stream transport with %d component(s)",
               comp_cnt));
+    pj_log_push_indent();
 
     pj_ice_strans_cfg_copy(pool, &ice_st->cfg, cfg);
@@ -551 +557 @@
     if (status != PJ_SUCCESS) {
         destroy_ice_st(ice_st);
+        pj_log_pop_indent();
         return status;
     }
@@ -571 +578 @@
             pj_lock_release(ice_st->init_lock);
             destroy_ice_st(ice_st);
+            pj_log_pop_indent();
             return status;
         }
@@ -584 +592 @@
 
     *p_ice_st = ice_st;
+    pj_log_pop_indent();
+
     return PJ_SUCCESS;
 }
@@ -591 +601 @@
 {
     unsigned i;
+
+    PJ_LOG(5,(ice_st->obj_name, "ICE stream transport destroying.."));
+    pj_log_push_indent();
 
     /* Destroy ICE if we have ICE */
@@ -630 +643 @@
     }
 
+    PJ_LOG(4,(ice_st->obj_name, "ICE stream transport destroyed"));
+
     /* Done */
     pj_pool_release(ice_st->pool);
+    pj_log_pop_indent();
 }
 
@@ -665 +681 @@
     pj_strerror(status, errmsg, sizeof(errmsg));
     PJ_LOG(4,(ice_st->obj_name, "%s: %s", title, errmsg));
-
-    if (op==PJ_ICE_STRANS_OP_INIT && ice_st->cb_called)
+    pj_log_push_indent();
+
+    if (op==PJ_ICE_STRANS_OP_INIT && ice_st->cb_called) {
+        pj_log_pop_indent();
         return;
+    }
 
     ice_st->cb_called = PJ_TRUE;
@@ -673 +692 @@
     if (ice_st->cb.on_ice_complete)
         (*ice_st->cb.on_ice_complete)(ice_st, op, status);
+
+    pj_log_pop_indent();
 }
 
@@ -710 +731 @@
 PJ_DEF(pj_status_t) pj_ice_strans_destroy(pj_ice_strans *ice_st)
 {
-    char obj_name[PJ_MAX_OBJ_NAME];
-
     PJ_ASSERT_RETURN(ice_st, PJ_EINVAL);
 
@@ -721 +740 @@
     }
     
-    pj_memcpy(obj_name, ice_st->obj_name, PJ_MAX_OBJ_NAME);
     destroy_ice_st(ice_st);
-
-    PJ_LOG(4,(obj_name, "ICE stream transport destroyed"));
     return PJ_SUCCESS;
 }
@@ -1295 +1311 @@
                                                PJ_ICE_STRANS_STATE_FAILED;
 
+        pj_log_push_indent();
         (*ice_st->cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_NEGOTIATION, 
                                       status);
-
+        pj_log_pop_indent();
         
     }
@@ -1616 +1633 @@
     PJ_LOG(5,(comp->ice_st->obj_name, "TURN client state changed %s --> %s",
               pj_turn_state_name(old_state), pj_turn_state_name(new_state)));
+    pj_log_push_indent();
 
     sess_add_ref(comp->ice_st);
@@ -1691 +1709 @@
 
     sess_dec_ref(comp->ice_st);
-}
-
+
+    pj_log_pop_indent();
+}
+