aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 18:54:38 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 18:54:38 +0000
commit72b3aacb6a93ffea31b68bd38d7fbb1207e29d5e (patch)
treea1f566bc385228ea8b9b234cc3a590afdef38729 /channels
parent7352220be0a924426d375d1f29346bf7bc7dc6ae (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59413 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-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)