diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-03-29 17:20:43 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-03-29 17:20:43 +0000 |
| commit | c4f42601d6e573811e9c525a79f77a29c4ad6717 (patch) | |
| tree | d77f6d1d8af48c1ef2d796ec451734fb04d5d5ba /main/rtp.c | |
| parent | 5a1c6826cec0a5b91ea803af4813a3091c30ba03 (diff) | |
Merged revisions 59358 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59358 | russell | 2007-03-29 12:17:41 -0500 (Thu, 29 Mar 2007) | 13 lines
Merged revisions 59357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59357 | russell | 2007-03-29 12:14:33 -0500 (Thu, 29 Mar 2007) | 5 lines
If an error occurs when reading from an RTP socket, and the error code does not
indicate that we should try again, then return NULL instead of a "null frame".
This will prevent Asterisk from trying over and over again, and eventually
causing the system to crash. (issue #8285, john)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/main/rtp.c b/main/rtp.c index 486ff6189..bcb86e4df 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -920,10 +920,12 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) rtcpheader = (unsigned int *)(rtcpdata + AST_FRIENDLY_OFFSET); if (res < 0) { - if (errno != EAGAIN) - ast_log(LOG_WARNING, "RTCP Read error: %s\n", strerror(errno)); if (errno == EBADF) CRASH; + if (errno != EAGAIN) { + ast_log(LOG_WARNING, "RTCP Read error: %s. Hanging up.\n", strerror(errno)); + return NULL; + } return &ast_null_frame; } @@ -1176,10 +1178,12 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) rtpheader = (unsigned int *)(rtp->rawdata + AST_FRIENDLY_OFFSET); if (res < 0) { - if (errno != EAGAIN) - ast_log(LOG_WARNING, "RTP Read error: %s\n", strerror(errno)); if (errno == EBADF) CRASH; + if (errno != EAGAIN) { + ast_log(LOG_WARNING, "RTP Read error: %s. Hanging up.\n", strerror(errno)); + return NULL; + } return &ast_null_frame; } |