[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20365 - gnunet/src/stream
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20365 - gnunet/src/stream |
Date: |
Thu, 8 Mar 2012 14:23:49 +0100 |
Author: harsha
Date: 2012-03-08 14:23:49 +0100 (Thu, 08 Mar 2012)
New Revision: 20365
Modified:
gnunet/src/stream/stream_api.c
gnunet/src/stream/test_stream_local.c
Log:
more assertions
Modified: gnunet/src/stream/stream_api.c
===================================================================
--- gnunet/src/stream/stream_api.c 2012-03-08 10:00:57 UTC (rev 20364)
+++ gnunet/src/stream/stream_api.c 2012-03-08 13:23:49 UTC (rev 20365)
@@ -1989,8 +1989,8 @@
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;
Modified: gnunet/src/stream/test_stream_local.c
===================================================================
--- gnunet/src/stream/test_stream_local.c 2012-03-08 10:00:57 UTC (rev
20364)
+++ gnunet/src/stream/test_stream_local.c 2012-03-08 13:23:49 UTC (rev
20365)
@@ -60,6 +60,11 @@
struct GNUNET_STREAM_IOReadHandle *io_read_handle;
/**
+ * Our Peer id
+ */
+ struct GNUNET_PeerIdentity our_id;
+
+ /**
* Bytes the peer has written
*/
unsigned int bytes_wrote;
@@ -240,7 +245,10 @@
{
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 @@
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 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20365 - gnunet/src/stream,
gnunet <=