kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 11:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous minor changes.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@220792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-09-28 21:02:20 +00:00
parent c8a141905e
commit f3f456f8b6
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_dahdi.c
View File

@@ -293,8 +293,6 @@ static struct ast_jb_conf global_jbconf;
/*! \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)
@@ -5194,8 +5192,7 @@ static int dahdi_hangup(struct ast_channel *ast)
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);
@@ -11390,7 +11387,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
analog_config_complete(analog_p);
}
}
#ifdef HAVE_PRI
#if defined(HAVE_PRI)
else if (pchan != NULL) {
pchan->channel = tmp->channel;
pchan->hidecallerid = tmp->hidecallerid;
@@ -11405,7 +11402,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
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. */

3
channels/sig_pri.c
View File

@@ -2360,6 +2360,7 @@ static void *pri_dchannel(void *vpri)
break;
default:
ast_debug(1, "Event: %d\n", e->e);
break;
}
}
ast_mutex_unlock(&pri->lock);
@@ -2800,7 +2801,7 @@ int sig_pri_indicate(struct sig_pri_chan *p, struct ast_channel *chan, int condi
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 */