From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 4 Jun 2011 22:29:23 +0000 (+0000)
Subject: fixes
X-Git-Tag: initial-import-from-subversion-38251~18337
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=957edb9803c88b05f42120433b78ea0a48f6bc9b;p=oweals%2Fgnunet.git

fixes
---

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 419647e8e..981be7b79 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -1976,21 +1976,21 @@ find_ready_address(struct NeighbourList *neighbour)
       head = head->next;
     }
   if (unix_address != NULL)
-  {
-	  best_address = unix_address;
+    {
+      best_address = unix_address;
 #if DEBUG_TRANSPORT
-	  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found unix address, forced this address\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+		  "Found UNIX address, forced this address\n");
 #endif
-  }
+    }
   if (best_address != NULL)
     {
 #if DEBUG_TRANSPORT
-
-	  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Best address found (`%s') has latency of %llu ms.\n",
 		  (best_address->addrlen > 0)
 		  ? a2s (best_address->ready_list->plugin->short_name,
-		       best_address->addr,
+			 best_address->addr,
 		       best_address->addrlen)
 		  : "<inbound>",
                   best_address->latency.rel_value);
@@ -3314,7 +3314,6 @@ setup_new_neighbour (const struct GNUNET_PeerIdentity *peer,
 	      "Setting up state for neighbour `%4s'\n",
 	      GNUNET_i2s (peer));
 #endif
-  GNUNET_assert (our_hello != NULL);
   GNUNET_STATISTICS_update (stats,
 			    gettext_noop ("# active neighbours"),
 			    1,
@@ -3365,10 +3364,11 @@ setup_new_neighbour (const struct GNUNET_PeerIdentity *peer,
                                 gettext_noop ("# HELLO's sent to new neighbors"),
                                 1,
                                 GNUNET_NO);
-      transmit_to_peer (NULL, NULL, 0,
-			HELLO_ADDRESS_EXPIRATION,
-			(const char *) our_hello, GNUNET_HELLO_size(our_hello),
-			GNUNET_NO, n);
+      if (NULL != our_hello)
+	transmit_to_peer (NULL, NULL, 0,
+			  HELLO_ADDRESS_EXPIRATION,
+			  (const char *) our_hello, GNUNET_HELLO_size(our_hello),
+			  GNUNET_NO, n);
     }
   return n;
 }