more assertions

diff --git a/src/stream/stream_api.c b/src/stream/stream_api.c
index d694d43bb46ee5b795af8f042268c3cef804b540..19a2d918dd1005a32aca8bb634b03eabd244d3c1 100644 (file)
--- a/src/stream/stream_api.c
+++ b/src/stream/stream_api.c
@@ -1989,8 +1989,8 @@ mesh_peer_connect_callback (void *cls,
   
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "%s: Target peer %s connected\n", 
-              GNUNET_i2s (&socket->our_id),
-              GNUNET_i2s (peer));
+              GNUNET_i2s (&(socket->our_id)),
+              GNUNET_i2s (&(socket->other_peer)));
   
   /* Set state to INIT */
   socket->state = STATE_INIT;

diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c
index 9cf6081645df67afdfd220244798c6dbfee2d09a..927194e3f5a69534a849f145e37db6fdf48cf37e 100644 (file)
--- a/src/stream/test_stream_local.c
+++ b/src/stream/test_stream_local.c
@@ -59,6 +59,11 @@ struct PeerData
    */
   struct GNUNET_STREAM_IOReadHandle *io_read_handle;
 
+  /**
+   * Our Peer id
+   */
+  struct GNUNET_PeerIdentity our_id;
+
   /**
    * Bytes the peer has written
    */
@@ -240,7 +245,10 @@ stream_open_cb (void *cls,
 {
   struct PeerData *peer;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream established from peer1\n");
+  GNUNET_assert (socket == peer1.socket);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "%s: Stream established from peer1\n",
+              GNUNET_i2s (&peer1.our_id));
   peer = (struct PeerData *) cls;
   peer->bytes_wrote = 0;
   GNUNET_assert (socket == peer1.socket);
@@ -356,7 +364,9 @@ stream_listen_cb (void *cls,
   GNUNET_assert (socket != peer1.socket);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer connected: %s\n", GNUNET_i2s(initiator));
+              "%s: Peer connected: %s\n",
+              GNUNET_i2s (&peer2.our_id),
+              GNUNET_i2s(initiator));
 
   peer2.socket = socket;
   read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);
@@ -390,6 +400,19 @@ peergroup_ready (void *cls, const char *emsg)
   d2 = GNUNET_TESTING_daemon_get (pg, 1);
   GNUNET_assert (NULL != d2);
 
+  GNUNET_TESTING_get_peer_identity (d1->cfg,
+                                    &peer1.our_id);
+  GNUNET_TESTING_get_peer_identity (d2->cfg,
+                                    &peer2.our_id);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "%s : %s\n",
+              GNUNET_i2s (&peer1.our_id),
+              GNUNET_i2s (&d1->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "%s : %s\n",
+              GNUNET_i2s (&peer2.our_id),
+              GNUNET_i2s (&d2->id));
+
   peer2_listen_socket = GNUNET_STREAM_listen (d2->cfg,
                                               10, /* App port */
                                               &stream_listen_cb,