kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-02 19:40:08 +00:00
Code Issues Projects Releases Wiki Activity

FS-5670 --resolve allow debug rtp if rtp is not attached to a session

Browse Source
This commit is contained in:
Seven Du 2013-08-08 08:48:40 +08:00
parent bd1c6106dc
commit f9487a9aa8
2 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/switch_core_session.c
View File

@ -2372,6 +2372,7 @@ SWITCH_DECLARE(uint8_t) switch_core_session_check_interface(switch_core_session_
SWITCH_DECLARE(char *) switch_core_session_get_uuid(switch_core_session_t *session) SWITCH_DECLARE(char *) switch_core_session_get_uuid(switch_core_session_t *session)
{ {
if (!session) return NULL;
return session->uuid_str; return session->uuid_str;
} }

86
src/switch_rtp.c
View File

@ -25,7 +25,7 @@
* *
* Anthony Minessale II <anthm@freeswitch.org> * Anthony Minessale II <anthm@freeswitch.org>
* Marcel Barbulescu <marcelbarbulescu@gmail.com> * Marcel Barbulescu <marcelbarbulescu@gmail.com>
* * Seven Du <dujinfang@gmail.com>
* *
* switch_rtp.c -- RTP * switch_rtp.c -- RTP
* *
@ -2859,14 +2859,10 @@ static void do_flush(switch_rtp_t *rtp_session)
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ)) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ)) {
switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
if (!session) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session),
switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ); SWITCH_LOG_CONSOLE, "%s FLUSH\n",
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "RTP HAS NO SESSION!\n"); session ? switch_channel_get_name(switch_core_session_get_channel(session)) : "NoName"
} else { );
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session),
SWITCH_LOG_CONSOLE, "%s FLUSH\n", switch_channel_get_name(switch_core_session_get_channel(session))
);
}
} }
if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) {
@ -3623,32 +3619,26 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ)) { if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ)) {
switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
const char *tx_host;
const char *old_host;
const char *my_host;
if (!session) { char bufa[30], bufb[30], bufc[30];
switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "RTP HAS NO SESSION!\n");
} else {
const char *tx_host;
const char *old_host;
const char *my_host;
char bufa[30], bufb[30], bufc[30];
tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr);
old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr);
my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr); my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_CONSOLE, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_CONSOLE,
"R %s b=%4ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n", "R %s b=%4ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n",
switch_channel_get_name(switch_core_session_get_channel(session)), session ? switch_channel_get_name(switch_core_session_get_channel(session)) : "NoName",
(long) bytes, (long) bytes,
my_host, switch_sockaddr_get_port(rtp_session->local_addr), my_host, switch_sockaddr_get_port(rtp_session->local_addr),
old_host, rtp_session->remote_port, old_host, rtp_session->remote_port,
tx_host, switch_sockaddr_get_port(rtp_session->from_addr), tx_host, switch_sockaddr_get_port(rtp_session->from_addr),
rtp_session->recv_msg.header.pt, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.header.m); rtp_session->recv_msg.header.pt, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.header.m);
}
} }
if (((rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) || rtp_session->recv_msg.header.pt == 13)) { if (((rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) || rtp_session->recv_msg.header.pt == 13)) {
@ -4453,32 +4443,26 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_WRITE)) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_WRITE)) {
switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
const char *tx_host;
const char *old_host;
const char *my_host;
if (!session) { char bufa[30], bufb[30], bufc[30];
switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_WRITE);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "RTP HAS NO SESSION!\n");
} else {
const char *tx_host;
const char *old_host;
const char *my_host;
char bufa[30], bufb[30], bufc[30];
tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr);
old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr);
my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr); my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_CONSOLE, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_CONSOLE,
"W %s b=%4ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n", "W %s b=%4ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n",
switch_channel_get_name(switch_core_session_get_channel(session)), session ? switch_channel_get_name(switch_core_session_get_channel(session)) : "NoName",
(long) bytes, (long) bytes,
my_host, switch_sockaddr_get_port(rtp_session->local_addr), my_host, switch_sockaddr_get_port(rtp_session->local_addr),
old_host, rtp_session->remote_port, old_host, rtp_session->remote_port,
tx_host, switch_sockaddr_get_port(rtp_session->from_addr), tx_host, switch_sockaddr_get_port(rtp_session->from_addr),
send_msg->header.pt, ntohl(send_msg->header.ts), send_msg->header.m); send_msg->header.pt, ntohl(send_msg->header.ts), send_msg->header.m);
}
} }