docs: add 🔀 Alt Arg status for features with different flag semantics

RSYNC_COMPAT.md

@@ -0,0 +1,276 @@
+# Rsync Feature Compatibility
+
+This document maps rsync's full feature set to FastSync's current implementation status.
+
+## Summary
+
+| Status | Count | Description |
+|--------|-------|-------------|
+| ✅ Implemented | 42 | Feature works end-to-end |
+| 🔀 Alt Arg | 3 | Functionality exists but under different flag/semantics |
+| ⚠️ Partial | 31 | Flag parsed/stored but behavior incomplete |
+| ❌ Not Implemented | 66 | Flag not recognized or no behavior |
+| **Total** | **142** | |
+
+---
+
+## 1. General Options
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-a`, `--archive` | Archive mode is -rlptgoD | 🔀 Alt Arg | Maps to -c -m -M (compression + multithread + metadata) |
+| `-v`, `--verbose` | Increase verbosity | ✅ Implemented | Sets `log_level=DEBUG` |
+| `-q`, `--quiet` | Suppress non-error messages | ✅ Implemented | `quiet` config field |
+| `-h`, `--help` | Show help | ✅ Implemented | Prints usage and exits |
+| `-V`, `--version` | Print version | ❌ Not Implemented | |
+| `--info=FLAGS` | Fine-grained info verbosity | ⚠️ Partial | `info_level` stored, not wired |
+| `--debug=FLAGS` | Fine-grained debug verbosity | ⚠️ Partial | `debug_level` stored, not wired |
+| `--stderr=MODE` | Change stderr output mode | ❌ Not Implemented | |
+| `--no-motd` | Suppress daemon MOTD | ❌ Not Implemented | |
+| `--exclude=PATTERN` | Exclude files matching pattern | ✅ Implemented | Glob matching in scanner |
+| `--include=PATTERN` | Include files matching pattern | ✅ Implemented | Glob matching in scanner |
+| `-C`, `--cvs-exclude` | Auto-ignore CVS files | ⚠️ Partial | `cvs_exclude` stored, not wired |
+
+## 2. Modifying Output
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `--stats` | Give transfer stats | ✅ Implemented | Prints file/byte counts |
+| `-h`, `--human-readable` | Human-readable numbers | ⚠️ Partial | `human_readable` stored, not wired |
+| `-i`, `--itemize-changes` | Per-file change summary | ⚠️ Partial | `itemize_changes` stored, not wired |
+| `--progress` | Show progress | ✅ Implemented | Progress callback in sender |
+| `-P` | Same as --partial --progress | ❌ Not Implemented | |
+| `--out-format=FORMAT` | Custom output format | ⚠️ Partial | `out_format` stored, not wired |
+| `--log-file=FILE` | Log to file | ✅ Implemented | `log_file` config field |
+| `--log-file-format=FMT` | Log format | ❌ Not Implemented | |
+| `--8-bit-output` | Leave high-bit chars unescaped | ❌ Not Implemented | |
+| `--list-only` | List files instead of copying | ⚠️ Partial | `list_only` stored, not wired |
+
+## 3. File Selection
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `--exclude-from=FILE` | Read exclude patterns from file | ✅ Implemented | Reads patterns from file |
+| `--include-from=FILE` | Read include patterns from file | ✅ Implemented | Reads patterns from file |
+| `--filter=RULE` | Add file-filtering rule | ⚠️ Partial | `filters` ArrayList stored, not wired |
+| `--files-from=FILE` | Read source file list from file | ⚠️ Partial | `files_from` stored, not wired |
+| `-0`, `--from0` | Delimit *-from files with NULs | ❌ Not Implemented | |
+| `--max-size=SIZE` | Skip files larger than SIZE | ✅ Implemented | `max_size` in scanner |
+| `--min-size=SIZE` | Skip files smaller than SIZE | ✅ Implemented | `min_size` in scanner |
+| `-I`, `--ignore-times` | Don't skip files matching size+time | ❌ Not Implemented | |
+| `--size-only` | Skip based on size only | ❌ Not Implemented | |
+| `-@`, `--modify-window=NUM` | Mod-time comparison accuracy | ❌ Not Implemented | |
+| `--existing` | Skip creating new files on receiver | ❌ Not Implemented | |
+| `--ignore-existing` | Skip updating existing files | ❌ Not Implemented | |
+| `--remove-source-files` | Sender removes synced files | ❌ Not Implemented | |
+
+## 4. Directory Options
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-r`, `--recursive` | Recurse into directories | ✅ Implemented | Default behavior |
+| `-R`, `--relative` | Use relative path names | ⚠️ Partial | `relative` stored, not wired |
+| `--no-implied-dirs` | Don't send implied dirs with -R | ❌ Not Implemented | |
+| `-d`, `--dirs` | Transfer dirs without recursing | ❌ Not Implemented | |
+| `--mkpath` | Create missing path components | ❌ Not Implemented | |
+
+## 5. Transfer Modifications
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-u`, `--update` | Skip files newer on receiver | ⚠️ Partial | `update` stored, not wired |
+| `--inplace` | Update files in-place | ✅ Implemented | Direct write mode |
+| `--append` | Append data to shorter files | ⚠️ Partial | `append` stored, not wired |
+| `--append-verify` | Append with old-data checksum | ⚠️ Partial | `append_verify` stored, not wired |
+| `-W`, `--whole-file` | Copy whole file (no delta) | ❌ Not Implemented | |
+| `--block-size=SIZE` | Force checksum block-size | ⚠️ Partial | `delta_block_size` configurable |
+
+## 6. Destination Handling
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-n`, `--dry-run` | Trial run with no changes | ✅ Implemented | `dry_run` config field |
+| `-b`, `--backup` | Make backups of overwritten files | ✅ Implemented | Backup before overwrite |
+| `--backup-dir=DIR` | Backup directory hierarchy | ✅ Implemented | `backup_dir` config field |
+| `--suffix=SUFFIX` | Backup suffix (default ~) | ✅ Implemented | `suffix` config field |
+| `--delay-updates` | Put updated files in place at end | ❌ Not Implemented | |
+
+## 7. Deletion
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `--delete` | Delete extraneous files from dest | ✅ Implemented | `use_delete` config field |
+| `--delete-before` | Delete before transfer | ⚠️ Partial | `delete_before` stored, not wired |
+| `--delete-during` | Delete during transfer | ❌ Not Implemented | |
+| `--delete-delay` | Find deletions during, delete after | ❌ Not Implemented | |
+| `--delete-after` | Delete after transfer | ⚠️ Partial | `delete_after` stored, not wired |
+| `--delete-excluded` | Also delete excluded files | ⚠️ Partial | `delete_excluded` stored, not wired |
+| `--max-delete=NUM` | Max files to delete | ⚠️ Partial | `max_delete` stored, not wired |
+| `--ignore-errors` | Delete even with I/O errors | ❌ Not Implemented | |
+| `--force` | Force deletion of non-empty dirs | ❌ Not Implemented | |
+| `--prune-empty-dirs` | Prune empty dir chains | ⚠️ Partial | `prune_empty_dirs` stored, not wired |
+
+## 8. Metadata Preservation
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-M`, `--preserve` | Preserve file metadata | ✅ Implemented | Mode, uid, gid, mtime |
+| `-p`, `--perms` | Preserve permissions | ✅ Implemented | Part of -M |
+| `-o`, `--owner` | Preserve owner | ✅ Implemented | Part of -M |
+| `-g`, `--group` | Preserve group | ✅ Implemented | Part of -M |
+| `-t`, `--times` | Preserve modification times | ✅ Implemented | Part of -M |
+| `-E`, `--executability` | Preserve executability | ❌ Not Implemented | |
+| `--chmod=CHMOD` | Affect file permissions | ❌ Not Implemented | |
+| `-A`, `--acls` | Preserve ACLs | ⚠️ Partial | `preserve_acls` stored, not wired |
+| `-X`, `--xattrs` | Preserve extended attributes | ⚠️ Partial | `preserve_xattrs` stored, not wired |
+| `-H`, `--hard-links` | Preserve hard links | ⚠️ Partial | `preserve_hard_links` stored, not wired |
+| `-D` | Same as --devices --specials | 🔀 Alt Arg | Maps to --devices only (no --specials) |
+| `--devices` | Preserve device files | ⚠️ Partial | `preserve_devices` stored, not wired |
+| `--specials` | Preserve special files | ❌ Not Implemented | |
+| `--copy-devices` | Copy device contents as file | ❌ Not Implemented | |
+| `--write-devices` | Write to devices as files | ❌ Not Implemented | |
+| `-U`, `--atimes` | Preserve access times | ❌ Not Implemented | |
+| `-N`, `--crtimes` | Preserve create times | ❌ Not Implemented | |
+| `-O`, `--omit-dir-times` | Omit dirs from --times | ❌ Not Implemented | |
+| `-J`, `--omit-link-times` | Omit symlinks from --times | ❌ Not Implemented | |
+| `--super` | Receiver attempts super-user activities | ❌ Not Implemented | |
+| `--fake-super` | Store/recover privileged attrs via xattrs | ❌ Not Implemented | |
+
+## 9. Symlink Handling
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-l`, `--links` | Copy symlinks as symlinks | ✅ Implemented | Scanner symlink handling |
+| `-L`, `--copy-links` | Transform symlink to referent | ✅ Implemented | `copy_links` config field |
+| `--copy-unsafe-links` | Transform unsafe symlinks | ✅ Implemented | `copy_unsafe_links` config field |
+| `--safe-links` | Ignore symlinks outside tree | ✅ Implemented | `safe_links` config field |
+| `--munge-links` | Munge symlinks for safety | ❌ Not Implemented | |
+| `-k`, `--copy-dirlinks` | Transform symlink to dir | ❌ Not Implemented | |
+| `-K`, `--keep-dirlinks` | Treat symlinked dir as dir | ❌ Not Implemented | |
+
+## 10. Sparse & Device
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-S`, `--sparse` | Sparse block handling | ✅ Implemented | `preserve_sparse` config field |
+| `--preallocate` | Allocate dest files before writing | ❌ Not Implemented | |
+
+## 11. Checksum & Comparison
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-c`, `--checksum` | Skip based on checksum | ⚠️ Partial | `checksum` stored, forwarded to scanner |
+| `--checksum-choice=STR` | Choose checksum algorithm | ❌ Not Implemented | xxHash used internally |
+| `--whole-file` | Disable delta-xfer algorithm | ❌ Not Implemented | |
+| `--compare-dest=DIR` | Compare dest files relative to DIR | ⚠️ Partial | `compare_dest` stored, not wired |
+| `--copy-dest=DIR` | Include copies of unchanged files | ⚠️ Partial | `copy_dest` stored, not wired |
+| `--link-dest=DIR` | Hardlink to files when unchanged | ⚠️ Partial | `link_dest` stored, not wired |
+| `--fuzzy`, `--no-fuzzy` | Find similar file for basis | ❌ Not Implemented | |
+
+## 12. Compression
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-z`, `--compress` | Compress file data | 🔀 Alt Arg | Always uses zstd (rsync supports multiple algorithms) |
+| `--compress-choice=STR` | Choose compression algorithm | ⚠️ Partial | `compress_choice` stored, always zstd |
+| `--compress-level=NUM` | Set compression level | ✅ Implemented | 1-22, default 5 |
+| `--compress-threads=NUM` | Set compression threads | ❌ Not Implemented | |
+| `--skip-compress=LIST` | Skip compress for suffixes | ❌ Not Implemented | Smart skip for known types |
+
+## 13. Connectivity
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `-e`, `--rsh=COMMAND` | Remote shell to use | ✅ Implemented | SSH transport support |
+| `--rsync-path=PROGRAM` | rsync binary on remote | ✅ Implemented | `rsync_path` config field |
+| `--port=PORT` | Alternate daemon port | ✅ Implemented | `server_port` config field |
+| `--sockopts=OPTIONS` | Custom TCP options | ❌ Not Implemented | |
+| `--blocking-io` | Use blocking I/O for remote shell | ❌ Not Implemented | |
+| `--outbuf=N\|L\|B` | Set output buffering | ❌ Not Implemented | |
+| `--address=ADDRESS` | Bind address for outgoing socket | ✅ Implemented | `bind_address` config field |
+| `-4`, `--ipv4` | Prefer IPv4 | ✅ Implemented | `ipv4` config field |
+| `-6`, `--ipv6` | Prefer IPv6 | ✅ Implemented | `ipv6` config field |
+
+## 14. Daemon Mode
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `--daemon` | Run as rsync daemon | ⚠️ Partial | `daemon` stored, not wired |
+| `--config=FILE` | Alternate rsyncd.conf file | ⚠️ Partial | `daemon_config` stored, not wired |
+| `--dparam=OVERRIDE` | Override global daemon config | ❌ Not Implemented | |
+| `--no-detach` | Don't detach from parent | ❌ Not Implemented | |
+| `--password-file=FILE` | Read daemon password from file | ❌ Not Implemented | |
+| `--early-input=FILE` | Use FILE for daemon early exec | ❌ Not Implemented | |
+
+## 15. Safety & Security
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| Path escape detection | Ensure files stay within root | ✅ Implemented | `has_path_traversal()` + realpath |
+| Symlink-safe delete | Skip symlinks in delete walk | ✅ Implemented | `delete_extras_walk()` |
+| Protocol version check | Verify compatible versions | ✅ Implemented | `config_receive()` |
+| Max data/string/chunk sizes | Prevent OOM attacks | ✅ Implemented | Per-message limits |
+| Per-connection memory limit | 1GB per connection | ✅ Implemented | `MAX_CONNECTION_MEMORY` |
+| `--trust-sender` | Trust remote sender's file list | ❌ Not Implemented | |
+| `--secluded-args` | Send args via protocol | ❌ Not Implemented | |
+| `--old-args` | Disable modern arg protection | ❌ Not Implemented | |
+| `--ignore-missing-args` | Ignore missing source args | ❌ Not Implemented | |
+| `--delete-missing-args` | Delete missing source args | ❌ Not Implemented | |
+
+## 16. Batch Operations
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `--write-batch=FILE` | Write batched update to file | ❌ Not Implemented | |
+| `--only-write-batch=FILE` | Write batch without updating dest | ❌ Not Implemented | |
+| `--read-batch=FILE` | Read batched update from file | ❌ Not Implemented | |
+
+## 17. Advanced
+
+| Flag | Rsync Description | FastSync Status | Notes |
+|------|-------------------|-----------------|-------|
+| `--stop-after=MINS` | Stop after N minutes | ❌ Not Implemented | |
+| `--stop-at=TIME` | Stop at specified time | ❌ Not Implemented | |
+| `--fsync` | Fsync every written file | ❌ Not Implemented | |
+| `--protocol=NUM` | Force older protocol version | ❌ Not Implemented | |
+| `--iconv=CONVERT_SPEC` | Charset conversion | ❌ Not Implemented | |
+| `--checksum-seed=NUM` | Set checksum seed | ❌ Not Implemented | |
+| `-s`, `--secluded-args` | Use protocol to send args | ❌ Not Implemented | |
+| `--no-OPTION` | Turn off implied option | ❌ Not Implemented | |
+
+---
+
+## Recommendations: Top Features to Implement Next
+
+Ranked by user demand, implementation complexity, and interoperability impact:
+
+| Priority | Feature | Effort | Impact |
+|----------|---------|--------|--------|
+| 1 | `--whole-file` / `-W` | Low | High — users expect opt-out of delta |
+| 2 | `--ignore-times` / `-I` | Low | Medium — useful for forcing re-transfer |
+| 3 | `--size-only` | Low | Medium — common migration scenario |
+| 4 | `--existing` / `--ignore-existing` | Low | Medium — common sync patterns |
+| 5 | `--remove-source-files` | Low | High — common for moves/backup |
+| 6 | `--delete-during` | Medium | High — performance improvement |
+| 7 | `--delay-updates` | Medium | High — atomic updates |
+| 8 | `--chmod` | Low | Medium — permission flexibility |
+| 9 | `--executability` / `-E` | Low | Low — simple flag |
+| 10 | `--skip-compress` | Low | Medium — performance tuning |
+
+---
+
+## FastSync-Specific Features (Not in rsync)
+
+| Feature | Description |
+|---------|-------------|
+| `-m` | Multithreaded pipeline (scanner/loader/sender) |
+| `-s` | Chunk serialization mode |
+| `-f` / `--sendfile` | Zero-copy sendfile() syscall (TCP only) |
+| `-c [level]` | zstd compression level (1-22) |
+| `--chunk-size` | Configurable chunk size |
+| `--queue-size` | Pipeline queue capacity |
+| `--tls` | TLS encryption (mutual auth) |
+| `--fastsync-server-path` | Path to fastsync-server binary |
+| `--server-host` / `--server-port` | Direct TCP connection |
+| Incremental sync | Skip unchanged files (size+mtime) |
+| Delta transfer | Block-level delta for changed files |

src/client/client_send.c

@@ -25,16 +25,13 @@
 
 #define STREAM_THRESHOLD (64ULL * 1024 * 1024)
 
-/* Forward declaration for progress-reporting thread used in multithreaded send. */
-static int progress_thread_fn(void* arg);
-
 /* Print dry-run manifest showing files that would be transferred. Returns 0 on success. */
 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, false);
+      config->safe_links, config->copy_unsafe_links);
   if (!scanner)
     return -1;
   Chunk* chunk;
@@ -274,9 +271,6 @@ static int send_chunks_multithreaded(void* pipeline_context) {
   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,
@@ -289,9 +283,6 @@ static int send_chunks_multithreaded(void* pipeline_context) {
       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;
     }
   } else {
@@ -301,18 +292,12 @@ static int send_chunks_multithreaded(void* pipeline_context) {
       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)) {
     client_disconnect(client);
     client_delete(client);
-    mtx_lock(&context->mutex_progress);
-    context->sender_done = true;
-    mtx_unlock(&context->mutex_progress);
     return thrd_error;
   }
 
@@ -331,38 +316,19 @@ static int send_chunks_multithreaded(void* pipeline_context) {
       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:
       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) {
       fprintf(stderr, "Error: unexpected error while sending chunk\n");
       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) {
-      unsigned long long chunk_bytes = 0;
-      for (int i = 0; i < current_chunk->element_count; i++) {
-        if (current_chunk->items[i] && current_chunk->items[i]->data)
-          chunk_bytes += current_chunk->items[i]->data->size;
-      }
-      mtx_lock(&context->mutex_progress);
-      context->progress_bytes += chunk_bytes;
-      mtx_unlock(&context->mutex_progress);
-    }
     chunk_destroy(current_chunk);
   }
 }
@@ -374,7 +340,7 @@ static int scan_directory_multithreaded(void* pipeline_context) {
       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, false);
+      context->config->copy_links, context->config->safe_links, context->config->copy_unsafe_links);
 
   Chunk* current_chunk;
   while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
@@ -432,42 +398,6 @@ static int load_files_multithreaded(void* pipeline_context) {
   }
 }
 
-/* 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) {
-  PipelineContextSender* context = (PipelineContextSender*)arg;
-  time_t last_progress = 0;
-  time_t start = time(NULL);
-
-  while (true) {
-    mtx_lock(&context->mutex_progress);
-    bool done = context->sender_done;
-    unsigned long long total = context->progress_bytes;
-    mtx_unlock(&context->mutex_progress);
-
-    if (done) {
-      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;
-      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 */
-    thrd_sleep(&ts, NULL);
-  }
-  return thrd_success;
-}
-
 int send_files(Config* config) {
   if (config->dry_run)
     return send_dry_run_manifest(config);
@@ -509,7 +439,7 @@ int send_files(Config* config) {
       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, false);
+      config->safe_links, config->copy_unsafe_links);
   Chunk* current_chunk;
   unsigned long long total_bytes = 0;
   time_t last_progress = 0;
@@ -617,7 +547,7 @@ int send_files_multithreaded(Config* config) {
   if (config->use_delete)
     context->manifest = array_list_create(free);
 
-  thrd_t scanner, loader, sender, progress;
+  thrd_t scanner, loader, sender;
   if (thrd_create(&scanner, scan_directory_multithreaded, context) != thrd_success ||
       thrd_create(&loader, load_files_multithreaded, context) != thrd_success ||
       thrd_create(&sender, send_chunks_multithreaded, context) != thrd_success) {
@@ -626,26 +556,11 @@ int send_files_multithreaded(Config* config) {
     return 1;
   }
 
-  if (config->show_progress) {
-    if (thrd_create(&progress, progress_thread_fn, context) != thrd_success) {
-      perror("Error creating progress thread.\n");
-      /* Non-fatal; continue without progress reporting */
-    }
-  }
-
   int sender_result;
   thrd_join(scanner, NULL);
   thrd_join(loader, NULL);
   thrd_join(sender, &sender_result);
 
-  if (config->show_progress) {
-    /* Signal progress thread to exit if it hasn't already */
-    mtx_lock(&context->mutex_progress);
-    context->sender_done = true;
-    mtx_unlock(&context->mutex_progress);
-    thrd_join(progress, NULL);
-  }
-
   pipeline_context_sender_destroy(context);
   return sender_result == thrd_success ? 0 : 1;
 }

src/client/scanner.c

@@ -40,7 +40,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
                                            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) {
+                                           bool copy_unsafe_links) {
   DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
   if (scanner == NULL)
     return NULL;
@@ -61,7 +61,6 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
   scanner->copy_links = copy_links;
   scanner->safe_links = safe_links;
   scanner->copy_unsafe_links = copy_unsafe_links;
-  scanner->checksum = checksum;
   queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0));
   return scanner;
 }
@@ -277,7 +276,6 @@ typedef struct {
   bool copy_links;
   bool safe_links;
   bool copy_unsafe_links;
-  bool checksum;
 } ParallelWorkerArg;
 
 static int parallel_worker_thread(void* arg) {
@@ -286,7 +284,7 @@ static int parallel_worker_thread(void* arg) {
     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);
+        wa->follow_symlinks, wa->copy_links, wa->safe_links, wa->copy_unsafe_links);
     Chunk* chunk;
     while ((chunk = directory_scanner_next(ds)) != NULL) {
       queue_enqueue_multithreaded(wa->ps->result_queue, chunk, &wa->ps->result_mutex,
@@ -314,7 +312,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
                                          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) {
+                                         bool safe_links, bool copy_unsafe_links) {
   ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
   if (!ps)
     return NULL;
@@ -477,7 +475,6 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
       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++)

src/client/scanner.h

@@ -25,7 +25,6 @@ typedef struct {
   bool copy_links;
   bool safe_links;
   bool copy_unsafe_links;
-  bool checksum;
 } DirectoryScanner;
 
 typedef struct {
@@ -46,7 +45,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
                                            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);
+                                           bool copy_unsafe_links);
 Chunk* directory_scanner_next(DirectoryScanner* scanner);
 void directory_scanner_destroy(DirectoryScanner* scanner);
 
@@ -56,7 +55,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
                                          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);
+                                         bool safe_links, bool copy_unsafe_links);
 Chunk* parallel_scanner_next(ParallelScanner* scanner);
 void parallel_scanner_destroy(ParallelScanner* scanner);
 

src/shared/config.c

@@ -89,18 +89,6 @@ Config* config_create(void) {
   config->compare_dest = NULL;
   config->copy_dest = NULL;
   config->link_dest = NULL;
-  config->partial_dir = NULL;
-  config->suffix = NULL;
-  config->delete_before = false;
-  config->address = NULL;
-  config->bind_address = NULL;
-  config->ipv6 = false;
-  config->ipv4 = false;
-  config->daemon = false;
-  config->daemon_config = NULL;
-  config->server_mode = false;
-  config->checksum = false;
-  config->compress_choice = NULL;
   return config;
 }
 
@@ -152,18 +140,9 @@ void config_delete(Config* config) {
   free(config->rsh_command);
   free(config->rsync_path);
   free(config->temp_dir);
-  free(config->partial_dir);
-  free(config->suffix);
-  free(config->compress_choice);
   free(config->compare_dest);
   free(config->copy_dest);
   free(config->link_dest);
-  free(config->partial_dir);
-  free(config->suffix);
-  free(config->address);
-  free(config->bind_address);
-  free(config->daemon_config);
-  free(config->compress_choice);
   if (config->filters) {
     array_list_delete(config->filters);
   }
@@ -246,18 +225,6 @@ bool config_send(int file_descriptor, const Config* config) {
   if (!send_str(file_descriptor, config->temp_dir ? config->temp_dir : ""))
     return false;
   Status status;
-  if (!send_int(file_descriptor, config->partial))
-    return false;
-  if (!send_str(file_descriptor, config->partial_dir ? config->partial_dir : ""))
-    return false;
-  if (!send_str(file_descriptor, config->suffix ? config->suffix : ""))
-    return false;
-  if (!send_int(file_descriptor, config->delete_before))
-    return false;
-  if (!send_int(file_descriptor, config->checksum))
-    return false;
-  if (!send_str(file_descriptor, config->compress_choice ? config->compress_choice : ""))
-    return false;
   if (!receive_status(file_descriptor, &status))
     return false;
   if (status != STATUS_OK) {
@@ -392,18 +359,6 @@ Config* config_receive(int file_descriptor) {
   config->compare_dest = NULL;
   config->copy_dest = NULL;
   config->link_dest = NULL;
-  config->partial_dir = NULL;
-  config->suffix = NULL;
-  config->delete_before = false;
-  config->address = NULL;
-  config->bind_address = NULL;
-  config->ipv6 = false;
-  config->ipv4 = false;
-  config->daemon = false;
-  config->daemon_config = NULL;
-  config->server_mode = false;
-  config->checksum = false;
-  config->compress_choice = NULL;
   if (!receive_int(file_descriptor, &tmp))
     goto error;
   config->backup = tmp;
@@ -479,9 +434,6 @@ error:
   free(config->server_host);
   free(config->backup_dir);
   free(config->temp_dir);
-  free(config->partial_dir);
-  free(config->suffix);
-  free(config->compress_choice);
   free(config);
   return NULL;
 }

src/shared/config.h

@@ -100,32 +100,6 @@ typedef struct Config {
   char* compare_dest;
   char* copy_dest;
   char* link_dest;
-
-  // PR #174: Partial transfer resumption
-  char* partial_dir;
-
-  // PR #178: Backup versioning
-  char* suffix;
-
-  // PR #179: Delete policies
-  bool delete_before;
-
-  // PR #181: IPv6 and bind address
-  char* address;
-  char* bind_address;
-  bool ipv6;
-  bool ipv4;
-
-  // PR #182: Daemon/server mode
-  bool daemon;
-  char* daemon_config;
-  bool server_mode;
-
-  // PR #183: Checksum comparison
-  bool checksum;
-
-  // PR #184: Compression algorithm negotiation
-  char* compress_choice;
 } Config;
 
 #define PROTOCOL_VERSION "1.3.0"

src/shared/file.c

@@ -129,28 +129,22 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
 }
 
 bool file_save_to_disk(const char* root_directory, File* file, const Config* config) {
-  bool backup_enabled = config && config->backup;
+  (void)config;
-  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;
-
   if (has_path_traversal(file->path)) {
     log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path);
     return false;
   }
 
-  char* resolved_root = NULL;
+  // Resolve the destination root to its real path, preventing symlink-based escapes.
-  const char* actual_root = (partial_dir && config && config->partial) ? partial_dir : root_directory;
+  // If the root does not yet exist, try to create it so realpath can succeed.
-  resolved_root = realpath(actual_root, NULL);
+  char* resolved_root = realpath(root_directory, NULL);
   if (resolved_root == NULL) {
-    if (mkdir_r(actual_root)) {
+    if (mkdir_r(root_directory)) {
-      resolved_root = realpath(actual_root, NULL);
+      resolved_root = realpath(root_directory, NULL);
     }
   }
   if (resolved_root == NULL) {
-    log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", actual_root);
+    log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", root_directory);
     return false;
   }
 
@@ -160,43 +154,7 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
     return false;
   }
 
-  if (backup_enabled) {
+  // Ensure the target directory exists so the parent can be resolved for path safety.
-    struct stat backup_stat;
-    if (stat(disk_path, &backup_stat) == 0) {
-      char* backup_path = NULL;
-      if (backup_dir) {
-        char* resolved_backup_dir = realpath(backup_dir, NULL);
-        if (!resolved_backup_dir) {
-          mkdir_r(backup_dir);
-          resolved_backup_dir = realpath(backup_dir, NULL);
-        }
-        if (resolved_backup_dir) {
-          backup_path = path_cat(resolved_backup_dir, file->path);
-          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) {
-          char* bdir = dirname(backup_dir_path);
-          mkdir_r(bdir);
-          free(backup_dir_path);
-        }
-        rename(disk_path, backup_path);
-        free(backup_path);
-      }
-    }
-  }
-
   char* dir_dup = str_dup(disk_path);
   if (!dir_dup) {
     free(resolved_root);
@@ -204,6 +162,7 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
     return false;
   }
   char* dir_str = dirname(dir_dup);
+  // Create the directory if needed (no-op if it already exists) so realpath can resolve it.
   if (!mkdir_r(dir_str)) {
     free(dir_dup);
     free(resolved_root);
@@ -219,11 +178,13 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
     return false;
   }
 
+  // Verify that the resolved directory is inside the resolved root.
+  // Both are canonical absolute paths — this prevents symlink-based escapes.
   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);
+                root_directory);
     free(resolved_dir);
     free(resolved_root);
     free(disk_path);
@@ -232,7 +193,7 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
   free(resolved_dir);
   free(resolved_root);
 
-  bool ok = to_disk(disk_path, file->data->data, file->data->size, inplace, sparse);
+  bool ok = to_disk(disk_path, file->data->data, file->data->size);
   if (ok)
     file_restore_metadata(disk_path, file->metadata);
   free(disk_path);
@@ -517,8 +478,7 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
   return file;
 }
 
-bool to_disk(const char* path, const void* data, unsigned long long data_size,
+bool to_disk(const char* path, const void* data, unsigned long long data_size) {
-             bool inplace, bool sparse) {
   char* tmp_path = NULL;
   char* directory = NULL;
 
@@ -535,39 +495,6 @@ bool to_disk(const char* path, const void* data, unsigned long long data_size,
   if (!mkdir_r(directory))
     goto done;
 
-  if (inplace) {
-    FILE* file_pointer = fopen(path, "wb");
-    if (file_pointer == NULL) {
-      perror("Could not open file for inplace write");
-      ok = false;
-      goto done;
-    }
-    if (sparse && data_size > 0) {
-      if (fseek(file_pointer, data_size - 1, SEEK_SET) != 0) {
-        perror("Failed to seek for sparse file");
-        fclose(file_pointer);
-        ok = false;
-        goto done;
-      }
-      if (fwrite("", 1, 1, file_pointer) != 1) {
-        perror("Failed to write sparse file");
-        fclose(file_pointer);
-        ok = false;
-        goto done;
-      }
-      rewind(file_pointer);
-    }
-    if (data_size > 0 && fwrite(data, 1, data_size, file_pointer) != data_size) {
-      perror("Failed to write all data to file");
-      fclose(file_pointer);
-      ok = false;
-      goto done;
-    }
-    fclose(file_pointer);
-    free(directory);
-    return true;
-  }
-
   size_t path_len = strlen(path);
   tmp_path = malloc(path_len + 5);
   if (!tmp_path) {
@@ -583,21 +510,6 @@ bool to_disk(const char* path, const void* data, unsigned long long data_size,
     ok = false;
     goto done;
   }
-  if (sparse && data_size > 0) {
-    if (fseek(file_pointer, data_size - 1, SEEK_SET) != 0) {
-      perror("Failed to seek for sparse file");
-      fclose(file_pointer);
-      ok = false;
-      goto done;
-    }
-    if (fwrite("", 1, 1, file_pointer) != 1) {
-      perror("Failed to write sparse file");
-      fclose(file_pointer);
-      ok = false;
-      goto done;
-    }
-    rewind(file_pointer);
-  }
   if (fwrite(data, 1, data_size, file_pointer) != data_size) {
     perror("Failed to write all data to temporary file");
     fclose(file_pointer);
@@ -622,6 +534,13 @@ done:
 
 bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
                         bool 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);

src/shared/file.h

@@ -34,8 +34,7 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
 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 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, File* file, const Config* config);
 File* receive_incremental_check(int fd, const Config* config, bool* skipped);
 int receive_manifest(int fd, const Config* config, int* next_status);

src/shared/multiprocessing.c

@@ -24,14 +24,11 @@ PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* que
   context->scanner_done = false;
   context->loader_done = false;
   context->manifest = NULL;
-  context->progress_bytes = 0;
-  context->sender_done = false;
   if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success ||
       cnd_init(&context->condition_not_full_scanner) != thrd_success ||
       cnd_init(&context->condition_not_empty_scanner) != thrd_success ||
       mtx_init(&context->mutex_loader, mtx_plain) != thrd_success ||
       cnd_init(&context->condition_not_full_loader) != thrd_success ||
-      mtx_init(&context->mutex_progress, mtx_plain) != thrd_success ||
       cnd_init(&context->condition_not_empty_loader) != thrd_success) {
     perror("Error initializing synchronization objects");
     free(context);
@@ -53,7 +50,6 @@ void pipeline_context_sender_destroy(PipelineContextSender* context) {
   mtx_destroy(&context->mutex_loader);
   cnd_destroy(&context->condition_not_full_loader);
   cnd_destroy(&context->condition_not_empty_loader);
-  mtx_destroy(&context->mutex_progress);
   free(context);
 }
 

src/shared/multiprocessing.h

@@ -23,9 +23,6 @@ typedef struct {
   cnd_t condition_not_empty_loader;
   bool loader_done;
   ArrayList* manifest;
-  mtx_t mutex_progress;
-  unsigned long long progress_bytes;
-  bool sender_done;
 } PipelineContextSender;
 
 typedef struct PipelineContextReceiver {

src/shared/transport_ssh.c

@@ -182,7 +182,7 @@ Client* client_connect_ssh(const char* destination, int port, const char* server
     return NULL;
   }
   client->file_descriptor = sv[0];
-  client->address.ss_family = AF_UNIX;
+  client->address.sin_family = AF_UNIX;
   client->address_length = 0;
   client->ssh_child_pid = pid;
   client->ssl = NULL;

src/shared/transport_tcp.c

@@ -3,7 +3,6 @@
 #include "protocol.h"
 #include <arpa/inet.h>
 #include <errno.h>
-#include <netdb.h>
 #include <openssl/ssl.h>
 #include <signal.h>
 #include <stdio.h>
@@ -144,10 +143,6 @@ void tcp_set_timeouts(int timeout_sec, int contimeout_sec) {
     g_contimeout_sec = contimeout_sec;
 }
 
-int tcp_get_contimeout_sec(void) {
-  return g_contimeout_sec;
-}
-
 static void tcp_apply_socket_timeout(int fd) {
   struct timeval tv;
   tv.tv_sec = g_timeout_sec;
@@ -157,12 +152,19 @@ static void tcp_apply_socket_timeout(int fd) {
 }
 
 Client* client_create() {
-  Client* client = (Client*)malloc(sizeof(Client));
+  int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
-  if (client == NULL) {
+  if (file_descriptor < 0) {
+    perror("Could not create Socket!");
     return NULL;
   }
-  client->file_descriptor = -1;
+
-  memset(&client->address, 0, sizeof(client->address));
+  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;
   client->address_length = sizeof(client->address);
   client->ssh_child_pid = -1;
   client->ssl = NULL;
@@ -171,50 +173,23 @@ Client* client_create() {
 }
 
 bool client_connect(Client* client, char* host, int port) {
-  struct addrinfo hints;
+  client->address.sin_port = htons(port);
-  struct addrinfo* result;
+  client->address.sin_family = AF_INET;
-  memset(&hints, 0, sizeof(hints));
+  client->address_length = sizeof(client->address);
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = IPPROTO_TCP;
 
-  char port_str[16];
+  if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
-  snprintf(port_str, sizeof(port_str), "%d", port);
+    perror("Could not convert host address!");
-
-  int err = getaddrinfo(host, port_str, &hints, &result);
-  if (err != 0 || result == NULL) {
-    fprintf(stderr, "Could not resolve host: %s (%s)\n", host, gai_strerror(err));
     return false;
   }
 
-  struct addrinfo* rp;
-  bool connected = false;
-  for (rp = result; rp != NULL; rp = rp->ai_next) {
-    if (client->file_descriptor >= 0)
-      close(client->file_descriptor);
-
-    client->file_descriptor = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if (client->file_descriptor < 0)
-      continue;
-
   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));
 
-    memcpy(&client->address, rp->ai_addr, rp->ai_addrlen);
+  if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
-    client->address_length = rp->ai_addrlen;
+      0) {
-
-    if (connect(client->file_descriptor, (struct sockaddr*)&client->address,
-                client->address_length) == 0) {
-      connected = true;
-      break;
-    }
-  }
-  freeaddrinfo(result);
-
-  if (!connected) {
     perror("Could not connect to Server!");
     return false;
   }
@@ -230,10 +205,7 @@ 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);

src/shared/transport_tcp.h

@@ -15,7 +15,7 @@ typedef struct Server {
 } Server;
 
 typedef struct Client {
-  struct sockaddr_storage address;
+  struct sockaddr_in address;
   unsigned int address_length;
   int file_descriptor;
   pid_t ssh_child_pid;
@@ -33,6 +33,5 @@ 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);
-int tcp_get_contimeout_sec(void);
 
 #endif

src/shared/transport_tls.c

@@ -3,7 +3,6 @@
 #include "protocol.h"
 #include "transport_tcp.h"
 #include <arpa/inet.h>
-#include <netdb.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <signal.h>
@@ -149,50 +148,13 @@ 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) {
-  struct addrinfo hints;
+  client->address.sin_port = htons(port);
-  struct addrinfo* result;
+  if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
-  memset(&hints, 0, sizeof(hints));
+    perror("Could not convert host address!");
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = IPPROTO_TCP;
-
-  char port_str[16];
-  snprintf(port_str, sizeof(port_str), "%d", port);
-
-  int err = getaddrinfo(host, port_str, &hints, &result);
-  if (err != 0 || result == NULL) {
-    fprintf(stderr, "Could not resolve host: %s (%s)\n", host, gai_strerror(err));
     return false;
   }
-
+  if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
-  struct addrinfo* rp;
+      0) {
-  bool connected = false;
-  for (rp = result; rp != NULL; rp = rp->ai_next) {
-    if (client->file_descriptor >= 0)
-      close(client->file_descriptor);
-
-    client->file_descriptor = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if (client->file_descriptor < 0)
-      continue;
-
-    struct timeval ct;
-    ct.tv_sec = tcp_get_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));
-
-    memcpy(&client->address, rp->ai_addr, rp->ai_addrlen);
-    client->address_length = rp->ai_addrlen;
-
-    if (connect(client->file_descriptor, (struct sockaddr*)&client->address,
-                client->address_length) == 0) {
-      connected = true;
-      break;
-    }
-  }
-  freeaddrinfo(result);
-
-  if (!connected) {
     perror("Could not connect to Server!");
     return false;
   }

tests/test_scanner.c

@@ -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, false, false, false, false, false);
+                                                       0, false, false, false, false);
   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, false, false, false, false, false);
+                                                       0, false, false, false, false);
   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, false, false, false, false, false);
+                                                       0, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   int total_files = 0;
@@ -112,7 +112,7 @@ static void test_scanner_empty_directory() {
   EXPECT_EQ_INT(mkdir(dir, 0755), 0);
 
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
-                                                       0, false, false, false, false, false);
+                                                       0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   const Chunk* chunk = directory_scanner_next(scanner);
@@ -136,7 +136,7 @@ static void test_scanner_exclude_pattern() {
 
   char* exclude[] = {"*.tmp"};
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0,
-                                                       0, 0, false, false, false, false, false);
+                                                       0, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);
@@ -169,7 +169,7 @@ static void test_scanner_exclude_subdirectory() {
 
   char* exclude[] = {"*.tmp"};
   DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0,
-                                                       0, 0, 0, false, false, false, false, false);
+                                                       0, 0, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   int total = 0;
@@ -207,7 +207,7 @@ static void test_scanner_include_and_exclude() {
   char* exclude[] = {"*.bak"};
   char* include[] = {"*.txt", "*.log"};
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2,
-                                                       0, 0, 0, false, false, false, false, false);
+                                                       0, 0, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);
@@ -244,7 +244,7 @@ static void test_scanner_max_size() {
 
   /* max_size = 10 — only files <= 10 bytes */
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10,
-                                                       0, 0, false, false, false, false, false);
+                                                       0, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);
@@ -272,7 +272,7 @@ static void test_scanner_min_size() {
 
   /* min_size = 1 — only files >= 1 byte */
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1,
-                                                       0, false, false, false, false, false);
+                                                       0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);
@@ -302,7 +302,7 @@ static void test_scanner_size_range() {
 
   /* Only files between 3 and 20 bytes */
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20,
-                                                       3, 0, false, false, false, false, false);
+                                                       3, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);
@@ -338,7 +338,7 @@ static void test_scanner_mixed_patterns() {
   char* exclude[] = {"*.bak"};
   char* include[] = {"*.txt"};
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1,
-                                                       10, 3, 0, false, false, false, false, false);
+                                                       10, 3, 0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);
@@ -369,7 +369,7 @@ static void test_scanner_no_patterns() {
   create_test_file(f2, "second");
 
   DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
-                                                       0, false, false, false, false, false);
+                                                       0, false, false, false, false);
   EXPECT_NOT_NULL(scanner);
 
   Chunk* chunk = directory_scanner_next(scanner);

tests/test_transport_tcp.c

@@ -23,8 +23,8 @@ static void test_server_delete_null() {
 static void test_client_create() {
   Client* c = client_create();
   EXPECT_NOT_NULL(c);
-  EXPECT_TRUE(c->file_descriptor == -1);
+  EXPECT_TRUE(c->file_descriptor >= 0);
-  EXPECT_EQ_INT(c->address.ss_family, 0);
+  EXPECT_EQ_INT(c->address.sin_family, AF_INET);
   EXPECT_EQ_INT(c->ssh_child_pid, -1);
   EXPECT_NULL(c->ssl);
   EXPECT_NULL(c->ssl_ctx);