kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-20 10:57:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

chan_dahdi/sig_pri: Fix type mismatch in the idledial feature's channel creation.

Browse Source 
Square pegs in round holes don't work very well.
........

Merged revisions 418261 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@418262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-07-10 01:42:26 +00:00
parent 2f1d2a9ef6
commit 073356fa18
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/sig_pri.c
+4 -4
View File
@@ -964,12 +964,12 @@ static int sig_pri_play_tone(struct sig_pri_chan *p, enum sig_pri_tone tone)
}
}
static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state, int ulaw, int transfercapability, char *exten, const struct ast_channel *requestor)
static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state, enum sig_pri_law law, int transfercapability, char *exten, const struct ast_channel *requestor)
{
struct ast_channel *c;
if (sig_pri_callbacks.new_ast_channel) {
c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, ulaw, exten, requestor);
c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, law, exten, requestor);
} else {
return NULL;
}
@@ -5743,7 +5743,7 @@ static void sig_pri_handle_setup(struct sig_pri_span *pri, pri_event *e)
int exten_exists_or_can_exist;
int could_match_more;
int need_dialtone;
int law;
enum sig_pri_law law;
int chanpos = -1;
struct ast_callid *callid = NULL;
struct ast_channel *c;
@@ -6210,7 +6210,7 @@ static void *pri_dchannel(void *vpri)
*/
sig_pri_lock_private(pri->pvts[nextidle]);
sig_pri_unlock_private(pri->pvts[nextidle]);
idle = sig_pri_request(pri->pvts[nextidle], AST_FORMAT_ULAW, NULL, 0);
idle = sig_pri_request(pri->pvts[nextidle], SIG_PRI_ULAW, NULL, 0);
ast_mutex_lock(&pri->lock);
if (idle) {
pri->pvts[nextidle]->isidlecall = 1;