aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-10 12:24:11 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-10 12:24:11 +0000
commit91ad35ce5445a2f9c958968672338869bd4ce8a5 (patch)
tree503e8c1d20f6c0594ff9ceebe29a789bcc3ebc4b /channels/chan_zap.c
parent8abb5a32f2e1226a24279c81b71cbd63456aad34 (diff)
ensure that control frames with payload can be sent to channel drivers via ->indicate()
update iax2_indicate to pass control frame payload to the connected channel add an API call for sending an indication with payload, and use it for control frames with payload git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26417 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b51292df6..c4181d708 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -695,7 +695,7 @@ static int zt_answer(struct ast_channel *ast);
struct ast_frame *zt_read(struct ast_channel *ast);
static int zt_write(struct ast_channel *ast, struct ast_frame *frame);
struct ast_frame *zt_exception(struct ast_channel *ast);
-static int zt_indicate(struct ast_channel *chan, int condition);
+static int zt_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen);
static int zt_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
static int zt_setoption(struct ast_channel *chan, int option, void *data, int datalen);
static int zt_func_read(struct ast_channel *chan, char *function, char *data, char *buf, size_t len);
@@ -3341,7 +3341,7 @@ static int zt_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
p->subs[x].owner = newchan;
}
if (newchan->_state == AST_STATE_RINGING)
- zt_indicate(newchan, AST_CONTROL_RINGING);
+ zt_indicate(newchan, AST_CONTROL_RINGING, NULL, 0);
update_conf(p);
ast_mutex_unlock(&p->lock);
return 0;
@@ -4843,7 +4843,7 @@ static int zt_write(struct ast_channel *ast, struct ast_frame *frame)
return 0;
}
-static int zt_indicate(struct ast_channel *chan, int condition)
+static int zt_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen)
{
struct zt_pvt *p = chan->tech_pvt;
int res=-1;