zheiling/BBS-Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes error when connection interrupts while downloading the file

Browse Source
This commit is contained in:
zheiling
2026-06-05 12:21:09 +03:00
parent 382335e59c
commit 8ef755b0a7
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file_p.c
+7 -21
View File
@@ -294,26 +294,6 @@ void file_download(session *sess) {
int source_d = sess->fd; int source_d = sess->fd;
int dest_d = sess->sd; int dest_d = sess->sd;
char buf[INBUFSIZE]; char buf[INBUFSIZE];
struct iovec iov = {.iov_base = buf, .iov_len = INBUFSIZE};
/* uses GNU library */
ssize_t ret = preadv2(sess->fd, &iov, 1, 0, RWF_NOWAIT);
if (ret > 0) {
char *line;
query_extract_from_buf_2(buf, &ret, &line);
if (!strcmp(line, "cancel\n")) {
FILE* sd_fileptr = fdopen(sess->fd, "w");
fflush(sd_fileptr);
fclose(sd_fileptr);
free(line);
/* replace session buffer with the rest of the local buffer */
memcpy(sess->buf, buf, ret);
sess->buf_used = ret;
clear_file_from_sess(sess);
session_send_string(sess, "ready\n");
sess->state = OP_WAIT;
return;
}
}
int rlen = read(source_d, buf, INBUFSIZE); int rlen = read(source_d, buf, INBUFSIZE);
if (rlen == 0) { if (rlen == 0) {
if (sess->file->rest) { if (sess->file->rest) {
@@ -324,7 +304,13 @@ void file_download(session *sess) {
sess->state = OP_WAIT; sess->state = OP_WAIT;
return; return;
} }
write(dest_d, buf, rlen); int ret = write(dest_d, buf, rlen);
if (ret == -1) {
const char *err_mes = strerror(errno);
print_log(stdout, pl_error, "Error downloading file %s! %s\n",
sess->file->name, err_mes);
sess->state = ERR;
}
sess->file->rest -= rlen; sess->file->rest -= rlen;
if (!sess->file->rest) { if (!sess->file->rest) {
print_log(stdout, pl_info, "File %s is downloaded from the server\n", print_log(stdout, pl_info, "File %s is downloaded from the server\n",