diff options
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/gnunet-service-cadet.c | 12 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_peer.c | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index dd693731f..d61556785 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c | |||
@@ -927,29 +927,23 @@ get_peer_info (void *cls, | |||
927 | struct CadetClient *c = cls; | 927 | struct CadetClient *c = cls; |
928 | struct GNUNET_MQ_Envelope *env; | 928 | struct GNUNET_MQ_Envelope *env; |
929 | struct GNUNET_CADET_LocalInfoPeer *msg; | 929 | struct GNUNET_CADET_LocalInfoPeer *msg; |
930 | |||
931 | 930 | ||
932 | env = GNUNET_MQ_msg (msg, | 931 | env = GNUNET_MQ_msg (msg, |
933 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEER); | 932 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEER); |
934 | |||
935 | msg->offset = htons(0); | 933 | msg->offset = htons(0); |
936 | msg->destination = *peer; | 934 | msg->destination = *peer; |
937 | msg->paths = htons (GCP_count_paths (p)); | 935 | msg->paths = htons (GCP_count_paths (p)); |
938 | msg->tunnel = htons (NULL != GCP_get_tunnel (p, | 936 | msg->tunnel = htons (NULL != GCP_get_tunnel (p, |
939 | GNUNET_NO)); | 937 | GNUNET_NO)); |
940 | msg->finished_with_paths = htons(0); | 938 | msg->finished_with_paths = htons(0); |
941 | |||
942 | GNUNET_MQ_send (c->mq, | 939 | GNUNET_MQ_send (c->mq, |
943 | env); | 940 | env); |
944 | 941 | GCP_iterate_indirect_paths (p, | |
945 | GCP_iterate_indirect_paths(p, | 942 | &path_info_iterator, |
946 | &path_info_iterator, | 943 | c->mq); |
947 | c->mq); | ||
948 | |||
949 | } | 944 | } |
950 | 945 | ||
951 | 946 | ||
952 | |||
953 | /** | 947 | /** |
954 | * Handler for client's SHOW_PEER request. | 948 | * Handler for client's SHOW_PEER request. |
955 | * | 949 | * |
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index ac1ee59de..bd642f155 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c | |||
@@ -1217,6 +1217,8 @@ GCP_iterate_paths (struct CadetPeer *cp, | |||
1217 | (NULL == cp->core_mq) ? "" : " including direct link"); | 1217 | (NULL == cp->core_mq) ? "" : " including direct link"); |
1218 | if (NULL != cp->core_mq) | 1218 | if (NULL != cp->core_mq) |
1219 | { | 1219 | { |
1220 | /* FIXME: this branch seems to duplicate the | ||
1221 | i=0 case below (direct link). Leave out!??? -CG */ | ||
1220 | struct CadetPeerPath *path; | 1222 | struct CadetPeerPath *path; |
1221 | 1223 | ||
1222 | path = GCPP_get_path_from_route (1, | 1224 | path = GCPP_get_path_from_route (1, |