From 5268f248c91fb03f2de2a942a1eb1f171be96123 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 8 Mar 2012 01:47:34 +0100 Subject: New and improved handshake --- src/method_null.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/method_null.c') diff --git a/src/method_null.c b/src/method_null.c index 8c144e8..62be501 100644 --- a/src/method_null.c +++ b/src/method_null.c @@ -51,20 +51,24 @@ static char* null_peer_str(const fastd_context *ctx, const fastd_peer *peer) { char addr_buf[INET6_ADDRSTRLEN] = ""; char *ret; + const char *temp = fastd_peer_is_temporary(peer) ? " (temporary)" : ""; + switch (peer->address.sa.sa_family) { case AF_UNSPEC: - return strdup(""); + if (asprintf(&ret, "%s", temp) > 0) + return ret; + break; case AF_INET: if (inet_ntop(AF_INET, &peer->address.in.sin_addr, addr_buf, sizeof(addr_buf))) { - if (asprintf(&ret, "%s:%u", addr_buf, ntohs(peer->address.in.sin_port)) > 0) + if (asprintf(&ret, "%s:%u%s", addr_buf, ntohs(peer->address.in.sin_port), temp) > 0) return ret; } break; case AF_INET6: if (inet_ntop(AF_INET6, &peer->address.in6.sin6_addr, addr_buf, sizeof(addr_buf))) { - if (asprintf(&ret, "[%s]:%u", addr_buf, ntohs(peer->address.in6.sin6_port)) > 0) + if (asprintf(&ret, "[%s]:%u%s", addr_buf, ntohs(peer->address.in6.sin6_port), temp) > 0) return ret; } break; @@ -82,7 +86,6 @@ static void null_init(fastd_context *ctx, fastd_peer *peer) { static void null_handle_recv(fastd_context *ctx, fastd_peer *peer, fastd_buffer buffer) { if (!fastd_peer_is_established(peer)) { - pr_info(ctx, "Connection established."); fastd_peer_set_established(ctx, peer); } -- cgit v1.2.3