[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24145 - gnunet/src/stream
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24145 - gnunet/src/stream |
Date: |
Sun, 30 Sep 2012 17:11:40 +0200 |
Author: harsha
Date: 2012-09-30 17:11:39 +0200 (Sun, 30 Sep 2012)
New Revision: 24145
Modified:
gnunet/src/stream/perf_stream_api.c
gnunet/src/stream/test_stream_2peers.c
gnunet/src/stream/test_stream_2peers_halfclose.c
gnunet/src/stream/test_stream_big.c
gnunet/src/stream/test_stream_local.c
gnunet/src/stream/test_stream_sequence_wraparound.c
Log:
more fixes for #2570
Modified: gnunet/src/stream/perf_stream_api.c
===================================================================
--- gnunet/src/stream/perf_stream_api.c 2012-09-30 14:26:25 UTC (rev 24144)
+++ gnunet/src/stream/perf_stream_api.c 2012-09-30 15:11:39 UTC (rev 24145)
@@ -588,6 +588,15 @@
{
struct PeerData *pdata = cls;
+
+ if ((NULL == socket) || (NULL == initiator))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return GNUNET_OK;
+ }
GNUNET_assert (NULL != socket);
GNUNET_assert (pdata == &peer_data[1]);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer connected: %s\n",
Modified: gnunet/src/stream/test_stream_2peers.c
===================================================================
--- gnunet/src/stream/test_stream_2peers.c 2012-09-30 14:26:25 UTC (rev
24144)
+++ gnunet/src/stream/test_stream_2peers.c 2012-09-30 15:11:39 UTC (rev
24145)
@@ -427,7 +427,14 @@
struct GNUNET_STREAM_Socket *socket,
const struct GNUNET_PeerIdentity *initiator)
{
- GNUNET_assert (NULL != socket);
+ if ((NULL == socket) || (NULL == initiator))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return GNUNET_OK;
+ }
GNUNET_assert (NULL != initiator);
GNUNET_assert (socket != peer2.socket);
GNUNET_assert (0 == memcmp (initiator, &peer2.our_id,
Modified: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c 2012-09-30 14:26:25 UTC
(rev 24144)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c 2012-09-30 15:11:39 UTC
(rev 24145)
@@ -661,15 +661,19 @@
struct GNUNET_STREAM_Socket *socket,
const struct GNUNET_PeerIdentity *initiator)
{
- GNUNET_assert (NULL != socket);
- GNUNET_assert (NULL != initiator);
+ if ((NULL == socket) || (NULL == initiator))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return GNUNET_OK;
+ }
GNUNET_assert (socket != peer1.socket);
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s: Peer connected: %s\n",
GNUNET_i2s (&peer2.our_id),
GNUNET_i2s(initiator));
-
peer2.socket = socket;
/* FIXME: reading should be done right now instead of a scheduled call */
read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);
Modified: gnunet/src/stream/test_stream_big.c
===================================================================
--- gnunet/src/stream/test_stream_big.c 2012-09-30 14:26:25 UTC (rev 24144)
+++ gnunet/src/stream/test_stream_big.c 2012-09-30 15:11:39 UTC (rev 24145)
@@ -302,6 +302,14 @@
struct GNUNET_STREAM_Socket *socket,
const struct GNUNET_PeerIdentity *initiator)
{
+ if ((NULL == socket) || (NULL == initiator))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return GNUNET_OK;
+ }
GNUNET_assert (NULL != socket);
GNUNET_assert (socket != peer1.socket);
Modified: gnunet/src/stream/test_stream_local.c
===================================================================
--- gnunet/src/stream/test_stream_local.c 2012-09-30 14:26:25 UTC (rev
24144)
+++ gnunet/src/stream/test_stream_local.c 2012-09-30 15:11:39 UTC (rev
24145)
@@ -320,6 +320,14 @@
{
struct PeerData *peer=cls;
+ if ((NULL == socket) || (NULL == initiator))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return GNUNET_OK;
+ }
GNUNET_assert (NULL != socket);
GNUNET_assert (socket != peer1.socket);
GNUNET_assert (&peer2 == peer);
Modified: gnunet/src/stream/test_stream_sequence_wraparound.c
===================================================================
--- gnunet/src/stream/test_stream_sequence_wraparound.c 2012-09-30 14:26:25 UTC
(rev 24144)
+++ gnunet/src/stream/test_stream_sequence_wraparound.c 2012-09-30 15:11:39 UTC
(rev 24145)
@@ -302,6 +302,14 @@
struct GNUNET_STREAM_Socket *socket,
const struct GNUNET_PeerIdentity *initiator)
{
+ if ((NULL == socket) || (NULL == initiator))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return GNUNET_OK;
+ }
GNUNET_assert (NULL != socket);
GNUNET_assert (socket != peer1.socket);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24145 - gnunet/src/stream,
gnunet <=