summaryrefslogtreecommitdiff
path: root/src/network_write.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/network_write.c')
-rw-r--r--src/network_write.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/network_write.c b/src/network_write.c
index 7fb52cb..90fc2ac 100644
--- a/src/network_write.c
+++ b/src/network_write.c
@@ -27,44 +27,44 @@
int network_write_chunkqueue_write(server *srv, connection *con, int fd, chunkqueue *cq) {
chunk *c;
size_t chunks_written = 0;
-
+
for(c = cq->first; c; c = c->next) {
int chunk_finished = 0;
-
+
switch(c->type) {
case MEM_CHUNK: {
char * offset;
size_t toSend;
ssize_t r;
-
+
if (c->mem->used == 0) {
chunk_finished = 1;
break;
}
-
+
offset = c->mem->ptr + c->offset;
toSend = c->mem->used - 1 - c->offset;
-#ifdef __WIN32
+#ifdef __WIN32
if ((r = send(fd, offset, toSend, 0)) < 0) {
log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed: ", strerror(errno), fd);
-
+
return -1;
}
#else
if ((r = write(fd, offset, toSend)) < 0) {
log_error_write(srv, __FILE__, __LINE__, "ssd", "write failed: ", strerror(errno), fd);
-
+
return -1;
}
#endif
-
+
c->offset += r;
cq->bytes_out += r;
-
+
if (c->offset == (off_t)c->mem->used - 1) {
chunk_finished = 1;
}
-
+
break;
}
case FILE_CHUNK: {
@@ -76,34 +76,34 @@ int network_write_chunkqueue_write(server *srv, connection *con, int fd, chunkqu
size_t toSend;
stat_cache_entry *sce = NULL;
int ifd;
-
+
if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
log_error_write(srv, __FILE__, __LINE__, "sb",
strerror(errno), c->file.name);
return -1;
}
-
+
offset = c->file.start + c->offset;
toSend = c->file.length - c->offset;
-
+
if (offset > sce->st.st_size) {
log_error_write(srv, __FILE__, __LINE__, "sb", "file was shrinked:", c->file.name);
-
+
return -1;
}
if (-1 == (ifd = open(c->file.name->ptr, O_RDONLY))) {
log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
-
+
return -1;
}
-
+
#if defined USE_MMAP
if (MAP_FAILED == (p = mmap(0, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0))) {
log_error_write(srv, __FILE__, __LINE__, "ss", "mmap failed: ", strerror(errno));
close(ifd);
-
+
return -1;
}
close(ifd);
@@ -113,48 +113,48 @@ int network_write_chunkqueue_write(server *srv, connection *con, int fd, chunkqu
munmap(p, sce->st.st_size);
return -1;
}
-
+
munmap(p, sce->st.st_size);
#else
buffer_prepare_copy(srv->tmp_buf, toSend);
-
+
lseek(ifd, offset, SEEK_SET);
if (-1 == (toSend = read(ifd, srv->tmp_buf->ptr, toSend))) {
log_error_write(srv, __FILE__, __LINE__, "ss", "read: ", strerror(errno));
close(ifd);
-
+
return -1;
}
close(ifd);
if (-1 == (r = send(fd, srv->tmp_buf->ptr, toSend, 0))) {
log_error_write(srv, __FILE__, __LINE__, "ss", "write: ", strerror(errno));
-
+
return -1;
}
#endif
c->offset += r;
cq->bytes_out += r;
-
+
if (c->offset == c->file.length) {
chunk_finished = 1;
}
-
+
break;
}
default:
-
+
log_error_write(srv, __FILE__, __LINE__, "ds", c, "type not known");
-
+
return -1;
}
-
+
if (!chunk_finished) {
/* not finished yet */
-
+
break;
}
-
+
chunks_written++;
}