[xiph-cvs] cvs commit: icecast/src format.c format_mp3.c

[Michael Smith]

msmith      03/01/18 07:30:30

  Modified:    src      format.c format_mp3.c
  Log:
  Fix for a couple of nasty bugs that could result in clients being incorrectly
  dropped under some circumstances. Thanks to Ricardo Galli for finding this.

Revision  Changes    Path
1.13      +1 -1      icecast/src/format.c

Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- format.c	31 Dec 2002 20:15:03 -0000	1.12
+++ format.c	18 Jan 2003 12:30:29 -0000	1.13
@@ -79,7 +79,7 @@
     ret = sock_write_bytes(client->con->sock, buf, len);
 
     if(ret < 0) {
-        if(sock_recoverable(ret)) {
+        if(sock_recoverable(sock_error())) {
             DEBUG1("Client had recoverable error %ld", ret);
             ret = 0;
         }

<p><p>1.12      +1 -1      icecast/src/format_mp3.c

Index: format_mp3.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format_mp3.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- format_mp3.c	1 Jan 2003 07:31:46 -0000	1.11
+++ format_mp3.c	18 Jan 2003 12:30:29 -0000	1.12
@@ -173,7 +173,7 @@
     }
 
     if(ret < 0) {
-        if(sock_recoverable(ret)) {
+        if(sock_recoverable(sock_error())) {
             DEBUG1("Client had recoverable error %ld", ret);
             ret = 0;
         }

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.