kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

This commit is contained in:
root 2012-07-25 20:50:42 -04:00
parent c92c727fee f7e94c45d3
commit 7fdfd70e26
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/freetdm/mod_freetdm/tdm.c
View File

@ -227,6 +227,8 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
goto fail; goto fail;
} }
switch_channel_mark_answered(channel);
return SWITCH_CAUSE_SUCCESS; return SWITCH_CAUSE_SUCCESS;
fail: fail:
@ -253,6 +255,9 @@ fail:
static switch_status_t channel_on_init(switch_core_session_t *session) static switch_status_t channel_on_init(switch_core_session_t *session)
{ {
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_set_state(channel, CS_CONSUME_MEDIA);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }

4
src/switch_rtp.c
View File

@ -34,6 +34,8 @@
//#define RTP_DEBUG_WRITE_DELTA //#define RTP_DEBUG_WRITE_DELTA
//#define DEBUG_MISSED_SEQ //#define DEBUG_MISSED_SEQ
typedef unsigned long u_long;
#include <switch.h> #include <switch.h>
#include <switch_stun.h> #include <switch_stun.h>
#include <apr_network_io.h> #include <apr_network_io.h>
@ -1451,7 +1453,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess
uint32_t index, switch_rtp_crypto_key_type_t type, unsigned char *key, switch_size_t keylen) uint32_t index, switch_rtp_crypto_key_type_t type, unsigned char *key, switch_size_t keylen)
{ {
#ifndef ENABLE_SRTP #ifndef ENABLE_SRTP
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "SRTP NOT SUPPORTED IN THIS BUILD!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SRTP NOT SUPPORTED IN THIS BUILD!\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
#else #else
switch_rtp_crypto_key_t *crypto_key; switch_rtp_crypto_key_t *crypto_key;