diff options
author | Julius Bünger <buenger@mytum.de> | 2018-01-22 04:30:18 +0100 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2018-01-22 04:30:18 +0100 |
commit | 560cb250f65ca483535ac7d36e307bdf0261d1b5 (patch) | |
tree | 638bd34acbdecffd2756a8153a17d34011fce1b3 /src/rps | |
parent | 8df42fb04245ec81c0c94e2f4583dbfdc8bfc57a (diff) | |
download | gnunet-560cb250f65ca483535ac7d36e307bdf0261d1b5.tar.gz gnunet-560cb250f65ca483535ac7d36e307bdf0261d1b5.zip |
rps service: try to fix handling of new channels
Diffstat (limited to 'src/rps')
-rw-r--r-- | src/rps/gnunet-service-rps.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 877893ee8..0d2e07206 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c | |||
@@ -1521,7 +1521,9 @@ Peers_handle_inbound_channel (void *cls, | |||
1521 | { | 1521 | { |
1522 | set_channel_flag (peer_ctx->recv_channel_flags, | 1522 | set_channel_flag (peer_ctx->recv_channel_flags, |
1523 | Peers_CHANNEL_ESTABLISHED_TWICE); | 1523 | Peers_CHANNEL_ESTABLISHED_TWICE); |
1524 | GNUNET_CADET_channel_destroy (channel); | 1524 | //GNUNET_CADET_channel_destroy (channel); |
1525 | GNUNET_CADET_channel_destroy (peer_ctx->recv_channel); | ||
1526 | peer_ctx->recv_channel = channel; | ||
1525 | /* return the channel context */ | 1527 | /* return the channel context */ |
1526 | return &peer_ctx->peer_id; | 1528 | return &peer_ctx->peer_id; |
1527 | } | 1529 | } |
@@ -2577,6 +2579,8 @@ cleanup_destroyed_channel (void *cls, | |||
2577 | uint32_t *channel_flag; | 2579 | uint32_t *channel_flag; |
2578 | struct PeerContext *peer_ctx; | 2580 | struct PeerContext *peer_ctx; |
2579 | 2581 | ||
2582 | GNUNET_assert (NULL != peer); | ||
2583 | |||
2580 | if (GNUNET_NO == Peers_check_peer_known (peer)) | 2584 | if (GNUNET_NO == Peers_check_peer_known (peer)) |
2581 | { /* We don't know a context to that peer */ | 2585 | { /* We don't know a context to that peer */ |
2582 | LOG (GNUNET_ERROR_TYPE_WARNING, | 2586 | LOG (GNUNET_ERROR_TYPE_WARNING, |