refactor: consolidate transfer infrastructure

CMakeLists.txt

@@ -8,10 +8,8 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 
 add_compile_options(-Wall -g -O3)
 
-# --- Sanitizer option ---
 set(SANITIZER "none" CACHE STRING "Sanitizer to enable (address, thread, undefined, none)")
 set_property(CACHE SANITIZER PROPERTY STRINGS address thread undefined none)
-
 if(SANITIZER STREQUAL "address")
   add_compile_options(-fsanitize=address -fno-omit-frame-pointer -g)
   add_link_options(-fsanitize=address)
@@ -25,13 +23,11 @@ elseif(NOT SANITIZER STREQUAL "none")
   message(FATAL_ERROR "Unknown sanitizer: ${SANITIZER}. Supported values: address, thread, undefined, none")
 endif()
 
-# --- Strict warnings option ---
 option(STRICT_WARNINGS "Enable strict warnings (Wextra, Wpedantic, Werror)" OFF)
 if(STRICT_WARNINGS)
   add_compile_options(-Wextra -Wpedantic -Werror)
 endif()
 
-# --- Coverage option ---
 option(ENABLE_COVERAGE "Enable gcov coverage" OFF)
 if(ENABLE_COVERAGE)
   add_compile_options(--coverage -fprofile-arcs -ftest-coverage -O0 -g)
@@ -49,58 +45,102 @@ FetchContent_MakeAvailable(xxhash)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
-
 find_library(ZSTD_LIBRARY zstd)
 if(NOT ZSTD_LIBRARY)
   message(FATAL_ERROR "zstd library not found. Ensure it is in your nix-shell!")
 endif()
-
 find_package(OpenSSL REQUIRED)
 
-file(GLOB SHARED_SRCS "src/shared/*.c")
-set(FILE_STORE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/shared/file_store.c")
-list(REMOVE_ITEM SHARED_SRCS ${FILE_STORE_SRCS})
-file(GLOB SERVER_SRCS "src/server/*.c")
-set(SERVER_RECEIVER_SRCS src/server/receiver.c)
-file(GLOB CLIENT_SRCS "src/client/*.c")
+set(SHARED_SRCS
+  src/shared/array_list.c
+  src/shared/chunk.c
+  src/shared/compression.c
+  src/shared/config.c
+  src/shared/data.c
+  src/shared/delta.c
+  src/shared/file.c
+  src/shared/log.c
+  src/shared/metadata.c
+  src/shared/multiprocessing.c
+  src/shared/protocol.c
+  src/shared/queue.c
+  src/shared/transport_ssh.c
+  src/shared/transport_tcp.c
+  src/shared/transport_tls.c
+  src/shared/utils.c
+)
+set(SERVER_SRCS src/server/server.c)
+set(CLIENT_SRCS
+  src/client/client_cli.c
+  src/client/client_send.c
+  src/client/scanner.c
+  src/client/usage.c
+)
 
-# --- Main executables ---
-add_executable(server ${SERVER_SRCS} ${SHARED_SRCS} ${FILE_STORE_SRCS})
-target_include_directories(server PRIVATE src/shared src/server src/client)
-target_link_libraries(server PRIVATE Threads::Threads ${ZSTD_LIBRARY} OpenSSL::SSL OpenSSL::Crypto xxhash)
+function(configure_fastsync_target target)
+  target_include_directories(${target} PRIVATE src/shared src/server src/client)
+  target_link_libraries(${target} PRIVATE Threads::Threads ${ZSTD_LIBRARY} OpenSSL::SSL OpenSSL::Crypto xxhash)
+endfunction()
 
-add_executable(client ${CLIENT_SRCS} ${SHARED_SRCS} ${FILE_STORE_SRCS} ${SERVER_RECEIVER_SRCS})
-target_include_directories(client PRIVATE src/shared src/server src/client)
-target_link_libraries(client PRIVATE Threads::Threads ${ZSTD_LIBRARY} OpenSSL::SSL OpenSSL::Crypto xxhash)
+add_executable(server ${SERVER_SRCS} ${SHARED_SRCS})
+configure_fastsync_target(server)
+add_executable(client ${CLIENT_SRCS} ${SHARED_SRCS})
+configure_fastsync_target(client)
 
-# --- Testing ---
 enable_testing()
-
-# Common test libraries
-set(TEST_LIBS Threads::Threads ${ZSTD_LIBRARY} OpenSSL::SSL OpenSSL::Crypto xxhash)
-set(TEST_INCLUDES tests src/shared src/server src/client)
-
-# Monolithic test binary (backward compatible)
-file(GLOB TEST_SRCS "tests/test_*.c" "tests/runner.c")
-add_executable(tests ${TEST_SRCS} ${SHARED_SRCS} ${FILE_STORE_SRCS} ${SERVER_RECEIVER_SRCS} src/client/scanner.c src/client/client_cli.c src/client/client_validation.c src/client/usage.c)
-target_include_directories(tests PRIVATE ${TEST_INCLUDES})
+set(TEST_SRCS
+  tests/runner.c
+  tests/test_array_list.c
+  tests/test_chunk.c
+  tests/test_client_cli.c
+  tests/test_compression.c
+  tests/test_config.c
+  tests/test_data.c
+  tests/test_delta.c
+  tests/test_file.c
+  tests/test_file_sendfile.c
+  tests/test_fuzz_smoke.c
+  tests/test_glob.c
+  tests/test_log.c
+  tests/test_metadata.c
+  tests/test_multiprocessing.c
+  tests/test_property.c
+  tests/test_protocol.c
+  tests/test_queue.c
+  tests/test_robustness.c
+  tests/test_scanner.c
+  tests/test_server.c
+  tests/test_shared_utils.c
+  tests/test_stress.c
+  tests/test_transport_ssh.c
+  tests/test_transport_tcp.c
+  tests/test_transport_tls.c
+)
+add_executable(tests ${TEST_SRCS} ${SHARED_SRCS} src/client/scanner.c src/client/client_cli.c)
+configure_fastsync_target(tests)
+target_include_directories(tests PRIVATE tests)
 target_compile_definitions(tests PRIVATE FASTSYNC_TEST_BUILD)
-target_link_libraries(tests PRIVATE ${TEST_LIBS})
 add_test(NAME unit_all COMMAND tests)
 
-# --- Fuzz targets (requires clang) ---
 option(ENABLE_FUZZ "Build fuzz targets (requires clang)" OFF)
 if(ENABLE_FUZZ)
   if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
     message(FATAL_ERROR "ENABLE_FUZZ requires Clang (compiler is ${CMAKE_C_COMPILER_ID})")
   endif()
-  file(GLOB FUZZ_SRCS "tests/fuzz/*.c")
+  set(FUZZ_SRCS
+    tests/fuzz/fuzz_chunk_deserialize.c
+    tests/fuzz/fuzz_compress_decompress.c
+    tests/fuzz/fuzz_delta_deserialize.c
+    tests/fuzz/fuzz_delta_signature_deserialize.c
+    tests/fuzz/fuzz_glob_match.c
+    tests/fuzz/fuzz_metadata_from_buf.c
+  )
   foreach(FUZZ_SRC ${FUZZ_SRCS})
     get_filename_component(FUZZ_NAME ${FUZZ_SRC} NAME_WE)
-    add_executable(${FUZZ_NAME} ${FUZZ_SRC} ${SHARED_SRCS} ${FILE_STORE_SRCS} ${SERVER_RECEIVER_SRCS})
-		target_include_directories(${FUZZ_NAME} PRIVATE ${TEST_INCLUDES})
+    add_executable(${FUZZ_NAME} ${FUZZ_SRC} ${SHARED_SRCS})
+    configure_fastsync_target(${FUZZ_NAME})
+    target_include_directories(${FUZZ_NAME} PRIVATE tests)
     target_compile_options(${FUZZ_NAME} PRIVATE -fsanitize=fuzzer,address,undefined -fno-omit-frame-pointer)
     target_link_options(${FUZZ_NAME} PRIVATE -fsanitize=fuzzer,address,undefined)
-		target_link_libraries(${FUZZ_NAME} PRIVATE ${TEST_LIBS})
   endforeach()
 endif()

README.md

@@ -105,7 +105,6 @@ working directory, so use a destination below that directory unless the
 remote server is otherwise configured with a matching authorized root.
 
 ```bash
-ssh user@host 'mkdir -p destination'
 ./build/client /path/to/source user@host:destination
 ```
 

src/client/client_cli.c

@@ -1,20 +1,18 @@
 #include "client_send.h"
-#include "client_validation.h"
 #include "config.h"
 #include "delta.h"
 #include "log.h"
 #include "protocol.h"
 #include "transport_tcp.h"
 #include "transport_tls.h"
-#include "usage.h"
 #include "utils.h"
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "usage.c"
 
 #ifndef FASTSYNC_TEST_BUILD
 /* Parse environment variables for source/destination directories and save-to-disk flag. */
@@ -60,7 +58,7 @@ static bool parse_positive_int(const char* s, int* out_val) {
 static int set_string_option(char** dest, const char* value, const char* option_name) {
   char* dup = str_dup(value);
   if (!dup) {
-    log_message(LOG_LEVEL_ERROR, "memory allocation failed for %s", option_name);
+    fprintf(stderr, "Error: memory allocation failed for %s\n", option_name);
     return -1;
   }
   free(*dest);
@@ -71,7 +69,7 @@ static int set_string_option(char** dest, const char* value, const char* option_
 /* Parse a string as a positive integer into *dest. Returns true on success, false on error. */
 static int set_positive_int_option(int* dest, const char* value, const char* option_name) {
   if (!parse_positive_int(value, dest)) {
-    log_message(LOG_LEVEL_ERROR, "%s must be a positive integer", option_name);
+    fprintf(stderr, "Error: %s must be a positive integer\n", option_name);
     return -1;
   }
   return 0;
@@ -80,7 +78,7 @@ static int set_positive_int_option(int* dest, const char* value, const char* opt
 /* Parse a string as a non-negative integer into *dest. Returns true on success, false on error. */
 static int set_nonneg_int_option(int* dest, const char* value, const char* option_name) {
   if (!parse_nonneg_int(value, dest)) {
-    log_message(LOG_LEVEL_ERROR, "%s must be a non-negative integer", option_name);
+    fprintf(stderr, "Error: %s must be a non-negative integer\n", option_name);
     return -1;
   }
   return 0;
@@ -88,187 +86,105 @@ static int set_nonneg_int_option(int* dest, const char* value, const char* optio
 
 static int read_patterns_from_file(const char* filepath, char*** patterns, int* count);
 
-/* Parse a string as an unsigned long long. Returns 0 on success, -1 on error. */
-static int parse_ull_arg(const char* val, unsigned long long* out, const char* optname) {
-  char* end;
-  errno = 0;
-  unsigned long long v = strtoull(val, &end, 10);
-  if (errno != 0 || *end != '\0') {
-    log_message(LOG_LEVEL_ERROR, "%s must be a non-negative integer", optname);
-    return -1;
-  }
-  *out = v;
-  return 0;
-}
-
-/* Append a duplicated pattern to a growable pattern array. Returns 0 on success, -1 on error. */
-static int config_add_pattern(char*** patterns, int* count, const char* value,
-                              const char* optname) {
-  char** tmp = realloc(*patterns, (*count + 1) * sizeof(char*));
-  if (!tmp) {
-    log_message(LOG_LEVEL_ERROR, "memory allocation failed for %s", optname);
-    return -1;
-  }
-  *patterns = tmp;
-  char* dup = str_dup(value);
-  if (!dup) {
-    log_message(LOG_LEVEL_ERROR, "memory allocation failed for %s", optname);
-    return -1;
-  }
-  (*patterns)[(*count)++] = dup;
-  return 0;
-}
-
-typedef enum {
-  OPT_FLAG,
-  OPT_STRING,
-  OPT_POS_INT,
-  OPT_NONNEG_INT,
-  OPT_ULL,
-} OptKind;
-
-typedef struct {
-  const char* name;
-  const char* alias;
-  OptKind kind;
-  size_t offset; /* offsetof of the target field in Config */
-} OptionEntry;
-
-/* Options that map directly onto a Config field with no side effects. */
-static const OptionEntry OPTION_TABLE[] = {
-    {"--dry-run", "-n", OPT_FLAG, offsetof(Config, dry_run)},
-    {"--delete", NULL, OPT_FLAG, offsetof(Config, use_delete)},
-    {"--incremental", NULL, OPT_FLAG, offsetof(Config, use_incremental)},
-    {"--delta", NULL, OPT_FLAG, offsetof(Config, use_delta)},
-    {"--save-to-disk", NULL, OPT_FLAG, offsetof(Config, save_to_disk)},
-    {"--progress", NULL, OPT_FLAG, offsetof(Config, show_progress)},
-    {"--tls", NULL, OPT_FLAG, offsetof(Config, use_tls)},
-    {"--backup", NULL, OPT_FLAG, offsetof(Config, backup)},
-    {"--stats", NULL, OPT_FLAG, offsetof(Config, stats)},
-    {"--partial", NULL, OPT_FLAG, offsetof(Config, partial)},
-    {"--links", "-l", OPT_FLAG, offsetof(Config, follow_symlinks)},
-    {"--copy-links", NULL, OPT_FLAG, offsetof(Config, copy_links)},
-    {"--safe-links", NULL, OPT_FLAG, offsetof(Config, safe_links)},
-    {"--copy-unsafe-links", NULL, OPT_FLAG, offsetof(Config, copy_unsafe_links)},
-    {"--sparse", "-S", OPT_FLAG, offsetof(Config, preserve_sparse)},
-    {"--inplace", NULL, OPT_FLAG, offsetof(Config, inplace)},
-    {"--checksum", NULL, OPT_FLAG, offsetof(Config, checksum)},
-
-    {"--source-dir", NULL, OPT_STRING, offsetof(Config, send_directory)},
-    {"--dest-dir", NULL, OPT_STRING, offsetof(Config, receive_root_directory)},
-    {"--server-host", NULL, OPT_STRING, offsetof(Config, server_host)},
-    {"--cert", NULL, OPT_STRING, offsetof(Config, tls_cert)},
-    {"--key", NULL, OPT_STRING, offsetof(Config, tls_key)},
-    {"--ca", NULL, OPT_STRING, offsetof(Config, tls_ca)},
-    {"--backup-dir", NULL, OPT_STRING, offsetof(Config, backup_dir)},
-    {"--fastsync-server-path", NULL, OPT_STRING, offsetof(Config, fastsync_server_path)},
-    {"--partial-dir", NULL, OPT_STRING, offsetof(Config, partial_dir)},
-    {"--suffix", NULL, OPT_STRING, offsetof(Config, suffix)},
-
-    {"--timeout", NULL, OPT_POS_INT, offsetof(Config, timeout)},
-    {"--contimeout", NULL, OPT_POS_INT, offsetof(Config, contimeout)},
-    {"--max-depth", NULL, OPT_NONNEG_INT, offsetof(Config, max_depth)},
-
-    {"--max-size", NULL, OPT_ULL, offsetof(Config, max_size)},
-    {"--min-size", NULL, OPT_ULL, offsetof(Config, min_size)},
-};
-
-static bool opt_is(const char* arg, const char* name, const char* alias) {
-  return strcmp(arg, name) == 0 || (alias && strcmp(arg, alias) == 0);
-}
-
-static const OptionEntry* find_table_option(const char* arg) {
-  for (size_t i = 0; i < sizeof(OPTION_TABLE) / sizeof(OPTION_TABLE[0]); i++)
-    if (opt_is(arg, OPTION_TABLE[i].name, OPTION_TABLE[i].alias))
-      return &OPTION_TABLE[i];
-  return NULL;
-}
-
-static int apply_table_option(Config* config, const OptionEntry* entry, const char* value) {
-  void* field = (char*)config + entry->offset;
-  switch (entry->kind) {
-  case OPT_FLAG:
-    *(bool*)field = true;
-    return 0;
-  case OPT_STRING:
-    return set_string_option((char**)field, value, entry->name);
-  case OPT_POS_INT:
-    return set_positive_int_option((int*)field, value, entry->name);
-  case OPT_NONNEG_INT:
-    return set_nonneg_int_option((int*)field, value, entry->name);
-  case OPT_ULL: {
-    unsigned long long v;
-    if (parse_ull_arg(value, &v, entry->name) != 0)
-      return -1;
-    *(unsigned long long*)field = v;
-    return 0;
-  }
-  }
-  return -1;
-}
-
 /* Parse CLI arguments into config. Returns 0 on success, -1 on error, 1 for help/clean-exit. */
 int parse_args(Config* config, int argc, char* argv[], int* positional_args,
                int* positional_count) {
   for (int i = 1; i < argc; i++) {
-    const OptionEntry* entry = find_table_option(argv[i]);
-    if (entry) {
-      if (entry->kind != OPT_FLAG) {
-        if (i + 1 >= argc) {
-          log_message(LOG_LEVEL_ERROR, "missing argument for %s", entry->name);
-          return -1;
-        }
-        if (apply_table_option(config, entry, argv[++i]) != 0)
-          return -1;
-      } else if (apply_table_option(config, entry, NULL) != 0) {
-        return -1;
-      }
-      continue;
-    }
-
-    if (opt_is(argv[i], "--help", NULL)) {
+    if (strcmp(argv[i], "--help") == 0) {
       print_usage();
       return 1;
-    } else if (opt_is(argv[i], "-V", "--version")) {
+    } else if (strcmp(argv[i], "-V") == 0 || strcmp(argv[i], "--version") == 0) {
       printf("fastsync version %s\n", PROTOCOL_VERSION);
       return 1;
-    } else if (opt_is(argv[i], "-a", "--archive")) {
+    } else if (strcmp(argv[i], "-a") == 0 || strcmp(argv[i], "--archive") == 0) {
       config->use_compression = true;
       config->use_multithreading = true;
       config->use_metadata = true;
       log_message(LOG_LEVEL_INFO, "Enabled archive mode (-c -m -M)");
-    } else if (opt_is(argv[i], "-p", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "-n") == 0 || strcmp(argv[i], "--dry-run") == 0) {
+      config->dry_run = true;
+    } else if (strcmp(argv[i], "-p") == 0 && i + 1 < argc) {
       if (set_positive_int_option(&config->ssh_port, argv[++i], "-p") != 0)
         return -1;
       if (config->ssh_port > 65535) {
-        log_message(LOG_LEVEL_ERROR, "SSH port must be 1-65535");
+        log_message(LOG_LEVEL_ERROR, "SSH port must be 1-65535\n");
         return -1;
       }
-    } else if (opt_is(argv[i], "--exclude", NULL) && i + 1 < argc) {
-      if (config_add_pattern(&config->exclude_patterns, &config->exclude_count, argv[++i],
-                             "--exclude") != 0)
+    } else if (strcmp(argv[i], "--delete") == 0) {
+      config->use_delete = true;
+    } else if (strcmp(argv[i], "--exclude") == 0 && i + 1 < argc) {
+      char** tmp = realloc(config->exclude_patterns, (config->exclude_count + 1) * sizeof(char*));
+      if (!tmp) {
+        fprintf(stderr, "Error: memory allocation failed for --exclude\n");
         return -1;
-    } else if (opt_is(argv[i], "--include", NULL) && i + 1 < argc) {
-      if (config_add_pattern(&config->include_patterns, &config->include_count, argv[++i],
-                             "--include") != 0)
+      }
+      config->exclude_patterns = tmp;
+      char* dup = str_dup(argv[++i]);
+      if (!dup) {
+        fprintf(stderr, "Error: memory allocation failed for --exclude\n");
         return -1;
-    } else if (opt_is(argv[i], "--delta-block", NULL) && i + 1 < argc) {
-      unsigned long long val;
-      if (parse_ull_arg(argv[++i], &val, "--delta-block") != 0)
+      }
+      config->exclude_patterns[config->exclude_count++] = dup;
+    } else if (strcmp(argv[i], "--include") == 0 && i + 1 < argc) {
+      char** tmp = realloc(config->include_patterns, (config->include_count + 1) * sizeof(char*));
+      if (!tmp) {
+        fprintf(stderr, "Error: memory allocation failed for --include\n");
         return -1;
+      }
+      config->include_patterns = tmp;
+      char* dup = str_dup(argv[++i]);
+      if (!dup) {
+        fprintf(stderr, "Error: memory allocation failed for --include\n");
+        return -1;
+      }
+      config->include_patterns[config->include_count++] = dup;
+    } else if (strcmp(argv[i], "--max-size") == 0 && i + 1 < argc) {
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --max-size must be a non-negative integer\n");
+        return -1;
+      }
+      config->max_size = val;
+    } else if (strcmp(argv[i], "--min-size") == 0 && i + 1 < argc) {
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --min-size must be a non-negative integer\n");
+        return -1;
+      }
+      config->min_size = val;
+    } else if (strcmp(argv[i], "--incremental") == 0) {
+      config->use_incremental = true;
+    } else if (strcmp(argv[i], "--delta") == 0) {
+      config->use_delta = true;
+    } else if (strcmp(argv[i], "--delta-block") == 0 && i + 1 < argc) {
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --delta-block must be a positive integer\n");
+        return -1;
+      }
       if (val >= DELTA_BLOCK_SIZE_MIN && val <= DELTA_BLOCK_SIZE_MAX)
         config->delta_block_size = (uint32_t)val;
       else
-        log_message(LOG_LEVEL_WARNING, "--delta-block value %llu out of range, using default", val);
-    } else if (opt_is(argv[i], "--delta-max", NULL) && i + 1 < argc) {
-      unsigned long long val;
-      if (parse_ull_arg(argv[++i], &val, "--delta-max") != 0)
+        fprintf(stderr, "Warning: --delta-block value %llu out of range, using default\n", val);
+    } else if (strcmp(argv[i], "--delta-max") == 0 && i + 1 < argc) {
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0') {
+        fprintf(stderr, "Error: --delta-max must be a positive integer\n");
         return -1;
+      }
       if (val >= DELTA_MIN_FILE_SIZE)
         config->delta_max_file_size = val;
       else
-        log_message(LOG_LEVEL_WARNING, "--delta-max value %llu too small, using default", val);
-    } else if (opt_is(argv[i], "-c", "-z")) {
+        fprintf(stderr, "Warning: --delta-max value %llu too small, using default\n", val);
+    } else if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-z") == 0) {
       config->use_compression = true;
       log_message(LOG_LEVEL_INFO, "Enabled Compression");
       if (i + 1 < argc) {
@@ -276,7 +192,7 @@ int parse_args(Config* config, int argc, char* argv[], int* positional_args,
         long level = strtol(argv[i + 1], &end_ptr, 10);
         if (*end_ptr == '\0') {
           if (level < 1 || level > 22) {
-            log_message(LOG_LEVEL_ERROR, "compression level must be 1-22");
+            fprintf(stderr, "Error: compression level must be 1-22\n");
             return -1;
           }
           config->compression_level = (int)level;
@@ -284,51 +200,91 @@ int parse_args(Config* config, int argc, char* argv[], int* positional_args,
           i++;
         }
       }
-    } else if (opt_is(argv[i], "-M", "--preserve")) {
+    } else if (strcmp(argv[i], "--source-dir") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->send_directory, argv[++i], "--source-dir") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--dest-dir") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->receive_root_directory, argv[++i], "--dest-dir") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--save-to-disk") == 0) {
+      config->save_to_disk = true;
+    } else if (strcmp(argv[i], "-M") == 0 || strcmp(argv[i], "--preserve") == 0) {
       config->use_metadata = true;
       log_message(LOG_LEVEL_INFO, "Enabled metadata preservation");
-    } else if (opt_is(argv[i], "-f", "--sendfile")) {
+    } else if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--sendfile") == 0) {
       config->use_sendfile = true;
       log_message(LOG_LEVEL_INFO, "Enabled sendfile");
-    } else if (opt_is(argv[i], "-m", NULL)) {
+    } else if (strcmp(argv[i], "-m") == 0) {
       config->use_multithreading = true;
       log_message(LOG_LEVEL_INFO, "Enabled Multithreading");
-    } else if (opt_is(argv[i], "-s", NULL)) {
+    } else if (strcmp(argv[i], "-s") == 0) {
       config->use_chunk_serialization = true;
       log_message(LOG_LEVEL_INFO, "Enabled Chunk Serialization");
-    } else if (opt_is(argv[i], "--server-port", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "--server-host") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->server_host, argv[++i], "--server-host") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--server-port") == 0 && i + 1 < argc) {
       if (!parse_positive_int(argv[++i], &config->server_port)) {
-        log_message(LOG_LEVEL_ERROR, "invalid --server-port value: %s", argv[i]);
+        fprintf(stderr, "Error: invalid --server-port value: %s\n", argv[i]);
         return -1;
       }
       if (config->server_port > 65535) {
-        log_message(LOG_LEVEL_ERROR, "server port must be 1-65535");
+        fprintf(stderr, "Error: server port must be 1-65535\n");
         return -1;
       }
-    } else if (opt_is(argv[i], "--bwlimit", NULL) && i + 1 < argc) {
-      unsigned long long kbps;
-      if (parse_ull_arg(argv[++i], &kbps, "--bwlimit") != 0)
-        return -1;
-      if (kbps == 0) {
-        log_message(LOG_LEVEL_ERROR, "--bwlimit must be a positive integer");
+    } else if (strcmp(argv[i], "--bwlimit") == 0 && i + 1 < argc) {
+      char* end;
+      errno = 0;
+      unsigned long long kbps = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0' || kbps == 0) {
+        fprintf(stderr, "Error: --bwlimit must be a positive integer\n");
         return -1;
       }
       if (kbps > ULLONG_MAX / 1024) {
-        log_message(LOG_LEVEL_ERROR, "--bwlimit value too large");
+        fprintf(stderr, "Error: --bwlimit value too large\n");
         return -1;
       }
       io_set_bwlimit(kbps * 1024);
       log_message(LOG_LEVEL_INFO, "Set bandwidth limit to %llu KB/s", kbps);
-    } else if (opt_is(argv[i], "--chunk-size", NULL) && i + 1 < argc) {
-      unsigned long long val;
-      if (parse_ull_arg(argv[++i], &val, "--chunk-size") != 0)
-        return -1;
-      if (val == 0) {
-        log_message(LOG_LEVEL_ERROR, "--chunk-size must be a positive integer");
+    } else if (strcmp(argv[i], "--progress") == 0) {
+      config->show_progress = true;
+    } else if (strcmp(argv[i], "--chunk-size") == 0 && i + 1 < argc) {
+      char* end;
+      errno = 0;
+      unsigned long long val = strtoull(argv[++i], &end, 10);
+      if (errno != 0 || *end != '\0' || val == 0) {
+        fprintf(stderr, "Error: --chunk-size must be a positive integer\n");
         return -1;
       }
       config->chunk_size = val;
-    } else if (opt_is(argv[i], "--log-file", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "--tls") == 0) {
+      config->use_tls = true;
+    } else if (strcmp(argv[i], "--cert") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->tls_cert, argv[++i], "--cert") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--key") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->tls_key, argv[++i], "--key") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--ca") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->tls_ca, argv[++i], "--ca") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--timeout") == 0 && i + 1 < argc) {
+      if (set_positive_int_option(&config->timeout, argv[++i], "--timeout") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--contimeout") == 0 && i + 1 < argc) {
+      if (set_positive_int_option(&config->contimeout, argv[++i], "--contimeout") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--backup") == 0) {
+      config->backup = true;
+    } else if (strcmp(argv[i], "--backup-dir") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->backup_dir, argv[++i], "--backup-dir") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--stats") == 0) {
+      config->stats = true;
+    } else if (strcmp(argv[i], "--max-depth") == 0 && i + 1 < argc) {
+      if (set_nonneg_int_option(&config->max_depth, argv[++i], "--max-depth") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--log-file") == 0 && i + 1 < argc) {
       if (config->log_file) {
         fclose(config->log_file);
         config->log_file = NULL;
@@ -336,29 +292,55 @@ int parse_args(Config* config, int argc, char* argv[], int* positional_args,
       }
       FILE* lf = fopen(argv[++i], "a");
       if (!lf) {
-        log_message(LOG_LEVEL_ERROR, "could not open log file '%s': %s", argv[i], strerror(errno));
+        fprintf(stderr, "Error: could not open log file '%s': %s\n", argv[i], strerror(errno));
         return -1;
       }
       config->log_file = lf;
       log_set_file(lf);
-    } else if (opt_is(argv[i], "--exclude-from", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "--exclude-from") == 0 && i + 1 < argc) {
       if (read_patterns_from_file(argv[++i], &config->exclude_patterns, &config->exclude_count) !=
           0)
         return -1;
-    } else if (opt_is(argv[i], "--include-from", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "--include-from") == 0 && i + 1 < argc) {
       if (read_patterns_from_file(argv[++i], &config->include_patterns, &config->include_count) !=
           0)
         return -1;
-    } else if (opt_is(argv[i], "-v", "--verbose")) {
+    } else if (strcmp(argv[i], "--partial") == 0) {
+      config->partial = true;
+    } else if (strcmp(argv[i], "--fastsync-server-path") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->fastsync_server_path, argv[++i], "--fastsync-server-path") !=
+          0)
+        return -1;
+    } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
       set_log_level(LOG_LEVEL_DEBUG);
-    } else if (opt_is(argv[i], "-T", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "--links") == 0) {
+      config->follow_symlinks = true;
+    } else if (strcmp(argv[i], "--copy-links") == 0) {
+      config->copy_links = true;
+    } else if (strcmp(argv[i], "--safe-links") == 0) {
+      config->safe_links = true;
+    } else if (strcmp(argv[i], "--copy-unsafe-links") == 0) {
+      config->copy_unsafe_links = true;
+    } else if (strcmp(argv[i], "-S") == 0 || strcmp(argv[i], "--sparse") == 0) {
+      config->preserve_sparse = true;
+    } else if (strcmp(argv[i], "--inplace") == 0) {
+      config->inplace = true;
+    } else if (strcmp(argv[i], "--partial-dir") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->partial_dir, argv[++i], "--partial-dir") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "--suffix") == 0 && i + 1 < argc) {
+      if (set_string_option(&config->suffix, argv[++i], "--suffix") != 0)
+        return -1;
+    } else if (strcmp(argv[i], "-T") == 0 && i + 1 < argc) {
       if (set_positive_int_option(&config->timeout, argv[++i], "-T") != 0)
         return -1;
-    } else if (opt_is(argv[i], "--compress-level", NULL) && i + 1 < argc) {
+    } else if (strcmp(argv[i], "--checksum") == 0) {
+      config->checksum = true;
+    } else if (strcmp(argv[i], "--compress-level") == 0 && i + 1 < argc) {
       if (set_positive_int_option(&config->compression_level, argv[++i], "--compress-level") != 0)
         return -1;
       if (config->compression_level < 1 || config->compression_level > 22) {
-        log_message(LOG_LEVEL_ERROR, "--compress-level must be between 1 and 22");
+        fprintf(stderr, "Error: --compress-level must be between 1 and 22\n");
         return -1;
       }
     } else if (argv[i][0] == '-') {
@@ -378,10 +360,59 @@ int parse_args(Config* config, int argc, char* argv[], int* positional_args,
   return 0;
 }
 
+#ifndef FASTSYNC_TEST_BUILD
+/* Validate config after parsing. Returns true if valid. */
+static bool validate_config(const Config* config) {
+  if (!config->send_directory || !config->receive_root_directory) {
+    fprintf(stderr, "Error: source and destination directories are required\n");
+    print_usage();
+    return false;
+  }
+  if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
+    fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk "
+                    "serialization)\n");
+    return false;
+  }
+  if (config->transport == TRANSPORT_SSH && config->use_sendfile) {
+    fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
+    return false;
+  }
+  if (config->use_incremental && config->use_chunk_serialization) {
+    fprintf(stderr, "Error: --incremental is not supported with -s (chunk serialization)\n");
+    return false;
+  }
+  if (config->use_delta && !config->use_incremental) {
+    fprintf(stderr, "Error: --delta requires --incremental\n");
+    return false;
+  }
+  if (config->use_delta && config->use_chunk_serialization) {
+    fprintf(stderr, "Error: --delta cannot be combined with -s (chunk serialization)\n");
+    return false;
+  }
+  if (config->use_delta && config->use_sendfile) {
+    fprintf(stderr, "Error: --delta cannot be combined with -f (sendfile)\n");
+    return false;
+  }
+  if (config->append || config->append_verify) {
+    fprintf(
+        stderr,
+        "Error: --append and --append-verify are not supported yet; refusing to ignore option\n");
+    return false;
+  }
+  if (config->use_tls) {
+    if (!config->tls_cert || !config->tls_key) {
+      fprintf(stderr, "Error: --tls requires --cert and --key\n");
+      return false;
+    }
+  }
+  return true;
+}
+#endif /* FASTSYNC_TEST_BUILD */
+
 static int read_patterns_from_file(const char* filepath, char*** patterns, int* count) {
   FILE* fp = fopen(filepath, "r");
   if (!fp) {
-    log_message(LOG_LEVEL_ERROR, "could not open pattern file '%s': %s", filepath, strerror(errno));
+    fprintf(stderr, "Error: could not open pattern file '%s': %s\n", filepath, strerror(errno));
     return -1;
   }
   char* line = NULL;
@@ -398,11 +429,22 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
       p[--len] = '\0';
     if (len == 0)
       continue;
-    if (config_add_pattern(patterns, count, p, "pattern file") != 0) {
+    char** tmp = realloc(*patterns, (*count + 1) * sizeof(char*));
+    if (!tmp) {
+      fprintf(stderr, "Error: memory allocation failed for pattern file\n");
       free(line);
       fclose(fp);
       return -1;
     }
+    *patterns = tmp;
+    char* dup = str_dup(p);
+    if (!dup) {
+      fprintf(stderr, "Error: memory allocation failed for pattern file\n");
+      free(line);
+      fclose(fp);
+      return -1;
+    }
+    (*patterns)[(*count)++] = dup;
   }
   free(line);
   fclose(fp);
@@ -420,7 +462,7 @@ int main(int argc, char* argv[]) {
   bool config_owned_by_pipeline = false;
   Config* config = config_create();
   if (!config) {
-    log_message(LOG_LEVEL_ERROR, "failed to allocate config");
+    fprintf(stderr, "Error: failed to allocate config\n");
     return 1;
   }
   config->save_to_disk = save_to_disk;
@@ -441,20 +483,20 @@ int main(int argc, char* argv[]) {
     free(config->receive_root_directory);
     config->send_directory = str_dup(argv[positional_args[0]]);
     if (!config->send_directory) {
-      log_message(LOG_LEVEL_ERROR, "memory allocation failed");
+      fprintf(stderr, "Error: memory allocation failed\n");
       exit_code = 1;
       goto cleanup;
     }
     config->receive_root_directory = str_dup(argv[positional_args[1]]);
     if (!config->receive_root_directory) {
-      log_message(LOG_LEVEL_ERROR, "memory allocation failed");
+      fprintf(stderr, "Error: memory allocation failed\n");
       exit_code = 1;
       goto cleanup;
     }
     config->save_to_disk = true;
     config_parse_ssh_dest(config);
   } else if (positional_count == 1) {
-    log_message(LOG_LEVEL_ERROR, "missing destination argument");
+    fprintf(stderr, "Error: missing destination argument\n");
     print_usage();
     exit_code = 1;
     goto cleanup;
@@ -462,7 +504,7 @@ int main(int argc, char* argv[]) {
     if (!config->send_directory && env_source) {
       config->send_directory = str_dup(env_source);
       if (!config->send_directory) {
-        log_message(LOG_LEVEL_ERROR, "memory allocation failed");
+        fprintf(stderr, "Error: memory allocation failed\n");
         exit_code = 1;
         goto cleanup;
       }
@@ -470,7 +512,7 @@ int main(int argc, char* argv[]) {
     if (!config->receive_root_directory && env_dest) {
       config->receive_root_directory = str_dup(env_dest);
       if (!config->receive_root_directory) {
-        log_message(LOG_LEVEL_ERROR, "memory allocation failed");
+        fprintf(stderr, "Error: memory allocation failed\n");
         exit_code = 1;
         goto cleanup;
       }

src/client/client_send.c

@@ -28,88 +28,6 @@
 /* Forward declaration for progress-reporting thread used in multithreaded send. */
 static int progress_thread_fn(void* arg);
 
-static ScannerOptions scanner_options_from_config(const Config* config, int num_threads) {
-  ScannerOptions options = {
-      config->use_metadata,  config->chunk_size,        config->exclude_patterns,
-      config->exclude_count, config->include_patterns,  config->include_count,
-      config->max_size,      config->min_size,          config->max_depth,
-      num_threads,           config->follow_symlinks,   config->copy_links,
-      config->safe_links,    config->copy_unsafe_links, config->checksum};
-  return options;
-}
-
-/* Select the configured transport for both transfer execution paths. */
-static Client* connect_transfer_client(const Config* config) {
-  if (config->transport == TRANSPORT_SSH) {
-    if (config->use_sendfile) {
-      log_message(LOG_LEVEL_ERROR, "-f/--sendfile is not supported with SSH transport");
-      return NULL;
-    }
-    return client_connect_ssh(config->ssh_destination, config->ssh_port,
-                              config->fastsync_server_path);
-  }
-
-  Client* client = client_create();
-  if (!client)
-    return NULL;
-  bool connected;
-  if (config->use_tls) {
-    connected = client_connect_tls(client, config->server_host, config->server_port,
-                                   config->tls_cert, config->tls_key, config->tls_ca);
-  } else {
-    connected = client_connect(client, config->server_host, config->server_port);
-  }
-  if (!connected) {
-    client_disconnect(client);
-    client_delete(client);
-    return NULL;
-  }
-  return client;
-}
-
-static void disconnect_transfer_client(Client* client) {
-  if (!client)
-    return;
-  client_disconnect(client);
-  client_delete(client);
-}
-
-static ArrayList* create_transfer_manifest(const Config* config) {
-  return config->use_delete ? array_list_create(free) : NULL;
-}
-
-static bool add_chunk_to_manifest(ArrayList* manifest, const Chunk* chunk) {
-  if (!manifest)
-    return true;
-  for (int i = 0; i < chunk->element_count; i++) {
-    const char* path = chunk->items[i]->path;
-    if (*path == '/')
-      path++;
-    char* entry = str_dup(path);
-    if (!entry) {
-      log_message(LOG_LEVEL_ERROR, "Failed to allocate manifest entry");
-      return false;
-    }
-    if (!array_list_add(manifest, entry)) {
-      free(entry);
-      return false;
-    }
-  }
-  return true;
-}
-
-static bool finalize_transfer(Client* client) {
-  Status status;
-  return send_status(client->file_descriptor, STATUS_FINISHED) &&
-         receive_status(client->file_descriptor, &status) && status == STATUS_OK;
-}
-
-static void mark_sender_done(PipelineContextSender* context) {
-  mtx_lock(&context->mutex_progress);
-  context->sender_done = true;
-  mtx_unlock(&context->mutex_progress);
-}
-
 static void pipeline_cancel(PipelineContextSender* context) {
   mtx_lock(&context->mutex_scanner);
   mtx_lock(&context->mutex_loader);
@@ -125,10 +43,12 @@ static void pipeline_cancel(PipelineContextSender* context) {
 }
 
 /* Print dry-run manifest showing files that would be transferred. Returns 0 on success. */
-static int send_dry_run_manifest(const Config* config) {
-  ScannerOptions options = scanner_options_from_config(config, 0);
-  DirectoryScanner* scanner =
-      directory_scanner_create_with_options(config->send_directory, &options);
+static int send_dry_run_manifest(Config* config) {
+  DirectoryScanner* scanner = directory_scanner_create(
+      config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
+      config->exclude_count, config->include_patterns, config->include_count, config->max_size,
+      config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
+      config->safe_links, config->copy_unsafe_links, config->checksum);
   if (!scanner)
     return -1;
   Chunk* chunk;
@@ -209,11 +129,8 @@ static int incremental_check(Client* client, File* file, const Config* config,
 
 static int send_delta(Client* client, File* file, DeltaSignature* sig, Config* config) {
   Delta* delta = delta_compute(file->data->data, file->data->size, sig, config->delta_block_size);
-  if (!delta) {
-    if (!send_status(client->file_descriptor, STATUS_NEXT))
-      return -1;
+  if (!delta)
     return 1;
-  }
 
   if (!delta_is_worthwhile(delta, file->data->size)) {
     delta_destroy(delta);
@@ -374,24 +291,49 @@ int send_chunk(Client* client, Chunk* chunk, Config* config) {
 
 static int send_chunks_multithreaded(void* pipeline_context) {
   PipelineContextSender* context = (PipelineContextSender*)pipeline_context;
-  Client* client = connect_transfer_client(context->config);
-  if (!client) {
-    if (context->config->transport == TRANSPORT_TCP)
-      log_message(LOG_LEVEL_ERROR, "could not connect to server%s",
-                  context->config->use_tls ? " via TLS" : "");
-    pipeline_cancel(context);
-    mark_sender_done(context);
+  Client* client;
+  if (context->config->transport == TRANSPORT_SSH) {
+    if (context->config->use_sendfile) {
+      fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
+      mtx_lock(&context->mutex_progress);
+      context->sender_done = true;
+      mtx_unlock(&context->mutex_progress);
+      return 1;
+    }
+    client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port,
+                                context->config->fastsync_server_path);
+  } else if (context->config->use_tls) {
+    client = client_create();
+    if (!client || !client_connect_tls(client, context->config->server_host,
+                                       context->config->server_port, context->config->tls_cert,
+                                       context->config->tls_key, context->config->tls_ca)) {
+      if (client)
+        client_delete(client);
+      fprintf(stderr, "Error: could not connect to server via TLS\n");
+      mtx_lock(&context->mutex_progress);
+      context->sender_done = true;
+      mtx_unlock(&context->mutex_progress);
       return thrd_error;
     }
-  ProtocolSession session;
-  protocol_session_init(&session, client->file_descriptor, client->file_descriptor);
-  protocol_session_set_ssl(&session, (SSL*)client->ssl);
-  protocol_session_bind(&session);
+  } else {
+    client = client_create();
+    if (!client ||
+        !client_connect(client, context->config->server_host, context->config->server_port)) {
+      if (client)
+        client_delete(client);
+      fprintf(stderr, "Error: could not connect to server\n");
+      mtx_lock(&context->mutex_progress);
+      context->sender_done = true;
+      mtx_unlock(&context->mutex_progress);
+      return thrd_error;
+    }
+  }
   if (!config_send(client->file_descriptor, context->config)) {
-    pipeline_cancel(context);
-    disconnect_transfer_client(client);
-    mark_sender_done(context);
-    protocol_session_unbind();
+    client_disconnect(client);
+    client_delete(client);
+    mtx_lock(&context->mutex_progress);
+    context->sender_done = true;
+    mtx_unlock(&context->mutex_progress);
     return thrd_error;
   }
 
@@ -400,37 +342,39 @@ static int send_chunks_multithreaded(void* pipeline_context) {
         context->queue_loader, &context->mutex_loader, &context->condition_not_empty_loader,
         &context->condition_not_full_loader, &context->loader_done);
     if (current_chunk == NULL) {
-      if (atomic_load(&context->cancelled)) {
-        pipeline_cancel(context);
-        disconnect_transfer_client(client);
-        mark_sender_done(context);
-        protocol_session_unbind();
-        return thrd_error;
-      }
       if (context->config->use_delete) {
         if (send_delete_manifest(client->file_descriptor, context->manifest) != 0)
           goto send_fail;
       }
-      bool ok = finalize_transfer(client);
-      disconnect_transfer_client(client);
-      mark_sender_done(context);
-      protocol_session_unbind();
+      if (!send_status(client->file_descriptor, STATUS_FINISHED))
+        goto send_fail;
+      Status s;
+      int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
+      client_disconnect(client);
+      client_delete(client);
+      mtx_lock(&context->mutex_progress);
+      context->sender_done = true;
+      mtx_unlock(&context->mutex_progress);
       return ok ? thrd_success : thrd_error;
 
     send_fail:
       pipeline_cancel(context);
-      disconnect_transfer_client(client);
-      mark_sender_done(context);
-      protocol_session_unbind();
+      client_disconnect(client);
+      client_delete(client);
+      mtx_lock(&context->mutex_progress);
+      context->sender_done = true;
+      mtx_unlock(&context->mutex_progress);
       return thrd_error;
     }
     if (send_chunk(client, current_chunk, context->config) != 0) {
-      log_message(LOG_LEVEL_ERROR, "unexpected error while sending chunk");
+      fprintf(stderr, "Error: unexpected error while sending chunk\n");
       chunk_destroy(current_chunk);
       pipeline_cancel(context);
-      disconnect_transfer_client(client);
-      mark_sender_done(context);
-      protocol_session_unbind();
+      client_disconnect(client);
+      client_delete(client);
+      mtx_lock(&context->mutex_progress);
+      context->sender_done = true;
+      mtx_unlock(&context->mutex_progress);
       return thrd_error;
     }
     if (context->config->show_progress) {
@@ -449,9 +393,13 @@ static int send_chunks_multithreaded(void* pipeline_context) {
 
 static int scan_directory_multithreaded(void* pipeline_context) {
   PipelineContextSender* context = (PipelineContextSender*)pipeline_context;
-  ScannerOptions options = scanner_options_from_config(context->config, 4);
-  ParallelScanner* scanner =
-      parallel_scanner_create_with_options(context->config->send_directory, &options);
+  ParallelScanner* scanner = parallel_scanner_create(
+      context->config->send_directory, context->config->use_metadata, context->config->chunk_size,
+      context->config->exclude_patterns, context->config->exclude_count,
+      context->config->include_patterns, context->config->include_count, context->config->max_size,
+      context->config->min_size, context->config->max_depth, 4, context->config->follow_symlinks,
+      context->config->copy_links, context->config->safe_links, context->config->copy_unsafe_links,
+      context->config->checksum);
 
   Chunk* current_chunk;
   if (scanner == NULL) {
@@ -462,15 +410,29 @@ static int scan_directory_multithreaded(void* pipeline_context) {
   while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
     if (context->config->use_delete) {
       mtx_lock(&context->mutex_scanner);
-      bool manifest_ok = add_chunk_to_manifest(context->manifest, current_chunk);
+      for (int i = 0; i < current_chunk->element_count; i++) {
+        const char* p = current_chunk->items[i]->path;
+        if (*p == '/')
+          p++;
+        char* manifest_entry = str_dup(p);
+        if (!manifest_entry) {
+          log_message(LOG_LEVEL_ERROR, "Failed to allocate manifest entry");
+          mtx_unlock(&context->mutex_scanner);
+          pipeline_cancel(context);
+          parallel_scanner_destroy(scanner);
+          return thrd_error;
+        }
+        if (!array_list_add(context->manifest, manifest_entry)) {
+          free(manifest_entry);
           mtx_unlock(&context->mutex_scanner);
-      if (!manifest_ok) {
           pipeline_cancel(context);
           chunk_destroy(current_chunk);
           parallel_scanner_destroy(scanner);
           return thrd_error;
         }
       }
+      mtx_unlock(&context->mutex_scanner);
+    }
     if (!queue_enqueue_multithreaded_cancel(
             context->queue_scanner, current_chunk, &context->mutex_scanner,
             &context->condition_not_empty_scanner, &context->condition_not_full_scanner,
@@ -519,10 +481,9 @@ static int load_files_multithreaded(void* pipeline_context) {
         if (f->data->size > STREAM_THRESHOLD)
           continue;
         if (!file_load_data(f)) {
-          log_message(LOG_LEVEL_ERROR, "Failed to load file data");
-          chunk_destroy(chunk);
-          pipeline_cancel(context);
-          return thrd_error;
+          log_message(LOG_LEVEL_ERROR, "Failed to load file data, skipping");
+          file_destroy(f);
+          chunk->items[i] = NULL;
         }
       }
     }
@@ -531,23 +492,14 @@ static int load_files_multithreaded(void* pipeline_context) {
                                             &context->condition_not_full_loader,
                                             &context->cancelled)) {
       chunk_destroy(chunk);
-      pipeline_cancel(context);
+      atomic_store(&context->cancelled, true);
+      cnd_broadcast(&context->condition_not_full_loader);
+      cnd_broadcast(&context->condition_not_empty_loader);
       return thrd_error;
     }
   }
 }
 
-/* Print a one-line transfer progress report to stderr. `suffix` ends the
-   line (e.g. "Done.\n") or is "" for in-place refresh. Shared by the
-   single-threaded loop and the multithreaded progress thread. */
-static void print_transfer_progress(unsigned long long total_bytes, time_t start,
-                                    const char* suffix) {
-  double elapsed = difftime(time(NULL), start);
-  double rate = elapsed > 0.0 ? total_bytes / (1048576.0 * elapsed) : 0.0;
-  fprintf(stderr, "\rSent %.1f MB  (%.1f MB/s)  %s", total_bytes / 1048576.0, rate, suffix);
-  fflush(stderr);
-}
-
 /* Progress-reporting thread for multithreaded send. Runs in parallel with
    the scanner/loader/sender threads and prints periodic progress to stderr. */
 static int progress_thread_fn(void* arg) {
@@ -562,14 +514,20 @@ static int progress_thread_fn(void* arg) {
     mtx_unlock(&context->mutex_progress);
 
     if (done) {
-      print_transfer_progress(total, start, "Done.\n");
+      time_t now = time(NULL);
+      double elapsed = difftime(now, start);
+      double rate = elapsed > 0.0 ? total / (1048576.0 * elapsed) : 0.0;
+      fprintf(stderr, "\rSent %.1f MB  (%.1f MB/s)  Done.\n", total / 1048576.0, rate);
       break;
     }
 
     time_t now = time(NULL);
     if (now - last_progress >= 1) {
       last_progress = now;
-      print_transfer_progress(total, start, "");
+      double elapsed = difftime(now, start);
+      double rate = elapsed > 0.0 ? total / (1048576.0 * elapsed) : 0.0;
+      fprintf(stderr, "\rSent %.1f MB  (%.1f MB/s)  ", total / 1048576.0, rate);
+      fflush(stderr);
     }
 
     struct timespec ts = {0, 100 * 1000000L}; /* 100 ms */
@@ -582,58 +540,103 @@ int send_files(Config* config) {
   if (config->dry_run)
     return send_dry_run_manifest(config);
 
-  Client* client = connect_transfer_client(config);
-  if (!client) {
-    if (config->transport == TRANSPORT_TCP)
-      log_message(LOG_LEVEL_ERROR, "could not connect to server%s",
-                  config->use_tls ? " via TLS" : "");
+  Client* client;
+  if (config->transport == TRANSPORT_SSH) {
+    if (config->use_sendfile) {
+      fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
       return 1;
     }
-  ProtocolSession session;
-  protocol_session_init(&session, client->file_descriptor, client->file_descriptor);
-  protocol_session_set_ssl(&session, (SSL*)client->ssl);
-  protocol_session_bind(&session);
-  int ret = 1;
-  DirectoryScanner* scanner = NULL;
-  ArrayList* manifest = NULL;
-  if (!config_send(client->file_descriptor, config))
-    goto send_fail;
-  ScannerOptions scanner_options = scanner_options_from_config(config, 0);
-  scanner = directory_scanner_create_with_options(config->send_directory, &scanner_options);
-  manifest = create_transfer_manifest(config);
-  if (!scanner || (config->use_delete && !manifest))
-    goto send_fail;
+    client =
+        client_connect_ssh(config->ssh_destination, config->ssh_port, config->fastsync_server_path);
+    if (!client)
+      return 1;
+  } else if (config->use_tls) {
+    client = client_create();
+    if (!client || !client_connect_tls(client, config->server_host, config->server_port,
+                                       config->tls_cert, config->tls_key, config->tls_ca)) {
+      if (client) {
+        client_disconnect(client);
+        client_delete(client);
+      }
+      fprintf(stderr, "Error: could not connect to server via TLS\n");
+      return 1;
+    }
+  } else {
+    client = client_create();
+    if (!client || !client_connect(client, config->server_host, config->server_port)) {
+      if (client) {
+        client_disconnect(client);
+        client_delete(client);
+      }
+      fprintf(stderr, "Error: could not connect to server\n");
+      return 1;
+    }
+  }
+  if (!config_send(client->file_descriptor, config)) {
+    client_disconnect(client);
+    client_delete(client);
+    return 1;
+  }
+  DirectoryScanner* scanner = directory_scanner_create(
+      config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
+      config->exclude_count, config->include_patterns, config->include_count, config->max_size,
+      config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
+      config->safe_links, config->copy_unsafe_links, config->checksum);
   Chunk* current_chunk;
   unsigned long long total_bytes = 0;
   int total_files = 0;
   time_t last_progress = 0;
   time_t start = time(NULL);
+  ArrayList* manifest = config->use_delete ? array_list_create(free) : NULL;
+  if (!scanner || (config->use_delete && !manifest)) {
+    if (scanner)
+      directory_scanner_destroy(scanner);
+    if (manifest)
+      array_list_delete(manifest);
+    client_disconnect(client);
+    client_delete(client);
+    return 1;
+  }
   while ((current_chunk = directory_scanner_next(scanner)) != NULL) {
     unsigned long long chunk_bytes = 0;
     for (int i = 0; i < current_chunk->element_count; i++) {
       chunk_bytes += current_chunk->items[i]->data->size;
       total_files++;
-    }
-    if (!add_chunk_to_manifest(manifest, current_chunk)) {
+      if (manifest) {
+        const char* p = current_chunk->items[i]->path;
+        if (*p == '/')
+          p++;
+        char* manifest_entry = str_dup(p);
+        if (!manifest_entry) {
+          log_message(LOG_LEVEL_ERROR, "Failed to allocate manifest entry");
           chunk_destroy(current_chunk);
-      goto send_fail;
+          array_list_delete(manifest);
+          directory_scanner_destroy(scanner);
+          client_disconnect(client);
+          client_delete(client);
+          return 1;
+        }
+        if (!array_list_add(manifest, manifest_entry)) {
+          free(manifest_entry);
+          chunk_destroy(current_chunk);
+          array_list_delete(manifest);
+          directory_scanner_destroy(scanner);
+          client_disconnect(client);
+          client_delete(client);
+          return 1;
+        }
+      }
     }
     if (!config->use_sendfile) {
-      bool load_ok = true;
       for (int i = 0; i < current_chunk->element_count; i++) {
         File* f = current_chunk->items[i];
         if (f->data->size > STREAM_THRESHOLD)
           continue;
         if (!file_load_data(f)) {
           log_message(LOG_LEVEL_ERROR, "Failed to load file data");
-          load_ok = false;
-          break;
+          continue;
         }
       }
-      if (!load_ok) {
-        chunk_destroy(current_chunk);
-        goto send_fail;
-      }
     }
     if (send_chunk(client, current_chunk, config) != 0) {
       log_message(LOG_LEVEL_ERROR, "Failed to send chunk");
@@ -648,7 +651,10 @@ int send_files(Config* config) {
       time_t now = time(NULL);
       if (now - last_progress >= 1) {
         last_progress = now;
-        print_transfer_progress(total_bytes, start, "");
+        double elapsed = difftime(now, start);
+        double rate = elapsed > 0 ? total_bytes / (1048576.0 * elapsed) : 0;
+        fprintf(stderr, "\rSent %.1f MB  (%.1f MB/s)  ", total_bytes / 1048576.0, rate);
+        fflush(stderr);
       }
     }
     chunk_destroy(current_chunk);
@@ -658,33 +664,37 @@ int send_files(Config* config) {
   if (config->use_delete) {
     if (send_delete_manifest(client->file_descriptor, manifest) != 0) {
       array_list_delete(manifest);
-      manifest = NULL;
       goto send_fail;
     }
     array_list_delete(manifest);
     manifest = NULL;
   }
-  bool ok = finalize_transfer(client);
-  if (config->show_progress)
-    print_transfer_progress(total_bytes, start, "Done.\n");
-  if (config->stats) {
+  if (!send_status(client->file_descriptor, STATUS_FINISHED))
+    goto send_fail;
+  Status s;
+  int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
   double elapsed_total = difftime(time(NULL), start);
+  if (config->show_progress) {
+    double rate = elapsed_total > 0 ? total_bytes / (1048576.0 * elapsed_total) : 0;
+    fprintf(stderr, "\rSent %.1f MB  (%.1f MB/s)  Done.\n", total_bytes / 1048576.0, rate);
+  }
+  if (config->stats) {
     double rate = elapsed_total > 0 ? total_bytes / (1048576.0 * elapsed_total) : 0;
     fprintf(stderr, "Stats: %d files, %.1f MB, %.1f MB/s\n", total_files, total_bytes / 1048576.0,
             rate);
   }
-  ret = ok ? 0 : 1;
+  directory_scanner_destroy(scanner);
+  client_disconnect(client);
+  client_delete(client);
+  return ok ? 0 : 1;
 
 send_fail:
-  /* Single cleanup path for all exits. The manifest is intentionally deleted
-     here even on success without --delete, fixing a pre-existing leak. */
   if (manifest)
     array_list_delete(manifest);
-  if (scanner)
   directory_scanner_destroy(scanner);
-  disconnect_transfer_client(client);
-  protocol_session_unbind();
-  return ret;
+  client_disconnect(client);
+  client_delete(client);
+  return 1;
 }
 
 int send_files_multithreaded(Config* config) {
@@ -719,11 +729,7 @@ int send_files_multithreaded(Config* config) {
     return 1;
   }
   if (config->use_delete)
-    context->manifest = create_transfer_manifest(config);
-  if (config->use_delete && !context->manifest) {
-    pipeline_context_sender_destroy(context);
-    return 1;
-  }
+    context->manifest = array_list_create(free);
 
   thrd_t scanner, loader, sender;
   bool scanner_created = false;
@@ -737,7 +743,7 @@ int send_files_multithreaded(Config* config) {
     sender_created = (thrd_create(&sender, send_chunks_multithreaded, context) == thrd_success);
 
   if (!scanner_created || !loader_created || !sender_created) {
-    log_perror("Error creating threads");
+    perror("Error creating threads.\n");
     pipeline_cancel(context);
     mtx_lock(&context->mutex_progress);
     context->sender_done = true;
@@ -757,7 +763,7 @@ int send_files_multithreaded(Config* config) {
   if (config->show_progress) {
     progress_created = (thrd_create(&progress, progress_thread_fn, context) == thrd_success);
     if (!progress_created) {
-      log_perror("Error creating progress thread");
+      perror("Error creating progress thread.\n");
       /* Non-fatal; continue without progress reporting */
     }
   }

src/client/client_validation.c

@@ -1,51 +0,0 @@
-#include "client_validation.h"
-#include "log.h"
-#include "usage.h"
-#include <stdio.h>
-
-/* Validate config after parsing. Returns true if valid. */
-bool validate_config(const Config* config) {
-  if (!config->send_directory || !config->receive_root_directory) {
-    log_message(LOG_LEVEL_ERROR, "source and destination directories are required");
-    print_usage();
-    return false;
-  }
-  if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
-    log_message(LOG_LEVEL_ERROR, "-f/--sendfile cannot be combined with -c (compression) or -s "
-                                 "(chunk serialization)");
-    return false;
-  }
-  if (config->transport == TRANSPORT_SSH && config->use_sendfile) {
-    log_message(LOG_LEVEL_ERROR, "-f/--sendfile is not supported with SSH transport");
-    return false;
-  }
-  if (config->use_incremental && config->use_chunk_serialization) {
-    log_message(LOG_LEVEL_ERROR, "--incremental is not supported with -s (chunk serialization)");
-    return false;
-  }
-  if (config->use_delta && !config->use_incremental) {
-    log_message(LOG_LEVEL_ERROR, "--delta requires --incremental");
-    return false;
-  }
-  if (config->use_delta && config->use_chunk_serialization) {
-    log_message(LOG_LEVEL_ERROR, "--delta cannot be combined with -s (chunk serialization)");
-    return false;
-  }
-  if (config->use_delta && config->use_sendfile) {
-    log_message(LOG_LEVEL_ERROR, "--delta cannot be combined with -f (sendfile)");
-    return false;
-  }
-  if (config->append || config->append_verify) {
-    fprintf(
-        stderr,
-        "Error: --append and --append-verify are not supported yet; refusing to ignore option\n");
-    return false;
-  }
-  if (config->use_tls) {
-    if (!config->tls_cert || !config->tls_key) {
-      log_message(LOG_LEVEL_ERROR, "--tls requires --cert and --key");
-      return false;
-    }
-  }
-  return true;
-}

src/client/client_validation.h

@@ -1,9 +0,0 @@
-#ifndef CLIENT_VALIDATION_H
-#define CLIENT_VALIDATION_H
-
-#include "config.h"
-#include <stdbool.h>
-
-bool validate_config(const Config* config);
-
-#endif

src/client/scanner.c

@@ -1,4 +1,3 @@
-#include "log.h"
 #include "scanner.h"
 #include "array_list.h"
 #include "chunk.h"
@@ -53,84 +52,13 @@ static bool safe_relative_link(const char* source_root, const char* containing_d
   return safe;
 }
 
-typedef struct {
-  char* path;
-  struct stat stats;
-  bool is_directory;
-} ScannerEntry;
-
-/* Inspect symlinks, resolve the entry type, and apply file filters once for both scanners. */
-static int scanner_inspect_entry(const ScannerOptions* options, const char* source_root,
-                                 const char* containing_dir, const char* name,
-                                 ScannerEntry* entry) {
-  entry->path = path_cat(containing_dir, name);
-  if (!entry->path)
-    return -1;
-
-  struct stat link_stats;
-  if (lstat(entry->path, &link_stats) != 0) {
-    free(entry->path);
-    return 0;
-  }
-  bool is_symlink = S_ISLNK(link_stats.st_mode);
-  if (is_symlink && !options->follow_symlinks && !options->copy_links && !options->safe_links &&
-      !options->copy_unsafe_links)
-    goto skip;
-
-  if (is_symlink && options->safe_links) {
-    char link_target[4096];
-    ssize_t length = readlink(entry->path, link_target, sizeof(link_target) - 1);
-    if (length < 0)
-      goto skip;
-    link_target[length] = '\0';
-    if (link_target[0] == '/' || !safe_relative_link(source_root, containing_dir, link_target))
-      goto skip;
-  }
-
-  if (is_symlink && options->copy_unsafe_links && !options->copy_links) {
-    char link_target[4096];
-    ssize_t length = readlink(entry->path, link_target, sizeof(link_target) - 1);
-    if (length < 0)
-      goto skip;
-    link_target[length] = '\0';
-    if (link_target[0] != '/')
-      goto skip;
-  }
-
-  if (is_symlink && options->follow_symlinks && !options->copy_links)
-    entry->stats = link_stats;
-  else if (stat(entry->path, &entry->stats) != 0)
-    goto skip;
-
-  entry->is_directory = S_ISDIR(entry->stats.st_mode);
-  if (entry->is_directory)
-    return 1;
-  for (int i = 0; i < options->exclude_count; i++)
-    if (glob_match(options->exclude_patterns[i], name))
-      goto skip;
-  if (options->include_count > 0) {
-    bool included = false;
-    for (int i = 0; i < options->include_count; i++)
-      if (glob_match(options->include_patterns[i], name))
-        included = true;
-    if (!included)
-      goto skip;
-  }
-  if ((options->max_size > 0 && (unsigned long long)entry->stats.st_size > options->max_size) ||
-      (options->min_size > 0 && (unsigned long long)entry->stats.st_size < options->min_size))
-    goto skip;
-  return 1;
-
-skip:
-  free(entry->path);
-  entry->path = NULL;
-  return 0;
-}
-
-DirectoryScanner* directory_scanner_create_with_options(const char* root_directory,
-                                                        const ScannerOptions* options) {
-  if (!root_directory || !options)
-    return NULL;
+DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata,
+                                           unsigned long long chunk_size, char** exclude_patterns,
+                                           int exclude_count, char** include_patterns,
+                                           int include_count, unsigned long long max_size,
+                                           unsigned long long min_size, int max_depth,
+                                           bool follow_symlinks, bool copy_links, bool safe_links,
+                                           bool copy_unsafe_links, bool checksum) {
   DirectoryScanner* scanner = calloc(1, sizeof(DirectoryScanner));
   if (scanner == NULL)
     return NULL;
@@ -141,21 +69,21 @@ DirectoryScanner* directory_scanner_create_with_options(const char* root_directo
   }
   scanner->current_dir = NULL;
   scanner->current_path = NULL;
-  scanner->use_metadata = options->use_metadata;
-  scanner->chunk_size = options->chunk_size > 0 ? options->chunk_size : DESIRED_CHUNK_SIZE;
-  scanner->exclude_patterns = options->exclude_patterns;
-  scanner->exclude_count = options->exclude_count;
-  scanner->include_patterns = options->include_patterns;
-  scanner->include_count = options->include_count;
-  scanner->max_size = options->max_size;
-  scanner->min_size = options->min_size;
-  scanner->max_depth = options->max_depth;
+  scanner->use_metadata = use_metadata;
+  scanner->chunk_size = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
+  scanner->exclude_patterns = exclude_patterns;
+  scanner->exclude_count = exclude_count;
+  scanner->include_patterns = include_patterns;
+  scanner->include_count = include_count;
+  scanner->max_size = max_size;
+  scanner->min_size = min_size;
+  scanner->max_depth = max_depth;
   scanner->current_depth = 0;
-  scanner->follow_symlinks = options->follow_symlinks;
-  scanner->copy_links = options->copy_links;
-  scanner->safe_links = options->safe_links;
-  scanner->copy_unsafe_links = options->copy_unsafe_links;
-  scanner->checksum = options->checksum;
+  scanner->follow_symlinks = follow_symlinks;
+  scanner->copy_links = copy_links;
+  scanner->safe_links = safe_links;
+  scanner->copy_unsafe_links = copy_unsafe_links;
+  scanner->checksum = checksum;
   scanner->failed = false;
   DirEntry* root = dir_entry_create(root_directory, 0);
   if (!root) {
@@ -172,20 +100,6 @@ DirectoryScanner* directory_scanner_create_with_options(const char* root_directo
   return scanner;
 }
 
-DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata,
-                                           unsigned long long chunk_size, char** exclude_patterns,
-                                           int exclude_count, char** include_patterns,
-                                           int include_count, unsigned long long max_size,
-                                           unsigned long long min_size, int max_depth,
-                                           bool follow_symlinks, bool copy_links, bool safe_links,
-                                           bool copy_unsafe_links, bool checksum) {
-  ScannerOptions options = {
-      use_metadata,    chunk_size, exclude_patterns, exclude_count,     include_patterns,
-      include_count,   max_size,   min_size,         max_depth,         0,
-      follow_symlinks, copy_links, safe_links,       copy_unsafe_links, checksum};
-  return directory_scanner_create_with_options(root_directory, &options);
-}
-
 void directory_scanner_destroy(DirectoryScanner* scanner) {
   if (scanner == NULL)
     return;
@@ -227,7 +141,7 @@ static int open_next_directory(DirectoryScanner* scanner) {
   free(de);
   scanner->current_dir = opendir(scanner->current_path);
   if (scanner->current_dir == NULL) {
-    log_perror("Could not open directory");
+    perror("Could not open directory");
     free(scanner->current_path);
     scanner->current_path = NULL;
     scanner->failed = true;
@@ -253,7 +167,7 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
         break;
     }
 
-    const struct dirent* entry = readdir(scanner->current_dir);
+    struct dirent* entry = readdir(scanner->current_dir);
     if (entry == NULL) {
       closedir(scanner->current_dir);
       scanner->current_dir = NULL;
@@ -265,27 +179,67 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
       continue;
 
-    ScannerOptions options = {scanner->use_metadata,     scanner->chunk_size,
-                              scanner->exclude_patterns, scanner->exclude_count,
-                              scanner->include_patterns, scanner->include_count,
-                              scanner->max_size,         scanner->min_size,
-                              scanner->max_depth,        0,
-                              scanner->follow_symlinks,  scanner->copy_links,
-                              scanner->safe_links,       scanner->copy_unsafe_links,
-                              scanner->checksum};
-    ScannerEntry inspected;
-    int inspection = scanner_inspect_entry(&options, scanner->current_path, scanner->current_path,
-                                           entry->d_name, &inspected);
-    if (inspection < 0) {
+    char* cur_path = path_cat(scanner->current_path, entry->d_name);
+    if (!cur_path) {
       scanner->failed = true;
       break;
     }
-    if (inspection == 0)
+    struct stat stats;
+    struct stat lstats;
+    bool is_symlink = false;
+    if (lstat(cur_path, &lstats) != 0) {
+      free(cur_path);
       continue;
-    char* cur_path = inspected.path;
-    struct stat stats = inspected.stats;
+    }
+    is_symlink = S_ISLNK(lstats.st_mode);
 
-    if (inspected.is_directory) {
+    if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links &&
+        !scanner->copy_unsafe_links) {
+      free(cur_path);
+      continue;
+    }
+
+    if (is_symlink && scanner->safe_links) {
+      char link_target[4096];
+      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
+      if (len < 0) {
+        free(cur_path);
+        continue;
+      }
+      link_target[len] = '\0';
+      if (link_target[0] == '/' ||
+          !safe_relative_link(scanner->current_path, scanner->current_path, link_target)) {
+        free(cur_path);
+        continue;
+      }
+    }
+
+    if (is_symlink && scanner->copy_unsafe_links && !scanner->copy_links) {
+      char link_target[4096];
+      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
+      if (len < 0) {
+        free(cur_path);
+        continue;
+      }
+      link_target[len] = '\0';
+      bool unsafe = (link_target[0] == '/');
+      if (!unsafe) {
+        free(cur_path);
+        continue;
+      }
+    }
+
+    bool use_lstat = is_symlink && scanner->follow_symlinks && !scanner->copy_links;
+    if (use_lstat) {
+      stats = lstats;
+    } else {
+      if (stat(cur_path, &stats) != 0) {
+        free(cur_path);
+        continue;
+      }
+    }
+
+    if (S_ISDIR(stats.st_mode)) {
       int next_depth = scanner->current_depth + 1;
       if (scanner->max_depth <= 0 || next_depth < scanner->max_depth) {
         DirEntry* de = dir_entry_create(cur_path, next_depth);
@@ -300,6 +254,38 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
         free(cur_path);
         continue;
       }
+      bool excluded = false;
+      for (int i = 0; i < scanner->exclude_count; i++) {
+        if (glob_match(scanner->exclude_patterns[i], entry->d_name)) {
+          excluded = true;
+          break;
+        }
+      }
+      if (excluded) {
+        free(cur_path);
+        continue;
+      }
+
+      if (scanner->include_count > 0) {
+        bool included = false;
+        for (int i = 0; i < scanner->include_count; i++) {
+          if (glob_match(scanner->include_patterns[i], entry->d_name)) {
+            included = true;
+            break;
+          }
+        }
+        if (!included) {
+          free(cur_path);
+          continue;
+        }
+      }
+
+      if ((scanner->max_size > 0 && (unsigned long long)stats.st_size > scanner->max_size) ||
+          (scanner->min_size > 0 && (unsigned long long)stats.st_size < scanner->min_size)) {
+        free(cur_path);
+        continue;
+      }
+
       File* file = file_create(cur_path);
       if (file == NULL) {
         free(cur_path);
@@ -350,13 +336,29 @@ typedef struct {
   ParallelScanner* ps;
   char** dirs;
   int dir_count;
-  ScannerOptions options;
+  bool use_metadata;
+  unsigned long long chunk_size;
+  char** exclude_patterns;
+  int exclude_count;
+  char** include_patterns;
+  int include_count;
+  unsigned long long max_size;
+  unsigned long long min_size;
+  int max_depth;
+  bool follow_symlinks;
+  bool copy_links;
+  bool safe_links;
+  bool copy_unsafe_links;
+  bool checksum;
 } ParallelWorkerArg;
 
 static int parallel_worker_thread(void* arg) {
   ParallelWorkerArg* wa = (ParallelWorkerArg*)arg;
   for (int i = 0; i < wa->dir_count; i++) {
-    DirectoryScanner* ds = directory_scanner_create_with_options(wa->dirs[i], &wa->options);
+    DirectoryScanner* ds = directory_scanner_create(
+        wa->dirs[i], wa->use_metadata, wa->chunk_size, wa->exclude_patterns, wa->exclude_count,
+        wa->include_patterns, wa->include_count, wa->max_size, wa->min_size, wa->max_depth,
+        wa->follow_symlinks, wa->copy_links, wa->safe_links, wa->copy_unsafe_links, wa->checksum);
     if (!ds) {
       mtx_lock(&wa->ps->result_mutex);
       wa->ps->failed = true;
@@ -364,8 +366,6 @@ static int parallel_worker_thread(void* arg) {
       cnd_broadcast(&wa->ps->result_not_empty);
       cnd_broadcast(&wa->ps->result_not_full);
       mtx_unlock(&wa->ps->result_mutex);
-      for (int j = i; j < wa->dir_count; j++)
-        free(wa->dirs[j]);
       break;
     }
     Chunk* chunk;
@@ -401,23 +401,21 @@ static int parallel_worker_thread(void* arg) {
   return thrd_success;
 }
 
-static void parallel_scanner_creation_failed(ParallelScanner* ps) {
-  mtx_lock(&ps->result_mutex);
-  ps->failed = true;
-  atomic_store(&ps->cancelled, true);
-  ps->expected_threads = ps->created_threads;
-  if (ps->completed >= ps->expected_threads)
-    ps->done = true;
-  cnd_broadcast(&ps->result_not_empty);
-  cnd_broadcast(&ps->result_not_full);
-  mtx_unlock(&ps->result_mutex);
-}
-
-/* Initialize result queue and synchronization primitives. Returns true on success. */
-static bool parallel_scanner_init(ParallelScanner* ps) {
+ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata,
+                                         unsigned long long chunk_size, char** exclude_patterns,
+                                         int exclude_count, char** include_patterns,
+                                         int include_count, unsigned long long max_size,
+                                         unsigned long long min_size, int max_depth,
+                                         int num_threads, bool follow_symlinks, bool copy_links,
+                                         bool safe_links, bool copy_unsafe_links, bool checksum) {
+  ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
+  if (!ps)
+    return NULL;
   ps->result_queue = queue_create(100, chunk_destroy);
-  if (!ps->result_queue)
-    return false;
+  if (!ps->result_queue) {
+    free(ps);
+    return NULL;
+  }
   atomic_init(&ps->cancelled, false);
   int init = 0;
   bool ok = true;
@@ -442,37 +440,171 @@ static bool parallel_scanner_init(ParallelScanner* ps) {
     if (init >= 1)
       mtx_destroy(&ps->result_mutex);
     queue_destroy(ps->result_queue);
-    ps->result_queue = NULL;
-    return false;
-  }
-  return true;
-}
-
-/* Split files into chunks of roughly chunk_size bytes. Returns the first chunk (also stored
- * chunks beyond the first are enqueued on `queue`). Nulls out consumed entries in `files`.
- * Sets *failed on allocation/enqueue errors. */
-static Chunk* batch_files(ArrayList* files, unsigned long long chunk_size, Queue* queue,
-                          bool* failed) {
-  Chunk* first = NULL;
-  if (files->size <= 0)
+    free(ps);
     return NULL;
+  }
+
+  DIR* dir = opendir(root_directory);
+  if (!dir) {
+    perror("Could not open root directory for parallel scan");
+    parallel_scanner_destroy(ps);
+    return NULL;
+  }
+
+  ArrayList* root_files = array_list_create(file_destroy);
+  ArrayList* subdirs = array_list_create(free);
+  if (!root_files || !subdirs) {
+    array_list_delete(root_files);
+    array_list_delete(subdirs);
+    closedir(dir);
+    parallel_scanner_destroy(ps);
+    return NULL;
+  }
+  struct dirent* entry;
+  while ((entry = readdir(dir)) != NULL) {
+    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
+      continue;
+    char* cur_path = path_cat(root_directory, entry->d_name);
+    if (!cur_path)
+      continue;
+    struct stat lstats;
+    if (lstat(cur_path, &lstats) != 0) {
+      free(cur_path);
+      continue;
+    }
+    bool is_symlink = S_ISLNK(lstats.st_mode);
+
+    // Skip symlinks unless the user explicitly enabled following/copying them.
+    if (is_symlink && !follow_symlinks && !copy_links && !safe_links && !copy_unsafe_links) {
+      free(cur_path);
+      continue;
+    }
+
+    // --safe-links: reject symlinks pointing outside the source tree.
+    if (is_symlink && safe_links) {
+      char link_target[4096];
+      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
+      if (len < 0) {
+        free(cur_path);
+        continue;
+      }
+      link_target[len] = 0;
+      if (link_target[0] == '/' ||
+          !safe_relative_link(root_directory, root_directory, link_target)) {
+        free(cur_path);
+        continue;
+      }
+    }
+
+    // --copy-unsafe-links (without --copy-links): only copy absolute symlinks.
+    if (is_symlink && copy_unsafe_links && !copy_links) {
+      char link_target[4096];
+      ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
+      if (len < 0) {
+        free(cur_path);
+        continue;
+      }
+      link_target[len] = 0;
+      bool unsafe = (link_target[0] == '/');
+      if (!unsafe) {
+        free(cur_path);
+        continue;
+      }
+    }
+
+    // Determine whether to use lstat or stat results for the entry.
+    struct stat st;
+    bool use_lstat_res = is_symlink && follow_symlinks && !copy_links;
+    if (use_lstat_res) {
+      st = lstats;
+    } else {
+      if (stat(cur_path, &st) != 0) {
+        free(cur_path);
+        continue;
+      }
+    }
+
+    if (S_ISDIR(st.st_mode)) {
+      if (!array_list_add(subdirs, cur_path)) {
+        free(cur_path);
+        ps->failed = true;
+      }
+    } else {
+      bool excluded = false;
+      for (int i = 0; i < exclude_count; i++) {
+        if (glob_match(exclude_patterns[i], entry->d_name)) {
+          excluded = true;
+          break;
+        }
+      }
+      if (excluded) {
+        free(cur_path);
+        continue;
+      }
+      if (include_count > 0) {
+        bool included = false;
+        for (int i = 0; i < include_count; i++) {
+          if (glob_match(include_patterns[i], entry->d_name)) {
+            included = true;
+            break;
+          }
+        }
+        if (!included) {
+          free(cur_path);
+          continue;
+        }
+      }
+      if ((max_size > 0 && (unsigned long long)st.st_size > max_size) ||
+          (min_size > 0 && (unsigned long long)st.st_size < min_size)) {
+        free(cur_path);
+        continue;
+      }
+      File* file = file_create(cur_path);
+      free(cur_path);
+      if (!file) {
+        ps->failed = true;
+        continue;
+      }
+      file->data->size = st.st_size;
+      if (use_metadata)
+        file->metadata = file_metadata_create(&st);
+      if (use_metadata && !file->metadata) {
+        file_destroy(file);
+        ps->failed = true;
+        continue;
+      }
+      if (!array_list_add(root_files, file)) {
+        file_destroy(file);
+        ps->failed = true;
+      }
+    }
+  }
+  closedir(dir);
+
+  unsigned long long cs = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
+  if (root_files->size > 0) {
     ArrayList* batch = array_list_create(NULL);
     if (!batch) {
-    *failed = true;
+      ps->failed = true;
+      array_list_delete(root_files);
+      array_list_delete(subdirs);
+      parallel_scanner_destroy(ps);
       return NULL;
     }
     unsigned long long batch_size = 0;
-  for (int i = 0; i < files->size; i++) {
-    File* f = (File*)files->items[i];
+    Chunk* first = NULL;
+    for (int i = 0; i < root_files->size; i++) {
+      File* f = (File*)root_files->items[i];
       if (!array_list_add(batch, f)) {
-      *failed = true;
+        ps->failed = true;
         break;
       }
       batch_size += f->data->size;
-    if (batch_size >= chunk_size || i == files->size - 1) {
+      if (batch_size >= cs || i == root_files->size - 1) {
         void** items = array_list_to_array(batch);
         if (!items) {
-        *failed = true;
+          ps->failed = true;
+          batch->item_destroyer = file_destroy;
           array_list_delete(batch);
           batch = NULL;
           break;
@@ -480,29 +612,27 @@ static Chunk* batch_files(ArrayList* files, unsigned long long chunk_size, Queue
         Chunk* c = chunk_create((File**)items, batch->size);
         free(items);
         if (!c) {
-        *failed = true;
+          ps->failed = true;
+          batch->item_destroyer = file_destroy;
           array_list_delete(batch);
           batch = NULL;
           break;
         }
-      int batch_start = i - batch->size + 1;
-      for (int j = batch_start; j <= i; j++)
-        files->items[j] = NULL;
         batch->item_destroyer = NULL;
         array_list_delete(batch);
         batch = NULL;
         if (!first) {
           first = c;
         } else {
-        if (!queue_enqueue(queue, c)) {
+          if (!queue_enqueue(ps->result_queue, c)) {
             chunk_destroy(c);
-          *failed = true;
+            ps->failed = true;
           }
         }
-      if (i < files->size - 1) {
+        if (i < root_files->size - 1) {
           batch = array_list_create(NULL);
           if (!batch) {
-          *failed = true;
+            ps->failed = true;
             break;
           }
           batch_size = 0;
@@ -513,88 +643,23 @@ static Chunk* batch_files(ArrayList* files, unsigned long long chunk_size, Queue
       batch->item_destroyer = NULL;
       array_list_delete(batch);
     }
-  return first;
-}
+    ps->initial_chunk = first;
+    root_files->item_destroyer = NULL;
+  }
+  array_list_delete(root_files);
 
-/* Scan one root-directory entry into either the subdirs or files list. */
-static void scan_root_entry(const ScannerOptions* options, const char* root_directory,
-                            const struct dirent* entry, ArrayList* root_files, ArrayList* subdirs,
-                            ParallelScanner* ps) {
-  ScannerEntry inspected;
-  int inspection =
-      scanner_inspect_entry(options, root_directory, root_directory, entry->d_name, &inspected);
-  if (inspection < 0) {
-    ps->failed = true;
-    return;
-  }
-  if (inspection == 0)
-    return;
-  char* cur_path = inspected.path;
-  struct stat st = inspected.stats;
-  if (inspected.is_directory) {
-    if (!array_list_add(subdirs, cur_path)) {
-      free(cur_path);
-      ps->failed = true;
-    }
-    return;
-  }
-  File* file = file_create(cur_path);
-  free(cur_path);
-  if (!file) {
-    ps->failed = true;
-    return;
-  }
-  file->data->size = st.st_size;
-  if (options->use_metadata)
-    file->metadata = file_metadata_create(&st);
-  if (options->use_metadata && !file->metadata) {
-    file_destroy(file);
-    ps->failed = true;
-    return;
-  }
-  if (!array_list_add(root_files, file)) {
-    file_destroy(file);
-    ps->failed = true;
-  }
-}
-
-/* Scan the root directory itself, collecting root files and subdirectories.
- * Returns false if the root directory could not be opened. */
-static bool scan_root_directory(ParallelScanner* ps, const char* root_directory,
-                                const ScannerOptions* options, ArrayList* root_files,
-                                ArrayList* subdirs) {
-  DIR* dir = opendir(root_directory);
-  if (!dir) {
-    log_perror("Could not open root directory for parallel scan");
-    return false;
-  }
-  const struct dirent* entry;
-  while ((entry = readdir(dir)) != NULL) {
-    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
-      continue;
-    scan_root_entry(options, root_directory, entry, root_files, subdirs, ps);
-  }
-  closedir(dir);
-  return true;
-}
-
-/* Spawn worker threads, one per group of subdirectories. */
-static void spawn_parallel_workers(ParallelScanner* ps, ArrayList* subdirs,
-                                   const ScannerOptions* options, unsigned long long cs) {
-  if (subdirs->size <= 0)
-    return;
-  int n = options->num_threads > 0 ? options->num_threads : 4;
+  int n = num_threads > 0 ? num_threads : 4;
   if (n > subdirs->size)
-    n = subdirs->size;
+    n = subdirs->size > 0 ? subdirs->size : 1;
 
+  if (subdirs->size > 0) {
     ps->num_threads = n;
     ps->expected_threads = n;
     ps->threads = calloc(n, sizeof(thrd_t));
     if (!ps->threads) {
-    ps->num_threads = 0;
-    ps->expected_threads = 0;
-    ps->failed = true;
-    return;
+      array_list_delete(subdirs);
+      parallel_scanner_destroy(ps);
+      return NULL;
     }
     int dirs_per_thread = subdirs->size / n;
     int remainder = subdirs->size % n;
@@ -606,14 +671,14 @@ static void spawn_parallel_workers(ParallelScanner* ps, ArrayList* subdirs,
         break;
       ParallelWorkerArg* wa = calloc(1, sizeof(ParallelWorkerArg));
       if (!wa) {
-      parallel_scanner_creation_failed(ps);
+        ps->failed = true;
         break;
       }
       wa->ps = ps;
       wa->dirs = calloc(count, sizeof(char*));
       if (!wa->dirs) {
         free(wa);
-      parallel_scanner_creation_failed(ps);
+        ps->failed = true;
         break;
       }
       bool dup_ok = true;
@@ -627,59 +692,43 @@ static void spawn_parallel_workers(ParallelScanner* ps, ArrayList* subdirs,
           free(wa->dirs[j]);
         free(wa->dirs);
         free(wa);
-      parallel_scanner_creation_failed(ps);
+        ps->failed = true;
         break;
       }
       wa->dir_count = count;
-    wa->options = *options;
-    wa->options.chunk_size = cs;
+      wa->use_metadata = use_metadata;
+      wa->chunk_size = cs;
+      wa->exclude_patterns = exclude_patterns;
+      wa->exclude_count = exclude_count;
+      wa->include_patterns = include_patterns;
+      wa->include_count = include_count;
+      wa->max_size = max_size;
+      wa->min_size = min_size;
+      wa->max_depth = max_depth;
+      wa->follow_symlinks = follow_symlinks;
+      wa->copy_links = copy_links;
+      wa->safe_links = safe_links;
+      wa->copy_unsafe_links = copy_unsafe_links;
+      wa->checksum = checksum;
       start += count;
       if (thrd_create(&ps->threads[t], parallel_worker_thread, wa) != thrd_success) {
         for (int j = 0; j < count; j++)
           free(wa->dirs[j]);
         free(wa->dirs);
         free(wa);
-      parallel_scanner_creation_failed(ps);
+        ps->failed = true;
+        atomic_store(&ps->cancelled, true);
+        ps->expected_threads = ps->created_threads;
+        mtx_lock(&ps->result_mutex);
+        cnd_broadcast(&ps->result_not_empty);
+        cnd_broadcast(&ps->result_not_full);
+        mtx_unlock(&ps->result_mutex);
         break;
       }
       ps->num_threads++;
       ps->created_threads++;
     }
-}
-
-ParallelScanner* parallel_scanner_create_with_options(const char* root_directory,
-                                                      const ScannerOptions* options) {
-  if (!root_directory || !options)
-    return NULL;
-  ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
-  if (!ps)
-    return NULL;
-  if (!parallel_scanner_init(ps)) {
-    free(ps);
-    return NULL;
   }
-
-  ArrayList* root_files = array_list_create(file_destroy);
-  ArrayList* subdirs = array_list_create(free);
-  if (!root_files || !subdirs) {
-    array_list_delete(root_files);
-    array_list_delete(subdirs);
-    parallel_scanner_destroy(ps);
-    return NULL;
-  }
-
-  if (!scan_root_directory(ps, root_directory, options, root_files, subdirs)) {
-    array_list_delete(root_files);
-    array_list_delete(subdirs);
-    parallel_scanner_destroy(ps);
-    return NULL;
-  }
-
-  unsigned long long cs = options->chunk_size > 0 ? options->chunk_size : DESIRED_CHUNK_SIZE;
-  ps->initial_chunk = batch_files(root_files, cs, ps->result_queue, &ps->failed);
-  array_list_delete(root_files);
-
-  spawn_parallel_workers(ps, subdirs, options, cs);
   array_list_delete(subdirs);
   return ps;
 }
@@ -692,11 +741,6 @@ Chunk* parallel_scanner_next(ParallelScanner* ps) {
   }
   if (ps->num_threads == 0) {
     mtx_lock(&ps->result_mutex);
-    if (!queue_is_empty(ps->result_queue)) {
-      Chunk* chunk = queue_dequeue(ps->result_queue);
-      mtx_unlock(&ps->result_mutex);
-      return chunk;
-    }
     ps->done = true;
     mtx_unlock(&ps->result_mutex);
     return NULL;

src/client/scanner.h

@@ -8,24 +8,6 @@
 #include <threads.h>
 #include <stdatomic.h>
 
-typedef struct {
-  bool use_metadata;
-  unsigned long long chunk_size;
-  char** exclude_patterns;
-  int exclude_count;
-  char** include_patterns;
-  int include_count;
-  unsigned long long max_size;
-  unsigned long long min_size;
-  int max_depth;
-  int num_threads;
-  bool follow_symlinks;
-  bool copy_links;
-  bool safe_links;
-  bool copy_unsafe_links;
-  bool checksum;
-} ScannerOptions;
-
 typedef struct {
   Queue* directories;
   DIR* current_dir;
@@ -71,14 +53,17 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
                                            unsigned long long min_size, int max_depth,
                                            bool follow_symlinks, bool copy_links, bool safe_links,
                                            bool copy_unsafe_links, bool checksum);
-DirectoryScanner* directory_scanner_create_with_options(const char* root_directory,
-                                                        const ScannerOptions* options);
 Chunk* directory_scanner_next(DirectoryScanner* scanner);
 bool directory_scanner_failed(const DirectoryScanner* scanner);
 void directory_scanner_destroy(DirectoryScanner* scanner);
 
-ParallelScanner* parallel_scanner_create_with_options(const char* root_directory,
-                                                      const ScannerOptions* options);
+ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata,
+                                         unsigned long long chunk_size, char** exclude_patterns,
+                                         int exclude_count, char** include_patterns,
+                                         int include_count, unsigned long long max_size,
+                                         unsigned long long min_size, int max_depth,
+                                         int num_threads, bool follow_symlinks, bool copy_links,
+                                         bool safe_links, bool copy_unsafe_links, bool checksum);
 Chunk* parallel_scanner_next(ParallelScanner* scanner);
 bool parallel_scanner_failed(const ParallelScanner* scanner);
 void parallel_scanner_destroy(ParallelScanner* scanner);

src/client/usage.c

@@ -1,9 +1,8 @@
-#include "usage.h"
-#include <stdio.h>
+#include "stdio.h"
 #include <delta.h>
 #include <chunk.h>
 
-void print_usage(void) {
+static __attribute__((unused)) void print_usage() {
   printf("Usage:\n");
   printf("  fastsync [options] <source> <destination>\n");
   printf("  fastsync [options] --source-dir <src> --dest-dir <dst>\n");

src/client/usage.h

@@ -1,6 +0,0 @@
-#ifndef USAGE_H
-#define USAGE_H
-
-void print_usage(void);
-
-#endif

src/server/receiver.c

@@ -1,126 +0,0 @@
-#include "receiver.h"
-
-#include "chunk.h"
-#include "log.h"
-#include "protocol.h"
-#include "utils.h"
-#include <stdlib.h>
-#include <sys/stat.h>
-
-static bool receiver_process_chunk(Chunk* chunk, const ReceiverSink* sink) {
-  for (int i = 0; i < chunk->element_count; i++) {
-    File* file = chunk->items[i];
-    chunk->items[i] = NULL;
-    if (!sink->store_file(file, sink->context)) {
-      chunk_destroy(chunk);
-      return false;
-    }
-  }
-  chunk_destroy(chunk);
-  return true;
-}
-
-static bool receiver_process_batch(Config* config, int file_descriptor) {
-  int count;
-  if (config->checksum || !receive_int(file_descriptor, &count) || count < 0 ||
-      count > MAX_MANIFEST_ENTRIES)
-    return false;
-  for (int i = 0; i < count; i++) {
-    char* check_path = receive_str(file_descriptor);
-    if (!check_path)
-      return false;
-    unsigned long long check_size;
-    long long check_mtime;
-    if (!receive_n_data(file_descriptor, &check_size, sizeof(check_size)) ||
-        !receive_n_data(file_descriptor, &check_mtime, sizeof(check_mtime))) {
-      free(check_path);
-      return false;
-    }
-    if (!utils_valid_batch_path(check_path)) {
-      free(check_path);
-      send_status(file_descriptor, STATUS_ERROR);
-      return false;
-    }
-    char* full_path = path_cat(config->receive_root_directory, check_path);
-    struct stat st;
-    bool has_old = full_path && lstat(full_path, &st) == 0;
-    bool match = has_old && (unsigned long long)st.st_size == check_size &&
-                 (long long)st.st_mtime == check_mtime;
-    bool sent = send_status(file_descriptor, match ? STATUS_OK : STATUS_NEXT);
-    free(full_path);
-    free(check_path);
-    if (!sent)
-      return false;
-  }
-  return true;
-}
-
-int receiver_process(Config* config, int file_descriptor, const ReceiverSink* sink) {
-  Status status;
-  if (!receive_status(file_descriptor, &status))
-    return -1;
-  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK ||
-         status == STATUS_KEEPALIVE || status == STATUS_ABORT || status == STATUS_CHECK_BATCH) {
-    if (status == STATUS_KEEPALIVE) {
-      if (!send_status(file_descriptor, STATUS_KEEPALIVE))
-        return -1;
-      goto next;
-    }
-    if (status == STATUS_ABORT) {
-      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
-      return -1;
-    }
-    if (status == STATUS_CHECK) {
-      bool skipped;
-      File* file = receive_incremental_check(file_descriptor, config, &skipped);
-      if (!skipped && (!file || !sink->store_file(file, sink->context)))
-        goto receive_error;
-    } else if (status == STATUS_CHUNK) {
-      Chunk* chunk = receive_chunk_data(file_descriptor, config);
-      if (!chunk || !receiver_process_chunk(chunk, sink))
-        goto receive_error;
-    } else if (status == STATUS_CHECK_BATCH) {
-      if (!receiver_process_batch(config, file_descriptor))
-        return -1;
-      goto next;
-    } else {
-      File* file = file_receive(config, file_descriptor);
-      if (!file) {
-        log_message(LOG_LEVEL_ERROR, "Failed to receive file");
-        goto receive_error;
-      }
-      if (!sink->store_file(file, sink->context))
-        goto receive_error;
-    }
-  next:
-    if (!receive_status(file_descriptor, &status))
-      goto receive_error;
-  }
-  if (status == STATUS_MANIFEST && receive_manifest(file_descriptor, config, &status) != 0)
-    return -1;
-  if (status != STATUS_FINISHED) {
-    log_message(LOG_LEVEL_ERROR, "Did not receive FINISHED Status");
-    goto receive_error;
-  }
-  if (sink->send_success && !send_status(file_descriptor, STATUS_OK))
-    return -1;
-  return 0;
-
-receive_error:
-  if (sink->send_error)
-    send_status(file_descriptor, STATUS_ERROR);
-  return -1;
-}
-
-static bool receiver_save_file(File* file, void* context) {
-  Config* config = context;
-  bool success =
-      !config->save_to_disk || file_save_to_disk(config->receive_root_directory, file, config);
-  file_destroy(file);
-  return success;
-}
-
-int receiver_receive_files(Config* config, int file_descriptor) {
-  ReceiverSink sink = {receiver_save_file, config, true, true};
-  return receiver_process(config, file_descriptor, &sink);
-}

src/server/receiver.h

@@ -1,19 +0,0 @@
-#ifndef RECEIVER_H
-#define RECEIVER_H
-
-#include "config.h"
-#include "file.h"
-
-typedef bool (*ReceiverFileSink)(File* file, void* context);
-
-typedef struct {
-  ReceiverFileSink store_file;
-  void* context;
-  bool send_error;
-  bool send_success;
-} ReceiverSink;
-
-int receiver_process(Config* config, int file_descriptor, const ReceiverSink* sink);
-int receiver_receive_files(Config* config, int file_descriptor);
-
-#endif

src/server/server.c

@@ -2,39 +2,38 @@
 #include "file.h"
 #include "log.h"
 #include "multiprocessing.h"
+#include "protocol.h"
 #include "queue.h"
-#include "receiver.h"
 #include "transport_tcp.h"
 #include "transport_tls.h"
 #include "unistd.h"
 #include "utils.h"
-#include <fcntl.h>
-#include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
+#include <fcntl.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 static char* authorized_root;
 static int authorized_root_fd = -1;
 static bool allow_delete;
 
-static void release_authorization(void) {
-  file_set_authorized_root(-1, NULL);
-  utils_set_authorized_root_fd(-1);
-  if (authorized_root_fd >= 0)
-    close(authorized_root_fd);
-  authorized_root_fd = -1;
-  free(authorized_root);
-  authorized_root = NULL;
-}
-
 static bool path_is_within(const char* root, const char* path) {
   size_t n = strlen(root);
   return strncmp(root, path, n) == 0 && (path[n] == '\0' || path[n] == '/');
 }
 
+static bool save_received_file(File* file, void* context) {
+  Config* config = context;
+  if (config->save_to_disk && !file_save_to_disk(config->receive_root_directory, file, config))
+    return false;
+  file_destroy(file);
+  return true;
+}
+
 static bool __attribute__((unused)) configure_authorization(const char* root) {
   char resolved[PATH_MAX];
   if (!root || !realpath(root, resolved))
@@ -48,35 +47,27 @@ static bool __attribute__((unused)) configure_authorization(const char* root) {
     authorized_root = NULL;
     return false;
   }
-  if (!file_set_authorized_root(authorized_root_fd, authorized_root)) {
-    close(authorized_root_fd);
-    authorized_root_fd = -1;
-    free(authorized_root);
-    authorized_root = NULL;
-    return false;
-  }
+  file_set_authorized_root(authorized_root_fd, authorized_root);
   utils_set_authorized_root_fd(authorized_root_fd);
   return true;
 }
 
+int receive_files(Config* config, int fd) {
+  return receive_files_common(config, fd, save_received_file, config, true);
+}
+
 void handler(int file_descriptor) {
   SSL* ssl = io_get_ssl();
-  ProtocolSession session;
-  protocol_session_init(&session, file_descriptor, file_descriptor);
-  protocol_session_set_ssl(&session, ssl);
-  protocol_session_bind(&session);
   Config* config = config_receive(file_descriptor);
   if (config == NULL) {
     log_message(LOG_LEVEL_ERROR, "Failed to receive config");
     close(file_descriptor);
-    protocol_session_unbind();
     return;
   }
   if (!authorized_root) {
     log_message(LOG_LEVEL_ERROR, "No server-side destination root configured");
     config_delete(config);
     close(file_descriptor);
-    protocol_session_unbind();
     return;
   }
   char resolved_destination[PATH_MAX];
@@ -88,7 +79,6 @@ void handler(int file_descriptor) {
     free(canonical_destination);
     config_delete(config);
     close(file_descriptor);
-    protocol_session_unbind();
     return;
   }
   if (canonical_destination)
@@ -101,7 +91,6 @@ void handler(int file_descriptor) {
   if (!config->receive_root_directory) {
     config_delete(config);
     close(file_descriptor);
-    protocol_session_unbind();
     return;
   }
   config->use_delete = config->use_delete && allow_delete;
@@ -110,7 +99,6 @@ void handler(int file_descriptor) {
     if (q == NULL) {
       config_delete(config);
       close(file_descriptor);
-      protocol_session_unbind();
       return;
     }
     PipelineContextReceiver* context =
@@ -119,17 +107,16 @@ void handler(int file_descriptor) {
       queue_destroy(q);
       config_delete(config);
       close(file_descriptor);
-      protocol_session_unbind();
       return;
     }
-    context->session.total_allocated_bytes = session.total_allocated_bytes;
     thrd_t receiver, writer;
-    bool receiver_created = thrd_create(&receiver, receive_thread, context) == thrd_success;
+    bool receiver_created = false;
     bool writer_created = false;
+    receiver_created = (thrd_create(&receiver, receive_thread, context) == thrd_success);
     if (receiver_created)
-      writer_created = thrd_create(&writer, write_thread, context) == thrd_success;
+      writer_created = (thrd_create(&writer, write_thread, context) == thrd_success);
     if (!receiver_created || !writer_created) {
-      log_perror("Error creating Threads");
+      perror("Error creating Threads");
       if (receiver_created) {
         mtx_lock(&context->mutex);
         atomic_store(&context->cancelled, true);
@@ -144,23 +131,22 @@ void handler(int file_descriptor) {
       if (writer_created)
         thrd_join(writer, NULL);
       pipeline_context_receiver_destroy(context);
-      protocol_session_unbind();
       return;
     }
     int receiver_result;
     int writer_result;
     thrd_join(receiver, &receiver_result);
     thrd_join(writer, &writer_result);
-    send_status(file_descriptor, receiver_result == thrd_success && writer_result == thrd_success
-                                     ? STATUS_OK
-                                     : STATUS_ERROR);
+    if (receiver_result == thrd_success && writer_result == thrd_success)
+      send_status(file_descriptor, STATUS_OK);
+    else
+      send_status(file_descriptor, STATUS_ERROR);
     pipeline_context_receiver_destroy(context);
   } else {
-    if (receiver_receive_files(config, file_descriptor) != 0)
+    if (receive_files(config, file_descriptor) != 0)
       log_message(LOG_LEVEL_ERROR, "Transfer failed");
     config_delete(config);
   }
-  protocol_session_unbind();
   close(file_descriptor);
 }
 
@@ -169,14 +155,16 @@ static Server* g_server = NULL;
 
 static void cleanup(int sig) {
   (void)sig;
-  if (g_server)
+  if (g_server) {
     server_delete(&g_server);
+  }
   _exit(0);
 }
 
 static void print_server_usage(void) {
   printf("FastSync Server\n");
-  printf("Usage: fastsync-server [options]\n\n");
+  printf("Usage: fastsync-server [options]\n");
+  printf("\n");
   printf("Options:\n");
   printf("  --stdio             Run in stdio mode (SSH transport)\n");
   printf("  -p <port>           TCP port (default: 8080, range: 1-65535)\n");
@@ -192,7 +180,9 @@ static void print_server_usage(void) {
 
 int main(int argc, char* argv[]) {
   bool use_tls = false;
-  char *tls_cert = NULL, *tls_key = NULL, *tls_ca = NULL;
+  char* tls_cert = NULL;
+  char* tls_key = NULL;
+  char* tls_ca = NULL;
   int port = 8080;
   const char* destination_root = ".";
   bool stdio_mode = false;
@@ -232,8 +222,11 @@ int main(int argc, char* argv[]) {
       return 1;
     }
   }
-  if (tls_ca && !use_tls)
+
+  if (tls_ca && !use_tls) {
     log_message(LOG_LEVEL_WARNING, "--ca has no effect without --tls");
+  }
+
   signal(SIGINT, cleanup);
   signal(SIGTERM, cleanup);
   if (!configure_authorization(destination_root)) {
@@ -243,35 +236,33 @@ int main(int argc, char* argv[]) {
   if (stdio_mode) {
     io_set_fds(STDIN_FILENO, STDOUT_FILENO);
     handler(STDIN_FILENO);
-    release_authorization();
+    file_set_authorized_root(-1, NULL);
+    utils_set_authorized_root_fd(-1);
+    close(authorized_root_fd);
+    free(authorized_root);
     return 0;
   }
   g_server = server_create(port);
-  if (!g_server) {
+  if (g_server == NULL) {
     log_message(LOG_LEVEL_ERROR, "Failed to create server");
-    release_authorization();
     return 1;
   }
   if (use_tls) {
     if (!tls_cert || !tls_key) {
       fprintf(stderr, "Error: --tls requires --cert and --key\n");
       server_delete(&g_server);
-      release_authorization();
       return 1;
     }
     tls_global_init();
     if (!server_create_tls(g_server, tls_cert, tls_key, tls_ca)) {
       log_message(LOG_LEVEL_ERROR, "Failed to set up TLS");
       server_delete(&g_server);
-      release_authorization();
       return 1;
     }
     server_listen_tls(g_server, handler);
   } else {
     server_listen(g_server, handler);
   }
-  server_delete(&g_server);
-  release_authorization();
   return 0;
 }
-#endif
+#endif /* !FASTSYNC_SERVER_AS_LIB */

src/shared/array_list.c

@@ -1,4 +1,3 @@
-#include "log.h"
 #include "array_list.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -7,7 +6,7 @@
 ArrayList* array_list_create(void (*item_destroyer)(void* item)) {
   ArrayList* list = (ArrayList*)malloc(sizeof(ArrayList));
   if (list == NULL) {
-    log_perror("ERROR: Could not allocate memory for array list struct");
+    perror("ERROR: Could not allocate memory for array list struct");
     return NULL;
   }
 
@@ -35,7 +34,7 @@ void array_list_delete(ArrayList* array_list) {
   free(array_list);
 }
 
-static bool array_list_extend(ArrayList* array_list) {
+bool array_list_extend(ArrayList* array_list) {
   if (array_list == NULL)
     return false;
   int new_capacity = array_list->capacity * 2;
@@ -43,7 +42,7 @@ static bool array_list_extend(ArrayList* array_list) {
     new_capacity = INITIAL_ARRAY_SIZE;
   void* new_items = realloc(array_list->items, new_capacity * sizeof(void*));
   if (new_items == NULL) {
-    log_perror("ERROR: Could not reallocate memory for array list items");
+    perror("ERROR: Could not reallocate memory for array list items");
     return false;
   }
   array_list->items = new_items;
@@ -69,7 +68,7 @@ void** array_list_to_array(const ArrayList* array_list) {
   }
   void** array = malloc(array_list->size * sizeof(void*));
   if (array == NULL) {
-    log_perror("Could not malloc space for array from array list!");
+    perror("Could not malloc space for array from array list!");
     return NULL;
   }
   memcpy(array, array_list->items, array_list->size * sizeof(void*));

src/shared/array_list.h

@@ -14,6 +14,7 @@ typedef struct ArrayList {
 
 ArrayList* array_list_create(void (*item_destroyer)(void* item));
 void array_list_delete(ArrayList* array_list);
+bool array_list_extend(ArrayList* array_list);
 bool array_list_add(ArrayList* array_list, void* item);
 void** array_list_to_array(const ArrayList* array_list);
 

src/shared/chunk.c

@@ -1,5 +1,4 @@
 #include <stddef.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,12 +14,11 @@
 
 /* Maximum individual file data size within a chunk (64 MB) */
 #define MAX_FILE_DATA_SIZE (64ULL * 1024 * 1024)
-#define MAX_CHUNK_FILES (1024 * 1024)
 
 Chunk* chunk_create(File** items, int element_count) {
   Chunk* chunk = (Chunk*)malloc(sizeof(Chunk));
   if (chunk == NULL) {
-    log_perror("ERROR: Could not allocate memory for chunk structure");
+    perror("ERROR: Could not allocate memory for chunk structure");
     return NULL;
   }
 
@@ -94,11 +92,6 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
   size_t remaining_size = data->size;
 
   while (remaining_size > 0) {
-    if (files->size >= MAX_CHUNK_FILES) {
-      log_message(LOG_LEVEL_ERROR, "Chunk contains too many files");
-      array_list_delete(files);
-      return NULL;
-    }
     if (remaining_size < sizeof(size_t)) {
       log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for path length");
       array_list_delete(files);
@@ -110,7 +103,7 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
     data_pointer += sizeof(size_t);
     remaining_size -= sizeof(size_t);
 
-    if (path_len > SIZE_MAX - 1 || remaining_size < path_len) {
+    if (remaining_size < path_len) {
       log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for path");
       array_list_delete(files);
       return NULL;
@@ -118,7 +111,7 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
 
     char* path = malloc(path_len + 1);
     if (path == NULL) {
-      log_perror("Could not allocate memory for file path");
+      perror("Could not allocate memory for file path");
       array_list_delete(files);
       return NULL;
     }
@@ -129,15 +122,10 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
 
     File* file = file_create(path);
     free(path);
-    if (file == NULL) {
-      array_list_delete(files);
-      return NULL;
-    }
 
     if (use_metadata) {
       if (remaining_size < sizeof(int)) {
         log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for metadata");
-        file_destroy(file);
         array_list_delete(files);
         return NULL;
       }
@@ -146,7 +134,6 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
       memcpy(&present_flag, data_pointer, sizeof(int));
       if (present_flag && remaining_size < sizeof(int) + FILE_METADATA_WIRE_SIZE) {
         log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for metadata body");
-        file_destroy(file);
         array_list_delete(files);
         return NULL;
       }
@@ -154,16 +141,10 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
       remaining_size -= sizeof(int);
       if (file->metadata)
         remaining_size -= FILE_METADATA_WIRE_SIZE;
-      else if (present_flag) {
-        file_destroy(file);
-        array_list_delete(files);
-        return NULL;
-      }
     }
 
     if (remaining_size < sizeof(size_t)) {
       log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for data size");
-      file_destroy(file);
       array_list_delete(files);
       return NULL;
     }
@@ -175,7 +156,6 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
 
     if (remaining_size < file_data_size) {
       log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for file content");
-      file_destroy(file);
       array_list_delete(files);
       return NULL;
     }
@@ -184,48 +164,29 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
     if (file_data_size > MAX_FILE_DATA_SIZE) {
       log_message(LOG_LEVEL_ERROR, "File data size %zu exceeds maximum %llu", file_data_size,
                   (unsigned long long)MAX_FILE_DATA_SIZE);
-      file_destroy(file);
       array_list_delete(files);
       return NULL;
     }
 
-    void* file_data = malloc(file_data_size > 0 ? file_data_size : 1);
+    void* file_data = malloc(file_data_size);
     if (file_data == NULL) {
-      log_perror("Could not allocate memory for file data");
-      file_destroy(file);
+      perror("Could not allocate memory for file data");
       array_list_delete(files);
       return NULL;
     }
     memcpy(file_data, data_pointer, file_data_size);
     data_destroy(file->data);
     file->data = data_create(file_data, file_data_size);
-    if (file->data == NULL) {
-      file_destroy(file);
-      array_list_delete(files);
-      return NULL;
-    }
     data_pointer += file_data_size;
     remaining_size -= file_data_size;
 
-    if (!array_list_add(files, file)) {
-      file_destroy(file);
-      array_list_delete(files);
-      return NULL;
-    }
+    array_list_add(files, file);
   }
 
   File** file_array = (File**)array_list_to_array(files);
-  if (file_array == NULL) {
-    array_list_delete(files);
-    return NULL;
-  }
   Chunk* chunk = chunk_create(file_array, files->size);
 
   free(file_array);
-  if (chunk == NULL) {
-    array_list_delete(files);
-    return NULL;
-  }
   files->item_destroyer = NULL;
   array_list_delete(files);
 

src/shared/config.c

@@ -108,7 +108,7 @@ Config* config_create(void) {
   return config;
 }
 
-bool config_is_remote_dest(const char* s) {
+bool is_remote_dest(const char* s) {
   if (s == NULL)
     return false;
   const char* colon = strchr(s, ':');
@@ -124,7 +124,7 @@ bool config_is_remote_dest(const char* s) {
 }
 
 void config_parse_ssh_dest(Config* config) {
-  if (!config_is_remote_dest(config->receive_root_directory))
+  if (!is_remote_dest(config->receive_root_directory))
     return;
   config->transport = TRANSPORT_SSH;
   config->ssh_destination = str_dup(config->receive_root_directory);
@@ -173,158 +173,39 @@ void config_delete(Config* config) {
   free(config);
 }
 
-/* Each helper is deliberately ordered to match the wire format. Keep the
- * helper call order in config_send and config_receive unchanged when adding
- * fields. */
-static bool send_core_fields(int fd, const Config* c) {
-  return send_str(fd, c->version) && send_str(fd, c->send_directory) &&
-         send_str(fd, c->receive_root_directory) && send_int(fd, c->save_to_disk) &&
-         send_int(fd, c->use_multithreading) && send_int(fd, c->use_chunk_serialization) &&
-         send_int(fd, c->use_compression) && send_int(fd, c->use_metadata) &&
-         send_int(fd, c->compression_level) &&
-         send_n_data(fd, &c->chunk_size, sizeof(c->chunk_size)) && send_int(fd, c->use_sendfile);
+static bool config_send_string(int file_descriptor, const char* value, bool optional) {
+  return send_str(file_descriptor, value ? value : (optional ? "" : NULL));
 }
 
-static bool send_delta_fields(int fd, const Config* c) {
-  return send_int(fd, c->use_delete) && send_int(fd, c->use_incremental) &&
-         send_int(fd, c->use_delta) &&
-         send_n_data(fd, &c->delta_block_size, sizeof(c->delta_block_size)) &&
-         send_n_data(fd, &c->delta_max_file_size, sizeof(unsigned long long));
-}
-
-static bool send_file_options(int fd, const Config* c) {
-  return send_int(fd, c->backup) && send_str(fd, c->backup_dir ? c->backup_dir : "") &&
-         send_int(fd, c->follow_symlinks) && send_int(fd, c->copy_links) &&
-         send_int(fd, c->safe_links) && send_int(fd, c->copy_unsafe_links) &&
-         send_int(fd, c->preserve_hard_links) && send_int(fd, c->preserve_acls) &&
-         send_int(fd, c->preserve_xattrs) && send_int(fd, c->preserve_devices) &&
-         send_int(fd, c->preserve_sparse);
-}
-
-static bool send_selection_options(int fd, const Config* c) {
-  return send_int(fd, c->update) && send_int(fd, c->inplace) && send_int(fd, c->append) &&
-         send_int(fd, c->append_verify) && send_int(fd, c->delete_excluded) &&
-         send_int(fd, c->delete_after) && send_n_data(fd, &c->max_delete, sizeof(c->max_delete)) &&
-         send_int(fd, c->relative) && send_int(fd, c->prune_empty_dirs);
-}
-
-static bool send_resume_options(int fd, const Config* c) {
-  return send_str(fd, c->temp_dir ? c->temp_dir : "") && send_int(fd, c->partial) &&
-         send_str(fd, c->partial_dir ? c->partial_dir : "") &&
-         send_str(fd, c->suffix ? c->suffix : "") && send_int(fd, c->delete_before) &&
-         send_int(fd, c->checksum) && send_str(fd, c->compress_choice ? c->compress_choice : "");
-}
-
-static bool receive_core_fields(int fd, Config* c) {
-  int value;
-  c->send_directory = receive_str(fd);
-  c->receive_root_directory = receive_str(fd);
-  if (!c->send_directory || !c->receive_root_directory)
-    return false;
-  if (!receive_int(fd, &value))
-    return false;
-  c->save_to_disk = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_multithreading = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_chunk_serialization = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_compression = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_metadata = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->compression_level = value;
-  if (!receive_n_data(fd, &c->chunk_size, sizeof(c->chunk_size)))
-    return false;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_sendfile = value;
-  return true;
-}
-
-static bool receive_delta_fields(int fd, Config* c) {
-  int value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_delete = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_incremental = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->use_delta = value;
-  return receive_n_data(fd, &c->delta_block_size, sizeof(c->delta_block_size)) &&
-         receive_n_data(fd, &c->delta_max_file_size, sizeof(unsigned long long));
-}
-
-static bool receive_file_options(int fd, Config* c) {
-  int value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->backup = value;
-  c->backup_dir = receive_str(fd);
-  if (!c->backup_dir)
-    return false;
-  bool* flags[] = {&c->follow_symlinks,   &c->copy_links,          &c->safe_links,
-                   &c->copy_unsafe_links, &c->preserve_hard_links, &c->preserve_acls,
-                   &c->preserve_xattrs,   &c->preserve_devices,    &c->preserve_sparse};
-  for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-    if (!receive_int(fd, &value))
-      return false;
-    *flags[i] = value;
-  }
-  return true;
-}
-
-static bool receive_selection_options(int fd, Config* c) {
-  int value;
-  bool* flags[] = {&c->update,        &c->inplace,         &c->append,
-                   &c->append_verify, &c->delete_excluded, &c->delete_after};
-  for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-    if (!receive_int(fd, &value))
-      return false;
-    *flags[i] = value;
-  }
-  if (!receive_n_data(fd, &c->max_delete, sizeof(c->max_delete)))
-    return false;
-  if (!receive_int(fd, &value))
-    return false;
-  c->relative = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->prune_empty_dirs = value;
-  return true;
-}
-
-static bool receive_resume_options(int fd, Config* c) {
-  int value;
-  c->temp_dir = receive_str(fd);
-  if (!c->temp_dir || !receive_int(fd, &value))
-    return false;
-  c->partial = value;
-  c->partial_dir = receive_str(fd);
-  c->suffix = c->partial_dir ? receive_str(fd) : NULL;
-  if (!c->partial_dir || !c->suffix || !receive_int(fd, &value))
-    return false;
-  c->delete_before = value;
-  if (!receive_int(fd, &value))
-    return false;
-  c->checksum = value;
-  c->compress_choice = receive_str(fd);
-  return c->compress_choice != NULL;
-}
+#define CONFIG_SEND_VERSION(field)                                                                 \
+  do {                                                                                             \
+    if (!config_send_string(file_descriptor, config->field, false))                                \
+      return false;                                                                                \
+  } while (0);
+#define CONFIG_SEND_STRING(field)                                                                  \
+  do {                                                                                             \
+    if (!config_send_string(file_descriptor, config->field, false))                                \
+      return false;                                                                                \
+  } while (0);
+#define CONFIG_SEND_OPTIONAL_STRING(field)                                                         \
+  do {                                                                                             \
+    if (!config_send_string(file_descriptor, config->field, true))                                 \
+      return false;                                                                                \
+  } while (0);
+#define CONFIG_SEND_INTEGER(field)                                                                 \
+  do {                                                                                             \
+    if (!send_int(file_descriptor, config->field))                                                 \
+      return false;                                                                                \
+  } while (0);
+#define CONFIG_SEND_DATA(field)                                                                    \
+  do {                                                                                             \
+    if (!send_n_data(file_descriptor, &config->field, sizeof(config->field)))                      \
+      return false;                                                                                \
+  } while (0);
 
 bool config_send(int file_descriptor, const Config* config) {
-  if (!send_core_fields(file_descriptor, config) || !send_delta_fields(file_descriptor, config) ||
-      !send_file_options(file_descriptor, config) ||
-      !send_selection_options(file_descriptor, config) ||
-      !send_resume_options(file_descriptor, config))
-    return false;
+  CONFIG_WIRE_FIELDS(CONFIG_SEND_VERSION, CONFIG_SEND_STRING, CONFIG_SEND_OPTIONAL_STRING,
+                     CONFIG_SEND_INTEGER, CONFIG_SEND_DATA)
   Status status;
   if (!receive_status(file_descriptor, &status))
     return false;
@@ -335,26 +216,60 @@ bool config_send(int file_descriptor, const Config* config) {
   return true;
 }
 
+#undef CONFIG_SEND_VERSION
+#undef CONFIG_SEND_STRING
+#undef CONFIG_SEND_OPTIONAL_STRING
+#undef CONFIG_SEND_INTEGER
+#undef CONFIG_SEND_DATA
+
+static bool config_receive_string(int file_descriptor, char** destination) {
+  char* value = receive_str(file_descriptor);
+  if (!value)
+    return false;
+  *destination = value;
+  return true;
+}
+
+#define CONFIG_RECEIVE_VERSION(field)                                                              \
+  do {                                                                                             \
+    free(config->field);                                                                           \
+    config->field = receive_str(file_descriptor);                                                  \
+    if (!config->field)                                                                            \
+      goto error;                                                                                  \
+    if (strcmp(config->field, PROTOCOL_VERSION) != 0) {                                            \
+      fprintf(stderr, "Protocol version mismatch: client=%s, server=%s\n", config->field,          \
+              PROTOCOL_VERSION);                                                                   \
+      config_delete(config);                                                                       \
+      send_status(file_descriptor, STATUS_ERROR);                                                  \
+      return NULL;                                                                                 \
+    }                                                                                              \
+  } while (0);
+#define CONFIG_RECEIVE_STRING(field)                                                               \
+  do {                                                                                             \
+    if (!config_receive_string(file_descriptor, &config->field))                                   \
+      goto error;                                                                                  \
+  } while (0);
+#define CONFIG_RECEIVE_OPTIONAL_STRING(field) CONFIG_RECEIVE_STRING(field)
+#define CONFIG_RECEIVE_INTEGER(field)                                                              \
+  do {                                                                                             \
+    if (!receive_int(file_descriptor, &tmp))                                                       \
+      goto error;                                                                                  \
+    config->field = tmp;                                                                           \
+  } while (0);
+#define CONFIG_RECEIVE_DATA(field)                                                                 \
+  do {                                                                                             \
+    if (!receive_n_data(file_descriptor, &config->field, sizeof(config->field)))                   \
+      goto error;                                                                                  \
+  } while (0);
+
 Config* config_receive(int file_descriptor) {
-  Config* config = config_create();
-  if (!config)
+  Config* config = (Config*)malloc(sizeof(Config));
+  if (config == NULL)
     return NULL;
-  free(config->version);
-  config->version = receive_str(file_descriptor);
-  if (!config->version)
-    goto error;
-  if (strcmp(config->version, PROTOCOL_VERSION) != 0) {
-    fprintf(stderr, "Protocol version mismatch: client=%s, server=%s\n", config->version,
-            PROTOCOL_VERSION);
-    send_status(file_descriptor, STATUS_ERROR);
-    goto error;
-  }
-  if (!receive_core_fields(file_descriptor, config) ||
-      !receive_delta_fields(file_descriptor, config) ||
-      !receive_file_options(file_descriptor, config) ||
-      !receive_selection_options(file_descriptor, config) ||
-      !receive_resume_options(file_descriptor, config))
-    goto error;
+  config_set_defaults(config);
+  int tmp;
+  CONFIG_WIRE_FIELDS(CONFIG_RECEIVE_VERSION, CONFIG_RECEIVE_STRING, CONFIG_RECEIVE_OPTIONAL_STRING,
+                     CONFIG_RECEIVE_INTEGER, CONFIG_RECEIVE_DATA)
   if (config->compress_choice[0] != '\0' && strcmp(config->compress_choice, "zstd") != 0 &&
       strcmp(config->compress_choice, "none") != 0) {
     fprintf(stderr, "Unsupported compression choice: %s\n", config->compress_choice);
@@ -369,3 +284,9 @@ error:
   config_delete(config);
   return NULL;
 }
+
+#undef CONFIG_RECEIVE_VERSION
+#undef CONFIG_RECEIVE_STRING
+#undef CONFIG_RECEIVE_OPTIONAL_STRING
+#undef CONFIG_RECEIVE_INTEGER
+#undef CONFIG_RECEIVE_DATA

src/shared/config.h

@@ -128,6 +128,53 @@ typedef struct Config {
   char* compress_choice;
 } Config;
 
+/* Keep the on-wire field order in one place. The first three strings require
+ * values when sent; optional strings are encoded as empty strings when NULL. */
+#define CONFIG_WIRE_FIELDS(VERSION, STRING, OPTIONAL_STRING, INTEGER, DATA)                        \
+  VERSION(version)                                                                                 \
+  STRING(send_directory)                                                                           \
+  STRING(receive_root_directory)                                                                   \
+  INTEGER(save_to_disk)                                                                            \
+  INTEGER(use_multithreading)                                                                      \
+  INTEGER(use_chunk_serialization)                                                                 \
+  INTEGER(use_compression)                                                                         \
+  INTEGER(use_metadata)                                                                            \
+  INTEGER(compression_level)                                                                       \
+  DATA(chunk_size)                                                                                 \
+  INTEGER(use_sendfile)                                                                            \
+  INTEGER(use_delete)                                                                              \
+  INTEGER(use_incremental)                                                                         \
+  INTEGER(use_delta)                                                                               \
+  DATA(delta_block_size)                                                                           \
+  DATA(delta_max_file_size)                                                                        \
+  INTEGER(backup)                                                                                  \
+  OPTIONAL_STRING(backup_dir)                                                                      \
+  INTEGER(follow_symlinks)                                                                         \
+  INTEGER(copy_links)                                                                              \
+  INTEGER(safe_links)                                                                              \
+  INTEGER(copy_unsafe_links)                                                                       \
+  INTEGER(preserve_hard_links)                                                                     \
+  INTEGER(preserve_acls)                                                                           \
+  INTEGER(preserve_xattrs)                                                                         \
+  INTEGER(preserve_devices)                                                                        \
+  INTEGER(preserve_sparse)                                                                         \
+  INTEGER(update)                                                                                  \
+  INTEGER(inplace)                                                                                 \
+  INTEGER(append)                                                                                  \
+  INTEGER(append_verify)                                                                           \
+  INTEGER(delete_excluded)                                                                         \
+  INTEGER(delete_after)                                                                            \
+  DATA(max_delete)                                                                                 \
+  INTEGER(relative)                                                                                \
+  INTEGER(prune_empty_dirs)                                                                        \
+  OPTIONAL_STRING(temp_dir)                                                                        \
+  INTEGER(partial)                                                                                 \
+  OPTIONAL_STRING(partial_dir)                                                                     \
+  OPTIONAL_STRING(suffix)                                                                          \
+  INTEGER(delete_before)                                                                           \
+  INTEGER(checksum)                                                                                \
+  OPTIONAL_STRING(compress_choice)
+
 #define PROTOCOL_VERSION "2.2.0"
 #define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
 
@@ -135,7 +182,7 @@ Config* config_create(void);
 void config_delete(Config* config);
 bool config_send(int file_descriptor, const Config* config);
 Config* config_receive(int file_descriptor);
-bool config_is_remote_dest(const char* s);
+bool is_remote_dest(const char* s);
 void config_parse_ssh_dest(Config* config);
 
 #endif

src/shared/file.h

@@ -1,23 +1,45 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include "file_send.h"
-#include "file_receive.h"
-#include "file_types.h"
+#include "config.h"
+#include "data.h"
 #include <stdbool.h>
-#include <stdint.h>
+#include <sys/stat.h>
 
-/* File/FileMetadata lifecycle and local disk helpers. */
+typedef enum { FILE_TYPE_REGULAR, FILE_TYPE_SYMLINK, FILE_TYPE_DIR } FileType;
+
+typedef struct {
+  mode_t mode;
+  uid_t uid;
+  gid_t gid;
+  time_t mtime_sec;
+  long mtime_nsec;
+} FileMetadata;
+
+typedef struct {
+  char* path;
+  Data* data;
+  FileMetadata* metadata;
+  bool skip;
+} File;
 
 File* file_create(const char* path);
 void file_destroy(void* item);
 bool file_load_data(File* file);
 bool file_checksum(File* file, uint64_t* checksum);
+File* file_receive(const Config* config, int file_descriptor);
+bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
+                            int compression_level, bool send_path);
+bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
+                        bool send_path);
 size_t file_content_to_buffer(File* file);
 FileMetadata* file_metadata_create(const struct stat* stats);
 void file_metadata_destroy(void* metadata);
-bool file_write_to_disk(const char* path, const void* data, unsigned long long data_size,
-                        bool inplace, bool sparse);
-bool file_set_authorized_root(int fd, const char* canonical_path);
+bool to_disk(const char* path, const void* data, unsigned long long data_size, bool inplace,
+             bool sparse);
+bool file_save_to_disk(const char* root_directory, const File* file, const Config* config);
+void file_set_authorized_root(int fd, const char* canonical_path);
+File* receive_incremental_check(int fd, const Config* config, bool* skipped);
+int receive_manifest(int fd, const Config* config, int* next_status);
 
 #endif

src/shared/file_receive.c

@@ -1,588 +0,0 @@
-#include <errno.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "array_list.h"
-#include "compression.h"
-#include "config.h"
-#include "data.h"
-#include "delta.h"
-#include "file.h"
-#include "file_store.h"
-#include "log.h"
-#include "metadata.h"
-#include "protocol.h"
-#include "utils.h"
-
-static bool path_is_within_root(const char* root, const char* path) {
-  size_t n = strlen(root);
-  return strncmp(root, path, n) == 0 && (path[n] == '\0' || path[n] == '/');
-}
-
-bool file_save_to_disk(const char* root_directory, const File* file, const Config* config) {
-  bool backup_enabled = config && config->backup;
-  bool inplace = config && config->inplace;
-  bool sparse = config && config->preserve_sparse;
-  const char* backup_suffix = (config && config->suffix) ? config->suffix : "~";
-  const char* backup_dir = (config && config->backup_dir) ? config->backup_dir : NULL;
-  const char* partial_dir = (config && config->partial_dir) ? config->partial_dir : NULL;
-  char *confined_backup = NULL, *confined_partial = NULL;
-
-  if (!file || !file->path || !file->data || has_path_traversal(file->path) ||
-      (backup_enabled &&
-       (!backup_suffix || backup_suffix[0] == '\0' || strchr(backup_suffix, '/') != NULL ||
-        strcmp(backup_suffix, ".") == 0 || strcmp(backup_suffix, "..") == 0))) {
-    log_message(LOG_LEVEL_ERROR, "Invalid file or path received");
-    return false;
-  }
-
-  /* These options arrive from the client.  They are names below the server
-     root, never independent filesystem roots. */
-  if ((backup_dir && (backup_dir[0] == '/' || has_path_traversal(backup_dir))) ||
-      (partial_dir && (partial_dir[0] == '/' || has_path_traversal(partial_dir))))
-    return false;
-  if (backup_dir && !(confined_backup = path_cat(root_directory, backup_dir)))
-    return false;
-  if (partial_dir && !(confined_partial = path_cat(root_directory, partial_dir))) {
-    free(confined_backup);
-    return false;
-  }
-
-  char* resolved_root = NULL;
-  const char* actual_root =
-      (partial_dir && config && config->partial) ? confined_partial : root_directory;
-  resolved_root = realpath(actual_root, NULL);
-  if (resolved_root == NULL) {
-    if (mkdir_r(actual_root)) {
-      resolved_root = realpath(actual_root, NULL);
-    }
-  }
-  if (resolved_root == NULL) {
-    log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", actual_root);
-    free(confined_backup);
-    free(confined_partial);
-    return false;
-  }
-  char* resolved_base = realpath(root_directory, NULL);
-  if (resolved_base == NULL || !path_is_within_root(resolved_base, resolved_root)) {
-    free(resolved_base);
-    free(confined_backup);
-    free(confined_partial);
-    free(resolved_root);
-    return false;
-  }
-  free(resolved_base);
-
-  char* disk_path = path_cat(resolved_root, file->path);
-  if (disk_path == NULL) {
-    free(confined_backup);
-    free(confined_partial);
-    free(resolved_root);
-    return false;
-  }
-
-  /* --update is receiver-side policy: never replace a newer destination. */
-  if (config && config->update) {
-    struct stat destination_stat;
-    if (stat(disk_path, &destination_stat) == 0 && file->metadata &&
-        destination_stat.st_mtime > file->metadata->mtime_sec) {
-      free(resolved_root);
-      free(confined_backup);
-      free(confined_partial);
-      free(disk_path);
-      return true;
-    }
-  }
-
-  if (backup_enabled) {
-    struct stat backup_stat;
-    if (stat(disk_path, &backup_stat) == 0) {
-      char* backup_path = NULL;
-      if (backup_dir) {
-        char* resolved_backup_dir = realpath(confined_backup, NULL);
-        if (!resolved_backup_dir) {
-          mkdir_r(confined_backup);
-          resolved_backup_dir = realpath(confined_backup, NULL);
-        }
-        if (resolved_backup_dir) {
-          char* backup_base = realpath(root_directory, NULL);
-          if (backup_base && path_is_within_root(backup_base, resolved_backup_dir))
-            backup_path = path_cat(resolved_backup_dir, file->path);
-          free(backup_base);
-          free(resolved_backup_dir);
-        }
-      }
-      if (!backup_path) {
-        size_t path_len = strlen(disk_path);
-        size_t suffix_len = strlen(backup_suffix);
-        backup_path = malloc(path_len + suffix_len + 1);
-        if (backup_path) {
-          memcpy(backup_path, disk_path, path_len);
-          memcpy(backup_path + path_len, backup_suffix, suffix_len + 1);
-        }
-      }
-      if (backup_path) {
-        char* backup_dir_path = str_dup(backup_path);
-        if (backup_dir_path) {
-          const char* bdir = dirname(backup_dir_path);
-          mkdir_r(bdir);
-          free(backup_dir_path);
-        }
-        if (!file_store_rename_secure(disk_path, backup_path)) {
-          free(backup_path);
-          free(resolved_root);
-          free(confined_backup);
-          free(confined_partial);
-          free(disk_path);
-          return false;
-        }
-        free(backup_path);
-      }
-    }
-  }
-
-  char* dir_dup = str_dup(disk_path);
-  if (!dir_dup) {
-    free(confined_backup);
-    free(confined_partial);
-    free(resolved_root);
-    free(disk_path);
-    return false;
-  }
-  char* dir_str = dirname(dir_dup);
-  if (!mkdir_r(dir_str)) {
-    free(dir_dup);
-    free(confined_backup);
-    free(confined_partial);
-    free(resolved_root);
-    free(disk_path);
-    return false;
-  }
-  char* resolved_dir = realpath(dir_str, NULL);
-  free(dir_dup);
-  if (resolved_dir == NULL) {
-    log_message(LOG_LEVEL_ERROR, "Failed to resolve directory for: %s", disk_path);
-    free(confined_backup);
-    free(confined_partial);
-    free(resolved_root);
-    free(disk_path);
-    return false;
-  }
-
-  size_t root_len = strlen(resolved_root);
-  if (strncmp(resolved_dir, resolved_root, root_len) != 0 ||
-      (resolved_dir[root_len] != '\0' && resolved_dir[root_len] != '/')) {
-    log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path, actual_root);
-    free(resolved_dir);
-    free(confined_backup);
-    free(confined_partial);
-    free(resolved_root);
-    free(disk_path);
-    return false;
-  }
-  free(resolved_dir);
-  free(resolved_root);
-
-  bool ok = file_store_write_secure(disk_path, file->data->data, file->data->size, inplace, sparse,
-                                    file->metadata);
-  free(confined_backup);
-  free(confined_partial);
-  free(disk_path);
-  return ok;
-}
-
-static File* receive_delta_file(int fd, const Config* config, const char* check_path,
-                                void* old_data, unsigned long long old_size, bool* failed) {
-  if (!old_data)
-    return NULL;
-
-  DeltaSignature* sig = delta_signature_create(old_data, old_size, config->delta_block_size);
-  if (!sig) {
-    free(old_data);
-    *failed = true;
-    return NULL;
-  }
-
-  Data* sig_data = delta_signature_serialize(sig);
-  if (!sig_data) {
-    delta_signature_destroy(sig);
-    free(old_data);
-    *failed = true;
-    return NULL;
-  }
-
-  bool sig_sent = send_status(fd, STATUS_DELTA_SIGNATURE) && send_data(fd, sig_data);
-  data_destroy(sig_data);
-
-  if (!sig_sent) {
-    delta_signature_destroy(sig);
-    free(old_data);
-    *failed = true;
-    return NULL;
-  }
-
-  Status resp;
-  if (!receive_status(fd, &resp)) {
-    delta_signature_destroy(sig);
-    free(old_data);
-    *failed = true;
-    return NULL;
-  }
-
-  if (resp == STATUS_DELTA_DATA) {
-    Data* delta_data = receive_data(fd);
-    if (!delta_data) {
-      delta_signature_destroy(sig);
-      free(old_data);
-      *failed = true;
-      return NULL;
-    }
-
-    Data* raw_delta = delta_data;
-    if (config->use_compression) {
-      raw_delta = data_decompress(delta_data);
-      data_destroy(delta_data);
-      if (!raw_delta) {
-        free(old_data);
-        delta_signature_destroy(sig);
-        *failed = true;
-        return NULL;
-      }
-    }
-
-    Delta* delta = delta_deserialize(raw_delta);
-    data_destroy(raw_delta);
-    if (!delta) {
-      free(old_data);
-      delta_signature_destroy(sig);
-      *failed = true;
-      return NULL;
-    }
-
-    void* new_data = delta_apply(old_data, old_size, delta, config->delta_block_size);
-    uint64_t new_size = delta->new_file_size;
-    delta_destroy(delta);
-
-    if (!new_data) {
-      free(old_data);
-      delta_signature_destroy(sig);
-      *failed = true;
-      return NULL;
-    }
-
-    File* file = file_create(check_path);
-    if (!file) {
-      free(new_data);
-      free(old_data);
-      delta_signature_destroy(sig);
-      *failed = true;
-      return NULL;
-    }
-
-    if (config->use_metadata) {
-      int meta_ok = 1;
-      file->metadata = metadata_receive(fd, &meta_ok);
-      if (!meta_ok) {
-        file_destroy(file);
-        free(new_data);
-        free(old_data);
-        delta_signature_destroy(sig);
-        *failed = true;
-        return NULL;
-      }
-    }
-
-    data_destroy(file->data);
-    file->data = data_create(new_data, (size_t)new_size);
-
-    free(old_data);
-    delta_signature_destroy(sig);
-    return file;
-  }
-
-  if (resp == STATUS_NEXT) {
-    delta_signature_destroy(sig);
-    free(old_data);
-
-    File* file = file_create(check_path);
-    if (!file) {
-      *failed = true;
-      return NULL;
-    }
-
-    if (config->use_metadata) {
-      int meta_ok = 1;
-      file->metadata = metadata_receive(fd, &meta_ok);
-      if (!meta_ok) {
-        file_destroy(file);
-        *failed = true;
-        return NULL;
-      }
-    }
-
-    Data* file_data = receive_data(fd);
-    if (file_data == NULL) {
-      file_destroy(file);
-      *failed = true;
-      return NULL;
-    }
-
-    if (config->use_compression) {
-      Data* uncompressed = data_decompress(file_data);
-      data_destroy(file_data);
-      if (uncompressed == NULL) {
-        file_destroy(file);
-        *failed = true;
-        return NULL;
-      }
-      file_data = uncompressed;
-    }
-
-    data_destroy(file->data);
-    file->data = file_data;
-    return file;
-  }
-
-  delta_signature_destroy(sig);
-  free(old_data);
-  *failed = true;
-  return NULL;
-}
-
-File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
-  *skipped = false;
-  char* check_path = receive_str(fd);
-  if (check_path == NULL) {
-    return NULL;
-  }
-
-  unsigned long long check_size;
-  long long check_mtime;
-  uint64_t check_checksum = 0;
-  if (!receive_n_data(fd, &check_size, sizeof(check_size)) ||
-      !receive_n_data(fd, &check_mtime, sizeof(check_mtime))) {
-    free(check_path);
-    return NULL;
-  }
-  if (config->checksum && !receive_n_data(fd, &check_checksum, sizeof(check_checksum))) {
-    free(check_path);
-    return NULL;
-  }
-
-  if (has_path_traversal(check_path)) {
-    log_message(LOG_LEVEL_ERROR, "Path traversal detected: %s", check_path);
-    free(check_path);
-    return NULL;
-  }
-
-  char* full_path = path_cat(config->receive_root_directory, check_path);
-  struct stat st;
-  bool has_old_file = false;
-  int old_fd = -1;
-  if (full_path) {
-    char* leaf = NULL;
-    int parent_fd = file_store_open_secure_parent(full_path, &leaf);
-    if (parent_fd >= 0) {
-      old_fd = openat(parent_fd, leaf, O_RDONLY | O_CLOEXEC | O_NOFOLLOW);
-      free(leaf);
-      close(parent_fd);
-      has_old_file = old_fd >= 0 && fstat(old_fd, &st) == 0 && S_ISREG(st.st_mode);
-    }
-  }
-  unsigned long long old_size = has_old_file ? (unsigned long long)st.st_size : 0;
-  void* old_data = NULL;
-  if (has_old_file && old_size > 0) {
-    old_data = malloc((size_t)old_size);
-    if (old_data) {
-      size_t got = 0;
-      while (got < (size_t)old_size) {
-        ssize_t n = read(old_fd, (char*)old_data + got, (size_t)old_size - got);
-        if (n <= 0) {
-          free(old_data);
-          old_data = NULL;
-          break;
-        }
-        got += (size_t)n;
-      }
-    }
-  }
-  if (old_fd >= 0) {
-    close(old_fd);
-  }
-
-  bool match = has_old_file && (unsigned long long)st.st_size == check_size;
-  if (match && config->checksum) {
-    uint64_t old_checksum = old_size == 0 ? delta_xxhash64("", 0) : 0;
-    if (old_data)
-      old_checksum = delta_xxhash64(old_data, (size_t)old_size);
-    match = (old_size == 0 || old_data) && old_checksum == check_checksum;
-    free(old_data);
-    old_data = NULL;
-  } else if (match) {
-    match = (long long)st.st_mtime == check_mtime;
-  }
-
-  if (match) {
-    free(old_data);
-    if (!send_status(fd, STATUS_OK)) {
-      free(full_path);
-      free(check_path);
-      return NULL;
-    }
-    free(full_path);
-    free(check_path);
-    *skipped = true;
-    return NULL;
-  }
-
-  bool try_delta = config->use_delta && has_old_file &&
-                   delta_should_attempt(old_size, check_size, config->delta_max_file_size);
-
-  if (try_delta) {
-    bool delta_failed = false;
-    File* delta_file =
-        receive_delta_file(fd, config, check_path, old_data, old_size, &delta_failed);
-    old_data = NULL; /* receive_delta_file consumes the snapshot on every path */
-    if (delta_file) {
-      free(full_path);
-      free(check_path);
-      return delta_file;
-    }
-    if (delta_failed) {
-      free(full_path);
-      free(check_path);
-      return NULL;
-    }
-    free(old_data);
-    old_data = NULL;
-    try_delta = false;
-  }
-
-  if (!try_delta) {
-    if (!send_status(fd, STATUS_NEXT)) {
-      free(full_path);
-      free(check_path);
-      return NULL;
-    }
-  }
-
-  File* file = file_create(check_path);
-  free(check_path);
-  free(full_path);
-  if (file == NULL) {
-    return NULL;
-  }
-
-  if (config->use_metadata) {
-    int meta_ok = 1;
-    file->metadata = metadata_receive(fd, &meta_ok);
-    if (!meta_ok) {
-      file_destroy(file);
-      return NULL;
-    }
-  }
-
-  Data* file_data = receive_data(fd);
-  if (file_data == NULL) {
-    file_destroy(file);
-    return NULL;
-  }
-
-  if (config->use_compression) {
-    Data* uncompressed = data_decompress(file_data);
-    data_destroy(file_data);
-    if (uncompressed == NULL) {
-      file_destroy(file);
-      return NULL;
-    }
-    file_data = uncompressed;
-  }
-
-  data_destroy(file->data);
-  file->data = file_data;
-  return file;
-}
-
-File* file_receive(const Config* config, int file_descriptor) {
-  char* path = receive_str(file_descriptor);
-  if (path == NULL)
-    return NULL;
-  if (path[0] == '\0' || has_path_traversal(path)) {
-    log_message(LOG_LEVEL_ERROR, "Invalid received file path: %s", path);
-    free(path);
-    return NULL;
-  }
-  File* file = file_create(path);
-  free(path);
-  if (file == NULL)
-    return NULL;
-  if (config->use_metadata) {
-    int meta_ok = 1;
-    file->metadata = metadata_receive(file_descriptor, &meta_ok);
-    if (!meta_ok) {
-      file_destroy(file);
-      return NULL;
-    }
-  }
-  Data* file_data = receive_data(file_descriptor);
-  if (file_data == NULL) {
-    file_destroy(file);
-    return NULL;
-  }
-  if (config->use_compression) {
-    Data* file_data_uncompressed = data_decompress(file_data);
-    data_destroy(file_data);
-    if (file_data_uncompressed == NULL) {
-      file_destroy(file);
-      return NULL;
-    }
-    file_data = file_data_uncompressed;
-  }
-  data_destroy(file->data);
-  file->data = file_data;
-  return file;
-}
-
-int receive_manifest(int fd, const Config* config, int* next_status) {
-  int received_status = STATUS_ERROR;
-  int* status_out = next_status ? next_status : &received_status;
-  int count;
-  if (!receive_int(fd, &count))
-    return -1;
-  if (count < 0 || count > MAX_MANIFEST_ENTRIES)
-    return -1;
-  ArrayList* manifest = array_list_create(free);
-  if (!manifest)
-    return -1;
-  size_t manifest_bytes = 0;
-  for (int i = 0; i < count; i++) {
-    char* s = receive_str(fd);
-    size_t entry_size = s ? strlen(s) : 0;
-    if (!s || s[0] == '\0' || s[0] == '/' || has_path_traversal(s) ||
-        entry_size > MAX_MANIFEST_BYTES - manifest_bytes ||
-        (manifest_bytes += entry_size) > MAX_MANIFEST_BYTES || !array_list_add(manifest, s)) {
-      free(s);
-      array_list_delete(manifest);
-      return -1;
-    }
-  }
-  if (!receive_status(fd, status_out)) {
-    array_list_delete(manifest);
-    return -1;
-  }
-  /* Deletion is a commit operation: never perform it until the sender has
-     completed the manifest frame successfully. */
-  if (*status_out != STATUS_FINISHED || !config->use_delete) {
-    array_list_delete(manifest);
-    return *status_out == STATUS_FINISHED ? 0 : -1;
-  }
-  fprintf(stderr, "Deleting files not in manifest...\n");
-  bool deletion_ok = delete_extras(config->receive_root_directory, manifest);
-  array_list_delete(manifest);
-  return deletion_ok ? 0 : -1;
-}

src/shared/file_receive.h

@@ -1,15 +0,0 @@
-#ifndef FILE_RECEIVE_H
-#define FILE_RECEIVE_H
-
-#include "config.h"
-#include "file_types.h"
-#include <stdbool.h>
-
-/* Server-side file receive/save path. */
-
-File* file_receive(const Config* config, int file_descriptor);
-File* receive_incremental_check(int fd, const Config* config, bool* skipped);
-int receive_manifest(int fd, const Config* config, int* next_status);
-bool file_save_to_disk(const char* root_directory, const File* file, const Config* config);
-
-#endif

src/shared/file_send.c

@@ -1,136 +0,0 @@
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <poll.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/sendfile.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "compression.h"
-#include "data.h"
-#include "file.h"
-#include "log.h"
-#include "metadata.h"
-#include "protocol.h"
-
-bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
-                            int compression_level, bool send_path) {
-  if (!file || !file->path || !file->data)
-    return false;
-  const Data* data_to_send = file->data;
-  Data* compressed_data = NULL;
-  if (compression_level > 0 && !compression_should_skip(file->path)) {
-    compressed_data = data_compress(file->data, compression_level);
-    if (compressed_data == NULL) {
-      log_message(LOG_LEVEL_ERROR, "Failed to compress file data");
-      return false;
-    }
-    data_to_send = compressed_data;
-  }
-  if (send_path && !send_str(file_descriptor, file->path)) {
-    data_destroy(compressed_data);
-    return false;
-  }
-  if (use_metadata && !metadata_send(file_descriptor, file->metadata)) {
-    data_destroy(compressed_data);
-    return false;
-  }
-  if (!send_data(file_descriptor, data_to_send)) {
-    data_destroy(compressed_data);
-    return false;
-  }
-  data_destroy(compressed_data);
-  return true;
-}
-
-bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
-                        bool send_path) {
-  if (!file || !file->path || !file->data)
-    return false;
-  if (compression_level > 0)
-    return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
-                                  send_path);
-
-  if (send_path && !send_str(file_descriptor, file->path))
-    return false;
-  if (use_metadata && !metadata_send(file_descriptor, file->metadata))
-    return false;
-
-  int fd = open(file->path, O_RDONLY);
-  if (fd == -1) {
-    log_perror("Could not open file for sendfile");
-    return false;
-  }
-
-  unsigned long long file_size = file->data->size;
-  struct stat source_stat;
-  if (fstat(fd, &source_stat) != 0 || !S_ISREG(source_stat.st_mode) ||
-      (unsigned long long)source_stat.st_size < file_size) {
-    close(fd);
-    return false;
-  }
-  if (!send_n_data(file_descriptor, &file_size, sizeof(unsigned long long))) {
-    close(fd);
-    return false;
-  }
-
-  /* sendfile cannot encrypt TLS records.  Keep the framing identical but
-     route encrypted transfers through the deadline-aware IO layer. */
-  if (io_get_ssl() != NULL) {
-    unsigned char buffer[64 * 1024];
-    unsigned long long remaining = file_size;
-    bool ok = true;
-    while (remaining > 0) {
-      size_t want = remaining > sizeof(buffer) ? sizeof(buffer) : (size_t)remaining;
-      ssize_t got = read(fd, buffer, want);
-      if (got <= 0 || !send_n_data(file_descriptor, buffer, (size_t)got)) {
-        ok = false;
-        break;
-      }
-      remaining -= (unsigned long long)got;
-    }
-    close(fd);
-    return ok;
-  }
-
-  off_t offset = 0;
-  struct timespec deadline;
-  clock_gettime(CLOCK_MONOTONIC, &deadline);
-  deadline.tv_sec += 60;
-  while ((unsigned long long)offset < file_size) {
-    struct timespec now;
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    long long remaining = (long long)(deadline.tv_sec - now.tv_sec) * 1000LL +
-                          (deadline.tv_nsec - now.tv_nsec) / 1000000LL;
-    if (remaining <= 0) {
-      close(fd);
-      return false;
-    }
-    struct pollfd pfd = {.fd = file_descriptor, .events = POLLOUT};
-    int timeout = remaining > INT_MAX ? INT_MAX : (int)remaining;
-    int polled = poll(&pfd, 1, timeout);
-    if (polled <= 0 || (pfd.revents & (POLLERR | POLLHUP | POLLNVAL))) {
-      close(fd);
-      return false;
-    }
-    ssize_t sent = sendfile(file_descriptor, fd, &offset, file_size - offset);
-    if (sent == -1) {
-      if (errno == EAGAIN || errno == EINTR)
-        continue;
-      log_perror("sendfile failed");
-      close(fd);
-      return false;
-    }
-    if (sent == 0) {
-      close(fd);
-      return false;
-    }
-  }
-
-  close(fd);
-  return true;
-}

src/shared/file_send.h

@@ -1,14 +0,0 @@
-#ifndef FILE_SEND_H
-#define FILE_SEND_H
-
-#include "file_types.h"
-#include <stdbool.h>
-
-/* Client-side file send path. */
-
-bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
-                            int compression_level, bool send_path);
-bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
-                        bool send_path);
-
-#endif

src/shared/file_store.c

@@ -1,175 +0,0 @@
-#include <errno.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "file_store.h"
-#include "metadata.h"
-#include "utils.h"
-
-static int authorized_root_fd = -1;
-static char* authorized_root_path;
-
-static bool path_is_within_root(const char* root, const char* path) {
-  size_t root_length = strlen(root);
-  return strncmp(root, path, root_length) == 0 &&
-         (path[root_length] == '\0' || path[root_length] == '/');
-}
-
-bool file_store_set_authorized_root(int fd, const char* canonical_path) {
-  char* new_path = canonical_path ? str_dup(canonical_path) : NULL;
-  if (canonical_path && !new_path)
-    return false;
-  free(authorized_root_path);
-  authorized_root_path = new_path;
-  authorized_root_fd = fd;
-  return true;
-}
-
-int file_store_open_secure_parent(const char* path, char** leaf_out) {
-  char* copy = str_dup(path);
-  if (!copy)
-    return -1;
-  char* parent = dirname(copy);
-  const char* slash = strrchr(path, '/');
-  char* leaf = str_dup(slash ? slash + 1 : path);
-  if (!leaf) {
-    free(copy);
-    return -1;
-  }
-  int fd;
-  if (authorized_root_fd >= 0 && authorized_root_path && path[0] == '/' &&
-      path_is_within_root(authorized_root_path, path)) {
-    fd = dup(authorized_root_fd);
-    size_t root_length = strlen(authorized_root_path);
-    char* relative = str_dup(path + root_length);
-    if (!relative) {
-      free(copy);
-      free(leaf);
-      close(fd);
-      return -1;
-    }
-    free(copy);
-    copy = relative;
-    parent = dirname(copy);
-  } else {
-    fd = (parent[0] == '/') ? open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC)
-                            : open(".", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
-  }
-  if (fd < 0) {
-    free(copy);
-    free(leaf);
-    return -1;
-  }
-  char* save = NULL;
-  char* component = strtok_r(parent, "/", &save);
-  while (component) {
-    if (strcmp(component, ".") != 0 && strcmp(component, "..") != 0) {
-      int next = openat(fd, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
-      if (next < 0 && errno == ENOENT && mkdirat(fd, component, 0755) == 0)
-        next = openat(fd, component, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
-      if (next < 0) {
-        close(fd);
-        free(copy);
-        free(leaf);
-        return -1;
-      }
-      close(fd);
-      fd = next;
-    }
-    component = strtok_r(NULL, "/", &save);
-  }
-  free(copy);
-  *leaf_out = leaf;
-  return fd;
-}
-
-bool file_store_rename_secure(const char* old_path, const char* new_path) {
-  char *old_leaf = NULL, *new_leaf = NULL;
-  int old_parent = file_store_open_secure_parent(old_path, &old_leaf);
-  int new_parent = file_store_open_secure_parent(new_path, &new_leaf);
-  bool ok = old_parent >= 0 && new_parent >= 0 &&
-            renameat(old_parent, old_leaf, new_parent, new_leaf) == 0;
-  if (old_parent >= 0)
-    close(old_parent);
-  if (new_parent >= 0)
-    close(new_parent);
-  free(old_leaf);
-  free(new_leaf);
-  return ok;
-}
-
-static bool write_all(int fd, const void* data, unsigned long long size) {
-  const unsigned char* p = data;
-  unsigned long long done = 0;
-  while (done < size) {
-    ssize_t n = write(fd, p + done, (size_t)(size - done));
-    if (n < 0 && errno == EINTR)
-      continue;
-    if (n <= 0)
-      return false;
-    done += (unsigned long long)n;
-  }
-  return true;
-}
-
-bool file_store_write_secure(const char* path, const void* data, unsigned long long data_size,
-                             bool inplace, bool sparse, const FileMetadata* metadata) {
-  char* leaf = NULL;
-  int dirfd = file_store_open_secure_parent(path, &leaf);
-  if (dirfd < 0)
-    return false;
-  int fd = -1;
-  bool ok = false;
-  if (inplace) {
-    fd = openat(dirfd, leaf, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW, 0644);
-    if (fd >= 0) {
-      if (!sparse || data_size == 0 || ftruncate(fd, (off_t)data_size) == 0)
-        ok = write_all(fd, data, data_size);
-      if (ok && metadata)
-        ok = file_restore_metadata_fd(fd, metadata);
-    }
-  } else {
-    int tmp_size = snprintf(NULL, 0, ".%s.tmp.%ld.%u", leaf, (long)getpid(), 99U);
-    if (tmp_size < 0) {
-      close(dirfd);
-      free(leaf);
-      return false;
-    }
-    char* tmp = malloc((size_t)tmp_size + 1);
-    if (!tmp) {
-      close(dirfd);
-      free(leaf);
-      return false;
-    }
-    for (unsigned int i = 0; i < 100 && !ok; ++i) {
-      snprintf(tmp, (size_t)tmp_size + 1, ".%s.tmp.%ld.%u", leaf, (long)getpid(), i);
-      fd = openat(dirfd, tmp, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC | O_NOFOLLOW, 0600);
-      if (fd < 0)
-        continue;
-      if (sparse && data_size > 0)
-        ok = ftruncate(fd, (off_t)data_size) == 0;
-      if (ok || (!sparse || data_size == 0))
-        ok = write_all(fd, data, data_size);
-      if (ok && metadata)
-        ok = file_restore_metadata_fd(fd, metadata);
-      if (close(fd) != 0)
-        ok = false;
-      fd = -1;
-      if (ok && renameat(dirfd, tmp, dirfd, leaf) != 0)
-        ok = false;
-      if (!ok)
-        unlinkat(dirfd, tmp, 0);
-    }
-    free(tmp);
-  }
-  if (fd >= 0)
-    close(fd);
-  close(dirfd);
-  free(leaf);
-  return ok;
-}

src/shared/file_store.h

@@ -1,13 +0,0 @@
-#ifndef FILE_STORE_H
-#define FILE_STORE_H
-
-#include "file.h"
-#include <stdbool.h>
-
-bool file_store_set_authorized_root(int fd, const char* canonical_path);
-int file_store_open_secure_parent(const char* path, char** leaf_out);
-bool file_store_rename_secure(const char* old_path, const char* new_path);
-bool file_store_write_secure(const char* path, const void* data, unsigned long long data_size,
-                             bool inplace, bool sparse, const FileMetadata* metadata);
-
-#endif

src/shared/file_types.h

@@ -1,25 +0,0 @@
-#ifndef FILE_TYPES_H
-#define FILE_TYPES_H
-
-#include "data.h"
-#include <stdbool.h>
-#include <sys/stat.h>
-
-typedef enum { FILE_TYPE_REGULAR, FILE_TYPE_SYMLINK, FILE_TYPE_DIR } FileType;
-
-typedef struct {
-  mode_t mode;
-  uid_t uid;
-  gid_t gid;
-  time_t mtime_sec;
-  long mtime_nsec;
-} FileMetadata;
-
-typedef struct {
-  char* path;
-  Data* data;
-  FileMetadata* metadata;
-  bool skip;
-} File;
-
-#endif

src/shared/log.c

@@ -1,8 +1,6 @@
 #include "log.h"
-#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 static const char* log_level_strings[] = {"DEBUG", "INFO", "WARN", "ERROR"};
@@ -52,7 +50,3 @@ void log_message(LogLevel log_level, const char* format, ...) {
     va_end(args);
   }
 }
-
-void log_perror(const char* context) {
-  log_message(LOG_LEVEL_ERROR, "%s: %s", context, strerror(errno));
-}

src/shared/log.h

@@ -6,7 +6,6 @@
 typedef enum { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR } LogLevel;
 
 void log_message(LogLevel log_level, const char* message, ...);
-void log_perror(const char* context);
 void set_log_level(LogLevel level);
 void log_set_file(FILE* fp);
 

src/shared/multiprocessing.c

@@ -1,5 +1,4 @@
 #include "multiprocessing.h"
-#include "receiver.h"
 
 #include "array_list.h"
 #include "chunk.h"
@@ -14,6 +13,106 @@
 #include <stdlib.h>
 #include <string.h>
 #include <threads.h>
+#include <sys/stat.h>
+
+static bool valid_batch_path(const char* path) {
+  return path && path[0] != '\0' && path[0] != '/' && !has_path_traversal(path);
+}
+
+static bool handle_batch_checks(int file_descriptor, const Config* config) {
+  int count;
+  if (config->checksum || !receive_int(file_descriptor, &count) || count < 0 ||
+      count > MAX_MANIFEST_ENTRIES)
+    return false;
+  for (int i = 0; i < count; i++) {
+    char* check_path = receive_str(file_descriptor);
+    if (!check_path)
+      return false;
+    unsigned long long check_size;
+    long long check_mtime;
+    bool received = receive_n_data(file_descriptor, &check_size, sizeof(check_size)) &&
+                    receive_n_data(file_descriptor, &check_mtime, sizeof(check_mtime));
+    if (!received || !valid_batch_path(check_path)) {
+      free(check_path);
+      if (received)
+        send_status(file_descriptor, STATUS_ERROR);
+      return false;
+    }
+    char* full_path = path_cat(config->receive_root_directory, check_path);
+    struct stat st;
+    bool has_old = full_path && lstat(full_path, &st) == 0;
+    bool match = has_old && (unsigned long long)st.st_size == check_size &&
+                 (long long)st.st_mtime == check_mtime;
+    bool sent = send_status(file_descriptor, match ? STATUS_OK : STATUS_NEXT);
+    free(full_path);
+    free(check_path);
+    if (!sent)
+      return false;
+  }
+  return true;
+}
+
+int receive_files_common(const Config* config, int file_descriptor, ReceivedFileHandler handler,
+                         void* context, bool send_completion_status) {
+  Status status;
+  if (!receive_status(file_descriptor, &status))
+    return -1;
+  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK ||
+         status == STATUS_KEEPALIVE || status == STATUS_ABORT || status == STATUS_CHECK_BATCH) {
+    if (status == STATUS_KEEPALIVE) {
+      if (!send_status(file_descriptor, STATUS_KEEPALIVE))
+        return -1;
+    } else if (status == STATUS_ABORT) {
+      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
+      return -1;
+    } else if (status == STATUS_CHECK_BATCH) {
+      if (!handle_batch_checks(file_descriptor, config))
+        return -1;
+    } else {
+      if (status == STATUS_CHUNK) {
+        Chunk* chunk = receive_chunk_data(file_descriptor, config);
+        if (!chunk)
+          return -1;
+        for (int i = 0; i < chunk->element_count; i++) {
+          File* file = chunk->items[i];
+          chunk->items[i] = NULL;
+          if (!handler(file, context)) {
+            file_destroy(file);
+            chunk_destroy(chunk);
+            return -1;
+          }
+        }
+        chunk_destroy(chunk);
+      } else {
+        bool skipped = false;
+        File* file = status == STATUS_CHECK
+                         ? receive_incremental_check(file_descriptor, config, &skipped)
+                         : file_receive(config, file_descriptor);
+        if (!skipped) {
+          if (!file || !handler(file, context)) {
+            file_destroy(file);
+            if (status == STATUS_NEXT)
+              log_message(LOG_LEVEL_ERROR, "Failed to receive file");
+            return -1;
+          }
+        }
+      }
+    }
+    if (!receive_status(file_descriptor, &status))
+      return -1;
+  }
+  if (status == STATUS_MANIFEST && receive_manifest(file_descriptor, config, &status) != 0)
+    return -1;
+  if (status != STATUS_FINISHED) {
+    log_message(LOG_LEVEL_ERROR, "Did not receive FINISHED Status");
+    if (send_completion_status)
+      send_status(file_descriptor, STATUS_ERROR);
+    return -1;
+  }
+  if (send_completion_status && !send_status(file_descriptor, STATUS_OK))
+    return -1;
+  return 0;
+}
 
 PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner,
                                                       Queue* queue_loader) {
@@ -55,7 +154,7 @@ PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* que
   return context;
 
 fail:
-  log_perror("Error initializing synchronization objects");
+  perror("Error initializing synchronization objects");
   if (init >= 6)
     cnd_destroy(&context->condition_not_empty_loader);
   if (init >= 5)
@@ -98,8 +197,6 @@ PipelineContextReceiver* pipeline_context_receiver_create(Config* config, Queue*
   context->queue = queue;
   context->file_descriptor = file_descriptor;
   context->ssl = ssl;
-  protocol_session_init(&context->session, file_descriptor, file_descriptor);
-  protocol_session_set_ssl(&context->session, ssl);
   context->receiver_done = false;
   atomic_init(&context->cancelled, false);
   int init = 0;
@@ -116,7 +213,7 @@ PipelineContextReceiver* pipeline_context_receiver_create(Config* config, Queue*
   return context;
 
 fail:
-  log_perror("Error initializing synchronization objects");
+  perror("Error initializing synchronization objects");
   if (init >= 3)
     cnd_destroy(&context->condition_not_empty);
   if (init >= 2)
@@ -136,62 +233,41 @@ void pipeline_context_receiver_destroy(PipelineContextReceiver* context) {
   free(context);
 }
 
-static bool receiver_enqueue_file(File* file, void* context_pointer) {
-  PipelineContextReceiver* context = context_pointer;
-  if (queue_enqueue_multithreaded_cancel(context->queue, file, &context->mutex,
-                                         &context->condition_not_empty,
-                                         &context->condition_not_full, &context->cancelled))
-    return true;
-  file_destroy(file);
-  return false;
-}
-
-static void receiver_thread_fail(PipelineContextReceiver* context) {
-  mtx_lock(&context->mutex);
-  atomic_store(&context->cancelled, true);
-  context->receiver_done = true;
-  cnd_broadcast(&context->condition_not_empty);
-  cnd_broadcast(&context->condition_not_full);
-  mtx_unlock(&context->mutex);
+static bool enqueue_received_file(File* file, void* context) {
+  PipelineContextReceiver* receiver = context;
+  return queue_enqueue_multithreaded_cancel(receiver->queue, file, &receiver->mutex,
+                                            &receiver->condition_not_empty,
+                                            &receiver->condition_not_full, &receiver->cancelled);
 }
 
 int receive_thread(void* pipeline_context) {
   PipelineContextReceiver* context = (PipelineContextReceiver*)pipeline_context;
-  protocol_session_bind(&context->session);
+  if (context->ssl)
+    io_set_ssl(context->ssl);
   mtx_lock(&context->mutex);
   int file_descriptor = context->file_descriptor;
   const Config* config = context->config;
   mtx_unlock(&context->mutex);
 
-  ReceiverSink sink = {receiver_enqueue_file, context, false, false};
-  if (receiver_process((Config*)config, file_descriptor, &sink) != 0) {
-    receiver_thread_fail(context);
-    protocol_session_unbind();
-    return thrd_error;
-  }
+  int result = receive_files_common(config, file_descriptor, enqueue_received_file, context, false);
   mtx_lock(&context->mutex);
+  if (result != 0)
+    atomic_store(&context->cancelled, true);
   context->receiver_done = true;
   cnd_signal(&context->condition_not_empty);
+  cnd_broadcast(&context->condition_not_full);
   mtx_unlock(&context->mutex);
-  protocol_session_unbind();
-  return thrd_success;
+  return result == 0 ? thrd_success : thrd_error;
 }
 
 int write_thread(void* pipeline_context) {
   PipelineContextReceiver* context = (PipelineContextReceiver*)pipeline_context;
+  if (context->ssl)
+    io_set_ssl(context->ssl);
   mtx_lock(&context->mutex);
   bool save_to_disk = context->config->save_to_disk;
   char* root_directory = str_dup(context->config->receive_root_directory);
   mtx_unlock(&context->mutex);
-  if (save_to_disk && !root_directory) {
-    mtx_lock(&context->mutex);
-    atomic_store(&context->cancelled, true);
-    context->receiver_done = true;
-    cnd_broadcast(&context->condition_not_full);
-    cnd_broadcast(&context->condition_not_empty);
-    mtx_unlock(&context->mutex);
-    return thrd_error;
-  }
 
   while (true) {
     File* file =

src/shared/multiprocessing.h

@@ -35,7 +35,6 @@ typedef struct PipelineContextReceiver {
   Config* config;
   int file_descriptor;
   SSL* ssl;
-  ProtocolSession session;
   mtx_t mutex;
   cnd_t condition_not_full;
   cnd_t condition_not_empty;
@@ -43,6 +42,11 @@ typedef struct PipelineContextReceiver {
   atomic_bool cancelled;
 } PipelineContextReceiver;
 
+typedef bool (*ReceivedFileHandler)(File* file, void* context);
+
+int receive_files_common(const Config* config, int file_descriptor, ReceivedFileHandler handler,
+                         void* context, bool send_completion_status);
+
 PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner,
                                                       Queue* queue_loader);
 void pipeline_context_sender_destroy(PipelineContextSender* context);

src/shared/protocol.c

@@ -18,8 +18,6 @@
 static __thread int io_read_fd = -1;
 static __thread int io_write_fd = -1;
 static __thread SSL* io_ssl;
-static __thread ProtocolSession* bound_session;
-static __thread ProtocolSession legacy_io_session = {.read_fd = -1, .write_fd = -1};
 
 static unsigned long long io_bwlimit = 0;
 static long long bw_tokens = 0;
@@ -27,41 +25,15 @@ static struct timespec bw_last_refill = {0, 0};
 static mtx_t bw_mutex;
 static once_flag bw_mutex_once = ONCE_FLAG_INIT;
 
+static __thread unsigned long long total_allocated_bytes = 0;
+
 void io_set_fds(int read_fd, int write_fd) {
-  bound_session = NULL;
   io_read_fd = read_fd;
   io_write_fd = write_fd;
   /* A descriptor switch starts a new transport; never reuse a TLS object
      belonging to a previous connection or test pipe. */
   io_ssl = NULL;
-  legacy_io_session.read_fd = read_fd;
-  legacy_io_session.write_fd = write_fd;
-  legacy_io_session.ssl = NULL;
-  legacy_io_session.total_allocated_bytes = 0;
-  protocol_session_set_bwlimit(&legacy_io_session, io_bwlimit);
-}
-
-void protocol_session_init(ProtocolSession* session, int read_fd, int write_fd) {
-  if (!session)
-    return;
-  memset(session, 0, sizeof(*session));
-  session->read_fd = read_fd;
-  session->write_fd = write_fd;
-  if (io_bwlimit)
-    protocol_session_set_bwlimit(session, io_bwlimit);
-}
-
-void protocol_session_bind(ProtocolSession* session) {
-  bound_session = session;
-}
-
-void protocol_session_unbind(void) {
-  bound_session = NULL;
-}
-
-void protocol_session_set_ssl(ProtocolSession* session, SSL* ssl) {
-  if (session)
-    session->ssl = ssl;
+  total_allocated_bytes = 0;
 }
 
 static void bw_mutex_init(void) {
@@ -77,51 +49,39 @@ void io_set_bwlimit(unsigned long long bytes_per_sec) {
   mtx_unlock(&bw_mutex);
 }
 
-void protocol_session_set_bwlimit(ProtocolSession* session, unsigned long long bytes_per_sec) {
-  if (!session)
-    return;
-  session->bwlimit = bytes_per_sec;
-  session->bw_tokens = (long long)bytes_per_sec;
-  struct timespec now;
-  clock_gettime(CLOCK_MONOTONIC, &now);
-  session->bw_last_refill_sec = now.tv_sec;
-  session->bw_last_refill_nsec = now.tv_nsec;
-}
-
-static void bw_throttle_session(ProtocolSession* session, size_t bytes_written) {
-  if (session->bwlimit == 0)
+static void bw_throttle(size_t bytes_written) {
+  if (io_bwlimit == 0)
     return;
+  call_once(&bw_mutex_once, bw_mutex_init);
+  mtx_lock(&bw_mutex);
 
   struct timespec now;
   clock_gettime(CLOCK_MONOTONIC, &now);
 
-  long long elapsed_ns = (now.tv_sec - session->bw_last_refill_sec) * 1000000000LL +
-                         (now.tv_nsec - session->bw_last_refill_nsec);
-  session->bw_last_refill_sec = now.tv_sec;
-  session->bw_last_refill_nsec = now.tv_nsec;
+  long long elapsed_ns =
+      (now.tv_sec - bw_last_refill.tv_sec) * 1000000000LL + (now.tv_nsec - bw_last_refill.tv_nsec);
+  bw_last_refill = now;
 
-  long long tokens_to_add = (long long)((double)session->bwlimit * elapsed_ns / 1000000000.0);
-  session->bw_tokens += tokens_to_add;
-  if (session->bw_tokens > (long long)session->bwlimit)
-    session->bw_tokens = (long long)session->bwlimit;
+  long long tokens_to_add = (long long)((double)io_bwlimit * elapsed_ns / 1000000000.0);
+  bw_tokens += tokens_to_add;
+  if (bw_tokens > (long long)io_bwlimit)
+    bw_tokens = (long long)io_bwlimit;
 
-  session->bw_tokens -= bytes_written;
+  bw_tokens -= (long long)bytes_written;
 
-  if (session->bw_tokens < 0) {
-    long long deficit_us =
-        (long long)((double)(-session->bw_tokens) / session->bwlimit * 1000000.0);
+  if (bw_tokens < 0) {
+    long long deficit_us = (long long)((double)(-bw_tokens) / io_bwlimit * 1000000.0);
     if (deficit_us >= 1000)
       poll(NULL, 0, (int)(deficit_us / 1000));
     else
       usleep((useconds_t)deficit_us);
-    session->bw_tokens = 0;
-    session->bw_last_refill_sec = now.tv_sec;
-    session->bw_last_refill_nsec = now.tv_nsec;
+    bw_tokens = 0;
+    clock_gettime(CLOCK_MONOTONIC, &bw_last_refill);
   }
+  mtx_unlock(&bw_mutex);
 }
 
 void io_set_ssl(SSL* ssl) {
-  bound_session = NULL;
   io_ssl = ssl;
 }
 
@@ -129,30 +89,8 @@ SSL* io_get_ssl(void) {
   return io_ssl;
 }
 
-static ProtocolSession* legacy_session(int read_fd, int write_fd) {
-  if (bound_session)
-    return bound_session;
-  int target_read_fd = io_read_fd != -1 ? io_read_fd : read_fd;
-  int target_write_fd = io_write_fd != -1 ? io_write_fd : write_fd;
-  if (legacy_io_session.read_fd != target_read_fd ||
-      legacy_io_session.write_fd != target_write_fd) {
-    legacy_io_session.read_fd = target_read_fd;
-    legacy_io_session.write_fd = target_write_fd;
-    legacy_io_session.total_allocated_bytes = 0;
-    protocol_session_set_bwlimit(&legacy_io_session, io_bwlimit);
-  } else if (legacy_io_session.bwlimit != io_bwlimit) {
-    protocol_session_set_bwlimit(&legacy_io_session, io_bwlimit);
-  }
-  legacy_io_session.ssl = io_ssl;
-  return &legacy_io_session;
-}
-
-bool send_n_data(int file_descriptor, const void* data, size_t data_size) {
-  return protocol_send_n_data(legacy_session(-1, file_descriptor), data, data_size);
-}
-
-bool receive_n_data(int file_descriptor, void* data, size_t data_size) {
-  return protocol_receive_n_data(legacy_session(file_descriptor, -1), data, data_size);
+static int io_fd(int dir_fd, int file_descriptor) {
+  return (dir_fd != -1) ? dir_fd : file_descriptor;
 }
 
 static int deadline_remaining_ms(const struct timespec* deadline) {
@@ -166,11 +104,9 @@ static int deadline_remaining_ms(const struct timespec* deadline) {
   return ms > INT_MAX ? INT_MAX : (int)ms;
 }
 
-bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t data_size) {
+bool send_n_data(int file_descriptor, const void* data, size_t data_size) {
   log_message(LOG_LEVEL_DEBUG, "    Sending n Data: %zu", data_size);
-  if (!session)
-    return false;
-  int fd = session->write_fd;
+  int fd = io_fd(io_write_fd, file_descriptor);
   struct timespec deadline;
   clock_gettime(CLOCK_MONOTONIC, &deadline);
   deadline.tv_sec += SEND_TIMEOUT_SEC;
@@ -178,7 +114,7 @@ bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t dat
   ssize_t total_bytes_send = 0;
   while ((size_t)total_bytes_send < data_size) {
     size_t chunk = data_size - total_bytes_send;
-    if (session->bwlimit > 0 && chunk > 65536)
+    if (io_bwlimit > 0 && chunk > 65536)
       chunk = 65536;
     struct pollfd pfd = {.fd = fd, .events = wait_events};
     int poll_result = poll(&pfd, 1, deadline_remaining_ms(&deadline));
@@ -191,13 +127,13 @@ bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t dat
     if (pfd.revents & (POLLERR | POLLNVAL))
       return false;
     ssize_t bytes_send;
-    if (session->ssl)
-      bytes_send = SSL_write(session->ssl, (const char*)data + total_bytes_send, chunk);
+    if (io_ssl)
+      bytes_send = SSL_write(io_ssl, (const char*)data + total_bytes_send, chunk);
     else
       bytes_send = write(fd, (const char*)data + total_bytes_send, chunk);
     if (bytes_send <= 0) {
-      if (session->ssl) {
-        int ssl_err = SSL_get_error(session->ssl, (int)bytes_send);
+      if (io_ssl) {
+        int ssl_err = SSL_get_error(io_ssl, (int)bytes_send);
         if (ssl_err == SSL_ERROR_WANT_WRITE || ssl_err == SSL_ERROR_WANT_READ) {
           wait_events = ssl_err == SSL_ERROR_WANT_WRITE ? POLLOUT : POLLIN;
           continue;
@@ -206,18 +142,16 @@ bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t dat
       log_message(LOG_LEVEL_ERROR, "Could not send data");
       return false;
     }
-    bw_throttle_session(session, (size_t)bytes_send);
+    bw_throttle((size_t)bytes_send);
     total_bytes_send += bytes_send;
   }
   log_message(LOG_LEVEL_DEBUG, "    Send n Data: %zu", total_bytes_send);
   return true;
 }
 
-bool protocol_receive_n_data(ProtocolSession* session, void* data, size_t data_size) {
+bool receive_n_data(int file_descriptor, void* data, size_t data_size) {
   log_message(LOG_LEVEL_DEBUG, "    Receiving n Data: %zu", data_size);
-  if (!session)
-    return false;
-  int fd = session->read_fd;
+  int fd = io_fd(io_read_fd, file_descriptor);
 
   struct timespec deadline;
   clock_gettime(CLOCK_MONOTONIC, &deadline);
@@ -242,15 +176,15 @@ bool protocol_receive_n_data(ProtocolSession* session, void* data, size_t data_s
       return false;
 
     ssize_t bytes_received;
-    if (session->ssl)
-      bytes_received = SSL_read(session->ssl, (char*)data + total_bytes_received,
-                                data_size - total_bytes_received);
+    if (io_ssl)
+      bytes_received =
+          SSL_read(io_ssl, (char*)data + total_bytes_received, data_size - total_bytes_received);
     else
       bytes_received =
           read(fd, (char*)data + total_bytes_received, data_size - total_bytes_received);
     if (bytes_received <= 0) {
-      if (session->ssl) {
-        int ssl_err = SSL_get_error(session->ssl, (int)bytes_received);
+      if (io_ssl) {
+        int ssl_err = SSL_get_error(io_ssl, (int)bytes_received);
         if (ssl_err == SSL_ERROR_WANT_WRITE || ssl_err == SSL_ERROR_WANT_READ) {
           wait_events = ssl_err == SSL_ERROR_WANT_WRITE ? POLLOUT : POLLIN;
           continue;
@@ -297,24 +231,24 @@ static const char* status_to_string(Status status) {
   }
 }
 
-bool protocol_send_str(ProtocolSession* session, const char* data) {
+bool send_str(int file_descriptor, const char* data) {
   if (data == NULL)
     return false;
   size_t size = strlen(data);
-  if (!protocol_send_n_data(session, &size, sizeof(size_t)))
+  if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
     return false;
-  if (!protocol_send_n_data(session, data, size))
+  if (!send_n_data(file_descriptor, data, size))
     return false;
   log_message(LOG_LEVEL_DEBUG, "Send String: %s", data);
   return true;
 }
 
-char* protocol_receive_str(ProtocolSession* session) {
+char* receive_str(int file_descriptor) {
   size_t size;
-  if (!protocol_receive_n_data(session, &size, sizeof(size_t)))
+  if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
     return NULL;
   if (size > MAX_STRING_SIZE || size > SIZE_MAX - 1 ||
-      size + 1 > MAX_CONNECTION_MEMORY - session->total_allocated_bytes) {
+      size + 1 > MAX_CONNECTION_MEMORY - total_allocated_bytes) {
     log_message(LOG_LEVEL_ERROR, "String size %zu exceeds maximum %llu", size,
                 (unsigned long long)MAX_STRING_SIZE);
     return NULL;
@@ -322,29 +256,29 @@ char* protocol_receive_str(ProtocolSession* session) {
   char* data = (char*)malloc(size + 1);
   if (data == NULL)
     return NULL;
-  if (!protocol_receive_n_data(session, data, size)) {
+  if (!receive_n_data(file_descriptor, data, size)) {
     free(data);
     return NULL;
   }
   data[size] = '\0';
-  session->total_allocated_bytes += size + 1;
+  total_allocated_bytes += size + 1;
   log_message(LOG_LEVEL_DEBUG, "Received String: %s", data);
   return data;
 }
 
-bool protocol_send_data(ProtocolSession* session, const Data* data) {
+bool send_data(int file_descriptor, const Data* data) {
   unsigned long long data_size = data->size;
-  if (!protocol_send_n_data(session, &data_size, sizeof(unsigned long long)))
+  if (!send_n_data(file_descriptor, &data_size, sizeof(unsigned long long)))
     return false;
-  if (!protocol_send_n_data(session, data->data, data_size))
+  if (!send_n_data(file_descriptor, data->data, data_size))
     return false;
   log_message(LOG_LEVEL_DEBUG, "Send %lld data", data_size);
   return true;
 }
 
-Data* protocol_receive_data(ProtocolSession* session) {
+Data* receive_data(int file_descriptor) {
   unsigned long long size = 0;
-  if (!protocol_receive_n_data(session, &size, sizeof(unsigned long long)))
+  if (!receive_n_data(file_descriptor, &size, sizeof(unsigned long long)))
     return NULL;
   if (size > MAX_DATA_PAYLOAD_SIZE) {
     log_message(LOG_LEVEL_ERROR, "Data size %llu exceeds maximum %llu", size,
@@ -352,78 +286,53 @@ Data* protocol_receive_data(ProtocolSession* session) {
     return NULL;
   }
   size_t allocation_size = size == 0 ? 1 : (size_t)size;
-  if (allocation_size > MAX_CONNECTION_MEMORY - session->total_allocated_bytes) {
+  if (allocation_size > MAX_CONNECTION_MEMORY - total_allocated_bytes) {
     log_message(LOG_LEVEL_ERROR, "Per-connection memory limit exceeded (%llu + %llu > %llu)",
-                (unsigned long long)session->total_allocated_bytes, size,
+                (unsigned long long)total_allocated_bytes, size,
                 (unsigned long long)MAX_CONNECTION_MEMORY);
     return NULL;
   }
   void* data = malloc(allocation_size);
   if (data == NULL)
     return NULL;
-  if (!protocol_receive_n_data(session, data, (size_t)size)) {
+  if (!receive_n_data(file_descriptor, data, (size_t)size)) {
     free(data);
     return NULL;
   }
-  session->total_allocated_bytes += allocation_size;
+  total_allocated_bytes += allocation_size;
   log_message(LOG_LEVEL_DEBUG, "Received %lld data", size);
   Data* result = data_create(data, (size_t)size);
   if (!result) {
     free(data);
-    session->total_allocated_bytes -= allocation_size;
+    total_allocated_bytes -= allocation_size;
   }
   return result;
 }
 
-bool protocol_send_int(ProtocolSession* session, int data) {
-  if (!protocol_send_n_data(session, &data, sizeof(int)))
+bool send_int(int file_descriptor, int data) {
+  if (!send_n_data(file_descriptor, &data, sizeof(int)))
     return false;
   log_message(LOG_LEVEL_DEBUG, "Send Int: %d", data);
   return true;
 }
 
-bool protocol_receive_int(ProtocolSession* session, int* data) {
-  if (!protocol_receive_n_data(session, data, sizeof(int)))
+bool receive_int(int file_descriptor, int* data) {
+  if (!receive_n_data(file_descriptor, data, sizeof(int)))
     return false;
   log_message(LOG_LEVEL_DEBUG, "Received Int: %d", *data);
   return true;
 }
 
-bool protocol_send_status(ProtocolSession* session, Status status) {
-  if (!protocol_send_n_data(session, &status, sizeof(Status)))
+bool send_status(int file_descriptor, Status status) {
+  if (!send_n_data(file_descriptor, &status, sizeof(Status)))
     return false;
   log_message(LOG_LEVEL_DEBUG, "Send Status: %s", status_to_string(status));
   return true;
 }
 
-bool protocol_receive_status(ProtocolSession* session, Status* status) {
-  if (!protocol_receive_n_data(session, status, sizeof(Status)))
+bool receive_status(int file_descriptor, Status* status) {
+  if (!receive_n_data(file_descriptor, status, sizeof(Status)))
     return false;
   log_message(LOG_LEVEL_DEBUG, "Received Status: %s", status_to_string(*status));
   return true;
 }
-
-bool send_str(int fd, const char* data) {
-  return protocol_send_str(legacy_session(-1, fd), data);
-}
-char* receive_str(int fd) {
-  return protocol_receive_str(legacy_session(fd, -1));
-}
-bool send_data(int fd, const Data* data) {
-  return protocol_send_data(legacy_session(-1, fd), data);
-}
-Data* receive_data(int fd) {
-  return protocol_receive_data(legacy_session(fd, -1));
-}
-bool send_int(int fd, int data) {
-  return protocol_send_int(legacy_session(-1, fd), data);
-}
-bool receive_int(int fd, int* data) {
-  return protocol_receive_int(legacy_session(fd, -1), data);
-}
-bool send_status(int fd, Status status) {
-  return protocol_send_status(legacy_session(-1, fd), status);
-}
-bool receive_status(int fd, Status* status) {
-  return protocol_receive_status(legacy_session(fd, -1), status);
-}

src/shared/protocol.h

@@ -19,23 +19,6 @@
 
 typedef struct ssl_st SSL;
 
-/*
- * Explicit owner of protocol I/O.  A session does not own the descriptors or
- * SSL object; it only describes the transport used by a transfer.  This makes
- * it safe to pass the transport to a worker without relying on inherited
- * thread-local state.
- */
-typedef struct ProtocolSession {
-  int read_fd;
-  int write_fd;
-  SSL* ssl;
-  unsigned long long bwlimit;
-  long long bw_tokens;
-  long long bw_last_refill_sec;
-  long bw_last_refill_nsec;
-  unsigned long long total_allocated_bytes;
-} ProtocolSession;
-
 typedef int Status;
 enum NET_STATUS {
   STATUS_OK,
@@ -56,23 +39,6 @@ void io_set_fds(int read_fd, int write_fd);
 void io_set_bwlimit(unsigned long long bytes_per_sec);
 void io_set_ssl(SSL* ssl);
 SSL* io_get_ssl(void);
-
-void protocol_session_init(ProtocolSession* session, int read_fd, int write_fd);
-/* Transitional bridge for helpers whose signatures still carry only an fd. */
-void protocol_session_bind(ProtocolSession* session);
-void protocol_session_unbind(void);
-void protocol_session_set_ssl(ProtocolSession* session, SSL* ssl);
-void protocol_session_set_bwlimit(ProtocolSession* session, unsigned long long bytes_per_sec);
-bool protocol_send_n_data(ProtocolSession* session, const void* data, size_t data_size);
-bool protocol_receive_n_data(ProtocolSession* session, void* data, size_t data_size);
-bool protocol_send_str(ProtocolSession* session, const char* data);
-char* protocol_receive_str(ProtocolSession* session);
-bool protocol_send_data(ProtocolSession* session, const Data* data);
-Data* protocol_receive_data(ProtocolSession* session);
-bool protocol_send_int(ProtocolSession* session, int data);
-bool protocol_receive_int(ProtocolSession* session, int* data);
-bool protocol_send_status(ProtocolSession* session, Status status);
-bool protocol_receive_status(ProtocolSession* session, Status* status);
 bool send_n_data(int file_descriptor, const void* data, size_t data_size);
 bool receive_n_data(int file_descriptor, void* data, size_t data_size);
 

src/shared/queue.c

@@ -1,4 +1,3 @@
-#include "log.h"
 #include <stdbool.h>
 #include <limits.h>
 #include <stdio.h>
@@ -14,7 +13,7 @@ Queue* queue_create(int capacity, void (*destroyer)(void* item)) {
 
   Queue* queue = (Queue*)malloc(sizeof(Queue));
   if (queue == NULL) {
-    log_perror("ERROR: Could not allocate memory for queue structure");
+    perror("ERROR: Could not allocate memory for queue structure");
     return NULL;
   }
 
@@ -73,7 +72,7 @@ static bool queue_double_capacity(Queue* queue) {
     new_capacity = 100;
   void** new_items = malloc(new_capacity * sizeof(void*));
   if (new_items == NULL) {
-    log_perror("ERROR: Could not allocate memory for doubling capacity of queue.");
+    perror("ERROR: Could not allocate memory for doubling capacity of queue.");
     return false;
   }
   for (int i = 0; i < queue->size; i++)
@@ -128,7 +127,7 @@ bool queue_enqueue_multithreaded_cancel(Queue* queue, void* item, mtx_t* mutex,
 
 void* queue_dequeue(Queue* queue) {
   if (queue == NULL || queue_is_empty(queue)) {
-    log_perror("ERROR: Could not dequeue from null or empty queue.");
+    perror("ERROR: Could not dequeue from null or empty queue.");
     return NULL;
   }
 

src/shared/transport_ssh.c

@@ -1,4 +1,3 @@
-#include "log.h"
 #include "transport_ssh.h"
 #include "utils.h"
 #include <fcntl.h>
@@ -77,7 +76,7 @@ Client* client_connect_ssh(const char* destination, int port, const char* server
 
   int sv[2];
   if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv) < 0) {
-    log_perror("socketpair failed");
+    perror("socketpair failed");
     remote_dest_destroy(&r);
     return NULL;
   }
@@ -90,7 +89,7 @@ Client* client_connect_ssh(const char* destination, int port, const char* server
 
   int exec_pipe[2];
   if (pipe(exec_pipe) < 0) {
-    log_perror("pipe failed");
+    perror("pipe failed");
     close(sv[0]);
     close(sv[1]);
     remote_dest_destroy(&r);
@@ -99,7 +98,7 @@ Client* client_connect_ssh(const char* destination, int port, const char* server
 
   pid_t pid = fork();
   if (pid < 0) {
-    log_perror("fork failed");
+    perror("fork failed");
     close(sv[0]);
     close(sv[1]);
     close(exec_pipe[0]);
@@ -152,7 +151,7 @@ Client* client_connect_ssh(const char* destination, int port, const char* server
     ssh_argv[ac++] = "--stdio";
     ssh_argv[ac] = NULL;
     execvp("ssh", ssh_argv);
-    log_perror("exec of ssh failed");
+    perror("exec of ssh failed");
     ssize_t wret = write(exec_pipe[1], "x", 1);
     (void)wret;
     _exit(1);

src/shared/transport_tcp.c

@@ -30,20 +30,20 @@ static void sigchld_handler(int sig) {
 Server* server_create(int port) {
   Server* server = (Server*)malloc(sizeof(Server));
   if (server == NULL) {
-    log_perror("Could not allocate space for Server");
+    perror("Could not allocate space for Server");
     return NULL;
   }
 
   int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
   if (file_descriptor < 0) {
-    log_perror("Could not create Socket!");
+    perror("Could not create Socket!");
     free(server);
     return NULL;
   }
   server->file_descriptor = file_descriptor;
   int opt = 1;
   if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) {
-    log_perror("Error setting a socket option!");
+    perror("Error setting a socket option!");
     close(server->file_descriptor);
     free(server);
     return NULL;
@@ -59,7 +59,7 @@ Server* server_create(int port) {
 
   if (bind(server->file_descriptor, (struct sockaddr*)&server->address, server->address_length) <
       0) {
-    log_perror("Could not bind server");
+    perror("Could not bind server");
     close(server->file_descriptor);
     free(server);
     return NULL;
@@ -83,7 +83,7 @@ void server_delete(Server** server) {
 static void accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
                         const char* log_fmt) {
   if (listen(server->file_descriptor, SOMAXCONN) < 0) {
-    log_perror("Could not listen on port!");
+    perror("Could not listen on port!");
     return;
   }
   signal(SIGCHLD, sigchld_handler);
@@ -92,7 +92,7 @@ static void accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
     socklen_t client_len = sizeof(client_addr);
     int fd = accept(server->file_descriptor, (struct sockaddr*)&client_addr, &client_len);
     if (fd < 0) {
-      log_perror("Could not accept the connection");
+      perror("Could not accept the connection");
       continue;
     }
     tcp_apply_socket_timeout(fd);
@@ -151,10 +151,6 @@ int tcp_get_contimeout_sec(void) {
   return g_contimeout_sec;
 }
 
-int tcp_get_timeout_sec(void) {
-  return g_timeout_sec;
-}
-
 static void tcp_apply_socket_timeout(int fd) {
   struct timeval tv;
   tv.tv_sec = g_timeout_sec;
@@ -177,7 +173,7 @@ Client* client_create() {
   return client;
 }
 
-bool tcp_connect_socket(Client* client, char* host, int port) {
+bool tcp_connect_socket(Client* client, const char* host, int port) {
   struct addrinfo hints;
   struct addrinfo* result;
   memset(&hints, 0, sizeof(hints));
@@ -222,18 +218,16 @@ bool tcp_connect_socket(Client* client, char* host, int port) {
   freeaddrinfo(result);
 
   if (!connected) {
-    log_perror("Could not connect to Server!");
+    perror("Could not connect to Server!");
     return false;
   }
 
+  tcp_apply_socket_timeout(client->file_descriptor);
   return true;
 }
 
 bool client_connect(Client* client, char* host, int port) {
-  if (!tcp_connect_socket(client, host, port))
-    return false;
-  tcp_apply_socket_timeout(client->file_descriptor);
-  return true;
+  return tcp_connect_socket(client, host, port);
 }
 
 void client_disconnect(Client* client) {

src/shared/transport_tcp.h

@@ -29,12 +29,11 @@ void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
                         const char* log_fmt);
 void server_delete(Server** server);
 Client* client_create();
+bool tcp_connect_socket(Client* client, const char* host, int port);
 bool client_connect(Client* client, char* host, int port);
-bool tcp_connect_socket(Client* client, char* host, int port);
 void client_disconnect(Client* client);
 void client_delete(Client* client);
 void tcp_set_timeouts(int timeout_sec, int contimeout_sec);
 int tcp_get_contimeout_sec(void);
-int tcp_get_timeout_sec(void);
 
 #endif

src/shared/transport_tls.c

@@ -2,14 +2,14 @@
 #include "log.h"
 #include "protocol.h"
 #include "transport_tcp.h"
-#include <arpa/inet.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 bool tls_global_init(void) {
@@ -93,7 +93,6 @@ static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server, const char* h
   }
 
   // Retry SSL_accept/SSL_connect on WANT_READ/WANT_WRITE (non-blocking handshake)
-  time_t deadline = time(NULL) + (is_server ? tcp_get_timeout_sec() : tcp_get_contimeout_sec());
   int ret;
   do {
     if (is_server)
@@ -103,8 +102,7 @@ static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server, const char* h
 
     if (ret <= 0) {
       int ssl_err = SSL_get_error(ssl, ret);
-      if ((ssl_err == SSL_ERROR_WANT_READ || ssl_err == SSL_ERROR_WANT_WRITE) &&
-          time(NULL) < deadline)
+      if (ssl_err == SSL_ERROR_WANT_READ || ssl_err == SSL_ERROR_WANT_WRITE)
         continue;
       log_message(LOG_LEVEL_ERROR, "SSL %s failed", is_server ? "accept" : "connect");
       log_ssl_errors();

src/shared/utils.c

@@ -1,4 +1,3 @@
-#include "log.h"
 #include "utils.h"
 #include "array_list.h"
 #include "libgen.h"
@@ -55,7 +54,7 @@ bool mkdir_r(const char* path) {
     struct stat st;
     if (stat(path_current, &st) != 0) {
       if (mkdir(path_current, 0755) != 0) {
-        log_perror("Could not create directory");
+        perror("Could not create directory");
         ok = false;
         break;
       }
@@ -238,10 +237,6 @@ bool has_path_traversal(const char* path) {
   return false;
 }
 
-bool utils_valid_batch_path(const char* path) {
-  return path && path[0] != '\0' && path[0] != '/' && !has_path_traversal(path);
-}
-
 char* path_cat(const char* path1, const char* path2) {
   if (path1 == NULL || *path1 == '\0')
     return str_dup(path2);

src/shared/utils.h

@@ -11,6 +11,5 @@ bool glob_match(const char* pattern, const char* str);
 bool delete_extras(const char* dest_root, ArrayList* manifest);
 void utils_set_authorized_root_fd(int fd);
 bool has_path_traversal(const char* path);
-bool utils_valid_batch_path(const char* path);
 
 #endif

tests/test_chunk.c

@@ -11,7 +11,7 @@ static void test_file_operations() {
   char* test_content = "Hello, Chunk System!";
   unsigned long long test_len = strlen(test_content);
 
-  file_write_to_disk(test_path, test_content, test_len, false, false);
+  to_disk(test_path, test_content, test_len, false, false);
 
   File* f = file_create(test_path);
   EXPECT_NOT_NULL(f);
@@ -43,8 +43,8 @@ static void test_chunk_operations() {
   char* content2 = "chunk item number 2";
   unsigned long long len2 = strlen(content2);
 
-  file_write_to_disk(path1, content1, len1, false, false);
-  file_write_to_disk(path2, content2, len2, false, false);
+  to_disk(path1, content1, len1, false, false);
+  to_disk(path2, content2, len2, false, false);
 
   struct stat st1, st2;
   stat(path1, &st1);

tests/test_client_cli.c

@@ -1,5 +1,4 @@
 #include "test_client_cli.h"
-#include "client_validation.h"
 #include "config.h"
 #include "test_utils.h"
 #include "utils.h"
@@ -10,56 +9,6 @@
 /* Declaration of parse_args from client_cli.c */
 int parse_args(Config* config, int argc, char* argv[], int* positional_args, int* positional_count);
 
-static Config* valid_client_config() {
-  Config* cfg = config_create();
-  if (!cfg)
-    return NULL;
-  cfg->send_directory = str_dup("/src");
-  cfg->receive_root_directory = str_dup("/dst");
-  return cfg;
-}
-
-static void test_validate_config_required_paths() {
-  Config* cfg = config_create();
-  EXPECT_FALSE(validate_config(cfg));
-  cfg->send_directory = str_dup("/src");
-  EXPECT_FALSE(validate_config(cfg));
-  config_delete(cfg);
-}
-
-static void test_validate_config_incompatible_options() {
-  Config* cfg = valid_client_config();
-  cfg->use_sendfile = true;
-  cfg->use_compression = true;
-  EXPECT_FALSE(validate_config(cfg));
-  cfg->use_compression = false;
-  cfg->use_incremental = true;
-  cfg->use_chunk_serialization = true;
-  EXPECT_FALSE(validate_config(cfg));
-  config_delete(cfg);
-}
-
-static void test_validate_config_tls_requirements() {
-  Config* cfg = valid_client_config();
-  cfg->use_tls = true;
-  EXPECT_FALSE(validate_config(cfg));
-  cfg->tls_cert = str_dup("cert.pem");
-  EXPECT_FALSE(validate_config(cfg));
-  cfg->tls_key = str_dup("key.pem");
-  EXPECT_TRUE(validate_config(cfg));
-  config_delete(cfg);
-}
-
-static void test_validate_config_delta_sendfile_constraints() {
-  Config* cfg = valid_client_config();
-  cfg->use_delta = true;
-  EXPECT_FALSE(validate_config(cfg));
-  cfg->use_incremental = true;
-  cfg->use_sendfile = true;
-  EXPECT_FALSE(validate_config(cfg));
-  config_delete(cfg);
-}
-
 /* Test main() with --help flag (early return path, no server connection needed) */
 static void test_cli_help() {
   /* We can't easily call main() because it calls send_files which needs a server.
@@ -338,10 +287,6 @@ static void test_parse_args_archive() {
 }
 
 void test_client_cli() {
-  test_validate_config_required_paths();
-  test_validate_config_incompatible_options();
-  test_validate_config_tls_requirements();
-  test_validate_config_delta_sendfile_constraints();
   test_cli_help();
   test_cli_archive_flags();
   test_cli_dry_run();

tests/test_compression.c

@@ -62,8 +62,8 @@ static void test_chunk_compress_decompress_roundtrip() {
   char* content2 = "chunk compression test file 2 with more data";
   unsigned long long len2 = strlen(content2);
 
-  file_write_to_disk(path1, content1, len1, false, false);
-  file_write_to_disk(path2, content2, len2, false, false);
+  to_disk(path1, content1, len1, false, false);
+  to_disk(path2, content2, len2, false, false);
 
   struct stat st1, st2;
   EXPECT_EQ_INT(stat(path1, &st1), 0);

tests/test_config.c

@@ -224,46 +224,26 @@ static void test_config_send_receive_version_mismatch() {
   }
 }
 
-static void test_config_receive_truncated() {
-  int p[2];
-  EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
-  io_set_fds(p[0], p[0]);
-  io_set_bwlimit(0);
-
-  /* A valid prefix exercises cleanup after allocated wire strings and a
-   * partially received scalar field. */
-  EXPECT_TRUE(send_str(p[1], PROTOCOL_VERSION));
-  EXPECT_TRUE(send_str(p[1], "/src"));
-  EXPECT_TRUE(send_str(p[1], "/dst"));
-  EXPECT_TRUE(send_int(p[1], 1));
-  shutdown(p[1], SHUT_WR);
-
-  const Config* cfg = config_receive(p[0]);
-  EXPECT_NULL(cfg);
-  close(p[0]);
-  close(p[1]);
-}
-
-static void test_config_is_remote_dest() {
+static void test_is_remote_dest() {
   /* Valid SSH-style destinations */
-  EXPECT_TRUE(config_is_remote_dest("user@host:/path"));
-  EXPECT_TRUE(config_is_remote_dest("host:/path"));
-  EXPECT_TRUE(config_is_remote_dest("user@192.168.1.1:/remote/path"));
+  EXPECT_TRUE(is_remote_dest("user@host:/path"));
+  EXPECT_TRUE(is_remote_dest("host:/path"));
+  EXPECT_TRUE(is_remote_dest("user@192.168.1.1:/remote/path"));
 
   /* Invalid destinations */
-  EXPECT_FALSE(config_is_remote_dest(NULL));
-  EXPECT_FALSE(config_is_remote_dest(""));
-  EXPECT_FALSE(config_is_remote_dest(":"));
-  EXPECT_FALSE(config_is_remote_dest("/local/path"));
-  EXPECT_FALSE(config_is_remote_dest("relative/path"));
+  EXPECT_FALSE(is_remote_dest(NULL));
+  EXPECT_FALSE(is_remote_dest(""));
+  EXPECT_FALSE(is_remote_dest(":"));
+  EXPECT_FALSE(is_remote_dest("/local/path"));
+  EXPECT_FALSE(is_remote_dest("relative/path"));
   /* C:/windows/path is treated as remote (colon with no preceding slash) */
-  EXPECT_TRUE(config_is_remote_dest("C:/windows/path"));
+  EXPECT_TRUE(is_remote_dest("C:/windows/path"));
 
   /* Edge cases */
-  EXPECT_FALSE(config_is_remote_dest("noslash"));
-  EXPECT_FALSE(config_is_remote_dest("/"));
-  EXPECT_TRUE(config_is_remote_dest("host:"));
-  EXPECT_TRUE(config_is_remote_dest("user@host:"));
+  EXPECT_FALSE(is_remote_dest("noslash"));
+  EXPECT_FALSE(is_remote_dest("/"));
+  EXPECT_TRUE(is_remote_dest("host:"));
+  EXPECT_TRUE(is_remote_dest("user@host:"));
 }
 
 void test_config() {
@@ -276,7 +256,6 @@ void test_config() {
   if (!is_running_under_valgrind()) {
     test_config_send_receive();
     test_config_send_receive_version_mismatch();
-    test_config_receive_truncated();
   }
-  test_config_is_remote_dest();
+  test_is_remote_dest();
 }

tests/test_file.c

@@ -34,8 +34,7 @@ static void test_file_destroy_normal() {
 
 static void test_file_load_data() {
   const char* content = "Hello Load Test";
-  EXPECT_TRUE(
-      file_write_to_disk("test_file_load_data.txt", content, strlen(content), false, false));
+  EXPECT_TRUE(to_disk("test_file_load_data.txt", content, strlen(content), false, false));
 
   struct stat st;
   EXPECT_EQ_INT(stat("test_file_load_data.txt", &st), 0);
@@ -88,16 +87,15 @@ static void test_file_save_to_disk() {
   rmdir("test_save_tmp");
 }
 
-static void test_file_write_to_disk_basic() {
-  const char* content = "Basic file_write_to_disk test";
-  EXPECT_TRUE(file_write_to_disk("test_file_write_to_disk_basic.txt", content, strlen(content),
-                                 false, false));
+static void test_to_disk_basic() {
+  const char* content = "Basic to_disk test";
+  EXPECT_TRUE(to_disk("test_to_disk_basic.txt", content, strlen(content), false, false));
 
   struct stat st;
-  EXPECT_EQ_INT(stat("test_file_write_to_disk_basic.txt", &st), 0);
+  EXPECT_EQ_INT(stat("test_to_disk_basic.txt", &st), 0);
   EXPECT_EQ_INT((int)st.st_size, (int)strlen(content));
 
-  FILE* fp = fopen("test_file_write_to_disk_basic.txt", "rb");
+  FILE* fp = fopen("test_to_disk_basic.txt", "rb");
   EXPECT_NOT_NULL(fp);
   char buf[100];
   size_t nread = fread(buf, 1, sizeof(buf), fp);
@@ -105,13 +103,12 @@ static void test_file_write_to_disk_basic() {
   EXPECT_EQ_INT((int)nread, (int)strlen(content));
   EXPECT_EQ_INT(memcmp(buf, content, strlen(content)), 0);
 
-  unlink("test_file_write_to_disk_basic.txt");
+  unlink("test_to_disk_basic.txt");
 }
 
-static void test_file_write_to_disk_creates_dirs() {
+static void test_to_disk_creates_dirs() {
   const char* content = "Nested dir test";
-  EXPECT_TRUE(file_write_to_disk("test_nested_tmp/nested/file.txt", content, strlen(content), false,
-                                 false));
+  EXPECT_TRUE(to_disk("test_nested_tmp/nested/file.txt", content, strlen(content), false, false));
 
   struct stat st;
   EXPECT_EQ_INT(stat("test_nested_tmp/nested/file.txt", &st), 0);
@@ -129,15 +126,15 @@ static void test_file_write_to_disk_creates_dirs() {
   rmdir("test_nested_tmp");
 }
 
-static void test_file_write_to_disk_does_not_follow_symlink() {
-  const char* outside = "test_file_write_to_disk_outside.txt";
-  const char* link = "test_file_write_to_disk_link.txt";
+static void test_to_disk_does_not_follow_symlink() {
+  const char* outside = "test_to_disk_outside.txt";
+  const char* link = "test_to_disk_link.txt";
   const char* content = "confined";
   unlink(outside);
   unlink(link);
-  EXPECT_TRUE(file_write_to_disk(outside, "outside", 7, false, false));
+  EXPECT_TRUE(to_disk(outside, "outside", 7, false, false));
   EXPECT_EQ_INT(symlink(outside, link), 0);
-  EXPECT_TRUE(file_write_to_disk(link, content, strlen(content), false, false));
+  EXPECT_TRUE(to_disk(link, content, strlen(content), false, false));
   FILE* fp = fopen(outside, "rb");
   char buf[16] = {0};
   EXPECT_NOT_NULL(fp);
@@ -154,7 +151,7 @@ static void test_file_write_to_disk_does_not_follow_symlink() {
 
 static void test_file_content_to_buffer() {
   const char* content = "Buffer content test";
-  EXPECT_TRUE(file_write_to_disk("test_buffer_file.txt", content, strlen(content), false, false));
+  EXPECT_TRUE(to_disk("test_buffer_file.txt", content, strlen(content), false, false));
 
   File* f = file_create("test_buffer_file.txt");
   EXPECT_NOT_NULL(f);
@@ -276,7 +273,7 @@ static void test_file_send_no_path() {
 }
 
 static void test_file_metadata_create() {
-  EXPECT_TRUE(file_write_to_disk("test_meta_file.txt", "metadata test", 13, false, false));
+  EXPECT_TRUE(to_disk("test_meta_file.txt", "metadata test", 13, false, false));
   struct stat st;
   EXPECT_EQ_INT(stat("test_meta_file.txt", &st), 0);
 
@@ -385,7 +382,7 @@ static void test_file_send_single_calls_metadata_and_path() {
   /* Create a real file on disk so we can have metadata */
   const char* content = "File with metadata";
   size_t len = strlen(content);
-  EXPECT_TRUE(file_write_to_disk("test_meta_send.txt", content, len, false, false));
+  EXPECT_TRUE(to_disk("test_meta_send.txt", content, len, false, false));
 
   struct stat st;
   EXPECT_EQ_INT(stat("test_meta_send.txt", &st), 0);
@@ -458,9 +455,9 @@ void test_file() {
   test_file_load_data();
   test_file_load_data_missing_file();
   test_file_save_to_disk();
-  test_file_write_to_disk_basic();
-  test_file_write_to_disk_creates_dirs();
-  test_file_write_to_disk_does_not_follow_symlink();
+  test_to_disk_basic();
+  test_to_disk_creates_dirs();
+  test_to_disk_does_not_follow_symlink();
   test_file_content_to_buffer();
   test_file_save_to_disk_path_traversal();
   test_file_save_to_disk_deep_traversal();

tests/test_file_sendfile.c

@@ -15,7 +15,7 @@
 static void test_sendfile_basic() {
   const char* content = "Hello from sendfile test!";
   size_t len = strlen(content);
-  EXPECT_TRUE(file_write_to_disk("test_sendfile_basic.txt", content, len, false, false));
+  EXPECT_TRUE(to_disk("test_sendfile_basic.txt", content, len, false, false));
 
   File* file = file_create("test_sendfile_basic.txt");
   EXPECT_NOT_NULL(file);
@@ -77,7 +77,7 @@ static void test_sendfile_basic() {
 static void test_sendfile_empty_file() {
   const char* content = "";
   size_t len = 0;
-  EXPECT_TRUE(file_write_to_disk("test_sendfile_empty.txt", content, len, false, false));
+  EXPECT_TRUE(to_disk("test_sendfile_empty.txt", content, len, false, false));
 
   File* file = file_create("test_sendfile_empty.txt");
   EXPECT_NOT_NULL(file);
@@ -156,7 +156,7 @@ static void test_sendfile_missing_file() {
 static void test_sendfile_compression_fallback() {
   const char* content = "Compression fallback content";
   size_t len = strlen(content);
-  EXPECT_TRUE(file_write_to_disk("test_sendfile_comp.txt", content, len, false, false));
+  EXPECT_TRUE(to_disk("test_sendfile_comp.txt", content, len, false, false));
 
   struct stat st;
   EXPECT_EQ_INT(stat("test_sendfile_comp.txt", &st), 0);
@@ -222,7 +222,7 @@ static void test_sendfile_compression_fallback() {
 static void test_sendfile_no_path() {
   const char* content = "No path sendfile test";
   size_t len = strlen(content);
-  EXPECT_TRUE(file_write_to_disk("test_sendfile_nopath.txt", content, len, false, false));
+  EXPECT_TRUE(to_disk("test_sendfile_nopath.txt", content, len, false, false));
 
   File* file = file_create("test_sendfile_nopath.txt");
   EXPECT_NOT_NULL(file);

tests/test_fuzz_smoke.c

@@ -101,7 +101,7 @@ static void test_fuzz_delta_deserialize() {
 /* Smoke test for metadata_from_buf fuzz target */
 static void test_fuzz_metadata_from_buf() {
   /* Create a real file to get metadata from */
-  EXPECT_TRUE(file_write_to_disk("fuzz_meta_test.txt", "metadata test", 13, false, false));
+  EXPECT_TRUE(to_disk("fuzz_meta_test.txt", "metadata test", 13, false, false));
 
   struct stat st;
   EXPECT_EQ_INT(stat("fuzz_meta_test.txt", &st), 0);

tests/test_metadata.c

@@ -125,7 +125,7 @@ static void test_metadata_rejects_invalid_values() {
 static void test_file_restore_metadata() {
   const char* path = "temp_meta_restore_test.txt";
   const char* content = "test content";
-  EXPECT_TRUE(file_write_to_disk(path, content, strlen(content), false, false));
+  EXPECT_TRUE(to_disk(path, content, strlen(content), false, false));
 
   FileMetadata m;
   m.mode = 0644;

tests/test_property.c

@@ -84,7 +84,7 @@ static void test_property_chunk_roundtrip() {
     for (int i = 0; i < content_len; i++)
       content[i] = (char)(rand() % 256);
 
-    file_write_to_disk(path, content, content_len, false, false);
+    to_disk(path, content, content_len, false, false);
 
     struct stat st;
     stat(path, &st);

tests/test_protocol.c

@@ -38,23 +38,6 @@ static void test_send_receive_n_data_zero() {
   close(p[1]);
 }
 
-static void test_explicit_session_context() {
-  int p[2];
-  EXPECT_EQ_INT(pipe(p), 0);
-  ProtocolSession session;
-  protocol_session_init(&session, p[0], p[1]);
-  protocol_session_set_bwlimit(&session, 0);
-
-  const char payload[] = "explicit context";
-  char received[sizeof(payload)] = {0};
-  EXPECT_TRUE(protocol_send_n_data(&session, payload, sizeof(payload)));
-  EXPECT_TRUE(protocol_receive_n_data(&session, received, sizeof(received)));
-  EXPECT_EQ_INT(memcmp(payload, received, sizeof(payload)), 0);
-
-  close(p[0]);
-  close(p[1]);
-}
-
 static void test_send_receive_str() {
   int p[2];
   EXPECT_EQ_INT(pipe(p), 0);
@@ -190,7 +173,6 @@ static void test_receive_str_truncated() {
 void test_protocol() {
   test_send_receive_n_data();
   test_send_receive_n_data_zero();
-  test_explicit_session_context();
   test_send_receive_str();
   test_send_receive_str_normal();
   test_send_receive_data();

tests/test_robustness.c

@@ -13,7 +13,7 @@
 static void test_chunk_deserialize_truncated() {
   char* path = "test_rob_trunc.txt";
   char* content = "hello";
-  file_write_to_disk(path, content, strlen(content), false, false);
+  to_disk(path, content, strlen(content), false, false);
 
   struct stat st;
   stat(path, &st);

tests/test_scanner.c

@@ -7,7 +7,7 @@
 #include <unistd.h>
 
 static void create_test_file(const char* path, const char* content) {
-  (void)file_write_to_disk(path, content, strlen(content), false, false);
+  (void)to_disk(path, content, strlen(content), false, false);
 }
 
 static void test_scanner_single_file() {
@@ -385,35 +385,6 @@ static void test_scanner_no_patterns() {
   rmdir(dir);
 }
 
-static void test_parallel_scanner_root_chunks_without_workers() {
-  const char* dir = "test_parallel_scan_root";
-  const char* file1 = "test_parallel_scan_root/a.txt";
-  const char* file2 = "test_parallel_scan_root/b.txt";
-
-  EXPECT_EQ_INT(mkdir(dir, 0755), 0);
-  create_test_file(file1, "a");
-  create_test_file(file2, "b");
-
-  ScannerOptions options = {false, 1, NULL,  0,     NULL,  0,     0,    0,
-                            0,     0, false, false, false, false, false};
-  ParallelScanner* scanner = parallel_scanner_create_with_options(dir, &options);
-  EXPECT_NOT_NULL(scanner);
-
-  int total_files = 0;
-  Chunk* chunk;
-  while ((chunk = parallel_scanner_next(scanner)) != NULL) {
-    total_files += chunk->element_count;
-    chunk_destroy(chunk);
-  }
-  EXPECT_EQ_INT(total_files, 2);
-  EXPECT_FALSE(parallel_scanner_failed(scanner));
-
-  parallel_scanner_destroy(scanner);
-  unlink(file1);
-  unlink(file2);
-  rmdir(dir);
-}
-
 void test_scanner() {
   test_scanner_single_file();
   test_scanner_multiple_files();
@@ -428,5 +399,4 @@ void test_scanner() {
   test_scanner_size_range();
   test_scanner_mixed_patterns();
   test_scanner_no_patterns();
-  test_parallel_scanner_root_chunks_without_workers();
 }

tests/test_server.c

@@ -11,7 +11,11 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "receiver.h"
+/* Include server.c but rename main to avoid conflict with test runner's main */
+#define main server_main_
+#define FASTSYNC_SERVER_AS_LIB
+#include "server.c"
+#undef main
 
 /* Test receive_files with immediate FINISHED status */
 static void test_receive_files_finished() {
@@ -32,7 +36,7 @@ static void test_receive_files_finished() {
     /* Child: use p[0] for both read and write */
     close(p[1]);
     io_set_fds(p[0], p[0]);
-    int ret = receiver_receive_files(cfg, p[0]);
+    int ret = receive_files(cfg, p[0]);
     close(p[0]);
     config_delete(cfg);
     _exit(ret == 0 ? 0 : 1);
@@ -84,7 +88,7 @@ static void test_receive_files_single_file() {
     /* Child: use p[0] for both read and write */
     close(p[1]);
     io_set_fds(p[0], p[0]);
-    int ret = receiver_receive_files(cfg, p[0]);
+    int ret = receive_files(cfg, p[0]);
     close(p[0]);
     config_delete(cfg);
     _exit(ret == 0 ? 0 : 1);
@@ -145,7 +149,7 @@ static void test_receive_files_abort() {
   if (pid == 0) {
     close(p[1]);
     io_set_fds(p[0], p[0]);
-    int ret = receiver_receive_files(cfg, p[0]);
+    int ret = receive_files(cfg, p[0]);
     close(p[0]);
     config_delete(cfg);
     /* Should return -1 on abort */