diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-28 14:38:56 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-28 14:38:56 +0100 |
commit | 6588438f94ba8053f8b4917b9b30a5165e9181ad (patch) | |
tree | fd88e8dfc929d412639d497b9b7302cee76bf6b1 | |
parent | c9e806d1862c68a7ae765127982622311304a928 (diff) | |
download | gnunet-6588438f94ba8053f8b4917b9b30a5165e9181ad.tar.gz gnunet-6588438f94ba8053f8b4917b9b30a5165e9181ad.zip |
misc minor fixes
-rw-r--r-- | src/cadet/gnunet-service-cadet-new.c | 8 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet-new_channel.c | 10 | ||||
-rw-r--r-- | src/consensus/test_consensus.conf | 13 | ||||
-rw-r--r-- | src/util/service_new.c | 4 |
4 files changed, 21 insertions, 14 deletions
diff --git a/src/cadet/gnunet-service-cadet-new.c b/src/cadet/gnunet-service-cadet-new.c index b0a818c7c..de85db5b6 100644 --- a/src/cadet/gnunet-service-cadet-new.c +++ b/src/cadet/gnunet-service-cadet-new.c | |||
@@ -716,9 +716,11 @@ handle_local_data (void *cls, | |||
716 | msg->ccn); | 716 | msg->ccn); |
717 | if (NULL == ch) | 717 | if (NULL == ch) |
718 | { | 718 | { |
719 | /* Channel does not exist! */ | 719 | /* Channel does not exist (anymore) */ |
720 | GNUNET_break (0); | 720 | LOG (GNUNET_ERROR_TYPE_WARNING, |
721 | GNUNET_SERVICE_client_drop (c->client); | 721 | "Dropping payload for channel %u from client (channel unknown, other endpoint may have disconnected)\n", |
722 | (unsigned int) ntohl (msg->ccn.channel_of_client)); | ||
723 | GNUNET_SERVICE_client_continue (c->client); | ||
722 | return; | 724 | return; |
723 | } | 725 | } |
724 | payload_size = ntohs (msg->header.size) - sizeof (*msg); | 726 | payload_size = ntohs (msg->header.size) - sizeof (*msg); |
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c b/src/cadet/gnunet-service-cadet-new_channel.c index c418893a8..8769601c2 100644 --- a/src/cadet/gnunet-service-cadet-new_channel.c +++ b/src/cadet/gnunet-service-cadet-new_channel.c | |||
@@ -1618,7 +1618,8 @@ GCCH_handle_remote_destroy (struct CadetChannel *ch, | |||
1618 | return; | 1618 | return; |
1619 | } | 1619 | } |
1620 | ccc = (NULL != ch->owner) ? ch->owner : ch->dest; | 1620 | ccc = (NULL != ch->owner) ? ch->owner : ch->dest; |
1621 | if (NULL != ccc->head_recv) | 1621 | if ( (NULL != ccc) && |
1622 | (NULL != ccc->head_recv) ) | ||
1622 | { | 1623 | { |
1623 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1624 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1624 | "Lost end of transmission due to remote shutdown on %s\n", | 1625 | "Lost end of transmission due to remote shutdown on %s\n", |
@@ -1626,9 +1627,10 @@ GCCH_handle_remote_destroy (struct CadetChannel *ch, | |||
1626 | /* FIXME: change API to notify client about truncated transmission! */ | 1627 | /* FIXME: change API to notify client about truncated transmission! */ |
1627 | } | 1628 | } |
1628 | ch->destroy = GNUNET_YES; | 1629 | ch->destroy = GNUNET_YES; |
1629 | GSC_handle_remote_channel_destroy (ccc->c, | 1630 | if (NULL != ccc) |
1630 | ccc->ccn, | 1631 | GSC_handle_remote_channel_destroy (ccc->c, |
1631 | ch); | 1632 | ccc->ccn, |
1633 | ch); | ||
1632 | channel_destroy (ch); | 1634 | channel_destroy (ch); |
1633 | } | 1635 | } |
1634 | 1636 | ||
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf index d1b33c4fd..f78b77d09 100644 --- a/src/consensus/test_consensus.conf +++ b/src/consensus/test_consensus.conf | |||
@@ -17,19 +17,22 @@ BINARY = gnunet-service-evil-consensus | |||
17 | RESOURCE_DIAGNOSTICS = resource.log.${PEERID:-master} | 17 | RESOURCE_DIAGNOSTICS = resource.log.${PEERID:-master} |
18 | 18 | ||
19 | [core] | 19 | [core] |
20 | FORECESTART = YES | 20 | FORCESTART = YES |
21 | 21 | ||
22 | [revocation] | 22 | [revocation] |
23 | FORECESTART = NO | 23 | FORCESTART = NO |
24 | 24 | ||
25 | [fs] | 25 | [fs] |
26 | FORECESTART = NO | 26 | FORCESTART = NO |
27 | 27 | ||
28 | [gns] | 28 | [gns] |
29 | FORECESTART = NO | 29 | FORCESTART = NO |
30 | |||
31 | [zonemaster] | ||
32 | FORCESTART = NO | ||
30 | 33 | ||
31 | [hostlist] | 34 | [hostlist] |
32 | FORECESTART = NO | 35 | FORCESTART = NO |
33 | 36 | ||
34 | [cadet] | 37 | [cadet] |
35 | #PREFIX = valgrind | 38 | #PREFIX = valgrind |
diff --git a/src/util/service_new.c b/src/util/service_new.c index 8371f7703..22eec0bde 100644 --- a/src/util/service_new.c +++ b/src/util/service_new.c | |||
@@ -2402,8 +2402,8 @@ resume_client_receive (void *cls) | |||
2402 | GNUNET_YES); | 2402 | GNUNET_YES); |
2403 | if (GNUNET_SYSERR == ret) | 2403 | if (GNUNET_SYSERR == ret) |
2404 | { | 2404 | { |
2405 | GNUNET_break (0); | 2405 | if (NULL != c->drop_task) |
2406 | GNUNET_SERVICE_client_drop (c); | 2406 | GNUNET_SERVICE_client_drop (c); |
2407 | return; | 2407 | return; |
2408 | } | 2408 | } |
2409 | if (GNUNET_NO == ret) | 2409 | if (GNUNET_NO == ret) |