1 files changed, 27 insertions, 7 deletions

diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c
index eb3d00ba..906f2683 100644
--- a/pjnath/src/pjnath/ice_strans.c
+++ b/pjnath/src/pjnath/ice_strans.c
@@ -405,6 +405,8 @@ static pj_status_t create_comp(pj_ice_strans *ice_st, unsigned comp_id)
 		      "Comp %d: srflx candidate starts Binding discovery",
 		      comp_id));
 
+	    pj_log_push_indent();
+
 	    /* Start Binding resolution */
 	    status = pj_stun_sock_start(comp->stun_sock, 
 					&ice_st->cfg.stun.server,
@@ -412,6 +414,7 @@ static pj_status_t create_comp(pj_ice_strans *ice_st, unsigned comp_id)
 					ice_st->cfg.resolver);
 	    if (status != PJ_SUCCESS) {
 		///sess_dec_ref(ice_st);
+		pj_log_pop_indent();
 		return status;
 	    }
 
@@ -419,6 +422,7 @@ static pj_status_t create_comp(pj_ice_strans *ice_st, unsigned comp_id)
 	    status = pj_stun_sock_get_info(comp->stun_sock, &stun_sock_info);
 	    if (status != PJ_SUCCESS) {
 		///sess_dec_ref(ice_st);
+		pj_log_pop_indent();
 		return status;
 	    }
 
@@ -437,6 +441,7 @@ static pj_status_t create_comp(pj_ice_strans *ice_st, unsigned comp_id)
 	    /* Set default candidate to srflx */
 	    comp->default_cand = cand - comp->cand_list;
 
+	    pj_log_pop_indent();
 	}
 
 	/* Add local addresses to host candidates, unless max_host_cands
@@ -536,6 +541,7 @@ PJ_DEF(pj_status_t) pj_ice_strans_create( const char *name,
     PJ_LOG(4,(ice_st->obj_name, 
 	      "Creating ICE stream transport with %d component(s)",
 	      comp_cnt));
+    pj_log_push_indent();
 
     pj_ice_strans_cfg_copy(pool, &ice_st->cfg, cfg);
     pj_memcpy(&ice_st->cb, cb, sizeof(*cb));
@@ -550,6 +556,7 @@ PJ_DEF(pj_status_t) pj_ice_strans_create( const char *name,
 					    &ice_st->init_lock);
     if (status != PJ_SUCCESS) {
 	destroy_ice_st(ice_st);
+	pj_log_pop_indent();
 	return status;
     }
 
@@ -570,6 +577,7 @@ PJ_DEF(pj_status_t) pj_ice_strans_create( const char *name,
 	if (status != PJ_SUCCESS) {
 	    pj_lock_release(ice_st->init_lock);
 	    destroy_ice_st(ice_st);
+	    pj_log_pop_indent();
 	    return status;
 	}
     }
@@ -583,6 +591,8 @@ PJ_DEF(pj_status_t) pj_ice_strans_create( const char *name,
     PJ_LOG(4,(ice_st->obj_name, "ICE stream transport created"));
 
     *p_ice_st = ice_st;
+    pj_log_pop_indent();
+
     return PJ_SUCCESS;
 }
 
@@ -591,6 +601,9 @@ static void destroy_ice_st(pj_ice_strans *ice_st)
 {
     unsigned i;
 
+    PJ_LOG(5,(ice_st->obj_name, "ICE stream transport destroying.."));
+    pj_log_push_indent();
+
     /* Destroy ICE if we have ICE */
     if (ice_st->ice) {
 	pj_ice_sess_destroy(ice_st->ice);
@@ -629,8 +642,11 @@ static void destroy_ice_st(pj_ice_strans *ice_st)
 	ice_st->busy_cnt = NULL;
     }
 
+    PJ_LOG(4,(ice_st->obj_name, "ICE stream transport destroyed"));
+
     /* Done */
     pj_pool_release(ice_st->pool);
+    pj_log_pop_indent();
 }
 
 /* Get ICE session state. */
@@ -664,14 +680,19 @@ static void sess_fail(pj_ice_strans *ice_st, pj_ice_strans_op op,
 
     pj_strerror(status, errmsg, sizeof(errmsg));
     PJ_LOG(4,(ice_st->obj_name, "%s: %s", title, errmsg));
+    pj_log_push_indent();
 
-    if (op==PJ_ICE_STRANS_OP_INIT && ice_st->cb_called)
+    if (op==PJ_ICE_STRANS_OP_INIT && ice_st->cb_called) {
+	pj_log_pop_indent();
 	return;
+    }
 
     ice_st->cb_called = PJ_TRUE;
 
     if (ice_st->cb.on_ice_complete)
 	(*ice_st->cb.on_ice_complete)(ice_st, op, status);
+
+    pj_log_pop_indent();
 }
 
 /* Update initialization status */
@@ -709,8 +730,6 @@ static void sess_init_update(pj_ice_strans *ice_st)
  */
 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);
 
     ice_st->destroy_req = PJ_TRUE;
@@ -720,10 +739,7 @@ PJ_DEF(pj_status_t) pj_ice_strans_destroy(pj_ice_strans *ice_st)
 	return PJ_EPENDING;
     }
     
-    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;
 }
 
@@ -1294,9 +1310,10 @@ static void on_ice_complete(pj_ice_sess *ice, pj_status_t status)
 	ice_st->state = (status==PJ_SUCCESS) ? PJ_ICE_STRANS_STATE_RUNNING :
 					       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();
 	
     }
 
@@ -1615,6 +1632,7 @@ static void turn_on_state(pj_turn_sock *turn_sock, pj_turn_state_t old_state,
 
     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);
 
@@ -1690,5 +1708,7 @@ static void turn_on_state(pj_turn_sock *turn_sock, pj_turn_state_t old_state,
     }
 
     sess_dec_ref(comp->ice_st);
+
+    pj_log_pop_indent();
 }