diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-26 16:33:52 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-26 16:33:52 +0000 |
| commit | 0f829e756d59b99eeb13a46d2f6dd84f2aec949c (patch) | |
| tree | ab04ca7c6c43448669732abd73603787888e1519 | |
| parent | 5715c3755f4110e34d7ac1ba7af88328f24027a5 (diff) | |
Merged revisions 62037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r62037 | file | 2007-04-26 12:30:57 -0400 (Thu, 26 Apr 2007) | 2 lines
Revert previous fix for when the IAX2 channel goes funky (that's the technical term). This is causing legit calls to be prematurely hung up. (issue #9600 reported by justdave)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@62038 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 89c5f4959..0730e63fe 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2986,8 +2986,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) { - ast_log(LOG_NOTICE, "I should never be called! Hanging up.\n"); - return NULL; + ast_log(LOG_NOTICE, "I should never be called!\n"); + return &ast_null_frame; } static int iax2_start_transfer(unsigned short callno0, unsigned short callno1, int mediaonly) |