From ecbd0527417115936b06b57be1a07b3607e31a85 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 7 Mar 2014 19:19:04 +0000 Subject: uniqueid: Fix chan_dahdi, sig_pri, sig_ss7, test_cdr, and test_cel compiler errors. (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 --- channels/sig_ss7.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'channels/sig_ss7.c') diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c index 905d79bf3..2e3918912 100644 --- a/channels/sig_ss7.c +++ b/channels/sig_ss7.c @@ -258,12 +258,15 @@ static void sig_ss7_loopback(struct sig_ss7_chan *p, int enable) } } -static struct ast_channel *sig_ss7_new_ast_channel(struct sig_ss7_chan *p, int state, int ulaw, int transfercapability, char *exten, const struct ast_channel *requestor) +static struct ast_channel *sig_ss7_new_ast_channel(struct sig_ss7_chan *p, int state, + int ulaw, int transfercapability, char *exten, + const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor) { struct ast_channel *ast; if (sig_ss7_callbacks.new_ast_channel) { - ast = sig_ss7_callbacks.new_ast_channel(p->chan_pvt, state, ulaw, exten, requestor); + ast = sig_ss7_callbacks.new_ast_channel(p->chan_pvt, state, ulaw, exten, + assignedids, requestor); } else { return NULL; } @@ -604,7 +607,7 @@ static void ss7_start_call(struct sig_ss7_chan *p, struct sig_ss7_linkset *links */ ast_mutex_unlock(&linkset->lock); sig_ss7_unlock_private(p); - c = sig_ss7_new_ast_channel(p, AST_STATE_RING, law, 0, p->exten, NULL); + c = sig_ss7_new_ast_channel(p, AST_STATE_RING, law, 0, p->exten, NULL, NULL); if (!c) { ast_log(LOG_WARNING, "Unable to start PBX on CIC %d\n", p->cic); ast_mutex_lock(&linkset->lock); @@ -1889,7 +1892,9 @@ int sig_ss7_indicate(struct sig_ss7_chan *p, struct ast_channel *chan, int condi * \retval ast_channel on success. * \retval NULL on error. */ -struct ast_channel *sig_ss7_request(struct sig_ss7_chan *p, enum sig_ss7_law law, const struct ast_channel *requestor, int transfercapability) +struct ast_channel *sig_ss7_request(struct sig_ss7_chan *p, enum sig_ss7_law law, + const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, + int transfercapability) { struct ast_channel *ast; @@ -1901,7 +1906,8 @@ struct ast_channel *sig_ss7_request(struct sig_ss7_chan *p, enum sig_ss7_law law } sig_ss7_set_outgoing(p, 1); - ast = sig_ss7_new_ast_channel(p, AST_STATE_RESERVED, law, transfercapability, p->exten, requestor); + ast = sig_ss7_new_ast_channel(p, AST_STATE_RESERVED, law, transfercapability, + p->exten, assignedids, requestor); if (!ast) { sig_ss7_set_outgoing(p, 0); -- cgit v1.2.3