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

Revert "Merge pull request 'Fix integration issues: ssl_ctx init + test API updates' (#85) from fix/integration-cleanup into main"

Browse Source 
This reverts commit e1f9ba090f, reversing
changes made to 8f25f6a6b6.
This commit is contained in:
TapTap
2026-07-20 19:36:09 +02:00
parent e1f9ba090f
commit 2f9a4fac78
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/transport_tcp.c
-1
View File
@@ -41,7 +41,6 @@ Server* server_create(int port) {
return NULL; return NULL;
} }
memset(&server->address, 0, sizeof(server->address)); memset(&server->address, 0, sizeof(server->address));
server->ssl_ctx = NULL;
// Try IPv6 first, fall back to IPv4 // Try IPv6 first, fall back to IPv4
int fd = socket(AF_INET6, SOCK_STREAM, 0); int fd = socket(AF_INET6, SOCK_STREAM, 0);
tests/test_file_sendfile.c
+2 -4
View File
@@ -224,10 +224,8 @@ static void test_sendfile_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 */ /* When send_path is false, the sender sends raw data (size + bytes) only.
int file_type; * We need to receive just the Data, not a File. */
EXPECT_TRUE(receive_int(p[0], &file_type));
EXPECT_EQ_INT(file_type, (int)FILE_TYPE_REGULAR);
Data* received = receive_data(p[0]); Data* received = receive_data(p[0]);
close(p[0]); close(p[0]);
tests/test_transport_tcp.c
+6 -5
View File
@@ -8,8 +8,8 @@
static void test_client_create_delete() { static void test_client_create_delete() {
Client* client = client_create(); Client* client = client_create();
EXPECT_NOT_NULL(client); EXPECT_NOT_NULL(client);
EXPECT_EQ_INT(client->file_descriptor, -1); EXPECT_TRUE(client->file_descriptor >= 0);
EXPECT_TRUE(client->address.ss_family == AF_UNSPEC); EXPECT_EQ_INT(client->address.sin_family, AF_INET);
EXPECT_EQ_INT(client->ssh_child_pid, -1); EXPECT_EQ_INT(client->ssh_child_pid, -1);
EXPECT_NULL(client->ssl); EXPECT_NULL(client->ssl);
EXPECT_NULL(client->ssl_ctx); EXPECT_NULL(client->ssl_ctx);
@@ -30,7 +30,7 @@ static void test_server_create_delete() {
Server* server = server_create(0); Server* server = server_create(0);
EXPECT_NOT_NULL(server); EXPECT_NOT_NULL(server);
EXPECT_TRUE(server->file_descriptor >= 0); EXPECT_TRUE(server->file_descriptor >= 0);
EXPECT_TRUE(server->address.ss_family == AF_INET || server->address.ss_family == AF_INET6); EXPECT_EQ_INT(server->address.sin_family, AF_INET);
EXPECT_NULL(server->ssl_ctx); EXPECT_NULL(server->ssl_ctx);
/* Clean up */ /* Clean up */
@@ -57,8 +57,9 @@ static void test_client_create_multiple() {
Client* c2 = client_create(); Client* c2 = client_create();
EXPECT_NOT_NULL(c1); EXPECT_NOT_NULL(c1);
EXPECT_NOT_NULL(c2); EXPECT_NOT_NULL(c2);
EXPECT_EQ_INT(c1->file_descriptor, -1); EXPECT_TRUE(c1->file_descriptor >= 0);
EXPECT_EQ_INT(c2->file_descriptor, -1); EXPECT_TRUE(c2->file_descriptor >= 0);
EXPECT_TRUE(c1->file_descriptor != c2->file_descriptor);
client_delete(c1); client_delete(c1);
client_delete(c2); client_delete(c2);