Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b68974b42 | |||
| df41e8bd06 | |||
| 9d67fcbf92 | |||
| 261683aaff | |||
| 15a861747a | |||
| 5f1b27c8ff | |||
| 732cd67735 | |||
| 50fb7185a8 | |||
| 3062927e07 | |||
| 5d74c7cb74 | |||
| efc7e062e3 | |||
| 88746c3396 | |||
| 80768d64d4 | |||
| e876055167 | |||
| 3d2eb97205 | |||
| da20bb4d37 | |||
| 3e4c571355 | |||
| 05dab758cf | |||
| 8cc587b79e |
@@ -60,48 +60,6 @@ python3 -m pytest tests/ # integration tests
|
|||||||
|
|
||||||
When running the CI workflow via `tea` (the task execution agent), always set a sufficient timeout (e.g., 600000ms) to allow CI to finish. After CI completes, check the results yourself — do not assume success. Use `gh run watch` or similar to monitor CI status, then inspect logs on failure.
|
When running the CI workflow via `tea` (the task execution agent), always set a sufficient timeout (e.g., 600000ms) to allow CI to finish. After CI completes, check the results yourself — do not assume success. Use `gh run watch` or similar to monitor CI status, then inspect logs on failure.
|
||||||
|
|
||||||
## Branch Strategy
|
|
||||||
|
|
||||||
Never push directly to `main`. All changes must be developed on a feature branch and merged via a pull request. Always create a new branch before making changes:
|
|
||||||
```bash
|
|
||||||
git checkout -b <feature-branch-name>
|
|
||||||
```
|
|
||||||
After committing changes, push the branch and create a PR:
|
|
||||||
```bash
|
|
||||||
git push -u origin <feature-branch-name>
|
|
||||||
gh pr create --fill
|
|
||||||
```
|
|
||||||
Wait for CI to pass on the PR before merging.
|
|
||||||
|
|
||||||
## Batch PR Workflow
|
|
||||||
|
|
||||||
When handling multiple issues split across several PRs that target the same files:
|
|
||||||
|
|
||||||
1. **Group issues by logical category** into separate PR branches (e.g., memory-safety, refactoring, test-coverage).
|
|
||||||
2. **Fix and push** each branch independently. Let CI run on each PR.
|
|
||||||
3. **Run all 3 reviewer types** on each PR and post results to Gitea via `tea pr approve/reject` or the Gitea API:
|
|
||||||
- `reviewer` — general code correctness
|
|
||||||
- `code-quality-guardian` — code quality, duplication, complexity
|
|
||||||
- `security-auditor` — vulnerability assessment
|
|
||||||
4. **Iterate**: if any reviewer requests changes, fix, push, re-review. Repeat until all 3 approve.
|
|
||||||
5. **Merge approved PRs** one at a time into `main`.
|
|
||||||
6. **Create a combined merge branch** for the remaining PRs that conflict with the new `main`:
|
|
||||||
```bash
|
|
||||||
git checkout -b merge-all origin/main
|
|
||||||
for branch in branch1 branch2 branch3; do
|
|
||||||
git merge origin/$branch --no-edit || true
|
|
||||||
# Resolve conflicts, build, test
|
|
||||||
done
|
|
||||||
```
|
|
||||||
7. **Run review again** on the combined branch. Fix issues, push, re-review until approved.
|
|
||||||
8. **Merge** the combined PR, **close** the redundant individual PRs, and **close all resolved issues** via the Gitea API:
|
|
||||||
```bash
|
|
||||||
curl -s -X PATCH -H "Authorization: token $TOKEN" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{"state":"closed"}' \
|
|
||||||
"https://gitea.tap-tap.win/api/v1/repos/owner/repo/issues/<number>"
|
|
||||||
```
|
|
||||||
|
|
||||||
## CI Troubleshooting
|
## CI Troubleshooting
|
||||||
|
|
||||||
### If lint (clang-format) fails
|
### If lint (clang-format) fails
|
||||||
@@ -124,6 +82,99 @@ Run locally before pushing:
|
|||||||
python3 -m pytest tests/ -v --tb=short
|
python3 -m pytest tests/ -v --tb=short
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Branch Strategy
|
||||||
|
|
||||||
|
Two main branches: `dev` (integration) and `main` (stable releases).
|
||||||
|
|
||||||
|
### Rules
|
||||||
|
- **All PRs target `dev`** — never target `main` directly
|
||||||
|
- **`dev` is the default branch** in Gitea repo settings
|
||||||
|
- **`main` is protected** — only merged from `dev` via PR with 2 approvals + full CI pass
|
||||||
|
- **Feature/bug branches** branch from `dev`, PR back to `dev`
|
||||||
|
- **`dev` → `main` merges** happen on-demand or weekly, requiring full CI + review
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Start a new feature
|
||||||
|
git checkout dev && git pull
|
||||||
|
git checkout -b feat/my-feature
|
||||||
|
# ... work, commit, push
|
||||||
|
git push -u origin feat/my-feature
|
||||||
|
# Create PR targeting dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Creating the `dev` branch (one-time setup)
|
||||||
|
```bash
|
||||||
|
git checkout main && git pull
|
||||||
|
git checkout -b dev
|
||||||
|
git push origin dev
|
||||||
|
# Then in Gitea: Settings → Repository → Default Branch → dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Branch protection (Gitea repo settings)
|
||||||
|
**For `dev`:**
|
||||||
|
- ✅ Require PR for merging
|
||||||
|
- ✅ Require 1 approval
|
||||||
|
- ✅ Require status checks (all CI jobs must pass)
|
||||||
|
- ✅ Delete branch after merge
|
||||||
|
|
||||||
|
**For `main`:**
|
||||||
|
- ✅ Require PR from `dev` only
|
||||||
|
- ✅ Require CI
|
||||||
|
- ✅ Require 2 approvals
|
||||||
|
- ✅ No direct pushes
|
||||||
|
|
||||||
|
## Automated Agent Workflows
|
||||||
|
|
||||||
|
All agents run locally via the opencode CLI. There is no CI-based agent automation — agents are invoked on-demand by the developer or by this assistant.
|
||||||
|
|
||||||
|
### One-command batch workflow
|
||||||
|
|
||||||
|
For fixing a set of issues and creating one integration PR:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Run each subagent on its category
|
||||||
|
opencode run --agent security-auditor "Fix all open security issues"
|
||||||
|
opencode run --agent debugger "Fix all open bugs"
|
||||||
|
opencode run --agent test-writer "Add missing test coverage"
|
||||||
|
|
||||||
|
# 2. The assistant handles: merging branches, fixing CI failures,
|
||||||
|
# pushing, creating the integration PR, waiting for CI, iterating.
|
||||||
|
# The developer only reviews the final PR.
|
||||||
|
```
|
||||||
|
|
||||||
|
### Issue triage loop
|
||||||
|
When you want to fix a batch of issues autonomously:
|
||||||
|
|
||||||
|
1. Tell the assistant: *"Fix all open issues and create one big PR"*
|
||||||
|
2. The assistant delegates to subagents in parallel
|
||||||
|
3. Merges their branches, handles CI failures iteratively
|
||||||
|
4. Pushes and opens the final PR
|
||||||
|
5. You review the PR once CI passes — no intermediate check-ins
|
||||||
|
|
||||||
|
### Scheduling
|
||||||
|
For periodic maintenance (security audits, code quality scans), run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
opencode run --agent security-auditor "Audit the codebase for vulnerabilities"
|
||||||
|
opencode run --agent code-quality-guardian "Scan for code quality issues"
|
||||||
|
```
|
||||||
|
|
||||||
|
This can be cron'd locally if desired (e.g., `crontab -e` with `opencode run`).
|
||||||
|
|
||||||
|
## Is opencode a good option?
|
||||||
|
|
||||||
|
**Yes, for FastSync's needs.** The hybrid model works well:
|
||||||
|
- opencode's 17 specialized agents handle deep code analysis, fixes, tests, and reviews
|
||||||
|
- The assistant orchestrates subagents, merges branches, and iterates on CI
|
||||||
|
- You only review the final output
|
||||||
|
|
||||||
|
The key limitation: opencode is session-based, not a persistent daemon. But for the "fix all issues, one PR" workflow, this is fine — the assistant runs the full pipeline in one shot. Persistent webhook-driven automation isn't available for Gitea, but the one-shot batch approach is simpler and gives you full control over what gets merged.
|
||||||
|
|
||||||
|
### Recommendations for this project
|
||||||
|
- **Do** use the batch pattern: delegate to subagents, let the assistant merge + iterate CI, review once
|
||||||
|
- **Don't** try to run opencode in Gitea Actions — the CI container doesn't have your LLM keys or the interactive context agents need
|
||||||
|
- **If** you want fully hands-off periodic scans, set up a local cron job or systemd timer that runs `opencode run` and posts results to Gitea via API
|
||||||
|
|
||||||
## Gitea API & tea CLI
|
## Gitea API & tea CLI
|
||||||
|
|
||||||
### Check CI status via API
|
### Check CI status via API
|
||||||
|
|||||||
+276
@@ -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 |
|
||||||
@@ -402,6 +402,72 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
|
|||||||
return -1;
|
return -1;
|
||||||
free(config->link_dest);
|
free(config->link_dest);
|
||||||
config->link_dest = dup;
|
config->link_dest = dup;
|
||||||
|
} else if (strcmp(argv[i], "--partial-dir") == 0 && i + 1 < argc) {
|
||||||
|
char* dup = str_dup(argv[++i]);
|
||||||
|
if (!dup) {
|
||||||
|
fprintf(stderr, "Error: memory allocation failed for --partial-dir\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
free(config->partial_dir);
|
||||||
|
config->partial_dir = dup;
|
||||||
|
} else if (strcmp(argv[i], "--suffix") == 0 && i + 1 < argc) {
|
||||||
|
char* dup = str_dup(argv[++i]);
|
||||||
|
if (!dup) {
|
||||||
|
fprintf(stderr, "Error: memory allocation failed for --suffix\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
free(config->suffix);
|
||||||
|
config->suffix = dup;
|
||||||
|
} else if (strcmp(argv[i], "--delete-before") == 0) {
|
||||||
|
config->delete_before = true;
|
||||||
|
} else if (strcmp(argv[i], "-T") == 0 && i + 1 < argc) {
|
||||||
|
int val;
|
||||||
|
if (!parse_positive_int(argv[++i], &val)) {
|
||||||
|
fprintf(stderr, "Error: -T must be a positive integer\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
config->timeout = val;
|
||||||
|
} else if (strcmp(argv[i], "--address") == 0 && i + 1 < argc) {
|
||||||
|
char* dup = str_dup(argv[++i]);
|
||||||
|
if (!dup)
|
||||||
|
return -1;
|
||||||
|
free(config->address);
|
||||||
|
config->address = dup;
|
||||||
|
} else if (strcmp(argv[i], "--bind-address") == 0 && i + 1 < argc) {
|
||||||
|
char* dup = str_dup(argv[++i]);
|
||||||
|
if (!dup)
|
||||||
|
return -1;
|
||||||
|
free(config->bind_address);
|
||||||
|
config->bind_address = dup;
|
||||||
|
} else if (strcmp(argv[i], "--ipv6") == 0) {
|
||||||
|
config->ipv6 = true;
|
||||||
|
} else if (strcmp(argv[i], "--ipv4") == 0) {
|
||||||
|
config->ipv4 = true;
|
||||||
|
} else if (strcmp(argv[i], "--daemon") == 0) {
|
||||||
|
config->daemon = true;
|
||||||
|
} else if (strcmp(argv[i], "--config") == 0 && i + 1 < argc) {
|
||||||
|
char* dup = str_dup(argv[++i]);
|
||||||
|
if (!dup)
|
||||||
|
return -1;
|
||||||
|
free(config->daemon_config);
|
||||||
|
config->daemon_config = dup;
|
||||||
|
} else if (strcmp(argv[i], "--server") == 0) {
|
||||||
|
config->server_mode = true;
|
||||||
|
} else if (strcmp(argv[i], "--checksum") == 0) {
|
||||||
|
config->checksum = true;
|
||||||
|
} else if (strcmp(argv[i], "--compress-choice") == 0 && i + 1 < argc) {
|
||||||
|
char* dup = str_dup(argv[++i]);
|
||||||
|
if (!dup)
|
||||||
|
return -1;
|
||||||
|
free(config->compress_choice);
|
||||||
|
config->compress_choice = dup;
|
||||||
|
} else if (strcmp(argv[i], "--compress-level") == 0 && i + 1 < argc) {
|
||||||
|
int val;
|
||||||
|
if (!parse_positive_int(argv[++i], &val)) {
|
||||||
|
fprintf(stderr, "Error: --compress-level must be a positive integer\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
config->compression_level = val;
|
||||||
} else if (argv[i][0] == '-') {
|
} else if (argv[i][0] == '-') {
|
||||||
fprintf(stderr, "Unknown option: %s\n", argv[i]);
|
fprintf(stderr, "Unknown option: %s\n", argv[i]);
|
||||||
print_usage();
|
print_usage();
|
||||||
@@ -507,16 +573,23 @@ static void print_usage(void) {
|
|||||||
printf(" --key <path> TLS private key file (PEM)\n");
|
printf(" --key <path> TLS private key file (PEM)\n");
|
||||||
printf(" --ca <path> TLS CA certificate file (PEM)\n");
|
printf(" --ca <path> TLS CA certificate file (PEM)\n");
|
||||||
printf(" --timeout <sec> I/O timeout in seconds (default: 30)\n");
|
printf(" --timeout <sec> I/O timeout in seconds (default: 30)\n");
|
||||||
|
printf(" -T <sec> Alias for --timeout\n");
|
||||||
printf(" --contimeout <sec> Connection timeout in seconds (default: 10)\n");
|
printf(" --contimeout <sec> Connection timeout in seconds (default: 10)\n");
|
||||||
|
printf(" --address <host> Server hostname/IP to connect to\n");
|
||||||
|
printf(" --bind-address <ip> Bind to specific local address\n");
|
||||||
|
printf(" --ipv6 Prefer IPv6 connections\n");
|
||||||
|
printf(" --ipv4 Prefer IPv4 connections\n");
|
||||||
printf(" -q, --quiet Suppress non-error output\n");
|
printf(" -q, --quiet Suppress non-error output\n");
|
||||||
printf(" --silent Alias for --quiet\n");
|
printf(" --silent Alias for --quiet\n");
|
||||||
printf(" --backup Backup existing files before overwriting\n");
|
printf(" --backup Backup existing files before overwriting\n");
|
||||||
printf(" --backup-dir <dir> Directory for backups (requires --backup)\n");
|
printf(" --backup-dir <dir> Directory for backups (requires --backup)\n");
|
||||||
|
printf(" --suffix <str> Backup suffix (default: ~)\n");
|
||||||
printf(" --stats Print transfer statistics at end\n");
|
printf(" --stats Print transfer statistics at end\n");
|
||||||
printf(" --max-depth <n> Maximum directory depth (0=unlimited)\n");
|
printf(" --max-depth <n> Maximum directory depth (0=unlimited)\n");
|
||||||
printf(" --log-file <path> Write log messages to file\n");
|
printf(" --log-file <path> Write log messages to file\n");
|
||||||
printf(" --queue-size <n> Queue capacity for multithreaded mode (default: 100)\n");
|
printf(" --queue-size <n> Queue capacity for multithreaded mode (default: 100)\n");
|
||||||
printf(" --partial Keep partial files on interrupted transfer\n");
|
printf(" --partial Keep partial files on interrupted transfer\n");
|
||||||
|
printf(" --partial-dir <dir> Directory for partial files\n");
|
||||||
printf(" --fastsync-server-path <path>\n");
|
printf(" --fastsync-server-path <path>\n");
|
||||||
printf(" Path to fastsync-server on remote (default: fastsync-server)\n");
|
printf(" Path to fastsync-server on remote (default: fastsync-server)\n");
|
||||||
printf(" -l, --links Copy symlinks as symlinks\n");
|
printf(" -l, --links Copy symlinks as symlinks\n");
|
||||||
@@ -538,6 +611,7 @@ static void print_usage(void) {
|
|||||||
printf(" --inplace Update files in-place (no temp+rename)\n");
|
printf(" --inplace Update files in-place (no temp+rename)\n");
|
||||||
printf(" --append Append data to shorter files\n");
|
printf(" --append Append data to shorter files\n");
|
||||||
printf(" --append-verify Append with verify\n");
|
printf(" --append-verify Append with verify\n");
|
||||||
|
printf(" --delete-before Delete before transfer\n");
|
||||||
printf(" --delete-excluded Also delete excluded files\n");
|
printf(" --delete-excluded Also delete excluded files\n");
|
||||||
printf(" --delete-after Delete after transfer, not before\n");
|
printf(" --delete-after Delete after transfer, not before\n");
|
||||||
printf(" --max-delete <n> Maximum number of files to delete\n");
|
printf(" --max-delete <n> Maximum number of files to delete\n");
|
||||||
@@ -548,6 +622,12 @@ static void print_usage(void) {
|
|||||||
printf(" -R, --relative Use relative paths\n");
|
printf(" -R, --relative Use relative paths\n");
|
||||||
printf(" -e, --rsh <cmd> Specify remote shell\n");
|
printf(" -e, --rsh <cmd> Specify remote shell\n");
|
||||||
printf(" --rsync-path <path> Path to remote binary\n");
|
printf(" --rsync-path <path> Path to remote binary\n");
|
||||||
|
printf(" --daemon Run in daemon mode\n");
|
||||||
|
printf(" --config <path> Path to configuration file\n");
|
||||||
|
printf(" --server Run in server mode\n");
|
||||||
|
printf(" --checksum Skip files based on checksum, not mod-time/size\n");
|
||||||
|
printf(" --compress-choice <alg> Compression algorithm (default: zstd)\n");
|
||||||
|
printf(" --compress-level <n> Compression level (default: 5)\n");
|
||||||
printf(" --temp-dir <dir> Temporary directory for files\n");
|
printf(" --temp-dir <dir> Temporary directory for files\n");
|
||||||
printf(" --compare-dest <dir> Compare destination\n");
|
printf(" --compare-dest <dir> Compare destination\n");
|
||||||
printf(" --copy-dest <dir> Copy destination\n");
|
printf(" --copy-dest <dir> Copy destination\n");
|
||||||
|
|||||||
@@ -25,13 +25,16 @@
|
|||||||
|
|
||||||
#define STREAM_THRESHOLD (64ULL * 1024 * 1024)
|
#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. */
|
/* Print dry-run manifest showing files that would be transferred. Returns 0 on success. */
|
||||||
static int send_dry_run_manifest(Config* config) {
|
static int send_dry_run_manifest(Config* config) {
|
||||||
DirectoryScanner* scanner = directory_scanner_create(
|
DirectoryScanner* scanner = directory_scanner_create(
|
||||||
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
|
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->exclude_count, config->include_patterns, config->include_count, config->max_size,
|
||||||
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
|
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
|
||||||
config->safe_links, config->copy_unsafe_links);
|
config->safe_links, config->copy_unsafe_links, config->checksum);
|
||||||
if (!scanner)
|
if (!scanner)
|
||||||
return -1;
|
return -1;
|
||||||
Chunk* chunk;
|
Chunk* chunk;
|
||||||
@@ -271,6 +274,9 @@ static int send_chunks_multithreaded(void* pipeline_context) {
|
|||||||
if (context->config->transport == TRANSPORT_SSH) {
|
if (context->config->transport == TRANSPORT_SSH) {
|
||||||
if (context->config->use_sendfile) {
|
if (context->config->use_sendfile) {
|
||||||
fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
|
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;
|
return 1;
|
||||||
}
|
}
|
||||||
client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port,
|
client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port,
|
||||||
@@ -283,6 +289,9 @@ static int send_chunks_multithreaded(void* pipeline_context) {
|
|||||||
if (client)
|
if (client)
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
fprintf(stderr, "Error: could not connect to server via TLS\n");
|
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;
|
return thrd_error;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -292,12 +301,18 @@ static int send_chunks_multithreaded(void* pipeline_context) {
|
|||||||
if (client)
|
if (client)
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
fprintf(stderr, "Error: could not connect to server\n");
|
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;
|
return thrd_error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!config_send(client->file_descriptor, context->config)) {
|
if (!config_send(client->file_descriptor, context->config)) {
|
||||||
client_disconnect(client);
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
|
mtx_lock(&context->mutex_progress);
|
||||||
|
context->sender_done = true;
|
||||||
|
mtx_unlock(&context->mutex_progress);
|
||||||
return thrd_error;
|
return thrd_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -316,19 +331,38 @@ static int send_chunks_multithreaded(void* pipeline_context) {
|
|||||||
int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
|
int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
|
||||||
client_disconnect(client);
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
|
mtx_lock(&context->mutex_progress);
|
||||||
|
context->sender_done = true;
|
||||||
|
mtx_unlock(&context->mutex_progress);
|
||||||
return ok ? thrd_success : thrd_error;
|
return ok ? thrd_success : thrd_error;
|
||||||
|
|
||||||
send_fail:
|
send_fail:
|
||||||
client_disconnect(client);
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
|
mtx_lock(&context->mutex_progress);
|
||||||
|
context->sender_done = true;
|
||||||
|
mtx_unlock(&context->mutex_progress);
|
||||||
return thrd_error;
|
return thrd_error;
|
||||||
}
|
}
|
||||||
if (send_chunk(client, current_chunk, context->config) != 0) {
|
if (send_chunk(client, current_chunk, context->config) != 0) {
|
||||||
fprintf(stderr, "Error: unexpected error while sending chunk\n");
|
fprintf(stderr, "Error: unexpected error while sending chunk\n");
|
||||||
client_disconnect(client);
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
|
mtx_lock(&context->mutex_progress);
|
||||||
|
context->sender_done = true;
|
||||||
|
mtx_unlock(&context->mutex_progress);
|
||||||
return thrd_error;
|
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);
|
chunk_destroy(current_chunk);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -340,7 +374,8 @@ static int scan_directory_multithreaded(void* pipeline_context) {
|
|||||||
context->config->exclude_patterns, context->config->exclude_count,
|
context->config->exclude_patterns, context->config->exclude_count,
|
||||||
context->config->include_patterns, context->config->include_count, context->config->max_size,
|
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->min_size, context->config->max_depth, 4, context->config->follow_symlinks,
|
||||||
context->config->copy_links, context->config->safe_links, context->config->copy_unsafe_links);
|
context->config->copy_links, context->config->safe_links, context->config->copy_unsafe_links,
|
||||||
|
context->config->checksum);
|
||||||
|
|
||||||
Chunk* current_chunk;
|
Chunk* current_chunk;
|
||||||
while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
|
while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
|
||||||
@@ -398,6 +433,42 @@ 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) {
|
int send_files(Config* config) {
|
||||||
if (config->dry_run)
|
if (config->dry_run)
|
||||||
return send_dry_run_manifest(config);
|
return send_dry_run_manifest(config);
|
||||||
@@ -439,9 +510,10 @@ int send_files(Config* config) {
|
|||||||
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
|
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->exclude_count, config->include_patterns, config->include_count, config->max_size,
|
||||||
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
|
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
|
||||||
config->safe_links, config->copy_unsafe_links);
|
config->safe_links, config->copy_unsafe_links, config->checksum);
|
||||||
Chunk* current_chunk;
|
Chunk* current_chunk;
|
||||||
unsigned long long total_bytes = 0;
|
unsigned long long total_bytes = 0;
|
||||||
|
int total_files = 0;
|
||||||
time_t last_progress = 0;
|
time_t last_progress = 0;
|
||||||
time_t start = time(NULL);
|
time_t start = time(NULL);
|
||||||
ArrayList* manifest = config->use_delete ? array_list_create(free) : NULL;
|
ArrayList* manifest = config->use_delete ? array_list_create(free) : NULL;
|
||||||
@@ -449,6 +521,7 @@ int send_files(Config* config) {
|
|||||||
unsigned long long chunk_bytes = 0;
|
unsigned long long chunk_bytes = 0;
|
||||||
for (int i = 0; i < current_chunk->element_count; i++) {
|
for (int i = 0; i < current_chunk->element_count; i++) {
|
||||||
chunk_bytes += current_chunk->items[i]->data->size;
|
chunk_bytes += current_chunk->items[i]->data->size;
|
||||||
|
total_files++;
|
||||||
if (manifest) {
|
if (manifest) {
|
||||||
const char* p = current_chunk->items[i]->path;
|
const char* p = current_chunk->items[i]->path;
|
||||||
if (*p == '/')
|
if (*p == '/')
|
||||||
@@ -496,11 +569,16 @@ int send_files(Config* config) {
|
|||||||
goto send_fail;
|
goto send_fail;
|
||||||
Status s;
|
Status s;
|
||||||
int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
|
int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
|
||||||
|
double elapsed_total = difftime(time(NULL), start);
|
||||||
if (config->show_progress) {
|
if (config->show_progress) {
|
||||||
double elapsed = difftime(time(NULL), start);
|
double rate = elapsed_total > 0 ? total_bytes / (1048576.0 * elapsed_total) : 0;
|
||||||
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);
|
fprintf(stderr, "\rSent %.1f MB (%.1f MB/s) Done.\n", total_bytes / 1048576.0, rate);
|
||||||
}
|
}
|
||||||
|
if (config->stats) {
|
||||||
|
double rate = elapsed_total > 0 ? total_bytes / (1048576.0 * elapsed_total) : 0;
|
||||||
|
fprintf(stderr, "Stats: %d files, %.1f MB, %.1f MB/s\n", total_files, total_bytes / 1048576.0,
|
||||||
|
rate);
|
||||||
|
}
|
||||||
directory_scanner_destroy(scanner);
|
directory_scanner_destroy(scanner);
|
||||||
client_disconnect(client);
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
@@ -547,7 +625,7 @@ int send_files_multithreaded(Config* config) {
|
|||||||
if (config->use_delete)
|
if (config->use_delete)
|
||||||
context->manifest = array_list_create(free);
|
context->manifest = array_list_create(free);
|
||||||
|
|
||||||
thrd_t scanner, loader, sender;
|
thrd_t scanner, loader, sender, progress;
|
||||||
if (thrd_create(&scanner, scan_directory_multithreaded, context) != thrd_success ||
|
if (thrd_create(&scanner, scan_directory_multithreaded, context) != thrd_success ||
|
||||||
thrd_create(&loader, load_files_multithreaded, context) != thrd_success ||
|
thrd_create(&loader, load_files_multithreaded, context) != thrd_success ||
|
||||||
thrd_create(&sender, send_chunks_multithreaded, context) != thrd_success) {
|
thrd_create(&sender, send_chunks_multithreaded, context) != thrd_success) {
|
||||||
@@ -556,11 +634,26 @@ int send_files_multithreaded(Config* config) {
|
|||||||
return 1;
|
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;
|
int sender_result;
|
||||||
thrd_join(scanner, NULL);
|
thrd_join(scanner, NULL);
|
||||||
thrd_join(loader, NULL);
|
thrd_join(loader, NULL);
|
||||||
thrd_join(sender, &sender_result);
|
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);
|
pipeline_context_sender_destroy(context);
|
||||||
return sender_result == thrd_success ? 0 : 1;
|
return sender_result == thrd_success ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|||||||
+57
-3
@@ -40,7 +40,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
|
|||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size, int max_depth,
|
unsigned long long min_size, int max_depth,
|
||||||
bool follow_symlinks, bool copy_links, bool safe_links,
|
bool follow_symlinks, bool copy_links, bool safe_links,
|
||||||
bool copy_unsafe_links) {
|
bool copy_unsafe_links, bool checksum) {
|
||||||
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
|
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
|
||||||
if (scanner == NULL)
|
if (scanner == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -61,6 +61,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
|
|||||||
scanner->copy_links = copy_links;
|
scanner->copy_links = copy_links;
|
||||||
scanner->safe_links = safe_links;
|
scanner->safe_links = safe_links;
|
||||||
scanner->copy_unsafe_links = copy_unsafe_links;
|
scanner->copy_unsafe_links = copy_unsafe_links;
|
||||||
|
scanner->checksum = checksum;
|
||||||
queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0));
|
queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0));
|
||||||
return scanner;
|
return scanner;
|
||||||
}
|
}
|
||||||
@@ -276,6 +277,7 @@ typedef struct {
|
|||||||
bool copy_links;
|
bool copy_links;
|
||||||
bool safe_links;
|
bool safe_links;
|
||||||
bool copy_unsafe_links;
|
bool copy_unsafe_links;
|
||||||
|
bool checksum;
|
||||||
} ParallelWorkerArg;
|
} ParallelWorkerArg;
|
||||||
|
|
||||||
static int parallel_worker_thread(void* arg) {
|
static int parallel_worker_thread(void* arg) {
|
||||||
@@ -284,7 +286,7 @@ static int parallel_worker_thread(void* arg) {
|
|||||||
DirectoryScanner* ds = directory_scanner_create(
|
DirectoryScanner* ds = directory_scanner_create(
|
||||||
wa->dirs[i], wa->use_metadata, wa->chunk_size, wa->exclude_patterns, wa->exclude_count,
|
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->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->follow_symlinks, wa->copy_links, wa->safe_links, wa->copy_unsafe_links, wa->checksum);
|
||||||
Chunk* chunk;
|
Chunk* chunk;
|
||||||
while ((chunk = directory_scanner_next(ds)) != NULL) {
|
while ((chunk = directory_scanner_next(ds)) != NULL) {
|
||||||
queue_enqueue_multithreaded(wa->ps->result_queue, chunk, &wa->ps->result_mutex,
|
queue_enqueue_multithreaded(wa->ps->result_queue, chunk, &wa->ps->result_mutex,
|
||||||
@@ -312,7 +314,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
|
|||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size, int max_depth,
|
unsigned long long min_size, int max_depth,
|
||||||
int num_threads, bool follow_symlinks, bool copy_links,
|
int num_threads, bool follow_symlinks, bool copy_links,
|
||||||
bool safe_links, bool copy_unsafe_links) {
|
bool safe_links, bool copy_unsafe_links, bool checksum) {
|
||||||
ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
|
ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
|
||||||
if (!ps)
|
if (!ps)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -345,11 +347,62 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
|
|||||||
char* cur_path = path_cat(root_directory, entry->d_name);
|
char* cur_path = path_cat(root_directory, entry->d_name);
|
||||||
if (!cur_path)
|
if (!cur_path)
|
||||||
continue;
|
continue;
|
||||||
|
struct stat lstats;
|
||||||
|
if (lstat(cur_path, &lstats) != 0) {
|
||||||
|
free(cur_path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
bool is_symlink = S_ISLNK(lstats.st_mode);
|
||||||
|
|
||||||
|
// Skip symlinks unless the user explicitly enabled following/copying them.
|
||||||
|
if (is_symlink && !follow_symlinks && !copy_links && !safe_links && !copy_unsafe_links) {
|
||||||
|
free(cur_path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --safe-links: reject symlinks pointing outside the source tree.
|
||||||
|
if (is_symlink && safe_links) {
|
||||||
|
char link_target[4096];
|
||||||
|
ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
|
||||||
|
if (len < 0) {
|
||||||
|
free(cur_path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
link_target[len] = 0;
|
||||||
|
if (link_target[0] == '/') {
|
||||||
|
free(cur_path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --copy-unsafe-links (without --copy-links): only copy absolute symlinks.
|
||||||
|
if (is_symlink && copy_unsafe_links && !copy_links) {
|
||||||
|
char link_target[4096];
|
||||||
|
ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
|
||||||
|
if (len < 0) {
|
||||||
|
free(cur_path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
link_target[len] = 0;
|
||||||
|
bool unsafe = (link_target[0] == '/');
|
||||||
|
if (!unsafe) {
|
||||||
|
free(cur_path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine whether to use lstat or stat results for the entry.
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
bool use_lstat_res = is_symlink && follow_symlinks && !copy_links;
|
||||||
|
if (use_lstat_res) {
|
||||||
|
st = lstats;
|
||||||
|
} else {
|
||||||
if (stat(cur_path, &st) != 0) {
|
if (stat(cur_path, &st) != 0) {
|
||||||
free(cur_path);
|
free(cur_path);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (S_ISDIR(st.st_mode)) {
|
if (S_ISDIR(st.st_mode)) {
|
||||||
array_list_add(subdirs, cur_path);
|
array_list_add(subdirs, cur_path);
|
||||||
} else {
|
} else {
|
||||||
@@ -475,6 +528,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
|
|||||||
wa->copy_links = copy_links;
|
wa->copy_links = copy_links;
|
||||||
wa->safe_links = safe_links;
|
wa->safe_links = safe_links;
|
||||||
wa->copy_unsafe_links = copy_unsafe_links;
|
wa->copy_unsafe_links = copy_unsafe_links;
|
||||||
|
wa->checksum = checksum;
|
||||||
start += count;
|
start += count;
|
||||||
if (thrd_create(&ps->threads[t], parallel_worker_thread, wa) != thrd_success) {
|
if (thrd_create(&ps->threads[t], parallel_worker_thread, wa) != thrd_success) {
|
||||||
for (int j = 0; j < count; j++)
|
for (int j = 0; j < count; j++)
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ typedef struct {
|
|||||||
bool copy_links;
|
bool copy_links;
|
||||||
bool safe_links;
|
bool safe_links;
|
||||||
bool copy_unsafe_links;
|
bool copy_unsafe_links;
|
||||||
|
bool checksum;
|
||||||
} DirectoryScanner;
|
} DirectoryScanner;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -45,7 +46,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
|
|||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size, int max_depth,
|
unsigned long long min_size, int max_depth,
|
||||||
bool follow_symlinks, bool copy_links, bool safe_links,
|
bool follow_symlinks, bool copy_links, bool safe_links,
|
||||||
bool copy_unsafe_links);
|
bool copy_unsafe_links, bool checksum);
|
||||||
Chunk* directory_scanner_next(DirectoryScanner* scanner);
|
Chunk* directory_scanner_next(DirectoryScanner* scanner);
|
||||||
void directory_scanner_destroy(DirectoryScanner* scanner);
|
void directory_scanner_destroy(DirectoryScanner* scanner);
|
||||||
|
|
||||||
@@ -55,7 +56,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
|
|||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size, int max_depth,
|
unsigned long long min_size, int max_depth,
|
||||||
int num_threads, bool follow_symlinks, bool copy_links,
|
int num_threads, bool follow_symlinks, bool copy_links,
|
||||||
bool safe_links, bool copy_unsafe_links);
|
bool safe_links, bool copy_unsafe_links, bool checksum);
|
||||||
Chunk* parallel_scanner_next(ParallelScanner* scanner);
|
Chunk* parallel_scanner_next(ParallelScanner* scanner);
|
||||||
void parallel_scanner_destroy(ParallelScanner* scanner);
|
void parallel_scanner_destroy(ParallelScanner* scanner);
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -126,7 +126,8 @@ void handler(int file_descriptor) {
|
|||||||
close(file_descriptor);
|
close(file_descriptor);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
PipelineContextReceiver* context = pipeline_context_receiver_create(config, q, file_descriptor, ssl);
|
PipelineContextReceiver* context =
|
||||||
|
pipeline_context_receiver_create(config, q, file_descriptor, ssl);
|
||||||
if (context == NULL) {
|
if (context == NULL) {
|
||||||
queue_destroy(q);
|
queue_destroy(q);
|
||||||
config_delete(config);
|
config_delete(config);
|
||||||
|
|||||||
@@ -12,6 +12,9 @@
|
|||||||
#include "metadata.h"
|
#include "metadata.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
|
|
||||||
|
/* Maximum individual file data size within a chunk (64 MB) */
|
||||||
|
#define MAX_FILE_DATA_SIZE (64ULL * 1024 * 1024)
|
||||||
|
|
||||||
Chunk* chunk_create(File** items, int element_count) {
|
Chunk* chunk_create(File** items, int element_count) {
|
||||||
Chunk* chunk = (Chunk*)malloc(sizeof(Chunk));
|
Chunk* chunk = (Chunk*)malloc(sizeof(Chunk));
|
||||||
if (chunk == NULL) {
|
if (chunk == NULL) {
|
||||||
@@ -157,6 +160,14 @@ Chunk* chunk_deserialize(Data* data, bool use_metadata) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reject individual file data larger than the maximum allowed size.
|
||||||
|
if (file_data_size > MAX_FILE_DATA_SIZE) {
|
||||||
|
log_message(LOG_LEVEL_ERROR, "File data size %zu exceeds maximum %llu", file_data_size,
|
||||||
|
(unsigned long long)MAX_FILE_DATA_SIZE);
|
||||||
|
array_list_delete(files);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
void* file_data = malloc(file_data_size);
|
void* file_data = malloc(file_data_size);
|
||||||
if (file_data == NULL) {
|
if (file_data == NULL) {
|
||||||
perror("Could not allocate memory for file data");
|
perror("Could not allocate memory for file data");
|
||||||
@@ -210,6 +221,15 @@ Chunk* receive_chunk_data(int fd, const Config* config) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reject chunks larger than the maximum allowed size to prevent OOM.
|
||||||
|
if (data_to_process->size > MAX_CHUNK_SIZE) {
|
||||||
|
log_message(LOG_LEVEL_ERROR, "Chunk size %zu exceeds maximum %llu", data_to_process->size,
|
||||||
|
(unsigned long long)MAX_CHUNK_SIZE);
|
||||||
|
data_destroy(data_to_process);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
Chunk* chunk = chunk_deserialize(data_to_process, config->use_metadata);
|
Chunk* chunk = chunk_deserialize(data_to_process, config->use_metadata);
|
||||||
data_destroy(data_to_process);
|
data_destroy(data_to_process);
|
||||||
if (chunk == NULL)
|
if (chunk == NULL)
|
||||||
|
|||||||
@@ -89,6 +89,18 @@ Config* config_create(void) {
|
|||||||
config->compare_dest = NULL;
|
config->compare_dest = NULL;
|
||||||
config->copy_dest = NULL;
|
config->copy_dest = NULL;
|
||||||
config->link_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;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,6 +155,12 @@ void config_delete(Config* config) {
|
|||||||
free(config->compare_dest);
|
free(config->compare_dest);
|
||||||
free(config->copy_dest);
|
free(config->copy_dest);
|
||||||
free(config->link_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) {
|
if (config->filters) {
|
||||||
array_list_delete(config->filters);
|
array_list_delete(config->filters);
|
||||||
}
|
}
|
||||||
@@ -224,6 +242,18 @@ bool config_send(int file_descriptor, const Config* config) {
|
|||||||
return false;
|
return false;
|
||||||
if (!send_str(file_descriptor, config->temp_dir ? config->temp_dir : ""))
|
if (!send_str(file_descriptor, config->temp_dir ? config->temp_dir : ""))
|
||||||
return false;
|
return false;
|
||||||
|
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;
|
||||||
Status status;
|
Status status;
|
||||||
if (!receive_status(file_descriptor, &status))
|
if (!receive_status(file_descriptor, &status))
|
||||||
return false;
|
return false;
|
||||||
@@ -421,6 +451,31 @@ Config* config_receive(int file_descriptor) {
|
|||||||
config->temp_dir = receive_str(file_descriptor);
|
config->temp_dir = receive_str(file_descriptor);
|
||||||
if (config->temp_dir == NULL)
|
if (config->temp_dir == NULL)
|
||||||
goto error;
|
goto error;
|
||||||
|
if (!receive_int(file_descriptor, &tmp))
|
||||||
|
goto error;
|
||||||
|
config->partial = tmp;
|
||||||
|
config->partial_dir = receive_str(file_descriptor);
|
||||||
|
if (config->partial_dir == NULL)
|
||||||
|
goto error;
|
||||||
|
config->suffix = receive_str(file_descriptor);
|
||||||
|
if (config->suffix == NULL)
|
||||||
|
goto error;
|
||||||
|
if (!receive_int(file_descriptor, &tmp))
|
||||||
|
goto error;
|
||||||
|
config->delete_before = tmp;
|
||||||
|
if (!receive_int(file_descriptor, &tmp))
|
||||||
|
goto error;
|
||||||
|
config->checksum = tmp;
|
||||||
|
config->compress_choice = receive_str(file_descriptor);
|
||||||
|
if (config->compress_choice == NULL)
|
||||||
|
goto error;
|
||||||
|
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->server_host = str_dup("127.0.0.1");
|
config->server_host = str_dup("127.0.0.1");
|
||||||
config->server_port = 8080;
|
config->server_port = 8080;
|
||||||
if (!send_status(file_descriptor, STATUS_OK))
|
if (!send_status(file_descriptor, STATUS_OK))
|
||||||
@@ -434,6 +489,9 @@ error:
|
|||||||
free(config->server_host);
|
free(config->server_host);
|
||||||
free(config->backup_dir);
|
free(config->backup_dir);
|
||||||
free(config->temp_dir);
|
free(config->temp_dir);
|
||||||
|
free(config->partial_dir);
|
||||||
|
free(config->suffix);
|
||||||
|
free(config->compress_choice);
|
||||||
free(config);
|
free(config);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,6 +100,32 @@ typedef struct Config {
|
|||||||
char* compare_dest;
|
char* compare_dest;
|
||||||
char* copy_dest;
|
char* copy_dest;
|
||||||
char* link_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;
|
} Config;
|
||||||
|
|
||||||
#define PROTOCOL_VERSION "1.3.0"
|
#define PROTOCOL_VERSION "1.3.0"
|
||||||
|
|||||||
+105
-23
@@ -35,7 +35,8 @@ File* file_create(const char* path) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy(file->path, path);
|
memcpy(file->path, path, path_len);
|
||||||
|
file->path[path_len] = '\0';
|
||||||
file->data = data_create_reserve(0);
|
file->data = data_create_reserve(0);
|
||||||
if (file->data == NULL) {
|
if (file->data == NULL) {
|
||||||
free(file->path);
|
free(file->path);
|
||||||
@@ -129,22 +130,29 @@ 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 file_save_to_disk(const char* root_directory, File* file, const Config* config) {
|
||||||
(void)config;
|
bool backup_enabled = config && config->backup;
|
||||||
|
bool inplace = config && config->inplace;
|
||||||
|
bool sparse = config && config->preserve_sparse;
|
||||||
|
const char* backup_suffix = (config && config->suffix) ? config->suffix : "~";
|
||||||
|
const char* backup_dir = (config && config->backup_dir) ? config->backup_dir : NULL;
|
||||||
|
const char* partial_dir = (config && config->partial_dir) ? config->partial_dir : NULL;
|
||||||
|
|
||||||
if (has_path_traversal(file->path)) {
|
if (has_path_traversal(file->path)) {
|
||||||
log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path);
|
log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resolve the destination root to its real path, preventing symlink-based escapes.
|
char* resolved_root = NULL;
|
||||||
// If the root does not yet exist, try to create it so realpath can succeed.
|
const char* actual_root =
|
||||||
char* resolved_root = realpath(root_directory, NULL);
|
(partial_dir && config && config->partial) ? partial_dir : root_directory;
|
||||||
|
resolved_root = realpath(actual_root, NULL);
|
||||||
if (resolved_root == NULL) {
|
if (resolved_root == NULL) {
|
||||||
if (mkdir_r(root_directory)) {
|
if (mkdir_r(actual_root)) {
|
||||||
resolved_root = realpath(root_directory, NULL);
|
resolved_root = realpath(actual_root, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (resolved_root == NULL) {
|
if (resolved_root == NULL) {
|
||||||
log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", root_directory);
|
log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", actual_root);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,7 +162,43 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the target directory exists so the parent can be resolved for path safety.
|
if (backup_enabled) {
|
||||||
|
struct stat backup_stat;
|
||||||
|
if (stat(disk_path, &backup_stat) == 0) {
|
||||||
|
char* backup_path = NULL;
|
||||||
|
if (backup_dir) {
|
||||||
|
char* resolved_backup_dir = realpath(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) {
|
||||||
|
const 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);
|
char* dir_dup = str_dup(disk_path);
|
||||||
if (!dir_dup) {
|
if (!dir_dup) {
|
||||||
free(resolved_root);
|
free(resolved_root);
|
||||||
@@ -162,7 +206,6 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
char* dir_str = dirname(dir_dup);
|
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)) {
|
if (!mkdir_r(dir_str)) {
|
||||||
free(dir_dup);
|
free(dir_dup);
|
||||||
free(resolved_root);
|
free(resolved_root);
|
||||||
@@ -178,13 +221,10 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
|
|||||||
return false;
|
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);
|
size_t root_len = strlen(resolved_root);
|
||||||
if (strncmp(resolved_dir, resolved_root, root_len) != 0 ||
|
if (strncmp(resolved_dir, resolved_root, root_len) != 0 ||
|
||||||
(resolved_dir[root_len] != '\0' && resolved_dir[root_len] != '/')) {
|
(resolved_dir[root_len] != '\0' && resolved_dir[root_len] != '/')) {
|
||||||
log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path,
|
log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path, actual_root);
|
||||||
root_directory);
|
|
||||||
free(resolved_dir);
|
free(resolved_dir);
|
||||||
free(resolved_root);
|
free(resolved_root);
|
||||||
free(disk_path);
|
free(disk_path);
|
||||||
@@ -193,7 +233,7 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
|
|||||||
free(resolved_dir);
|
free(resolved_dir);
|
||||||
free(resolved_root);
|
free(resolved_root);
|
||||||
|
|
||||||
bool ok = to_disk(disk_path, file->data->data, file->data->size);
|
bool ok = to_disk(disk_path, file->data->data, file->data->size, inplace, sparse);
|
||||||
if (ok)
|
if (ok)
|
||||||
file_restore_metadata(disk_path, file->metadata);
|
file_restore_metadata(disk_path, file->metadata);
|
||||||
free(disk_path);
|
free(disk_path);
|
||||||
@@ -478,7 +518,8 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
|
|||||||
return file;
|
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* tmp_path = NULL;
|
||||||
char* directory = NULL;
|
char* directory = NULL;
|
||||||
|
|
||||||
@@ -495,6 +536,39 @@ bool to_disk(const char* path, const void* data, unsigned long long data_size) {
|
|||||||
if (!mkdir_r(directory))
|
if (!mkdir_r(directory))
|
||||||
goto done;
|
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);
|
size_t path_len = strlen(path);
|
||||||
tmp_path = malloc(path_len + 5);
|
tmp_path = malloc(path_len + 5);
|
||||||
if (!tmp_path) {
|
if (!tmp_path) {
|
||||||
@@ -510,6 +584,21 @@ bool to_disk(const char* path, const void* data, unsigned long long data_size) {
|
|||||||
ok = false;
|
ok = false;
|
||||||
goto done;
|
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) {
|
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 temporary file");
|
||||||
fclose(file_pointer);
|
fclose(file_pointer);
|
||||||
@@ -534,13 +623,6 @@ done:
|
|||||||
|
|
||||||
bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
|
bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
|
||||||
bool send_path) {
|
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)
|
if (compression_level > 0)
|
||||||
return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
|
return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
|
||||||
send_path);
|
send_path);
|
||||||
|
|||||||
+2
-1
@@ -34,7 +34,8 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
|
|||||||
size_t file_content_to_buffer(File* file);
|
size_t file_content_to_buffer(File* file);
|
||||||
FileMetadata* file_metadata_create(const struct stat* stats);
|
FileMetadata* file_metadata_create(const struct stat* stats);
|
||||||
void file_metadata_destroy(void* metadata);
|
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);
|
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);
|
File* receive_incremental_check(int fd, const Config* config, bool* skipped);
|
||||||
int receive_manifest(int fd, const Config* config, int* next_status);
|
int receive_manifest(int fd, const Config* config, int* next_status);
|
||||||
|
|||||||
@@ -24,11 +24,14 @@ PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* que
|
|||||||
context->scanner_done = false;
|
context->scanner_done = false;
|
||||||
context->loader_done = false;
|
context->loader_done = false;
|
||||||
context->manifest = NULL;
|
context->manifest = NULL;
|
||||||
|
context->progress_bytes = 0;
|
||||||
|
context->sender_done = false;
|
||||||
if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success ||
|
if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success ||
|
||||||
cnd_init(&context->condition_not_full_scanner) != thrd_success ||
|
cnd_init(&context->condition_not_full_scanner) != thrd_success ||
|
||||||
cnd_init(&context->condition_not_empty_scanner) != thrd_success ||
|
cnd_init(&context->condition_not_empty_scanner) != thrd_success ||
|
||||||
mtx_init(&context->mutex_loader, mtx_plain) != thrd_success ||
|
mtx_init(&context->mutex_loader, mtx_plain) != thrd_success ||
|
||||||
cnd_init(&context->condition_not_full_loader) != 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) {
|
cnd_init(&context->condition_not_empty_loader) != thrd_success) {
|
||||||
perror("Error initializing synchronization objects");
|
perror("Error initializing synchronization objects");
|
||||||
free(context);
|
free(context);
|
||||||
@@ -50,6 +53,7 @@ void pipeline_context_sender_destroy(PipelineContextSender* context) {
|
|||||||
mtx_destroy(&context->mutex_loader);
|
mtx_destroy(&context->mutex_loader);
|
||||||
cnd_destroy(&context->condition_not_full_loader);
|
cnd_destroy(&context->condition_not_full_loader);
|
||||||
cnd_destroy(&context->condition_not_empty_loader);
|
cnd_destroy(&context->condition_not_empty_loader);
|
||||||
|
mtx_destroy(&context->mutex_progress);
|
||||||
free(context);
|
free(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,7 +152,7 @@ int receive_thread(void* pipeline_context) {
|
|||||||
}
|
}
|
||||||
char* full_path = path_cat(config->receive_root_directory, check_path);
|
char* full_path = path_cat(config->receive_root_directory, check_path);
|
||||||
struct stat st;
|
struct stat st;
|
||||||
bool has_old = full_path && stat(full_path, &st) == 0;
|
bool has_old = full_path && lstat(full_path, &st) == 0;
|
||||||
bool match = has_old && (unsigned long long)st.st_size == check_size &&
|
bool match = has_old && (unsigned long long)st.st_size == check_size &&
|
||||||
(long long)st.st_mtime == check_mtime;
|
(long long)st.st_mtime == check_mtime;
|
||||||
if (match)
|
if (match)
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ typedef struct {
|
|||||||
cnd_t condition_not_empty_loader;
|
cnd_t condition_not_empty_loader;
|
||||||
bool loader_done;
|
bool loader_done;
|
||||||
ArrayList* manifest;
|
ArrayList* manifest;
|
||||||
|
mtx_t mutex_progress;
|
||||||
|
unsigned long long progress_bytes;
|
||||||
|
bool sender_done;
|
||||||
} PipelineContextSender;
|
} PipelineContextSender;
|
||||||
|
|
||||||
typedef struct PipelineContextReceiver {
|
typedef struct PipelineContextReceiver {
|
||||||
|
|||||||
@@ -11,6 +11,9 @@
|
|||||||
/* Maximum allowed data payload size for receive_data (100 MB) */
|
/* Maximum allowed data payload size for receive_data (100 MB) */
|
||||||
#define MAX_DATA_PAYLOAD_SIZE (100ULL * 1024 * 1024)
|
#define MAX_DATA_PAYLOAD_SIZE (100ULL * 1024 * 1024)
|
||||||
|
|
||||||
|
/* Maximum chunk size (64 MB) — prevents unbounded allocation from the wire */
|
||||||
|
#define MAX_CHUNK_SIZE (64ULL * 1024 * 1024)
|
||||||
|
|
||||||
typedef struct ssl_st SSL;
|
typedef struct ssl_st SSL;
|
||||||
|
|
||||||
typedef int Status;
|
typedef int Status;
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ Client* client_connect_ssh(const char* destination, int port, const char* server
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
client->file_descriptor = sv[0];
|
client->file_descriptor = sv[0];
|
||||||
client->address.sin_family = AF_UNIX;
|
client->address.ss_family = AF_UNIX;
|
||||||
client->address_length = 0;
|
client->address_length = 0;
|
||||||
client->ssh_child_pid = pid;
|
client->ssh_child_pid = pid;
|
||||||
client->ssl = NULL;
|
client->ssl = NULL;
|
||||||
|
|||||||
+44
-16
@@ -3,6 +3,7 @@
|
|||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <netdb.h>
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -143,6 +144,10 @@ void tcp_set_timeouts(int timeout_sec, int contimeout_sec) {
|
|||||||
g_contimeout_sec = 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) {
|
static void tcp_apply_socket_timeout(int fd) {
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
tv.tv_sec = g_timeout_sec;
|
tv.tv_sec = g_timeout_sec;
|
||||||
@@ -152,19 +157,12 @@ static void tcp_apply_socket_timeout(int fd) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Client* client_create() {
|
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));
|
Client* client = (Client*)malloc(sizeof(Client));
|
||||||
if (client == NULL) {
|
if (client == NULL) {
|
||||||
close(file_descriptor);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
client->file_descriptor = file_descriptor;
|
client->file_descriptor = -1;
|
||||||
client->address.sin_family = AF_INET;
|
memset(&client->address, 0, sizeof(client->address));
|
||||||
client->address_length = sizeof(client->address);
|
client->address_length = sizeof(client->address);
|
||||||
client->ssh_child_pid = -1;
|
client->ssh_child_pid = -1;
|
||||||
client->ssl = NULL;
|
client->ssl = NULL;
|
||||||
@@ -173,23 +171,50 @@ Client* client_create() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool client_connect(Client* client, char* host, int port) {
|
bool client_connect(Client* client, char* host, int port) {
|
||||||
client->address.sin_port = htons(port);
|
struct addrinfo hints;
|
||||||
client->address.sin_family = AF_INET;
|
struct addrinfo* result;
|
||||||
client->address_length = sizeof(client->address);
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
hints.ai_family = AF_UNSPEC;
|
||||||
|
hints.ai_socktype = SOCK_STREAM;
|
||||||
|
hints.ai_protocol = IPPROTO_TCP;
|
||||||
|
|
||||||
if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
|
char port_str[16];
|
||||||
perror("Could not convert host address!");
|
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;
|
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;
|
struct timeval ct;
|
||||||
ct.tv_sec = g_contimeout_sec;
|
ct.tv_sec = g_contimeout_sec;
|
||||||
ct.tv_usec = 0;
|
ct.tv_usec = 0;
|
||||||
setsockopt(client->file_descriptor, SOL_SOCKET, SO_RCVTIMEO, &ct, sizeof(ct));
|
setsockopt(client->file_descriptor, SOL_SOCKET, SO_RCVTIMEO, &ct, sizeof(ct));
|
||||||
setsockopt(client->file_descriptor, SOL_SOCKET, SO_SNDTIMEO, &ct, sizeof(ct));
|
setsockopt(client->file_descriptor, SOL_SOCKET, SO_SNDTIMEO, &ct, sizeof(ct));
|
||||||
|
|
||||||
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
|
memcpy(&client->address, rp->ai_addr, rp->ai_addrlen);
|
||||||
0) {
|
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!");
|
perror("Could not connect to Server!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -205,7 +230,10 @@ void client_disconnect(Client* client) {
|
|||||||
client->ssl = NULL;
|
client->ssl = NULL;
|
||||||
io_set_ssl(NULL);
|
io_set_ssl(NULL);
|
||||||
}
|
}
|
||||||
|
if (client->file_descriptor >= 0) {
|
||||||
close(client->file_descriptor);
|
close(client->file_descriptor);
|
||||||
|
client->file_descriptor = -1;
|
||||||
|
}
|
||||||
if (client->ssh_child_pid > 0) {
|
if (client->ssh_child_pid > 0) {
|
||||||
int status;
|
int status;
|
||||||
waitpid(client->ssh_child_pid, &status, 0);
|
waitpid(client->ssh_child_pid, &status, 0);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ typedef struct Server {
|
|||||||
} Server;
|
} Server;
|
||||||
|
|
||||||
typedef struct Client {
|
typedef struct Client {
|
||||||
struct sockaddr_in address;
|
struct sockaddr_storage address;
|
||||||
unsigned int address_length;
|
unsigned int address_length;
|
||||||
int file_descriptor;
|
int file_descriptor;
|
||||||
pid_t ssh_child_pid;
|
pid_t ssh_child_pid;
|
||||||
@@ -33,5 +33,6 @@ bool client_connect(Client* client, char* host, int port);
|
|||||||
void client_disconnect(Client* client);
|
void client_disconnect(Client* client);
|
||||||
void client_delete(Client* client);
|
void client_delete(Client* client);
|
||||||
void tcp_set_timeouts(int timeout_sec, int contimeout_sec);
|
void tcp_set_timeouts(int timeout_sec, int contimeout_sec);
|
||||||
|
int tcp_get_contimeout_sec(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "transport_tcp.h"
|
#include "transport_tcp.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
#include <netdb.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
@@ -148,13 +149,50 @@ 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,
|
bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
|
||||||
const char* key_path, const char* ca_path) {
|
const char* key_path, const char* ca_path) {
|
||||||
client->address.sin_port = htons(port);
|
struct addrinfo hints;
|
||||||
if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
|
struct addrinfo* result;
|
||||||
perror("Could not convert host address!");
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
|
|
||||||
0) {
|
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 = 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!");
|
perror("Could not connect to Server!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-8
@@ -13,7 +13,7 @@ bool mkdir_r(const char* path) {
|
|||||||
char* path_duplicate = malloc(strlen(path) + 1);
|
char* path_duplicate = malloc(strlen(path) + 1);
|
||||||
if (!path_duplicate)
|
if (!path_duplicate)
|
||||||
return false;
|
return false;
|
||||||
strcpy(path_duplicate, path);
|
memcpy(path_duplicate, path, strlen(path) + 1);
|
||||||
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
|
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
|
||||||
if (!path_current) {
|
if (!path_current) {
|
||||||
free(path_duplicate);
|
free(path_duplicate);
|
||||||
@@ -21,7 +21,8 @@ bool mkdir_r(const char* path) {
|
|||||||
}
|
}
|
||||||
char* path_current_position = path_current;
|
char* path_current_position = path_current;
|
||||||
if (path[0] == '/') {
|
if (path[0] == '/') {
|
||||||
strcpy(path_current, "/");
|
path_current[0] = '/';
|
||||||
|
path_current[1] = '\0';
|
||||||
path_current_position += 1;
|
path_current_position += 1;
|
||||||
} else {
|
} else {
|
||||||
path_current[0] = '\0';
|
path_current[0] = '\0';
|
||||||
@@ -31,10 +32,12 @@ bool mkdir_r(const char* path) {
|
|||||||
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
||||||
bool ok = true;
|
bool ok = true;
|
||||||
while (part != NULL) {
|
while (part != NULL) {
|
||||||
strcpy(path_current_position, part);
|
size_t part_len = strlen(part);
|
||||||
path_current_position += strlen(part) * sizeof(char);
|
memcpy(path_current_position, part, part_len);
|
||||||
strcpy(path_current_position, "/");
|
path_current_position += part_len;
|
||||||
path_current_position += sizeof(char);
|
path_current_position[0] = '/';
|
||||||
|
path_current_position[1] = '\0';
|
||||||
|
path_current_position++;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(path_current, &st) != 0) {
|
if (stat(path_current, &st) != 0) {
|
||||||
if (mkdir(path_current, 0755) != 0) {
|
if (mkdir(path_current, 0755) != 0) {
|
||||||
@@ -53,8 +56,11 @@ bool mkdir_r(const char* path) {
|
|||||||
char* str_dup(const char* string) {
|
char* str_dup(const char* string) {
|
||||||
if (string == NULL)
|
if (string == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
char* new_string = (char*)malloc(strlen(string) + 1);
|
size_t str_len = strlen(string);
|
||||||
strcpy(new_string, string);
|
char* new_string = (char*)malloc(str_len + 1);
|
||||||
|
if (new_string == NULL)
|
||||||
|
return NULL;
|
||||||
|
memcpy(new_string, string, str_len + 1);
|
||||||
return new_string;
|
return new_string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -11,7 +11,7 @@ static void test_file_operations() {
|
|||||||
char* test_content = "Hello, Chunk System!";
|
char* test_content = "Hello, Chunk System!";
|
||||||
unsigned long long test_len = strlen(test_content);
|
unsigned long long test_len = strlen(test_content);
|
||||||
|
|
||||||
to_disk(test_path, test_content, test_len);
|
to_disk(test_path, test_content, test_len, false, false);
|
||||||
|
|
||||||
File* f = file_create(test_path);
|
File* f = file_create(test_path);
|
||||||
EXPECT_NOT_NULL(f);
|
EXPECT_NOT_NULL(f);
|
||||||
@@ -43,8 +43,8 @@ static void test_chunk_operations() {
|
|||||||
char* content2 = "chunk item number 2";
|
char* content2 = "chunk item number 2";
|
||||||
unsigned long long len2 = strlen(content2);
|
unsigned long long len2 = strlen(content2);
|
||||||
|
|
||||||
to_disk(path1, content1, len1);
|
to_disk(path1, content1, len1, false, false);
|
||||||
to_disk(path2, content2, len2);
|
to_disk(path2, content2, len2, false, false);
|
||||||
|
|
||||||
struct stat st1, st2;
|
struct stat st1, st2;
|
||||||
stat(path1, &st1);
|
stat(path1, &st1);
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ static void test_chunk_compress_decompress_roundtrip() {
|
|||||||
char* content2 = "chunk compression test file 2 with more data";
|
char* content2 = "chunk compression test file 2 with more data";
|
||||||
unsigned long long len2 = strlen(content2);
|
unsigned long long len2 = strlen(content2);
|
||||||
|
|
||||||
to_disk(path1, content1, len1);
|
to_disk(path1, content1, len1, false, false);
|
||||||
to_disk(path2, content2, len2);
|
to_disk(path2, content2, len2, false, false);
|
||||||
|
|
||||||
struct stat st1, st2;
|
struct stat st1, st2;
|
||||||
EXPECT_EQ_INT(stat(path1, &st1), 0);
|
EXPECT_EQ_INT(stat(path1, &st1), 0);
|
||||||
|
|||||||
+6
-6
@@ -34,7 +34,7 @@ static void test_file_destroy_normal() {
|
|||||||
|
|
||||||
static void test_file_load_data() {
|
static void test_file_load_data() {
|
||||||
const char* content = "Hello Load Test";
|
const char* content = "Hello Load Test";
|
||||||
EXPECT_TRUE(to_disk("test_file_load_data.txt", content, strlen(content)));
|
EXPECT_TRUE(to_disk("test_file_load_data.txt", content, strlen(content), false, false));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("test_file_load_data.txt", &st), 0);
|
EXPECT_EQ_INT(stat("test_file_load_data.txt", &st), 0);
|
||||||
@@ -89,7 +89,7 @@ static void test_file_save_to_disk() {
|
|||||||
|
|
||||||
static void test_to_disk_basic() {
|
static void test_to_disk_basic() {
|
||||||
const char* content = "Basic to_disk test";
|
const char* content = "Basic to_disk test";
|
||||||
EXPECT_TRUE(to_disk("test_to_disk_basic.txt", content, strlen(content)));
|
EXPECT_TRUE(to_disk("test_to_disk_basic.txt", content, strlen(content), false, false));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("test_to_disk_basic.txt", &st), 0);
|
EXPECT_EQ_INT(stat("test_to_disk_basic.txt", &st), 0);
|
||||||
@@ -108,7 +108,7 @@ static void test_to_disk_basic() {
|
|||||||
|
|
||||||
static void test_to_disk_creates_dirs() {
|
static void test_to_disk_creates_dirs() {
|
||||||
const char* content = "Nested dir test";
|
const char* content = "Nested dir test";
|
||||||
EXPECT_TRUE(to_disk("test_nested_tmp/nested/file.txt", content, strlen(content)));
|
EXPECT_TRUE(to_disk("test_nested_tmp/nested/file.txt", content, strlen(content), false, false));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("test_nested_tmp/nested/file.txt", &st), 0);
|
EXPECT_EQ_INT(stat("test_nested_tmp/nested/file.txt", &st), 0);
|
||||||
@@ -128,7 +128,7 @@ static void test_to_disk_creates_dirs() {
|
|||||||
|
|
||||||
static void test_file_content_to_buffer() {
|
static void test_file_content_to_buffer() {
|
||||||
const char* content = "Buffer content test";
|
const char* content = "Buffer content test";
|
||||||
EXPECT_TRUE(to_disk("test_buffer_file.txt", content, strlen(content)));
|
EXPECT_TRUE(to_disk("test_buffer_file.txt", content, strlen(content), false, false));
|
||||||
|
|
||||||
File* f = file_create("test_buffer_file.txt");
|
File* f = file_create("test_buffer_file.txt");
|
||||||
EXPECT_NOT_NULL(f);
|
EXPECT_NOT_NULL(f);
|
||||||
@@ -250,7 +250,7 @@ static void test_file_send_no_path() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void test_file_metadata_create() {
|
static void test_file_metadata_create() {
|
||||||
EXPECT_TRUE(to_disk("test_meta_file.txt", "metadata test", 13));
|
EXPECT_TRUE(to_disk("test_meta_file.txt", "metadata test", 13, false, false));
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("test_meta_file.txt", &st), 0);
|
EXPECT_EQ_INT(stat("test_meta_file.txt", &st), 0);
|
||||||
|
|
||||||
@@ -359,7 +359,7 @@ static void test_file_send_single_calls_metadata_and_path() {
|
|||||||
/* Create a real file on disk so we can have metadata */
|
/* Create a real file on disk so we can have metadata */
|
||||||
const char* content = "File with metadata";
|
const char* content = "File with metadata";
|
||||||
size_t len = strlen(content);
|
size_t len = strlen(content);
|
||||||
EXPECT_TRUE(to_disk("test_meta_send.txt", content, len));
|
EXPECT_TRUE(to_disk("test_meta_send.txt", content, len, false, false));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("test_meta_send.txt", &st), 0);
|
EXPECT_EQ_INT(stat("test_meta_send.txt", &st), 0);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
static void test_sendfile_basic() {
|
static void test_sendfile_basic() {
|
||||||
const char* content = "Hello from sendfile test!";
|
const char* content = "Hello from sendfile test!";
|
||||||
size_t len = strlen(content);
|
size_t len = strlen(content);
|
||||||
EXPECT_TRUE(to_disk("test_sendfile_basic.txt", content, len));
|
EXPECT_TRUE(to_disk("test_sendfile_basic.txt", content, len, false, false));
|
||||||
|
|
||||||
File* file = file_create("test_sendfile_basic.txt");
|
File* file = file_create("test_sendfile_basic.txt");
|
||||||
EXPECT_NOT_NULL(file);
|
EXPECT_NOT_NULL(file);
|
||||||
@@ -77,7 +77,7 @@ static void test_sendfile_basic() {
|
|||||||
static void test_sendfile_empty_file() {
|
static void test_sendfile_empty_file() {
|
||||||
const char* content = "";
|
const char* content = "";
|
||||||
size_t len = 0;
|
size_t len = 0;
|
||||||
EXPECT_TRUE(to_disk("test_sendfile_empty.txt", content, len));
|
EXPECT_TRUE(to_disk("test_sendfile_empty.txt", content, len, false, false));
|
||||||
|
|
||||||
File* file = file_create("test_sendfile_empty.txt");
|
File* file = file_create("test_sendfile_empty.txt");
|
||||||
EXPECT_NOT_NULL(file);
|
EXPECT_NOT_NULL(file);
|
||||||
@@ -156,7 +156,7 @@ static void test_sendfile_missing_file() {
|
|||||||
static void test_sendfile_compression_fallback() {
|
static void test_sendfile_compression_fallback() {
|
||||||
const char* content = "Compression fallback content";
|
const char* content = "Compression fallback content";
|
||||||
size_t len = strlen(content);
|
size_t len = strlen(content);
|
||||||
EXPECT_TRUE(to_disk("test_sendfile_comp.txt", content, len));
|
EXPECT_TRUE(to_disk("test_sendfile_comp.txt", content, len, false, false));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("test_sendfile_comp.txt", &st), 0);
|
EXPECT_EQ_INT(stat("test_sendfile_comp.txt", &st), 0);
|
||||||
@@ -222,7 +222,7 @@ static void test_sendfile_compression_fallback() {
|
|||||||
static void test_sendfile_no_path() {
|
static void test_sendfile_no_path() {
|
||||||
const char* content = "No path sendfile test";
|
const char* content = "No path sendfile test";
|
||||||
size_t len = strlen(content);
|
size_t len = strlen(content);
|
||||||
EXPECT_TRUE(to_disk("test_sendfile_nopath.txt", content, len));
|
EXPECT_TRUE(to_disk("test_sendfile_nopath.txt", content, len, false, false));
|
||||||
|
|
||||||
File* file = file_create("test_sendfile_nopath.txt");
|
File* file = file_create("test_sendfile_nopath.txt");
|
||||||
EXPECT_NOT_NULL(file);
|
EXPECT_NOT_NULL(file);
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ static void test_fuzz_delta_deserialize() {
|
|||||||
/* Smoke test for metadata_from_buf fuzz target */
|
/* Smoke test for metadata_from_buf fuzz target */
|
||||||
static void test_fuzz_metadata_from_buf() {
|
static void test_fuzz_metadata_from_buf() {
|
||||||
/* Create a real file to get metadata from */
|
/* Create a real file to get metadata from */
|
||||||
EXPECT_TRUE(to_disk("fuzz_meta_test.txt", "metadata test", 13));
|
EXPECT_TRUE(to_disk("fuzz_meta_test.txt", "metadata test", 13, false, false));
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
EXPECT_EQ_INT(stat("fuzz_meta_test.txt", &st), 0);
|
EXPECT_EQ_INT(stat("fuzz_meta_test.txt", &st), 0);
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ static void test_metadata_send_null() {
|
|||||||
static void test_file_restore_metadata() {
|
static void test_file_restore_metadata() {
|
||||||
const char* path = "temp_meta_restore_test.txt";
|
const char* path = "temp_meta_restore_test.txt";
|
||||||
const char* content = "test content";
|
const char* content = "test content";
|
||||||
EXPECT_TRUE(to_disk(path, content, strlen(content)));
|
EXPECT_TRUE(to_disk(path, content, strlen(content), false, false));
|
||||||
|
|
||||||
FileMetadata m;
|
FileMetadata m;
|
||||||
m.mode = 0644;
|
m.mode = 0644;
|
||||||
|
|||||||
@@ -116,7 +116,6 @@ static void test_receiver_fd_zero() {
|
|||||||
pipeline_context_receiver_destroy(ctx);
|
pipeline_context_receiver_destroy(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Test that receive_thread completes cleanly when sent FINISHED immediately */
|
/* Test that receive_thread completes cleanly when sent FINISHED immediately */
|
||||||
static void test_receive_thread_finished() {
|
static void test_receive_thread_finished() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create();
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ static void test_property_chunk_roundtrip() {
|
|||||||
for (int i = 0; i < content_len; i++)
|
for (int i = 0; i < content_len; i++)
|
||||||
content[i] = (char)(rand() % 256);
|
content[i] = (char)(rand() % 256);
|
||||||
|
|
||||||
to_disk(path, content, content_len);
|
to_disk(path, content, content_len, false, false);
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
stat(path, &st);
|
stat(path, &st);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
static void test_chunk_deserialize_truncated() {
|
static void test_chunk_deserialize_truncated() {
|
||||||
char* path = "test_rob_trunc.txt";
|
char* path = "test_rob_trunc.txt";
|
||||||
char* content = "hello";
|
char* content = "hello";
|
||||||
to_disk(path, content, strlen(content));
|
to_disk(path, content, strlen(content), false, false);
|
||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
stat(path, &st);
|
stat(path, &st);
|
||||||
|
|||||||
+13
-13
@@ -7,7 +7,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
static void create_test_file(const char* path, const char* content) {
|
static void create_test_file(const char* path, const char* content) {
|
||||||
(void)to_disk(path, content, strlen(content));
|
(void)to_disk(path, content, strlen(content), false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_scanner_single_file() {
|
static void test_scanner_single_file() {
|
||||||
@@ -19,7 +19,7 @@ static void test_scanner_single_file() {
|
|||||||
create_test_file(file1, content1);
|
create_test_file(file1, content1);
|
||||||
|
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
||||||
0, false, false, false, false);
|
0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -48,7 +48,7 @@ static void test_scanner_multiple_files() {
|
|||||||
create_test_file(file2, content2);
|
create_test_file(file2, content2);
|
||||||
|
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
||||||
0, false, false, false, false);
|
0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
const Chunk* chunk = directory_scanner_next(scanner);
|
const Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -88,7 +88,7 @@ static void test_scanner_subdirectory() {
|
|||||||
create_test_file(sub_file, content);
|
create_test_file(sub_file, content);
|
||||||
|
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0,
|
||||||
0, 0, false, false, false, false);
|
0, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
int total_files = 0;
|
int total_files = 0;
|
||||||
@@ -112,7 +112,7 @@ static void test_scanner_empty_directory() {
|
|||||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||||
|
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
||||||
0, false, false, false, false);
|
0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
const Chunk* chunk = directory_scanner_next(scanner);
|
const Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -136,7 +136,7 @@ static void test_scanner_exclude_pattern() {
|
|||||||
|
|
||||||
char* exclude[] = {"*.tmp"};
|
char* exclude[] = {"*.tmp"};
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0,
|
||||||
0, 0, false, false, false, false);
|
0, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -169,7 +169,7 @@ static void test_scanner_exclude_subdirectory() {
|
|||||||
|
|
||||||
char* exclude[] = {"*.tmp"};
|
char* exclude[] = {"*.tmp"};
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0,
|
||||||
0, 0, 0, false, false, false, false);
|
0, 0, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
int total = 0;
|
int total = 0;
|
||||||
@@ -207,7 +207,7 @@ static void test_scanner_include_and_exclude() {
|
|||||||
char* exclude[] = {"*.bak"};
|
char* exclude[] = {"*.bak"};
|
||||||
char* include[] = {"*.txt", "*.log"};
|
char* include[] = {"*.txt", "*.log"};
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2,
|
||||||
0, 0, 0, false, false, false, false);
|
0, 0, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -244,7 +244,7 @@ static void test_scanner_max_size() {
|
|||||||
|
|
||||||
/* max_size = 10 — only files <= 10 bytes */
|
/* max_size = 10 — only files <= 10 bytes */
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10,
|
||||||
0, 0, false, false, false, false);
|
0, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -272,7 +272,7 @@ static void test_scanner_min_size() {
|
|||||||
|
|
||||||
/* min_size = 1 — only files >= 1 byte */
|
/* min_size = 1 — only files >= 1 byte */
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1,
|
||||||
0, false, false, false, false);
|
0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -302,7 +302,7 @@ static void test_scanner_size_range() {
|
|||||||
|
|
||||||
/* Only files between 3 and 20 bytes */
|
/* Only files between 3 and 20 bytes */
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20,
|
||||||
3, 0, false, false, false, false);
|
3, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -338,7 +338,7 @@ static void test_scanner_mixed_patterns() {
|
|||||||
char* exclude[] = {"*.bak"};
|
char* exclude[] = {"*.bak"};
|
||||||
char* include[] = {"*.txt"};
|
char* include[] = {"*.txt"};
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1,
|
||||||
10, 3, 0, false, false, false, false);
|
10, 3, 0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
@@ -369,7 +369,7 @@ static void test_scanner_no_patterns() {
|
|||||||
create_test_file(f2, "second");
|
create_test_file(f2, "second");
|
||||||
|
|
||||||
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
DirectoryScanner* scanner = directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0,
|
||||||
0, false, false, false, false);
|
0, false, false, false, false, false);
|
||||||
EXPECT_NOT_NULL(scanner);
|
EXPECT_NOT_NULL(scanner);
|
||||||
|
|
||||||
Chunk* chunk = directory_scanner_next(scanner);
|
Chunk* chunk = directory_scanner_next(scanner);
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ static void test_server_delete_null() {
|
|||||||
static void test_client_create() {
|
static void test_client_create() {
|
||||||
Client* c = client_create();
|
Client* c = client_create();
|
||||||
EXPECT_NOT_NULL(c);
|
EXPECT_NOT_NULL(c);
|
||||||
EXPECT_TRUE(c->file_descriptor >= 0);
|
EXPECT_TRUE(c->file_descriptor == -1);
|
||||||
EXPECT_EQ_INT(c->address.sin_family, AF_INET);
|
EXPECT_EQ_INT(c->address.ss_family, 0);
|
||||||
EXPECT_EQ_INT(c->ssh_child_pid, -1);
|
EXPECT_EQ_INT(c->ssh_child_pid, -1);
|
||||||
EXPECT_NULL(c->ssl);
|
EXPECT_NULL(c->ssl);
|
||||||
EXPECT_NULL(c->ssl_ctx);
|
EXPECT_NULL(c->ssl_ctx);
|
||||||
|
|||||||
Reference in New Issue
Block a user