diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp index 8814d03c..f9e81557 100644 --- a/Connector_RTMP/main.cpp +++ b/Connector_RTMP/main.cpp @@ -104,7 +104,7 @@ int main(int argc, char ** argv){ //only parse input if available or not yet init'ed //rightnow = getNowMS(); retval = epoll_wait(poller, events, 1, 0); - if ((retval > 0) || (!ready4data || (snd_cnt - snd_window_at >= snd_window_size))){ + if (!ready4data || (snd_cnt - snd_window_at >= snd_window_size)){ parseChunk(); } if (ready4data){ diff --git a/util/ddv_socket.cpp b/util/ddv_socket.cpp index 1d3efd69..19a6b80e 100644 --- a/util/ddv_socket.cpp +++ b/util/ddv_socket.cpp @@ -73,7 +73,7 @@ bool DDV_write(void * buffer, int todo, int sock){ int r = send(sock, (char*)buffer + sofar, todo-sofar, 0); if (r <= 0){ switch (errno){ - case EWOULDBLOCK: printf("Would block\n"); socketBlocking = true; break; + case EWOULDBLOCK: socketBlocking = true; return false; break; default: socketError = true; printf("Could not write! %s\n", strerror(errno)); @@ -93,7 +93,7 @@ bool DDV_read(void * buffer, int todo, int sock){ int r = recv(sock, (char*)buffer + sofar, todo-sofar, 0); if (r <= 0){ switch (errno){ - case EWOULDBLOCK: printf("Read: Would block\n"); socketBlocking = true; break; + case EWOULDBLOCK: socketBlocking = true; return false; break; default: socketError = true; printf("Could not read! %s\n", strerror(errno)); @@ -115,7 +115,7 @@ int DDV_iwrite(void * buffer, int todo, int sock){ int r = send(sock, buffer, todo, 0); if (r < 0){ switch (errno){ - case EWOULDBLOCK: printf("Write: Would block\n"); break; + case EWOULDBLOCK: break; default: socketError = true; printf("Could not write! %s\n", strerror(errno)); @@ -130,7 +130,7 @@ int DDV_iread(void * buffer, int todo, int sock){ int r = recv(sock, buffer, todo, 0); if (r < 0){ switch (errno){ - case EWOULDBLOCK: printf("Read: Would block\n"); break; + case EWOULDBLOCK: break; default: socketError = true; printf("Could not read! %s\n", strerror(errno));