Merge branch 'main' into metadata-transfer, resolve conflicts

Conflicts resolved:
- config_create signature: added both use_metadata and use_sendfile params
- config_send/config_receive: wire protocol includes both use_metadata and use_sendfile
- client.c: config_create call updated, arg parsing includes both -M/--preserve and -f/--sendfile
- test_config.c: all three config_create calls updated
- file_send_sendfile: use file->data->size instead of removed struct stat
This commit is contained in:
2026-07-05 20:29:04 +02:00
9 changed files with 383 additions and 65 deletions
+5 -2
View File
@@ -7,8 +7,8 @@
Config *config_create(char *version, char *send_directory,
char *receive_directory, bool save_to_disk,
bool use_multithreading, bool use_chunk_serialization,
bool use_compression, bool use_metadata,
int compression_level, int num_connections) {
bool use_compression, bool use_metadata,
int compression_level, int num_connections, bool use_sendfile) {
Config *config = malloc(sizeof(Config));
config->version = version;
@@ -21,6 +21,7 @@ Config *config_create(char *version, char *send_directory,
config->use_metadata = use_metadata;
config->compression_level = compression_level;
config->num_connections = num_connections;
config->use_sendfile = use_sendfile;
return config;
}
@@ -42,6 +43,7 @@ void config_send(int file_descriptor, Config *config) {
send_int(file_descriptor, config->use_metadata);
send_int(file_descriptor, config->compression_level);
send_int(file_descriptor, config->num_connections);
send_int(file_descriptor, config->use_sendfile);
if (receive_status(file_descriptor) != STATUS_OK) {
perror("Error transmitting config!");
exit(EXIT_FAILURE);
@@ -60,6 +62,7 @@ Config *config_receive(int file_descriptor) {
config->use_metadata = receive_int(file_descriptor);
config->compression_level = receive_int(file_descriptor);
config->num_connections = receive_int(file_descriptor);
config->use_sendfile = receive_int(file_descriptor);
send_status(file_descriptor, STATUS_OK);
return config;
}