kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-25 20:19:36 +00:00
Code Issues Projects Releases Wiki Activity

refactor

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7277 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-18 00:10:23 +00:00
parent 95e49af4cf
commit 0c1367c11d
2 changed files with 8 additions and 3 deletions
src
mod/endpoints/mod_sofia
sofia.c
switch_rtp.c

2
src/mod/endpoints/mod_sofia/sofia.c

@ -2453,7 +2453,7 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
} else { } else {
const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url;
if (strchr(url, '>')) { if (url && strchr(url, '>')) {
tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport));
} else { } else {
tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport));

9
src/switch_rtp.c

@ -770,6 +770,7 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session)
SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session) SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
{ {
void *pop; void *pop;
switch_socket_t *sock;
if (!switch_rtp_ready(*rtp_session)) { if (!switch_rtp_ready(*rtp_session)) {
return; return;
@ -792,8 +793,10 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
} }
switch_rtp_kill_socket(*rtp_session); switch_rtp_kill_socket(*rtp_session);
switch_socket_close((*rtp_session)->sock); sock = (*rtp_session)->sock;
(*rtp_session)->sock = NULL; (*rtp_session)->sock = NULL;
switch_socket_close(sock);
if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) { if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) {
@ -1088,7 +1091,9 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
switch_frame_flag_t frame_flags = SFF_NONE; switch_frame_flag_t frame_flags = SFF_NONE;
data[0] = 65; data[0] = 65;
rtp_session->cn++; rtp_session->cn++;
switch_mutex_lock(rtp_session->flag_mutex);
rtp_common_write(rtp_session, NULL, (void *) data, 2, rtp_session->cng_pt, 0, &frame_flags); rtp_common_write(rtp_session, NULL, (void *) data, 2, rtp_session->cng_pt, 0, &frame_flags);
switch_mutex_unlock(rtp_session->flag_mutex);
} }
} }
@ -1601,7 +1606,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
this_ts = ntohl(send_msg->header.ts); this_ts = ntohl(send_msg->header.ts);
if (rtp_session->sending_dtmf || !this_ts) { if (!switch_rtp_ready(rtp_session) || rtp_session->sending_dtmf || !this_ts) {
send = 0; send = 0;
} }