[GNUnet-SVN] r17261 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2011-10-06 18:46:13 +0200 (Thu, 06 Oct 2011)
New Revision: 17261

Modified:
   gnunet/src/mesh/test_mesh_small.conf
   gnunet/src/mesh/test_mesh_small_unicast.c
Log:
Revert 17260

Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf        2011-10-06 16:43:13 UTC (rev 
17260)
+++ gnunet/src/mesh/test_mesh_small.conf        2011-10-06 16:46:13 UTC (rev 
17261)
@@ -49,10 +49,6 @@
 [mesh]
 PORT = 10005
 DEBUG=YES
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-# PREFIX = valgrind --leak-check=full
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [testing]
 NUM_PEERS = 16

Modified: gnunet/src/mesh/test_mesh_small_unicast.c
===================================================================
--- gnunet/src/mesh/test_mesh_small_unicast.c   2011-10-06 16:43:13 UTC (rev 
17260)
+++ gnunet/src/mesh/test_mesh_small_unicast.c   2011-10-06 16:46:13 UTC (rev 
17261)
@@ -289,61 +289,6 @@
 
 
 /**
- * Prototype of a callback function indicating that two peers
- * are currently connected.
- *
- * @param cls closure
- * @param first peer id for first daemon
- * @param second peer id for the second daemon
- * @param distance distance between the connected peers
- * @param emsg error message (NULL on success)
- */
-void
-topo_cb (void *cls,
-         const struct GNUNET_PeerIdentity* first,
-         const struct GNUNET_PeerIdentity* second,
-         const char *emsg)
-{
-  GNUNET_PEER_Id p1;
-  GNUNET_PEER_Id p2;
-  uint16_t *connections = cls;
-  struct GNUNET_PeerIdentity id;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "test: :::::::::::::::::::::::::: %u\n",
-              connections[0]);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ###################### %p\n", 
connections);
-  GNUNET_PEER_resolve(connections[0], &id);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "test: looking for %s...\n",
-                GNUNET_i2s(&id));
-  p1 = GNUNET_PEER_search(first);
-  if (p1 == connections[0])
-  {
-    p2 = GNUNET_PEER_search(second);
-    GNUNET_assert(p2 < num_peers);
-    if (0 == p2) return;
-    connections[p2]++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "test: %s IS a neighbor\n",
-                GNUNET_i2s(second));
-    return;
-  }
-  p1 = GNUNET_PEER_search(second);
-  if (p1 == connections[0])
-  {
-    p2 = GNUNET_PEER_search(first);
-    GNUNET_assert(p2 < num_peers);
-    if (0 == p2) return;
-    connections[p2]++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "test: %s IS a neighbor\n",
-                GNUNET_i2s(first));
-    return;
-  }
-}
-
-/**
  * connect_mesh_service: connect to the mesh service of one of the peers
  *
  */
@@ -351,39 +296,20 @@
 connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_MESH_ApplicationType app;
-  uint16_t connections[num_peers];
-  uint16_t i;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
 
-  for (i = 0; i < num_peers; i++)
-  {
-    d1 = GNUNET_TESTING_daemon_get (pg, i);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "test:   %u: %s\n",
-                GNUNET_PEER_intern(&d1->id),
-                GNUNET_i2s (&d1->id));
-    connections[i] = 0;
-  }
-  connections[0] = GNUNET_PEER_intern(&d1->id);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ###################### %p\n", 
connections);
-  GNUNET_TESTING_get_topology(pg, &topo_cb, connections);
-  for (i = 1; i < num_peers; i++)
-    if (connections[i] == 0)
-      break;
-  GNUNET_assert (i < num_peers);
-  d2 = GNUNET_TESTING_daemon_get (pg, i);
+  d1 = GNUNET_TESTING_daemon_get (pg, 1);
+  d2 = GNUNET_TESTING_daemon_get (pg, 3);
   app = (GNUNET_MESH_ApplicationType) 0;
 
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "test: connecting to mesh service of peer %s (%u)\n",
-              GNUNET_i2s (&d1->id),
-              connections[0]);
+              "test: connecting to mesh service of peer %s\n",
+              GNUNET_i2s (&d1->id));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "test: connecting to mesh service of peer %s (%u)\n",
-              GNUNET_i2s (&d2->id),
-              i);
+              "test: connecting to mesh service of peer %s\n",
+              GNUNET_i2s (&d2->id));
 #endif
   h1 = GNUNET_MESH_connect (d1->cfg,
                             10,