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/transport_tcp.c
+32 -152
View File
@@ -2,64 +2,29 @@
#include "log.h"
#include "protocol.h"
#include <arpa/inet.h>
#include <netdb.h>
#include <openssl/ssl.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/wait.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 = (Server*)malloc(sizeof(Server));
if (server == NULL) {
perror("Could not allocate space for Server");
return NULL;
}
memset(&server->address, 0, sizeof(server->address));
// Try IPv6 first, fall back to IPv4
int fd = socket(AF_INET6, SOCK_STREAM, 0);
if (fd < 0) {
fd = socket(AF_INET, SOCK_STREAM, 0);
}
if (fd < 0) {
int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
if (file_descriptor < 0) {
perror("Could not create Socket!");
free(server);
return NULL;
}
if (!set_socket_timeouts(fd)) {
close(fd);
free(server);
return NULL;
}
server->file_descriptor = fd;
server->file_descriptor = file_descriptor;
int opt = 1;
if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) {
perror("Error setting a socket option!");
@@ -68,63 +33,18 @@ Server* server_create(int port) {
return NULL;
}
// Determine address family from the actual socket
struct sockaddr_storage* addr = &server->address;
socklen_t addr_len = sizeof(*addr);
if (getsockname(fd, (struct sockaddr*)addr, &addr_len) == 0) {
// Use the family of the socket we actually created
}
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);
}
server->address.sin_family = AF_INET;
server->address.sin_addr.s_addr = INADDR_ANY;
server->address.sin_port = htons(port);
server->address_length = sizeof(server->address);
server->ssl_ctx = NULL;
if (bind(server->file_descriptor, (struct sockaddr*)&server->address, server->address_length) <
0) {
// If IPv6 bind failed (maybe no IPv6), try IPv4
if (addr->ss_family == AF_INET6) {
close(fd);
fd = socket(AF_INET, SOCK_STREAM, 0);
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;
}
perror("Could not bind server");
close(server->file_descriptor);
free(server);
return NULL;
}
return server;
@@ -150,14 +70,13 @@ static void accept_loop(Server* server, void (*child_fn)(int, void*), void* chil
}
signal(SIGCHLD, SIG_IGN);
while (1) {
struct sockaddr_storage client_addr;
struct sockaddr_in client_addr;
socklen_t client_len = sizeof(client_addr);
int fd = accept(server->file_descriptor, (struct sockaddr*)&client_addr, &client_len);
if (fd < 0) {
perror("Could not accept the connection");
continue;
}
set_socket_timeouts(fd);
log_message(LOG_LEVEL_INFO, "%s", log_fmt);
pid_t pid = fork();
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)) {
struct sockaddr_in* addr4 = (struct sockaddr_in*)&server->address;
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);
log_message(LOG_LEVEL_INFO, "Start Listening on Port: %d", ntohs(server->address.sin_port));
struct plain_ctx ctx = {handler};
accept_loop(server, plain_child_fn, &ctx, "Received Connection");
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,
const char* log_fmt) {
struct sockaddr_in* addr4 = (struct sockaddr_in*)&server->address;
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);
log_message(LOG_LEVEL_INFO, "Start TLS Listening on Port: %d", ntohs(server->address.sin_port));
accept_loop(server, child_fn, child_ctx, log_fmt);
}
Client* client_create() {
Client* client = (Client*)malloc(sizeof(Client));
if (client == NULL) {
int file_descriptor = socket(AF_INET, SOCK_STREAM, 0);
if (file_descriptor < 0) {
perror("Could not create Socket!");
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->file_descriptor = -1;
client->ssh_child_pid = -1;
client->ssl = NULL;
client->ssl_ctx = NULL;
@@ -215,52 +132,18 @@ Client* client_create() {
}
bool client_connect(Client* client, char* host, int port) {
struct addrinfo hints, *res, *rp;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
client->address.sin_port = htons(port);
char port_str[16];
snprintf(port_str, sizeof(port_str), "%d", port);
int gai_err = getaddrinfo(host, port_str, &hints, &res);
if (gai_err != 0) {
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(gai_err));
if (inet_pton(AF_INET, host, &client->address.sin_addr) <= 0) {
perror("Could not convert host address!");
return false;
}
// Try IPv6 first, then IPv4
int fd = -1;
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) {
if (connect(client->file_descriptor, (struct sockaddr*)&client->address, client->address_length) <
0) {
perror("Could not connect to Server!");
freeaddrinfo(res);
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;
}
@@ -271,10 +154,7 @@ void client_disconnect(Client* client) {
client->ssl = NULL;
io_set_ssl(NULL);
}
if (client->file_descriptor >= 0) {
close(client->file_descriptor);
client->file_descriptor = -1;
}
close(client->file_descriptor);
if (client->ssh_child_pid > 0) {
int status;
waitpid(client->ssh_child_pid, &status, 0);