Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e34ec3d594 | |||
| e62296d92f | |||
| 4339d7905d | |||
| 4b93082139 | |||
| 30d4d6870c | |||
| cf572ece04 | |||
| a4fc16650e | |||
| 62ff1d3929 | |||
| e5b46bb1c0 | |||
| 16376bcafc | |||
| 6b8979a040 | |||
| bcf5ffcf40 | |||
| 5049a7bbf0 | |||
| e6e8679bfc | |||
| 6831e7e6fb | |||
| e3484939b6 | |||
| 2f9a4fac78 | |||
| e1f9ba090f | |||
| f6b4d89a3c | |||
| 8f25f6a6b6 | |||
| 2dd40d6a5b | |||
| 12ca4b13c8 | |||
| 2fed5dddaa | |||
| 28d076fc28 | |||
| 4383caa3bb | |||
| df0f52ce39 | |||
| c2ddda26ad | |||
| ddfdb3825a | |||
| 4dbb2b4f8b |
Submodule _deps/xxhash-src deleted from e626a72bc2
+2
-57
@@ -24,58 +24,9 @@ DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metada
|
||||
scanner->current_path = NULL;
|
||||
scanner->use_metadata = use_metadata;
|
||||
scanner->chunk_size = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
|
||||
/* Deep-copy exclude patterns */
|
||||
if (exclude_count > 0 && exclude_patterns != NULL) {
|
||||
scanner->exclude_patterns = malloc((size_t)exclude_count * sizeof(char*));
|
||||
if (scanner->exclude_patterns == NULL) {
|
||||
queue_destroy(scanner->directories);
|
||||
free(scanner);
|
||||
return NULL;
|
||||
}
|
||||
for (int i = 0; i < exclude_count; i++) {
|
||||
scanner->exclude_patterns[i] = str_dup(exclude_patterns[i]);
|
||||
if (scanner->exclude_patterns[i] == NULL) {
|
||||
for (int j = 0; j < i; j++)
|
||||
free(scanner->exclude_patterns[j]);
|
||||
free(scanner->exclude_patterns);
|
||||
queue_destroy(scanner->directories);
|
||||
free(scanner);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
scanner->exclude_patterns = NULL;
|
||||
}
|
||||
scanner->exclude_patterns = exclude_patterns;
|
||||
scanner->exclude_count = exclude_count;
|
||||
|
||||
/* Deep-copy include patterns */
|
||||
if (include_count > 0 && include_patterns != NULL) {
|
||||
scanner->include_patterns = malloc((size_t)include_count * sizeof(char*));
|
||||
if (scanner->include_patterns == NULL) {
|
||||
for (int i = 0; i < exclude_count; i++)
|
||||
free(scanner->exclude_patterns[i]);
|
||||
free(scanner->exclude_patterns);
|
||||
queue_destroy(scanner->directories);
|
||||
free(scanner);
|
||||
return NULL;
|
||||
}
|
||||
for (int i = 0; i < include_count; i++) {
|
||||
scanner->include_patterns[i] = str_dup(include_patterns[i]);
|
||||
if (scanner->include_patterns[i] == NULL) {
|
||||
for (int j = 0; j < i; j++)
|
||||
free(scanner->include_patterns[j]);
|
||||
free(scanner->include_patterns);
|
||||
for (int j = 0; j < exclude_count; j++)
|
||||
free(scanner->exclude_patterns[j]);
|
||||
free(scanner->exclude_patterns);
|
||||
queue_destroy(scanner->directories);
|
||||
free(scanner);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
scanner->include_patterns = NULL;
|
||||
}
|
||||
scanner->include_patterns = include_patterns;
|
||||
scanner->include_count = include_count;
|
||||
scanner->max_size = max_size;
|
||||
scanner->min_size = min_size;
|
||||
@@ -91,12 +42,6 @@ void directory_scanner_destroy(DirectoryScanner* scanner) {
|
||||
scanner->current_dir = NULL;
|
||||
}
|
||||
free(scanner->current_path);
|
||||
for (int i = 0; i < scanner->exclude_count; i++)
|
||||
free(scanner->exclude_patterns[i]);
|
||||
free(scanner->exclude_patterns);
|
||||
for (int i = 0; i < scanner->include_count; i++)
|
||||
free(scanner->include_patterns[i]);
|
||||
free(scanner->include_patterns);
|
||||
queue_destroy(scanner->directories);
|
||||
free(scanner);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
#include "compression.h"
|
||||
#include "data.h"
|
||||
#include "log.h"
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include "stdlib.h"
|
||||
#include "zstd.h"
|
||||
|
||||
#define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
|
||||
@@ -67,16 +66,8 @@ Data* data_decompress(Data* compressed_data) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size_t buf_size = INITIAL_DECOMPRESS_BUF_SIZE;
|
||||
if (!ZSTD_isError(dst_size) && dst_size > 0) {
|
||||
if (dst_size > SIZE_MAX) {
|
||||
log_message(LOG_LEVEL_ERROR,
|
||||
"Decompressed size %llu exceeds addressable memory, using fallback buffer",
|
||||
dst_size);
|
||||
} else {
|
||||
buf_size = (size_t)dst_size;
|
||||
}
|
||||
}
|
||||
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");
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@ typedef struct Config {
|
||||
char* tls_ca;
|
||||
} Config;
|
||||
|
||||
#define PROTOCOL_VERSION "1.3.0"
|
||||
#define PROTOCOL_VERSION "1.4.0"
|
||||
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
|
||||
|
||||
Config* config_create(char* version, char* send_directory, char* receive_directory,
|
||||
|
||||
+1
-3
@@ -3,9 +3,7 @@
|
||||
#include "stdlib.h"
|
||||
|
||||
Data* data_create_empty(size_t data_size) {
|
||||
/* malloc(0) is UB; allocate at least 1 byte but preserve requested size */
|
||||
size_t alloc_size = data_size > 0 ? data_size : 1;
|
||||
void* data = malloc(alloc_size);
|
||||
void* data = malloc(data_size);
|
||||
if (data == NULL) {
|
||||
log_message(LOG_LEVEL_ERROR, "Could not allocate memory for empty data");
|
||||
return NULL;
|
||||
|
||||
+26
-1
@@ -118,6 +118,11 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
|
||||
data_destroy(compressed_data);
|
||||
return false;
|
||||
}
|
||||
int ft = 0; // FILE_TYPE_REGULAR
|
||||
if (!send_int(file_descriptor, ft)) {
|
||||
data_destroy(compressed_data);
|
||||
return false;
|
||||
}
|
||||
if (!send_data(file_descriptor, data_to_send)) {
|
||||
data_destroy(compressed_data);
|
||||
return false;
|
||||
@@ -157,17 +162,21 @@ static void* old_data_from_path(const char* full_path, unsigned long long old_si
|
||||
|
||||
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)
|
||||
if (!old_data) {
|
||||
send_status(fd, STATUS_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
DeltaSignature* sig = delta_signature_create(old_data, old_size, config->delta_block_size);
|
||||
if (!sig) {
|
||||
send_status(fd, STATUS_ERROR);
|
||||
free(old_data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Data* sig_data = delta_signature_serialize(sig);
|
||||
if (!sig_data) {
|
||||
send_status(fd, STATUS_ERROR);
|
||||
delta_signature_destroy(sig);
|
||||
free(old_data);
|
||||
return NULL;
|
||||
@@ -385,6 +394,13 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
|
||||
}
|
||||
}
|
||||
|
||||
int file_type;
|
||||
if (!receive_int(fd, &file_type)) {
|
||||
file_destroy(file);
|
||||
send_status(fd, STATUS_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Data* file_data = receive_data(fd);
|
||||
if (file_data == NULL) {
|
||||
file_destroy(file);
|
||||
@@ -462,6 +478,10 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
|
||||
if (use_metadata && !metadata_send(file_descriptor, file->metadata))
|
||||
return false;
|
||||
|
||||
int ft = 0; // FILE_TYPE_REGULAR
|
||||
if (!send_int(file_descriptor, ft))
|
||||
return false;
|
||||
|
||||
int fd = open(file->path, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
perror("Could not open file for sendfile");
|
||||
@@ -504,6 +524,11 @@ File* file_receive(const Config* config, int file_descriptor) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
int file_type;
|
||||
if (!receive_int(file_descriptor, &file_type)) {
|
||||
file_destroy(file);
|
||||
return NULL;
|
||||
}
|
||||
Data* file_data = receive_data(file_descriptor);
|
||||
if (file_data == NULL) {
|
||||
file_destroy(file);
|
||||
|
||||
@@ -138,10 +138,6 @@ static const char* status_to_string(Status status) {
|
||||
}
|
||||
|
||||
bool send_str(int file_descriptor, const char* data) {
|
||||
if (data == NULL) {
|
||||
log_message(LOG_LEVEL_ERROR, "send_str called with NULL data");
|
||||
return false;
|
||||
}
|
||||
size_t size = strlen(data);
|
||||
if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
|
||||
return false;
|
||||
@@ -155,11 +151,6 @@ char* receive_str(int file_descriptor) {
|
||||
size_t size;
|
||||
if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
|
||||
return NULL;
|
||||
if (size > MAX_STRING_SIZE) {
|
||||
log_message(LOG_LEVEL_ERROR, "receive_str: size %zu exceeds maximum %zu", size,
|
||||
(size_t)MAX_STRING_SIZE);
|
||||
return NULL;
|
||||
}
|
||||
char* data = (char*)malloc(size + 1);
|
||||
if (data == NULL)
|
||||
return NULL;
|
||||
|
||||
@@ -36,6 +36,3 @@ bool send_status(int file_descriptor, Status status);
|
||||
bool receive_status(int file_descriptor, Status* status);
|
||||
|
||||
#endif
|
||||
|
||||
/* Maximum allowed string size for receive_str (10 MB) */
|
||||
#define MAX_STRING_SIZE (10 * 1024 * 1024)
|
||||
|
||||
@@ -124,10 +124,7 @@ Client* client_connect_ssh(const char* destination, int port) {
|
||||
else
|
||||
snprintf(ssh_user, sizeof(ssh_user), "%s", r.host);
|
||||
|
||||
size_t ssh_argv_max = 32;
|
||||
char** ssh_argv = calloc(ssh_argv_max, sizeof(char*));
|
||||
if (ssh_argv == NULL)
|
||||
_exit(1);
|
||||
char* ssh_argv[16];
|
||||
int ac = 0;
|
||||
char port_str[16];
|
||||
ssh_argv[ac++] = "ssh";
|
||||
@@ -138,24 +135,15 @@ Client* client_connect_ssh(const char* destination, int port) {
|
||||
ssh_argv[ac++] = "-o";
|
||||
ssh_argv[ac++] = "ControlPath=~/.cache/fastsync-%r@%h:%p";
|
||||
if (port > 0 && port != 22) {
|
||||
if ((size_t)ac + 2 >= ssh_argv_max) {
|
||||
free(ssh_argv);
|
||||
_exit(1);
|
||||
}
|
||||
ssh_argv[ac++] = "-p";
|
||||
snprintf(port_str, sizeof(port_str), "%d", port);
|
||||
ssh_argv[ac++] = port_str;
|
||||
}
|
||||
if ((size_t)ac + 3 >= ssh_argv_max) {
|
||||
free(ssh_argv);
|
||||
_exit(1);
|
||||
}
|
||||
ssh_argv[ac++] = ssh_user;
|
||||
ssh_argv[ac++] = "fastsync-server";
|
||||
ssh_argv[ac++] = "--stdio";
|
||||
ssh_argv[ac] = NULL;
|
||||
execvp("ssh", ssh_argv);
|
||||
free(ssh_argv);
|
||||
perror("exec of ssh failed");
|
||||
ssize_t wret = write(exec_pipe[1], "x", 1);
|
||||
(void)wret;
|
||||
|
||||
+11
-20
@@ -10,23 +10,19 @@
|
||||
#include <unistd.h>
|
||||
|
||||
bool mkdir_r(const char* path) {
|
||||
size_t path_len = strlen(path);
|
||||
char* path_duplicate = malloc(path_len + 1);
|
||||
char* path_duplicate = malloc(strlen(path) + 1);
|
||||
if (!path_duplicate)
|
||||
return false;
|
||||
memcpy(path_duplicate, path, path_len + 1);
|
||||
/* Buffer for building subpaths: path_len + 1 for leading '/' + 1 for null */
|
||||
size_t buf_size = path_len + 2;
|
||||
char* path_current = (char*)malloc(buf_size);
|
||||
strcpy(path_duplicate, path);
|
||||
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
|
||||
if (!path_current) {
|
||||
free(path_duplicate);
|
||||
return false;
|
||||
}
|
||||
size_t pos = 0;
|
||||
char* path_current_position = path_current;
|
||||
if (path[0] == '/') {
|
||||
path_current[0] = '/';
|
||||
path_current[1] = '\0';
|
||||
pos = 1;
|
||||
strcpy(path_current, "/");
|
||||
path_current_position += 1;
|
||||
} else {
|
||||
path_current[0] = '\0';
|
||||
}
|
||||
@@ -35,16 +31,10 @@ bool mkdir_r(const char* path) {
|
||||
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
||||
bool ok = true;
|
||||
while (part != NULL) {
|
||||
size_t part_len = strlen(part);
|
||||
if (pos + part_len + 1 >= buf_size) {
|
||||
ok = false;
|
||||
break;
|
||||
}
|
||||
memcpy(path_current + pos, part, part_len);
|
||||
pos += part_len;
|
||||
path_current[pos] = '/';
|
||||
pos++;
|
||||
path_current[pos] = '\0';
|
||||
strcpy(path_current_position, part);
|
||||
path_current_position += strlen(part) * sizeof(char);
|
||||
strcpy(path_current_position, "/");
|
||||
path_current_position += sizeof(char);
|
||||
struct stat st;
|
||||
if (stat(path_current, &st) != 0) {
|
||||
if (mkdir(path_current, 0755) != 0) {
|
||||
@@ -59,6 +49,7 @@ bool mkdir_r(const char* path) {
|
||||
free(path_current);
|
||||
return ok;
|
||||
}
|
||||
|
||||
char* str_dup(const char* string) {
|
||||
if (string == NULL)
|
||||
return NULL;
|
||||
|
||||
@@ -5,8 +5,11 @@
|
||||
#include "test_data.h"
|
||||
#include "test_delta.h"
|
||||
#include "test_file.h"
|
||||
#include "test_file_sendfile.h"
|
||||
#include "test_glob.h"
|
||||
#include "test_log.h"
|
||||
#include "test_metadata.h"
|
||||
#include "test_multiprocessing.h"
|
||||
#include "test_property.h"
|
||||
#include "test_protocol.h"
|
||||
#include "test_queue.h"
|
||||
@@ -14,6 +17,9 @@
|
||||
#include "test_scanner.h"
|
||||
#include "test_shared_utils.h"
|
||||
#include "test_stress.h"
|
||||
#include "test_transport_tcp.h"
|
||||
#include "test_transport_ssh.h"
|
||||
#include "test_transport_tls.h"
|
||||
#include "test_utils.h"
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -38,6 +44,12 @@ int main() {
|
||||
RUN_TEST(test_metadata);
|
||||
RUN_TEST(test_glob);
|
||||
RUN_TEST(test_file);
|
||||
RUN_TEST(test_file_sendfile);
|
||||
RUN_TEST(test_multiprocessing);
|
||||
RUN_TEST(test_log);
|
||||
RUN_TEST(test_transport_tcp);
|
||||
RUN_TEST(test_transport_ssh);
|
||||
RUN_TEST(test_transport_tls);
|
||||
RUN_TEST(test_robustness);
|
||||
RUN_TEST(test_stress);
|
||||
RUN_TEST(test_property);
|
||||
|
||||
@@ -23,14 +23,6 @@ static void test_data_create_empty() {
|
||||
data_destroy(d);
|
||||
}
|
||||
|
||||
static void test_data_create_empty_zero() {
|
||||
Data* d = data_create_empty(0);
|
||||
EXPECT_NOT_NULL(d);
|
||||
EXPECT_NOT_NULL(d->data);
|
||||
EXPECT_EQ_INT((int)d->size, 0);
|
||||
data_destroy(d);
|
||||
}
|
||||
|
||||
static void test_data_create_reserve() {
|
||||
Data* d = data_create_reserve(1024);
|
||||
EXPECT_NOT_NULL(d);
|
||||
@@ -52,7 +44,6 @@ static void test_data_destroy_normal() {
|
||||
void test_data() {
|
||||
test_data_create();
|
||||
test_data_create_empty();
|
||||
test_data_create_empty_zero();
|
||||
test_data_create_reserve();
|
||||
test_data_destroy_null();
|
||||
test_data_destroy_normal();
|
||||
|
||||
+4
-1
@@ -217,6 +217,9 @@ static void test_file_send_no_path() {
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
close(p[1]);
|
||||
int file_type;
|
||||
EXPECT_TRUE(receive_int(p[0], &file_type));
|
||||
EXPECT_EQ_INT(file_type, 0); /* FILE_TYPE_REGULAR */
|
||||
Data* received = receive_data(p[0]);
|
||||
close(p[0]);
|
||||
|
||||
@@ -271,7 +274,7 @@ void test_file() {
|
||||
test_to_disk_basic();
|
||||
test_to_disk_creates_dirs();
|
||||
test_file_content_to_buffer();
|
||||
if (!getenv("FASTSYNC_UNDER_VALGRIND")) {
|
||||
if (!is_running_under_valgrind()) {
|
||||
// Fork tests are skipped under valgrind because the parent process runs
|
||||
// orders of magnitude slower than the child (parent is instrumented, child
|
||||
// is not), which causes pipe-based protocol handshake timeouts. The parent
|
||||
|
||||
@@ -0,0 +1,269 @@
|
||||
#include "test_file_sendfile.h"
|
||||
#include "file.h"
|
||||
#include "config.h"
|
||||
#include "protocol.h"
|
||||
#include "utils.h"
|
||||
#include "test_utils.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* Test basic sendfile transfer: create a file, send it via file_send_sendfile,
|
||||
* receive via file_receive, and verify contents. */
|
||||
static void test_sendfile_basic() {
|
||||
const char* content = "Hello from sendfile test!";
|
||||
size_t len = strlen(content);
|
||||
EXPECT_TRUE(to_disk("test_sendfile_basic.txt", content, len));
|
||||
|
||||
File* file = file_create("test_sendfile_basic.txt");
|
||||
EXPECT_NOT_NULL(file);
|
||||
/* Set the size so file_send_sendfile can report it */
|
||||
file->data->size = len;
|
||||
|
||||
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||
false, false, false, false, 0, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
int p[2];
|
||||
EXPECT_EQ_INT(pipe(p), 0);
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
/* Child: receive */
|
||||
close(p[1]);
|
||||
File* received = file_receive(cfg, p[0]);
|
||||
close(p[0]);
|
||||
|
||||
bool ok = true;
|
||||
if (!received)
|
||||
ok = false;
|
||||
else {
|
||||
if (!received->path || strcmp(received->path, "test_sendfile_basic.txt") != 0)
|
||||
ok = false;
|
||||
if (!received->data || received->data->size != len)
|
||||
ok = false;
|
||||
else if (memcmp(received->data->data, content, len) != 0)
|
||||
ok = false;
|
||||
}
|
||||
file_destroy(received);
|
||||
config_delete(cfg);
|
||||
_exit(ok ? 0 : 1);
|
||||
} else {
|
||||
/* Parent: send via sendfile */
|
||||
close(p[0]);
|
||||
bool sent = file_send_sendfile(file, p[1], false, 0, true);
|
||||
close(p[1]);
|
||||
|
||||
int status;
|
||||
waitpid(pid, &status, 0);
|
||||
|
||||
file_destroy(file);
|
||||
config_delete(cfg);
|
||||
unlink("test_sendfile_basic.txt");
|
||||
|
||||
EXPECT_TRUE(sent);
|
||||
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Test sendfile with an empty file */
|
||||
static void test_sendfile_empty_file() {
|
||||
const char* content = "";
|
||||
size_t len = 0;
|
||||
EXPECT_TRUE(to_disk("test_sendfile_empty.txt", content, len));
|
||||
|
||||
File* file = file_create("test_sendfile_empty.txt");
|
||||
EXPECT_NOT_NULL(file);
|
||||
file->data->size = 0;
|
||||
|
||||
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||
false, false, false, false, 0, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
int p[2];
|
||||
EXPECT_EQ_INT(pipe(p), 0);
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
close(p[1]);
|
||||
File* received = file_receive(cfg, p[0]);
|
||||
close(p[0]);
|
||||
|
||||
bool ok = true;
|
||||
if (!received)
|
||||
ok = false;
|
||||
else {
|
||||
if (strcmp(received->path, "test_sendfile_empty.txt") != 0)
|
||||
ok = false;
|
||||
if (received->data->size != 0)
|
||||
ok = false;
|
||||
}
|
||||
file_destroy(received);
|
||||
config_delete(cfg);
|
||||
_exit(ok ? 0 : 1);
|
||||
} else {
|
||||
close(p[0]);
|
||||
bool sent = file_send_sendfile(file, p[1], false, 0, true);
|
||||
close(p[1]);
|
||||
|
||||
int status;
|
||||
waitpid(pid, &status, 0);
|
||||
|
||||
file_destroy(file);
|
||||
config_delete(cfg);
|
||||
unlink("test_sendfile_empty.txt");
|
||||
|
||||
EXPECT_TRUE(sent);
|
||||
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Test error path: file does not exist on disk */
|
||||
static void test_sendfile_missing_file() {
|
||||
File* file = file_create("nonexistent_sendfile_test_file.txt");
|
||||
EXPECT_NOT_NULL(file);
|
||||
file->data->size = 100; /* fake size */
|
||||
|
||||
/* Use a pipe that we can write to but sendfile should fail */
|
||||
int p[2];
|
||||
EXPECT_EQ_INT(pipe(p), 0);
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
/* file_send_sendfile will try to open the nonexistent file -> should return false */
|
||||
bool sent = file_send_sendfile(file, p[1], false, 0, true);
|
||||
|
||||
close(p[0]);
|
||||
close(p[1]);
|
||||
file_destroy(file);
|
||||
|
||||
EXPECT_FALSE(sent);
|
||||
}
|
||||
|
||||
/* Test compression level > 0 falls back to file_send_single_calls */
|
||||
static void test_sendfile_compression_fallback() {
|
||||
const char* content = "Compression fallback content";
|
||||
size_t len = strlen(content);
|
||||
EXPECT_TRUE(to_disk("test_sendfile_comp.txt", content, len));
|
||||
|
||||
struct stat st;
|
||||
EXPECT_EQ_INT(stat("test_sendfile_comp.txt", &st), 0);
|
||||
|
||||
File* file = file_create("test_sendfile_comp.txt");
|
||||
EXPECT_NOT_NULL(file);
|
||||
/* Load the file data into memory (required by file_send_single_calls fallback) */
|
||||
file->data->size = (size_t)st.st_size;
|
||||
EXPECT_TRUE(file_load_data(file));
|
||||
|
||||
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||
false, false, true, false, 3, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
int p[2];
|
||||
EXPECT_EQ_INT(pipe(p), 0);
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
close(p[1]);
|
||||
File* received = file_receive(cfg, p[0]);
|
||||
close(p[0]);
|
||||
|
||||
bool ok = true;
|
||||
if (!received)
|
||||
ok = false;
|
||||
else {
|
||||
if (received->data->size != len)
|
||||
ok = false;
|
||||
else if (memcmp(received->data->data, content, len) != 0)
|
||||
ok = false;
|
||||
}
|
||||
file_destroy(received);
|
||||
config_delete(cfg);
|
||||
_exit(ok ? 0 : 1);
|
||||
} else {
|
||||
close(p[0]);
|
||||
/* compression_level = 3 triggers fallback to file_send_single_calls */
|
||||
bool sent = file_send_sendfile(file, p[1], false, 3, true);
|
||||
close(p[1]);
|
||||
|
||||
int status;
|
||||
waitpid(pid, &status, 0);
|
||||
|
||||
file_destroy(file);
|
||||
config_delete(cfg);
|
||||
unlink("test_sendfile_comp.txt");
|
||||
|
||||
EXPECT_TRUE(sent);
|
||||
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Test sendfile without path (send_path = false) */
|
||||
static void test_sendfile_no_path() {
|
||||
const char* content = "No path sendfile test";
|
||||
size_t len = strlen(content);
|
||||
EXPECT_TRUE(to_disk("test_sendfile_nopath.txt", content, len));
|
||||
|
||||
File* file = file_create("test_sendfile_nopath.txt");
|
||||
EXPECT_NOT_NULL(file);
|
||||
file->data->size = len;
|
||||
|
||||
int p[2];
|
||||
EXPECT_EQ_INT(pipe(p), 0);
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
close(p[1]);
|
||||
/* When send_path is false, the sender sends file_type + raw data (size + bytes).
|
||||
* Read file_type first with assertion, then receive data. */
|
||||
int file_type;
|
||||
EXPECT_TRUE(receive_int(p[0], &file_type));
|
||||
EXPECT_EQ_INT(file_type, 0); /* FILE_TYPE_REGULAR */
|
||||
Data* received = receive_data(p[0]);
|
||||
close(p[0]);
|
||||
|
||||
bool ok = true;
|
||||
if (!received)
|
||||
ok = false;
|
||||
else if (received->size != len)
|
||||
ok = false;
|
||||
else if (memcmp(received->data, content, len) != 0)
|
||||
ok = false;
|
||||
|
||||
data_destroy(received);
|
||||
_exit(ok ? 0 : 1);
|
||||
} else {
|
||||
close(p[0]);
|
||||
bool sent = file_send_sendfile(file, p[1], false, 0, false);
|
||||
close(p[1]);
|
||||
|
||||
int status;
|
||||
waitpid(pid, &status, 0);
|
||||
|
||||
file_destroy(file);
|
||||
unlink("test_sendfile_nopath.txt");
|
||||
|
||||
EXPECT_TRUE(sent);
|
||||
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
void test_file_sendfile() {
|
||||
test_sendfile_missing_file(); // no fork, always runs
|
||||
if (!getenv("FASTSYNC_UNDER_VALGRIND")) {
|
||||
test_sendfile_basic();
|
||||
test_sendfile_empty_file();
|
||||
test_sendfile_compression_fallback();
|
||||
test_sendfile_no_path();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef TEST_FILE_SENDFILE_H
|
||||
#define TEST_FILE_SENDFILE_H
|
||||
|
||||
void test_file_sendfile();
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,116 @@
|
||||
#include "test_log.h"
|
||||
#include "log.h"
|
||||
#include "test_utils.h"
|
||||
|
||||
/* Test default log level: WARNING and ERROR should print, DEBUG and INFO should not.
|
||||
* We can't easily capture stderr in unit tests, so we verify the functions don't crash
|
||||
* and that set_log_level changes behavior. */
|
||||
|
||||
static void test_log_message_debug() {
|
||||
set_log_level(LOG_LEVEL_WARNING);
|
||||
log_message(LOG_LEVEL_DEBUG, "debug message: %d", 42);
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
static void test_log_message_info() {
|
||||
set_log_level(LOG_LEVEL_WARNING);
|
||||
log_message(LOG_LEVEL_INFO, "info message: %s", "test");
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
static void test_log_message_warning() {
|
||||
set_log_level(LOG_LEVEL_WARNING);
|
||||
log_message(LOG_LEVEL_WARNING, "warning message: %d %s", 1, "test");
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
static void test_log_message_error() {
|
||||
set_log_level(LOG_LEVEL_WARNING);
|
||||
log_message(LOG_LEVEL_ERROR, "error message: %s", "critical");
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
static void test_log_set_level_debug() {
|
||||
set_log_level(LOG_LEVEL_DEBUG);
|
||||
|
||||
/* After setting to DEBUG, all levels should be shown */
|
||||
log_message(LOG_LEVEL_DEBUG, "debug after set");
|
||||
log_message(LOG_LEVEL_INFO, "info after set");
|
||||
log_message(LOG_LEVEL_WARNING, "warning after set");
|
||||
log_message(LOG_LEVEL_ERROR, "error after set");
|
||||
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
static void test_log_set_level_info() {
|
||||
set_log_level(LOG_LEVEL_INFO);
|
||||
|
||||
/* INFO level should show INFO, WARNING, ERROR but not DEBUG */
|
||||
log_message(LOG_LEVEL_DEBUG, "debug should be filtered"); /* filtered */
|
||||
log_message(LOG_LEVEL_INFO, "info should show");
|
||||
log_message(LOG_LEVEL_WARNING, "warning should show");
|
||||
log_message(LOG_LEVEL_ERROR, "error should show");
|
||||
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
static void test_log_set_level_error() {
|
||||
set_log_level(LOG_LEVEL_ERROR);
|
||||
|
||||
/* ERROR level: only ERROR should show */
|
||||
log_message(LOG_LEVEL_DEBUG, "debug filtered");
|
||||
log_message(LOG_LEVEL_INFO, "info filtered");
|
||||
log_message(LOG_LEVEL_WARNING, "warning filtered");
|
||||
log_message(LOG_LEVEL_ERROR, "error should show");
|
||||
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
/* Test that set_log_level with default WARNING filters correctly */
|
||||
static void test_log_filtering() {
|
||||
/* Reset to default */
|
||||
set_log_level(LOG_LEVEL_WARNING);
|
||||
|
||||
/* These should be filtered */
|
||||
log_message(LOG_LEVEL_DEBUG, "filtered debug");
|
||||
log_message(LOG_LEVEL_INFO, "filtered info");
|
||||
|
||||
/* These should be shown */
|
||||
log_message(LOG_LEVEL_WARNING, "visible warning");
|
||||
log_message(LOG_LEVEL_ERROR, "visible error");
|
||||
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
/* Test that log_message handles various format strings */
|
||||
static void test_log_message_formats() {
|
||||
set_log_level(LOG_LEVEL_DEBUG);
|
||||
|
||||
log_message(LOG_LEVEL_DEBUG, "simple string");
|
||||
log_message(LOG_LEVEL_INFO, "integer: %d", -1);
|
||||
log_message(LOG_LEVEL_WARNING, "string: %s", "hello");
|
||||
log_message(LOG_LEVEL_ERROR, "multiple: %d %s %d", 1, "two", 3);
|
||||
|
||||
/* crash regression test — stderr capture would need infrastructure changes */
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
void test_log() {
|
||||
test_log_message_debug();
|
||||
test_log_message_info();
|
||||
test_log_message_warning();
|
||||
test_log_message_error();
|
||||
test_log_set_level_debug();
|
||||
test_log_set_level_info();
|
||||
test_log_set_level_error();
|
||||
test_log_filtering();
|
||||
test_log_message_formats();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef TEST_LOG_H
|
||||
#define TEST_LOG_H
|
||||
|
||||
void test_log();
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,101 @@
|
||||
#include "test_multiprocessing.h"
|
||||
#include "multiprocessing.h"
|
||||
#include "config.h"
|
||||
#include "queue.h"
|
||||
#include "utils.h"
|
||||
#include "test_utils.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
/* Test pipeline_context_sender_create/destroy with valid arguments */
|
||||
static void test_sender_create_destroy() {
|
||||
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||
false, false, 0, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
Queue* q_scanner = queue_create(5, NULL);
|
||||
EXPECT_NOT_NULL(q_scanner);
|
||||
|
||||
Queue* q_loader = queue_create(10, NULL);
|
||||
EXPECT_NOT_NULL(q_loader);
|
||||
|
||||
PipelineContextSender* ctx = pipeline_context_sender_create(cfg, q_scanner, q_loader);
|
||||
EXPECT_NOT_NULL(ctx);
|
||||
EXPECT_EQ_STR(ctx->config->version, "1.0");
|
||||
EXPECT_EQ_INT(ctx->queue_scanner->capacity, 5);
|
||||
EXPECT_EQ_INT(ctx->queue_loader->capacity, 10);
|
||||
EXPECT_FALSE(ctx->scanner_done);
|
||||
EXPECT_FALSE(ctx->loader_done);
|
||||
EXPECT_NULL(ctx->manifest);
|
||||
|
||||
pipeline_context_sender_destroy(ctx);
|
||||
}
|
||||
|
||||
/* Test pipeline_context_receiver_create/destroy with valid arguments */
|
||||
static void test_receiver_create_destroy() {
|
||||
Config* cfg = config_create(str_dup("2.0"), str_dup("/src"), str_dup("/dst"), true, true, false,
|
||||
false, false, 0, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
Queue* q = queue_create(20, NULL);
|
||||
EXPECT_NOT_NULL(q);
|
||||
|
||||
PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 42);
|
||||
EXPECT_NOT_NULL(ctx);
|
||||
EXPECT_EQ_STR(ctx->config->version, "2.0");
|
||||
EXPECT_EQ_INT(ctx->queue->capacity, 20);
|
||||
EXPECT_EQ_INT(ctx->file_descriptor, 42);
|
||||
EXPECT_FALSE(ctx->receiver_done);
|
||||
|
||||
pipeline_context_receiver_destroy(ctx);
|
||||
}
|
||||
|
||||
/* Test that create handles various queue capacities */
|
||||
static void test_sender_queue_capacities() {
|
||||
Config* cfg = config_create(str_dup("3.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||
false, false, 0, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
/* Single-element queues */
|
||||
Queue* q1 = queue_create(1, NULL);
|
||||
Queue* q2 = queue_create(1, NULL);
|
||||
PipelineContextSender* ctx = pipeline_context_sender_create(cfg, q1, q2);
|
||||
EXPECT_NOT_NULL(ctx);
|
||||
EXPECT_EQ_INT(ctx->queue_scanner->capacity, 1);
|
||||
EXPECT_EQ_INT(ctx->queue_loader->capacity, 1);
|
||||
pipeline_context_sender_destroy(ctx);
|
||||
}
|
||||
|
||||
/* Test that create handles zero-capacity queues */
|
||||
static void test_sender_zero_capacity() {
|
||||
Config* cfg = config_create(str_dup("4.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||
false, false, 0, false, 0);
|
||||
EXPECT_NOT_NULL(cfg);
|
||||
|
||||
Queue* q1 = queue_create(0, NULL);
|
||||
Queue* q2 = queue_create(0, NULL);
|
||||
PipelineContextSender* ctx = pipeline_context_sender_create(cfg, q1, q2);
|
||||
EXPECT_NOT_NULL(ctx);
|
||||
EXPECT_EQ_INT(ctx->queue_scanner->capacity, 0);
|
||||
EXPECT_EQ_INT(ctx->queue_loader->capacity, 0);
|
||||
pipeline_context_sender_destroy(ctx);
|
||||
}
|
||||
|
||||
/* Test receiver with zero file_descriptor */
|
||||
static void test_receiver_fd_zero() {
|
||||
Config* cfg = config_create(str_dup("5.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||
false, false, 0, false, 0);
|
||||
Queue* q = queue_create(5, NULL);
|
||||
PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 0);
|
||||
EXPECT_NOT_NULL(ctx);
|
||||
EXPECT_EQ_INT(ctx->file_descriptor, 0);
|
||||
EXPECT_FALSE(ctx->receiver_done);
|
||||
pipeline_context_receiver_destroy(ctx);
|
||||
}
|
||||
|
||||
void test_multiprocessing() {
|
||||
test_sender_create_destroy();
|
||||
test_receiver_create_destroy();
|
||||
test_sender_queue_capacities();
|
||||
test_sender_zero_capacity();
|
||||
test_receiver_fd_zero();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef TEST_MULTIPROCESSING_H
|
||||
#define TEST_MULTIPROCESSING_H
|
||||
|
||||
void test_multiprocessing();
|
||||
|
||||
#endif
|
||||
+4
-18
@@ -46,6 +46,7 @@ static void test_send_receive_str() {
|
||||
|
||||
EXPECT_TRUE(send_str(0, ""));
|
||||
|
||||
/* cppcheck-suppress constVariablePointer */
|
||||
char* received = receive_str(0);
|
||||
EXPECT_NOT_NULL(received);
|
||||
EXPECT_EQ_STR(received, "");
|
||||
@@ -63,6 +64,7 @@ static void test_send_receive_str_normal() {
|
||||
|
||||
EXPECT_TRUE(send_str(0, "Hello, Protocol!"));
|
||||
|
||||
/* cppcheck-suppress constVariablePointer */
|
||||
char* received = receive_str(0);
|
||||
EXPECT_NOT_NULL(received);
|
||||
EXPECT_EQ_STR(received, "Hello, Protocol!");
|
||||
@@ -78,6 +80,7 @@ static void test_send_receive_data() {
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
/* cppcheck-suppress constVariablePointer */
|
||||
unsigned char bin[] = {0xDE, 0xAD, 0xBE, 0xEF, 0x00, 0xFF};
|
||||
void* buf = malloc(sizeof(bin));
|
||||
EXPECT_NOT_NULL(buf);
|
||||
@@ -128,6 +131,7 @@ static void test_send_receive_status() {
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
/* cppcheck-suppress constVariablePointer */
|
||||
Status statuses[] = {STATUS_OK, STATUS_ERROR, STATUS_FINISHED, STATUS_NEXT,
|
||||
STATUS_CHUNK, STATUS_CHECK, STATUS_DELTA_SIGNATURE, STATUS_DELTA_DATA};
|
||||
int count = sizeof(statuses) / sizeof(statuses[0]);
|
||||
@@ -169,23 +173,6 @@ static void test_receive_str_truncated() {
|
||||
close(p[0]);
|
||||
}
|
||||
|
||||
static void test_receive_str_oversized() {
|
||||
int p[2];
|
||||
EXPECT_EQ_INT(pipe(p), 0);
|
||||
io_set_fds(p[0], p[1]);
|
||||
io_set_bwlimit(0);
|
||||
|
||||
/* Send a size exceeding MAX_STRING_SIZE */
|
||||
size_t huge = MAX_STRING_SIZE + 1;
|
||||
EXPECT_TRUE(send_n_data(0, &huge, sizeof(size_t)));
|
||||
|
||||
char* received = receive_str(0);
|
||||
EXPECT_NULL(received);
|
||||
|
||||
close(p[0]);
|
||||
close(p[1]);
|
||||
}
|
||||
|
||||
void test_protocol() {
|
||||
test_send_receive_n_data();
|
||||
test_send_receive_n_data_zero();
|
||||
@@ -196,5 +183,4 @@ void test_protocol() {
|
||||
test_send_receive_status();
|
||||
test_receive_n_data_truncated();
|
||||
test_receive_str_truncated();
|
||||
test_receive_str_oversized();
|
||||
}
|
||||
|
||||
+287
-5
@@ -15,7 +15,7 @@ static void test_scanner_single_file() {
|
||||
const char* file1 = "test_scan_dir_single/file1.txt";
|
||||
const char* content1 = "hello scanner";
|
||||
|
||||
mkdir(dir, 0755);
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(file1, content1);
|
||||
|
||||
DirectoryScanner* scanner =
|
||||
@@ -43,7 +43,7 @@ static void test_scanner_multiple_files() {
|
||||
const char* content1 = "alpha";
|
||||
const char* content2 = "beta";
|
||||
|
||||
mkdir(dir, 0755);
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(file1, content1);
|
||||
create_test_file(file2, content2);
|
||||
|
||||
@@ -82,8 +82,8 @@ static void test_scanner_subdirectory() {
|
||||
const char* sub_file = "test_scan_sub/sub/sub_file.txt";
|
||||
const char* content = "nested content";
|
||||
|
||||
mkdir(root, 0755);
|
||||
mkdir(sub, 0755);
|
||||
EXPECT_EQ_INT(mkdir(root, 0755), 0);
|
||||
EXPECT_EQ_INT(mkdir(sub, 0755), 0);
|
||||
create_test_file(root_file, content);
|
||||
create_test_file(sub_file, content);
|
||||
|
||||
@@ -109,7 +109,7 @@ static void test_scanner_subdirectory() {
|
||||
static void test_scanner_empty_directory() {
|
||||
const char* dir = "test_scan_empty";
|
||||
|
||||
mkdir(dir, 0755);
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0);
|
||||
@@ -122,9 +122,291 @@ static void test_scanner_empty_directory() {
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
/* --- Exclude/include pattern and size filter edge cases (Issue #56) --- */
|
||||
|
||||
static void test_scanner_exclude_pattern() {
|
||||
const char* dir = "test_scan_excl";
|
||||
const char* f_txt = "test_scan_excl/keep.txt";
|
||||
const char* f_tmp = "test_scan_excl/remove.tmp";
|
||||
const char* content = "data";
|
||||
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(f_txt, content);
|
||||
create_test_file(f_tmp, content);
|
||||
|
||||
char* exclude[] = {"*.tmp"};
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0, 0);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
Chunk* chunk = directory_scanner_next(scanner);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
EXPECT_EQ_INT(chunk->element_count, 1);
|
||||
EXPECT_EQ_STR(chunk->items[0]->path, f_txt);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(f_txt);
|
||||
unlink(f_tmp);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
static void test_scanner_exclude_subdirectory() {
|
||||
/* Exclude patterns match filenames only (via entry->d_name).
|
||||
* Files inside subdirectories are also matched by filename. */
|
||||
const char* root = "test_scan_excl_sub";
|
||||
const char* sub = "test_scan_excl_sub/sub";
|
||||
const char* root_txt = "test_scan_excl_sub/root.txt";
|
||||
const char* sub_txt = "test_scan_excl_sub/sub/data.txt";
|
||||
const char* sub_tmp = "test_scan_excl_sub/sub/temp.tmp";
|
||||
const char* content = "data";
|
||||
|
||||
EXPECT_EQ_INT(mkdir(root, 0755), 0);
|
||||
EXPECT_EQ_INT(mkdir(sub, 0755), 0);
|
||||
create_test_file(root_txt, content);
|
||||
create_test_file(sub_txt, content);
|
||||
create_test_file(sub_tmp, content);
|
||||
|
||||
/* Exclude *.tmp — should exclude sub/temp.tmp but keep root.txt and sub/data.txt */
|
||||
char* exclude[] = {"*.tmp"};
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0, 0, 0);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
int total = 0;
|
||||
Chunk* chunk;
|
||||
while ((chunk = directory_scanner_next(scanner)) != NULL) {
|
||||
total += chunk->element_count;
|
||||
for (int i = 0; i < chunk->element_count; i++) {
|
||||
/* No path should end in .tmp */
|
||||
size_t len = strlen(chunk->items[i]->path);
|
||||
EXPECT_TRUE(len < 4 || strcmp(chunk->items[i]->path + len - 4, ".tmp") != 0);
|
||||
}
|
||||
chunk_destroy(chunk);
|
||||
}
|
||||
EXPECT_EQ_INT(total, 2);
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(root_txt);
|
||||
unlink(sub_txt);
|
||||
unlink(sub_tmp);
|
||||
rmdir(sub);
|
||||
rmdir(root);
|
||||
}
|
||||
|
||||
static void test_scanner_include_and_exclude() {
|
||||
/* In the scanner, exclude is checked first and takes precedence.
|
||||
* Include patterns act as an additional filter: if include_count > 0,
|
||||
* the file must match one of the include patterns (after not being excluded).
|
||||
* This test uses non-overlapping exclude and include patterns. */
|
||||
const char* dir = "test_scan_inc_exc";
|
||||
const char* f_txt = "test_scan_inc_exc/a.txt";
|
||||
const char* f_log = "test_scan_inc_exc/b.log";
|
||||
const char* f_bak = "test_scan_inc_exc/c.bak";
|
||||
const char* content = "filter";
|
||||
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(f_txt, content);
|
||||
create_test_file(f_log, content);
|
||||
create_test_file(f_bak, content);
|
||||
|
||||
/* Exclude *.bak. Include *.txt and *.log. */
|
||||
char* exclude[] = {"*.bak"};
|
||||
char* include[] = {"*.txt", "*.log"};
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2, 0, 0);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
Chunk* chunk = directory_scanner_next(scanner);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
EXPECT_EQ_INT(chunk->element_count, 2);
|
||||
|
||||
int found_txt = 0, found_log = 0;
|
||||
for (int i = 0; i < chunk->element_count; i++) {
|
||||
if (strstr(chunk->items[i]->path, "a.txt"))
|
||||
found_txt = 1;
|
||||
if (strstr(chunk->items[i]->path, "b.log"))
|
||||
found_log = 1;
|
||||
}
|
||||
/* a.txt included by *.txt, b.log included by *.log, c.bak excluded by *.bak */
|
||||
EXPECT_TRUE(found_txt);
|
||||
EXPECT_TRUE(found_log);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(f_txt);
|
||||
unlink(f_log);
|
||||
unlink(f_bak);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
static void test_scanner_max_size() {
|
||||
const char* dir = "test_scan_max";
|
||||
const char* small = "test_scan_max/small.txt";
|
||||
const char* large = "test_scan_max/large.txt";
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(small, "tiny");
|
||||
create_test_file(large, "this_content_is_longer_than_ten_chars");
|
||||
|
||||
/* max_size = 10 — only files <= 10 bytes */
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10, 0);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
Chunk* chunk = directory_scanner_next(scanner);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
EXPECT_EQ_INT(chunk->element_count, 1);
|
||||
EXPECT_EQ_STR(chunk->items[0]->path, small);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(small);
|
||||
unlink(large);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
static void test_scanner_min_size() {
|
||||
const char* dir = "test_scan_min";
|
||||
const char* empty_f = "test_scan_min/empty.txt";
|
||||
const char* data_f = "test_scan_min/data.txt";
|
||||
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(empty_f, "");
|
||||
create_test_file(data_f, "some content here");
|
||||
|
||||
/* min_size = 1 — only files >= 1 byte */
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
Chunk* chunk = directory_scanner_next(scanner);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
EXPECT_EQ_INT(chunk->element_count, 1);
|
||||
EXPECT_EQ_STR(chunk->items[0]->path, data_f);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(empty_f);
|
||||
unlink(data_f);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
static void test_scanner_size_range() {
|
||||
const char* dir = "test_scan_range";
|
||||
const char* tiny = "test_scan_range/tiny.txt";
|
||||
const char* medium = "test_scan_range/med.txt";
|
||||
const char* huge = "test_scan_range/huge.txt";
|
||||
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(tiny, "ab");
|
||||
create_test_file(medium, "hello world");
|
||||
create_test_file(huge, "this is a much larger file for testing size filters");
|
||||
|
||||
/* Only files between 3 and 20 bytes */
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20, 3);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
Chunk* chunk = directory_scanner_next(scanner);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
EXPECT_EQ_INT(chunk->element_count, 1);
|
||||
EXPECT_EQ_STR(chunk->items[0]->path, medium);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(tiny);
|
||||
unlink(medium);
|
||||
unlink(huge);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
static void test_scanner_mixed_patterns() {
|
||||
/* Combine exclude, include, and size filters together */
|
||||
const char* dir = "test_scan_mixed";
|
||||
const char* a_txt = "test_scan_mixed/a.txt"; /* size ~= 5 */
|
||||
const char* b_bin = "test_scan_mixed/b.bin"; /* size ~= 13 */
|
||||
const char* c_txt = "test_scan_mixed/c.txt"; /* size ~= 5 */
|
||||
const char* d_bak = "test_scan_mixed/d.bak"; /* size ~= 42 */
|
||||
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(a_txt, "aaaaa");
|
||||
create_test_file(b_bin, "bbbbbbbbbbbbb");
|
||||
create_test_file(c_txt, "ccccc");
|
||||
create_test_file(d_bak, "dddddddddddddddddddddddddddddddddddddddddd");
|
||||
|
||||
/* Exclude *.bak, include *.txt, min_size=3, max_size=10 */
|
||||
char* exclude[] = {"*.bak"};
|
||||
char* include[] = {"*.txt"};
|
||||
DirectoryScanner* scanner =
|
||||
directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1, 10, 3);
|
||||
EXPECT_NOT_NULL(scanner);
|
||||
|
||||
Chunk* chunk = directory_scanner_next(scanner);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
/* Both a.txt and c.txt meet the criteria: .txt extension, size 5 <= 10 and >= 3 */
|
||||
EXPECT_EQ_INT(chunk->element_count, 2);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(a_txt);
|
||||
unlink(b_bin);
|
||||
unlink(c_txt);
|
||||
unlink(d_bak);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
static void test_scanner_no_patterns() {
|
||||
/* Explicit test with no exclude/include patterns and no size filters.
|
||||
* This verifies that NULL/0 for all pattern parameters works correctly. */
|
||||
const char* dir = "test_scan_none";
|
||||
const char* f1 = "test_scan_none/f1.txt";
|
||||
const char* f2 = "test_scan_none/f2.txt";
|
||||
|
||||
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||
create_test_file(f1, "first");
|
||||
create_test_file(f2, "second");
|
||||
|
||||
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);
|
||||
EXPECT_NOT_NULL(chunk);
|
||||
EXPECT_EQ_INT(chunk->element_count, 2);
|
||||
|
||||
chunk_destroy(chunk);
|
||||
EXPECT_NULL(directory_scanner_next(scanner));
|
||||
|
||||
directory_scanner_destroy(scanner);
|
||||
unlink(f1);
|
||||
unlink(f2);
|
||||
rmdir(dir);
|
||||
}
|
||||
|
||||
void test_scanner() {
|
||||
test_scanner_single_file();
|
||||
test_scanner_multiple_files();
|
||||
test_scanner_subdirectory();
|
||||
test_scanner_empty_directory();
|
||||
/* Issue #56: scanner pattern edge cases */
|
||||
test_scanner_exclude_pattern();
|
||||
test_scanner_exclude_subdirectory();
|
||||
test_scanner_include_and_exclude();
|
||||
test_scanner_max_size();
|
||||
test_scanner_min_size();
|
||||
test_scanner_size_range();
|
||||
test_scanner_mixed_patterns();
|
||||
test_scanner_no_patterns();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
#include "test_transport_ssh.h"
|
||||
#include "transport_ssh.h"
|
||||
#include "test_utils.h"
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
/* Test client_connect_ssh with invalid destination (missing colon) */
|
||||
static void test_ssh_connect_invalid_dest() {
|
||||
/* Missing colon — parse_remote_dest should fail and return NULL */
|
||||
/* cppcheck-suppress constVariablePointer */
|
||||
Client* client = client_connect_ssh("invalid-destination-no-colon", 22);
|
||||
EXPECT_NULL(client);
|
||||
}
|
||||
|
||||
/* Test client_connect_ssh with empty destination */
|
||||
static void test_ssh_connect_empty_dest() {
|
||||
/* cppcheck-suppress constVariablePointer */
|
||||
Client* client = client_connect_ssh("", 22);
|
||||
EXPECT_NULL(client);
|
||||
}
|
||||
|
||||
/* Test client_connect_ssh with malformed destination (just a colon).
|
||||
* parse_remote_dest succeeds, ssh is exec'd and fails, but the function
|
||||
* creates a Client that must be cleaned up. */
|
||||
static void test_ssh_connect_malformed() {
|
||||
Client* client = client_connect_ssh(":", 22);
|
||||
/* ssh binary exists, so exec succeeds; the function returns a Client.
|
||||
* We just verify it doesn't crash and clean up properly. */
|
||||
if (client != NULL) {
|
||||
client_disconnect(client);
|
||||
client_delete(client);
|
||||
}
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
/* Test client_connect_ssh with valid format but unreachable host.
|
||||
* The function launches ssh which will fail to connect, returns a Client. */
|
||||
static void test_ssh_connect_unreachable() {
|
||||
Client* client = client_connect_ssh("nonexistent.invalid:/remote/path", 22);
|
||||
if (client != NULL) {
|
||||
client_disconnect(client);
|
||||
client_delete(client);
|
||||
}
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
void test_transport_ssh() {
|
||||
test_ssh_connect_invalid_dest();
|
||||
test_ssh_connect_empty_dest();
|
||||
test_ssh_connect_malformed();
|
||||
test_ssh_connect_unreachable();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef TEST_TRANSPORT_SSH_H
|
||||
#define TEST_TRANSPORT_SSH_H
|
||||
|
||||
void test_transport_ssh();
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,90 @@
|
||||
#include "test_transport_tcp.h"
|
||||
#include "transport_tcp.h"
|
||||
#include "test_utils.h"
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* Test client_create and client_delete lifecycle */
|
||||
static void test_client_create_delete() {
|
||||
Client* client = client_create();
|
||||
EXPECT_NOT_NULL(client);
|
||||
EXPECT_TRUE(client->file_descriptor >= 0);
|
||||
EXPECT_EQ_INT(client->address.sin_family, AF_INET);
|
||||
EXPECT_EQ_INT(client->ssh_child_pid, -1);
|
||||
EXPECT_NULL(client->ssl);
|
||||
EXPECT_NULL(client->ssl_ctx);
|
||||
|
||||
/* Delete should clean up without error */
|
||||
client_delete(client);
|
||||
}
|
||||
|
||||
/* Test client_delete with NULL (safety) */
|
||||
static void test_client_delete_null() {
|
||||
client_delete(NULL);
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
/* Test server_create and server_delete lifecycle */
|
||||
static void test_server_create_delete() {
|
||||
/* Use port 0 to let the OS assign a port */
|
||||
Server* server = server_create(0);
|
||||
EXPECT_NOT_NULL(server);
|
||||
EXPECT_TRUE(server->file_descriptor >= 0);
|
||||
EXPECT_EQ_INT(server->address.sin_family, AF_INET);
|
||||
EXPECT_NULL(server->ssl_ctx);
|
||||
|
||||
/* Clean up */
|
||||
server_delete(&server);
|
||||
EXPECT_NULL(server);
|
||||
}
|
||||
|
||||
/* Test server_delete with NULL pointer */
|
||||
static void test_server_delete_null_ptr() {
|
||||
server_delete(NULL);
|
||||
EXPECT_TRUE(true);
|
||||
}
|
||||
|
||||
/* Test server_delete with NULL server */
|
||||
static void test_server_delete_null_server() {
|
||||
Server* s = NULL;
|
||||
server_delete(&s);
|
||||
EXPECT_NULL(s);
|
||||
}
|
||||
|
||||
/* Test client_create can be called multiple times */
|
||||
static void test_client_create_multiple() {
|
||||
Client* c1 = client_create();
|
||||
Client* c2 = client_create();
|
||||
EXPECT_NOT_NULL(c1);
|
||||
EXPECT_NOT_NULL(c2);
|
||||
EXPECT_TRUE(c1->file_descriptor >= 0);
|
||||
EXPECT_TRUE(c2->file_descriptor >= 0);
|
||||
EXPECT_TRUE(c1->file_descriptor != c2->file_descriptor);
|
||||
|
||||
client_delete(c1);
|
||||
client_delete(c2);
|
||||
}
|
||||
|
||||
/* Test client_disconnect on a fresh client (should close socket) */
|
||||
static void test_client_disconnect_fresh() {
|
||||
Client* client = client_create();
|
||||
EXPECT_NOT_NULL(client);
|
||||
|
||||
/* Disconnect should close the file descriptor */
|
||||
client_disconnect(client);
|
||||
/* The fd should now be invalid */
|
||||
/* Verify by trying to use close() on it - should fail */
|
||||
EXPECT_EQ_INT(close(client->file_descriptor), -1);
|
||||
|
||||
client_delete(client);
|
||||
}
|
||||
|
||||
void test_transport_tcp() {
|
||||
test_client_create_delete();
|
||||
test_client_delete_null();
|
||||
test_server_create_delete();
|
||||
test_server_delete_null_ptr();
|
||||
test_server_delete_null_server();
|
||||
test_client_create_multiple();
|
||||
test_client_disconnect_fresh();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef TEST_TRANSPORT_TCP_H
|
||||
#define TEST_TRANSPORT_TCP_H
|
||||
|
||||
void test_transport_tcp();
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,81 @@
|
||||
#include "test_transport_tls.h"
|
||||
#include "transport_tls.h"
|
||||
#include "transport_tcp.h"
|
||||
#include "test_utils.h"
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* Test tls_global_init succeeds */
|
||||
static void test_tls_global_init() {
|
||||
bool ok = tls_global_init();
|
||||
EXPECT_TRUE(ok);
|
||||
}
|
||||
|
||||
/* Test tls_global_init can be called multiple times */
|
||||
static void test_tls_global_init_twice() {
|
||||
bool ok1 = tls_global_init();
|
||||
bool ok2 = tls_global_init();
|
||||
EXPECT_TRUE(ok1);
|
||||
EXPECT_TRUE(ok2);
|
||||
}
|
||||
|
||||
/* Test client_connect_tls with bad certificate path.
|
||||
* The function will create a socket, try to connect to localhost,
|
||||
* fail to connect (since nothing is listening), and return false.
|
||||
* We don't need a server to verify the error path. */
|
||||
static void test_tls_connect_bad_cert() {
|
||||
/* First, init TLS globally */
|
||||
tls_global_init();
|
||||
|
||||
Client* client = client_create();
|
||||
EXPECT_NOT_NULL(client);
|
||||
|
||||
/* Attempt to connect to a non-existent server with bad cert paths.
|
||||
* client_connect_tls will try to connect first, fail, and return false.
|
||||
* Note: we use an invalid host to ensure connection failure,
|
||||
* which exercises the error path before cert loading. */
|
||||
bool ok = client_connect_tls(client, "127.0.0.1", 1, "/nonexistent/cert.pem",
|
||||
"/nonexistent/key.pem", "/nonexistent/ca.pem");
|
||||
EXPECT_FALSE(ok);
|
||||
|
||||
client_delete(client);
|
||||
}
|
||||
|
||||
/* Test client_connect_tls with NULL cert paths (should still attempt connection).
|
||||
* Cert/key/ca being NULL is valid — the function will attempt to create an
|
||||
* SSL context without client certificates. */
|
||||
static void test_tls_connect_null_paths() {
|
||||
tls_global_init();
|
||||
|
||||
Client* client = client_create();
|
||||
EXPECT_NOT_NULL(client);
|
||||
|
||||
/* Connect to invalid address — will fail at connect() step */
|
||||
bool ok = client_connect_tls(client, "127.0.0.1", 1, NULL, NULL, NULL);
|
||||
EXPECT_FALSE(ok);
|
||||
|
||||
client_delete(client);
|
||||
}
|
||||
|
||||
/* Test server_create_tls with bad cert paths.
|
||||
* The function should fail gracefully. */
|
||||
static void test_tls_server_bad_cert() {
|
||||
tls_global_init();
|
||||
|
||||
Server* server = server_create(0);
|
||||
EXPECT_NOT_NULL(server);
|
||||
|
||||
/* Load bad cert paths — should fail and return false */
|
||||
bool ok = server_create_tls(server, "/nonexistent/cert.pem", "/nonexistent/key.pem", NULL);
|
||||
EXPECT_FALSE(ok);
|
||||
|
||||
server_delete(&server);
|
||||
}
|
||||
|
||||
void test_transport_tls() {
|
||||
test_tls_global_init();
|
||||
test_tls_global_init_twice();
|
||||
test_tls_connect_bad_cert();
|
||||
test_tls_connect_null_paths();
|
||||
test_tls_server_bad_cert();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef TEST_TRANSPORT_TLS_H
|
||||
#define TEST_TRANSPORT_TLS_H
|
||||
|
||||
void test_transport_tls();
|
||||
|
||||
#endif
|
||||
@@ -2,9 +2,24 @@
|
||||
#define TEST_UTILS_H
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
// Detect if running under valgrind by checking /proc/self/maps for vgpreload.
|
||||
// This is used to skip fork-based tests that are incompatible with valgrind
|
||||
// (the instrumented parent runs too slowly, causing pipe timeouts).
|
||||
static inline bool is_running_under_valgrind(void) {
|
||||
FILE* f = fopen("/proc/self/maps", "r");
|
||||
if (!f)
|
||||
return false;
|
||||
char buf[4096];
|
||||
size_t n = fread(buf, 1, sizeof(buf) - 1, f);
|
||||
fclose(f);
|
||||
buf[n] = '\0';
|
||||
return strstr(buf, "vgpreload") != NULL;
|
||||
}
|
||||
|
||||
// Global test suite status
|
||||
extern int tests_run;
|
||||
extern int tests_failed;
|
||||
|
||||
Reference in New Issue
Block a user