aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-02-28 15:21:32 +0100
committerChristian Grothoff <christian@grothoff.org>2017-02-28 15:21:40 +0100
commit1ba3554564c3d1b1110f5db9c37df498dee0cb9b (patch)
tree7cacdfe76e14e7d6f8d31a4fa7caf97984952dc9
parentd0b5f5ba30665a8a25cec029e298a4f2c575df14 (diff)
downloadgnunet-1ba3554564c3d1b1110f5db9c37df498dee0cb9b.tar.gz
gnunet-1ba3554564c3d1b1110f5db9c37df498dee0cb9b.zip
do not bitch at CADET for issues that can happen in normal operation
-rw-r--r--src/cadet/cadet_api_new.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/cadet/cadet_api_new.c b/src/cadet/cadet_api_new.c
index efdb6d8a6..2d5d853b3 100644
--- a/src/cadet/cadet_api_new.c
+++ b/src/cadet/cadet_api_new.c
@@ -686,7 +686,7 @@ handle_channel_destroy (void *cls,
686 if (NULL == ch) 686 if (NULL == ch)
687 { 687 {
688 LOG (GNUNET_ERROR_TYPE_DEBUG, 688 LOG (GNUNET_ERROR_TYPE_DEBUG,
689 "Received channel destroy for unknown channel %X from CADET service\n", 689 "Received channel destroy for unknown channel %X from CADET service (recently close?)\n",
690 ntohl (msg->ccn.channel_of_client)); 690 ntohl (msg->ccn.channel_of_client));
691 return; 691 return;
692 } 692 }
@@ -709,8 +709,6 @@ static int
709check_local_data (void *cls, 709check_local_data (void *cls,
710 const struct GNUNET_CADET_LocalData *message) 710 const struct GNUNET_CADET_LocalData *message)
711{ 711{
712 struct GNUNET_CADET_Handle *h = cls;
713 struct GNUNET_CADET_Channel *ch;
714 uint16_t size; 712 uint16_t size;
715 713
716 size = ntohs (message->header.size); 714 size = ntohs (message->header.size);
@@ -719,15 +717,6 @@ check_local_data (void *cls,
719 GNUNET_break (0); 717 GNUNET_break (0);
720 return GNUNET_SYSERR; 718 return GNUNET_SYSERR;
721 } 719 }
722
723 ch = find_channel (h,
724 message->ccn);
725 if (NULL == ch)
726 {
727 GNUNET_break (0);
728 return GNUNET_SYSERR;
729 }
730
731 return GNUNET_OK; 720 return GNUNET_OK;
732} 721}
733 722
@@ -752,8 +741,9 @@ handle_local_data (void *cls,
752 message->ccn); 741 message->ccn);
753 if (NULL == ch) 742 if (NULL == ch)
754 { 743 {
755 GNUNET_break (0); 744 LOG (GNUNET_ERROR_TYPE_DEBUG,
756 reconnect (h); 745 "Unknown channel %X for incoming data (recently closed?)\n",
746 ntohl (message->ccn.channel_of_client));
757 return; 747 return;
758 } 748 }
759 749