Changeset 5234 for pjproject

Timestamp:

Jan 15, 2016 3:32:26 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Suppress EAGAIN recv() error log in pjmedia stream.c & vid_stream.c (thanks Christian Ambach for the patch).

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• stream.c (modified) (2 diffs)
• vid_stream.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1629 +1629 @@
     if (bytes_read < 0) {
         status = (pj_status_t)-bytes_read;
+        if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            return;
+        }
         if (stream->rtp_rx_last_err != status) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -1895 +1898 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((stream->port.info.name.ptr, "RTCP recv() error",
-                (pj_status_t)-bytes_read));
+        if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            LOGERR_((stream->port.info.name.ptr, "RTCP recv() error",
+                    (pj_status_t)-bytes_read));
+        }
         return;
     }

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -608 +608 @@
     if (bytes_read < 0) {
         status = (pj_status_t)-bytes_read;
+        if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            return;
+        }
         if (stream->rtp_rx_last_err != status) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -787 +790 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((stream->cname.ptr, "RTCP recv() error", 
-                 (pj_status_t)-bytes_read));
+        if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            LOGERR_((stream->cname.ptr, "RTCP recv() error",
+                    (pj_status_t)-bytes_read));
+        }
         return;
     }