Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Make chan_dahdi build even without PRI / SS7

Browse Source 
(Note: still some strange build warnings without SS7 in dev-mode)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Tzafrir Cohen 16 years ago
parent fb0196fce6
commit d36cecd578
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File

12
channels/chan_dahdi.c
Unescape View File

@ -4099,6 +4099,7 @@ static void dahdi_enable_ec(struct dahdi_pvt *p)
} }
if (p->echocancel.head.tap_length) { if (p->echocancel.head.tap_length) {
switch (p->sig) { switch (p->sig) {
#ifdef HAVE_PRI
case SIG_PRI_LIB_HANDLE_CASES: case SIG_PRI_LIB_HANDLE_CASES:
if (((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) { if (((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) {
/* /*
@ -4107,12 +4108,15 @@ static void dahdi_enable_ec(struct dahdi_pvt *p)
*/ */
return; return;
} }
#endif
/* Fall through */ /* Fall through */
#ifdef HAVE_SS7
case SIG_SS7: case SIG_SS7:
x = 1; x = 1;
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &x); res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &x);
if (res) if (res)
ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno)); ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
#endif
break; break;
default: default:
break; break;
@ -4361,17 +4365,21 @@ static inline int dahdi_confmute(struct dahdi_pvt *p, int muted)
x = muted; x = muted;
switch (p->sig) { switch (p->sig) {
#ifdef HAVE_PRI
case SIG_PRI_LIB_HANDLE_CASES: case SIG_PRI_LIB_HANDLE_CASES:
if (((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) { if (((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) {
/* PRI nobch pseudo channel. Does not handle ioctl(DAHDI_AUDIOMODE) */ /* PRI nobch pseudo channel. Does not handle ioctl(DAHDI_AUDIOMODE) */
break; break;
} }
#endif
/* Fall through */ /* Fall through */
#ifdef HAVE_SS7
case SIG_SS7: case SIG_SS7:
y = 1; y = 1;
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &y); res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &y);
if (res) if (res)
ast_log(LOG_WARNING, "Unable to set audio mode on %d: %s\n", p->channel, strerror(errno)); ast_log(LOG_WARNING, "Unable to set audio mode on %d: %s\n", p->channel, strerror(errno));
#endif
break; break;
default: default:
break; break;
@ -6025,11 +6033,13 @@ static int dahdi_setoption(struct ast_channel *chan, int option, void *data, int
ast_dsp_set_digitmode(p->dsp, ((*cp) ? DSP_DIGITMODE_RELAXDTMF : DSP_DIGITMODE_DTMF) | p->dtmfrelax); ast_dsp_set_digitmode(p->dsp, ((*cp) ? DSP_DIGITMODE_RELAXDTMF : DSP_DIGITMODE_DTMF) | p->dtmfrelax);
break; break;
case AST_OPTION_AUDIO_MODE: /* Set AUDIO mode (or not) */ case AST_OPTION_AUDIO_MODE: /* Set AUDIO mode (or not) */
#ifdef HAVE_PRI
if (dahdi_sig_pri_lib_handles(p->sig) if (dahdi_sig_pri_lib_handles(p->sig)
&& ((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) { && ((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) {
/* PRI nobch pseudo channel. Does not handle ioctl(DAHDI_AUDIOMODE) */ /* PRI nobch pseudo channel. Does not handle ioctl(DAHDI_AUDIOMODE) */
break; break;
} }
#endif
cp = (char *) data; cp = (char *) data;
if (!*cp) { if (!*cp) {
@ -6409,6 +6419,7 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
return AST_BRIDGE_RETRY; return AST_BRIDGE_RETRY;
} }
#ifdef HAVE_PRI
if ((dahdi_sig_pri_lib_handles(p0->sig) if ((dahdi_sig_pri_lib_handles(p0->sig)
&& ((struct sig_pri_chan *) p0->sig_pvt)->no_b_channel) && ((struct sig_pri_chan *) p0->sig_pvt)->no_b_channel)
|| (dahdi_sig_pri_lib_handles(p1->sig) || (dahdi_sig_pri_lib_handles(p1->sig)
@ -6423,6 +6434,7 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
ast_channel_unlock(c1); ast_channel_unlock(c1);
return AST_BRIDGE_FAILED_NOWARN; return AST_BRIDGE_FAILED_NOWARN;
} }
#endif
if ((oi0 == SUB_REAL) && (oi1 == SUB_REAL)) { if ((oi0 == SUB_REAL) && (oi1 == SUB_REAL)) {
if (p0->owner && p1->owner) { if (p0->owner && p1->owner) {

Write Preview
Loading…
Cancel
Save