ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 05:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'fsorig/master'

Browse Source
This commit is contained in:
Moises Silva
2010-09-07 18:47:52 -04:00
parent c219a73c06 a13cfa488b
commit 9a8bd09360
25 changed files with 776 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/freetdm/msvc/freetdm.2008.vcproj
+8
View File
@@ -338,6 +338,10 @@
RelativePath="..\src\include\private\ftdm_buffer.h"
>
</File>
<File
RelativePath="..\src\include\private\ftdm_call_utils.h"
>
</File>
<File
RelativePath="..\src\include\private\ftdm_config.h"
>
@@ -416,6 +420,10 @@
RelativePath="..\src\ftdm_buffer.c"
>
</File>
<File
RelativePath="..\src\ftdm_call_utils.c"
>
</File>
<File
RelativePath="..\src\ftdm_callerid.c"
>
libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+4 -1
View File
@@ -259,7 +259,10 @@ static unsigned wp_open_range(ftdm_span_t *span, unsigned spanno, unsigned start
chan->physical_chan_id = x;
chan->rate = 8000;
if (type == FTDM_CHAN_TYPE_FXS || type == FTDM_CHAN_TYPE_FXO || type == FTDM_CHAN_TYPE_B) {
if (type == FTDM_CHAN_TYPE_FXS
|| type == FTDM_CHAN_TYPE_FXO
|| type == FTDM_CHAN_TYPE_CAS
|| type == FTDM_CHAN_TYPE_B) {
int err;
dtmf = "software";
libs/libdingaling/src/libdingaling.c
+14
View File
@@ -1974,10 +1974,19 @@ unsigned int ldl_session_terminate(ldl_session_t *session)
{
iks *iq, *sess;
unsigned int id;
apr_hash_t *hash = session->handle->sessions;
new_session_iq(session, &iq, &sess, &id, "terminate");
schedule_packet(session->handle, id, iq, LDL_RETRY);
if (session->id) {
apr_hash_set(hash, session->id, APR_HASH_KEY_STRING, NULL);
}
if (session->them) {
apr_hash_set(hash, session->them, APR_HASH_KEY_STRING, NULL);
}
return id;
}
@@ -2471,6 +2480,11 @@ int ldl_handle_running(ldl_handle_t *handle)
}
void ldl_session_set_gateway(ldl_session_t *session)
{
ldl_set_flag(session, LDL_FLAG_GATEWAY);
}
int ldl_session_gateway(ldl_session_t *session)
{
return ldl_test_flag(session, LDL_FLAG_GATEWAY) ? 1 : 0;
libs/libdingaling/src/libdingaling.h
+1
View File
@@ -593,6 +593,7 @@ ldl_status ldl_handle_init(ldl_handle_t **handle,
void ldl_handle_run(ldl_handle_t *handle);
int ldl_session_gateway(ldl_session_t *handle);
void ldl_session_set_gateway(ldl_session_t *session);
/*!
\brief Stop a libDingaLing handle