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

Ensure we don't throw away a buffer after only sending part of it.

Browse Source 
svn path=/trunk/icecast/; revision=3290
This commit is contained in:
Michael Smith 2002-05-08 05:18:43 +00:00
parent 59b605ec12
commit 2225738aba
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/source.c
View File

@ -217,14 +217,21 @@ 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 >= 0) {
client->con->sent_bytes += sbytes;
if(sbytes != bytes) {
client->pos += sbytes;
refbuf_queue_insert(&client->queue, abuf);
data_done = 1;
break;
}
}
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;
} else {
printf("SOURCE: client had recoverable error...\n");
client->pos += sbytes>0?sbytes:0;
/* put the refbuf back on top of the queue, since we didn't finish with it */
refbuf_queue_insert(&client->queue, abuf);
}
@ -246,7 +253,14 @@ 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 >= 0) {
client->con->sent_bytes += sbytes;
if(sbytes != bytes) {
client->pos = sbytes;
refbuf_addref(refbuf);
refbuf_queue_insert(&client->queue, abuf);
}
}
if (sbytes < 0) {
bytes = sock_error();
if (!sock_recoverable(bytes)) {
@ -254,7 +268,7 @@ void *source_main(void *arg)
client->con->error = 1;
} else {
printf("SOURCE: recoverable error %ld\n", bytes);
client->pos = sbytes > 0 ? sbytes : 0;
client->pos = 0;
refbuf_addref(refbuf);
refbuf_queue_insert(&client->queue, refbuf);
}