diff options
author | Julius Bünger <buenger@mytum.de> | 2017-03-12 23:42:59 +0100 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2017-03-12 23:42:59 +0100 |
commit | 689692223b9cfd09143cf47a8b3f05dd66fb084e (patch) | |
tree | 87c55ffdd57660fa84b90f47cc99acb1fae1c440 /src | |
parent | ac837930d961e9001df6167c793c844dcf6f6584 (diff) | |
download | gnunet-689692223b9cfd09143cf47a8b3f05dd66fb084e.tar.gz gnunet-689692223b9cfd09143cf47a8b3f05dd66fb084e.zip |
last step to new cadet api
Diffstat (limited to 'src')
-rw-r--r-- | src/rps/gnunet-service-rps_peers.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/rps/gnunet-service-rps_peers.c b/src/rps/gnunet-service-rps_peers.c index cbe3aefa3..1679bd9f8 100644 --- a/src/rps/gnunet-service-rps_peers.c +++ b/src/rps/gnunet-service-rps_peers.c | |||
@@ -566,7 +566,7 @@ get_mq (const struct GNUNET_PeerIdentity *peer) | |||
566 | if (NULL == peer_ctx->mq) | 566 | if (NULL == peer_ctx->mq) |
567 | { | 567 | { |
568 | (void) get_channel (peer); | 568 | (void) get_channel (peer); |
569 | peer_ctx->mq = GNUNET_CADET_mq_create (peer_ctx->send_channel); | 569 | peer_ctx->mq = GNUNET_CADET_get_mq (peer_ctx->send_channel); |
570 | } | 570 | } |
571 | return peer_ctx->mq; | 571 | return peer_ctx->mq; |
572 | } | 572 | } |
@@ -663,9 +663,7 @@ remove_pending_message (struct PendingMessage *pending_msg) | |||
663 | GNUNET_CONTAINER_DLL_remove (peer_ctx->pending_messages_head, | 663 | GNUNET_CONTAINER_DLL_remove (peer_ctx->pending_messages_head, |
664 | peer_ctx->pending_messages_tail, | 664 | peer_ctx->pending_messages_tail, |
665 | pending_msg); | 665 | pending_msg); |
666 | /* FIXME We are not able to cancel messages as #GNUNET_CADET_mq_create () does | 666 | GNUNET_MQ_send_cancel (peer_ctx->pending_messages_head->ev); |
667 | * not set a #GNUNET_MQ_CancelImpl */ | ||
668 | /* GNUNET_MQ_send_cancel (peer_ctx->pending_messages_head->ev); */ | ||
669 | GNUNET_free (pending_msg); | 667 | GNUNET_free (pending_msg); |
670 | } | 668 | } |
671 | 669 | ||
@@ -1688,12 +1686,7 @@ Peers_get_recv_channel (const struct GNUNET_PeerIdentity *peer) | |||
1688 | { | 1686 | { |
1689 | struct PeerContext *peer_ctx; | 1687 | struct PeerContext *peer_ctx; |
1690 | 1688 | ||
1691 | if (0 == GNUNET_CRYPTO_cmp_peer_identity (peer, own_identity)) | ||
1692 | { | ||
1693 | return GNUNET_NO; | ||
1694 | } | ||
1695 | GNUNET_assert (GNUNET_YES == Peers_check_peer_known (peer)); | 1689 | GNUNET_assert (GNUNET_YES == Peers_check_peer_known (peer)); |
1696 | |||
1697 | peer_ctx = get_peer_ctx (peer); | 1690 | peer_ctx = get_peer_ctx (peer); |
1698 | return peer_ctx->recv_channel; | 1691 | return peer_ctx->recv_channel; |
1699 | } | 1692 | } |