Use new dragonnet (fixes IPv4/IPv6 problems)

diff --git a/deps/dragonnet b/deps/dragonnet
index c346a21deaf3aec0983d0e740d6c0b6799f076ef..eb33e93d3af69b098141558d47ab042acf791a1d 160000 (submodule)
--- 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 c0160d083669113be1fbd6ff0b5e61d97a8d5db0..539392297f3a48dec947b1fcb55b08fb6582dc21 100644 (file)
--- 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 aaaba088d8470ade5e5fc42646b2b27550073fe2..0cbaed38d8df73a6128db24839866407f21ee763 100644 (file)
--- 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 530e9efa4c5c495eac67f210b05329b5f71d36fa..61b666c4728e6094119c44bbfc0ac38223db1e4d 100644 (file)
--- 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};