ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-29 22:54:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'moystash/em-suspend-support'

Browse Source 
Conflicts:
	libs/freetdm/src/include/private/ftdm_core.h
This commit is contained in:
Moises Silva committed 2014-11-09 03:50:07 -05:00
2 parents 2f1b12fdc0 6b8d5b2b10
commit eb30491688
7 files changed
+199 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/freetdm/src/include/private/ftdm_core.h
+2
View File
@@ -477,6 +477,7 @@ struct ftdm_channel {
int32_t rxdrops;
ftdm_usrmsg_t *usrmsg;
ftdm_time_t last_state_change_time;
ftdm_time_t last_release_time;
};
struct ftdm_span {
@@ -515,6 +516,7 @@ struct ftdm_span {
ftdm_channel_sig_write_t sig_write;
ftdm_channel_sig_dtmf_t sig_queue_dtmf;
ftdm_channel_sig_dtmf_t sig_send_dtmf;
uint32_t sig_release_guard_time_ms;
ftdm_channel_state_processor_t state_processor; /*!< This guy is called whenever state processing is required */
void *io_data; /*!< Private I/O data per span. Do not touch unless you are an I/O module */
char *type;