/*! \brief Typically, how many rings before we should send Caller*ID */
#define DEFAULT_CIDRINGS 1
-#define CHANNEL_PSEUDO -12
-
#define AST_LAW(p) (((p)->law == DAHDI_LAW_ALAW) ? AST_FORMAT_ALAW : AST_FORMAT_ULAW)
dahdi_setlinear(p->subs[SUB_REAL].dfd, 0);
law = DAHDI_LAW_DEFAULT;
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_SETLAW, &law);
- if (p->sig)
- dahdi_disable_ec(p);
+ dahdi_disable_ec(p);
update_conf(p);
reset_conf(p);
sig_pri_hangup(p->sig_pvt, ast);
analog_config_complete(analog_p);
}
}
-#ifdef HAVE_PRI
+#if defined(HAVE_PRI)
else if (pchan != NULL) {
pchan->channel = tmp->channel;
pchan->hidecallerid = tmp->hidecallerid;
ast_copy_string(pchan->mohinterpret, tmp->mohinterpret, sizeof(pchan->mohinterpret));
pchan->stripmsd = tmp->stripmsd;
}
-#endif
+#endif /* defined(HAVE_PRI) */
}
if (tmp && !here) {
/* Add the new channel interface to the sorted channel interface list. */
break;
default:
ast_debug(1, "Event: %d\n", e->e);
+ break;
}
}
ast_mutex_unlock(&pri->lock);
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
} else if (!p->progress && p->pri && !p->outgoing) {
- if (p->pri) {
+ if (p->pri->pri) {
if (!pri_grab(p, p->pri)) {
#ifdef HAVE_PRI_PROG_W_CAUSE
pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_SWITCH_CONGESTION); /* cause = 42 */