diff options
| author | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-16 02:41:09 +0000 |
|---|---|---|
| committer | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-16 02:41:09 +0000 |
| commit | 95978316fc96c25d41b279116c38a130c02cd268 (patch) | |
| tree | 1e6b4964ce4d1038eecd3e67bd518d9762facbd1 /channels/chan_dahdi.c | |
| parent | ab149639af72c0a317f01325e04114b50858c499 (diff) | |
Merged revisions 200799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r200799 | moy | 2009-06-15 21:24:30 -0500 (Mon, 15 Jun 2009) | 2 lines
keep backwards compatible chan_dahdi with older openr2 versions by not using the new skip category feature unless supported
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@200807 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 507142ae7..495d82bf2 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -475,7 +475,9 @@ struct dahdi_mfcr2_conf { int max_ani; int max_dnis; int get_ani_first:1; +#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1 int skip_category_request:1; +#endif int call_files:1; int allow_collect_calls:1; int charge_calls:1; @@ -1306,7 +1308,9 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void) .max_ani = 10, .max_dnis = 4, .get_ani_first = -1, +#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1 .skip_category_request = -1, +#endif .call_files = 0, .allow_collect_calls = 0, .charge_calls = 1, @@ -9857,7 +9861,9 @@ static int dahdi_r2_set_context(struct dahdi_mfcr2 *r2_link, const struct dahdi_ } openr2_context_set_log_level(r2_link->protocol_context, conf->mfcr2.loglevel); openr2_context_set_ani_first(r2_link->protocol_context, conf->mfcr2.get_ani_first); +#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1 openr2_context_set_skip_category_request(r2_link->protocol_context, conf->mfcr2.skip_category_request); +#endif openr2_context_set_mf_threshold(r2_link->protocol_context, threshold); openr2_context_set_mf_back_timeout(r2_link->protocol_context, conf->mfcr2.mfback_timeout); openr2_context_set_metering_pulse_timeout(r2_link->protocol_context, conf->mfcr2.metering_pulse_timeout); @@ -14623,7 +14629,9 @@ static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli ast_cli(a->fd, "MFC/R2 Max ANI: %d\n", openr2_context_get_max_ani(r2context)); ast_cli(a->fd, "MFC/R2 Max DNIS: %d\n", openr2_context_get_max_dnis(r2context)); ast_cli(a->fd, "MFC/R2 Get ANI First: %s\n", openr2_context_get_ani_first(r2context) ? "Yes" : "No"); +#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1 ast_cli(a->fd, "MFC/R2 Skip Category Request: %s\n", openr2_context_get_skip_category_request(r2context) ? "Yes" : "No"); +#endif ast_cli(a->fd, "MFC/R2 Immediate Accept: %s\n", openr2_context_get_immediate_accept(r2context) ? "Yes" : "No"); ast_cli(a->fd, "MFC/R2 Accept on Offer: %s\n", tmp->mfcr2_accept_on_offer ? "Yes" : "No"); ast_cli(a->fd, "MFC/R2 Charge Calls: %s\n", tmp->mfcr2_charge_calls ? "Yes" : "No"); |