trying to fix bandwidth calculations

2 files changed, 24 insertions, 8 deletions

diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index 6ae4d8210..7f761360d 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -832,6 +832,11 @@ consider_for_advertising (const struct GNUNET_HELLO_Message *hello)
   struct PeerList *pos;
   uint16_t size;
 
+  GNUNET_break (GNUNET_OK == GNUNET_HELLO_get_id (hello, &pid));
+  if (0 == memcmp (&pid,
+                   &my_identity,
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return; /* that's me! */
   have_address = GNUNET_NO;
   GNUNET_HELLO_iterate_addresses (hello,
                                   GNUNET_NO,
@@ -839,7 +844,6 @@ consider_for_advertising (const struct GNUNET_HELLO_Message *hello)
                                   &have_address);
   if (GNUNET_NO == have_address)
     return; /* no point in advertising this one... */
-  GNUNET_break (GNUNET_OK == GNUNET_HELLO_get_id (hello, &pid));
   peer = find_peer (&pid);
   if (peer == NULL)
     peer = make_peer (&pid, hello, GNUNET_NO);
@@ -1098,13 +1102,24 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg)
         }
       else
         {
-          entries_found++;
-          fl = make_peer (&pid,
-                          NULL,
-                          GNUNET_YES);
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                      _("Found friend `%s' in configuration\n"),
-                      GNUNET_i2s (&fl->id));
+          if (0 != memcmp (&pid,
+                           &my_identity,
+                           sizeof (struct GNUNET_PeerIdentity)))
+            {
+              entries_found++;
+              fl = make_peer (&pid,
+                              NULL,
+                              GNUNET_YES);
+              GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                          _("Found friend `%s' in configuration\n"),
+                          GNUNET_i2s (&fl->id));
+            }
+          else
+            {
+              GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                          _("Found myself `%s' in friend list (useless, ignored)\n"),
+                          GNUNET_i2s (&fl->id));
+            }
         }
       pos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded);
       while ((pos < frstat.st_size) && isspace (data[pos]))
diff --git a/src/topology/test_gnunet_service_topology_data.conf b/src/topology/test_gnunet_service_topology_data.conf
index 588134b8a..a7cf18955 100644
--- a/src/topology/test_gnunet_service_topology_data.conf
+++ b/src/topology/test_gnunet_service_topology_data.conf
@@ -8,6 +8,7 @@ PORT = 2664
 [transport]
 PORT = 2665
 PLUGINS = tcp
+DEBUG = YES
 #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p