kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00: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
........

Merged revisions 418262 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 418263 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-07-10 01:59:44 +00:00
parent f962448eee
commit d834be9faf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/sig_pri.c
View File

@@ -1029,13 +1029,13 @@ 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, static struct ast_channel *sig_pri_new_ast_channel(struct sig_pri_chan *p, int state,
int ulaw, int transfercapability, char *exten, enum sig_pri_law law, int transfercapability, char *exten,
const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor) const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor)
{ {
struct ast_channel *c; struct ast_channel *c;
if (sig_pri_callbacks.new_ast_channel) { if (sig_pri_callbacks.new_ast_channel) {
c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, ulaw, exten, assignedids, requestor); c = sig_pri_callbacks.new_ast_channel(p->chan_pvt, state, law, exten, assignedids, requestor);
} else { } else {
return NULL; return NULL;
} }
@@ -5890,7 +5890,7 @@ static void sig_pri_handle_setup(struct sig_pri_span *pri, pri_event *e)
int exten_exists_or_can_exist; int exten_exists_or_can_exist;
int could_match_more; int could_match_more;
int need_dialtone; int need_dialtone;
int law; enum sig_pri_law law;
int chanpos = -1; int chanpos = -1;
struct ast_callid *callid = NULL; struct ast_callid *callid = NULL;
struct ast_channel *c; struct ast_channel *c;
@@ -6357,7 +6357,7 @@ static void *pri_dchannel(void *vpri)
*/ */
sig_pri_lock_private(pri->pvts[nextidle]); sig_pri_lock_private(pri->pvts[nextidle]);
sig_pri_unlock_private(pri->pvts[nextidle]); sig_pri_unlock_private(pri->pvts[nextidle]);
idle = sig_pri_request(pri->pvts[nextidle], AST_FORMAT_ULAW, NULL, NULL, 0); idle = sig_pri_request(pri->pvts[nextidle], SIG_PRI_ULAW, NULL, NULL, 0);
ast_mutex_lock(&pri->lock); ast_mutex_lock(&pri->lock);
if (idle) { if (idle) {
pri->pvts[nextidle]->isidlecall = 1; pri->pvts[nextidle]->isidlecall = 1;