hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DDVSocket edits

Browse source
This commit is contained in:
Thulinma 2010-11-08 16:12:53 +01:00
parent 3539e95f07
commit 5ca0886b6d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Connector_RTMP/main.cpp
View file

@ -104,7 +104,7 @@ int main(int argc, char ** argv){
//only parse input if available or not yet init'ed //only parse input if available or not yet init'ed
//rightnow = getNowMS(); //rightnow = getNowMS();
retval = epoll_wait(poller, events, 1, 0); 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(); parseChunk();
} }
if (ready4data){ if (ready4data){

8
util/ddv_socket.cpp
View file

@ -73,7 +73,7 @@ bool DDV_write(void * buffer, int todo, int sock){
int r = send(sock, (char*)buffer + sofar, todo-sofar, 0); int r = send(sock, (char*)buffer + sofar, todo-sofar, 0);
if (r <= 0){ if (r <= 0){
switch (errno){ switch (errno){
case EWOULDBLOCK: printf("Would block\n"); socketBlocking = true; break; case EWOULDBLOCK: socketBlocking = true; return false; break;
default: default:
socketError = true; socketError = true;
printf("Could not write! %s\n", strerror(errno)); 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); int r = recv(sock, (char*)buffer + sofar, todo-sofar, 0);
if (r <= 0){ if (r <= 0){
switch (errno){ switch (errno){
case EWOULDBLOCK: printf("Read: Would block\n"); socketBlocking = true; break; case EWOULDBLOCK: socketBlocking = true; return false; break;
default: default:
socketError = true; socketError = true;
printf("Could not read! %s\n", strerror(errno)); 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); int r = send(sock, buffer, todo, 0);
if (r < 0){ if (r < 0){
switch (errno){ switch (errno){
case EWOULDBLOCK: printf("Write: Would block\n"); break; case EWOULDBLOCK: break;
default: default:
socketError = true; socketError = true;
printf("Could not write! %s\n", strerror(errno)); 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); int r = recv(sock, buffer, todo, 0);
if (r < 0){ if (r < 0){
switch (errno){ switch (errno){
case EWOULDBLOCK: printf("Read: Would block\n"); break; case EWOULDBLOCK: break;
default: default:
socketError = true; socketError = true;
printf("Could not read! %s\n", strerror(errno)); printf("Could not read! %s\n", strerror(errno));