summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-07-21 16:54:32 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-07-21 16:54:32 -0500
commitefebb1b9e0c36690b890a891d2735ee84867a522 (patch)
tree69b9fa3012a9e2e0096aa659376350167414682c /include
parentdec1e31f4529092feab22df292cc6c6602a784fc (diff)
parent851b1c3a177e06660aeeb92b29a0d3e267ddb61b (diff)
Merge "res_pjsip: Add fax_detect_timeout endpoint option." into 13
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/res_pjsip.h2
-rw-r--r--include/asterisk/res_pjsip_session.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h
index 962ddb11b..4d60d1dab 100644
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@ -749,6 +749,8 @@ struct ast_sip_endpoint {
struct ast_acl_list *acl;
/* Restrict what IPs are allowed in the Contact header (for registration) */
struct ast_acl_list *contact_acl;
+ /*! The number of seconds into call to disable fax detection. (0 = disabled) */
+ unsigned int faxdetect_timeout;
};
/*!
diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h
index e4c54a173..7e65e6d7c 100644
--- a/include/asterisk/res_pjsip_session.h
+++ b/include/asterisk/res_pjsip_session.h
@@ -137,7 +137,7 @@ struct ast_sip_session {
struct ast_party_id id;
/*! Requested capabilities */
struct ast_format_cap *req_caps;
- /*! Optional DSP, used only for inband DTMF detection if configured */
+ /*! Optional DSP, used only for inband DTMF/Fax-CNG detection if configured */
struct ast_dsp *dsp;
/*! Whether the termination of the session should be deferred */
unsigned int defer_terminate:1;