mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
12
rtp.c
12
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) {
|
||||
|
Reference in New Issue
Block a user