Compare commits
27 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 |
@@ -55,7 +55,6 @@ static void print_usage(void) {
|
|||||||
printf(" --cert <path> TLS certificate file (PEM)\n");
|
printf(" --cert <path> TLS certificate file (PEM)\n");
|
||||||
printf(" --key <path> TLS private key file (PEM)\n");
|
printf(" --key <path> TLS private key file (PEM)\n");
|
||||||
printf(" --ca <path> TLS CA certificate file (PEM)\n");
|
printf(" --ca <path> TLS CA certificate file (PEM)\n");
|
||||||
printf(" --partial Keep partial files on interrupted transfer\n");
|
|
||||||
printf(" --help Show this help\n");
|
printf(" --help Show this help\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,8 +199,6 @@ int main(int argc, char* argv[]) {
|
|||||||
} else if (strcmp(argv[i], "--ca") == 0 && i + 1 < argc) {
|
} else if (strcmp(argv[i], "--ca") == 0 && i + 1 < argc) {
|
||||||
free(config->tls_ca);
|
free(config->tls_ca);
|
||||||
config->tls_ca = str_dup(argv[++i]);
|
config->tls_ca = str_dup(argv[++i]);
|
||||||
} else if (strcmp(argv[i], "--partial") == 0) {
|
|
||||||
config->partial = true;
|
|
||||||
} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
|
} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
|
||||||
set_log_level(LOG_LEVEL_DEBUG);
|
set_log_level(LOG_LEVEL_DEBUG);
|
||||||
} else if (argv[i][0] == '-') {
|
} else if (argv[i][0] == '-') {
|
||||||
|
|||||||
+3
-133
@@ -16,17 +16,6 @@ DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metada
|
|||||||
int exclude_count, char** include_patterns,
|
int exclude_count, char** include_patterns,
|
||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size) {
|
unsigned long long min_size) {
|
||||||
return directory_scanner_create_full(root_directory, use_metadata, chunk_size,
|
|
||||||
exclude_patterns, exclude_count,
|
|
||||||
include_patterns, include_count,
|
|
||||||
max_size, min_size, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
DirectoryScanner* directory_scanner_create_full(char* root_directory, bool use_metadata,
|
|
||||||
unsigned long long chunk_size, char** exclude_patterns,
|
|
||||||
int exclude_count, char** include_patterns,
|
|
||||||
int include_count, unsigned long long max_size,
|
|
||||||
unsigned long long min_size, bool follow_symlinks) {
|
|
||||||
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
|
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
|
||||||
if (scanner == NULL)
|
if (scanner == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -35,62 +24,12 @@ DirectoryScanner* directory_scanner_create_full(char* root_directory, bool use_m
|
|||||||
scanner->current_path = NULL;
|
scanner->current_path = NULL;
|
||||||
scanner->use_metadata = use_metadata;
|
scanner->use_metadata = use_metadata;
|
||||||
scanner->chunk_size = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
|
scanner->chunk_size = chunk_size > 0 ? chunk_size : DESIRED_CHUNK_SIZE;
|
||||||
/* Deep-copy exclude patterns */
|
scanner->exclude_patterns = exclude_patterns;
|
||||||
if (exclude_count > 0 && exclude_patterns != NULL) {
|
|
||||||
scanner->exclude_patterns = malloc((size_t)exclude_count * sizeof(char*));
|
|
||||||
if (scanner->exclude_patterns == NULL) {
|
|
||||||
queue_destroy(scanner->directories);
|
|
||||||
free(scanner);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < exclude_count; i++) {
|
|
||||||
scanner->exclude_patterns[i] = str_dup(exclude_patterns[i]);
|
|
||||||
if (scanner->exclude_patterns[i] == NULL) {
|
|
||||||
for (int j = 0; j < i; j++)
|
|
||||||
free(scanner->exclude_patterns[j]);
|
|
||||||
free(scanner->exclude_patterns);
|
|
||||||
queue_destroy(scanner->directories);
|
|
||||||
free(scanner);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
scanner->exclude_patterns = NULL;
|
|
||||||
}
|
|
||||||
scanner->exclude_count = exclude_count;
|
scanner->exclude_count = exclude_count;
|
||||||
|
scanner->include_patterns = include_patterns;
|
||||||
/* Deep-copy include patterns */
|
|
||||||
if (include_count > 0 && include_patterns != NULL) {
|
|
||||||
scanner->include_patterns = malloc((size_t)include_count * sizeof(char*));
|
|
||||||
if (scanner->include_patterns == NULL) {
|
|
||||||
for (int i = 0; i < exclude_count; i++)
|
|
||||||
free(scanner->exclude_patterns[i]);
|
|
||||||
free(scanner->exclude_patterns);
|
|
||||||
queue_destroy(scanner->directories);
|
|
||||||
free(scanner);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < include_count; i++) {
|
|
||||||
scanner->include_patterns[i] = str_dup(include_patterns[i]);
|
|
||||||
if (scanner->include_patterns[i] == NULL) {
|
|
||||||
for (int j = 0; j < i; j++)
|
|
||||||
free(scanner->include_patterns[j]);
|
|
||||||
free(scanner->include_patterns);
|
|
||||||
for (int j = 0; j < exclude_count; j++)
|
|
||||||
free(scanner->exclude_patterns[j]);
|
|
||||||
free(scanner->exclude_patterns);
|
|
||||||
queue_destroy(scanner->directories);
|
|
||||||
free(scanner);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
scanner->include_patterns = NULL;
|
|
||||||
}
|
|
||||||
scanner->include_count = include_count;
|
scanner->include_count = include_count;
|
||||||
scanner->max_size = max_size;
|
scanner->max_size = max_size;
|
||||||
scanner->min_size = min_size;
|
scanner->min_size = min_size;
|
||||||
scanner->follow_symlinks = follow_symlinks;
|
|
||||||
queue_enqueue(scanner->directories, str_dup(root_directory));
|
queue_enqueue(scanner->directories, str_dup(root_directory));
|
||||||
return scanner;
|
return scanner;
|
||||||
}
|
}
|
||||||
@@ -103,12 +42,6 @@ void directory_scanner_destroy(DirectoryScanner* scanner) {
|
|||||||
scanner->current_dir = NULL;
|
scanner->current_dir = NULL;
|
||||||
}
|
}
|
||||||
free(scanner->current_path);
|
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);
|
queue_destroy(scanner->directories);
|
||||||
free(scanner);
|
free(scanner);
|
||||||
}
|
}
|
||||||
@@ -171,76 +104,13 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
|
|||||||
|
|
||||||
char* cur_path = path_cat(scanner->current_path, entry->d_name);
|
char* cur_path = path_cat(scanner->current_path, entry->d_name);
|
||||||
struct stat stats;
|
struct stat stats;
|
||||||
// Use lstat to detect symlinks
|
if (stat(cur_path, &stats) != 0) {
|
||||||
if (lstat(cur_path, &stats) != 0) {
|
|
||||||
free(cur_path);
|
free(cur_path);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If follow_symlinks is enabled and this is a symlink, resolve it
|
|
||||||
if (scanner->follow_symlinks && S_ISLNK(stats.st_mode)) {
|
|
||||||
struct stat target_stats;
|
|
||||||
if (stat(cur_path, &target_stats) != 0) {
|
|
||||||
// Broken symlink, skip
|
|
||||||
free(cur_path);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
stats = target_stats;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (S_ISDIR(stats.st_mode)) {
|
if (S_ISDIR(stats.st_mode)) {
|
||||||
queue_enqueue(scanner->directories, (void*)cur_path);
|
queue_enqueue(scanner->directories, (void*)cur_path);
|
||||||
} else if (S_ISLNK(stats.st_mode)) {
|
|
||||||
// Handle symlink (not following)
|
|
||||||
bool excluded = false;
|
|
||||||
for (int i = 0; i < scanner->exclude_count; i++) {
|
|
||||||
if (glob_match(scanner->exclude_patterns[i], entry->d_name)) {
|
|
||||||
excluded = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (excluded) {
|
|
||||||
free(cur_path);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scanner->include_count > 0) {
|
|
||||||
bool included = false;
|
|
||||||
for (int i = 0; i < scanner->include_count; i++) {
|
|
||||||
if (glob_match(scanner->include_patterns[i], entry->d_name)) {
|
|
||||||
included = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!included) {
|
|
||||||
free(cur_path);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
File* file = file_create(cur_path);
|
|
||||||
if (file == NULL) {
|
|
||||||
free(cur_path);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
file->type = FILE_TYPE_SYMLINK;
|
|
||||||
// Read link target
|
|
||||||
char link_buf[4096];
|
|
||||||
ssize_t link_len = readlink(cur_path, link_buf, sizeof(link_buf) - 1);
|
|
||||||
if (link_len >= 0) {
|
|
||||||
link_buf[link_len] = '\0';
|
|
||||||
file->link_target = str_dup(link_buf);
|
|
||||||
}
|
|
||||||
file->data->size = 0;
|
|
||||||
if (scanner->use_metadata)
|
|
||||||
file->metadata = file_metadata_create(&stats);
|
|
||||||
array_list_add(chunk_data, file);
|
|
||||||
chunk_data_size += 1; // small size for symlinks
|
|
||||||
if (chunk_data_size > scanner->chunk_size) {
|
|
||||||
free(cur_path);
|
|
||||||
return chunk_data_to_chunk(chunk_data);
|
|
||||||
}
|
|
||||||
free(cur_path);
|
|
||||||
} else {
|
} else {
|
||||||
bool excluded = false;
|
bool excluded = false;
|
||||||
for (int i = 0; i < scanner->exclude_count; i++) {
|
for (int i = 0; i < scanner->exclude_count; i++) {
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ typedef struct {
|
|||||||
int include_count;
|
int include_count;
|
||||||
unsigned long long max_size;
|
unsigned long long max_size;
|
||||||
unsigned long long min_size;
|
unsigned long long min_size;
|
||||||
bool follow_symlinks;
|
|
||||||
} DirectoryScanner;
|
} DirectoryScanner;
|
||||||
|
|
||||||
DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metadata,
|
DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metadata,
|
||||||
@@ -26,11 +25,6 @@ DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metada
|
|||||||
int exclude_count, char** include_patterns,
|
int exclude_count, char** include_patterns,
|
||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size);
|
unsigned long long min_size);
|
||||||
DirectoryScanner* directory_scanner_create_full(char* root_directory, bool use_metadata,
|
|
||||||
unsigned long long chunk_size, char** exclude_patterns,
|
|
||||||
int exclude_count, char** include_patterns,
|
|
||||||
int include_count, unsigned long long max_size,
|
|
||||||
unsigned long long min_size, bool follow_symlinks);
|
|
||||||
Chunk* directory_scanner_next(DirectoryScanner* scanner);
|
Chunk* directory_scanner_next(DirectoryScanner* scanner);
|
||||||
void directory_scanner_destroy(DirectoryScanner* scanner);
|
void directory_scanner_destroy(DirectoryScanner* scanner);
|
||||||
|
|
||||||
|
|||||||
+3
-39
@@ -11,47 +11,11 @@
|
|||||||
#include "transport_tls.h"
|
#include "transport_tls.h"
|
||||||
#include "unistd.h"
|
#include "unistd.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include <libgen.h>
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
// Check if a file path should be excluded based on config patterns
|
|
||||||
static bool is_excluded(const char* path, const Config* config) {
|
|
||||||
// Extract filename from path
|
|
||||||
char* path_dup = str_dup(path);
|
|
||||||
if (!path_dup)
|
|
||||||
return false;
|
|
||||||
char* fname = basename(path_dup);
|
|
||||||
|
|
||||||
// Check exclude patterns
|
|
||||||
for (int i = 0; i < config->exclude_count; i++) {
|
|
||||||
if (glob_match(config->exclude_patterns[i], fname)) {
|
|
||||||
free(path_dup);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check include patterns (if any, file must match at least one)
|
|
||||||
if (config->include_count > 0) {
|
|
||||||
bool included = false;
|
|
||||||
for (int i = 0; i < config->include_count; i++) {
|
|
||||||
if (glob_match(config->include_patterns[i], fname)) {
|
|
||||||
included = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!included) {
|
|
||||||
free(path_dup);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
free(path_dup);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int receive_files(Config* config, int fd) {
|
int receive_files(Config* config, int fd) {
|
||||||
Status status;
|
Status status;
|
||||||
if (!receive_status(fd, &status))
|
if (!receive_status(fd, &status))
|
||||||
@@ -65,7 +29,7 @@ int receive_files(Config* config, int fd) {
|
|||||||
goto next;
|
goto next;
|
||||||
if (file == NULL && !skipped)
|
if (file == NULL && !skipped)
|
||||||
return -1;
|
return -1;
|
||||||
if (config->save_to_disk && !is_excluded(file->path, config))
|
if (config->save_to_disk)
|
||||||
file_save_to_disk(config->receive_root_directory, file);
|
file_save_to_disk(config->receive_root_directory, file);
|
||||||
file_destroy(file);
|
file_destroy(file);
|
||||||
} else if (status == STATUS_CHUNK) {
|
} else if (status == STATUS_CHUNK) {
|
||||||
@@ -75,7 +39,7 @@ int receive_files(Config* config, int fd) {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < chunk->element_count; i++) {
|
for (int i = 0; i < chunk->element_count; i++) {
|
||||||
if (config->save_to_disk && !is_excluded(chunk->items[i]->path, config))
|
if (config->save_to_disk)
|
||||||
file_save_to_disk(config->receive_root_directory, chunk->items[i]);
|
file_save_to_disk(config->receive_root_directory, chunk->items[i]);
|
||||||
}
|
}
|
||||||
chunk_destroy(chunk);
|
chunk_destroy(chunk);
|
||||||
@@ -86,7 +50,7 @@ int receive_files(Config* config, int fd) {
|
|||||||
send_status(fd, STATUS_ERROR);
|
send_status(fd, STATUS_ERROR);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (config->save_to_disk && !is_excluded(file->path, config))
|
if (config->save_to_disk)
|
||||||
file_save_to_disk(config->receive_root_directory, file);
|
file_save_to_disk(config->receive_root_directory, file);
|
||||||
file_destroy(file);
|
file_destroy(file);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
#include "compression.h"
|
#include "compression.h"
|
||||||
#include "data.h"
|
#include "data.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include <stdint.h>
|
#include "stdlib.h"
|
||||||
#include <stdlib.h>
|
|
||||||
#include "zstd.h"
|
#include "zstd.h"
|
||||||
|
|
||||||
#define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
|
#define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
|
||||||
@@ -67,16 +66,8 @@ Data* data_decompress(Data* compressed_data) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t buf_size = INITIAL_DECOMPRESS_BUF_SIZE;
|
size_t buf_size =
|
||||||
if (!ZSTD_isError(dst_size) && dst_size > 0) {
|
(!ZSTD_isError(dst_size) && dst_size > 0) ? (size_t)dst_size : INITIAL_DECOMPRESS_BUF_SIZE;
|
||||||
if (dst_size > SIZE_MAX) {
|
|
||||||
log_message(LOG_LEVEL_ERROR,
|
|
||||||
"Decompressed size %llu exceeds addressable memory, using fallback buffer",
|
|
||||||
dst_size);
|
|
||||||
} else {
|
|
||||||
buf_size = (size_t)dst_size;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Data* uncompressed_data = data_create_empty(buf_size);
|
Data* uncompressed_data = data_create_empty(buf_size);
|
||||||
if (!uncompressed_data) {
|
if (!uncompressed_data) {
|
||||||
log_message(LOG_LEVEL_ERROR, "Failed to allocate decompression buffer");
|
log_message(LOG_LEVEL_ERROR, "Failed to allocate decompression buffer");
|
||||||
|
|||||||
@@ -45,8 +45,6 @@ Config* config_create(char* version, char* send_directory, char* receive_directo
|
|||||||
config->tls_cert = NULL;
|
config->tls_cert = NULL;
|
||||||
config->tls_key = NULL;
|
config->tls_key = NULL;
|
||||||
config->tls_ca = NULL;
|
config->tls_ca = NULL;
|
||||||
config->follow_symlinks = false;
|
|
||||||
config->partial = false;
|
|
||||||
config->server_host = str_dup("127.0.0.1");
|
config->server_host = str_dup("127.0.0.1");
|
||||||
config->server_port = 8080;
|
config->server_port = 8080;
|
||||||
return config;
|
return config;
|
||||||
@@ -129,26 +127,6 @@ bool config_send(int file_descriptor, const Config* config) {
|
|||||||
return false;
|
return false;
|
||||||
if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
|
if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
|
||||||
return false;
|
return false;
|
||||||
if (!send_int(file_descriptor, config->exclude_count))
|
|
||||||
return false;
|
|
||||||
for (int i = 0; i < config->exclude_count; i++) {
|
|
||||||
if (!send_str(file_descriptor, config->exclude_patterns[i]))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!send_int(file_descriptor, config->include_count))
|
|
||||||
return false;
|
|
||||||
for (int i = 0; i < config->include_count; i++) {
|
|
||||||
if (!send_str(file_descriptor, config->include_patterns[i]))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!send_n_data(file_descriptor, &config->max_size, sizeof(config->max_size)))
|
|
||||||
return false;
|
|
||||||
if (!send_n_data(file_descriptor, &config->min_size, sizeof(config->min_size)))
|
|
||||||
return false;
|
|
||||||
if (!send_int(file_descriptor, config->follow_symlinks))
|
|
||||||
return false;
|
|
||||||
if (!send_int(file_descriptor, config->partial))
|
|
||||||
return false;
|
|
||||||
Status status;
|
Status status;
|
||||||
if (!receive_status(file_descriptor, &status))
|
if (!receive_status(file_descriptor, &status))
|
||||||
return false;
|
return false;
|
||||||
@@ -243,70 +221,6 @@ Config* config_receive(int file_descriptor) {
|
|||||||
config->tls_cert = NULL;
|
config->tls_cert = NULL;
|
||||||
config->tls_key = NULL;
|
config->tls_key = NULL;
|
||||||
config->tls_ca = NULL;
|
config->tls_ca = NULL;
|
||||||
config->follow_symlinks = false;
|
|
||||||
config->partial = false;
|
|
||||||
|
|
||||||
// Receive exclude patterns
|
|
||||||
int ec;
|
|
||||||
if (!receive_int(file_descriptor, &ec))
|
|
||||||
goto error;
|
|
||||||
config->exclude_count = ec;
|
|
||||||
if (ec > 0) {
|
|
||||||
config->exclude_patterns = malloc((size_t)ec * sizeof(char*));
|
|
||||||
if (!config->exclude_patterns) {
|
|
||||||
config->exclude_count = 0;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < ec; i++) {
|
|
||||||
config->exclude_patterns[i] = receive_str(file_descriptor);
|
|
||||||
if (!config->exclude_patterns[i]) {
|
|
||||||
for (int j = 0; j < i; j++)
|
|
||||||
free(config->exclude_patterns[j]);
|
|
||||||
free(config->exclude_patterns);
|
|
||||||
config->exclude_patterns = NULL;
|
|
||||||
config->exclude_count = 0;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Receive include patterns
|
|
||||||
int ic;
|
|
||||||
if (!receive_int(file_descriptor, &ic))
|
|
||||||
goto error;
|
|
||||||
config->include_count = ic;
|
|
||||||
if (ic > 0) {
|
|
||||||
config->include_patterns = malloc((size_t)ic * sizeof(char*));
|
|
||||||
if (!config->include_patterns) {
|
|
||||||
config->include_count = 0;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < ic; i++) {
|
|
||||||
config->include_patterns[i] = receive_str(file_descriptor);
|
|
||||||
if (!config->include_patterns[i]) {
|
|
||||||
for (int j = 0; j < i; j++)
|
|
||||||
free(config->include_patterns[j]);
|
|
||||||
free(config->include_patterns);
|
|
||||||
config->include_patterns = NULL;
|
|
||||||
config->include_count = 0;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!receive_n_data(file_descriptor, &config->max_size, sizeof(config->max_size)))
|
|
||||||
goto error;
|
|
||||||
if (!receive_n_data(file_descriptor, &config->min_size, sizeof(config->min_size)))
|
|
||||||
goto error;
|
|
||||||
int tmp_follow;
|
|
||||||
if (!receive_int(file_descriptor, &tmp_follow))
|
|
||||||
goto error;
|
|
||||||
config->follow_symlinks = tmp_follow;
|
|
||||||
int tmp_partial;
|
|
||||||
if (!receive_int(file_descriptor, &tmp_partial))
|
|
||||||
goto error;
|
|
||||||
config->partial = tmp_partial;
|
|
||||||
|
|
||||||
config->server_host = str_dup("127.0.0.1");
|
config->server_host = str_dup("127.0.0.1");
|
||||||
config->server_port = 8080;
|
config->server_port = 8080;
|
||||||
if (!send_status(file_descriptor, STATUS_OK))
|
if (!send_status(file_descriptor, STATUS_OK))
|
||||||
|
|||||||
+1
-3
@@ -40,11 +40,9 @@ typedef struct Config {
|
|||||||
char* tls_cert;
|
char* tls_cert;
|
||||||
char* tls_key;
|
char* tls_key;
|
||||||
char* tls_ca;
|
char* tls_ca;
|
||||||
bool follow_symlinks;
|
|
||||||
bool partial;
|
|
||||||
} Config;
|
} Config;
|
||||||
|
|
||||||
#define PROTOCOL_VERSION "1.3.0"
|
#define PROTOCOL_VERSION "1.4.0"
|
||||||
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
|
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
|
||||||
|
|
||||||
Config* config_create(char* version, char* send_directory, char* receive_directory,
|
Config* config_create(char* version, char* send_directory, char* receive_directory,
|
||||||
|
|||||||
+1
-3
@@ -3,9 +3,7 @@
|
|||||||
#include "stdlib.h"
|
#include "stdlib.h"
|
||||||
|
|
||||||
Data* data_create_empty(size_t data_size) {
|
Data* data_create_empty(size_t data_size) {
|
||||||
/* malloc(0) is UB; allocate at least 1 byte but preserve requested size */
|
void* data = malloc(data_size);
|
||||||
size_t alloc_size = data_size > 0 ? data_size : 1;
|
|
||||||
void* data = malloc(alloc_size);
|
|
||||||
if (data == NULL) {
|
if (data == NULL) {
|
||||||
log_message(LOG_LEVEL_ERROR, "Could not allocate memory for empty data");
|
log_message(LOG_LEVEL_ERROR, "Could not allocate memory for empty data");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
+24
-140
@@ -20,9 +20,6 @@
|
|||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
#define STREAM_THRESHOLD (64ULL * 1024 * 1024) /* 64 MB */
|
|
||||||
#define STREAM_CHUNK_SIZE (1ULL * 1024 * 1024) /* 1 MB */
|
|
||||||
|
|
||||||
File* file_create(const char* path) {
|
File* file_create(const char* path) {
|
||||||
File* file = (File*)malloc(sizeof(File));
|
File* file = (File*)malloc(sizeof(File));
|
||||||
if (file == NULL) {
|
if (file == NULL) {
|
||||||
@@ -45,8 +42,6 @@ File* file_create(const char* path) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
file->metadata = NULL;
|
file->metadata = NULL;
|
||||||
file->type = FILE_TYPE_REGULAR;
|
|
||||||
file->link_target = NULL;
|
|
||||||
return file;
|
return file;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,8 +55,6 @@ void file_destroy(void* item) {
|
|||||||
file->metadata = NULL;
|
file->metadata = NULL;
|
||||||
free(file->path);
|
free(file->path);
|
||||||
file->path = NULL;
|
file->path = NULL;
|
||||||
free(file->link_target);
|
|
||||||
file->link_target = NULL;
|
|
||||||
free(file);
|
free(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,14 +83,6 @@ void file_metadata_destroy(void* metadata) {
|
|||||||
bool file_load_data(File* file) {
|
bool file_load_data(File* file) {
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return false;
|
return false;
|
||||||
// Symlinks have no data to load
|
|
||||||
if (file->type == FILE_TYPE_SYMLINK)
|
|
||||||
return true;
|
|
||||||
// For streaming files, just record the size, don't load into memory
|
|
||||||
if (file->data->size > STREAM_THRESHOLD) {
|
|
||||||
// Don't allocate; streaming will read directly from disk
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (file->data->data == NULL) {
|
if (file->data->data == NULL) {
|
||||||
file->data->data = malloc(file->data->size);
|
file->data->data = malloc(file->data->size);
|
||||||
if (file->data->data == NULL) {
|
if (file->data->data == NULL) {
|
||||||
@@ -113,69 +98,10 @@ bool file_load_data(File* file) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stream file content in chunks without loading entire file into RAM
|
|
||||||
static bool file_send_streaming(File* file, int file_descriptor) {
|
|
||||||
unsigned long long total_size = file->data->size;
|
|
||||||
// Send total size prefix (same wire format as send_data)
|
|
||||||
if (!send_n_data(file_descriptor, &total_size, sizeof(total_size)))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
FILE* fp = fopen(file->path, "rb");
|
|
||||||
if (!fp) {
|
|
||||||
perror("Could not open file for streaming");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
char buf[STREAM_CHUNK_SIZE];
|
|
||||||
unsigned long long remaining = total_size;
|
|
||||||
while (remaining > 0) {
|
|
||||||
size_t to_read = (size_t)((remaining < STREAM_CHUNK_SIZE) ? remaining : STREAM_CHUNK_SIZE);
|
|
||||||
size_t nread = fread(buf, 1, to_read, fp);
|
|
||||||
if (nread != to_read) {
|
|
||||||
if (ferror(fp)) {
|
|
||||||
perror("Read error during streaming");
|
|
||||||
}
|
|
||||||
fclose(fp);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!send_n_data(file_descriptor, buf, nread)) {
|
|
||||||
fclose(fp);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
remaining -= (unsigned long long)nread;
|
|
||||||
}
|
|
||||||
fclose(fp);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
|
bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
|
||||||
int compression_level, bool send_path) {
|
int compression_level, bool send_path) {
|
||||||
if (send_path && !send_str(file_descriptor, file->path))
|
|
||||||
return false;
|
|
||||||
if (use_metadata && !metadata_send(file_descriptor, file->metadata))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// Send file type indicator so receiver can distinguish regular from symlink
|
|
||||||
int ft = (int)file->type;
|
|
||||||
if (!send_int(file_descriptor, ft))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (file->type == FILE_TYPE_SYMLINK) {
|
|
||||||
// Send link target, then zero-length data
|
|
||||||
if (!send_str(file_descriptor, file->link_target ? file->link_target : ""))
|
|
||||||
return false;
|
|
||||||
Data empty = {NULL, 0};
|
|
||||||
return send_data(file_descriptor, &empty);
|
|
||||||
}
|
|
||||||
|
|
||||||
const Data* data_to_send = file->data;
|
const Data* data_to_send = file->data;
|
||||||
Data* compressed_data = NULL;
|
Data* compressed_data = NULL;
|
||||||
|
|
||||||
// Streaming mode: for large files without compression, stream from disk
|
|
||||||
if (file->data->size > STREAM_THRESHOLD && compression_level == 0) {
|
|
||||||
return file_send_streaming(file, file_descriptor);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (compression_level > 0) {
|
if (compression_level > 0) {
|
||||||
compressed_data = data_compress(file->data, compression_level);
|
compressed_data = data_compress(file->data, compression_level);
|
||||||
if (compressed_data == NULL) {
|
if (compressed_data == NULL) {
|
||||||
@@ -184,6 +110,19 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
|
|||||||
}
|
}
|
||||||
data_to_send = compressed_data;
|
data_to_send = compressed_data;
|
||||||
}
|
}
|
||||||
|
if (send_path && !send_str(file_descriptor, file->path)) {
|
||||||
|
data_destroy(compressed_data);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (use_metadata && !metadata_send(file_descriptor, file->metadata)) {
|
||||||
|
data_destroy(compressed_data);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
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)) {
|
if (!send_data(file_descriptor, data_to_send)) {
|
||||||
data_destroy(compressed_data);
|
data_destroy(compressed_data);
|
||||||
return false;
|
return false;
|
||||||
@@ -193,18 +132,6 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool file_save_to_disk(const char* root_directory, File* file) {
|
bool file_save_to_disk(const char* root_directory, File* file) {
|
||||||
if (file->type == FILE_TYPE_SYMLINK && file->link_target) {
|
|
||||||
char* disk_path = path_cat((char*)root_directory, file->path);
|
|
||||||
if (disk_path == NULL)
|
|
||||||
return false;
|
|
||||||
unlink(disk_path);
|
|
||||||
bool ok = (symlink(file->link_target, disk_path) == 0);
|
|
||||||
if (ok && file->metadata)
|
|
||||||
file_restore_metadata(disk_path, file->metadata);
|
|
||||||
free(disk_path);
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* disk_path = path_cat((char*)root_directory, file->path);
|
char* disk_path = path_cat((char*)root_directory, file->path);
|
||||||
if (disk_path == NULL)
|
if (disk_path == NULL)
|
||||||
return false;
|
return false;
|
||||||
@@ -235,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,
|
static File* receive_delta_file(int fd, const Config* config, const char* check_path,
|
||||||
void* old_data, unsigned long long old_size) {
|
void* old_data, unsigned long long old_size) {
|
||||||
if (!old_data)
|
if (!old_data) {
|
||||||
|
send_status(fd, STATUS_ERROR);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
DeltaSignature* sig = delta_signature_create(old_data, old_size, config->delta_block_size);
|
DeltaSignature* sig = delta_signature_create(old_data, old_size, config->delta_block_size);
|
||||||
if (!sig) {
|
if (!sig) {
|
||||||
|
send_status(fd, STATUS_ERROR);
|
||||||
free(old_data);
|
free(old_data);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Data* sig_data = delta_signature_serialize(sig);
|
Data* sig_data = delta_signature_serialize(sig);
|
||||||
if (!sig_data) {
|
if (!sig_data) {
|
||||||
|
send_status(fd, STATUS_ERROR);
|
||||||
delta_signature_destroy(sig);
|
delta_signature_destroy(sig);
|
||||||
free(old_data);
|
free(old_data);
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -408,18 +339,6 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
|
|||||||
bool has_old_file = (full_path && stat(full_path, &st) == 0);
|
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;
|
unsigned long long old_size = has_old_file ? (unsigned long long)st.st_size : 0;
|
||||||
|
|
||||||
// Check for partial file if enabled
|
|
||||||
if (config->partial && !has_old_file && full_path) {
|
|
||||||
char* partial_path = malloc(strlen(full_path) + 20);
|
|
||||||
if (partial_path) {
|
|
||||||
sprintf(partial_path, "%s.fastsync-partial", full_path);
|
|
||||||
has_old_file = (stat(partial_path, &st) == 0);
|
|
||||||
if (has_old_file)
|
|
||||||
old_size = (unsigned long long)st.st_size;
|
|
||||||
free(partial_path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool match = has_old_file && (unsigned long long)st.st_size == check_size &&
|
bool match = has_old_file && (unsigned long long)st.st_size == check_size &&
|
||||||
(long long)st.st_mtime == check_mtime;
|
(long long)st.st_mtime == check_mtime;
|
||||||
|
|
||||||
@@ -475,25 +394,12 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read file type indicator
|
|
||||||
int file_type;
|
int file_type;
|
||||||
if (!receive_int(fd, &file_type)) {
|
if (!receive_int(fd, &file_type)) {
|
||||||
file_destroy(file);
|
file_destroy(file);
|
||||||
send_status(fd, STATUS_ERROR);
|
send_status(fd, STATUS_ERROR);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
file->type = (FileType)file_type;
|
|
||||||
|
|
||||||
if (file->type == FILE_TYPE_SYMLINK) {
|
|
||||||
char* link_target = receive_str(fd);
|
|
||||||
if (link_target) {
|
|
||||||
file->link_target = link_target;
|
|
||||||
}
|
|
||||||
Data* empty_data = receive_data(fd);
|
|
||||||
if (empty_data)
|
|
||||||
data_destroy(empty_data);
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
|
|
||||||
Data* file_data = receive_data(fd);
|
Data* file_data = receive_data(fd);
|
||||||
if (file_data == NULL) {
|
if (file_data == NULL) {
|
||||||
@@ -556,14 +462,13 @@ done:
|
|||||||
|
|
||||||
bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
|
bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int compression_level,
|
||||||
bool send_path) {
|
bool send_path) {
|
||||||
// Handle symlinks
|
|
||||||
if (file->type == FILE_TYPE_SYMLINK) {
|
|
||||||
return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
|
|
||||||
send_path);
|
|
||||||
}
|
|
||||||
|
|
||||||
// sendfile is incompatible with compression (kernel zero-copy).
|
// sendfile is incompatible with compression (kernel zero-copy).
|
||||||
// If compression is requested, fall back to the regular send path.
|
// If compression is requested, fall back to the regular send path.
|
||||||
|
// NOTE: This is a safety net only — callers must ensure compression_level == 0
|
||||||
|
// before calling file_send_sendfile. The fallback to file_send_single_calls
|
||||||
|
// preserves the send_path contract, but callers should not rely on it for
|
||||||
|
// correctness (the --sendfile flag is validated to be mutually exclusive with
|
||||||
|
// -c/--compress at the CLI layer).
|
||||||
if (compression_level > 0)
|
if (compression_level > 0)
|
||||||
return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
|
return file_send_single_calls(file, file_descriptor, use_metadata, compression_level,
|
||||||
send_path);
|
send_path);
|
||||||
@@ -573,8 +478,7 @@ bool file_send_sendfile(File* file, int file_descriptor, bool use_metadata, int
|
|||||||
if (use_metadata && !metadata_send(file_descriptor, file->metadata))
|
if (use_metadata && !metadata_send(file_descriptor, file->metadata))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Send file type indicator
|
int ft = 0; // FILE_TYPE_REGULAR
|
||||||
int ft = (int)file->type;
|
|
||||||
if (!send_int(file_descriptor, ft))
|
if (!send_int(file_descriptor, ft))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -620,30 +524,11 @@ File* file_receive(const Config* config, int file_descriptor) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Receive file type indicator
|
|
||||||
int file_type;
|
int file_type;
|
||||||
if (!receive_int(file_descriptor, &file_type)) {
|
if (!receive_int(file_descriptor, &file_type)) {
|
||||||
file_destroy(file);
|
file_destroy(file);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
file->type = (FileType)file_type;
|
|
||||||
|
|
||||||
if (file->type == FILE_TYPE_SYMLINK) {
|
|
||||||
char* link_target = receive_str(file_descriptor);
|
|
||||||
if (link_target == NULL) {
|
|
||||||
file_destroy(file);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
file->link_target = link_target;
|
|
||||||
// Receive and discard zero-length data
|
|
||||||
Data* empty_data = receive_data(file_descriptor);
|
|
||||||
if (empty_data)
|
|
||||||
data_destroy(empty_data);
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Regular file - receive data
|
|
||||||
Data* file_data = receive_data(file_descriptor);
|
Data* file_data = receive_data(file_descriptor);
|
||||||
if (file_data == NULL) {
|
if (file_data == NULL) {
|
||||||
file_destroy(file);
|
file_destroy(file);
|
||||||
@@ -658,7 +543,6 @@ File* file_receive(const Config* config, int file_descriptor) {
|
|||||||
}
|
}
|
||||||
file_data = file_data_uncompressed;
|
file_data = file_data_uncompressed;
|
||||||
}
|
}
|
||||||
|
|
||||||
data_destroy(file->data);
|
data_destroy(file->data);
|
||||||
file->data = file_data;
|
file->data = file_data;
|
||||||
return file;
|
return file;
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
typedef enum { FILE_TYPE_REGULAR, FILE_TYPE_SYMLINK, FILE_TYPE_DIR } FileType;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
mode_t mode;
|
mode_t mode;
|
||||||
uid_t uid;
|
uid_t uid;
|
||||||
@@ -20,8 +18,6 @@ typedef struct {
|
|||||||
char* path;
|
char* path;
|
||||||
Data* data;
|
Data* data;
|
||||||
FileMetadata* metadata;
|
FileMetadata* metadata;
|
||||||
FileType type;
|
|
||||||
char* link_target;
|
|
||||||
} File;
|
} File;
|
||||||
|
|
||||||
File* file_create(const char* path);
|
File* file_create(const char* path);
|
||||||
|
|||||||
@@ -138,10 +138,6 @@ static const char* status_to_string(Status status) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool send_str(int file_descriptor, const char* data) {
|
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);
|
size_t size = strlen(data);
|
||||||
if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
|
if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
|
||||||
return false;
|
return false;
|
||||||
@@ -155,11 +151,6 @@ char* receive_str(int file_descriptor) {
|
|||||||
size_t size;
|
size_t size;
|
||||||
if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
|
if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
|
||||||
return NULL;
|
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);
|
char* data = (char*)malloc(size + 1);
|
||||||
if (data == NULL)
|
if (data == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
@@ -5,9 +5,6 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
/* Maximum allowed string size for receive_str (10 MB) */
|
|
||||||
#define MAX_STRING_SIZE (10 * 1024 * 1024)
|
|
||||||
|
|
||||||
typedef struct ssl_st SSL;
|
typedef struct ssl_st SSL;
|
||||||
|
|
||||||
typedef int Status;
|
typedef int Status;
|
||||||
|
|||||||
@@ -124,10 +124,7 @@ Client* client_connect_ssh(const char* destination, int port) {
|
|||||||
else
|
else
|
||||||
snprintf(ssh_user, sizeof(ssh_user), "%s", r.host);
|
snprintf(ssh_user, sizeof(ssh_user), "%s", r.host);
|
||||||
|
|
||||||
size_t ssh_argv_max = 32;
|
char* ssh_argv[16];
|
||||||
char** ssh_argv = calloc(ssh_argv_max, sizeof(char*));
|
|
||||||
if (ssh_argv == NULL)
|
|
||||||
_exit(1);
|
|
||||||
int ac = 0;
|
int ac = 0;
|
||||||
char port_str[16];
|
char port_str[16];
|
||||||
ssh_argv[ac++] = "ssh";
|
ssh_argv[ac++] = "ssh";
|
||||||
@@ -138,24 +135,15 @@ Client* client_connect_ssh(const char* destination, int port) {
|
|||||||
ssh_argv[ac++] = "-o";
|
ssh_argv[ac++] = "-o";
|
||||||
ssh_argv[ac++] = "ControlPath=~/.cache/fastsync-%r@%h:%p";
|
ssh_argv[ac++] = "ControlPath=~/.cache/fastsync-%r@%h:%p";
|
||||||
if (port > 0 && port != 22) {
|
if (port > 0 && port != 22) {
|
||||||
if ((size_t)ac + 2 >= ssh_argv_max) {
|
|
||||||
free(ssh_argv);
|
|
||||||
_exit(1);
|
|
||||||
}
|
|
||||||
ssh_argv[ac++] = "-p";
|
ssh_argv[ac++] = "-p";
|
||||||
snprintf(port_str, sizeof(port_str), "%d", port);
|
snprintf(port_str, sizeof(port_str), "%d", port);
|
||||||
ssh_argv[ac++] = port_str;
|
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++] = ssh_user;
|
||||||
ssh_argv[ac++] = "fastsync-server";
|
ssh_argv[ac++] = "fastsync-server";
|
||||||
ssh_argv[ac++] = "--stdio";
|
ssh_argv[ac++] = "--stdio";
|
||||||
ssh_argv[ac] = NULL;
|
ssh_argv[ac] = NULL;
|
||||||
execvp("ssh", ssh_argv);
|
execvp("ssh", ssh_argv);
|
||||||
free(ssh_argv);
|
|
||||||
perror("exec of ssh failed");
|
perror("exec of ssh failed");
|
||||||
ssize_t wret = write(exec_pipe[1], "x", 1);
|
ssize_t wret = write(exec_pipe[1], "x", 1);
|
||||||
(void)wret;
|
(void)wret;
|
||||||
@@ -186,7 +174,7 @@ Client* client_connect_ssh(const char* destination, int port) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
client->file_descriptor = sv[0];
|
client->file_descriptor = sv[0];
|
||||||
client->address.ss_family = AF_UNIX;
|
client->address.sin_family = AF_UNIX;
|
||||||
client->address_length = 0;
|
client->address_length = 0;
|
||||||
client->ssh_child_pid = pid;
|
client->ssh_child_pid = pid;
|
||||||
client->ssl = NULL;
|
client->ssl = NULL;
|
||||||
|
|||||||
+32
-152
@@ -2,64 +2,29 @@
|
|||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <netdb.h>
|
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
bool set_socket_timeouts(int fd) {
|
|
||||||
struct timeval tv;
|
|
||||||
tv.tv_sec = 30;
|
|
||||||
tv.tv_usec = 0;
|
|
||||||
|
|
||||||
int keepalive = 1;
|
|
||||||
if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive)) < 0) {
|
|
||||||
perror("Could not set SO_KEEPALIVE");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
|
|
||||||
perror("Could not set SO_RCVTIMEO");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) {
|
|
||||||
perror("Could not set SO_SNDTIMEO");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
Server* server_create(int port) {
|
Server* server_create(int port) {
|
||||||
Server* server = (Server*)malloc(sizeof(Server));
|
Server* server = (Server*)malloc(sizeof(Server));
|
||||||
if (server == NULL) {
|
if (server == NULL) {
|
||||||
perror("Could not allocate space for Server");
|
perror("Could not allocate space for Server");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
memset(&server->address, 0, sizeof(server->address));
|
|
||||||
|
|
||||||
// Try IPv6 first, fall back to IPv4
|
int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
int fd = socket(AF_INET6, SOCK_STREAM, 0);
|
if (file_descriptor < 0) {
|
||||||
if (fd < 0) {
|
|
||||||
fd = socket(AF_INET, SOCK_STREAM, 0);
|
|
||||||
}
|
|
||||||
if (fd < 0) {
|
|
||||||
perror("Could not create Socket!");
|
perror("Could not create Socket!");
|
||||||
free(server);
|
free(server);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
server->file_descriptor = file_descriptor;
|
||||||
if (!set_socket_timeouts(fd)) {
|
|
||||||
close(fd);
|
|
||||||
free(server);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
server->file_descriptor = fd;
|
|
||||||
int opt = 1;
|
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!");
|
perror("Error setting a socket option!");
|
||||||
@@ -68,63 +33,18 @@ Server* server_create(int port) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine address family from the actual socket
|
server->address.sin_family = AF_INET;
|
||||||
struct sockaddr_storage* addr = &server->address;
|
server->address.sin_addr.s_addr = INADDR_ANY;
|
||||||
socklen_t addr_len = sizeof(*addr);
|
server->address.sin_port = htons(port);
|
||||||
if (getsockname(fd, (struct sockaddr*)addr, &addr_len) == 0) {
|
server->address_length = sizeof(server->address);
|
||||||
// Use the family of the socket we actually created
|
server->ssl_ctx = NULL;
|
||||||
}
|
|
||||||
|
|
||||||
struct sockaddr_in* addr4 = (struct sockaddr_in*)addr;
|
|
||||||
struct sockaddr_in6* addr6 = (struct sockaddr_in6*)addr;
|
|
||||||
|
|
||||||
if (addr->ss_family == AF_INET6) {
|
|
||||||
addr6->sin6_family = AF_INET6;
|
|
||||||
addr6->sin6_addr = in6addr_any;
|
|
||||||
addr6->sin6_port = htons(port);
|
|
||||||
server->address_length = sizeof(struct sockaddr_in6);
|
|
||||||
} else {
|
|
||||||
addr4->sin_family = AF_INET;
|
|
||||||
addr4->sin_addr.s_addr = INADDR_ANY;
|
|
||||||
addr4->sin_port = htons(port);
|
|
||||||
server->address_length = sizeof(struct sockaddr_in);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bind(server->file_descriptor, (struct sockaddr*)&server->address, server->address_length) <
|
if (bind(server->file_descriptor, (struct sockaddr*)&server->address, server->address_length) <
|
||||||
0) {
|
0) {
|
||||||
// If IPv6 bind failed (maybe no IPv6), try IPv4
|
perror("Could not bind server");
|
||||||
if (addr->ss_family == AF_INET6) {
|
close(server->file_descriptor);
|
||||||
close(fd);
|
free(server);
|
||||||
fd = socket(AF_INET, SOCK_STREAM, 0);
|
return NULL;
|
||||||
if (fd < 0) {
|
|
||||||
perror("Could not create IPv4 Socket!");
|
|
||||||
free(server);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (!set_socket_timeouts(fd)) {
|
|
||||||
close(fd);
|
|
||||||
free(server);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
server->file_descriptor = fd;
|
|
||||||
setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
|
|
||||||
memset(addr, 0, sizeof(*addr));
|
|
||||||
addr4->sin_family = AF_INET;
|
|
||||||
addr4->sin_addr.s_addr = INADDR_ANY;
|
|
||||||
addr4->sin_port = htons(port);
|
|
||||||
server->address_length = sizeof(struct sockaddr_in);
|
|
||||||
if (bind(server->file_descriptor, (struct sockaddr*)addr, server->address_length) < 0) {
|
|
||||||
perror("Could not bind server");
|
|
||||||
close(server->file_descriptor);
|
|
||||||
free(server);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
perror("Could not bind server");
|
|
||||||
close(server->file_descriptor);
|
|
||||||
free(server);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return server;
|
return server;
|
||||||
@@ -150,14 +70,13 @@ static void accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
|
|||||||
}
|
}
|
||||||
signal(SIGCHLD, SIG_IGN);
|
signal(SIGCHLD, SIG_IGN);
|
||||||
while (1) {
|
while (1) {
|
||||||
struct sockaddr_storage client_addr;
|
struct sockaddr_in client_addr;
|
||||||
socklen_t client_len = sizeof(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) {
|
if (fd < 0) {
|
||||||
perror("Could not accept the connection");
|
perror("Could not accept the connection");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
set_socket_timeouts(fd);
|
|
||||||
log_message(LOG_LEVEL_INFO, "%s", log_fmt);
|
log_message(LOG_LEVEL_INFO, "%s", log_fmt);
|
||||||
pid_t pid = fork();
|
pid_t pid = fork();
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
@@ -179,11 +98,7 @@ static void plain_child_fn(int fd, void* ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool server_listen(Server* server, void (*handler)(int file_descriptor)) {
|
bool server_listen(Server* server, void (*handler)(int file_descriptor)) {
|
||||||
struct sockaddr_in* addr4 = (struct sockaddr_in*)&server->address;
|
log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d", ntohs(server->address.sin_port));
|
||||||
int port = (server->address.ss_family == AF_INET6)
|
|
||||||
? ntohs(((struct sockaddr_in6*)&server->address)->sin6_port)
|
|
||||||
: ntohs(addr4->sin_port);
|
|
||||||
log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d", port);
|
|
||||||
struct plain_ctx ctx = {handler};
|
struct plain_ctx ctx = {handler};
|
||||||
accept_loop(server, plain_child_fn, &ctx, "Received Connection");
|
accept_loop(server, plain_child_fn, &ctx, "Received Connection");
|
||||||
return true;
|
return true;
|
||||||
@@ -191,23 +106,25 @@ bool server_listen(Server* server, void (*handler)(int file_descriptor)) {
|
|||||||
|
|
||||||
void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
|
void server_accept_loop(Server* server, void (*child_fn)(int, void*), void* child_ctx,
|
||||||
const char* log_fmt) {
|
const char* log_fmt) {
|
||||||
struct sockaddr_in* addr4 = (struct sockaddr_in*)&server->address;
|
log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d", ntohs(server->address.sin_port));
|
||||||
int port = (server->address.ss_family == AF_INET6)
|
|
||||||
? ntohs(((struct sockaddr_in6*)&server->address)->sin6_port)
|
|
||||||
: ntohs(addr4->sin_port);
|
|
||||||
log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d", port);
|
|
||||||
accept_loop(server, child_fn, child_ctx, log_fmt);
|
accept_loop(server, child_fn, child_ctx, log_fmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
Client* client_create() {
|
Client* client_create() {
|
||||||
Client* client = (Client*)malloc(sizeof(Client));
|
int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if (client == NULL) {
|
if (file_descriptor < 0) {
|
||||||
|
perror("Could not create Socket!");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
memset(&client->address, 0, sizeof(client->address));
|
|
||||||
client->address.ss_family = AF_UNSPEC;
|
Client* client = (Client*)malloc(sizeof(Client));
|
||||||
|
if (client == NULL) {
|
||||||
|
close(file_descriptor);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
client->file_descriptor = file_descriptor;
|
||||||
|
client->address.sin_family = AF_INET;
|
||||||
client->address_length = sizeof(client->address);
|
client->address_length = sizeof(client->address);
|
||||||
client->file_descriptor = -1;
|
|
||||||
client->ssh_child_pid = -1;
|
client->ssh_child_pid = -1;
|
||||||
client->ssl = NULL;
|
client->ssl = NULL;
|
||||||
client->ssl_ctx = NULL;
|
client->ssl_ctx = NULL;
|
||||||
@@ -215,52 +132,18 @@ Client* client_create() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool client_connect(Client* client, char* host, int port) {
|
bool client_connect(Client* client, char* host, int port) {
|
||||||
struct addrinfo hints, *res, *rp;
|
client->address.sin_port = htons(port);
|
||||||
memset(&hints, 0, sizeof(hints));
|
|
||||||
hints.ai_family = AF_UNSPEC;
|
|
||||||
hints.ai_socktype = SOCK_STREAM;
|
|
||||||
|
|
||||||
char port_str[16];
|
if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
|
||||||
snprintf(port_str, sizeof(port_str), "%d", port);
|
perror("Could not convert host address!");
|
||||||
|
|
||||||
int gai_err = getaddrinfo(host, port_str, &hints, &res);
|
|
||||||
if (gai_err != 0) {
|
|
||||||
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(gai_err));
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try IPv6 first, then IPv4
|
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
|
||||||
int fd = -1;
|
0) {
|
||||||
for (rp = res; rp != NULL; rp = rp->ai_next) {
|
|
||||||
fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
|
|
||||||
if (fd < 0)
|
|
||||||
continue;
|
|
||||||
if (!set_socket_timeouts(fd)) {
|
|
||||||
close(fd);
|
|
||||||
fd = -1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (connect(fd, rp->ai_addr, rp->ai_addrlen) == 0)
|
|
||||||
break;
|
|
||||||
close(fd);
|
|
||||||
fd = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fd < 0) {
|
|
||||||
perror("Could not connect to Server!");
|
perror("Could not connect to Server!");
|
||||||
freeaddrinfo(res);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save the connected address
|
|
||||||
memcpy(&client->address, rp->ai_addr, rp->ai_addrlen);
|
|
||||||
client->address_length = rp->ai_addrlen;
|
|
||||||
freeaddrinfo(res);
|
|
||||||
|
|
||||||
// Close old fd if any and set new one
|
|
||||||
if (client->file_descriptor >= 0)
|
|
||||||
close(client->file_descriptor);
|
|
||||||
client->file_descriptor = fd;
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -271,10 +154,7 @@ void client_disconnect(Client* client) {
|
|||||||
client->ssl = NULL;
|
client->ssl = NULL;
|
||||||
io_set_ssl(NULL);
|
io_set_ssl(NULL);
|
||||||
}
|
}
|
||||||
if (client->file_descriptor >= 0) {
|
close(client->file_descriptor);
|
||||||
close(client->file_descriptor);
|
|
||||||
client->file_descriptor = -1;
|
|
||||||
}
|
|
||||||
if (client->ssh_child_pid > 0) {
|
if (client->ssh_child_pid > 0) {
|
||||||
int status;
|
int status;
|
||||||
waitpid(client->ssh_child_pid, &status, 0);
|
waitpid(client->ssh_child_pid, &status, 0);
|
||||||
|
|||||||
@@ -1,21 +1,19 @@
|
|||||||
#ifndef TRANSPORT_TCP_H
|
#ifndef TRANSPORT_TCP_H
|
||||||
#define TRANSPORT_TCP_H
|
#define TRANSPORT_TCP_H
|
||||||
|
|
||||||
#include <netdb.h>
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
typedef struct Server {
|
typedef struct Server {
|
||||||
struct sockaddr_storage address;
|
struct sockaddr_in address;
|
||||||
unsigned int address_length;
|
unsigned int address_length;
|
||||||
int file_descriptor;
|
int file_descriptor;
|
||||||
void* ssl_ctx;
|
void* ssl_ctx;
|
||||||
} Server;
|
} Server;
|
||||||
|
|
||||||
typedef struct Client {
|
typedef struct Client {
|
||||||
struct sockaddr_storage address;
|
struct sockaddr_in address;
|
||||||
unsigned int address_length;
|
unsigned int address_length;
|
||||||
int file_descriptor;
|
int file_descriptor;
|
||||||
pid_t ssh_child_pid;
|
pid_t ssh_child_pid;
|
||||||
@@ -32,6 +30,5 @@ Client* client_create();
|
|||||||
bool client_connect(Client* client, char* host, int port);
|
bool client_connect(Client* client, char* host, int port);
|
||||||
void client_disconnect(Client* client);
|
void client_disconnect(Client* client);
|
||||||
void client_delete(Client* client);
|
void client_delete(Client* client);
|
||||||
bool set_socket_timeouts(int fd);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+10
-23
@@ -5,8 +5,6 @@
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#include <openssl/x509.h>
|
|
||||||
#include <openssl/x509v3.h>
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -34,7 +32,7 @@ static void log_ssl_errors(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static SSL_CTX* create_ssl_ctx(bool is_server, const char* cert, const char* key,
|
static SSL_CTX* create_ssl_ctx(bool is_server, const char* cert, const char* key,
|
||||||
const char* ca_path) {
|
const char* ca_path) {
|
||||||
const SSL_METHOD* method = is_server ? TLS_server_method() : TLS_client_method();
|
const SSL_METHOD* method = is_server ? TLS_server_method() : TLS_client_method();
|
||||||
SSL_CTX* ctx = SSL_CTX_new(method);
|
SSL_CTX* ctx = SSL_CTX_new(method);
|
||||||
if (!ctx) {
|
if (!ctx) {
|
||||||
@@ -74,12 +72,6 @@ static SSL_CTX* create_ssl_ctx(bool is_server, const char* cert, const char* key
|
|||||||
}
|
}
|
||||||
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
|
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
|
||||||
SSL_CTX_set_verify_depth(ctx, 4);
|
SSL_CTX_set_verify_depth(ctx, 4);
|
||||||
} else {
|
|
||||||
if (!is_server) {
|
|
||||||
log_message(LOG_LEVEL_WARNING,
|
|
||||||
"No CA path provided — TLS server certificate will not be verified");
|
|
||||||
}
|
|
||||||
SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ctx;
|
return ctx;
|
||||||
@@ -92,7 +84,6 @@ static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
SSL_set_fd(ssl, fd);
|
SSL_set_fd(ssl, fd);
|
||||||
|
|
||||||
int ret;
|
int ret;
|
||||||
if (is_server)
|
if (is_server)
|
||||||
ret = SSL_accept(ssl);
|
ret = SSL_accept(ssl);
|
||||||
@@ -105,17 +96,6 @@ static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server) {
|
|||||||
SSL_free(ssl);
|
SSL_free(ssl);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// In client mode, check verification result if peer verification was requested
|
|
||||||
if (!is_server) {
|
|
||||||
long verify_result = SSL_get_verify_result(ssl);
|
|
||||||
if (verify_result != X509_V_OK) {
|
|
||||||
log_message(LOG_LEVEL_ERROR, "TLS certificate verification failed: %ld", verify_result);
|
|
||||||
SSL_free(ssl);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ssl;
|
return ssl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,9 +133,16 @@ bool server_listen_tls(Server* server, void (*handler)(int file_descriptor)) {
|
|||||||
|
|
||||||
bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
|
bool client_connect_tls(Client* client, char* host, int port, const char* cert_path,
|
||||||
const char* key_path, const char* ca_path) {
|
const char* key_path, const char* ca_path) {
|
||||||
// Use the common TCP connection logic (with IPv6 support)
|
client->address.sin_port = htons(port);
|
||||||
if (!client_connect(client, host, port))
|
if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
|
||||||
|
perror("Could not convert host address!");
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
|
||||||
|
0) {
|
||||||
|
perror("Could not connect to Server!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
SSL_CTX* ctx = create_ssl_ctx(false, cert_path, key_path, ca_path);
|
SSL_CTX* ctx = create_ssl_ctx(false, cert_path, key_path, ca_path);
|
||||||
if (!ctx)
|
if (!ctx)
|
||||||
|
|||||||
+11
-20
@@ -10,23 +10,19 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
bool mkdir_r(const char* path) {
|
bool mkdir_r(const char* path) {
|
||||||
size_t path_len = strlen(path);
|
char* path_duplicate = malloc(strlen(path) + 1);
|
||||||
char* path_duplicate = malloc(path_len + 1);
|
|
||||||
if (!path_duplicate)
|
if (!path_duplicate)
|
||||||
return false;
|
return false;
|
||||||
memcpy(path_duplicate, path, path_len + 1);
|
strcpy(path_duplicate, path);
|
||||||
/* Buffer for building subpaths: path_len + 1 for leading '/' + 1 for null */
|
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char));
|
||||||
size_t buf_size = path_len + 2;
|
|
||||||
char* path_current = (char*)malloc(buf_size);
|
|
||||||
if (!path_current) {
|
if (!path_current) {
|
||||||
free(path_duplicate);
|
free(path_duplicate);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
size_t pos = 0;
|
char* path_current_position = path_current;
|
||||||
if (path[0] == '/') {
|
if (path[0] == '/') {
|
||||||
path_current[0] = '/';
|
strcpy(path_current, "/");
|
||||||
path_current[1] = '\0';
|
path_current_position += 1;
|
||||||
pos = 1;
|
|
||||||
} else {
|
} else {
|
||||||
path_current[0] = '\0';
|
path_current[0] = '\0';
|
||||||
}
|
}
|
||||||
@@ -35,16 +31,10 @@ bool mkdir_r(const char* path) {
|
|||||||
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
const char* part = strtok_r(path_duplicate, delimiter, &saveptr);
|
||||||
bool ok = true;
|
bool ok = true;
|
||||||
while (part != NULL) {
|
while (part != NULL) {
|
||||||
size_t part_len = strlen(part);
|
strcpy(path_current_position, part);
|
||||||
if (pos + part_len + 1 >= buf_size) {
|
path_current_position += strlen(part) * sizeof(char);
|
||||||
ok = false;
|
strcpy(path_current_position, "/");
|
||||||
break;
|
path_current_position += sizeof(char);
|
||||||
}
|
|
||||||
memcpy(path_current + pos, part, part_len);
|
|
||||||
pos += part_len;
|
|
||||||
path_current[pos] = '/';
|
|
||||||
pos++;
|
|
||||||
path_current[pos] = '\0';
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(path_current, &st) != 0) {
|
if (stat(path_current, &st) != 0) {
|
||||||
if (mkdir(path_current, 0755) != 0) {
|
if (mkdir(path_current, 0755) != 0) {
|
||||||
@@ -59,6 +49,7 @@ bool mkdir_r(const char* path) {
|
|||||||
free(path_current);
|
free(path_current);
|
||||||
return ok;
|
return ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* str_dup(const char* string) {
|
char* str_dup(const char* string) {
|
||||||
if (string == NULL)
|
if (string == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
@@ -5,8 +5,11 @@
|
|||||||
#include "test_data.h"
|
#include "test_data.h"
|
||||||
#include "test_delta.h"
|
#include "test_delta.h"
|
||||||
#include "test_file.h"
|
#include "test_file.h"
|
||||||
|
#include "test_file_sendfile.h"
|
||||||
#include "test_glob.h"
|
#include "test_glob.h"
|
||||||
|
#include "test_log.h"
|
||||||
#include "test_metadata.h"
|
#include "test_metadata.h"
|
||||||
|
#include "test_multiprocessing.h"
|
||||||
#include "test_property.h"
|
#include "test_property.h"
|
||||||
#include "test_protocol.h"
|
#include "test_protocol.h"
|
||||||
#include "test_queue.h"
|
#include "test_queue.h"
|
||||||
@@ -14,6 +17,9 @@
|
|||||||
#include "test_scanner.h"
|
#include "test_scanner.h"
|
||||||
#include "test_shared_utils.h"
|
#include "test_shared_utils.h"
|
||||||
#include "test_stress.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 "test_utils.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
@@ -38,6 +44,12 @@ int main() {
|
|||||||
RUN_TEST(test_metadata);
|
RUN_TEST(test_metadata);
|
||||||
RUN_TEST(test_glob);
|
RUN_TEST(test_glob);
|
||||||
RUN_TEST(test_file);
|
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_robustness);
|
||||||
RUN_TEST(test_stress);
|
RUN_TEST(test_stress);
|
||||||
RUN_TEST(test_property);
|
RUN_TEST(test_property);
|
||||||
|
|||||||
@@ -23,14 +23,6 @@ static void test_data_create_empty() {
|
|||||||
data_destroy(d);
|
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() {
|
static void test_data_create_reserve() {
|
||||||
Data* d = data_create_reserve(1024);
|
Data* d = data_create_reserve(1024);
|
||||||
EXPECT_NOT_NULL(d);
|
EXPECT_NOT_NULL(d);
|
||||||
@@ -52,7 +44,6 @@ static void test_data_destroy_normal() {
|
|||||||
void test_data() {
|
void test_data() {
|
||||||
test_data_create();
|
test_data_create();
|
||||||
test_data_create_empty();
|
test_data_create_empty();
|
||||||
test_data_create_empty_zero();
|
|
||||||
test_data_create_reserve();
|
test_data_create_reserve();
|
||||||
test_data_destroy_null();
|
test_data_destroy_null();
|
||||||
test_data_destroy_normal();
|
test_data_destroy_normal();
|
||||||
|
|||||||
+2
-3
@@ -217,10 +217,9 @@ static void test_file_send_no_path() {
|
|||||||
pid_t pid = fork();
|
pid_t pid = fork();
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
close(p[1]);
|
close(p[1]);
|
||||||
// Read file type indicator
|
|
||||||
int file_type;
|
int file_type;
|
||||||
EXPECT_TRUE(receive_int(p[0], &file_type));
|
EXPECT_TRUE(receive_int(p[0], &file_type));
|
||||||
EXPECT_EQ_INT(file_type, (int)FILE_TYPE_REGULAR);
|
EXPECT_EQ_INT(file_type, 0); /* FILE_TYPE_REGULAR */
|
||||||
Data* received = receive_data(p[0]);
|
Data* received = receive_data(p[0]);
|
||||||
close(p[0]);
|
close(p[0]);
|
||||||
|
|
||||||
@@ -275,7 +274,7 @@ void test_file() {
|
|||||||
test_to_disk_basic();
|
test_to_disk_basic();
|
||||||
test_to_disk_creates_dirs();
|
test_to_disk_creates_dirs();
|
||||||
test_file_content_to_buffer();
|
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
|
// Fork tests are skipped under valgrind because the parent process runs
|
||||||
// orders of magnitude slower than the child (parent is instrumented, child
|
// orders of magnitude slower than the child (parent is instrumented, child
|
||||||
// is not), which causes pipe-based protocol handshake timeouts. The parent
|
// 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, ""));
|
EXPECT_TRUE(send_str(0, ""));
|
||||||
|
|
||||||
|
/* cppcheck-suppress constVariablePointer */
|
||||||
char* received = receive_str(0);
|
char* received = receive_str(0);
|
||||||
EXPECT_NOT_NULL(received);
|
EXPECT_NOT_NULL(received);
|
||||||
EXPECT_EQ_STR(received, "");
|
EXPECT_EQ_STR(received, "");
|
||||||
@@ -63,6 +64,7 @@ static void test_send_receive_str_normal() {
|
|||||||
|
|
||||||
EXPECT_TRUE(send_str(0, "Hello, Protocol!"));
|
EXPECT_TRUE(send_str(0, "Hello, Protocol!"));
|
||||||
|
|
||||||
|
/* cppcheck-suppress constVariablePointer */
|
||||||
char* received = receive_str(0);
|
char* received = receive_str(0);
|
||||||
EXPECT_NOT_NULL(received);
|
EXPECT_NOT_NULL(received);
|
||||||
EXPECT_EQ_STR(received, "Hello, Protocol!");
|
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_fds(p[0], p[1]);
|
||||||
io_set_bwlimit(0);
|
io_set_bwlimit(0);
|
||||||
|
|
||||||
|
/* cppcheck-suppress constVariablePointer */
|
||||||
unsigned char bin[] = {0xDE, 0xAD, 0xBE, 0xEF, 0x00, 0xFF};
|
unsigned char bin[] = {0xDE, 0xAD, 0xBE, 0xEF, 0x00, 0xFF};
|
||||||
void* buf = malloc(sizeof(bin));
|
void* buf = malloc(sizeof(bin));
|
||||||
EXPECT_NOT_NULL(buf);
|
EXPECT_NOT_NULL(buf);
|
||||||
@@ -128,6 +131,7 @@ static void test_send_receive_status() {
|
|||||||
io_set_fds(p[0], p[1]);
|
io_set_fds(p[0], p[1]);
|
||||||
io_set_bwlimit(0);
|
io_set_bwlimit(0);
|
||||||
|
|
||||||
|
/* cppcheck-suppress constVariablePointer */
|
||||||
Status statuses[] = {STATUS_OK, STATUS_ERROR, STATUS_FINISHED, STATUS_NEXT,
|
Status statuses[] = {STATUS_OK, STATUS_ERROR, STATUS_FINISHED, STATUS_NEXT,
|
||||||
STATUS_CHUNK, STATUS_CHECK, STATUS_DELTA_SIGNATURE, STATUS_DELTA_DATA};
|
STATUS_CHUNK, STATUS_CHECK, STATUS_DELTA_SIGNATURE, STATUS_DELTA_DATA};
|
||||||
int count = sizeof(statuses) / sizeof(statuses[0]);
|
int count = sizeof(statuses) / sizeof(statuses[0]);
|
||||||
@@ -169,23 +173,6 @@ static void test_receive_str_truncated() {
|
|||||||
close(p[0]);
|
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() {
|
void test_protocol() {
|
||||||
test_send_receive_n_data();
|
test_send_receive_n_data();
|
||||||
test_send_receive_n_data_zero();
|
test_send_receive_n_data_zero();
|
||||||
@@ -196,5 +183,4 @@ void test_protocol() {
|
|||||||
test_send_receive_status();
|
test_send_receive_status();
|
||||||
test_receive_n_data_truncated();
|
test_receive_n_data_truncated();
|
||||||
test_receive_str_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* file1 = "test_scan_dir_single/file1.txt";
|
||||||
const char* content1 = "hello scanner";
|
const char* content1 = "hello scanner";
|
||||||
|
|
||||||
mkdir(dir, 0755);
|
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||||
create_test_file(file1, content1);
|
create_test_file(file1, content1);
|
||||||
|
|
||||||
DirectoryScanner* scanner =
|
DirectoryScanner* scanner =
|
||||||
@@ -43,7 +43,7 @@ static void test_scanner_multiple_files() {
|
|||||||
const char* content1 = "alpha";
|
const char* content1 = "alpha";
|
||||||
const char* content2 = "beta";
|
const char* content2 = "beta";
|
||||||
|
|
||||||
mkdir(dir, 0755);
|
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||||
create_test_file(file1, content1);
|
create_test_file(file1, content1);
|
||||||
create_test_file(file2, content2);
|
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* sub_file = "test_scan_sub/sub/sub_file.txt";
|
||||||
const char* content = "nested content";
|
const char* content = "nested content";
|
||||||
|
|
||||||
mkdir(root, 0755);
|
EXPECT_EQ_INT(mkdir(root, 0755), 0);
|
||||||
mkdir(sub, 0755);
|
EXPECT_EQ_INT(mkdir(sub, 0755), 0);
|
||||||
create_test_file(root_file, content);
|
create_test_file(root_file, content);
|
||||||
create_test_file(sub_file, content);
|
create_test_file(sub_file, content);
|
||||||
|
|
||||||
@@ -109,7 +109,7 @@ static void test_scanner_subdirectory() {
|
|||||||
static void test_scanner_empty_directory() {
|
static void test_scanner_empty_directory() {
|
||||||
const char* dir = "test_scan_empty";
|
const char* dir = "test_scan_empty";
|
||||||
|
|
||||||
mkdir(dir, 0755);
|
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
|
||||||
|
|
||||||
DirectoryScanner* scanner =
|
DirectoryScanner* scanner =
|
||||||
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0);
|
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);
|
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() {
|
void test_scanner() {
|
||||||
test_scanner_single_file();
|
test_scanner_single_file();
|
||||||
test_scanner_multiple_files();
|
test_scanner_multiple_files();
|
||||||
test_scanner_subdirectory();
|
test_scanner_subdirectory();
|
||||||
test_scanner_empty_directory();
|
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
|
#define TEST_UTILS_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdbool.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
|
// Global test suite status
|
||||||
extern int tests_run;
|
extern int tests_run;
|
||||||
extern int tests_failed;
|
extern int tests_failed;
|
||||||
|
|||||||
Reference in New Issue
Block a user