From 965c1c790b6d0a213278422b6b897b97cc16793b Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 17 Apr 2022 17:09:22 +0200 Subject: [PATCH] Use new dragonnet (fixes IPv4/IPv6 problems) --- deps/dragonnet | 2 +- src/client/client.c | 4 +--- src/server/server.c | 4 +--- src/server/server_player.c | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deps/dragonnet b/deps/dragonnet index c346a21..eb33e93 160000 --- a/deps/dragonnet +++ b/deps/dragonnet @@ -1 +1 @@ -Subproject commit c346a21deaf3aec0983d0e740d6c0b6799f076ef +Subproject commit eb33e93d3af69b098141558d47ab042acf791a1d diff --git a/src/client/client.c b/src/client/client.c index c0160d0..5393922 100644 --- a/src/client/client.c +++ b/src/client/client.c @@ -130,9 +130,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - char *address = dragonnet_addr_str(client->raddr); - printf("[access] connected to %s\n", address); - free(address); + printf("[access] connected to %s\n", client->address); client->on_disconnect = &on_disconnect; client->on_recv = (void *) &on_recv; diff --git a/src/server/server.c b/src/server/server.c index aaaba08..0cbaed3 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -60,9 +60,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - char *address = dragonnet_addr_str(server->laddr); - printf("[info] listening on %s\n", address); - free(address); + printf("[info] listening on %s\n", server->address); server->on_connect = &server_player_add; server->on_disconnect = &server_player_remove; diff --git a/src/server/server_player.c b/src/server/server_player.c index 530e9ef..61b666c 100644 --- a/src/server/server_player.c +++ b/src/server/server_player.c @@ -163,7 +163,7 @@ void server_player_add(DragonnetPeer *peer) player->auth = false; // use address as name until auth is done - player->name = dragonnet_addr_str(peer->raddr); + player->name = strdup(peer->address); pthread_rwlock_init(&player->lock_auth, NULL); player->pos = (v3f64) {0.0f, 0.0f, 0.0f}; -- 2.44.0