aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_iax2.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 17:10:28 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 17:10:28 +0000
commit486c3c419f027962b714a0029014b6724226f4ac (patch)
treef226cc94c96f92ae49a343cdb4abb3d8f83c15cd /channels/chan_iax2.c
parent4c8f694d5f017fd37ec83eaa54e81b9c64def6eb (diff)
Backport the change to chan_iax2 to return NULL instead of a "null frame"
from its read callback. See revision 59341 to the 1.4 branch for more info. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@59355 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r--channels/chan_iax2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c8c4221df..bce9d3e13 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3164,9 +3164,8 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat
static struct ast_frame *iax2_read(struct ast_channel *c)
{
- static struct ast_frame f = { AST_FRAME_NULL, };
- ast_log(LOG_NOTICE, "I should never be called!\n");
- return &f;
+ ast_log(LOG_NOTICE, "I should never be called! Hanging up.\n");
+ return NULL;
}
static int iax2_start_transfer(unsigned short callno0, unsigned short callno1)