aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

We were triggering error logic when no errors had occurred. Thanks

Browse Source 
to Ricardo Galli for finding this bug.

svn path=/trunk/icecast/; revision=3175
This commit is contained in:
Jack Moffitt 2002-03-22 21:18:03 +00:00
parent 06fb100e10
commit d8559723fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/source.c
View File

@ -209,8 +209,8 @@ void *source_main(void *arg)
bytes = abuf->len;
sbytes = sock_write_bytes(client->con->sock, &abuf->data[client->pos], bytes);
if (sbytes > 0) client->con->sent_bytes += sbytes;
if (sbytes < bytes) {
if (sbytes >= 0) client->con->sent_bytes += sbytes;
if (sbytes < 0) {
if (!sock_recoverable(sock_error())) {
printf("SOURCE: Client had unrecoverable error catching up (%ld/%ld)\n", sbytes, bytes);
client->con->error = 1;
@ -238,15 +238,15 @@ void *source_main(void *arg)
refbuf_queue_add(&client->queue, refbuf);
} else {
sbytes = sock_write_bytes(client->con->sock, refbuf->data, refbuf->len);
if (sbytes > 0) client->con->sent_bytes += sbytes;
if (sbytes < refbuf->len) {
if (sbytes >= 0) client->con->sent_bytes += sbytes;
if (sbytes < 0) {
bytes = sock_error();
if (!sock_recoverable(bytes)) {
printf("SOURCE: client had unrecoverable error %ld with new data (%ld/%ld)\n", bytes, sbytes, refbuf->len);
client->con->error = 1;
} else {
printf("SOURCE: recoverable error %ld\n", bytes);
client->pos = sbytes>0?sbytes:0;
client->pos = sbytes > 0 ? sbytes : 0;
refbuf_addref(refbuf);
refbuf_queue_insert(&client->queue, refbuf);
}