[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34802 - gnunet/src/rps
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34802 - gnunet/src/rps |
Date: |
Sat, 27 Dec 2014 13:31:55 +0100 |
Author: ch3
Date: 2014-12-27 13:31:55 +0100 (Sat, 27 Dec 2014)
New Revision: 34802
Modified:
gnunet/src/rps/gnunet-service-rps.c
Log:
using get_peer_context()
Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2014-12-27 12:31:53 UTC (rev 34801)
+++ gnunet/src/rps/gnunet-service-rps.c 2014-12-27 12:31:55 UTC (rev 34802)
@@ -1351,26 +1351,27 @@
uint32_t port,
enum GNUNET_CADET_ChannelOption options)
{
+ struct peer_context *ctx;
+
LOG(GNUNET_ERROR_TYPE_DEBUG, "New channel was established to us (Peer
%s).\n", GNUNET_i2s(initiator));
GNUNET_assert( NULL != channel );
- // TODO we might not even store the from_channel
+ // we might not even store the from_channel
- if ( GNUNET_CONTAINER_multipeermap_contains( peer_map, initiator ) ) {
- ((struct peer_context *) GNUNET_CONTAINER_multipeermap_get( peer_map,
initiator ))->from_channel = channel;
- // FIXME there might already be an established channel
- } else {
- struct peer_context *ctx;
-
- ctx = GNUNET_new(struct peer_context);
- ctx->in_flags = in_other_gossip_list;
- ctx->mq = NULL; // TODO create mq?
+ ctx = get_peer_ctx(peer_map, initiator);
+ if (NULL != ctx->from_channel)
+ {
ctx->from_channel = channel;
+ }
- GNUNET_CONTAINER_multipeermap_put (peer_map, initiator, ctx,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
- }
+ // FIXME there might already be an established channel
+
+ //ctx->in_flags = in_other_gossip_list;
+ ctx->mq = NULL; // TODO create mq?
+
+ GNUNET_CONTAINER_multipeermap_put (peer_map, initiator, ctx,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
return NULL; // TODO
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34802 - gnunet/src/rps,
gnunet <=