automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59413 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 8 insertions, 4 deletions

diff --git a/rtp.c b/rtp.c
index 5e034200e..2f655a657 100644
--- a/rtp.c
+++ b/rtp.c
@@ -390,10 +390,12 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
 					0, (struct sockaddr *)&sin, &len);
 	
 	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 now.\n", strerror(errno));
+			return NULL;
+		}
 		return &null_frame;
 	}
 
@@ -457,10 +459,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 now.\n", strerror(errno));
+			return NULL;
+		}
 		return &null_frame;
 	}
 	if (res < hdrlen) {