kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

put ifdef protection around the rest of the libpri function calls that were added at the same time as progress_with_cause

Browse Source 
move parsing of the qsig channel mapping configuration option outside ifdef HAVE_PRI_INBANDDISCONNECT and into a properly ifdef'd block



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@155066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-06 20:51:26 +00:00
parent d5624cfdb9
commit f08ab8278c
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
channels/chan_dahdi.c
View File

@@ -2988,6 +2988,8 @@ static int dahdi_send_keypad_facility_exec(struct ast_channel *chan, void *data)
return 0; return 0;
} }
#ifdef HAVE_PRI_PROG_W_CAUSE
static char *dahdi_send_callrerouting_facility_app = "DAHDISendCallreroutingFacility"; static char *dahdi_send_callrerouting_facility_app = "DAHDISendCallreroutingFacility";
static int dahdi_send_callrerouting_facility_exec(struct ast_channel *chan, void *data) static int dahdi_send_callrerouting_facility_exec(struct ast_channel *chan, void *data)
@@ -3063,6 +3065,8 @@ static int dahdi_send_callrerouting_facility_exec(struct ast_channel *chan, void
return res; return res;
} }
#endif
static int pri_is_up(struct dahdi_pri *pri) static int pri_is_up(struct dahdi_pri *pri)
{ {
int x; int x;
@@ -11684,7 +11688,7 @@ static int start_pri(struct dahdi_pri *pri)
if (pri->switchtype == PRI_SWITCH_GR303_TMC) if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH; pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0); pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
#ifdef PRI_SET_CHAN_MAPPING_LOGICAL #ifdef HAVE_PRI_PROG_W_CAUSE
pri_set_chan_mapping_logical(pri->dchans[i], pri->qsigchannelmapping == DAHDI_CHAN_MAPPING_LOGICAL); pri_set_chan_mapping_logical(pri->dchans[i], pri->qsigchannelmapping == DAHDI_CHAN_MAPPING_LOGICAL);
#endif #endif
#ifdef HAVE_PRI_INBANDDISCONNECT #ifdef HAVE_PRI_INBANDDISCONNECT
@@ -13534,8 +13538,10 @@ static int __unload_module(void)
} }
ast_cli_unregister_multiple(dahdi_pri_cli, ARRAY_LEN(dahdi_pri_cli)); ast_cli_unregister_multiple(dahdi_pri_cli, ARRAY_LEN(dahdi_pri_cli));
ast_unregister_application(dahdi_send_keypad_facility_app); ast_unregister_application(dahdi_send_keypad_facility_app);
#ifdef HAVE_PRI_PROG_W_CAUSE
ast_unregister_application(dahdi_send_callrerouting_facility_app); ast_unregister_application(dahdi_send_callrerouting_facility_app);
#endif #endif
#endif
#if defined(HAVE_SS7) #if defined(HAVE_SS7)
for (i = 0; i < NUM_SPANS; i++) { for (i = 0; i < NUM_SPANS; i++) {
if (linksets[i].master != AST_PTHREADT_NULL) if (linksets[i].master != AST_PTHREADT_NULL)
@@ -14324,7 +14330,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
} else { } else {
confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE; confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE;
} }
#ifdef HAVE_PRI_INBANDDISCONNECT #ifdef HAVE_PRI_PROG_W_CAUSE
} else if (!strcasecmp(v->name, "qsigchannelmapping")) { } else if (!strcasecmp(v->name, "qsigchannelmapping")) {
if (!strcasecmp(v->value, "logical")) { if (!strcasecmp(v->value, "logical")) {
confp->pri.qsigchannelmapping = DAHDI_CHAN_MAPPING_LOGICAL; confp->pri.qsigchannelmapping = DAHDI_CHAN_MAPPING_LOGICAL;
@@ -14333,8 +14339,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
} else { } else {
confp->pri.qsigchannelmapping = DAHDI_CHAN_MAPPING_PHYSICAL; confp->pri.qsigchannelmapping = DAHDI_CHAN_MAPPING_PHYSICAL;
} }
#endif
} else if (!strcasecmp(v->name, "discardremoteholdretrieval")) { } else if (!strcasecmp(v->name, "discardremoteholdretrieval")) {
confp->pri.discardremoteholdretrieval = ast_true(v->value); confp->pri.discardremoteholdretrieval = ast_true(v->value);
#ifdef HAVE_PRI_INBANDDISCONNECT
} else if (!strcasecmp(v->name, "inbanddisconnect")) { } else if (!strcasecmp(v->name, "inbanddisconnect")) {
confp->pri.inbanddisconnect = ast_true(v->value); confp->pri.inbanddisconnect = ast_true(v->value);
#endif #endif
@@ -14834,8 +14842,10 @@ static int load_module(void)
pri_set_error(dahdi_pri_error); pri_set_error(dahdi_pri_error);
pri_set_message(dahdi_pri_message); pri_set_message(dahdi_pri_message);
ast_register_application_xml(dahdi_send_keypad_facility_app, dahdi_send_keypad_facility_exec); ast_register_application_xml(dahdi_send_keypad_facility_app, dahdi_send_keypad_facility_exec);
#ifdef HAVE_PRI_PROG_W_CAUSE
ast_register_application_xml(dahdi_send_callrerouting_facility_app, dahdi_send_callrerouting_facility_exec); ast_register_application_xml(dahdi_send_callrerouting_facility_app, dahdi_send_callrerouting_facility_exec);
#endif #endif
#endif
#ifdef HAVE_SS7 #ifdef HAVE_SS7
memset(linksets, 0, sizeof(linksets)); memset(linksets, 0, sizeof(linksets));
for (y = 0; y < NUM_SPANS; y++) { for (y = 0; y < NUM_SPANS; y++) {