diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-03-07 19:19:04 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-03-07 19:19:04 +0000 |
| commit | ecbd0527417115936b06b57be1a07b3607e31a85 (patch) | |
| tree | be718846953c7bba40c8f247173e928aaf4e4c97 /channels/chan_dahdi.c | |
| parent | 80ef9a21b9d91ff0bafc304923bc29effa230b00 (diff) | |
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
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index fb5877f32..ef2f19e70 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -969,7 +969,9 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void) } -static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause); +static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap *cap, + const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, + const char *data, int *cause); static int dahdi_digit_begin(struct ast_channel *ast, char digit); static int dahdi_digit_end(struct ast_channel *ast, char digit, unsigned int duration); static int dahdi_sendtext(struct ast_channel *c, const char *text); @@ -2129,7 +2131,9 @@ static int dahdi_setlaw(int dfd, int law) #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ #if defined(HAVE_PRI) -static struct ast_channel *my_new_pri_ast_channel(void *pvt, int state, enum sig_pri_law law, char *exten, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor) +static struct ast_channel *my_new_pri_ast_channel(void *pvt, int state, + enum sig_pri_law law, char *exten, const struct ast_assigned_ids *assignedids, + const struct ast_channel *requestor) { struct dahdi_pvt *p = pvt; int audio; @@ -13161,7 +13165,9 @@ static struct dahdi_pvt *determine_starting_point(const char *data, struct dahdi return p; } -static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause) +static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap *cap, + const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, + const char *data, int *cause) { int callwait = 0; struct dahdi_pvt *p; @@ -13255,11 +13261,11 @@ static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap sig_pri_extract_called_num_subaddr(p->sig_pvt, data, p->dnid, sizeof(p->dnid)); - tmp = sig_pri_request(p->sig_pvt, SIG_PRI_DEFLAW, requestor, transcapdigital); + tmp = sig_pri_request(p->sig_pvt, SIG_PRI_DEFLAW, assignedids, requestor, transcapdigital); #endif #if defined(HAVE_SS7) } else if (p->sig == SIG_SS7) { - tmp = sig_ss7_request(p->sig_pvt, SIG_SS7_DEFLAW, requestor, transcapdigital); + tmp = sig_ss7_request(p->sig_pvt, SIG_SS7_DEFLAW, assignedids, requestor, transcapdigital); #endif /* defined(HAVE_SS7) */ } else { tmp = dahdi_new(p, AST_STATE_RESERVED, 0, p->owner ? SUB_CALLWAIT : SUB_REAL, 0, assignedids, requestor, callid); |