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

uniqueid: Fix chan_dahdi, sig_pri, sig_ss7, test_cdr, and test_cel compiler errors.

Browse Source 
(issue ASTERISK-23120)
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-03-07 19:19:04 +00:00
parent 80ef9a21b9
commit ecbd052741
8 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channels/sig_pri.c
View File

@@ -1028,12 +1028,14 @@ 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,
int ulaw, int transfercapability, char *exten,
const struct ast_assigned_ids *assignedids, 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, ulaw, exten, assignedids, requestor);
} else {
return NULL;
}
@@ -1098,14 +1100,17 @@ static void sig_pri_ami_channel_event(struct sig_pri_chan *p)
}
}
struct ast_channel *sig_pri_request(struct sig_pri_chan *p, enum sig_pri_law law, const struct ast_channel *requestor, int transfercapability)
struct ast_channel *sig_pri_request(struct sig_pri_chan *p, enum sig_pri_law law,
const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor,
int transfercapability)
{
struct ast_channel *ast;
ast_debug(1, "%s %d\n", __FUNCTION__, p->channel);
sig_pri_set_outgoing(p, 1);
ast = sig_pri_new_ast_channel(p, AST_STATE_RESERVED, law, transfercapability, p->exten, requestor);
ast = sig_pri_new_ast_channel(p, AST_STATE_RESERVED, law, transfercapability,
p->exten, assignedids, requestor);
if (!ast) {
sig_pri_set_outgoing(p, 0);
}
@@ -5859,7 +5864,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], AST_FORMAT_ULAW, NULL, NULL, 0);
ast_mutex_lock(&pri->lock);
if (idle) {
pri->pvts[nextidle]->isidlecall = 1;
@@ -6470,7 +6475,7 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->lock);
c = sig_pri_new_ast_channel(pri->pvts[chanpos],
AST_STATE_RESERVED, law, e->ring.ctype,
pri->pvts[chanpos]->exten, NULL);
pri->pvts[chanpos]->exten, NULL, NULL);
ast_mutex_lock(&pri->lock);
sig_pri_lock_private(pri->pvts[chanpos]);
if (c) {
@@ -6593,7 +6598,7 @@ static void *pri_dchannel(void *vpri)
ast_mutex_unlock(&pri->lock);
c = sig_pri_new_ast_channel(pri->pvts[chanpos],
AST_STATE_RING, law, e->ring.ctype,
pri->pvts[chanpos]->exten, NULL);
pri->pvts[chanpos]->exten, NULL, NULL);
ast_mutex_lock(&pri->lock);
sig_pri_lock_private(pri->pvts[chanpos]);
if (c) {