TapTap/FastSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

rsync 3.4.1 drop-in parity (#285-#297) + parity completion (protocol 2.26.0) #298

Merged
TapTap merged 77 commits from feat/rsync-parity into dev 2026-09-17 20:33:17 +02:00
Conversation 0 Commits 77 Files Changed 99
+17 -15
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d7c55d3c0 - Show all commits
src/client/client_send.c
+18 -16
View File
@@ -843,31 +843,33 @@ static bool finalize_transfer(Client* client, const Config* config, ArrayList* r
*delete_limit_out = false; *delete_limit_out = false;
if (!send_status(client->file_descriptor, STATUS_FINISHED)) if (!send_status(client->file_descriptor, STATUS_FINISHED))
return false; return false;
if (config->remove_source_files && remove_sources) { /* The receiver emits its optional wire-stats frame (protocol 2.25.0) FIRST,
for (int i = 0; i < remove_sources->size; i++) { then any per-file --remove-source-files acks, then the terminal status. */
Status per_file; Status status;
if (!receive_status(client->file_descriptor, &per_file)) if (!receive_status(client->file_descriptor, &status))
return false; return false;
if (per_file == STATUS_ERROR) { if (status == STATUS_STATS) {
ReceiverStats scratch;
if (!receive_stats_record(client->file_descriptor, stats_out ? stats_out : &scratch, NULL))
return false;
if (!receive_status(client->file_descriptor, &status))
return false;
}
if (config->remove_source_files && remove_sources && remove_sources->size > 0) {
for (int i = 0; i < remove_sources->size; i++) {
if (i > 0 && !receive_status(client->file_descriptor, &status))
return false;
if (status == STATUS_ERROR) {
log_server_rejection("Receiver reported a per-file error"); log_server_rejection("Receiver reported a per-file error");
return false; return false;
} }
if (per_file == STATUS_OK) { if (status == STATUS_OK) {
((SourceFile*)remove_sources->items[i])->skipped = true; ((SourceFile*)remove_sources->items[i])->skipped = true;
} else if (per_file != STATUS_NEXT) { } else if (status != STATUS_NEXT) {
log_message(LOG_LEVEL_ERROR, "Unexpected per-file status from receiver"); log_message(LOG_LEVEL_ERROR, "Unexpected per-file status from receiver");
return false; return false;
} }
} }
}
Status status;
if (!receive_status(client->file_descriptor, &status))
return false;
/* Optional wire-stats frame (protocol 2.25.0) precedes the terminal status. */
if (status == STATUS_STATS) {
if (!receive_stats_record(client->file_descriptor, stats_out ? stats_out : &(ReceiverStats){0},
NULL))
return false;
if (!receive_status(client->file_descriptor, &status)) if (!receive_status(client->file_descriptor, &status))
return false; return false;
} }