TapTap/FastSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request 'Features and enhancements (#70, #36, #34, #33, #32, #57, #40, #37)' (#84) from fix/enhancements into main"

Browse Source 
This reverts commit 8f25f6a6b6, reversing
changes made to 12ca4b13c8.
This commit is contained in:
TapTap
2026-07-20 19:36:09 +02:00
parent 2f9a4fac78
commit e3484939b6
13 changed files with 62 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/config.c
-86
View File
@@ -45,8 +45,6 @@ Config* config_create(char* version, char* send_directory, char* receive_directo
config->tls_cert = NULL;
config->tls_key = NULL;
config->tls_ca = NULL;
config->follow_symlinks = false;
config->partial = false;
config->server_host = str_dup("127.0.0.1");
config->server_port = 8080;
return config;
@@ -129,26 +127,6 @@ bool config_send(int file_descriptor, const Config* config) {
return false;
if (!send_n_data(file_descriptor, &config->delta_max_file_size, sizeof(unsigned long long)))
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;
if (!receive_status(file_descriptor, &status))
return false;
@@ -243,70 +221,6 @@ Config* config_receive(int file_descriptor) {
config->tls_cert = NULL;
config->tls_key = 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_port = 8080;
if (!send_status(file_descriptor, STATUS_OK))