lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add union for sock addr

Browse Source
This commit is contained in:
Lorenz Stechauner
2022-12-15 10:26:28 +01:00
parent fabb55d94b
commit 1f20c70772
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.c
View File

@ -755,7 +755,7 @@ int client_connection_handler(client_ctx_t *ctx, sock *client, unsigned long cli
ctx->cc[0] = 0; ctx->cc[0] = 0;
ctx->geoip[0] = 0; ctx->geoip[0] = 0;
geoip_lookup_country((struct sockaddr *) &client->addr, ctx->cc); geoip_lookup_country(&client->addr.sock, ctx->cc);
info("Connection accepted from %s %s%s%s[%s]", ctx->addr, ctx->host[0] != 0 ? "(" : "", info("Connection accepted from %s %s%s%s[%s]", ctx->addr, ctx->host[0] != 0 ? "(" : "",
ctx->host[0] != 0 ? ctx->host : "", ctx->host[0] != 0 ? ") " : "", ctx->host[0] != 0 ? ctx->host : "", ctx->host[0] != 0 ? ") " : "",
@ -819,7 +819,7 @@ int client_handler(sock *client, unsigned long client_num) {
signal(SIGINT, client_terminate); signal(SIGINT, client_terminate);
signal(SIGTERM, client_terminate); signal(SIGTERM, client_terminate);
inet_ntop(client->addr.sin6_family, (void *) &client->addr.sin6_addr, ctx._c_addr, sizeof(ctx._c_addr)); inet_ntop(client->addr.ipv6.sin6_family, &client->addr.ipv6.sin6_addr, ctx._c_addr, sizeof(ctx._c_addr));
if (strncmp(ctx._c_addr, "::ffff:", 7) == 0) { if (strncmp(ctx._c_addr, "::ffff:", 7) == 0) {
ctx.addr = ctx._c_addr + 7; ctx.addr = ctx._c_addr + 7;
} else { } else {
@ -838,7 +838,7 @@ int client_handler(sock *client, unsigned long client_num) {
sprintf(log_client_prefix, "[%s%4i%s]%s[%*s][%5i]%s", (int) client->enc ? HTTPS_STR : HTTP_STR, sprintf(log_client_prefix, "[%s%4i%s]%s[%*s][%5i]%s", (int) client->enc ? HTTPS_STR : HTTP_STR,
ntohs(server_addr->sin6_port), CLR_STR, color_table[client_num % 6], INET6_ADDRSTRLEN, ctx.addr, ntohs(server_addr->sin6_port), CLR_STR, color_table[client_num % 6], INET6_ADDRSTRLEN, ctx.addr,
ntohs(client->addr.sin6_port), CLR_STR); ntohs(client->addr.ipv6.sin6_port), CLR_STR);
sprintf(log_conn_prefix, "[%6i][%*s]%s", getpid(), INET6_ADDRSTRLEN, ctx.s_addr, log_client_prefix); sprintf(log_conn_prefix, "[%6i][%*s]%s", getpid(), INET6_ADDRSTRLEN, ctx.s_addr, log_client_prefix);
logger_set_prefix(log_conn_prefix); logger_set_prefix(log_conn_prefix);

5
src/lib/sock.h
View File

@ -16,7 +16,10 @@
typedef struct { typedef struct {
unsigned int enc:1; unsigned int enc:1;
int socket; int socket;
struct sockaddr_in6 addr; union {
struct sockaddr sock;
struct sockaddr_in6 ipv6;
} addr;
SSL_CTX *ctx; SSL_CTX *ctx;
SSL *ssl; SSL *ssl;
long _last_ret; long _last_ret;

2
src/server.c
View File

@ -321,7 +321,7 @@ int main(int argc, const char *argv[]) {
for (int i = 0; i < NUM_SOCKETS; i++) { for (int i = 0; i < NUM_SOCKETS; i++) {
if (poll_fds[i].revents & POLLIN) { if (poll_fds[i].revents & POLLIN) {
socklen_t addr_len = sizeof(client.addr); socklen_t addr_len = sizeof(client.addr);
client_fd = accept(sockets[i], (struct sockaddr *) &client.addr, &addr_len); client_fd = accept(sockets[i], &client.addr.sock, &addr_len);
if (client_fd < 0) { if (client_fd < 0) {
critical("Unable to accept connection"); critical("Unable to accept connection");
continue; continue;