diff options
Diffstat (limited to 'pjsip/src/pjsip/sip_dialog.c')
| -rw-r--r-- | pjsip/src/pjsip/sip_dialog.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c index 3b2ce15a..2b6bb898 100644 --- a/pjsip/src/pjsip/sip_dialog.c +++ b/pjsip/src/pjsip/sip_dialog.c @@ -802,6 +802,8 @@ PJ_DEF(pj_status_t) pjsip_dlg_inc_session( pjsip_dialog *dlg, { PJ_ASSERT_RETURN(dlg && mod, PJ_EINVAL); + pj_log_push_indent(); + pjsip_dlg_inc_lock(dlg); ++dlg->sess_count; pjsip_dlg_dec_lock(dlg); @@ -809,6 +811,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_inc_session( pjsip_dialog *dlg, PJ_LOG(5,(dlg->obj_name, "Session count inc to %d by %.*s", dlg->sess_count, (int)mod->name.slen, mod->name.ptr)); + pj_log_pop_indent(); return PJ_SUCCESS; } @@ -889,6 +892,8 @@ PJ_DEF(pj_status_t) pjsip_dlg_dec_session( pjsip_dialog *dlg, { PJ_ASSERT_RETURN(dlg, PJ_EINVAL); + pj_log_push_indent(); + PJ_LOG(5,(dlg->obj_name, "Session count dec to %d by %.*s", dlg->sess_count-1, (int)mod->name.slen, mod->name.ptr)); @@ -896,6 +901,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_dec_session( pjsip_dialog *dlg, --dlg->sess_count; pjsip_dlg_dec_lock(dlg); + pj_log_pop_indent(); return PJ_SUCCESS; } @@ -1150,6 +1156,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_send_request( pjsip_dialog *dlg, PJ_ASSERT_RETURN(tdata->msg->type == PJSIP_REQUEST_MSG, PJSIP_ENOTREQUESTMSG); + pj_log_push_indent(); PJ_LOG(5,(dlg->obj_name, "Sending %s", pjsip_tx_data_get_info(tdata))); @@ -1221,7 +1228,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_send_request( pjsip_dialog *dlg, /* Unlock dialog, may destroy dialog. */ pjsip_dlg_dec_lock(dlg); - + pj_log_pop_indent(); return PJ_SUCCESS; on_error: @@ -1230,7 +1237,7 @@ on_error: /* Whatever happen delete the message. */ pjsip_tx_data_dec_ref( tdata ); - + pj_log_pop_indent(); return status; } @@ -1408,6 +1415,8 @@ PJ_DEF(pj_status_t) pjsip_dlg_send_response( pjsip_dialog *dlg, /* The transaction must belong to this dialog. */ PJ_ASSERT_RETURN(tsx->mod_data[dlg->ua->id] == dlg, PJ_EINVALIDOP); + pj_log_push_indent(); + PJ_LOG(5,(dlg->obj_name, "Sending %s", pjsip_tx_data_get_info(tdata))); @@ -1452,6 +1461,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_send_response( pjsip_dialog *dlg, } pjsip_dlg_dec_lock(dlg); + pj_log_pop_indent(); return status; } @@ -1519,6 +1529,7 @@ void pjsip_dlg_on_rx_request( pjsip_dialog *dlg, pjsip_rx_data *rdata ) PJ_LOG(5,(dlg->obj_name, "Received %s", pjsip_rx_data_get_info(rdata))); + pj_log_push_indent(); /* Lock dialog and increment session. */ pjsip_dlg_inc_lock(dlg); @@ -1540,6 +1551,7 @@ void pjsip_dlg_on_rx_request( pjsip_dialog *dlg, pjsip_rx_data *rdata ) warn_text = pj_str("Invalid CSeq"); pjsip_endpt_respond_stateless(dlg->endpt, rdata, 500, &warn_text, NULL, NULL); + pj_log_pop_indent(); return; } @@ -1643,6 +1655,7 @@ void pjsip_dlg_on_rx_request( pjsip_dialog *dlg, pjsip_rx_data *rdata ) on_return: /* Unlock dialog and dec session, may destroy dialog. */ pjsip_dlg_dec_lock(dlg); + pj_log_pop_indent(); } /* Update route-set from incoming message */ @@ -1739,6 +1752,7 @@ void pjsip_dlg_on_rx_response( pjsip_dialog *dlg, pjsip_rx_data *rdata ) PJ_LOG(5,(dlg->obj_name, "Received %s", pjsip_rx_data_get_info(rdata))); + pj_log_push_indent(); /* Lock the dialog and inc session. */ pjsip_dlg_inc_lock(dlg); @@ -1931,6 +1945,8 @@ void pjsip_dlg_on_rx_response( pjsip_dialog *dlg, pjsip_rx_data *rdata ) /* Unlock dialog and dec session, may destroy dialog. */ pjsip_dlg_dec_lock(dlg); + + pj_log_pop_indent(); } /* This function is called by user agent upon receiving transaction @@ -1944,6 +1960,7 @@ void pjsip_dlg_on_tsx_state( pjsip_dialog *dlg, PJ_LOG(5,(dlg->obj_name, "Transaction %s state changed to %s", tsx->obj_name, pjsip_tsx_state_str(tsx->state))); + pj_log_push_indent(); /* Lock the dialog and increment session. */ pjsip_dlg_inc_lock(dlg); @@ -1972,6 +1989,7 @@ void pjsip_dlg_on_tsx_state( pjsip_dialog *dlg, /* Unlock dialog and dec session, may destroy dialog. */ pjsip_dlg_dec_lock(dlg); + pj_log_pop_indent(); } |