Merged revisions 59358 via svnmerge from
[asterisk/asterisk.git] / main / rtp.c
index 486ff61..bcb86e4 100644 (file)
@@ -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;
        }