From 20409dca4f6b55c3cbbc76e8b80851ea821cd4a8 Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Wed, 31 Mar 2010 09:21:39 +0000 Subject: [PATCH] coverity fixes, test case tweak --- src/dv/dv_api.c | 7 +++++-- src/dv/gnunet-service-dv.c | 13 ++++++++----- src/dv/test_transport_api_data.conf | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index ace020c3e..7b1a4f0cf 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c @@ -22,7 +22,7 @@ * @file dv/dv_api.c * @brief library to access the DV service * @author Christian Grothoff - * @author Not Nathan Evans + * @author Nathan Evans */ #include "platform.h" #include "gnunet_bandwidth_lib.h" @@ -379,7 +379,10 @@ GNUNET_DV_connect (struct GNUNET_SCHEDULER_Handle *sched, handle->receive_cls = receive_handler_cls; if (handle->client == NULL) - return NULL; + { + GNUNET_free(handle); + return NULL; + } GNUNET_CLIENT_receive (handle->client, &handle_message_receipt, diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 0a63276f1..21e2e6657 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -714,9 +714,11 @@ neighbor_send_task (void *cls, encPeerAbout = GNUNET_strdup(GNUNET_i2s(&about->identity)); encPeerTo = GNUNET_strdup(GNUNET_i2s(&to->identity)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Sending info about peer %s to directly connected peer %s\n", - GNUNET_i2s(&my_identity), - encPeerAbout, encPeerTo); + "%s: Sending info about peer %s to directly connected peer %s\n", + GNUNET_i2s(&my_identity), + encPeerAbout, encPeerTo); + GNUNET_free(encPeerAbout); + GNUNET_free(encPeerTo); #endif pending_message = GNUNET_malloc(sizeof(struct PendingMessage)); pending_message->msg = GNUNET_malloc(sizeof(p2p_dv_MESSAGE_NeighborInfo)); @@ -968,6 +970,7 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, if (cost > ctx.fisheye_depth) { /* too costly */ + GNUNET_free(neighbor_update); return; } if (ctx.max_table_size <= @@ -978,6 +981,7 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, if (cost > max->cost) { /* new entry most expensive, don't create */ + GNUNET_free(neighbor_update); return; } if (max->cost > 0) @@ -1008,10 +1012,9 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, GNUNET_CONTAINER_multihashmap_put (ctx.extended_neighbors, &peer->hashPubKey, neighbor, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); - - return; } + GNUNET_free(neighbor_update); /* Old logic to remove entry and replace, not needed now as we only want to remove when full * or when the referring peer disconnects from us. */ diff --git a/src/dv/test_transport_api_data.conf b/src/dv/test_transport_api_data.conf index 0a5c8f02e..e36fa6455 100644 --- a/src/dv/test_transport_api_data.conf +++ b/src/dv/test_transport_api_data.conf @@ -2,7 +2,7 @@ SERVICEHOME = /tmp/test-transport-api/ DEFAULTCONFIG = test_transport_api_data.conf -[transport-udp] +[transport-tcp] PORT = 2094 [fs] @@ -64,7 +64,7 @@ HOSTNAME = localhost PORT = 2092 [transport] -plugins = udp +plugins = tcp DEBUG = NO PREFIX = ALLOW_SHUTDOWN = YES -- 2.25.1