kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues 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
2014-11-09 03:50:07 -05:00
parent 2f1b12fdc0 6b8d5b2b10
commit eb30491688
7 changed files with 199 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/freetdm/src/include/freetdm.h
View File

@@ -74,10 +74,10 @@ extern "C" {
#endif
/*! \brief Limit to span names */
#define FTDM_MAX_NAME_STR_SZ 80
#define FTDM_MAX_NAME_STR_SZ 128
/*! \brief Limit to channel number strings */
#define FTDM_MAX_NUMBER_STR_SZ 20
#define FTDM_MAX_NUMBER_STR_SZ 32
/*! \brief Hangup cause codes */
typedef enum {
@@ -355,7 +355,7 @@ typedef enum {
FTDM_STR2ENUM_P(ftdm_str2ftdm_transfer_response, ftdm_transfer_response2str, ftdm_transfer_response_t)
/*! \brief Digit limit used in DNIS/ANI */
#define FTDM_DIGITS_LIMIT 25
#define FTDM_DIGITS_LIMIT 64
#define FTDM_SILENCE_VALUE(fchan) (fchan)->native_codec == FTDM_CODEC_ULAW ? 255 : (fchan)->native_codec == FTDM_CODEC_ALAW ? 0xD5 : 0x00
@@ -533,6 +533,8 @@ typedef struct ftdm_channel_config {
uint8_t debugdtmf;
uint8_t dtmf_on_start;
uint32_t dtmfdetect_ms;
uint32_t dtmf_time_on;
uint32_t dtmf_time_off;
uint8_t iostats;
} ftdm_channel_config_t;

2
libs/freetdm/src/include/private/ftdm_core.h
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;