Changeset 64fea282d28f812fef7c5622fca0ed39d70ad136

Timestamp:

16/09/06 13:01:24 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1158404484 +0000

git-parent:

[f424ec54abf8f25e4107a9219390625f0630cde7]

git-author:

Clément Stenac <zorglub@videolan.org> 1158404484 +0000

Message:

Even if we are asked to wait for data, bail out if all sockets are at EOF.

I'm far from being sure this is the right thing to do, but it allows MMSH to work correctly (it requests some data while the server is closing connection)

Files:

• src/network/io.c (modified) (3 diffs)

src/network/io.c

@@ -145 +145 @@
-{
-    size_t i_total = 0;
+    int eof[fdc];
+    unsigned int i_eof = 0;
+    memset( eof, 0, sizeof( eof ) );
-
-    do
@@ -159 +162 @@
-        if( i_buflen == 0 )
-            return i_total; // output buffer full
+
+        if( i_eof == fdc )
+            return i_total; // all sockets are at EOF
-
-        delay_ms = 500;
@@ -277 +283 @@
-        i_buflen -= n;
-
+        if( n ==  0 ) // EOF on socket
+        {
+            unsigned int j;
+            for( j = 0 ; j < i_eof ; j++ )
+                if( eof[j] == *fdv ) goto end;
+            eof[i_eof++] = *fdv;
+        }
+end:
-        if( wait_ms == -1 )
-        {