[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26681 - gnunet/src/consensus
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26681 - gnunet/src/consensus |
Date: |
Sat, 30 Mar 2013 17:28:07 +0100 |
Author: grothoff
Date: 2013-03-30 17:28:07 +0100 (Sat, 30 Mar 2013)
New Revision: 26681
Modified:
gnunet/src/consensus/gnunet-service-consensus.c
Log:
-this CAN happen, do not crash then
Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c 2013-03-30 16:23:08 UTC
(rev 26680)
+++ gnunet/src/consensus/gnunet-service-consensus.c 2013-03-30 16:28:07 UTC
(rev 26681)
@@ -1535,7 +1535,12 @@
const struct GNUNET_PeerIdentity *initiator)
{
struct IncomingSocket *incoming;
- GNUNET_assert (NULL != socket);
+
+ if (NULL == socket)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
incoming = GNUNET_malloc (sizeof *incoming);
incoming->socket = socket;
incoming->peer_id = *initiator;
@@ -2746,14 +2751,16 @@
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
listener = GNUNET_STREAM_listen (cfg, GNUNET_APPLICATION_TYPE_CONSENSUS,
- listen_cb, NULL,
+ &listen_cb, NULL,
GNUNET_STREAM_OPTION_END);
/* we have to wait for the core_startup callback before proceeding with the
consensus service startup */
- core = GNUNET_CORE_connect (c, NULL, &core_startup, NULL, NULL, NULL,
GNUNET_NO, NULL, GNUNET_NO, core_handlers);
+ core = GNUNET_CORE_connect (c, NULL,
+ &core_startup, NULL,
+ NULL, NULL, GNUNET_NO, NULL,
+ GNUNET_NO, core_handlers);
GNUNET_assert (NULL != core);
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "consensus running\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus running\n");
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26681 - gnunet/src/consensus,
gnunet <=