Compare commits

..

17 Commits

Author SHA1 Message Date
TapTap 326aa5d08b feat: update AI automation agents, add reviewer agent, fix leaks, enhance CI
CI / lint (push) Successful in 7s
CI / lint (pull_request) Successful in 7s
CI / build-and-test (push) Successful in 54s
CI / sanitizers (address) (push) Failing after 18s
CI / clang-tidy (push) Successful in 8s
CI / build-and-test (pull_request) Successful in 53s
CI / sanitizers (address) (pull_request) Failing after 17s
CI / clang-tidy (pull_request) Successful in 5s
Agents:
- cmake-expert: fix stale CMake version (4.1 -> 3.22), add OpenSSL/xxHash deps
- integrator: fix stale test.py references to tests/integration/, update CI docs
- test-writer: update integration test patterns for modular test structure
- reviewer: new comprehensive PR reviewer (code, build, CI, docs, quality)

Bug fixes:
- delta.c: set instructions[i].type = DELTA_INSTR_LITERAL in deserialize
- scanner.c: free ArrayList when directory_scanner_next returns NULL

CI:
- Add sanitizer job (ASan + UBSan) with LSAN suppressions for pre-existing leaks
- Add clang-tidy job with proper warning/error detection
- Remove || true masking (fixes now make sanitizer useful)

Cleanup:
- gitignore build-asan/
- .lsan-suppressions.txt for known CLI config leaks
2026-07-19 22:38:16 +02:00
TapTap 8a222bffa6 Merge pull request 'ci: add static analysis, sanitizers, and formatting enforcement' (#24) from ci/tier1-review-automation into main
CI / lint (push) Successful in 7s
CI / build-and-test (push) Successful in 53s
CI / sanitizers (address) (push) Successful in 14s
Reviewed-on: #24
2026-07-19 18:10:06 +02:00
TapTap 4982f9f47d chore: remove build-asan from tracking, add to .gitignore
CI / lint (push) Successful in 7s
CI / lint (pull_request) Successful in 7s
CI / build-and-test (push) Successful in 53s
CI / sanitizers (address) (push) Successful in 13s
CI / build-and-test (pull_request) Successful in 53s
CI / sanitizers (address) (pull_request) Successful in 14s
2026-07-19 17:15:58 +02:00
TapTap 8531f9e4c1 fix: set DELTA_INSTR_LITERAL type in deserialize and fix error path leaks
CI / lint (push) Successful in 7s
CI / lint (pull_request) Successful in 8s
CI / build-and-test (push) Successful in 53s
CI / sanitizers (address) (push) Successful in 14s
CI / build-and-test (pull_request) Successful in 52s
CI / sanitizers (address) (pull_request) Successful in 14s
2026-07-19 17:15:43 +02:00
TapTap 413f69de90 fix: const-correct delta.c and use unread variable in test for cppcheck
CI / lint (push) Successful in 7s
CI / lint (pull_request) Successful in 8s
CI / build-and-test (push) Successful in 52s
CI / sanitizers (address) (push) Failing after 13s
CI / build-and-test (pull_request) Successful in 53s
CI / sanitizers (address) (pull_request) Failing after 13s
2026-07-19 17:07:14 +02:00
TapTap d7b9d4dbbc fix: apply clang-format to merged code from main
CI / lint (push) Failing after 8s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / lint (pull_request) Failing after 7s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
2026-07-19 17:04:05 +02:00
TapTap b9840b123d Merge remote-tracking branch 'origin/main' into ci/tier1-review-automation
CI / lint (push) Failing after 3s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / lint (pull_request) Failing after 2s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
# Conflicts:
#	src/client/client_send.c
#	src/shared/config.c
#	src/shared/file.c
#	src/shared/file.h
#	src/shared/protocol.h
2026-07-19 16:58:53 +02:00
TapTap 971a070b65 fix: const-correct config_send and file_send_single_calls for cppcheck
CI / lint (push) Successful in 6s
CI / lint (pull_request) Successful in 6s
CI / build-and-test (push) Successful in 47s
CI / sanitizers (address) (push) Successful in 4s
CI / build-and-test (pull_request) Successful in 47s
CI / sanitizers (address) (pull_request) Successful in 4s
2026-07-19 16:44:01 +02:00
TapTap dc7ada552b fix: const-correct protocol send functions, remove duplicate typedef, null check
CI / lint (push) Failing after 6s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / lint (pull_request) Failing after 5s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
- send_n_data: void* data → const void* data
- send_str: char* data → const char* data
- send_data: Data* data → const Data* data
- Remove duplicate typedef struct ssl_st SSL in protocol.h
- Add NULL check after malloc in directory_scanner_create
2026-07-19 16:40:47 +02:00
TapTap 5dfc262cf7 fix: scanner leak, remove TSan (Docker incompatible)
CI / lint (push) Successful in 6s
CI / lint (pull_request) Successful in 5s
CI / build-and-test (push) Successful in 48s
CI / sanitizers (address) (push) Successful in 5s
CI / build-and-test (pull_request) Successful in 47s
CI / sanitizers (address) (pull_request) Successful in 4s
- Fix ArrayList leak in directory_scanner_next when no files found
- Remove TSan from CI matrix (Docker 'unexpected memory mapping')
- Keep ASan which now passes clean
2026-07-19 16:22:16 +02:00
TapTap ba6d42ea2d fix: const-correct local Config* in multiprocessing.c for cppcheck
CI / lint (push) Successful in 5s
CI / lint (pull_request) Successful in 6s
CI / build-and-test (push) Successful in 47s
CI / sanitizers (address) (push) Failing after 4s
CI / sanitizers (thread) (push) Failing after 4s
CI / build-and-test (pull_request) Successful in 47s
CI / sanitizers (address) (pull_request) Failing after 4s
CI / sanitizers (thread) (pull_request) Failing after 5s
2026-07-19 16:16:28 +02:00
TapTap 256e1d7567 fix: const-correct receive_incremental_check for cppcheck
CI / lint (push) Failing after 6s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / sanitizers (thread) (push) Has been skipped
CI / lint (pull_request) Failing after 5s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (thread) (pull_request) Has been skipped
2026-07-19 16:13:47 +02:00
TapTap f6eeb69d77 ci: use find|xargs for clang-format to fix directory handling
CI / lint (push) Failing after 5s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / sanitizers (thread) (push) Has been skipped
CI / lint (pull_request) Failing after 6s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (thread) (pull_request) Has been skipped
2026-07-19 16:09:13 +02:00
TapTap f899085de4 fix: reformat queue.c/queue.h after const-correctness change
CI / lint (push) Failing after 2s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / sanitizers (thread) (push) Has been skipped
CI / lint (pull_request) Failing after 2s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (thread) (pull_request) Has been skipped
2026-07-19 16:06:57 +02:00
TapTap 5ede5c8bec ci: use fastsync-ci:v7 image with cppcheck and clang-format pre-installed
CI / sanitizers (thread) (push) Has been skipped
CI / lint (pull_request) Failing after 2s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (thread) (pull_request) Has been skipped
CI / lint (push) Failing after 3s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
2026-07-19 16:01:48 +02:00
TapTap 23b1d6660c fix: reformat codebase and fix const-correctness for CI lint
CI / lint (push) Failing after 16s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / sanitizers (thread) (push) Has been skipped
CI / lint (pull_request) Failing after 44s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (thread) (pull_request) Has been skipped
- Reformat all C/H files to match .clang-format (LLVM style)
- Fix 26 cppcheck const-correctness warnings (constParameterPointer,
  constVariablePointer, constVariable)
- Update function declarations in headers to match const parameters
2026-07-19 15:57:31 +02:00
TapTap 02266710fb ci: add static analysis, sanitizers, and formatting enforcement
CI / lint (push) Failing after 16s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / sanitizers (thread) (push) Has been skipped
CI / lint (pull_request) Failing after 30s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (thread) (pull_request) Has been skipped
Add Tier 1 review automation to catch issues before human review:

- Add cppcheck and clang-format to CI lint job
- Add sanitizer matrix (ASan + TSan) CI job
- Enable -Wextra -Wpedantic -Werror in CI build
- Add SANITIZER and STRICT_WARNINGS CMake options
- Add .clang-format for consistent code style
- Update Dockerfile with cppcheck and clang-format
- Fix sign-compare and unused-parameter warnings for -Werror
2026-07-19 15:37:18 +02:00
52 changed files with 1387 additions and 1158 deletions
+10
View File
@@ -0,0 +1,10 @@
BasedOnStyle: LLVM
IndentWidth: 2
ColumnLimit: 100
PointerAlignment: Left
AllowShortFunctionsOnASingleLine: None
SortIncludes: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
BinPackArguments: true
BinPackParameters: true
+28 -21
View File
@@ -3,15 +3,29 @@ name: CI
on: [push, pull_request]
jobs:
lint:
runs-on: ubuntu-latest
container: gitea.tap-tap.win/taptap/fastsync-ci:v7
steps:
- name: Checkout
uses: actions/checkout@v4
- name: clang-format check
run: find src/ tests/ -name '*.c' -o -name '*.h' | xargs clang-format --dry-run --Werror
- name: cppcheck
run: cppcheck --enable=warning,style,performance,portability --suppress=missingIncludeSystem --error-exitcode=1 --inline-suppr src/ tests/
build-and-test:
runs-on: ubuntu-latest
container: gitea.tap-tap.win/taptap/fastsync-ci:v6
container: gitea.tap-tap.win/taptap/fastsync-ci:v7
needs: lint
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Configure
run: cmake -B build -S .
run: cmake -B build -S . -DSTRICT_WARNINGS=ON
- name: Build
run: cmake --build build -j$(nproc)
@@ -22,49 +36,42 @@ jobs:
- name: Integration Tests
run: python3 -m pytest tests/ -v --tb=short
sanitizer:
sanitizers:
runs-on: ubuntu-latest
container: gitea.tap-tap.win/taptap/fastsync-ci:v6
container: gitea.tap-tap.win/taptap/fastsync-ci:v7
needs: lint
strategy:
matrix:
sanitizer: [address]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Configure with ASan + UBSan
run: >
cmake -B build -S .
-DCMAKE_C_FLAGS="-fsanitize=address,undefined -fno-omit-frame-pointer -g"
-DCMAKE_EXE_LINKER_FLAGS="-fsanitize=address,undefined"
- name: Configure
run: cmake -B build-${{ matrix.sanitizer }} -S . -DSANITIZER=${{ matrix.sanitizer }}
- name: Build
run: cmake --build build -j$(nproc)
run: cmake --build build-${{ matrix.sanitizer }} -j$(nproc)
- name: Unit Tests
run: ./build/tests
run: ./build-${{ matrix.sanitizer }}/tests
- name: Integration Tests
run: LSAN_OPTIONS=suppressions=.lsan-suppressions.txt python3 -m pytest tests/ -v --tb=short
clang-tidy:
runs-on: ubuntu-latest
container: gitea.tap-tap.win/taptap/fastsync-ci:v6
container: gitea.tap-tap.win/taptap/fastsync-ci:v7
needs: lint
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install clang-tidy
run: |
apt-get update && apt-get install -y clang-tidy 2>/dev/null || \
echo "::warning title=clang-tidy-skip::clang-tidy not available in container, skipping static analysis"
- name: Configure (generate compile_commands.json)
run: cmake -B build -S .
- name: Run clang-tidy
run: |
if ! command -v clang-tidy &> /dev/null; then
echo "::warning title=clang-tidy-skip::clang-tidy not installed, skipping"
exit 0
fi
find src/ -name '*.c' | xargs clang-tidy -p build \
--checks='-*,bugprone-*,clang-analyzer-*,misc-*,-misc-no-recursion' \
2>&1 | tee clang-tidy-output.txt
+1 -1
View File
@@ -2,4 +2,4 @@ build
data_copied
test_data/
__pycache__/
build-asan/
build-asan
+19 -2
View File
@@ -7,9 +7,26 @@ set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
add_compile_options(-Wall -g -O3)
# add_compile_options(-Wall -g -O1 -fsanitize=address)
# add_link_options(-fsanitize=address)
# --- Sanitizer option ---
set(SANITIZER "none" CACHE STRING "Sanitizer to enable (address, thread, none)")
set_property(CACHE SANITIZER PROPERTY STRINGS address thread none)
if(SANITIZER STREQUAL "address")
add_compile_options(-fsanitize=address -fno-omit-frame-pointer -g)
add_link_options(-fsanitize=address)
elseif(SANITIZER STREQUAL "thread")
add_compile_options(-fsanitize=thread -fno-omit-frame-pointer -g)
add_link_options(-fsanitize=thread)
elseif(NOT SANITIZER STREQUAL "none")
message(FATAL_ERROR "Unknown sanitizer: ${SANITIZER}. Supported values: address, thread, none")
endif()
# --- Strict warnings option ---
option(STRICT_WARNINGS "Enable strict warnings (Wextra, Wpedantic, Werror)" OFF)
if(STRICT_WARNINGS)
add_compile_options(-Wextra -Wpedantic -Werror)
endif()
include(FetchContent)
FetchContent_Declare(
+1 -1
View File
@@ -1,6 +1,6 @@
FROM ubuntu:24.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc g++ make libc6-dev cmake libzstd-dev libssl-dev git ca-certificates curl \
gcc g++ make libc6-dev cmake libzstd-dev libssl-dev git ca-certificates curl cppcheck clang-format \
python3 python3-pip python3-venv openssl openssh-client && \
pip3 install --break-system-packages pytest && \
curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
+14 -11
View File
@@ -38,8 +38,10 @@ static void print_usage(void) {
printf(" --min-size <n> Skip files smaller than n bytes\n");
printf(" --incremental Skip files unchanged since last transfer\n");
printf(" --delta Delta transfer for changed files (requires --incremental)\n");
printf(" --delta-block <n> Delta block size in bytes (default: %d)\n", DELTA_BLOCK_SIZE_DEFAULT);
printf(" --delta-max <n> Max file size for delta transfer (default: %llu)\n", DELTA_MAX_FILE_SIZE);
printf(" --delta-block <n> Delta block size in bytes (default: %d)\n",
DELTA_BLOCK_SIZE_DEFAULT);
printf(" --delta-max <n> Max file size for delta transfer (default: %llu)\n",
DELTA_MAX_FILE_SIZE);
printf(" -m Enable multithreading\n");
printf(" -s Enable chunk serialization\n");
printf(" -f Enable sendfile (TCP only, not with -c or -s)\n");
@@ -65,13 +67,12 @@ int main(int argc, char *argv[]) {
const char* env_save = getenv("FASTSYNC_SAVE_TO_DISK");
bool save_to_disk = false;
if (env_save &&
(strcmp(env_save, "true") == 0 || strcmp(env_save, "1") == 0)) {
if (env_save && (strcmp(env_save, "true") == 0 || strcmp(env_save, "1") == 0)) {
save_to_disk = true;
}
Config *config = config_create(str_dup(PROTOCOL_VERSION), NULL, NULL,
save_to_disk, false, false, false, false, 5, false, 0);
Config* config = config_create(str_dup(PROTOCOL_VERSION), NULL, NULL, save_to_disk, false, false,
false, false, 5, false, 0);
int positional_args[2];
int positional_count = 0;
@@ -93,11 +94,13 @@ int main(int argc, char *argv[]) {
config->use_delete = true;
} else if (strcmp(argv[i], "--exclude") == 0 && i + 1 < argc) {
int idx = config->exclude_count++;
config->exclude_patterns = realloc(config->exclude_patterns, config->exclude_count * sizeof(char *));
config->exclude_patterns =
realloc(config->exclude_patterns, config->exclude_count * sizeof(char*));
config->exclude_patterns[idx] = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--include") == 0 && i + 1 < argc) {
int idx = config->include_count++;
config->include_patterns = realloc(config->include_patterns, config->include_count * sizeof(char *));
config->include_patterns =
realloc(config->include_patterns, config->include_count * sizeof(char*));
config->include_patterns[idx] = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--max-size") == 0 && i + 1 < argc) {
config->max_size = strtoull(argv[++i], NULL, 10);
@@ -127,8 +130,7 @@ int main(int argc, char *argv[]) {
int level = strtol(argv[i + 1], &end_ptr, 10);
if (*end_ptr == '\0') {
config->compression_level = level;
log_message(LOG_LEVEL_INFO, "Set Compression level to %d",
config->compression_level);
log_message(LOG_LEVEL_INFO, "Set Compression level to %d", config->compression_level);
i++;
}
}
@@ -230,7 +232,8 @@ int main(int argc, char *argv[]) {
return 1;
}
if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk serialization)\n");
fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk "
"serialization)\n");
return 1;
}
+110 -94
View File
@@ -22,28 +22,35 @@
#include <threads.h>
#include <time.h>
static int incremental_check(Client *client, File *file,
DeltaSignature **out_sig) {
static int incremental_check(Client* client, File* file, DeltaSignature** out_sig) {
*out_sig = NULL;
if (!send_status(client->file_descriptor, STATUS_CHECK)) return -1;
if (!send_str(client->file_descriptor, file->path)) return -1;
if (!send_status(client->file_descriptor, STATUS_CHECK))
return -1;
if (!send_str(client->file_descriptor, file->path))
return -1;
unsigned long long fsize = file->data->size;
long long mtime = file->metadata ? file->metadata->mtime_sec : 0;
if (!send_n_data(client->file_descriptor, &fsize, sizeof(fsize))) return -1;
if (!send_n_data(client->file_descriptor, &mtime, sizeof(mtime))) return -1;
if (!send_n_data(client->file_descriptor, &fsize, sizeof(fsize)))
return -1;
if (!send_n_data(client->file_descriptor, &mtime, sizeof(mtime)))
return -1;
Status s;
if (!receive_status(client->file_descriptor, &s)) return -1;
if (!receive_status(client->file_descriptor, &s))
return -1;
if (s == STATUS_ERROR) {
log_message(LOG_LEVEL_ERROR, "Server reported error for file");
return -1;
}
if (s == STATUS_OK) return 1;
if (s == STATUS_OK)
return 1;
if (s == STATUS_DELTA_SIGNATURE) {
Data* sig_data = receive_data(client->file_descriptor);
if (!sig_data) return -1;
if (!sig_data)
return -1;
DeltaSignature* sig = delta_signature_deserialize(sig_data);
data_destroy(sig_data);
if (!sig) return -1;
if (!sig)
return -1;
*out_sig = sig;
return 2;
}
@@ -54,27 +61,29 @@ static int incremental_check(Client *client, File *file,
return 0;
}
static int send_delta(Client *client, File *file, DeltaSignature *sig,
Config *config) {
Delta *delta = delta_compute(file->data->data, file->data->size,
sig, config->delta_block_size);
if (!delta) return 1;
static int send_delta(Client* client, File* file, DeltaSignature* sig, Config* config) {
Delta* delta = delta_compute(file->data->data, file->data->size, sig, config->delta_block_size);
if (!delta)
return 1;
if (!delta_is_worthwhile(delta, file->data->size)) {
delta_destroy(delta);
if (!send_status(client->file_descriptor, STATUS_NEXT)) return -1;
if (!send_status(client->file_descriptor, STATUS_NEXT))
return -1;
return 1;
}
Data* delta_data = delta_serialize(delta);
delta_destroy(delta);
if (!delta_data) return -1;
if (!delta_data)
return -1;
Data* to_send = delta_data;
if (config->use_compression) {
to_send = data_compress(delta_data, config->compression_level);
data_destroy(delta_data);
if (!to_send) return -1;
if (!to_send)
return -1;
}
bool ok = send_status(client->file_descriptor, STATUS_DELTA_DATA) &&
@@ -89,17 +98,24 @@ static int send_delta(Client *client, File *file, DeltaSignature *sig,
typedef bool (*file_send_fn)(File*, int, bool, int, bool);
static int send_file_incremental(Client *client, File *file, Config *config,
file_send_fn send_fn) {
static int send_file_incremental(Client* client, File* file, Config* config, file_send_fn send_fn) {
DeltaSignature* sig = NULL;
int rc = incremental_check(client, file, &sig);
if (rc < 0) { delta_signature_destroy(sig); return -1; }
if (rc == 1) { delta_signature_destroy(sig); return 1; }
if (rc < 0) {
delta_signature_destroy(sig);
return -1;
}
if (rc == 1) {
delta_signature_destroy(sig);
return 1;
}
if (rc == 2 && config->use_delta) {
int drc = send_delta(client, file, sig, config);
delta_signature_destroy(sig);
if (drc == 0) return 0;
if (drc < 0) return -1;
if (drc == 0)
return 0;
if (drc < 0)
return -1;
} else {
delta_signature_destroy(sig);
}
@@ -111,26 +127,35 @@ static int send_file_incremental(Client *client, File *file, Config *config,
int send_chunk(Client* client, Chunk* chunk, Config* config) {
if (config->use_chunk_serialization) {
if (!send_status(client->file_descriptor, STATUS_CHUNK)) return -1;
if (!send_status(client->file_descriptor, STATUS_CHUNK))
return -1;
Data* data;
if (config->use_compression) {
data = chunk_compress(chunk, config->compression_level, config->use_metadata);
} else {
data = chunk_serialize(chunk, config->use_metadata);
}
if (data == NULL) return -1;
if (!send_data(client->file_descriptor, data)) { data_destroy(data); return -1; }
if (data == NULL)
return -1;
if (!send_data(client->file_descriptor, data)) {
data_destroy(data);
return -1;
}
data_destroy(data);
} else if (config->use_sendfile && !config->use_compression) {
for (int i = 0; i < chunk->element_count; i++) {
if (config->use_incremental) {
int rc = send_file_incremental(client, chunk->items[i], config,
(file_send_fn)file_send_sendfile);
if (rc == 1) continue;
if (rc < 0) return -1;
if (rc == 1)
continue;
if (rc < 0)
return -1;
} else {
if (!send_status(client->file_descriptor, STATUS_NEXT)) return -1;
if (!file_send_sendfile(chunk->items[i], client->file_descriptor, config->use_metadata, 0, true))
if (!send_status(client->file_descriptor, STATUS_NEXT))
return -1;
if (!file_send_sendfile(chunk->items[i], client->file_descriptor, config->use_metadata, 0,
true))
return -1;
}
}
@@ -139,14 +164,15 @@ int send_chunk(Client *client, Chunk *chunk, Config *config) {
if (config->use_incremental) {
int rc = send_file_incremental(client, chunk->items[i], config,
(file_send_fn)file_send_single_calls);
if (rc == 1) continue;
if (rc < 0) return -1;
if (rc == 1)
continue;
if (rc < 0)
return -1;
} else {
if (!send_status(client->file_descriptor, STATUS_NEXT)) return -1;
if (!file_send_single_calls(chunk->items[i], client->file_descriptor,
config->use_metadata,
config->use_compression ? config->compression_level : 0,
true))
if (!send_status(client->file_descriptor, STATUS_NEXT))
return -1;
if (!file_send_single_calls(chunk->items[i], client->file_descriptor, config->use_metadata,
config->use_compression ? config->compression_level : 0, true))
return -1;
}
}
@@ -165,18 +191,18 @@ static int send_chunks_multithreaded(void *pipeline_context) {
client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port);
} else if (context->config->use_tls) {
client = client_create();
if (!client || !client_connect_tls(client, server_host, server_port,
context->config->tls_cert,
context->config->tls_key,
context->config->tls_ca)) {
if (client) client_delete(client);
if (!client || !client_connect_tls(client, server_host, server_port, context->config->tls_cert,
context->config->tls_key, context->config->tls_ca)) {
if (client)
client_delete(client);
fprintf(stderr, "Error: could not connect to server via TLS\n");
return thrd_error;
}
} else {
client = client_create();
if (!client || !client_connect(client, server_host, server_port)) {
if (client) client_delete(client);
if (client)
client_delete(client);
fprintf(stderr, "Error: could not connect to server\n");
return thrd_error;
}
@@ -189,16 +215,14 @@ static int send_chunks_multithreaded(void *pipeline_context) {
while (true) {
Chunk* current_chunk = queue_dequeue_multithreaded(
context->queue_loader, &context->mutex_loader,
&context->condition_not_empty_loader,
context->queue_loader, &context->mutex_loader, &context->condition_not_empty_loader,
&context->condition_not_full_loader, &context->loader_done);
if (current_chunk == NULL) {
if (context->config->use_delete) {
send_status(client->file_descriptor, STATUS_MANIFEST);
send_int(client->file_descriptor, context->manifest->size);
for (int i = 0; i < context->manifest->size; i++)
send_str(client->file_descriptor,
(char *)context->manifest->items[i]);
send_str(client->file_descriptor, (char*)context->manifest->items[i]);
}
send_status(client->file_descriptor, STATUS_FINISHED);
Status s;
@@ -221,10 +245,9 @@ static int scan_directory_multithreaded(void *pipeline_context) {
PipelineContextSender* context = (PipelineContextSender*)pipeline_context;
mtx_lock(&context->mutex_scanner);
DirectoryScanner* scanner = directory_scanner_create(
context->config->send_directory, context->config->use_metadata,
context->config->chunk_size, context->config->exclude_patterns,
context->config->exclude_count, context->config->include_patterns,
context->config->include_count, context->config->max_size,
context->config->send_directory, context->config->use_metadata, context->config->chunk_size,
context->config->exclude_patterns, context->config->exclude_count,
context->config->include_patterns, context->config->include_count, context->config->max_size,
context->config->min_size);
mtx_unlock(&context->mutex_scanner);
@@ -234,13 +257,13 @@ static int scan_directory_multithreaded(void *pipeline_context) {
mtx_lock(&context->mutex_scanner);
for (int i = 0; i < current_chunk->element_count; i++) {
const char* p = current_chunk->items[i]->path;
if (*p == '/') p++;
if (*p == '/')
p++;
array_list_add(context->manifest, str_dup(p));
}
mtx_unlock(&context->mutex_scanner);
}
queue_enqueue_multithreaded(context->queue_scanner, current_chunk,
&context->mutex_scanner,
queue_enqueue_multithreaded(context->queue_scanner, current_chunk, &context->mutex_scanner,
&context->condition_not_empty_scanner,
&context->condition_not_full_scanner);
}
@@ -257,8 +280,7 @@ static int load_files_multithreaded(void *pipeline_context) {
PipelineContextSender* context = (PipelineContextSender*)pipeline_context;
while (true) {
Chunk* chunk = queue_dequeue_multithreaded(
context->queue_scanner, &context->mutex_scanner,
&context->condition_not_empty_scanner,
context->queue_scanner, &context->mutex_scanner, &context->condition_not_empty_scanner,
&context->condition_not_full_scanner, &context->scanner_done);
if (chunk == NULL) {
mtx_lock(&context->mutex_loader);
@@ -276,8 +298,7 @@ static int load_files_multithreaded(void *pipeline_context) {
}
}
}
queue_enqueue_multithreaded(context->queue_loader, chunk,
&context->mutex_loader,
queue_enqueue_multithreaded(context->queue_loader, chunk, &context->mutex_loader,
&context->condition_not_empty_loader,
&context->condition_not_full_loader);
}
@@ -286,26 +307,23 @@ static int load_files_multithreaded(void *pipeline_context) {
int send_files(Config* config) {
if (config->dry_run) {
DirectoryScanner* scanner = directory_scanner_create(
config->send_directory, config->use_metadata, config->chunk_size,
config->exclude_patterns, config->exclude_count,
config->include_patterns, config->include_count,
config->max_size, config->min_size);
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
config->min_size);
Chunk* chunk;
int file_count = 0;
unsigned long long total_bytes = 0;
printf("Dry run: files to be transferred\n");
while ((chunk = directory_scanner_next(scanner)) != NULL) {
for (int i = 0; i < chunk->element_count; i++) {
printf(" %s (%zu bytes)\n", chunk->items[i]->path,
chunk->items[i]->data->size);
printf(" %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
total_bytes += chunk->items[i]->data->size;
file_count++;
}
chunk_destroy(chunk);
}
directory_scanner_destroy(scanner);
printf("Total: %d files, %.1f MB\n", file_count,
total_bytes / 1048576.0);
printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
return 0;
}
@@ -316,20 +334,22 @@ int send_files(Config *config) {
return 1;
}
client = client_connect_ssh(config->ssh_destination, config->ssh_port);
if (!client) return 1;
if (!client)
return 1;
} else if (config->use_tls) {
client = client_create();
if (!client || !client_connect_tls(client, server_host, server_port,
config->tls_cert, config->tls_key,
config->tls_ca)) {
if (client) client_delete(client);
if (!client || !client_connect_tls(client, server_host, server_port, config->tls_cert,
config->tls_key, config->tls_ca)) {
if (client)
client_delete(client);
fprintf(stderr, "Error: could not connect to server via TLS\n");
return 1;
}
} else {
client = client_create();
if (!client || !client_connect(client, server_host, server_port)) {
if (client) client_delete(client);
if (client)
client_delete(client);
fprintf(stderr, "Error: could not connect to server\n");
return 1;
}
@@ -340,10 +360,9 @@ int send_files(Config *config) {
return 1;
}
DirectoryScanner* scanner = directory_scanner_create(
config->send_directory, config->use_metadata, config->chunk_size,
config->exclude_patterns, config->exclude_count,
config->include_patterns, config->include_count,
config->max_size, config->min_size);
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
config->min_size);
Chunk* current_chunk;
unsigned long long total_bytes = 0;
time_t last_progress = 0;
@@ -355,7 +374,8 @@ int send_files(Config *config) {
chunk_bytes += current_chunk->items[i]->data->size;
if (manifest) {
const char* p = current_chunk->items[i]->path;
if (*p == '/') p++;
if (*p == '/')
p++;
array_list_add(manifest, str_dup(p));
}
}
@@ -409,38 +429,36 @@ int send_files(Config *config) {
int send_files_multithreaded(Config* config) {
if (config->dry_run) {
DirectoryScanner* scanner = directory_scanner_create(
config->send_directory, config->use_metadata, config->chunk_size,
config->exclude_patterns, config->exclude_count,
config->include_patterns, config->include_count,
config->max_size, config->min_size);
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
config->min_size);
Chunk* chunk;
int file_count = 0;
unsigned long long total_bytes = 0;
printf("Dry run: files to be transferred\n");
while ((chunk = directory_scanner_next(scanner)) != NULL) {
for (int i = 0; i < chunk->element_count; i++) {
printf(" %s (%zu bytes)\n", chunk->items[i]->path,
chunk->items[i]->data->size);
printf(" %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
total_bytes += chunk->items[i]->data->size;
file_count++;
}
chunk_destroy(chunk);
}
directory_scanner_destroy(scanner);
printf("Total: %d files, %.1f MB\n", file_count,
total_bytes / 1048576.0);
printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
return 0;
}
Queue* q1 = queue_create(100, chunk_destroy);
Queue* q2 = queue_create(100, chunk_destroy);
if (!q1 || !q2) {
if (q1) queue_destroy(q1);
if (q2) queue_destroy(q2);
if (q1)
queue_destroy(q1);
if (q2)
queue_destroy(q2);
return 1;
}
PipelineContextSender *context =
pipeline_context_sender_create(config, q1, q2);
PipelineContextSender* context = pipeline_context_sender_create(config, q1, q2);
if (!context) {
queue_destroy(q1);
queue_destroy(q2);
@@ -450,11 +468,9 @@ int send_files_multithreaded(Config *config) {
context->manifest = array_list_create(free);
thrd_t scanner, loader, sender;
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(&sender, send_chunks_multithreaded, context) !=
thrd_success) {
thrd_create(&sender, send_chunks_multithreaded, context) != thrd_success) {
perror("Error creating threads.\n");
pipeline_context_sender_destroy(context);
return 1;
+7 -2
View File
@@ -11,8 +11,14 @@
#include <sys/stat.h>
#include <unistd.h>
DirectoryScanner *directory_scanner_create(char *root_directory, bool use_metadata, unsigned long long chunk_size, char **exclude_patterns, int exclude_count, char **include_patterns, int include_count, unsigned long long max_size, unsigned long long min_size) {
DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metadata,
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size) {
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
if (scanner == NULL)
return NULL;
scanner->directories = queue_create(100, free);
scanner->current_dir = NULL;
scanner->current_path = NULL;
@@ -154,7 +160,6 @@ Chunk *directory_scanner_next(DirectoryScanner *scanner) {
if (chunk_data->size > 0)
return chunk_data_to_chunk(chunk_data);
chunk_data->item_destroyer = NULL;
array_list_delete(chunk_data);
return NULL;
}
+5 -1
View File
@@ -20,7 +20,11 @@ typedef struct {
unsigned long long min_size;
} DirectoryScanner;
DirectoryScanner *directory_scanner_create(char *root_directory, bool use_metadata, unsigned long long chunk_size, char **exclude_patterns, int exclude_count, char **include_patterns, int include_count, unsigned long long max_size, unsigned long long min_size);
DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metadata,
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size);
Chunk* directory_scanner_next(DirectoryScanner* scanner);
void directory_scanner_destroy(DirectoryScanner* scanner);
+9 -6
View File
@@ -18,14 +18,17 @@
int receive_files(Config* config, int fd) {
Status status;
if (!receive_status(fd, &status)) return -1;
if (!receive_status(fd, &status))
return -1;
while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK) {
if (status == STATUS_CHECK) {
bool skipped;
File* file = receive_incremental_check(fd, config, &skipped);
if (skipped) goto next;
if (file == NULL && !skipped) return -1;
if (skipped)
goto next;
if (file == NULL && !skipped)
return -1;
if (config->save_to_disk)
file_save_to_disk(config->receive_root_directory, file);
file_destroy(file);
@@ -59,7 +62,8 @@ int receive_files(Config *config, int fd) {
}
if (status == STATUS_MANIFEST) {
if (receive_manifest(fd, config, &status) != 0) return -1;
if (receive_manifest(fd, config, &status) != 0)
return -1;
}
if (status != STATUS_FINISHED) {
log_message(LOG_LEVEL_ERROR, "Did not receive FINISHED Status");
@@ -84,8 +88,7 @@ void handler(int file_descriptor) {
close(file_descriptor);
return;
}
PipelineContextReceiver *context = pipeline_context_receiver_create(
config, q, file_descriptor);
PipelineContextReceiver* context = pipeline_context_receiver_create(config, q, file_descriptor);
if (context == NULL) {
queue_destroy(q);
config_delete(config);
+5 -3
View File
@@ -35,7 +35,8 @@ void array_list_delete(ArrayList *array_list) {
}
bool array_list_extend(ArrayList* array_list) {
if (array_list == NULL) return false;
if (array_list == NULL)
return false;
int new_capacity = array_list->capacity * 2;
if (new_capacity == 0)
new_capacity = INITIAL_ARRAY_SIZE;
@@ -50,7 +51,8 @@ bool array_list_extend(ArrayList *array_list) {
}
bool array_list_add(ArrayList* array_list, void* item) {
if (array_list == NULL) return false;
if (array_list == NULL)
return false;
if (array_list->capacity == array_list->size) {
if (!array_list_extend(array_list))
return false;
@@ -60,7 +62,7 @@ bool array_list_add(ArrayList *array_list, void *item) {
return true;
}
void **array_list_to_array(ArrayList *array_list) {
void** array_list_to_array(const ArrayList* array_list) {
if (array_list == NULL) {
return NULL;
}
+1 -1
View File
@@ -16,6 +16,6 @@ ArrayList *array_list_create(void (*item_destroyer)(void *item));
void array_list_delete(ArrayList* array_list);
bool array_list_extend(ArrayList* array_list);
bool array_list_add(ArrayList* array_list, void* item);
void **array_list_to_array(ArrayList *array_list);
void** array_list_to_array(const ArrayList* array_list);
#endif
+6 -8
View File
@@ -59,8 +59,7 @@ Data *chunk_serialize(Chunk *chunk, bool use_metadata) {
}
Data* data = data_create_empty(data_size);
if (data == NULL) {
log_message(LOG_LEVEL_ERROR,
"Could not allocate memory for chunk serialization");
log_message(LOG_LEVEL_ERROR, "Could not allocate memory for chunk serialization");
return NULL;
}
char* data_pointer = data->data;
@@ -171,15 +170,17 @@ Chunk *chunk_deserialize(Data *data, bool use_metadata) {
Data* chunk_compress(Chunk* chunk, int compression_level, bool use_metadata) {
log_message(LOG_LEVEL_DEBUG, "Starting to compress chunk");
Data* serialized = chunk_serialize(chunk, use_metadata);
if (serialized == NULL) return NULL;
if (serialized == NULL)
return NULL;
Data* compressed = data_compress(serialized, compression_level);
data_destroy(serialized);
if (compressed == NULL) return NULL;
if (compressed == NULL)
return NULL;
log_message(LOG_LEVEL_DEBUG, "Chunk successfully compressed");
return compressed;
}
Chunk *receive_chunk_data(int fd, Config *config) {
Chunk* receive_chunk_data(int fd, const Config* config) {
Data* chunk_data = receive_data(fd);
if (chunk_data == NULL) {
log_message(LOG_LEVEL_ERROR, "Failed to receive chunk data");
@@ -200,6 +201,3 @@ Chunk *receive_chunk_data(int fd, Config *config) {
log_message(LOG_LEVEL_ERROR, "Failed to deserialize chunk, skipping");
return chunk;
}
+1 -1
View File
@@ -19,6 +19,6 @@ void chunk_destroy(void *chunk);
Data* chunk_serialize(Chunk* chunk, bool use_metadata);
Chunk* chunk_deserialize(Data* data, bool use_metadata);
Data* chunk_compress(Chunk* chunk, int compression_level, bool use_metadata);
Chunk *receive_chunk_data(int fd, Config *config);
Chunk* receive_chunk_data(int fd, const Config* config);
#endif
+10 -12
View File
@@ -7,10 +7,12 @@
#define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
Data* data_compress(Data* data_to_compress, int compression_level) {
(void)compression_level;
log_message(LOG_LEVEL_DEBUG, "Starting to compress data");
size_t dst_size = ZSTD_compressBound(data_to_compress->size);
Data* compressed_data = data_create_empty(dst_size);
if (compressed_data == NULL) return NULL;
if (compressed_data == NULL)
return NULL;
ZSTD_CCtx* cctx = ZSTD_createCCtx();
if (!cctx) {
@@ -26,8 +28,7 @@ Data *data_compress(Data *data_to_compress, int compression_level) {
do {
ret = ZSTD_compressStream2(cctx, &output, &input, ZSTD_e_end);
if (ZSTD_isError(ret)) {
log_message(LOG_LEVEL_ERROR, "Compression failed: %s",
ZSTD_getErrorName(ret));
log_message(LOG_LEVEL_ERROR, "Compression failed: %s", ZSTD_getErrorName(ret));
ZSTD_freeCCtx(cctx);
data_destroy(compressed_data);
return NULL;
@@ -44,8 +45,8 @@ Data *data_compress(Data *data_to_compress, int compression_level) {
Data* data_decompress(Data* compressed_data) {
log_message(LOG_LEVEL_DEBUG, "Start to decompress data");
unsigned long long dst_size = ZSTD_getFrameContentSize(
compressed_data->data, compressed_data->size);
unsigned long long dst_size =
ZSTD_getFrameContentSize(compressed_data->data, compressed_data->size);
if (ZSTD_isError(dst_size)) {
log_message(LOG_LEVEL_ERROR, "Failed to get decompressed size: %s",
ZSTD_getErrorName(dst_size));
@@ -54,14 +55,12 @@ Data *data_decompress(Data *compressed_data) {
ZSTD_DCtx* dctx = ZSTD_createDCtx();
if (!dctx) {
log_message(LOG_LEVEL_ERROR,
"Failed to create ZSTD decompression context");
log_message(LOG_LEVEL_ERROR, "Failed to create ZSTD decompression context");
return NULL;
}
size_t buf_size = (!ZSTD_isError(dst_size) && dst_size > 0)
? (size_t)dst_size
: INITIAL_DECOMPRESS_BUF_SIZE;
size_t buf_size =
(!ZSTD_isError(dst_size) && dst_size > 0) ? (size_t)dst_size : INITIAL_DECOMPRESS_BUF_SIZE;
Data* uncompressed_data = data_create_empty(buf_size);
if (!uncompressed_data) {
log_message(LOG_LEVEL_ERROR, "Failed to allocate decompression buffer");
@@ -76,8 +75,7 @@ Data *data_decompress(Data *compressed_data) {
do {
ret = ZSTD_decompressStream(dctx, &output, &input);
if (ZSTD_isError(ret)) {
log_message(LOG_LEVEL_ERROR, "Decompression failed: %s",
ZSTD_getErrorName(ret));
log_message(LOG_LEVEL_ERROR, "Decompression failed: %s", ZSTD_getErrorName(ret));
ZSTD_freeDCtx(dctx);
data_destroy(uncompressed_data);
return NULL;
+97 -50
View File
@@ -8,12 +8,10 @@
#include <stdlib.h>
#include <string.h>
Config *config_create(char *version, char *send_directory,
char *receive_directory, bool save_to_disk,
bool use_multithreading, bool use_chunk_serialization,
bool use_compression, bool use_metadata,
int compression_level, bool use_sendfile,
unsigned long long chunk_size) {
Config* config_create(char* version, char* send_directory, char* receive_directory,
bool save_to_disk, bool use_multithreading, bool use_chunk_serialization,
bool use_compression, bool use_metadata, int compression_level,
bool use_sendfile, unsigned long long chunk_size) {
Config* config = malloc(sizeof(Config));
config->version = version;
@@ -51,21 +49,26 @@ Config *config_create(char *version, char *send_directory,
}
bool is_remote_dest(const char* s) {
if (s == NULL) return false;
if (s == NULL)
return false;
const char* colon = strchr(s, ':');
if (colon == NULL) return false;
if (colon == s) return false;
if (colon == NULL)
return false;
if (colon == s)
return false;
for (const char* p = s; p < colon; p++) {
if (*p == '/') return false;
if (*p == '/')
return false;
}
return true;
}
void config_parse_ssh_dest(Config* config) {
if (!is_remote_dest(config->receive_root_directory)) return;
if (!is_remote_dest(config->receive_root_directory))
return;
config->transport = TRANSPORT_SSH;
config->ssh_destination = str_dup(config->receive_root_directory);
char *colon = strchr(config->receive_root_directory, ':');
const char* colon = strchr(config->receive_root_directory, ':');
char* path = str_dup(colon + 1);
free(config->receive_root_directory);
config->receive_root_directory = path;
@@ -88,25 +91,42 @@ void config_delete(Config *config) {
free(config);
}
bool config_send(int file_descriptor, Config *config) {
if (!send_str(file_descriptor, config->version)) return false;
if (!send_str(file_descriptor, config->send_directory)) return false;
if (!send_str(file_descriptor, config->receive_root_directory)) return false;
if (!send_int(file_descriptor, config->save_to_disk)) return false;
if (!send_int(file_descriptor, config->use_multithreading)) return false;
if (!send_int(file_descriptor, config->use_chunk_serialization)) return false;
if (!send_int(file_descriptor, config->use_compression)) return false;
if (!send_int(file_descriptor, config->use_metadata)) return false;
if (!send_int(file_descriptor, config->compression_level)) return false;
if (!send_int(file_descriptor, (int)config->chunk_size)) return false;
if (!send_int(file_descriptor, config->use_sendfile)) return false;
if (!send_int(file_descriptor, config->use_delete)) return false;
if (!send_int(file_descriptor, config->use_incremental)) return false;
if (!send_int(file_descriptor, config->use_delta)) return false;
if (!send_int(file_descriptor, (int)config->delta_block_size)) return false;
if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long))) return false;
bool config_send(int file_descriptor, const Config* config) {
if (!send_str(file_descriptor, config->version))
return false;
if (!send_str(file_descriptor, config->send_directory))
return false;
if (!send_str(file_descriptor, config->receive_root_directory))
return false;
if (!send_int(file_descriptor, config->save_to_disk))
return false;
if (!send_int(file_descriptor, config->use_multithreading))
return false;
if (!send_int(file_descriptor, config->use_chunk_serialization))
return false;
if (!send_int(file_descriptor, config->use_compression))
return false;
if (!send_int(file_descriptor, config->use_metadata))
return false;
if (!send_int(file_descriptor, config->compression_level))
return false;
if (!send_int(file_descriptor, (int)config->chunk_size))
return false;
if (!send_int(file_descriptor, config->use_sendfile))
return false;
if (!send_int(file_descriptor, config->use_delete))
return false;
if (!send_int(file_descriptor, config->use_incremental))
return false;
if (!send_int(file_descriptor, config->use_delta))
return false;
if (!send_int(file_descriptor, (int)config->delta_block_size))
return false;
if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
return false;
Status status;
if (!receive_status(file_descriptor, &status)) return false;
if (!receive_status(file_descriptor, &status))
return false;
if (status != STATUS_OK) {
log_message(LOG_LEVEL_ERROR, "Error transmitting config");
return false;
@@ -116,47 +136,73 @@ bool config_send(int file_descriptor, Config *config) {
Config* config_receive(int file_descriptor) {
Config* config = (Config*)malloc(sizeof(Config));
if (config == NULL) return NULL;
if (config == NULL)
return NULL;
config->version = receive_str(file_descriptor);
if (!config->version) { free(config); return NULL; }
if (!config->version) {
free(config);
return NULL;
}
if (strcmp(config->version, PROTOCOL_VERSION) != 0) {
fprintf(stderr, "Protocol version mismatch: client=%s, server=%s\n",
config->version, PROTOCOL_VERSION);
fprintf(stderr, "Protocol version mismatch: client=%s, server=%s\n", config->version,
PROTOCOL_VERSION);
free(config->version);
free(config);
send_status(file_descriptor, STATUS_ERROR);
return NULL;
}
config->send_directory = receive_str(file_descriptor);
if (!config->send_directory) { free(config->version); free(config); return NULL; }
if (!config->send_directory) {
free(config->version);
free(config);
return NULL;
}
config->receive_root_directory = receive_str(file_descriptor);
if (!config->receive_root_directory) { free(config->version); free(config->send_directory); free(config); return NULL; }
if (!config->receive_root_directory) {
free(config->version);
free(config->send_directory);
free(config);
return NULL;
}
int tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->save_to_disk = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_multithreading = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_chunk_serialization = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_compression = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_metadata = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->compression_level = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->chunk_size = (unsigned long long)tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_sendfile = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_delete = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_incremental = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->use_delta = tmp;
if (!receive_int(file_descriptor, &tmp)) goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->delta_block_size = (uint32_t)tmp;
if (!receive_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long))) goto error;
if (!receive_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
goto error;
config->show_progress = false;
config->dry_run = false;
config->ssh_port = 22;
@@ -172,7 +218,8 @@ Config *config_receive(int file_descriptor) {
config->tls_cert = NULL;
config->tls_key = NULL;
config->tls_ca = NULL;
if (!send_status(file_descriptor, STATUS_OK)) goto error;
if (!send_status(file_descriptor, STATUS_OK))
goto error;
return config;
error:
+6 -11
View File
@@ -4,10 +4,7 @@
#include <stdbool.h>
#include <stdint.h>
typedef enum {
TRANSPORT_TCP,
TRANSPORT_SSH
} TransportType;
typedef enum { TRANSPORT_TCP, TRANSPORT_SSH } TransportType;
typedef struct Config {
char* version;
@@ -46,14 +43,12 @@ typedef struct Config {
#define PROTOCOL_VERSION "1.2.0"
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
Config *config_create(char *version, char *send_directory,
char *receive_directory, bool save_to_disk,
bool use_multithreading, bool use_chunk_serialization,
bool use_compression, bool use_metadata,
int compression_level, bool use_sendfile,
unsigned long long chunk_size);
Config* config_create(char* version, char* send_directory, char* receive_directory,
bool save_to_disk, bool use_multithreading, bool use_chunk_serialization,
bool use_compression, bool use_metadata, int compression_level,
bool use_sendfile, unsigned long long chunk_size);
void config_delete(Config* config);
bool config_send(int file_descriptor, Config *config);
bool config_send(int file_descriptor, const Config* config);
Config* config_receive(int file_descriptor);
bool is_remote_dest(const char* s);
void config_parse_ssh_dest(Config* config);
+2 -1
View File
@@ -35,7 +35,8 @@ Data *data_create(void *data, size_t data_size) {
}
void data_destroy(Data* data) {
if (data == NULL) return;
if (data == NULL)
return;
free(data->data);
free(data);
}
+63 -47
View File
@@ -22,8 +22,7 @@ uint32_t delta_xxhash32(const void *data, uint32_t len) {
return XXH32(data, len, 0);
}
DeltaSignature *delta_signature_create(const void *old_file_data,
uint64_t old_file_size,
DeltaSignature* delta_signature_create(const void* old_file_data, uint64_t old_file_size,
uint32_t block_size) {
if (old_file_data == NULL || old_file_size == 0 || block_size == 0)
return NULL;
@@ -31,7 +30,8 @@ DeltaSignature *delta_signature_create(const void *old_file_data,
uint32_t block_count = (uint32_t)((old_file_size + block_size - 1) / block_size);
DeltaSignature* sig = malloc(sizeof(DeltaSignature));
if (!sig) return NULL;
if (!sig)
return NULL;
sig->file_size = old_file_size;
sig->block_size = block_size;
@@ -45,9 +45,8 @@ DeltaSignature *delta_signature_create(const void *old_file_data,
const uint8_t* data = (const uint8_t*)old_file_data;
for (uint32_t i = 0; i < block_count; i++) {
uint64_t offset = (uint64_t)i * block_size;
uint32_t len = (uint32_t)((old_file_size - offset < block_size)
? (old_file_size - offset)
: block_size);
uint32_t len =
(uint32_t)((old_file_size - offset < block_size) ? (old_file_size - offset) : block_size);
sig->blocks[i].adler32 = delta_adler32(data + offset, len);
sig->blocks[i].xxhash = delta_xxhash32(data + offset, len);
}
@@ -56,13 +55,15 @@ DeltaSignature *delta_signature_create(const void *old_file_data,
}
Data* delta_signature_serialize(const DeltaSignature* sig) {
if (!sig) return NULL;
if (!sig)
return NULL;
uint64_t total = sizeof(uint64_t) + sizeof(uint32_t) + sizeof(uint32_t) +
(uint64_t)sig->block_count * (sizeof(uint32_t) + sizeof(uint32_t));
uint8_t* buf = malloc((size_t)total);
if (!buf) return NULL;
if (!buf)
return NULL;
size_t pos = 0;
memcpy(buf + pos, &sig->file_size, sizeof(uint64_t));
@@ -90,7 +91,8 @@ DeltaSignature *delta_signature_deserialize(const Data *data) {
size_t pos = 0;
DeltaSignature* sig = malloc(sizeof(DeltaSignature));
if (!sig) return NULL;
if (!sig)
return NULL;
memcpy(&sig->file_size, buf + pos, sizeof(uint64_t));
pos += sizeof(uint64_t);
@@ -123,30 +125,34 @@ DeltaSignature *delta_signature_deserialize(const Data *data) {
}
void delta_signature_destroy(DeltaSignature* sig) {
if (!sig) return;
if (!sig)
return;
free(sig->blocks);
free(sig);
}
static bool ensure_capacity(DeltaInstruction **instrs, uint32_t *capacity,
uint32_t count) {
if (count < *capacity) return true;
static bool ensure_capacity(DeltaInstruction** instrs, uint32_t* capacity, uint32_t count) {
if (count < *capacity)
return true;
uint32_t new_cap = *capacity * 2;
DeltaInstruction* tmp = realloc(*instrs, new_cap * sizeof(DeltaInstruction));
if (!tmp) return false;
if (!tmp)
return false;
*instrs = tmp;
*capacity = new_cap;
return true;
}
static bool flush_literal(DeltaInstruction **instrs, uint32_t *capacity,
uint32_t *count, const uint8_t *data,
uint64_t start, uint64_t end) {
if (start >= end) return true;
static bool flush_literal(DeltaInstruction** instrs, uint32_t* capacity, uint32_t* count,
const uint8_t* data, uint64_t start, uint64_t end) {
if (start >= end)
return true;
uint32_t lit_len = (uint32_t)(end - start);
if (!ensure_capacity(instrs, capacity, *count)) return false;
if (!ensure_capacity(instrs, capacity, *count))
return false;
uint8_t* lit_data = malloc(lit_len);
if (!lit_data) return false;
if (!lit_data)
return false;
memcpy(lit_data, data + start, lit_len);
(*instrs)[*count].type = DELTA_INSTR_LITERAL;
(*instrs)[*count].literal.data = lit_data;
@@ -155,8 +161,8 @@ static bool flush_literal(DeltaInstruction **instrs, uint32_t *capacity,
return true;
}
Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
const DeltaSignature *sig, uint32_t block_size) {
Delta* delta_compute(const void* new_file_data, uint64_t new_file_size, const DeltaSignature* sig,
uint32_t block_size) {
if (!new_file_data || !sig || new_file_size == 0 || block_size == 0)
return NULL;
@@ -165,7 +171,8 @@ Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
uint32_t capacity = 64;
uint32_t count = 0;
DeltaInstruction* instrs = malloc(capacity * sizeof(DeltaInstruction));
if (!instrs) return NULL;
if (!instrs)
return NULL;
uint64_t literal_start = 0;
bool has_literal = false;
@@ -176,20 +183,17 @@ Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
bool rolling_valid = false;
while (i < new_file_size) {
uint32_t window_len = (uint32_t)((new_file_size - i < block_size)
? (new_file_size - i)
: block_size);
uint32_t window_len =
(uint32_t)((new_file_size - i < block_size) ? (new_file_size - i) : block_size);
bool full_window = (window_len == block_size);
uint32_t adler;
if (rolling_valid && full_window) {
uint8_t old_byte = new_data[i - 1];
uint8_t new_byte = new_data[i + block_size - 1];
s1 = (s1 + DELTA_ADLER32_MODULUS - old_byte + new_byte) %
DELTA_ADLER32_MODULUS;
s1 = (s1 + DELTA_ADLER32_MODULUS - old_byte + new_byte) % DELTA_ADLER32_MODULUS;
s2 = (s2 + DELTA_ADLER32_MODULUS -
(uint32_t)((uint64_t)block_size * old_byte % DELTA_ADLER32_MODULUS) +
s1 - 1) %
(uint32_t)((uint64_t)block_size * old_byte % DELTA_ADLER32_MODULUS) + s1 - 1) %
DELTA_ADLER32_MODULUS;
adler = (s2 << 16) | s1;
} else {
@@ -209,8 +213,7 @@ Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
uint32_t xxh = delta_xxhash32(new_data + i, window_len);
if (xxh == sig->blocks[j].xxhash) {
if (has_literal) {
if (!flush_literal(&instrs, &capacity, &count, new_data,
literal_start, i)) {
if (!flush_literal(&instrs, &capacity, &count, new_data, literal_start, i)) {
free(instrs);
return NULL;
}
@@ -245,8 +248,7 @@ Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
}
if (has_literal) {
if (!flush_literal(&instrs, &capacity, &count, new_data,
literal_start, new_file_size)) {
if (!flush_literal(&instrs, &capacity, &count, new_data, literal_start, new_file_size)) {
free(instrs);
return NULL;
}
@@ -280,11 +282,13 @@ Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
}
Data* delta_serialize(const Delta* delta) {
if (!delta) return NULL;
if (!delta)
return NULL;
uint64_t total = sizeof(uint64_t) + sizeof(uint32_t) + delta->delta_size;
uint8_t* buf = malloc((size_t)total);
if (!buf) return NULL;
if (!buf)
return NULL;
size_t pos = 0;
memcpy(buf + pos, &delta->new_file_size, sizeof(uint64_t));
@@ -307,8 +311,7 @@ Data *delta_serialize(const Delta *delta) {
} else {
memcpy(buf + pos, &delta->instructions[i].literal.length, sizeof(uint32_t));
pos += sizeof(uint32_t);
memcpy(buf + pos, delta->instructions[i].literal.data,
delta->instructions[i].literal.length);
memcpy(buf + pos, delta->instructions[i].literal.data, delta->instructions[i].literal.length);
pos += delta->instructions[i].literal.length;
}
}
@@ -324,7 +327,8 @@ Delta *delta_deserialize(const Data *data) {
size_t pos = 0;
Delta* delta = malloc(sizeof(Delta));
if (!delta) return NULL;
if (!delta)
return NULL;
memcpy(&delta->new_file_size, buf + pos, sizeof(uint64_t));
pos += sizeof(uint64_t);
@@ -372,6 +376,10 @@ Delta *delta_deserialize(const Data *data) {
delta->delta_size += sizeof(uint32_t) * 3;
} else if (type == DELTA_OP_LITERAL) {
if (pos + sizeof(uint32_t) > data->size) {
for (uint32_t k = 0; k < i; k++) {
if (delta->instructions[k].type == DELTA_INSTR_LITERAL)
free(delta->instructions[k].literal.data);
}
free(delta->instructions);
free(delta);
return NULL;
@@ -382,6 +390,10 @@ Delta *delta_deserialize(const Data *data) {
uint32_t lit_len = delta->instructions[i].literal.length;
if (pos + lit_len > data->size) {
for (uint32_t k = 0; k < i; k++) {
if (delta->instructions[k].type == DELTA_INSTR_LITERAL)
free(delta->instructions[k].literal.data);
}
free(delta->instructions);
free(delta);
return NULL;
@@ -411,19 +423,20 @@ Delta *delta_deserialize(const Data *data) {
void* delta_apply(const void* old_data, uint64_t old_size, const Delta* delta,
uint32_t block_size) {
if (!old_data || !delta) return NULL;
if (!old_data || !delta)
return NULL;
void* output = malloc((size_t)delta->new_file_size);
if (!output) return NULL;
if (!output)
return NULL;
uint8_t* out = (uint8_t*)output;
uint8_t *old = (uint8_t *)old_data;
const uint8_t* old = (const uint8_t*)old_data;
uint64_t out_pos = 0;
for (uint32_t i = 0; i < delta->instruction_count; i++) {
if (delta->instructions[i].type == DELTA_INSTR_BLOCK_MATCH) {
uint64_t src_offset = (uint64_t)delta->instructions[i].match.block_index *
block_size;
uint64_t src_offset = (uint64_t)delta->instructions[i].match.block_index * block_size;
src_offset += delta->instructions[i].match.block_offset;
uint32_t len = delta->instructions[i].match.length;
@@ -449,7 +462,8 @@ void *delta_apply(const void *old_data, uint64_t old_size, const Delta *delta,
}
void delta_destroy(Delta* delta) {
if (!delta) return;
if (!delta)
return;
for (uint32_t i = 0; i < delta->instruction_count; i++) {
if (delta->instructions[i].type == DELTA_INSTR_LITERAL)
free(delta->instructions[i].literal.data);
@@ -471,7 +485,8 @@ bool delta_should_attempt(uint64_t old_size, uint64_t new_size, uint64_t max_fil
}
bool delta_is_worthwhile(const Delta* delta, uint64_t new_file_size) {
if (!delta || delta->instruction_count == 0) return false;
if (!delta || delta->instruction_count == 0)
return false;
bool has_match = false;
for (uint32_t i = 0; i < delta->instruction_count; i++) {
@@ -480,7 +495,8 @@ bool delta_is_worthwhile(const Delta *delta, uint64_t new_file_size) {
break;
}
}
if (!has_match) return false;
if (!has_match)
return false;
double ratio = (double)delta->delta_size / (double)new_file_size;
return ratio < DELTA_FALLBACK_RATIO;
+5 -10
View File
@@ -30,10 +30,7 @@ typedef struct {
DeltaBlockSig* blocks;
} DeltaSignature;
typedef enum {
DELTA_INSTR_BLOCK_MATCH = 0x01,
DELTA_INSTR_LITERAL = 0x02
} DeltaInstrType;
typedef enum { DELTA_INSTR_BLOCK_MATCH = 0x01, DELTA_INSTR_LITERAL = 0x02 } DeltaInstrType;
typedef struct {
DeltaInstrType type;
@@ -57,19 +54,17 @@ typedef struct {
uint64_t delta_size;
} Delta;
DeltaSignature *delta_signature_create(const void *old_file_data,
uint64_t old_file_size,
DeltaSignature* delta_signature_create(const void* old_file_data, uint64_t old_file_size,
uint32_t block_size);
Data* delta_signature_serialize(const DeltaSignature* sig);
DeltaSignature* delta_signature_deserialize(const Data* data);
void delta_signature_destroy(DeltaSignature* sig);
Delta *delta_compute(const void *new_file_data, uint64_t new_file_size,
const DeltaSignature *sig, uint32_t block_size);
Delta* delta_compute(const void* new_file_data, uint64_t new_file_size, const DeltaSignature* sig,
uint32_t block_size);
Data* delta_serialize(const Delta* delta);
Delta* delta_deserialize(const Data* data);
void *delta_apply(const void *old_data, uint64_t old_size, const Delta *delta,
uint32_t block_size);
void* delta_apply(const void* old_data, uint64_t old_size, const Delta* delta, uint32_t block_size);
void delta_destroy(Delta* delta);
bool delta_should_attempt(uint64_t old_size, uint64_t new_size, uint64_t max_file_size);
+104 -49
View File
@@ -58,7 +58,7 @@ void file_destroy(void *item) {
free(file);
}
FileMetadata *file_metadata_create(struct stat *stats) {
FileMetadata* file_metadata_create(const struct stat* stats) {
FileMetadata* m = malloc(sizeof(FileMetadata));
if (m == NULL) {
perror("ERROR: Could not allocate memory for file metadata");
@@ -81,7 +81,8 @@ void file_metadata_destroy(void *metadata) {
}
bool file_load_data(File* file) {
if (file == NULL) return false;
if (file == NULL)
return false;
if (file->data->data == NULL) {
file->data->data = malloc(file->data->size);
if (file->data->data == NULL) {
@@ -97,8 +98,9 @@ bool file_load_data(File *file) {
return true;
}
bool file_send_single_calls(File *file, int file_descriptor, bool use_metadata, int compression_level, bool send_path) {
Data *data_to_send = file->data;
bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
int compression_level, bool send_path) {
const Data* data_to_send = file->data;
Data* compressed_data = NULL;
if (compression_level > 0) {
compressed_data = data_compress(file->data, compression_level);
@@ -126,40 +128,59 @@ bool file_send_single_calls(File *file, int file_descriptor, bool use_metadata,
bool file_save_to_disk(const char* root_directory, File* file) {
char* disk_path = path_cat((char*)root_directory, file->path);
if (disk_path == NULL) return false;
if (disk_path == NULL)
return false;
bool ok = to_disk(disk_path, file->data->data, file->data->size);
if (ok) file_restore_metadata(disk_path, file->metadata);
if (ok)
file_restore_metadata(disk_path, file->metadata);
free(disk_path);
return ok;
}
static void* old_data_from_path(const char* full_path, unsigned long long old_size) {
void* data = malloc((size_t)old_size);
if (!data) return NULL;
if (!data)
return NULL;
FILE* fp = fopen(full_path, "rb");
if (!fp) { free(data); return NULL; }
if (!fp) {
free(data);
return NULL;
}
size_t nread = fread(data, 1, (size_t)old_size, fp);
fclose(fp);
if (nread != (size_t)old_size) { free(data); return NULL; }
if (nread != (size_t)old_size) {
free(data);
return NULL;
}
return data;
}
static File *receive_delta_file(int fd, Config *config, const char *check_path,
static File* receive_delta_file(int fd, const Config* config, const char* check_path,
void* old_data, unsigned long long old_size) {
if (!old_data) return NULL;
if (!old_data)
return NULL;
DeltaSignature *sig = delta_signature_create(old_data, old_size,
config->delta_block_size);
if (!sig) { free(old_data); return NULL; }
DeltaSignature* sig = delta_signature_create(old_data, old_size, config->delta_block_size);
if (!sig) {
free(old_data);
return NULL;
}
Data* sig_data = delta_signature_serialize(sig);
if (!sig_data) { delta_signature_destroy(sig); free(old_data); return NULL; }
if (!sig_data) {
delta_signature_destroy(sig);
free(old_data);
return NULL;
}
bool sig_sent = send_status(fd, STATUS_DELTA_SIGNATURE) &&
send_data(fd, sig_data);
bool sig_sent = send_status(fd, STATUS_DELTA_SIGNATURE) && send_data(fd, sig_data);
data_destroy(sig_data);
if (!sig_sent) { delta_signature_destroy(sig); free(old_data); return NULL; }
if (!sig_sent) {
delta_signature_destroy(sig);
free(old_data);
return NULL;
}
Status resp;
if (!receive_status(fd, &resp)) {
@@ -198,8 +219,7 @@ static File *receive_delta_file(int fd, Config *config, const char *check_path,
return NULL;
}
void *new_data = delta_apply(old_data, old_size, delta,
config->delta_block_size);
void* new_data = delta_apply(old_data, old_size, delta, config->delta_block_size);
uint64_t new_size = delta->new_file_size;
delta_destroy(delta);
@@ -245,12 +265,19 @@ static File *receive_delta_file(int fd, Config *config, const char *check_path,
free(old_data);
File* file = file_create(check_path);
if (!file) { send_status(fd, STATUS_ERROR); return NULL; }
if (!file) {
send_status(fd, STATUS_ERROR);
return NULL;
}
if (config->use_metadata) {
int meta_ok = 1;
file->metadata = metadata_receive(fd, &meta_ok);
if (!meta_ok) { file_destroy(file); send_status(fd, STATUS_ERROR); return NULL; }
if (!meta_ok) {
file_destroy(file);
send_status(fd, STATUS_ERROR);
return NULL;
}
}
Data* file_data = receive_data(fd);
@@ -263,7 +290,11 @@ static File *receive_delta_file(int fd, Config *config, const char *check_path,
if (config->use_compression) {
Data* uncompressed = data_decompress(file_data);
data_destroy(file_data);
if (uncompressed == NULL) { file_destroy(file); send_status(fd, STATUS_ERROR); return NULL; }
if (uncompressed == NULL) {
file_destroy(file);
send_status(fd, STATUS_ERROR);
return NULL;
}
file_data = uncompressed;
}
@@ -277,10 +308,13 @@ static File *receive_delta_file(int fd, Config *config, const char *check_path,
return NULL;
}
File *receive_incremental_check(int fd, Config *config, bool *skipped) {
File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
*skipped = false;
char* check_path = receive_str(fd);
if (check_path == NULL) { send_status(fd, STATUS_ERROR); return NULL; }
if (check_path == NULL) {
send_status(fd, STATUS_ERROR);
return NULL;
}
unsigned long long check_size;
long long check_mtime;
@@ -296,12 +330,15 @@ File *receive_incremental_check(int fd, Config *config, bool *skipped) {
bool has_old_file = (full_path && stat(full_path, &st) == 0);
unsigned long long old_size = has_old_file ? (unsigned long long)st.st_size : 0;
bool match = has_old_file &&
(unsigned long long)st.st_size == check_size &&
bool match = has_old_file && (unsigned long long)st.st_size == check_size &&
(long long)st.st_mtime == check_mtime;
if (match) {
if (!send_status(fd, STATUS_OK)) { free(full_path); free(check_path); return NULL; }
if (!send_status(fd, STATUS_OK)) {
free(full_path);
free(check_path);
return NULL;
}
free(full_path);
free(check_path);
*skipped = true;
@@ -313,8 +350,7 @@ File *receive_incremental_check(int fd, Config *config, bool *skipped) {
if (try_delta) {
void* old_data = old_data_from_path(full_path, old_size);
File *delta_file = receive_delta_file(fd, config, check_path,
old_data, old_size);
File* delta_file = receive_delta_file(fd, config, check_path, old_data, old_size);
if (delta_file) {
free(full_path);
free(check_path);
@@ -334,12 +370,19 @@ File *receive_incremental_check(int fd, Config *config, bool *skipped) {
File* file = file_create(check_path);
free(check_path);
free(full_path);
if (file == NULL) { send_status(fd, STATUS_ERROR); return NULL; }
if (file == NULL) {
send_status(fd, STATUS_ERROR);
return NULL;
}
if (config->use_metadata) {
int meta_ok = 1;
file->metadata = metadata_receive(fd, &meta_ok);
if (!meta_ok) { file_destroy(file); send_status(fd, STATUS_ERROR); return NULL; }
if (!meta_ok) {
file_destroy(file);
send_status(fd, STATUS_ERROR);
return NULL;
}
}
Data* file_data = receive_data(fd);
@@ -352,7 +395,11 @@ File *receive_incremental_check(int fd, Config *config, bool *skipped) {
if (config->use_compression) {
Data* uncompressed = data_decompress(file_data);
data_destroy(file_data);
if (uncompressed == NULL) { file_destroy(file); send_status(fd, STATUS_ERROR); return NULL; }
if (uncompressed == NULL) {
file_destroy(file);
send_status(fd, STATUS_ERROR);
return NULL;
}
file_data = uncompressed;
}
@@ -386,10 +433,13 @@ bool to_disk(const char *path, const void *data, unsigned long long data_size) {
return true;
}
bool file_send_sendfile(File *file, int file_descriptor, bool use_metadata, int compression_level, bool send_path) {
bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
bool send_path) {
(void)compression_level;
if (send_path && !send_str(file_descriptor, file->path)) return false;
if (use_metadata && !metadata_send(file_descriptor, file->metadata)) return false;
if (send_path && !send_str(file_descriptor, file->path))
return false;
if (use_metadata && !metadata_send(file_descriptor, file->metadata))
return false;
int fd = open(file->path, O_RDONLY);
if (fd == -1) {
@@ -404,7 +454,7 @@ bool file_send_sendfile(File *file, int file_descriptor, bool use_metadata, int
}
off_t offset = 0;
while (offset < file_size) {
while ((unsigned long long)offset < file_size) {
ssize_t sent = sendfile(file_descriptor, fd, &offset, file_size - offset);
if (sent == -1) {
perror("sendfile failed");
@@ -417,16 +467,21 @@ bool file_send_sendfile(File *file, int file_descriptor, bool use_metadata, int
return true;
}
File *file_receive(Config *config, int file_descriptor) {
File* file_receive(const Config* config, int file_descriptor) {
char* path = receive_str(file_descriptor);
if (path == NULL) return NULL;
if (path == NULL)
return NULL;
File* file = file_create(path);
free(path);
if (file == NULL) return NULL;
if (file == NULL)
return NULL;
if (config->use_metadata) {
int meta_ok = 1;
file->metadata = metadata_receive(file_descriptor, &meta_ok);
if (!meta_ok) { file_destroy(file); return NULL; }
if (!meta_ok) {
file_destroy(file);
return NULL;
}
}
Data* file_data = receive_data(file_descriptor);
if (file_data == NULL) {
@@ -453,8 +508,7 @@ size_t file_content_to_buffer(File *file) {
perror("Could not open the file!");
return 0;
}
size_t bytes_read =
fread(file->data->data, 1, file->data->size, file_pointer);
size_t bytes_read = fread(file->data->data, 1, file->data->size, file_pointer);
if (bytes_read != (size_t)file->data->size) {
fclose(file_pointer);
perror("Read unexpected number of bytes from File!");
@@ -464,21 +518,22 @@ size_t file_content_to_buffer(File *file) {
return bytes_read;
}
int receive_manifest(int fd, Config *config, int *next_status) {
int receive_manifest(int fd, const Config* config, int* next_status) {
int count;
if (!receive_int(fd, &count)) return -1;
if (!receive_int(fd, &count))
return -1;
ArrayList* manifest = array_list_create(free);
if (manifest) {
for (int i = 0; i < count; i++) {
char* s = receive_str(fd);
if (s) array_list_add(manifest, s);
if (s)
array_list_add(manifest, s);
}
fprintf(stderr, "Deleting files not in manifest...\n");
delete_extras(config->receive_root_directory, manifest);
array_list_delete(manifest);
}
if (!receive_status(fd, next_status)) return -1;
if (!receive_status(fd, next_status))
return -1;
return 0;
}
+8 -6
View File
@@ -23,15 +23,17 @@ typedef struct {
File* file_create(const char* path);
void file_destroy(void* item);
bool file_load_data(File* file);
File *file_receive(Config *config, int file_descriptor);
bool file_send_single_calls(File *file, int file_descriptor, bool use_metadata, int compression_level, bool send_path);
bool file_send_sendfile(File *file, int file_descriptor, bool use_metadata, int compression_level, bool send_path);
File* file_receive(const Config* config, int file_descriptor);
bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
int compression_level, bool send_path);
bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
bool send_path);
size_t file_content_to_buffer(File* file);
FileMetadata *file_metadata_create(struct stat *stats);
FileMetadata* file_metadata_create(const struct stat* stats);
void file_metadata_destroy(void* metadata);
bool to_disk(const char* path, const void* data, unsigned long long data_size);
bool file_save_to_disk(const char* root_directory, File* file);
File *receive_incremental_check(int fd, Config *config, bool *skipped);
int receive_manifest(int fd, Config *config, int *next_status);
File* receive_incremental_check(int fd, const Config* config, bool* skipped);
int receive_manifest(int fd, const Config* config, int* next_status);
#endif
+3 -4
View File
@@ -14,11 +14,10 @@ void log_message(LogLevel log_level, char *format, ...) {
if (log_level < current_log_level)
return;
time_t now = time(NULL);
struct tm *t = localtime(&now);
const struct tm* t = localtime(&now);
fprintf(stderr, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900,
t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec,
log_level_strings[log_level]);
fprintf(stderr, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900, t->tm_mon + 1,
t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, log_level_strings[log_level]);
va_list args;
va_start(args, format);
+1 -6
View File
@@ -1,12 +1,7 @@
#ifndef LOG_H
#define LOG_H
typedef enum {
LOG_LEVEL_DEBUG,
LOG_LEVEL_INFO,
LOG_LEVEL_WARNING,
LOG_LEVEL_ERROR
} LogLevel;
typedef enum { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR } LogLevel;
void log_message(LogLevel log_level, char* message, ...);
void set_log_level(LogLevel level);
+34 -16
View File
@@ -8,17 +8,22 @@
#include <time.h>
#include <unistd.h>
void metadata_to_buf(char **buf, FileMetadata *m) {
void metadata_to_buf(char** buf, const FileMetadata* m) {
int present = (m != NULL) ? 1 : 0;
memcpy(*buf, &present, sizeof(int));
*buf += sizeof(int);
if (m == NULL)
return;
memcpy(*buf, &m->mode, sizeof(mode_t)); *buf += sizeof(mode_t);
memcpy(*buf, &m->uid, sizeof(uid_t)); *buf += sizeof(uid_t);
memcpy(*buf, &m->gid, sizeof(gid_t)); *buf += sizeof(gid_t);
memcpy(*buf, &m->mtime_sec, sizeof(time_t)); *buf += sizeof(time_t);
memcpy(*buf, &m->mtime_nsec, sizeof(long)); *buf += sizeof(long);
memcpy(*buf, &m->mode, sizeof(mode_t));
*buf += sizeof(mode_t);
memcpy(*buf, &m->uid, sizeof(uid_t));
*buf += sizeof(uid_t);
memcpy(*buf, &m->gid, sizeof(gid_t));
*buf += sizeof(gid_t);
memcpy(*buf, &m->mtime_sec, sizeof(time_t));
*buf += sizeof(time_t);
memcpy(*buf, &m->mtime_nsec, sizeof(long));
*buf += sizeof(long);
}
FileMetadata* metadata_from_buf(char** buf) {
@@ -28,11 +33,16 @@ FileMetadata *metadata_from_buf(char **buf) {
if (!present)
return NULL;
FileMetadata* m = malloc(sizeof(FileMetadata));
memcpy(&m->mode, *buf, sizeof(mode_t)); *buf += sizeof(mode_t);
memcpy(&m->uid, *buf, sizeof(uid_t)); *buf += sizeof(uid_t);
memcpy(&m->gid, *buf, sizeof(gid_t)); *buf += sizeof(gid_t);
memcpy(&m->mtime_sec, *buf, sizeof(time_t)); *buf += sizeof(time_t);
memcpy(&m->mtime_nsec, *buf, sizeof(long)); *buf += sizeof(long);
memcpy(&m->mode, *buf, sizeof(mode_t));
*buf += sizeof(mode_t);
memcpy(&m->uid, *buf, sizeof(uid_t));
*buf += sizeof(uid_t);
memcpy(&m->gid, *buf, sizeof(gid_t));
*buf += sizeof(gid_t);
memcpy(&m->mtime_sec, *buf, sizeof(time_t));
*buf += sizeof(time_t);
memcpy(&m->mtime_nsec, *buf, sizeof(long));
*buf += sizeof(long);
return m;
}
@@ -53,25 +63,33 @@ bool metadata_send(int file_descriptor, FileMetadata *m) {
FileMetadata* metadata_receive(int file_descriptor, int* ok) {
int present;
if (!receive_n_data(file_descriptor, &present, sizeof(int))) {
if (ok) *ok = 0;
if (ok)
*ok = 0;
return NULL;
}
if (!present) {
if (ok) *ok = 1;
if (ok)
*ok = 1;
return NULL;
}
FileMetadata* m = malloc(sizeof(FileMetadata));
if (m == NULL) { if (ok) *ok = 0; return NULL; }
if (m == NULL) {
if (ok)
*ok = 0;
return NULL;
}
if (!receive_n_data(file_descriptor, &m->mode, sizeof(mode_t)) ||
!receive_n_data(file_descriptor, &m->uid, sizeof(uid_t)) ||
!receive_n_data(file_descriptor, &m->gid, sizeof(gid_t)) ||
!receive_n_data(file_descriptor, &m->mtime_sec, sizeof(time_t)) ||
!receive_n_data(file_descriptor, &m->mtime_nsec, sizeof(long))) {
free(m);
if (ok) *ok = 0;
if (ok)
*ok = 0;
return NULL;
}
if (ok) *ok = 1;
if (ok)
*ok = 1;
return m;
}
+3 -2
View File
@@ -5,9 +5,10 @@
#include <stdbool.h>
#include <sys/stat.h>
#define FILE_METADATA_WIRE_SIZE (sizeof(mode_t) + sizeof(uid_t) + sizeof(gid_t) + sizeof(time_t) + sizeof(long))
#define FILE_METADATA_WIRE_SIZE \
(sizeof(mode_t) + sizeof(uid_t) + sizeof(gid_t) + sizeof(time_t) + sizeof(long))
void metadata_to_buf(char **buf, FileMetadata *m);
void metadata_to_buf(char** buf, const FileMetadata* m);
FileMetadata* metadata_from_buf(char** buf);
bool metadata_send(int file_descriptor, FileMetadata* m);
FileMetadata* metadata_receive(int file_descriptor, int* ok);
+25 -26
View File
@@ -13,11 +13,11 @@
#include <string.h>
#include <threads.h>
PipelineContextSender *pipeline_context_sender_create(Config *config,
Queue *queue_scanner,
PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner,
Queue* queue_loader) {
PipelineContextSender* context = malloc(sizeof(PipelineContextSender));
if (context == NULL) return NULL;
if (context == NULL)
return NULL;
context->config = config;
context->queue_scanner = queue_scanner;
context->queue_loader = queue_loader;
@@ -53,11 +53,11 @@ void pipeline_context_sender_destroy(PipelineContextSender *context) {
free(context);
}
PipelineContextReceiver *pipeline_context_receiver_create(Config *config,
Queue *queue,
PipelineContextReceiver* pipeline_context_receiver_create(Config* config, Queue* queue,
int file_descriptor) {
PipelineContextReceiver* context = malloc(sizeof(PipelineContextReceiver));
if (context == NULL) return NULL;
if (context == NULL)
return NULL;
context->config = config;
context->queue = queue;
context->file_descriptor = file_descriptor;
@@ -81,40 +81,39 @@ void pipeline_context_receiver_destroy(PipelineContextReceiver *context) {
free(context);
}
static void receive_chunk_enqueue(int file_descriptor,
PipelineContextReceiver *context) {
static void receive_chunk_enqueue(int file_descriptor, PipelineContextReceiver* context) {
Chunk* chunk = receive_chunk_data(file_descriptor, context->config);
if (chunk == NULL) return;
if (chunk == NULL)
return;
for (int i = 0; i < chunk->element_count; i++) {
File* file = chunk->items[i];
chunk->items[i] = NULL;
queue_enqueue_multithreaded(context->queue, file, &context->mutex,
&context->condition_not_empty,
&context->condition_not_full);
&context->condition_not_empty, &context->condition_not_full);
}
chunk_destroy(chunk);
}
int receive_thread(void* pipeline_context) {
PipelineContextReceiver *context =
(PipelineContextReceiver *)pipeline_context;
PipelineContextReceiver* context = (PipelineContextReceiver*)pipeline_context;
mtx_lock(&context->mutex);
int file_descriptor = context->file_descriptor;
Config *config = context->config;
const Config* config = context->config;
mtx_unlock(&context->mutex);
Status status;
if (!receive_status(file_descriptor, &status)) return thrd_error;
if (!receive_status(file_descriptor, &status))
return thrd_error;
while (status == STATUS_NEXT || status == STATUS_CHUNK || status == STATUS_CHECK) {
if (status == STATUS_CHECK) {
bool skipped;
File* file = receive_incremental_check(file_descriptor, config, &skipped);
if (!skipped) {
if (file == NULL) return thrd_error;
if (file == NULL)
return thrd_error;
queue_enqueue_multithreaded(context->queue, file, &context->mutex,
&context->condition_not_empty,
&context->condition_not_full);
&context->condition_not_empty, &context->condition_not_full);
}
} else if (status == STATUS_CHUNK) {
receive_chunk_enqueue(file_descriptor, context);
@@ -122,16 +121,17 @@ int receive_thread(void *pipeline_context) {
File* file = file_receive(config, file_descriptor);
if (file) {
queue_enqueue_multithreaded(context->queue, file, &context->mutex,
&context->condition_not_empty,
&context->condition_not_full);
&context->condition_not_empty, &context->condition_not_full);
} else {
log_message(LOG_LEVEL_ERROR, "Failed to receive file");
}
}
if (!receive_status(file_descriptor, &status)) return thrd_error;
if (!receive_status(file_descriptor, &status))
return thrd_error;
}
if (status == STATUS_MANIFEST) {
if (receive_manifest(file_descriptor, config, &status) != 0) return thrd_error;
if (receive_manifest(file_descriptor, config, &status) != 0)
return thrd_error;
}
mtx_lock(&context->mutex);
context->receiver_done = true;
@@ -141,16 +141,15 @@ int receive_thread(void *pipeline_context) {
}
int write_thread(void* pipeline_context) {
PipelineContextReceiver *context =
(PipelineContextReceiver *)pipeline_context;
PipelineContextReceiver* context = (PipelineContextReceiver*)pipeline_context;
mtx_lock(&context->mutex);
bool save_to_disk = context->config->save_to_disk;
char* root_directory = str_dup(context->config->receive_root_directory);
mtx_unlock(&context->mutex);
while (true) {
File *file = queue_dequeue_multithreaded(
context->queue, &context->mutex, &context->condition_not_empty,
File* file =
queue_dequeue_multithreaded(context->queue, &context->mutex, &context->condition_not_empty,
&context->condition_not_full, &context->receiver_done);
if (file == NULL) {
free(root_directory);
+2 -4
View File
@@ -33,12 +33,10 @@ typedef struct PipelineContextReceiver {
bool receiver_done;
} PipelineContextReceiver;
PipelineContextSender *pipeline_context_sender_create(Config *config,
Queue *queue_scanner,
PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner,
Queue* queue_loader);
void pipeline_context_sender_destroy(PipelineContextSender* context);
PipelineContextReceiver *pipeline_context_receiver_create(Config *config,
Queue *queue_receiver,
PipelineContextReceiver* pipeline_context_receiver_create(Config* config, Queue* queue_receiver,
int file_descriptor);
void pipeline_context_receiver_destroy(PipelineContextReceiver* context);
int receive_thread(void* pipeline_context);
+32 -22
View File
@@ -28,13 +28,14 @@ void io_set_bwlimit(unsigned long long bytes_per_sec) {
}
static void bw_throttle(size_t bytes_written) {
if (io_bwlimit == 0) return;
if (io_bwlimit == 0)
return;
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
long long elapsed_ns = (now.tv_sec - bw_last_refill.tv_sec) * 1000000000LL +
(now.tv_nsec - bw_last_refill.tv_nsec);
long long elapsed_ns =
(now.tv_sec - bw_last_refill.tv_sec) * 1000000000LL + (now.tv_nsec - bw_last_refill.tv_nsec);
bw_last_refill = now;
long long tokens_to_add = (long long)((double)io_bwlimit * elapsed_ns / 1000000000.0);
@@ -64,19 +65,19 @@ static int io_fd(int dir_fd, int file_descriptor) {
return (dir_fd != -1) ? dir_fd : file_descriptor;
}
bool send_n_data(int file_descriptor, void *data, size_t data_size) {
bool send_n_data(int file_descriptor, const void* data, size_t data_size) {
log_message(LOG_LEVEL_DEBUG, " Sending n Data: %zu", data_size);
int fd = io_fd(io_write_fd, file_descriptor);
ssize_t total_bytes_send = 0;
while (total_bytes_send < data_size) {
while ((size_t)total_bytes_send < data_size) {
size_t chunk = data_size - total_bytes_send;
if (io_bwlimit > 0 && chunk > 65536)
chunk = 65536;
ssize_t bytes_send;
if (io_ssl)
bytes_send = SSL_write(io_ssl, (char *)data + total_bytes_send, chunk);
bytes_send = SSL_write(io_ssl, (const char*)data + total_bytes_send, chunk);
else
bytes_send = write(fd, (char *)data + total_bytes_send, chunk);
bytes_send = write(fd, (const char*)data + total_bytes_send, chunk);
if (bytes_send <= 0) {
log_message(LOG_LEVEL_ERROR, "Could not send data");
return false;
@@ -95,11 +96,11 @@ bool receive_n_data(int file_descriptor, void *data, size_t data_size) {
while (total_bytes_received < data_size) {
ssize_t bytes_received;
if (io_ssl)
bytes_received = SSL_read(io_ssl, (char *)data + total_bytes_received,
data_size - total_bytes_received);
bytes_received =
SSL_read(io_ssl, (char*)data + total_bytes_received, data_size - total_bytes_received);
else
bytes_received = read(fd, (char *)data + total_bytes_received,
data_size - total_bytes_received);
bytes_received =
read(fd, (char*)data + total_bytes_received, data_size - total_bytes_received);
if (bytes_received <= 0) {
if (bytes_received == 0)
log_message(LOG_LEVEL_ERROR, "Connection closed while receiving data");
@@ -136,19 +137,23 @@ static const char *status_to_string(Status status) {
}
}
bool send_str(int file_descriptor, char *data) {
bool send_str(int file_descriptor, const char* data) {
size_t size = strlen(data);
if (!send_n_data(file_descriptor, &size, sizeof(size_t))) return false;
if (!send_n_data(file_descriptor, data, size)) return false;
if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
return false;
if (!send_n_data(file_descriptor, data, size))
return false;
log_message(LOG_LEVEL_DEBUG, "Send String: %s", data);
return true;
}
char* receive_str(int file_descriptor) {
size_t size;
if (!receive_n_data(file_descriptor, &size, sizeof(size_t))) return NULL;
if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
return NULL;
char* data = (char*)malloc(size + 1);
if (data == NULL) return NULL;
if (data == NULL)
return NULL;
if (!receive_n_data(file_descriptor, data, size)) {
free(data);
return NULL;
@@ -158,7 +163,7 @@ char *receive_str(int file_descriptor) {
return data;
}
bool send_data(int file_descriptor, Data *data) {
bool send_data(int file_descriptor, const Data* data) {
unsigned long long data_size = data->size;
if (!send_n_data(file_descriptor, &data_size, sizeof(unsigned long long)))
return false;
@@ -173,7 +178,8 @@ Data *receive_data(int file_descriptor) {
if (!receive_n_data(file_descriptor, &size, sizeof(unsigned long long)))
return NULL;
void* data = malloc((size_t)size);
if (data == NULL) return NULL;
if (data == NULL)
return NULL;
if (!receive_n_data(file_descriptor, data, (size_t)size)) {
free(data);
return NULL;
@@ -183,25 +189,29 @@ Data *receive_data(int file_descriptor) {
}
bool send_int(int file_descriptor, int data) {
if (!send_n_data(file_descriptor, &data, sizeof(int))) return false;
if (!send_n_data(file_descriptor, &data, sizeof(int)))
return false;
log_message(LOG_LEVEL_DEBUG, "Send Int: %d", data);
return true;
}
bool receive_int(int file_descriptor, int* data) {
if (!receive_n_data(file_descriptor, data, sizeof(int))) return false;
if (!receive_n_data(file_descriptor, data, sizeof(int)))
return false;
log_message(LOG_LEVEL_DEBUG, "Received Int: %d", *data);
return true;
}
bool send_status(int file_descriptor, Status status) {
if (!send_n_data(file_descriptor, &status, sizeof(Status))) return false;
if (!send_n_data(file_descriptor, &status, sizeof(Status)))
return false;
log_message(LOG_LEVEL_DEBUG, "Send Status: %s", status_to_string(status));
return true;
}
bool receive_status(int file_descriptor, Status* status) {
if (!receive_n_data(file_descriptor, status, sizeof(Status))) return false;
if (!receive_n_data(file_descriptor, status, sizeof(Status)))
return false;
log_message(LOG_LEVEL_DEBUG, "Received Status: %s", status_to_string(*status));
return true;
}
+14 -5
View File
@@ -8,18 +8,27 @@
typedef struct ssl_st SSL;
typedef int Status;
enum NET_STATUS { STATUS_OK, STATUS_ERROR, STATUS_FINISHED, STATUS_NEXT, STATUS_CHUNK, STATUS_MANIFEST, STATUS_CHECK, STATUS_DELTA_SIGNATURE, STATUS_DELTA_DATA };
enum NET_STATUS {
STATUS_OK,
STATUS_ERROR,
STATUS_FINISHED,
STATUS_NEXT,
STATUS_CHUNK,
STATUS_MANIFEST,
STATUS_CHECK,
STATUS_DELTA_SIGNATURE,
STATUS_DELTA_DATA
};
void io_set_fds(int read_fd, int write_fd);
void io_set_bwlimit(unsigned long long bytes_per_sec);
typedef struct ssl_st SSL;
void io_set_ssl(SSL* ssl);
bool send_n_data(int file_descriptor, void *data, size_t data_size);
bool send_n_data(int file_descriptor, const void* data, size_t data_size);
bool receive_n_data(int file_descriptor, void* data, size_t data_size);
bool send_str(int file_descriptor, char *data);
bool send_str(int file_descriptor, const char* data);
char* receive_str(int file_descriptor);
bool send_data(int file_descriptor, Data *data);
bool send_data(int file_descriptor, const Data* data);
Data* receive_data(int file_descriptor);
bool send_int(int file_descriptor, int data);
bool receive_int(int file_descriptor, int* data);
+11 -11
View File
@@ -46,20 +46,21 @@ void queue_destroy(Queue *queue) {
free(queue);
}
bool queue_is_empty(Queue *queue) {
bool queue_is_empty(const Queue* queue) {
if (queue == NULL)
return true;
return queue->size == 0;
}
bool queue_is_full(Queue *queue) {
bool queue_is_full(const Queue* queue) {
if (queue == NULL)
return false;
return queue->size == queue->capacity;
}
static bool queue_double_capacity(Queue* queue) {
if (queue == NULL) return false;
if (queue == NULL)
return false;
unsigned int new_capacity = queue->capacity * 2;
if (new_capacity <= 1)
new_capacity = 100;
@@ -79,9 +80,11 @@ static bool queue_double_capacity(Queue *queue) {
}
bool queue_enqueue(Queue* queue, void* item) {
if (queue == NULL || item == NULL) return false;
if (queue == NULL || item == NULL)
return false;
if (queue_is_full(queue)) {
if (!queue_double_capacity(queue)) return false;
if (!queue_double_capacity(queue))
return false;
}
queue->items[queue->rear] = item;
queue->rear = (queue->rear + 1) % queue->capacity;
@@ -89,8 +92,7 @@ bool queue_enqueue(Queue *queue, void *item) {
return true;
}
bool queue_enqueue_multithreaded(Queue *queue, void *item, mtx_t *mutex,
cnd_t *condition_not_empty,
bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t* condition_not_empty,
cnd_t* condition_not_full) {
mtx_lock(mutex);
while (queue_is_full(queue))
@@ -114,10 +116,8 @@ void *queue_dequeue(Queue *queue) {
return item;
}
void *queue_dequeue_multithreaded(Queue *queue, mtx_t *mutex,
cnd_t *condition_not_empty,
cnd_t *condition_not_full,
bool *other_thread_done) {
void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty,
cnd_t* condition_not_full, const bool* other_thread_done) {
mtx_lock(mutex);
while (queue_is_empty(queue) && !*other_thread_done)
cnd_wait(condition_not_empty, mutex);
+5 -8
View File
@@ -15,16 +15,13 @@ typedef struct Queue {
Queue* queue_create(int capacity, void (*destroyer)(void* item));
void queue_destroy(Queue* queue);
bool queue_is_empty(Queue *queue);
bool queue_is_full(Queue *queue);
bool queue_is_empty(const Queue* queue);
bool queue_is_full(const Queue* queue);
bool queue_enqueue(Queue* queue, void* item);
bool queue_enqueue_multithreaded(Queue *queue, void *item, mtx_t *mutex,
cnd_t *condition_not_empty,
bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t* condition_not_empty,
cnd_t* condition_not_full);
void* queue_dequeue(Queue* queue);
void *queue_dequeue_multithreaded(Queue *queue, mtx_t *mutex,
cnd_t *condition_not_empty,
cnd_t *condition_not_full,
bool *other_thread_done);
void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty,
cnd_t* condition_not_full, const bool* other_thread_done);
#endif
+19 -10
View File
@@ -15,34 +15,39 @@ typedef struct {
static int parse_remote_dest(const char* dest, RemoteDest* r) {
const char* colon = strchr(dest, ':');
if (!colon) return -1;
if (!colon)
return -1;
size_t remote_path_len = strlen(colon + 1);
if (remote_path_len >= sizeof(r->remote_path)) return -1;
if (remote_path_len >= sizeof(r->remote_path))
return -1;
memcpy(r->remote_path, colon + 1, remote_path_len + 1);
const char* at = memchr(dest, '@', colon - dest);
if (at) {
size_t user_len = at - dest;
if (user_len >= sizeof(r->user)) return -1;
if (user_len >= sizeof(r->user))
return -1;
memcpy(r->user, dest, user_len);
r->user[user_len] = '\0';
size_t host_len = colon - at - 1;
if (host_len >= sizeof(r->host)) return -1;
if (host_len >= sizeof(r->host))
return -1;
memcpy(r->host, at + 1, host_len);
r->host[host_len] = '\0';
} else {
r->user[0] = '\0';
size_t host_len = colon - dest;
if (host_len >= sizeof(r->host)) return -1;
if (host_len >= sizeof(r->host))
return -1;
memcpy(r->host, dest, host_len);
r->host[host_len] = '\0';
}
return 0;
}
Client *client_connect_ssh(char *destination, int port) {
Client* client_connect_ssh(const char* destination, int port) {
RemoteDest r;
if (parse_remote_dest(destination, &r) != 0) {
fprintf(stderr, "Invalid remote destination: %s\n", destination);
@@ -64,15 +69,18 @@ Client *client_connect_ssh(char *destination, int port) {
int exec_pipe[2];
if (pipe(exec_pipe) < 0) {
perror("pipe failed");
close(sv[0]); close(sv[1]);
close(sv[0]);
close(sv[1]);
return NULL;
}
pid_t pid = fork();
if (pid < 0) {
perror("fork failed");
close(sv[0]); close(sv[1]);
close(exec_pipe[0]); close(exec_pipe[1]);
close(sv[0]);
close(sv[1]);
close(exec_pipe[0]);
close(exec_pipe[1]);
return NULL;
}
@@ -85,7 +93,8 @@ Client *client_connect_ssh(char *destination, int port) {
dup2(sv[1], STDIN_FILENO);
if (sv[1] != STDOUT_FILENO)
dup2(sv[1], STDOUT_FILENO);
if (sv[1] > 1) close(sv[1]);
if (sv[1] > 1)
close(sv[1]);
char ssh_user[512];
if (r.user[0] != '\0')
+1 -1
View File
@@ -3,6 +3,6 @@
#include "transport_tcp.h"
Client *client_connect_ssh(char *destination, int port);
Client* client_connect_ssh(const char* destination, int port);
#endif
+19 -19
View File
@@ -26,8 +26,7 @@ Server *server_create(int port) {
}
server->file_descriptor = file_descriptor;
int opt = 1;
if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt,
sizeof(opt))) {
if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) {
perror("Error setting a socket option!");
close(server->file_descriptor);
free(server);
@@ -40,8 +39,8 @@ Server *server_create(int port) {
server->address_length = sizeof(server->address);
server->ssl_ctx = NULL;
if (bind(server->file_descriptor, (struct sockaddr *)&server->address,
server->address_length) < 0) {
if (bind(server->file_descriptor, (struct sockaddr*)&server->address, server->address_length) <
0) {
perror("Could not bind server");
close(server->file_descriptor);
free(server);
@@ -52,7 +51,8 @@ Server *server_create(int port) {
}
void server_delete(Server** server) {
if (server == NULL || *server == NULL) return;
if (server == NULL || *server == NULL)
return;
close((*server)->file_descriptor);
if ((*server)->ssl_ctx) {
SSL_CTX_free((*server)->ssl_ctx);
@@ -62,8 +62,8 @@ void server_delete(Server **server) {
*server = NULL;
}
static void accept_loop(Server *server, void (*child_fn)(int, void *),
void *child_ctx, const char *log_fmt) {
static void accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
const char* log_fmt) {
if (listen(server->file_descriptor, SOMAXCONN) < 0) {
perror("Could not listen on port!");
return;
@@ -72,8 +72,7 @@ static void accept_loop(Server *server, void (*child_fn)(int, void *),
while (1) {
struct sockaddr_in client_addr;
socklen_t client_len = sizeof(client_addr);
int fd = accept(server->file_descriptor, (struct sockaddr *)&client_addr,
&client_len);
int fd = accept(server->file_descriptor, (struct sockaddr*)&client_addr, &client_len);
if (fd < 0) {
perror("Could not accept the connection");
continue;
@@ -90,24 +89,24 @@ static void accept_loop(Server *server, void (*child_fn)(int, void *),
}
}
struct plain_ctx { void (*handler)(int); };
struct plain_ctx {
void (*handler)(int);
};
static void plain_child_fn(int fd, void* ctx) {
((struct plain_ctx*)ctx)->handler(fd);
}
bool server_listen(Server* server, void (*handler)(int file_descriptor)) {
log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d",
ntohs(server->address.sin_port));
log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d", ntohs(server->address.sin_port));
struct plain_ctx ctx = {handler};
accept_loop(server, plain_child_fn, &ctx, "Received Connection");
return true;
}
void server_accept_loop(Server *server, void (*child_fn)(int, void *),
void *child_ctx, const char *log_fmt) {
log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d",
ntohs(server->address.sin_port));
void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
const char* log_fmt) {
log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d", ntohs(server->address.sin_port));
accept_loop(server, child_fn, child_ctx, log_fmt);
}
@@ -140,8 +139,8 @@ bool client_connect(Client *client, char *host, int port) {
return false;
}
if (connect(client->file_descriptor, (struct sockaddr *)&client->address,
client->address_length) < 0) {
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
0) {
perror("Could not connect to Server!");
return false;
}
@@ -164,7 +163,8 @@ void client_disconnect(Client *client) {
}
void client_delete(Client* client) {
if (client == NULL) return;
if (client == NULL)
return;
if (client->ssl_ctx) {
SSL_CTX_free(client->ssl_ctx);
client->ssl_ctx = NULL;
+2 -2
View File
@@ -23,8 +23,8 @@ typedef struct Client {
Server* server_create(int port);
bool server_listen(Server* server, void (*handler)(int file_descriptor));
void server_accept_loop(Server *server, void (*child_fn)(int, void *),
void *child_ctx, const char *log_fmt);
void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
const char* log_fmt);
void server_delete(Server** server);
Client* client_create();
bool client_connect(Client* client, char* host, int port);
+17 -18
View File
@@ -31,10 +31,9 @@ static void log_ssl_errors(void) {
}
}
static SSL_CTX *create_ssl_ctx(bool is_server, const char *cert,
const char *key, const char *ca_path) {
const SSL_METHOD *method =
is_server ? TLS_server_method() : TLS_client_method();
static SSL_CTX* create_ssl_ctx(bool is_server, const char* cert, const char* key,
const char* ca_path) {
const SSL_METHOD* method = is_server ? TLS_server_method() : TLS_client_method();
SSL_CTX* ctx = SSL_CTX_new(method);
if (!ctx) {
log_message(LOG_LEVEL_ERROR, "Unable to create SSL context");
@@ -58,8 +57,7 @@ static SSL_CTX *create_ssl_ctx(bool is_server, const char *cert,
return NULL;
}
if (!SSL_CTX_check_private_key(ctx)) {
log_message(LOG_LEVEL_ERROR,
"Private key does not match certificate");
log_message(LOG_LEVEL_ERROR, "Private key does not match certificate");
SSL_CTX_free(ctx);
return NULL;
}
@@ -93,8 +91,7 @@ static SSL *wrap_fd_with_ssl(int fd, SSL_CTX *ctx, bool is_server) {
ret = SSL_connect(ssl);
if (ret <= 0) {
log_message(LOG_LEVEL_ERROR, "SSL %s failed",
is_server ? "accept" : "connect");
log_message(LOG_LEVEL_ERROR, "SSL %s failed", is_server ? "accept" : "connect");
log_ssl_errors();
SSL_free(ssl);
return NULL;
@@ -102,10 +99,11 @@ static SSL *wrap_fd_with_ssl(int fd, SSL_CTX *ctx, bool is_server) {
return ssl;
}
bool server_create_tls(Server *server, const char *cert_path,
const char *key_path, const char *ca_path) {
bool server_create_tls(Server* server, const char* cert_path, const char* key_path,
const char* ca_path) {
SSL_CTX* ctx = create_ssl_ctx(true, cert_path, key_path, ca_path);
if (!ctx) return false;
if (!ctx)
return false;
server->ssl_ctx = ctx;
return true;
}
@@ -118,7 +116,8 @@ struct tls_child_ctx {
static void tls_child_fn(int fd, void* arg) {
struct tls_child_ctx* ctx = (struct tls_child_ctx*)arg;
SSL* ssl = wrap_fd_with_ssl(fd, ctx->ssl_ctx, true);
if (!ssl) return;
if (!ssl)
return;
io_set_ssl(ssl);
ctx->handler(fd);
SSL_shutdown(ssl);
@@ -132,22 +131,22 @@ bool server_listen_tls(Server *server, void (*handler)(int file_descriptor)) {
return true;
}
bool client_connect_tls(Client *client, char *host, int port,
const char *cert_path, const char *key_path,
const char *ca_path) {
bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
const char* key_path, const char* ca_path) {
client->address.sin_port = htons(port);
if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
perror("Could not convert host address!");
return false;
}
if (connect(client->file_descriptor, (struct sockaddr *)&client->address,
client->address_length) < 0) {
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
0) {
perror("Could not connect to Server!");
return false;
}
SSL_CTX* ctx = create_ssl_ctx(false, cert_path, key_path, ca_path);
if (!ctx) return false;
if (!ctx)
return false;
client->ssl_ctx = ctx;
SSL* ssl = wrap_fd_with_ssl(client->file_descriptor, ctx, false);
+4 -5
View File
@@ -6,11 +6,10 @@
bool tls_global_init(void);
bool server_create_tls(Server *server, const char *cert_path,
const char *key_path, const char *ca_path);
bool server_listen_tls(Server *server, void (*handler)(int file_descriptor));
bool client_connect_tls(Client *client, char *host, int port,
const char *cert_path, const char *key_path,
bool server_create_tls(Server* server, const char* cert_path, const char* key_path,
const char* ca_path);
bool server_listen_tls(Server* server, void (*handler)(int file_descriptor));
bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
const char* key_path, const char* ca_path);
#endif
+12 -8
View File
@@ -8,12 +8,16 @@
#include <sys/stat.h>
#include <unistd.h>
bool mkdir_r(char *path) {
bool mkdir_r(const char* path) {
char* path_duplicate = malloc(strlen(path) + 1);
if (!path_duplicate) return false;
if (!path_duplicate)
return false;
strcpy(path_duplicate, path);
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
if (!path_current) { free(path_duplicate); return false; }
if (!path_current) {
free(path_duplicate);
return false;
}
char* path_current_position = path_current;
if (path[0] == '/') {
strcpy(path_current, "/");
@@ -22,7 +26,7 @@ bool mkdir_r(char *path) {
path_current[0] = '\0';
}
const char* delimiter = "/";
char *part = strtok(path_duplicate, delimiter);
const char* part = strtok(path_duplicate, delimiter);
bool ok = true;
while (part != NULL) {
strcpy(path_current_position, part);
@@ -77,8 +81,7 @@ bool glob_match(const char *pattern, const char *str) {
return *str == '\0';
}
static void delete_extras_walk(const char *abs_path, const char *rel_path,
ArrayList *manifest) {
static void delete_extras_walk(const char* abs_path, const char* rel_path, ArrayList* manifest) {
DIR* dir = opendir(abs_path);
if (!dir)
return;
@@ -121,7 +124,7 @@ void delete_extras(const char *dest_root, ArrayList *manifest) {
delete_extras_walk(dest_root, "", manifest);
}
char *path_cat(char *path1, char *path2) {
char* path_cat(const char* path1, char* path2) {
if (path1 == NULL || *path1 == '\0')
return str_dup(path2);
if (path2 == NULL || *path2 == '\0')
@@ -136,7 +139,8 @@ char *path_cat(char *path1, char *path2) {
path2_len -= 1;
}
char* new_path = malloc(path1_len + path2_len + 2);
if (new_path == NULL) return NULL;
if (new_path == NULL)
return NULL;
memcpy(new_path, path1, path1_len);
new_path[path1_len] = '/';
memcpy(new_path + path1_len + 1, path2_pointer, path2_len);
+2 -2
View File
@@ -4,9 +4,9 @@
#include "array_list.h"
#include <stdbool.h>
bool mkdir_r(char *path);
bool mkdir_r(const char* path);
char* str_dup(const char* string);
char *path_cat(char *path1, char *path2);
char* path_cat(const char* path1, char* path2);
bool glob_match(const char* pattern, const char* str);
void delete_extras(const char* dest_root, ArrayList* manifest);
+1 -1
View File
@@ -9,7 +9,7 @@
#include <unistd.h>
static void test_data_compress_decompress_roundtrip() {
char original[] = "Hello, World! This is test data for compression round-trip!";
const char original[] = "Hello, World! This is test data for compression round-trip!";
size_t len = strlen(original);
char* buf = malloc(len);
+12 -12
View File
@@ -7,8 +7,8 @@
#include <stdlib.h>
static void test_config_lifecycle() {
Config *cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"),
true, true, false, false, false, 1, false, 0);
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), true, true, false,
false, false, 1, false, 0);
EXPECT_NOT_NULL(cfg);
EXPECT_EQ_STR(cfg->version, "1.0");
EXPECT_EQ_STR(cfg->send_directory, "/src");
@@ -23,8 +23,8 @@ static void test_config_lifecycle() {
}
static void test_config_ssh_dest() {
Config *cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("user@host:/dst"),
true, false, false, false, false, 1, false, 0);
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("user@host:/dst"), true,
false, false, false, false, 1, false, 0);
EXPECT_NOT_NULL(cfg);
EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP);
EXPECT_NULL(cfg->ssh_destination);
@@ -38,8 +38,8 @@ static void test_config_ssh_dest() {
}
static void test_config_ssh_dest_local_path() {
Config *cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/local/path"),
true, false, false, false, false, 1, false, 0);
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/local/path"), true, false,
false, false, false, 1, false, 0);
config_parse_ssh_dest(cfg);
EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP);
EXPECT_NULL(cfg->ssh_destination);
@@ -48,8 +48,8 @@ static void test_config_ssh_dest_local_path() {
}
static void test_config_ssh_dest_no_user() {
Config *cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("host:/remote"),
true, false, false, false, false, 1, false, 0);
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("host:/remote"), true, false,
false, false, false, 1, false, 0);
config_parse_ssh_dest(cfg);
EXPECT_EQ_INT(cfg->transport, TRANSPORT_SSH);
EXPECT_EQ_STR(cfg->ssh_destination, "host:/remote");
@@ -58,8 +58,8 @@ static void test_config_ssh_dest_no_user() {
}
static void test_pipeline_sender_lifecycle() {
Config *cfg = config_create(str_dup("2.0"), str_dup("/src2"),
str_dup("/dst2"), false, false, true, true, false, 1, false, 0);
Config* cfg = config_create(str_dup("2.0"), str_dup("/src2"), str_dup("/dst2"), false, false,
true, true, false, 1, false, 0);
Queue* q1 = queue_create(5, NULL);
Queue* q2 = queue_create(15, NULL);
@@ -75,8 +75,8 @@ static void test_pipeline_sender_lifecycle() {
}
static void test_pipeline_receiver_lifecycle() {
Config *cfg = config_create(str_dup("3.0"), str_dup("/src3"),
str_dup("/dst3"), true, true, true, true, false, 1, false, 0);
Config* cfg = config_create(str_dup("3.0"), str_dup("/src3"), str_dup("/dst3"), true, true, true,
true, false, 1, false, 0);
Queue* q = queue_create(20, NULL);
PipelineContextReceiver* pcr = pipeline_context_receiver_create(cfg, q, 42);
+13 -6
View File
@@ -37,7 +37,8 @@ static void test_xxhash32_different_data() {
static void test_signature_roundtrip() {
char old_data[4096];
for (int i = 0; i < 4096; i++) old_data[i] = (char)(i % 256);
for (int i = 0; i < 4096; i++)
old_data[i] = (char)(i % 256);
DeltaSignature* sig = delta_signature_create(old_data, 4096, 1024);
EXPECT_NOT_NULL(sig);
@@ -64,7 +65,8 @@ static void test_signature_roundtrip() {
static void test_delta_identical_files() {
char data[2048];
for (int i = 0; i < 2048; i++) data[i] = (char)(i % 128);
for (int i = 0; i < 2048; i++)
data[i] = (char)(i % 128);
DeltaSignature* sig = delta_signature_create(data, 2048, 512);
EXPECT_NOT_NULL(sig);
@@ -195,9 +197,11 @@ static void test_delta_serialize_roundtrip() {
static void test_delta_file_growth() {
char old_data[2048];
char new_data[3072];
for (int i = 0; i < 2048; i++) old_data[i] = (char)(i % 256);
for (int i = 0; i < 2048; i++)
old_data[i] = (char)(i % 256);
memcpy(new_data, old_data, 2048);
for (int i = 2048; i < 3072; i++) new_data[i] = (char)(i % 256);
for (int i = 2048; i < 3072; i++)
new_data[i] = (char)(i % 256);
DeltaSignature* sig = delta_signature_create(old_data, 2048, 512);
EXPECT_NOT_NULL(sig);
@@ -218,8 +222,10 @@ static void test_delta_file_growth() {
static void test_delta_file_shrink() {
char old_data[3072];
char new_data[2048];
for (int i = 0; i < 3072; i++) old_data[i] = (char)(i % 256);
for (int i = 0; i < 2048; i++) new_data[i] = old_data[i];
for (int i = 0; i < 3072; i++)
old_data[i] = (char)(i % 256);
for (int i = 0; i < 2048; i++)
new_data[i] = old_data[i];
DeltaSignature* sig = delta_signature_create(old_data, 3072, 512);
EXPECT_NOT_NULL(sig);
@@ -301,6 +307,7 @@ static void test_large_file_delta() {
else
match_count++;
}
EXPECT_TRUE(total_literal > 0);
EXPECT_TRUE(match_count > 0);
EXPECT_TRUE(delta->delta_size < new_size / 2);
+10 -11
View File
@@ -44,7 +44,7 @@ static void test_queue_basic() {
EXPECT_EQ_INT(q->size, 6);
int expected_vals[] = {30, 40, 50, 60, 70, 80};
const int expected_vals[] = {30, 40, 50, 60, 70, 80};
for (int i = 0; i < 6; i++) {
int* v = (int*)queue_dequeue(q);
EXPECT_NOT_NULL(v);
@@ -69,7 +69,7 @@ static void test_queue_resize() {
EXPECT_TRUE(queue_is_full(q));
int *v1 = (int *)queue_dequeue(q);
const int* v1 = (const int*)queue_dequeue(q);
EXPECT_NOT_NULL(v1);
EXPECT_EQ_INT(*v1, 1);
@@ -84,19 +84,19 @@ static void test_queue_resize() {
EXPECT_EQ_INT(q->size, 4);
// Dequeue all and check order: B, C, D, E
int *v2 = (int *)queue_dequeue(q);
const int* v2 = (const int*)queue_dequeue(q);
EXPECT_NOT_NULL(v2);
EXPECT_EQ_INT(*v2, 2);
int *v3 = (int *)queue_dequeue(q);
const int* v3 = (const int*)queue_dequeue(q);
EXPECT_NOT_NULL(v3);
EXPECT_EQ_INT(*v3, 3);
int *v4 = (int *)queue_dequeue(q);
const int* v4 = (const int*)queue_dequeue(q);
EXPECT_NOT_NULL(v4);
EXPECT_EQ_INT(*v4, 4);
int *v5 = (int *)queue_dequeue(q);
const int* v5 = (const int*)queue_dequeue(q);
EXPECT_NOT_NULL(v5);
EXPECT_EQ_INT(*v5, 5);
@@ -142,7 +142,8 @@ typedef struct {
static int consumer_func(void* arg) {
ThreadContext* ctx = (ThreadContext*)arg;
while (true) {
int *val = (int *)queue_dequeue_multithreaded(ctx->q, ctx->mutex, ctx->cnd_empty, ctx->cnd_full, &ctx->done);
int* val = (int*)queue_dequeue_multithreaded(ctx->q, ctx->mutex, ctx->cnd_empty, ctx->cnd_full,
&ctx->done);
if (val == NULL) {
break;
}
@@ -162,14 +163,12 @@ static void test_queue_multithreaded() {
cnd_init(&cnd_empty);
cnd_init(&cnd_full);
ThreadContext ctx = {
.q = q,
ThreadContext ctx = {.q = q,
.mutex = &mutex,
.cnd_empty = &cnd_empty,
.cnd_full = &cnd_full,
.done = false,
.sum = 0
};
.sum = 0};
thrd_t consumer;
int res = thrd_create(&consumer, consumer_func, &ctx);
+17 -11
View File
@@ -18,7 +18,8 @@ static void test_scanner_single_file() {
mkdir(dir, 0755);
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);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -26,7 +27,7 @@ static void test_scanner_single_file() {
EXPECT_EQ_INT(chunk->element_count, 1);
EXPECT_EQ_STR(chunk->items[0]->path, file1);
Chunk *next = directory_scanner_next(scanner);
const Chunk* next = directory_scanner_next(scanner);
EXPECT_NULL(next);
chunk_destroy(chunk);
@@ -46,25 +47,28 @@ static void test_scanner_multiple_files() {
create_test_file(file1, content1);
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);
EXPECT_NOT_NULL(scanner);
Chunk *chunk = directory_scanner_next(scanner);
const Chunk* chunk = directory_scanner_next(scanner);
EXPECT_NOT_NULL(chunk);
EXPECT_EQ_INT(chunk->element_count, 2);
int found1 = 0, found2 = 0;
for (int i = 0; i < chunk->element_count; i++) {
if (strcmp(chunk->items[i]->path, file1) == 0) found1 = 1;
if (strcmp(chunk->items[i]->path, file2) == 0) found2 = 1;
if (strcmp(chunk->items[i]->path, file1) == 0)
found1 = 1;
if (strcmp(chunk->items[i]->path, file2) == 0)
found2 = 1;
}
EXPECT_TRUE(found1);
EXPECT_TRUE(found2);
Chunk *next = directory_scanner_next(scanner);
const Chunk* next = directory_scanner_next(scanner);
EXPECT_NULL(next);
chunk_destroy(chunk);
chunk_destroy((void*)chunk);
directory_scanner_destroy(scanner);
unlink(file1);
unlink(file2);
@@ -83,7 +87,8 @@ static void test_scanner_subdirectory() {
create_test_file(root_file, content);
create_test_file(sub_file, content);
DirectoryScanner *scanner = directory_scanner_create((char *)root, false, 0, NULL, 0, NULL, 0, 0, 0);
DirectoryScanner* scanner =
directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
int total_files = 0;
@@ -106,10 +111,11 @@ static void test_scanner_empty_directory() {
mkdir(dir, 0755);
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);
EXPECT_NOT_NULL(scanner);
Chunk *chunk = directory_scanner_next(scanner);
const Chunk* chunk = directory_scanner_next(scanner);
EXPECT_NULL(chunk);
directory_scanner_destroy(scanner);
+1 -1
View File
@@ -6,7 +6,7 @@
void test_shared_utils() {
// Test str_dup
char *dup_null = str_dup(NULL);
const char* dup_null = str_dup(NULL);
EXPECT_NULL(dup_null);
char* dup_empty = str_dup("");
+12 -6
View File
@@ -29,7 +29,8 @@ extern bool current_test_failed;
#define EXPECT_TRUE(condition) \
do { \
if (!(condition)) { \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Assertion failed: %s is false\n", __FILE__, __LINE__, #condition); \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Assertion failed: %s is false\n", __FILE__, \
__LINE__, #condition); \
current_test_failed = true; \
return; \
} \
@@ -38,7 +39,8 @@ extern bool current_test_failed;
#define EXPECT_FALSE(condition) \
do { \
if (condition) { \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Assertion failed: %s is true\n", __FILE__, __LINE__, #condition); \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Assertion failed: %s is true\n", __FILE__, \
__LINE__, #condition); \
current_test_failed = true; \
return; \
} \
@@ -49,7 +51,8 @@ extern bool current_test_failed;
int act = (actual); \
int exp = (expected); \
if (act != exp) { \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected %d, got %d\n", __FILE__, __LINE__, exp, act); \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected %d, got %d\n", __FILE__, __LINE__, exp, \
act); \
current_test_failed = true; \
return; \
} \
@@ -67,7 +70,8 @@ extern bool current_test_failed;
return; \
} \
} else if (strcmp(act, exp) != 0) { \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected \"%s\", got \"%s\"\n", __FILE__, __LINE__, exp, act); \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected \"%s\", got \"%s\"\n", __FILE__, \
__LINE__, exp, act); \
current_test_failed = true; \
return; \
} \
@@ -76,7 +80,8 @@ extern bool current_test_failed;
#define EXPECT_NOT_NULL(ptr) \
do { \
if ((ptr) == NULL) { \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected non-null pointer, got NULL\n", __FILE__, __LINE__); \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected non-null pointer, got NULL\n", __FILE__, \
__LINE__); \
current_test_failed = true; \
return; \
} \
@@ -85,7 +90,8 @@ extern bool current_test_failed;
#define EXPECT_NULL(ptr) \
do { \
if ((ptr) != NULL) { \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected NULL, got %p\n", __FILE__, __LINE__, (void*)(ptr)); \
printf(" \033[1;31m[FAIL]\033[0m %s:%d: Expected NULL, got %p\n", __FILE__, __LINE__, \
(void*)(ptr)); \
current_test_failed = true; \
return; \
} \