fix: features and enhancements — issues #70 , #36 , #34 , #33 , #32 , #57 , #40 , #37

2026-07-20 19:27:13 +02:00
28 changed files with 772 additions and 725 deletions
@@ -5,5 +5,3 @@ __pycache__/
 build-asan
 coverage.info
 build-*/
-build3/
-build_docker2/
@@ -3,7 +3,6 @@
 #include "delta.h"
 #include "log.h"
 #include "protocol.h"
-#include "transport_tcp.h"
 #include "transport_tls.h"
 #include "utils.h"
 #include <errno.h>
@@ -32,8 +31,6 @@ static void print_usage(void) {
  printf("  --delete            Delete files on receiver not in source\n");
  printf("  --exclude <pattern> Exclude files matching pattern\n");
  printf("  --include <pattern> Only include files matching pattern\n");
-  printf("  --exclude-from <file> Read exclude patterns from file\n");
-  printf("  --include-from <file> Read include patterns from file\n");
  printf("  --max-size <n>      Skip files larger than n bytes\n");
  printf("  --min-size <n>      Skip files smaller than n bytes\n");
  printf("  --incremental       Skip files unchanged since last transfer\n");
@@ -58,50 +55,10 @@ static void print_usage(void) {
  printf("  --cert <path>       TLS certificate file (PEM)\n");
  printf("  --key <path>        TLS private key file (PEM)\n");
  printf("  --ca <path>         TLS CA certificate file (PEM)\n");
-  printf("  --timeout <sec>     I/O timeout in seconds (default: 30)\n");
-  printf("  --contimeout <sec>  Connection timeout in seconds (default: 10)\n");
-  printf("  -q, --quiet         Suppress non-error output\n");
-  printf("  --silent            Alias for --quiet\n");
-  printf("  --backup            Backup existing files before overwriting\n");
-  printf("  --backup-dir <dir>  Directory for backups (requires --backup)\n");
-  printf("  --stats             Print transfer statistics at end\n");
-  printf("  --max-depth <n>     Maximum directory depth (0=unlimited)\n");
-  printf("  --log-file <path>   Write log messages to file\n");
-  printf("  --queue-size <n>    Queue capacity for multithreaded mode (default: 100)\n");
+  printf("  --partial           Keep partial files on interrupted transfer\n");
  printf("  --help              Show this help\n");
 }

-static int read_patterns_from_file(const char* filepath, char*** patterns, int* count) {
-  FILE* fp = fopen(filepath, "r");
-  if (!fp) {
-    fprintf(stderr, "Error: could not open pattern file '%s': %s\n", filepath, strerror(errno));
-    return -1;
-  }
-  char line[4096];
-  while (fgets(line, sizeof(line), fp)) {
-    char* p = line;
-    while (*p == ' ' || *p == '\t')
-      p++;
-    if (*p == '#' || *p == '\n' || *p == '\0')
-      continue;
-    size_t len = strlen(p);
-    while (len > 0 && (p[len - 1] == '\n' || p[len - 1] == '\r'))
-      p[--len] = '\0';
-    if (len == 0)
-      continue;
-    char** tmp = realloc(*patterns, (*count + 1) * sizeof(char*));
-    if (!tmp) {
-      fprintf(stderr, "Error: memory allocation failed for pattern file\n");
-      fclose(fp);
-      return -1;
-    }
-    *patterns = tmp;
-    (*patterns)[(*count)++] = str_dup(p);
-  }
-  fclose(fp);
-  return 0;
-}
-
 int main(int argc, char* argv[]) {
  const char* env_source = getenv("FASTSYNC_SOURCE_DIR");
  const char* env_dest = getenv("FASTSYNC_DEST_DIR");
@@ -243,64 +200,8 @@ int main(int argc, char* argv[]) {
    } else if (strcmp(argv[i], "--ca") == 0 && i + 1 < argc) {
      free(config->tls_ca);
      config->tls_ca = str_dup(argv[++i]);
-    } else if (strcmp(argv[i], "--timeout") == 0 && i + 1 < argc) {
-      config->timeout = atoi(argv[++i]);
-      if (config->timeout <= 0) {
-        fprintf(stderr, "Error: --timeout must be a positive integer\n");
-        exit_code = 1;
-        goto cleanup;
-      }
-    } else if (strcmp(argv[i], "--contimeout") == 0 && i + 1 < argc) {
-      config->contimeout = atoi(argv[++i]);
-      if (config->contimeout <= 0) {
-        fprintf(stderr, "Error: --contimeout must be a positive integer\n");
-        exit_code = 1;
-        goto cleanup;
-      }
-    } else if (strcmp(argv[i], "-q") == 0 || strcmp(argv[i], "--quiet") == 0 ||
-               strcmp(argv[i], "--silent") == 0) {
-      config->quiet = true;
-    } else if (strcmp(argv[i], "--backup") == 0) {
-      config->backup = true;
-    } else if (strcmp(argv[i], "--backup-dir") == 0 && i + 1 < argc) {
-      config->backup_dir = str_dup(argv[++i]);
-    } else if (strcmp(argv[i], "--stats") == 0) {
-      config->stats = true;
-    } else if (strcmp(argv[i], "--max-depth") == 0 && i + 1 < argc) {
-      config->max_depth = atoi(argv[++i]);
-      if (config->max_depth < 0) {
-        fprintf(stderr, "Error: --max-depth must be a non-negative integer\n");
-        exit_code = 1;
-        goto cleanup;
-      }
-    } else if (strcmp(argv[i], "--log-file") == 0 && i + 1 < argc) {
-      FILE* lf = fopen(argv[++i], "a");
-      if (!lf) {
-        fprintf(stderr, "Error: could not open log file '%s': %s\n", argv[i], strerror(errno));
-        exit_code = 1;
-        goto cleanup;
-      }
-      config->log_file = lf;
-      log_set_file(lf);
-    } else if (strcmp(argv[i], "--queue-size") == 0 && i + 1 < argc) {
-      config->queue_size = atoi(argv[++i]);
-      if (config->queue_size <= 0) {
-        fprintf(stderr, "Error: --queue-size must be a positive integer\n");
-        exit_code = 1;
-        goto cleanup;
-      }
-    } 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) {
-        exit_code = 1;
-        goto cleanup;
-      }
-    } 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) {
-        exit_code = 1;
-        goto cleanup;
-      }
+    } else if (strcmp(argv[i], "--partial") == 0) {
+      config->partial = true;
    } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
      set_log_level(LOG_LEVEL_DEBUG);
    } else if (argv[i][0] == '-') {
@@ -399,8 +300,6 @@ int main(int argc, char* argv[]) {
    tls_global_init();
  }

-  tcp_set_timeouts(config->timeout, config->contimeout);
-
  if (config->use_multithreading) {
    config_owned_by_pipeline = true;
    exit_code = send_files_multithreaded(config);
@@ -409,8 +308,6 @@ int main(int argc, char* argv[]) {
  }

 cleanup:
-  if (config->log_file)
-    fclose(config->log_file);
  if (!config_owned_by_pipeline)
    config_delete(config);
  return exit_code;
@@ -16,23 +16,12 @@
 #include "transport_ssh.h"
 #include "transport_tls.h"
 #include "utils.h"
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <threads.h>
 #include <time.h>

-static volatile sig_atomic_t g_abort_requested = 0;
-static int g_abort_fd = -1;
-
-static void handle_sigint(int sig) {
-  (void)sig;
-  g_abort_requested = 1;
-}
-
-#define KEEPALIVE_INTERVAL 30
-
 static int incremental_check(Client* client, File* file, DeltaSignature** out_sig) {
  *out_sig = NULL;
  if (!send_status(client->file_descriptor, STATUS_CHECK))
@@ -107,35 +96,6 @@ static int send_delta(Client* client, File* file, DeltaSignature* sig, Config* c
  return ok ? 0 : -1;
 }

-static bool batch_incremental_check(Client* client, ArrayList* files) {
-  if (!send_status(client->file_descriptor, STATUS_CHECK_BATCH))
-    return false;
-  if (!send_int(client->file_descriptor, files->size))
-    return false;
-  for (int i = 0; i < files->size; i++) {
-    File* file = (File*)files->items[i];
-    if (!send_str(client->file_descriptor, file->path))
-      return false;
-    unsigned long long fsize = file->data ? file->data->size : 0;
-    long long mtime = file->metadata ? file->metadata->mtime_sec : 0;
-    if (!send_n_data(client->file_descriptor, &fsize, sizeof(fsize)))
-      return false;
-    if (!send_n_data(client->file_descriptor, &mtime, sizeof(mtime)))
-      return false;
-  }
-  for (int i = 0; i < files->size; i++) {
-    Status s;
-    if (!receive_status(client->file_descriptor, &s))
-      return false;
-    File* file = (File*)files->items[i];
-    if (s == STATUS_OK)
-      file->skip = true;
-    else if (s == STATUS_ERROR)
-      return false;
-  }
-  return true;
-}
-
 typedef bool (*file_send_fn)(File*, int, bool, int, bool);

 // Send a single file directly (non-incremental path).
@@ -158,9 +118,6 @@ static int send_single_file(Client* client, File* file, Config* config, bool use
                            bool use_sendfile) {
  int compression_level = config->use_compression ? config->compression_level : 0;

-  if (file->skip)
-    return 1;
-
  if (!use_incremental) {
    if (use_sendfile) {
      return send_file_direct_sendfile(file, client->file_descriptor, config->use_metadata) ? 0
@@ -298,30 +255,7 @@ static int send_chunks_multithreaded(void* pipeline_context) {
    return thrd_error;
  }

-  g_abort_fd = client->file_descriptor;
-  time_t last_activity = time(NULL);
  while (true) {
-    if (g_abort_requested) {
-      send_status(client->file_descriptor, STATUS_ABORT);
-      client_disconnect(client);
-      client_delete(client);
-      return thrd_error;
-    }
-    time_t now = time(NULL);
-    if (now - last_activity >= KEEPALIVE_INTERVAL) {
-      if (!send_status(client->file_descriptor, STATUS_KEEPALIVE)) {
-        client_disconnect(client);
-        client_delete(client);
-        return thrd_error;
-      }
-      Status s;
-      if (!receive_status(client->file_descriptor, &s)) {
-        client_disconnect(client);
-        client_delete(client);
-        return thrd_error;
-      }
-      last_activity = now;
-    }
    Chunk* current_chunk = queue_dequeue_multithreaded(
        context->queue_loader, &context->mutex_loader, &context->condition_not_empty_loader,
        &context->condition_not_full_loader, &context->loader_done);
@@ -366,7 +300,7 @@ static int scan_directory_multithreaded(void* pipeline_context) {
      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);
+      context->config->min_size);
  mtx_unlock(&context->mutex_scanner);

  Chunk* current_chunk;
@@ -427,15 +361,13 @@ int send_files(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->min_size);
    Chunk* chunk;
    int file_count = 0;
    unsigned long long total_bytes = 0;
-    if (!config->quiet)
    printf("Dry run: files to be transferred\n");
    while ((chunk = directory_scanner_next(scanner)) != NULL) {
      for (int i = 0; i < chunk->element_count; i++) {
-        if (!config->quiet)
        printf("  %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
        total_bytes += chunk->items[i]->data->size;
        file_count++;
@@ -443,7 +375,6 @@ int send_files(Config* config) {
      chunk_destroy(chunk);
    }
    directory_scanner_destroy(scanner);
-    if (!config->quiet)
    printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
    return 0;
  }
@@ -480,98 +411,42 @@ int send_files(Config* config) {
    client_delete(client);
    return 1;
  }
-
-  g_abort_fd = client->file_descriptor;
-  struct sigaction sa;
-  memset(&sa, 0, sizeof(sa));
-  sa.sa_handler = handle_sigint;
-  sigaction(SIGINT, &sa, NULL);
-  sigaction(SIGTERM, &sa, NULL);
-
  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);
-  ArrayList* all_files = array_list_create(NULL);
-  ArrayList* manifest = config->use_delete ? array_list_create(free) : NULL;
+      config->min_size);
  Chunk* current_chunk;
+  unsigned long long total_bytes = 0;
+  time_t last_progress = 0;
+  time_t start = time(NULL);
+  ArrayList* manifest = config->use_delete ? array_list_create(free) : NULL;
  while ((current_chunk = directory_scanner_next(scanner)) != NULL) {
+    unsigned long long chunk_bytes = 0;
    for (int i = 0; i < current_chunk->element_count; i++) {
-      File* f = current_chunk->items[i];
-      array_list_add(all_files, f);
-      current_chunk->items[i] = NULL;
+      chunk_bytes += current_chunk->items[i]->data->size;
      if (manifest) {
-        const char* p = f->path;
+        const char* p = current_chunk->items[i]->path;
        if (*p == '/')
          p++;
        array_list_add(manifest, str_dup(p));
      }
    }
-    chunk_destroy(current_chunk);
-  }
-  directory_scanner_destroy(scanner);
-  scanner = NULL;
-
-  bool batch_ok = true;
-  if (config->use_incremental && all_files->size > 0) {
-    if (!batch_incremental_check(client, all_files)) {
-      log_message(LOG_LEVEL_ERROR, "Batch incremental check failed");
-      batch_ok = false;
-    }
-  }
-
-  unsigned long long total_bytes = 0;
-  time_t last_progress = 0;
-  time_t last_activity = 0;
-  time_t start = time(NULL);
-  bool use_sendfile = config->use_sendfile && !config->use_compression;
-  for (int i = 0; i < all_files->size; i++) {
-    File* file = (File*)all_files->items[i];
-    if (file->skip)
-      continue;
-    if (g_abort_requested) {
-      send_status(client->file_descriptor, STATUS_ABORT);
-      batch_ok = false;
-      break;
-    }
-    time_t now = time(NULL);
-    if (now - last_activity >= KEEPALIVE_INTERVAL) {
-      if (!send_status(client->file_descriptor, STATUS_KEEPALIVE)) {
-        batch_ok = false;
-        break;
-      }
-      Status s;
-      if (!receive_status(client->file_descriptor, &s)) {
-        batch_ok = false;
-        break;
-      }
-      last_activity = now;
-    }
-    int compression_level = config->use_compression ? config->compression_level : 0;
-    if (!send_status(client->file_descriptor, STATUS_NEXT)) {
-      batch_ok = false;
-      break;
-    }
-    if (use_sendfile) {
-      if (!file_send_sendfile(file, client->file_descriptor, config->use_metadata, 0, true)) {
-        log_message(LOG_LEVEL_ERROR, "Failed to send file via sendfile");
-        batch_ok = false;
-        break;
-      }
-    } else {
-      if (!file_load_data(file)) {
+    if (!config->use_sendfile) {
+      for (int i = 0; i < current_chunk->element_count; i++) {
+        if (!file_load_data(current_chunk->items[i])) {
          log_message(LOG_LEVEL_ERROR, "Failed to load file data");
          continue;
        }
-      if (!file_send_single_calls(file, client->file_descriptor, config->use_metadata,
-                                  compression_level, true)) {
-        log_message(LOG_LEVEL_ERROR, "Failed to send file");
-        batch_ok = false;
+      }
+    }
+    if (send_chunk(client, current_chunk, config) != 0) {
+      log_message(LOG_LEVEL_ERROR, "Failed to send chunk");
+      chunk_destroy(current_chunk);
      break;
    }
-    }
-    total_bytes += file->data ? file->data->size : 0;
    if (config->show_progress) {
+      total_bytes += chunk_bytes;
+      time_t now = time(NULL);
      if (now - last_progress >= 1) {
        last_progress = now;
        double elapsed = difftime(now, start);
@@ -580,56 +455,58 @@ int send_files(Config* config) {
        fflush(stderr);
      }
    }
+    chunk_destroy(current_chunk);
  }
-
-  if (batch_ok && config->use_delete && manifest) {
-    if (!send_status(client->file_descriptor, STATUS_MANIFEST))
-      batch_ok = false;
-    else if (!send_int(client->file_descriptor, manifest->size))
-      batch_ok = false;
-    else {
-      for (int i = 0; i < manifest->size && batch_ok; i++) {
-        if (!send_str(client->file_descriptor, (char*)manifest->items[i]))
-          batch_ok = false;
+  if (config->use_delete) {
+    if (!send_status(client->file_descriptor, STATUS_MANIFEST)) {
+      array_list_delete(manifest);
+      goto send_fail;
    }
+    if (!send_int(client->file_descriptor, manifest->size)) {
+      array_list_delete(manifest);
+      goto send_fail;
+    }
+    for (int i = 0; i < manifest->size; i++) {
+      if (!send_str(client->file_descriptor, (char*)manifest->items[i])) {
+        array_list_delete(manifest);
+        goto send_fail;
      }
    }
    array_list_delete(manifest);
-
-  if (batch_ok && !send_status(client->file_descriptor, STATUS_FINISHED))
-    batch_ok = false;
+  }
+  if (!send_status(client->file_descriptor, STATUS_FINISHED))
+    goto send_fail;
  Status s;
-  int ok = 0;
-  if (batch_ok)
-    ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
+  int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
  if (config->show_progress) {
    double elapsed = difftime(time(NULL), start);
    double rate = elapsed > 0 ? total_bytes / (1048576.0 * elapsed) : 0;
    fprintf(stderr, "\rSent %.1f MB  (%.1f MB/s)  Done.\n", total_bytes / 1048576.0, rate);
  }
-  for (int i = 0; i < all_files->size; i++)
-    file_destroy(all_files->items[i]);
-  array_list_delete(all_files);
+  directory_scanner_destroy(scanner);
  client_disconnect(client);
  client_delete(client);
-  return (batch_ok && ok) ? 0 : -1;
+  return ok ? 0 : -1;
+
+send_fail:
+  directory_scanner_destroy(scanner);
+  client_disconnect(client);
+  client_delete(client);
+  return -1;
 }

 int send_files_multithreaded(Config* config) {
-  time_t start_time = time(NULL);
  if (config->dry_run) {
    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->min_size);
    Chunk* chunk;
    int file_count = 0;
    unsigned long long total_bytes = 0;
-    if (!config->quiet)
    printf("Dry run: files to be transferred\n");
    while ((chunk = directory_scanner_next(scanner)) != NULL) {
      for (int i = 0; i < chunk->element_count; i++) {
-        if (!config->quiet)
        printf("  %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
        total_bytes += chunk->items[i]->data->size;
        file_count++;
@@ -637,14 +514,12 @@ int send_files_multithreaded(Config* config) {
      chunk_destroy(chunk);
    }
    directory_scanner_destroy(scanner);
-    if (!config->quiet)
    printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
    return 0;
  }

-  int qsize = config->queue_size > 0 ? config->queue_size : 100;
-  Queue* q1 = queue_create(qsize, chunk_destroy);
-  Queue* q2 = queue_create(qsize, chunk_destroy);
+  Queue* q1 = queue_create(100, chunk_destroy);
+  Queue* q2 = queue_create(100, chunk_destroy);
  if (!q1 || !q2) {
    if (q1)
      queue_destroy(q1);
@@ -675,12 +550,6 @@ int send_files_multithreaded(Config* config) {
  thrd_join(loader, NULL);
  thrd_join(sender, &sender_result);

-  if (config->stats && !config->quiet) {
-    double elapsed = difftime(time(NULL), start_time);
-    printf("\nTransfer statistics:\n");
-    printf("  Elapsed time: %.1f sec\n", elapsed);
-  }
-
  pipeline_context_sender_destroy(context);
  return sender_result == thrd_success ? 0 : -1;
 }
@@ -11,50 +11,87 @@
 #include <sys/stat.h>
 #include <unistd.h>

-typedef struct {
-  char* path;
-  int depth;
-} DirEntry;
-
-static void dir_entry_destroy(void* item) {
-  if (item) {
-    DirEntry* de = (DirEntry*)item;
-    free(de->path);
-    free(de);
-  }
-}
-
-static DirEntry* dir_entry_create(const char* path, int depth) {
-  DirEntry* de = malloc(sizeof(DirEntry));
-  if (de) {
-    de->path = str_dup(path);
-    de->depth = depth;
-  }
-  return de;
-}
-
-DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata,
+DirectoryScanner* directory_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) {
+                                           unsigned long long min_size) {
+  return directory_scanner_create_full(root_directory, use_metadata, chunk_size,
+                                       exclude_patterns, exclude_count,
+                                       include_patterns, include_count,
+                                       max_size, min_size, true);
+}
+
+DirectoryScanner* directory_scanner_create_full(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, bool follow_symlinks) {
  DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
  if (scanner == NULL)
    return NULL;
-  scanner->directories = queue_create(100, dir_entry_destroy);
+  scanner->directories = queue_create(100, free);
  scanner->current_dir = NULL;
  scanner->current_path = NULL;
  scanner->use_metadata = use_metadata;
  scanner->chunk_size = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
-  scanner->exclude_patterns = exclude_patterns;
+  /* Deep-copy exclude patterns */
+  if (exclude_count > 0 && exclude_patterns != NULL) {
+    scanner->exclude_patterns = malloc((size_t)exclude_count * sizeof(char*));
+    if (scanner->exclude_patterns == NULL) {
+      queue_destroy(scanner->directories);
+      free(scanner);
+      return NULL;
+    }
+    for (int i = 0; i < exclude_count; i++) {
+      scanner->exclude_patterns[i] = str_dup(exclude_patterns[i]);
+      if (scanner->exclude_patterns[i] == NULL) {
+        for (int j = 0; j < i; j++)
+          free(scanner->exclude_patterns[j]);
+        free(scanner->exclude_patterns);
+        queue_destroy(scanner->directories);
+        free(scanner);
+        return NULL;
+      }
+    }
+  } else {
+    scanner->exclude_patterns = NULL;
+  }
  scanner->exclude_count = exclude_count;
-  scanner->include_patterns = include_patterns;
+
+  /* Deep-copy include patterns */
+  if (include_count > 0 && include_patterns != NULL) {
+    scanner->include_patterns = malloc((size_t)include_count * sizeof(char*));
+    if (scanner->include_patterns == NULL) {
+      for (int i = 0; i < exclude_count; i++)
+        free(scanner->exclude_patterns[i]);
+      free(scanner->exclude_patterns);
+      queue_destroy(scanner->directories);
+      free(scanner);
+      return NULL;
+    }
+    for (int i = 0; i < include_count; i++) {
+      scanner->include_patterns[i] = str_dup(include_patterns[i]);
+      if (scanner->include_patterns[i] == NULL) {
+        for (int j = 0; j < i; j++)
+          free(scanner->include_patterns[j]);
+        free(scanner->include_patterns);
+        for (int j = 0; j < exclude_count; j++)
+          free(scanner->exclude_patterns[j]);
+        free(scanner->exclude_patterns);
+        queue_destroy(scanner->directories);
+        free(scanner);
+        return NULL;
+      }
+    }
+  } else {
+    scanner->include_patterns = NULL;
+  }
  scanner->include_count = include_count;
  scanner->max_size = max_size;
  scanner->min_size = min_size;
-  scanner->max_depth = max_depth;
-  scanner->current_depth = 0;
-  queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0));
+  scanner->follow_symlinks = follow_symlinks;
+  queue_enqueue(scanner->directories, str_dup(root_directory));
  return scanner;
 }

@@ -66,6 +103,12 @@ void directory_scanner_destroy(DirectoryScanner* scanner) {
    scanner->current_dir = NULL;
  }
  free(scanner->current_path);
+  for (int i = 0; i < scanner->exclude_count; i++)
+    free(scanner->exclude_patterns[i]);
+  free(scanner->exclude_patterns);
+  for (int i = 0; i < scanner->include_count; i++)
+    free(scanner->include_patterns[i]);
+  free(scanner->include_patterns);
  queue_destroy(scanner->directories);
  free(scanner);
 }
@@ -90,10 +133,7 @@ static int open_next_directory(DirectoryScanner* scanner) {
  if (queue_is_empty(scanner->directories))
    return 0;

-  DirEntry* de = (DirEntry*)queue_dequeue(scanner->directories);
-  scanner->current_path = de->path;
-  scanner->current_depth = de->depth;
-  free(de);
+  scanner->current_path = (char*)queue_dequeue(scanner->directories);
  scanner->current_dir = opendir(scanner->current_path);
  if (scanner->current_dir == NULL) {
    perror("Could not open directory");
@@ -131,22 +171,77 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {

    char* cur_path = path_cat(scanner->current_path, entry->d_name);
    struct stat stats;
-    if (stat(cur_path, &stats) != 0) {
+    // Use lstat to detect symlinks
+    if (lstat(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)
-        queue_enqueue(scanner->directories, dir_entry_create(cur_path, next_depth));
-      else
-        free(cur_path);
-    } else {
-      if (scanner->max_depth > 0 && scanner->current_depth + 1 > scanner->max_depth) {
+    // If follow_symlinks is enabled and this is a symlink, resolve it
+    if (scanner->follow_symlinks && S_ISLNK(stats.st_mode)) {
+      struct stat target_stats;
+      if (stat(cur_path, &target_stats) != 0) {
+        // Broken symlink, skip
        free(cur_path);
        continue;
      }
+      stats = target_stats;
+    }
+
+    if (S_ISDIR(stats.st_mode)) {
+      queue_enqueue(scanner->directories, (void*)cur_path);
+    } else if (S_ISLNK(stats.st_mode)) {
+      // Handle symlink (not following)
+      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;
+        }
+      }
+
+      File* file = file_create(cur_path);
+      if (file == NULL) {
+        free(cur_path);
+        continue;
+      }
+      file->type = FILE_TYPE_SYMLINK;
+      // Read link target
+      char link_buf[4096];
+      ssize_t link_len = readlink(cur_path, link_buf, sizeof(link_buf) - 1);
+      if (link_len >= 0) {
+        link_buf[link_len] = '\0';
+        file->link_target = str_dup(link_buf);
+      }
+      file->data->size = 0;
+      if (scanner->use_metadata)
+        file->metadata = file_metadata_create(&stats);
+      array_list_add(chunk_data, file);
+      chunk_data_size += 1; // small size for symlinks
+      if (chunk_data_size > scanner->chunk_size) {
+        free(cur_path);
+        return chunk_data_to_chunk(chunk_data);
+      }
+      free(cur_path);
+    } else {
      bool excluded = false;
      for (int i = 0; i < scanner->exclude_count; i++) {
        if (glob_match(scanner->exclude_patterns[i], entry->d_name)) {
@@ -18,15 +18,19 @@ typedef struct {
  int include_count;
  unsigned long long max_size;
  unsigned long long min_size;
-  int max_depth;
-  int current_depth;
+  bool follow_symlinks;
 } DirectoryScanner;

-DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_metadata,
+DirectoryScanner* directory_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);
+                                           unsigned long long min_size);
+DirectoryScanner* directory_scanner_create_full(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, bool follow_symlinks);
 Chunk* directory_scanner_next(DirectoryScanner* scanner);
 void directory_scanner_destroy(DirectoryScanner* scanner);

@@ -11,26 +11,53 @@
 #include "transport_tls.h"
 #include "unistd.h"
 #include "utils.h"
+#include <libgen.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+// Check if a file path should be excluded based on config patterns
+static bool is_excluded(const char* path, const Config* config) {
+  // Extract filename from path
+  char* path_dup = str_dup(path);
+  if (!path_dup)
+    return false;
+  char* fname = basename(path_dup);
+
+  // Check exclude patterns
+  for (int i = 0; i < config->exclude_count; i++) {
+    if (glob_match(config->exclude_patterns[i], fname)) {
+      free(path_dup);
+      return true;
+    }
+  }
+
+  // Check include patterns (if any, file must match at least one)
+  if (config->include_count > 0) {
+    bool included = false;
+    for (int i = 0; i < config->include_count; i++) {
+      if (glob_match(config->include_patterns[i], fname)) {
+        included = true;
+        break;
+      }
+    }
+    if (!included) {
+      free(path_dup);
+      return true;
+    }
+  }
+
+  free(path_dup);
+  return false;
+}
+
 int receive_files(Config* config, int fd) {
  Status status;
  if (!receive_status(fd, &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) {
-      send_status(fd, STATUS_KEEPALIVE);
-      goto next;
-    }
-    if (status == STATUS_ABORT) {
-      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
-      return -1;
-    }
+  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK) {
    if (status == STATUS_CHECK) {
      bool skipped;
      File* file = receive_incremental_check(fd, config, &skipped);
@@ -38,8 +65,8 @@ int receive_files(Config* config, int fd) {
        goto next;
      if (file == NULL && !skipped)
        return -1;
-      if (config->save_to_disk)
-        file_save_to_disk(config->receive_root_directory, file, NULL);
+      if (config->save_to_disk && !is_excluded(file->path, config))
+        file_save_to_disk(config->receive_root_directory, file);
      file_destroy(file);
    } else if (status == STATUS_CHUNK) {
      Chunk* chunk = receive_chunk_data(fd, config);
@@ -48,38 +75,10 @@ int receive_files(Config* config, int fd) {
        return -1;
      }
      for (int i = 0; i < chunk->element_count; i++) {
-        if (config->save_to_disk)
-          file_save_to_disk(config->receive_root_directory, chunk->items[i], NULL);
+        if (config->save_to_disk && !is_excluded(chunk->items[i]->path, config))
+          file_save_to_disk(config->receive_root_directory, chunk->items[i]);
      }
      chunk_destroy(chunk);
-    } else if (status == STATUS_CHECK_BATCH) {
-      int count;
-      if (!receive_int(fd, &count))
-        return -1;
-      for (int i = 0; i < count; i++) {
-        char* check_path = receive_str(fd);
-        if (!check_path)
-          return -1;
-        unsigned long long check_size;
-        long long check_mtime;
-        if (!receive_n_data(fd, &check_size, sizeof(check_size)) ||
-            !receive_n_data(fd, &check_mtime, sizeof(check_mtime))) {
-          free(check_path);
-          return -1;
-        }
-        char* full_path = path_cat(config->receive_root_directory, check_path);
-        struct stat st;
-        bool has_old = full_path && stat(full_path, &st) == 0;
-        bool match = has_old && (unsigned long long)st.st_size == check_size &&
-                     (long long)st.st_mtime == check_mtime;
-        if (match)
-          send_status(fd, STATUS_OK);
-        else
-          send_status(fd, STATUS_NEXT);
-        free(full_path);
-        free(check_path);
-      }
-      goto next;
    } else {
      File* file = file_receive(config, fd);
      if (file == NULL) {
@@ -87,8 +86,8 @@ int receive_files(Config* config, int fd) {
        send_status(fd, STATUS_ERROR);
        return -1;
      }
-      if (config->save_to_disk)
-        file_save_to_disk(config->receive_root_directory, file, NULL);
+      if (config->save_to_disk && !is_excluded(file->path, config))
+        file_save_to_disk(config->receive_root_directory, file);
      file_destroy(file);
    }
  next:
@@ -1,7 +1,8 @@
 #include "compression.h"
 #include "data.h"
 #include "log.h"
-#include "stdlib.h"
+#include <stdint.h>
+#include <stdlib.h>
 #include "zstd.h"

 #define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
@@ -66,8 +67,16 @@ Data* data_decompress(Data* compressed_data) {
    return NULL;
  }

-  size_t buf_size =
-      (!ZSTD_isError(dst_size) && dst_size > 0) ? (size_t)dst_size : INITIAL_DECOMPRESS_BUF_SIZE;
+  size_t buf_size = INITIAL_DECOMPRESS_BUF_SIZE;
+  if (!ZSTD_isError(dst_size) && dst_size > 0) {
+    if (dst_size > SIZE_MAX) {
+      log_message(LOG_LEVEL_ERROR,
+                  "Decompressed size %llu exceeds addressable memory, using fallback buffer",
+                  dst_size);
+    } else {
+      buf_size = (size_t)dst_size;
+    }
+  }
  Data* uncompressed_data = data_create_empty(buf_size);
  if (!uncompressed_data) {
    log_message(LOG_LEVEL_ERROR, "Failed to allocate decompression buffer");
@@ -45,17 +45,10 @@ Config* config_create(char* version, char* send_directory, char* receive_directo
  config->tls_cert = NULL;
  config->tls_key = NULL;
  config->tls_ca = NULL;
+  config->follow_symlinks = false;
+  config->partial = false;
  config->server_host = str_dup("127.0.0.1");
  config->server_port = 8080;
-  config->timeout = 30;
-  config->contimeout = 10;
-  config->quiet = false;
-  config->backup = false;
-  config->backup_dir = NULL;
-  config->stats = false;
-  config->max_depth = 0;
-  config->log_file = NULL;
-  config->queue_size = 100;
  return config;
 }

@@ -99,7 +92,6 @@ void config_delete(Config* config) {
  free(config->tls_cert);
  free(config->tls_key);
  free(config->tls_ca);
-  free(config->backup_dir);
  free(config->server_host);
  free(config);
 }
@@ -137,9 +129,25 @@ bool config_send(int file_descriptor, const Config* config) {
    return false;
  if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
    return false;
-  if (!send_int(file_descriptor, config->backup))
+  if (!send_int(file_descriptor, config->exclude_count))
    return false;
-  if (!send_str(file_descriptor, config->backup_dir ? config->backup_dir : ""))
+  for (int i = 0; i < config->exclude_count; i++) {
+    if (!send_str(file_descriptor, config->exclude_patterns[i]))
+      return false;
+  }
+  if (!send_int(file_descriptor, config->include_count))
+    return false;
+  for (int i = 0; i < config->include_count; i++) {
+    if (!send_str(file_descriptor, config->include_patterns[i]))
+      return false;
+  }
+  if (!send_n_data(file_descriptor, &config->max_size, sizeof(config->max_size)))
+    return false;
+  if (!send_n_data(file_descriptor, &config->min_size, sizeof(config->min_size)))
+    return false;
+  if (!send_int(file_descriptor, config->follow_symlinks))
+    return false;
+  if (!send_int(file_descriptor, config->partial))
    return false;
  Status status;
  if (!receive_status(file_descriptor, &status))
@@ -235,19 +243,70 @@ Config* config_receive(int file_descriptor) {
  config->tls_cert = NULL;
  config->tls_key = NULL;
  config->tls_ca = NULL;
-  config->timeout = 30;
-  config->contimeout = 10;
-  config->quiet = false;
-  config->stats = false;
-  config->max_depth = 0;
-  config->log_file = NULL;
-  config->queue_size = 100;
-  if (!receive_int(file_descriptor, &tmp))
+  config->follow_symlinks = false;
+  config->partial = false;
+
+  // Receive exclude patterns
+  int ec;
+  if (!receive_int(file_descriptor, &ec))
    goto error;
-  config->backup = tmp;
-  config->backup_dir = receive_str(file_descriptor);
-  if (config->backup_dir == NULL)
+  config->exclude_count = ec;
+  if (ec > 0) {
+    config->exclude_patterns = malloc((size_t)ec * sizeof(char*));
+    if (!config->exclude_patterns) {
+      config->exclude_count = 0;
      goto error;
+    }
+    for (int i = 0; i < ec; i++) {
+      config->exclude_patterns[i] = receive_str(file_descriptor);
+      if (!config->exclude_patterns[i]) {
+        for (int j = 0; j < i; j++)
+          free(config->exclude_patterns[j]);
+        free(config->exclude_patterns);
+        config->exclude_patterns = NULL;
+        config->exclude_count = 0;
+        goto error;
+      }
+    }
+  }
+
+  // Receive include patterns
+  int ic;
+  if (!receive_int(file_descriptor, &ic))
+    goto error;
+  config->include_count = ic;
+  if (ic > 0) {
+    config->include_patterns = malloc((size_t)ic * sizeof(char*));
+    if (!config->include_patterns) {
+      config->include_count = 0;
+      goto error;
+    }
+    for (int i = 0; i < ic; i++) {
+      config->include_patterns[i] = receive_str(file_descriptor);
+      if (!config->include_patterns[i]) {
+        for (int j = 0; j < i; j++)
+          free(config->include_patterns[j]);
+        free(config->include_patterns);
+        config->include_patterns = NULL;
+        config->include_count = 0;
+        goto error;
+      }
+    }
+  }
+
+  if (!receive_n_data(file_descriptor, &config->max_size, sizeof(config->max_size)))
+    goto error;
+  if (!receive_n_data(file_descriptor, &config->min_size, sizeof(config->min_size)))
+    goto error;
+  int tmp_follow;
+  if (!receive_int(file_descriptor, &tmp_follow))
+    goto error;
+  config->follow_symlinks = tmp_follow;
+  int tmp_partial;
+  if (!receive_int(file_descriptor, &tmp_partial))
+    goto error;
+  config->partial = tmp_partial;
+
  config->server_host = str_dup("127.0.0.1");
  config->server_port = 8080;
  if (!send_status(file_descriptor, STATUS_OK))
@@ -3,7 +3,6 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>

 typedef enum { TRANSPORT_TCP, TRANSPORT_SSH } TransportType;

@@ -41,15 +40,8 @@ typedef struct Config {
  char* tls_cert;
  char* tls_key;
  char* tls_ca;
-  int timeout;
-  int contimeout;
-  bool quiet;
-  bool backup;
-  char* backup_dir;
-  bool stats;
-  int max_depth;
-  FILE* log_file;
-  int queue_size;
+  bool follow_symlinks;
+  bool partial;
 } Config;

 #define PROTOCOL_VERSION "1.3.0"
@@ -3,7 +3,9 @@
 #include "stdlib.h"

 Data* data_create_empty(size_t data_size) {
-  void* data = malloc(data_size);
+  /* malloc(0) is UB; allocate at least 1 byte but preserve requested size */
+  size_t alloc_size = data_size > 0 ? data_size : 1;
+  void* data = malloc(alloc_size);
  if (data == NULL) {
    log_message(LOG_LEVEL_ERROR, "Could not allocate memory for empty data");
    return NULL;
@@ -108,12 +108,7 @@ DeltaSignature* delta_signature_deserialize(const Data* data) {
    return NULL;
  }

-  uint64_t blocks_size = (uint64_t)sig->block_count * sizeof(DeltaBlockSig);
-  if (blocks_size > SIZE_MAX) {
-    free(sig);
-    return NULL;
-  }
-  sig->blocks = malloc((size_t)blocks_size);
+  sig->blocks = malloc(sig->block_count * sizeof(DeltaBlockSig));
  if (!sig->blocks) {
    free(sig);
    return NULL;
@@ -1,5 +1,4 @@
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <stddef.h>
@@ -21,6 +20,9 @@
 #include "protocol.h"
 #include "utils.h"

+#define STREAM_THRESHOLD (64ULL * 1024 * 1024)  /* 64 MB */
+#define STREAM_CHUNK_SIZE (1ULL * 1024 * 1024)  /* 1 MB */
+
 File* file_create(const char* path) {
  File* file = (File*)malloc(sizeof(File));
  if (file == NULL) {
@@ -43,7 +45,8 @@ File* file_create(const char* path) {
    return NULL;
  }
  file->metadata = NULL;
-  file->skip = false;
+  file->type = FILE_TYPE_REGULAR;
+  file->link_target = NULL;
  return file;
 }

@@ -57,6 +60,8 @@ void file_destroy(void* item) {
  file->metadata = NULL;
  free(file->path);
  file->path = NULL;
+  free(file->link_target);
+  file->link_target = NULL;
  free(file);
 }

@@ -85,6 +90,14 @@ void file_metadata_destroy(void* metadata) {
 bool file_load_data(File* file) {
  if (file == NULL)
    return false;
+  // Symlinks have no data to load
+  if (file->type == FILE_TYPE_SYMLINK)
+    return true;
+  // For streaming files, just record the size, don't load into memory
+  if (file->data->size > STREAM_THRESHOLD) {
+    // Don't allocate; streaming will read directly from disk
+    return true;
+  }
  if (file->data->data == NULL) {
    file->data->data = malloc(file->data->size);
    if (file->data->data == NULL) {
@@ -100,10 +113,69 @@ bool file_load_data(File* file) {
  return true;
 }

+// Stream file content in chunks without loading entire file into RAM
+static bool file_send_streaming(File* file, int file_descriptor) {
+  unsigned long long total_size = file->data->size;
+  // Send total size prefix (same wire format as send_data)
+  if (!send_n_data(file_descriptor, &total_size, sizeof(total_size)))
+    return false;
+
+  FILE* fp = fopen(file->path, "rb");
+  if (!fp) {
+    perror("Could not open file for streaming");
+    return false;
+  }
+
+  char buf[STREAM_CHUNK_SIZE];
+  unsigned long long remaining = total_size;
+  while (remaining > 0) {
+    size_t to_read = (size_t)((remaining < STREAM_CHUNK_SIZE) ? remaining : STREAM_CHUNK_SIZE);
+    size_t nread = fread(buf, 1, to_read, fp);
+    if (nread != to_read) {
+      if (ferror(fp)) {
+        perror("Read error during streaming");
+      }
+      fclose(fp);
+      return false;
+    }
+    if (!send_n_data(file_descriptor, buf, nread)) {
+      fclose(fp);
+      return false;
+    }
+    remaining -= (unsigned long long)nread;
+  }
+  fclose(fp);
+  return true;
+}
+
 bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
                            int compression_level, bool send_path) {
+  if (send_path && !send_str(file_descriptor, file->path))
+    return false;
+  if (use_metadata && !metadata_send(file_descriptor, file->metadata))
+    return false;
+
+  // Send file type indicator so receiver can distinguish regular from symlink
+  int ft = (int)file->type;
+  if (!send_int(file_descriptor, ft))
+    return false;
+
+  if (file->type == FILE_TYPE_SYMLINK) {
+    // Send link target, then zero-length data
+    if (!send_str(file_descriptor, file->link_target ? file->link_target : ""))
+      return false;
+    Data empty = {NULL, 0};
+    return send_data(file_descriptor, &empty);
+  }
+
  const Data* data_to_send = file->data;
  Data* compressed_data = NULL;
+
+  // Streaming mode: for large files without compression, stream from disk
+  if (file->data->size > STREAM_THRESHOLD && compression_level == 0) {
+    return file_send_streaming(file, file_descriptor);
+  }
+
  if (compression_level > 0) {
    compressed_data = data_compress(file->data, compression_level);
    if (compressed_data == NULL) {
@@ -112,14 +184,6 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
    }
    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;
@@ -128,12 +192,19 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
  return true;
 }

-bool file_save_to_disk(const char* root_directory, File* file, const Config* config) {
-  (void)config;
-  if (has_path_traversal(file->path)) {
-    log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path);
+bool file_save_to_disk(const char* root_directory, File* file) {
+  if (file->type == FILE_TYPE_SYMLINK && file->link_target) {
+    char* disk_path = path_cat((char*)root_directory, file->path);
+    if (disk_path == NULL)
      return false;
+    unlink(disk_path);
+    bool ok = (symlink(file->link_target, disk_path) == 0);
+    if (ok && file->metadata)
+      file_restore_metadata(disk_path, file->metadata);
+    free(disk_path);
+    return ok;
  }
+
  char* disk_path = path_cat((char*)root_directory, file->path);
  if (disk_path == NULL)
    return false;
@@ -332,18 +403,23 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
    return NULL;
  }

-  if (has_path_traversal(check_path)) {
-    log_message(LOG_LEVEL_ERROR, "Path traversal detected: %s", check_path);
-    free(check_path);
-    send_status(fd, STATUS_ERROR);
-    return NULL;
-  }
-
  char* full_path = path_cat(config->receive_root_directory, check_path);
  struct stat st;
  bool has_old_file = (full_path && stat(full_path, &st) == 0);
  unsigned long long old_size = has_old_file ? (unsigned long long)st.st_size : 0;

+  // Check for partial file if enabled
+  if (config->partial && !has_old_file && full_path) {
+    char* partial_path = malloc(strlen(full_path) + 20);
+    if (partial_path) {
+      sprintf(partial_path, "%s.fastsync-partial", full_path);
+      has_old_file = (stat(partial_path, &st) == 0);
+      if (has_old_file)
+        old_size = (unsigned long long)st.st_size;
+      free(partial_path);
+    }
+  }
+
  bool match = has_old_file && (unsigned long long)st.st_size == check_size &&
               (long long)st.st_mtime == check_mtime;

@@ -399,6 +475,26 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
    }
  }

+  // Read file type indicator
+  int file_type;
+  if (!receive_int(fd, &file_type)) {
+    file_destroy(file);
+    send_status(fd, STATUS_ERROR);
+    return NULL;
+  }
+  file->type = (FileType)file_type;
+
+  if (file->type == FILE_TYPE_SYMLINK) {
+    char* link_target = receive_str(fd);
+    if (link_target) {
+      file->link_target = link_target;
+    }
+    Data* empty_data = receive_data(fd);
+    if (empty_data)
+      data_destroy(empty_data);
+    return file;
+  }
+
  Data* file_data = receive_data(fd);
  if (file_data == NULL) {
    file_destroy(file);
@@ -423,68 +519,51 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
 }

 bool to_disk(const char* path, const void* data, unsigned long long data_size) {
-  char* tmp_path = NULL;
-  char* directory = NULL;
-
+  // dirname() may modify its argument and may return a pointer to static storage.
+  // We must use a copy of the result to be safe.
  char* path_dup = str_dup(path);
  if (!path_dup)
    return false;
  const char* dir_result = dirname(path_dup);
-  directory = str_dup(dir_result);
+  char* directory = str_dup(dir_result);
  free(path_dup);
  if (!directory)
    return false;

  bool ok = true;
-  if (!mkdir_r(directory))
-    goto done;
-
-  size_t path_len = strlen(path);
-  tmp_path = malloc(path_len + 5);
-  if (!tmp_path) {
+  if (!mkdir_r(directory)) {
    ok = false;
    goto done;
  }
-  memcpy(tmp_path, path, path_len);
-  memcpy(tmp_path + path_len, ".tmp", 5);
-
-  FILE* file_pointer = fopen(tmp_path, "wb");
+  FILE* file_pointer = fopen(path, "wb");
  if (file_pointer == NULL) {
-    perror("Could not open temporary file");
+    perror("Could not open File");
    ok = false;
    goto done;
  }
  if (fwrite(data, 1, data_size, file_pointer) != data_size) {
-    perror("Failed to write all data to temporary file");
+    perror("Failed to write all data to disk");
    fclose(file_pointer);
-    unlink(tmp_path);
    ok = false;
    goto done;
  }
  fclose(file_pointer);

-  if (rename(tmp_path, path) != 0) {
-    perror("Failed to atomically rename temporary file");
-    unlink(tmp_path);
-    ok = false;
-    goto done;
-  }
-
 done:
-  free(tmp_path);
  free(directory);
  return ok;
 }

 bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
                        bool send_path) {
+  // Handle symlinks
+  if (file->type == FILE_TYPE_SYMLINK) {
+    return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
+                                  send_path);
+  }
+
  // sendfile is incompatible with compression (kernel zero-copy).
  // If compression is requested, fall back to the regular send path.
-  // NOTE: This is a safety net only — callers must ensure compression_level == 0
-  // before calling file_send_sendfile. The fallback to file_send_single_calls
-  // preserves the send_path contract, but callers should not rely on it for
-  // correctness (the --sendfile flag is validated to be mutually exclusive with
-  // -c/--compress at the CLI layer).
  if (compression_level > 0)
    return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
                                  send_path);
@@ -494,6 +573,11 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
  if (use_metadata && !metadata_send(file_descriptor, file->metadata))
    return false;

+  // Send file type indicator
+  int ft = (int)file->type;
+  if (!send_int(file_descriptor, ft))
+    return false;
+
  int fd = open(file->path, O_RDONLY);
  if (fd == -1) {
    perror("Could not open file for sendfile");
@@ -536,6 +620,30 @@ File* file_receive(const Config* config, int file_descriptor) {
      return NULL;
    }
  }
+
+  // Receive file type indicator
+  int file_type;
+  if (!receive_int(file_descriptor, &file_type)) {
+    file_destroy(file);
+    return NULL;
+  }
+  file->type = (FileType)file_type;
+
+  if (file->type == FILE_TYPE_SYMLINK) {
+    char* link_target = receive_str(file_descriptor);
+    if (link_target == NULL) {
+      file_destroy(file);
+      return NULL;
+    }
+    file->link_target = link_target;
+    // Receive and discard zero-length data
+    Data* empty_data = receive_data(file_descriptor);
+    if (empty_data)
+      data_destroy(empty_data);
+    return file;
+  }
+
+  // Regular file - receive data
  Data* file_data = receive_data(file_descriptor);
  if (file_data == NULL) {
    file_destroy(file);
@@ -550,6 +658,7 @@ File* file_receive(const Config* config, int file_descriptor) {
    }
    file_data = file_data_uncompressed;
  }
+
  data_destroy(file->data);
  file->data = file_data;
  return file;
@@ -6,6 +6,8 @@
 #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;
@@ -18,7 +20,8 @@ typedef struct {
  char* path;
  Data* data;
  FileMetadata* metadata;
-  bool skip;
+  FileType type;
+  char* link_target;
 } File;

 File* file_create(const char* path);
@@ -33,7 +36,7 @@ size_t file_content_to_buffer(File* file);
 FileMetadata* file_metadata_create(const struct stat* stats);
 void file_metadata_destroy(void* metadata);
 bool to_disk(const char* path, const void* data, unsigned long long data_size);
-bool file_save_to_disk(const char* root_directory, File* file, const Config* config);
+bool file_save_to_disk(const char* root_directory, File* file);
 File* receive_incremental_check(int fd, const Config* config, bool* skipped);
 int receive_manifest(int fd, const Config* config, int* next_status);

@@ -5,16 +5,11 @@

 static const char* log_level_strings[] = {"DEBUG", "INFO", "WARN", "ERROR"};
 static LogLevel current_log_level = LOG_LEVEL_WARNING;
-static FILE* log_fp = NULL;

 void set_log_level(LogLevel level) {
  current_log_level = level;
 }

-void log_set_file(FILE* fp) {
-  log_fp = fp;
-}
-
 void log_message(LogLevel log_level, char* format, ...) {
  if (log_level < current_log_level)
    return;
@@ -29,14 +24,4 @@ void log_message(LogLevel log_level, char* format, ...) {
  vfprintf(stderr, format, args);
  va_end(args);
  fprintf(stderr, "\n");
-
-  if (log_fp) {
-    fprintf(log_fp, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900, t->tm_mon + 1,
-            t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, log_level_strings[log_level]);
-    va_start(args, format);
-    vfprintf(log_fp, format, args);
-    va_end(args);
-    fprintf(log_fp, "\n");
-    fflush(log_fp);
-  }
 }
@@ -1,12 +1,9 @@
 #ifndef LOG_H
 #define LOG_H

-#include <stdio.h>
-
 typedef enum { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR } LogLevel;

 void log_message(LogLevel log_level, char* message, ...);
 void set_log_level(LogLevel level);
-void log_set_file(FILE* fp);

 #endif
@@ -105,16 +105,7 @@ int receive_thread(void* pipeline_context) {
  Status status;
  if (!receive_status(file_descriptor, &status))
    return thrd_error;
-  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK ||
-         status == STATUS_KEEPALIVE || status == STATUS_ABORT || status == STATUS_CHECK_BATCH) {
-    if (status == STATUS_KEEPALIVE) {
-      send_status(file_descriptor, STATUS_KEEPALIVE);
-      goto next;
-    }
-    if (status == STATUS_ABORT) {
-      log_message(LOG_LEVEL_INFO, "Received abort from client, cleaning up");
-      return thrd_error;
-    }
+  while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK) {
    if (status == STATUS_CHECK) {
      bool skipped;
      File* file = receive_incremental_check(file_descriptor, config, &skipped);
@@ -126,34 +117,6 @@ int receive_thread(void* pipeline_context) {
      }
    } else if (status == STATUS_CHUNK) {
      receive_chunk_enqueue(file_descriptor, context);
-    } else if (status == STATUS_CHECK_BATCH) {
-      int count;
-      if (!receive_int(file_descriptor, &count))
-        return thrd_error;
-      for (int i = 0; i < count; i++) {
-        char* check_path = receive_str(file_descriptor);
-        if (!check_path)
-          return thrd_error;
-        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 thrd_error;
-        }
-        char* full_path = path_cat(config->receive_root_directory, check_path);
-        struct stat st;
-        bool has_old = full_path && stat(full_path, &st) == 0;
-        bool match = has_old && (unsigned long long)st.st_size == check_size &&
-                     (long long)st.st_mtime == check_mtime;
-        if (match)
-          send_status(file_descriptor, STATUS_OK);
-        else
-          send_status(file_descriptor, STATUS_NEXT);
-        free(full_path);
-        free(check_path);
-      }
-      goto next;
    } else {
      File* file = file_receive(config, file_descriptor);
      if (file) {
@@ -163,7 +126,6 @@ int receive_thread(void* pipeline_context) {
        log_message(LOG_LEVEL_ERROR, "Failed to receive file");
      }
    }
-  next:
    if (!receive_status(file_descriptor, &status))
      return thrd_error;
  }
@@ -194,7 +156,7 @@ int write_thread(void* pipeline_context) {
      return thrd_success;
    }
    if (save_to_disk)
-      file_save_to_disk(root_directory, file, context->config);
+      file_save_to_disk(root_directory, file);
    file_destroy(file);
  }
 }
@@ -8,10 +8,6 @@
 #include <time.h>
 #include <unistd.h>

-#define MAX_DATA_SIZE (256ULL * 1024 * 1024)          /* 256 MB max per message */
-#define RECEIVE_TIMEOUT_SEC 60                        /* 60 second per-message timeout */
-#define MAX_CONNECTION_MEMORY (1024ULL * 1024 * 1024) /* 1 GB total per connection */
-
 static __thread int io_read_fd = -1;
 static __thread int io_write_fd = -1;
 static SSL* io_ssl = NULL;
@@ -20,8 +16,6 @@ static unsigned long long io_bwlimit = 0;
 static long long bw_tokens = 0;
 static struct timespec bw_last_refill = {0, 0};

-static __thread unsigned long long total_allocated_bytes = 0;
-
 void io_set_fds(int read_fd, int write_fd) {
  io_read_fd = read_fd;
  io_write_fd = write_fd;
@@ -98,21 +92,8 @@ 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) {
  log_message(LOG_LEVEL_DEBUG, "    Receiving n Data: %zu", data_size);
  int fd = io_fd(io_read_fd, file_descriptor);
-
-  struct timespec deadline;
-  clock_gettime(CLOCK_MONOTONIC, &deadline);
-  deadline.tv_sec += RECEIVE_TIMEOUT_SEC;
-
  size_t total_bytes_received = 0;
  while (total_bytes_received < data_size) {
-    struct timespec now;
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    if (now.tv_sec > deadline.tv_sec ||
-        (now.tv_sec == deadline.tv_sec && now.tv_nsec > deadline.tv_nsec)) {
-      log_message(LOG_LEVEL_ERROR, "Receive timeout after %ds", RECEIVE_TIMEOUT_SEC);
-      return false;
-    }
-
    ssize_t bytes_received;
    if (io_ssl)
      bytes_received =
@@ -151,18 +132,16 @@ static const char* status_to_string(Status status) {
    return "DELTA_SIGNATURE";
  case STATUS_DELTA_DATA:
    return "DELTA_DATA";
-  case STATUS_KEEPALIVE:
-    return "KEEPALIVE";
-  case STATUS_ABORT:
-    return "ABORT";
-  case STATUS_CHECK_BATCH:
-    return "CHECK_BATCH";
  default:
    return "UNKNOWN";
  }
 }

 bool send_str(int file_descriptor, const char* data) {
+  if (data == NULL) {
+    log_message(LOG_LEVEL_ERROR, "send_str called with NULL data");
+    return false;
+  }
  size_t size = strlen(data);
  if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
    return false;
@@ -176,9 +155,9 @@ char* receive_str(int file_descriptor) {
  size_t size;
  if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
    return NULL;
-  if (size > MAX_DATA_SIZE) {
-    log_message(LOG_LEVEL_ERROR, "String size %zu exceeds maximum %llu", size,
-                (unsigned long long)MAX_DATA_SIZE);
+  if (size > MAX_STRING_SIZE) {
+    log_message(LOG_LEVEL_ERROR, "receive_str: size %zu exceeds maximum %zu", size,
+                (size_t)MAX_STRING_SIZE);
    return NULL;
  }
  char* data = (char*)malloc(size + 1);
@@ -207,17 +186,6 @@ Data* receive_data(int file_descriptor) {
  unsigned long long size = 0;
  if (!receive_n_data(file_descriptor, &size, sizeof(unsigned long long)))
    return NULL;
-  if (size > MAX_DATA_SIZE) {
-    log_message(LOG_LEVEL_ERROR, "Data size %llu exceeds maximum %llu", size,
-                (unsigned long long)MAX_DATA_SIZE);
-    return NULL;
-  }
-  if (total_allocated_bytes + size > MAX_CONNECTION_MEMORY) {
-    log_message(LOG_LEVEL_ERROR, "Per-connection memory limit exceeded (%llu + %llu > %llu)",
-                (unsigned long long)total_allocated_bytes, size,
-                (unsigned long long)MAX_CONNECTION_MEMORY);
-    return NULL;
-  }
  void* data = malloc((size_t)size);
  if (data == NULL)
    return NULL;
@@ -225,7 +193,6 @@ Data* receive_data(int file_descriptor) {
    free(data);
    return NULL;
  }
-  total_allocated_bytes += size;
  log_message(LOG_LEVEL_DEBUG, "Received %lld data", size);
  return data_create(data, (size_t)size);
 }
@@ -5,6 +5,9 @@
 #include <stdbool.h>
 #include <stddef.h>

+/* Maximum allowed string size for receive_str (10 MB) */
+#define MAX_STRING_SIZE (10 * 1024 * 1024)
+
 typedef struct ssl_st SSL;

 typedef int Status;
@@ -17,10 +20,7 @@ enum NET_STATUS {
  STATUS_MANIFEST,
  STATUS_CHECK,
  STATUS_DELTA_SIGNATURE,
-  STATUS_DELTA_DATA,
-  STATUS_KEEPALIVE,
-  STATUS_ABORT,
-  STATUS_CHECK_BATCH
+  STATUS_DELTA_DATA
 };

 void io_set_fds(int read_fd, int write_fd);
@@ -118,20 +118,16 @@ Client* client_connect_ssh(const char* destination, int port) {
    if (sv[1] > 1)
      close(sv[1]);

-    size_t ssh_user_len;
+    char ssh_user[512];
    if (r.user && r.user[0] != '\0')
-      ssh_user_len = strlen(r.user) + 1 + strlen(r.host) + 1;
+      snprintf(ssh_user, sizeof(ssh_user), "%s@%s", r.user, r.host);
    else
-      ssh_user_len = strlen(r.host) + 1;
-    char* ssh_user = malloc(ssh_user_len);
-    if (!ssh_user)
-      _exit(1);
-    if (r.user && r.user[0] != '\0')
-      snprintf(ssh_user, ssh_user_len, "%s@%s", r.user, r.host);
-    else
-      snprintf(ssh_user, ssh_user_len, "%s", r.host);
+      snprintf(ssh_user, sizeof(ssh_user), "%s", r.host);

-    char* ssh_argv[16];
+    size_t ssh_argv_max = 32;
+    char** ssh_argv = calloc(ssh_argv_max, sizeof(char*));
+    if (ssh_argv == NULL)
+      _exit(1);
    int ac = 0;
    char port_str[16];
    ssh_argv[ac++] = "ssh";
@@ -142,15 +138,24 @@ Client* client_connect_ssh(const char* destination, int port) {
    ssh_argv[ac++] = "-o";
    ssh_argv[ac++] = "ControlPath=~/.cache/fastsync-%r@%h:%p";
    if (port > 0 && port != 22) {
+      if ((size_t)ac + 2 >= ssh_argv_max) {
+        free(ssh_argv);
+        _exit(1);
+      }
      ssh_argv[ac++] = "-p";
      snprintf(port_str, sizeof(port_str), "%d", port);
      ssh_argv[ac++] = port_str;
    }
+    if ((size_t)ac + 3 >= ssh_argv_max) {
+      free(ssh_argv);
+      _exit(1);
+    }
    ssh_argv[ac++] = ssh_user;
    ssh_argv[ac++] = "fastsync-server";
    ssh_argv[ac++] = "--stdio";
    ssh_argv[ac] = NULL;
    execvp("ssh", ssh_argv);
+    free(ssh_argv);
    perror("exec of ssh failed");
    ssize_t wret = write(exec_pipe[1], "x", 1);
    (void)wret;
@@ -181,7 +186,7 @@ Client* client_connect_ssh(const char* destination, int port) {
    return NULL;
  }
  client->file_descriptor = sv[0];
-  client->address.sin_family = AF_UNIX;
+  client->address.ss_family = AF_UNIX;
  client->address_length = 0;
  client->ssh_child_pid = pid;
  client->ssl = NULL;
@@ -2,26 +2,36 @@
 #include "log.h"
 #include "protocol.h"
 #include <arpa/inet.h>
-#include <errno.h>
+#include <netdb.h>
 #include <openssl/ssl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

-static volatile unsigned int g_active_connections = 0;
+bool set_socket_timeouts(int fd) {
+  struct timeval tv;
+  tv.tv_sec = 30;
+  tv.tv_usec = 0;

-static void sigchld_handler(int sig) {
-  (void)sig;
-  int saved_errno = errno;
-  while (waitpid(-1, NULL, WNOHANG) > 0) {
-    if (g_active_connections > 0)
-      g_active_connections--;
+  int keepalive = 1;
+  if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive)) < 0) {
+    perror("Could not set SO_KEEPALIVE");
+    return false;
  }
-  errno = saved_errno;
+  if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
+    perror("Could not set SO_RCVTIMEO");
+    return false;
+  }
+  if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) {
+    perror("Could not set SO_SNDTIMEO");
+    return false;
+  }
+  return true;
 }

 Server* server_create(int port) {
@@ -30,14 +40,26 @@ Server* server_create(int port) {
    perror("Could not allocate space for Server");
    return NULL;
  }
+  memset(&server->address, 0, sizeof(server->address));

-  int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
-  if (file_descriptor < 0) {
+  // Try IPv6 first, fall back to IPv4
+  int fd = socket(AF_INET6, SOCK_STREAM, 0);
+  if (fd < 0) {
+    fd = socket(AF_INET, SOCK_STREAM, 0);
+  }
+  if (fd < 0) {
    perror("Could not create Socket!");
    free(server);
    return NULL;
  }
-  server->file_descriptor = file_descriptor;
+
+  if (!set_socket_timeouts(fd)) {
+    close(fd);
+    free(server);
+    return NULL;
+  }
+
+  server->file_descriptor = fd;
  int opt = 1;
  if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) {
    perror("Error setting a socket option!");
@@ -46,21 +68,64 @@ Server* server_create(int port) {
    return NULL;
  }

-  server->address.sin_family = AF_INET;
-  server->address.sin_addr.s_addr = INADDR_ANY;
-  server->address.sin_port = htons(port);
-  server->address_length = sizeof(server->address);
-  server->ssl_ctx = NULL;
-  server->max_connections = 100;
-  server->active_connections = 0;
+  // Determine address family from the actual socket
+  struct sockaddr_storage* addr = &server->address;
+  socklen_t addr_len = sizeof(*addr);
+  if (getsockname(fd, (struct sockaddr*)addr, &addr_len) == 0) {
+    // Use the family of the socket we actually created
+  }
+
+  struct sockaddr_in* addr4 = (struct sockaddr_in*)addr;
+  struct sockaddr_in6* addr6 = (struct sockaddr_in6*)addr;
+
+  if (addr->ss_family == AF_INET6) {
+    addr6->sin6_family = AF_INET6;
+    addr6->sin6_addr = in6addr_any;
+    addr6->sin6_port = htons(port);
+    server->address_length = sizeof(struct sockaddr_in6);
+  } else {
+    addr4->sin_family = AF_INET;
+    addr4->sin_addr.s_addr = INADDR_ANY;
+    addr4->sin_port = htons(port);
+    server->address_length = sizeof(struct sockaddr_in);
+  }

  if (bind(server->file_descriptor, (struct sockaddr*)&server->address, server->address_length) <
      0) {
+    // If IPv6 bind failed (maybe no IPv6), try IPv4
+    if (addr->ss_family == AF_INET6) {
+      close(fd);
+      fd = socket(AF_INET, SOCK_STREAM, 0);
+      if (fd < 0) {
+        perror("Could not create IPv4 Socket!");
+        free(server);
+        return NULL;
+      }
+      if (!set_socket_timeouts(fd)) {
+        close(fd);
+        free(server);
+        return NULL;
+      }
+      server->file_descriptor = fd;
+      setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
+      memset(addr, 0, sizeof(*addr));
+      addr4->sin_family = AF_INET;
+      addr4->sin_addr.s_addr = INADDR_ANY;
+      addr4->sin_port = htons(port);
+      server->address_length = sizeof(struct sockaddr_in);
+      if (bind(server->file_descriptor, (struct sockaddr*)addr, server->address_length) < 0) {
        perror("Could not bind server");
        close(server->file_descriptor);
        free(server);
        return NULL;
      }
+    } else {
+      perror("Could not bind server");
+      close(server->file_descriptor);
+      free(server);
+      return NULL;
+    }
+  }

  return server;
 }
@@ -83,21 +148,16 @@ static void accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
    perror("Could not listen on port!");
    return;
  }
-  signal(SIGCHLD, sigchld_handler);
+  signal(SIGCHLD, SIG_IGN);
  while (1) {
-    struct sockaddr_in client_addr;
+    struct sockaddr_storage client_addr;
    socklen_t client_len = sizeof(client_addr);
    int fd = accept(server->file_descriptor, (struct sockaddr*)&client_addr, &client_len);
    if (fd < 0) {
      perror("Could not accept the connection");
      continue;
    }
-    if (g_active_connections >= server->max_connections) {
-      log_message(LOG_LEVEL_WARNING, "Max connections (%u) reached, rejecting",
-                  server->max_connections);
-      close(fd);
-      continue;
-    }
+    set_socket_timeouts(fd);
    log_message(LOG_LEVEL_INFO, "%s", log_fmt);
    pid_t pid = fork();
    if (pid == 0) {
@@ -105,8 +165,6 @@ static void accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
      child_fn(fd, child_ctx);
      close(fd);
      _exit(0);
-    } else if (pid > 0) {
-      g_active_connections++;
    }
    close(fd);
  }
@@ -121,7 +179,11 @@ static void plain_child_fn(int fd, void* ctx) {
 }

 bool server_listen(Server* server, void (*handler)(int file_descriptor)) {
-  log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d", ntohs(server->address.sin_port));
+  struct sockaddr_in* addr4 = (struct sockaddr_in*)&server->address;
+  int port = (server->address.ss_family == AF_INET6)
+                 ? ntohs(((struct sockaddr_in6*)&server->address)->sin6_port)
+                 : ntohs(addr4->sin_port);
+  log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d", port);
  struct plain_ctx ctx = {handler};
  accept_loop(server, plain_child_fn, &ctx, "Received Connection");
  return true;
@@ -129,43 +191,23 @@ bool server_listen(Server* server, void (*handler)(int file_descriptor)) {

 void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
                        const char* log_fmt) {
-  log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d", ntohs(server->address.sin_port));
+  struct sockaddr_in* addr4 = (struct sockaddr_in*)&server->address;
+  int port = (server->address.ss_family == AF_INET6)
+                 ? ntohs(((struct sockaddr_in6*)&server->address)->sin6_port)
+                 : ntohs(addr4->sin_port);
+  log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d", port);
  accept_loop(server, child_fn, child_ctx, log_fmt);
 }

-static int g_timeout_sec = 30;
-static int g_contimeout_sec = 10;
-
-void tcp_set_timeouts(int timeout_sec, int contimeout_sec) {
-  if (timeout_sec > 0)
-    g_timeout_sec = timeout_sec;
-  if (contimeout_sec > 0)
-    g_contimeout_sec = contimeout_sec;
-}
-
-static void tcp_apply_socket_timeout(int fd) {
-  struct timeval tv;
-  tv.tv_sec = g_timeout_sec;
-  tv.tv_usec = 0;
-  setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-  setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-}
-
 Client* client_create() {
-  int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
-  if (file_descriptor < 0) {
-    perror("Could not create Socket!");
-    return NULL;
-  }
-
  Client* client = (Client*)malloc(sizeof(Client));
  if (client == NULL) {
-    close(file_descriptor);
    return NULL;
  }
-  client->file_descriptor = file_descriptor;
-  client->address.sin_family = AF_INET;
+  memset(&client->address, 0, sizeof(client->address));
+  client->address.ss_family = AF_UNSPEC;
  client->address_length = sizeof(client->address);
+  client->file_descriptor = -1;
  client->ssh_child_pid = -1;
  client->ssl = NULL;
  client->ssl_ctx = NULL;
@@ -173,28 +215,52 @@ Client* client_create() {
 }

 bool client_connect(Client* client, char* host, int port) {
-  client->address.sin_port = htons(port);
-  client->address.sin_family = AF_INET;
-  client->address_length = sizeof(client->address);
+  struct addrinfo hints, *res, *rp;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;

-  if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
-    perror("Could not convert host address!");
+  char port_str[16];
+  snprintf(port_str, sizeof(port_str), "%d", port);
+
+  int gai_err = getaddrinfo(host, port_str, &hints, &res);
+  if (gai_err != 0) {
+    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(gai_err));
    return false;
  }

-  struct timeval ct;
-  ct.tv_sec = g_contimeout_sec;
-  ct.tv_usec = 0;
-  setsockopt(client->file_descriptor, SOL_SOCKET, SO_RCVTIMEO, &ct, sizeof(ct));
-  setsockopt(client->file_descriptor, SOL_SOCKET, SO_SNDTIMEO, &ct, sizeof(ct));
+  // Try IPv6 first, then IPv4
+  int fd = -1;
+  for (rp = res; rp != NULL; rp = rp->ai_next) {
+    fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    if (fd < 0)
+      continue;
+    if (!set_socket_timeouts(fd)) {
+      close(fd);
+      fd = -1;
+      continue;
+    }
+    if (connect(fd, rp->ai_addr, rp->ai_addrlen) == 0)
+      break;
+    close(fd);
+    fd = -1;
+  }

-  if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
-      0) {
+  if (fd < 0) {
    perror("Could not connect to Server!");
+    freeaddrinfo(res);
    return false;
  }

-  tcp_apply_socket_timeout(client->file_descriptor);
+  // Save the connected address
+  memcpy(&client->address, rp->ai_addr, rp->ai_addrlen);
+  client->address_length = rp->ai_addrlen;
+  freeaddrinfo(res);
+
+  // Close old fd if any and set new one
+  if (client->file_descriptor >= 0)
+    close(client->file_descriptor);
+  client->file_descriptor = fd;
  return true;
 }

@@ -205,7 +271,10 @@ void client_disconnect(Client* client) {
    client->ssl = NULL;
    io_set_ssl(NULL);
  }
+  if (client->file_descriptor >= 0) {
    close(client->file_descriptor);
+    client->file_descriptor = -1;
+  }
  if (client->ssh_child_pid > 0) {
    int status;
    waitpid(client->ssh_child_pid, &status, 0);
@@ -1,21 +1,21 @@
 #ifndef TRANSPORT_TCP_H
 #define TRANSPORT_TCP_H

+#include <netdb.h>
 #include <netinet/in.h>
 #include <stdbool.h>
+#include <sys/socket.h>
 #include <sys/types.h>

 typedef struct Server {
-  struct sockaddr_in address;
+  struct sockaddr_storage address;
  unsigned int address_length;
  int file_descriptor;
  void* ssl_ctx;
-  unsigned int max_connections;
-  volatile unsigned int active_connections;
 } Server;

 typedef struct Client {
-  struct sockaddr_in address;
+  struct sockaddr_storage address;
  unsigned int address_length;
  int file_descriptor;
  pid_t ssh_child_pid;
@@ -32,6 +32,6 @@ Client* client_create();
 bool client_connect(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);
+bool set_socket_timeouts(int fd);

 #endif
@@ -5,6 +5,8 @@
 #include <arpa/inet.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -73,6 +75,10 @@ static SSL_CTX* create_ssl_ctx(bool is_server, const char* cert, const char* key
    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
    SSL_CTX_set_verify_depth(ctx, 4);
  } else {
+    if (!is_server) {
+      log_message(LOG_LEVEL_WARNING,
+                  "No CA path provided — TLS server certificate will not be verified");
+    }
    SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
  }

@@ -86,6 +92,7 @@ static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server) {
    return NULL;
  }
  SSL_set_fd(ssl, fd);
+
  int ret;
  if (is_server)
    ret = SSL_accept(ssl);
@@ -98,6 +105,17 @@ static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server) {
    SSL_free(ssl);
    return NULL;
  }
+
+  // In client mode, check verification result if peer verification was requested
+  if (!is_server) {
+    long verify_result = SSL_get_verify_result(ssl);
+    if (verify_result != X509_V_OK) {
+      log_message(LOG_LEVEL_ERROR, "TLS certificate verification failed: %ld", verify_result);
+      SSL_free(ssl);
+      return NULL;
+    }
+  }
+
  return ssl;
 }

@@ -135,16 +153,9 @@ bool server_listen_tls(Server* server, void (*handler)(int file_descriptor)) {

 bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
                        const char* key_path, const char* ca_path) {
-  client->address.sin_port = htons(port);
-  if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
-    perror("Could not convert host address!");
+  // Use the common TCP connection logic (with IPv6 support)
+  if (!client_connect(client, host, port))
    return false;
-  }
-  if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
-      0) {
-    perror("Could not connect to Server!");
-    return false;
-  }

  SSL_CTX* ctx = create_ssl_ctx(false, cert_path, key_path, ca_path);
  if (!ctx)
@@ -10,19 +10,23 @@
 #include <unistd.h>

 bool mkdir_r(const char* path) {
-  char* path_duplicate = malloc(strlen(path) + 1);
+  size_t path_len = strlen(path);
+  char* path_duplicate = malloc(path_len + 1);
  if (!path_duplicate)
    return false;
-  strcpy(path_duplicate, path);
-  char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
+  memcpy(path_duplicate, path, path_len + 1);
+  /* Buffer for building subpaths: path_len + 1 for leading '/' + 1 for null */
+  size_t buf_size = path_len + 2;
+  char* path_current = (char*)malloc(buf_size);
  if (!path_current) {
    free(path_duplicate);
    return false;
  }
-  char* path_current_position = path_current;
+  size_t pos = 0;
  if (path[0] == '/') {
-    strcpy(path_current, "/");
-    path_current_position += 1;
+    path_current[0] = '/';
+    path_current[1] = '\0';
+    pos = 1;
  } else {
    path_current[0] = '\0';
  }
@@ -31,10 +35,16 @@ bool mkdir_r(const char* path) {
  const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
  bool ok = true;
  while (part != NULL) {
-    strcpy(path_current_position, part);
-    path_current_position += strlen(part) * sizeof(char);
-    strcpy(path_current_position, "/");
-    path_current_position += sizeof(char);
+    size_t part_len = strlen(part);
+    if (pos + part_len + 1 >= buf_size) {
+      ok = false;
+      break;
+    }
+    memcpy(path_current + pos, part, part_len);
+    pos += part_len;
+    path_current[pos] = '/';
+    pos++;
+    path_current[pos] = '\0';
    struct stat st;
    if (stat(path_current, &st) != 0) {
      if (mkdir(path_current, 0755) != 0) {
@@ -49,7 +59,6 @@ bool mkdir_r(const char* path) {
  free(path_current);
  return ok;
 }
-
 char* str_dup(const char* string) {
  if (string == NULL)
    return NULL;
@@ -149,25 +158,6 @@ void delete_extras(const char* dest_root, ArrayList* manifest) {
  delete_extras_walk(dest_root, "", manifest);
 }

-bool has_path_traversal(const char* path) {
-  if (!path)
-    return false;
-  char* dup = str_dup(path);
-  if (!dup)
-    return false;
-  char* saveptr;
-  const char* part = strtok_r(dup, "/", &saveptr);
-  while (part) {
-    if (strcmp(part, "..") == 0) {
-      free(dup);
-      return true;
-    }
-    part = strtok_r(NULL, "/", &saveptr);
-  }
-  free(dup);
-  return false;
-}
-
 char* path_cat(const char* path1, char* path2) {
  if (path1 == NULL || *path1 == '\0')
    return str_dup(path2);
@@ -9,6 +9,5 @@ char* str_dup(const char* string);
 char* path_cat(const char* path1, char* path2);
 bool glob_match(const char* pattern, const char* str);
 void delete_extras(const char* dest_root, ArrayList* manifest);
-bool has_path_traversal(const char* path);

 #endif
@@ -23,6 +23,14 @@ static void test_data_create_empty() {
  data_destroy(d);
 }

+static void test_data_create_empty_zero() {
+  Data* d = data_create_empty(0);
+  EXPECT_NOT_NULL(d);
+  EXPECT_NOT_NULL(d->data);
+  EXPECT_EQ_INT((int)d->size, 0);
+  data_destroy(d);
+}
+
 static void test_data_create_reserve() {
  Data* d = data_create_reserve(1024);
  EXPECT_NOT_NULL(d);
@@ -44,6 +52,7 @@ static void test_data_destroy_normal() {
 void test_data() {
  test_data_create();
  test_data_create_empty();
+  test_data_create_empty_zero();
  test_data_create_reserve();
  test_data_destroy_null();
  test_data_destroy_normal();
@@ -69,7 +69,7 @@ static void test_file_save_to_disk() {
  memcpy(f->data->data, content, strlen(content));
  f->data->size = strlen(content);

-  EXPECT_TRUE(file_save_to_disk("test_save_tmp", f, NULL));
+  EXPECT_TRUE(file_save_to_disk("test_save_tmp", f));

  struct stat st;
  EXPECT_EQ_INT(stat("test_save_tmp/saved_file.txt", &st), 0);
@@ -217,6 +217,10 @@ static void test_file_send_no_path() {
  pid_t pid = fork();
  if (pid == 0) {
    close(p[1]);
+    // Read file type indicator
+    int file_type;
+    EXPECT_TRUE(receive_int(p[0], &file_type));
+    EXPECT_EQ_INT(file_type, (int)FILE_TYPE_REGULAR);
    Data* received = receive_data(p[0]);
    close(p[0]);

@@ -169,6 +169,23 @@ static void test_receive_str_truncated() {
  close(p[0]);
 }

+static void test_receive_str_oversized() {
+  int p[2];
+  EXPECT_EQ_INT(pipe(p), 0);
+  io_set_fds(p[0], p[1]);
+  io_set_bwlimit(0);
+
+  /* Send a size exceeding MAX_STRING_SIZE */
+  size_t huge = MAX_STRING_SIZE + 1;
+  EXPECT_TRUE(send_n_data(0, &huge, sizeof(size_t)));
+
+  char* received = receive_str(0);
+  EXPECT_NULL(received);
+
+  close(p[0]);
+  close(p[1]);
+}
+
 void test_protocol() {
  test_send_receive_n_data();
  test_send_receive_n_data_zero();
@@ -179,4 +196,5 @@ void test_protocol() {
  test_send_receive_status();
  test_receive_n_data_truncated();
  test_receive_str_truncated();
+  test_receive_str_oversized();
 }
@@ -19,7 +19,7 @@ static void test_scanner_single_file() {
  create_test_file(file1, content1);

  DirectoryScanner* scanner =
-      directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
+      directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0);
  EXPECT_NOT_NULL(scanner);

  Chunk* chunk = directory_scanner_next(scanner);
@@ -48,7 +48,7 @@ static void test_scanner_multiple_files() {
  create_test_file(file2, content2);

  DirectoryScanner* scanner =
-      directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
+      directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0);
  EXPECT_NOT_NULL(scanner);

  const Chunk* chunk = directory_scanner_next(scanner);
@@ -88,7 +88,7 @@ static void test_scanner_subdirectory() {
  create_test_file(sub_file, content);

  DirectoryScanner* scanner =
-      directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
+      directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, 0);
  EXPECT_NOT_NULL(scanner);

  int total_files = 0;
@@ -112,7 +112,7 @@ static void test_scanner_empty_directory() {
  mkdir(dir, 0755);

  DirectoryScanner* scanner =
-      directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
+      directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0);
  EXPECT_NOT_NULL(scanner);

  const Chunk* chunk = directory_scanner_next(scanner);