From: Nathan S. Evans <evans@in.tum.de>
Date: Fri, 2 Jul 2010 14:37:34 +0000 (+0000)
Subject: codesonar fix; config change
X-Git-Tag: initial-import-from-subversion-38251~21051
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6808383ffb5f49aedd72d4e1ff0cfb377bf86bdc;p=oweals%2Fgnunet.git

codesonar fix; config change
---

diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index d8714a841..4bb6555d3 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -2470,7 +2470,7 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct GNUNET_CRYPTO
                 }
             }
         }
-      if (cost != DIRECT_NEIGHBOR_COST)
+      if ((cost != DIRECT_NEIGHBOR_COST) && (neighbor->pkey != NULL))
         {
           /* Added neighbor, now send HELLO to transport */
           hello_context = GNUNET_malloc(sizeof(struct HelloContext));
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 8cb1ffb06..2c6837d63 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -10,12 +10,7 @@ DEBUG = YES
 PORT = 2565
 PLUGINS = tcp dv
 BLACKLIST_FILE = $SERVICEHOME/blacklist
-#PREFIX = xterm -hold -T transport -e gdb --args
-#PREFIX = gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 BINARY = gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p --track-origins=yes
-#DEBUG = YES
 
 [arm]
 PORT = 2566
@@ -32,16 +27,9 @@ PORT = 2568
 
 [peerinfo]
 PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
 
 [core]
 PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
 
 [dv]
 AUTOSTART = YES
@@ -49,10 +37,6 @@ DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-dv
-#BINARY = /root/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice -e gdb --args
-#PREFIX = valgrind --log-file=dv-%p --leak-check=full
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost