aboutsummaryrefslogtreecommitdiff
path: root/src/cadet
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-02-09 23:29:47 +0100
committerChristian Grothoff <christian@grothoff.org>2019-02-09 23:30:00 +0100
commitd974bae720beaea9223a8729f4e6c88c326c522b (patch)
treed8f9a5dedb46fcd6be7731914d86159fb564c2f8 /src/cadet
parent4f9169370608dd9c0c125455b651082f5acc7ea6 (diff)
downloadgnunet-d974bae720beaea9223a8729f4e6c88c326c522b.tar.gz
gnunet-d974bae720beaea9223a8729f4e6c88c326c522b.zip
untested fix for #5511
Diffstat (limited to 'src/cadet')
-rw-r--r--src/cadet/gnunet-service-cadet.c8
-rw-r--r--src/cadet/gnunet-service-cadet_channel.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 97950a18a..d64242943 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
@@ -824,7 +824,7 @@ get_all_peers_iterator (void *cls,
824 struct GNUNET_CADET_LocalInfoPeers *msg; 824 struct GNUNET_CADET_LocalInfoPeers *msg;
825 825
826 env = GNUNET_MQ_msg (msg, 826 env = GNUNET_MQ_msg (msg,
827 GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEERS); 827 GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEERS);
828 msg->destination = *peer; 828 msg->destination = *peer;
829 msg->paths = htons (GCP_count_paths (p)); 829 msg->paths = htons (GCP_count_paths (p));
830 msg->tunnel = htons (NULL != GCP_get_tunnel (p, 830 msg->tunnel = htons (NULL != GCP_get_tunnel (p,
@@ -893,7 +893,7 @@ path_info_iterator (void *cls,
893 } 893 }
894 env = GNUNET_MQ_msg_extra (resp, 894 env = GNUNET_MQ_msg_extra (resp,
895 path_size, 895 path_size,
896 GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PATH); 896 GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PATH);
897 id = (struct GNUNET_PeerIdentity *) &resp[1]; 897 id = (struct GNUNET_PeerIdentity *) &resp[1];
898 898
899 /* Don't copy first peer. First peer is always the local one. Last 899 /* Don't copy first peer. First peer is always the local one. Last
@@ -928,7 +928,7 @@ handle_show_path (void *cls,
928 if (NULL != p) 928 if (NULL != p)
929 GCP_iterate_indirect_paths (p, 929 GCP_iterate_indirect_paths (p,
930 &path_info_iterator, 930 &path_info_iterator,
931 c->mq); 931 c->mq);
932 env = GNUNET_MQ_msg (resp, 932 env = GNUNET_MQ_msg (resp,
933 GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PATH_END); 933 GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PATH_END);
934 GNUNET_MQ_send (c->mq, 934 GNUNET_MQ_send (c->mq,
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 25b408a0b..9b434ea68 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
@@ -1827,7 +1827,7 @@ GCCH_handle_local_data (struct CadetChannel *ch,
1827 1827
1828 if (ch->pending_messages >= ch->max_pending_messages) 1828 if (ch->pending_messages >= ch->max_pending_messages)
1829 { 1829 {
1830 GNUNET_break (0); 1830 GNUNET_break (0); /* Fails: #5370 */
1831 return GNUNET_SYSERR; 1831 return GNUNET_SYSERR;
1832 } 1832 }
1833 if (GNUNET_YES == ch->destroy) 1833 if (GNUNET_YES == ch->destroy)