aboutsummaryrefslogtreecommitdiff
path: root/src/core/gnunet-service-core_clients.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/gnunet-service-core_clients.c')
-rw-r--r--src/core/gnunet-service-core_clients.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 5448d5d0f..4098b45b1 100644
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -343,13 +343,14 @@ handle_client_send_request (void *cls, struct GNUNET_SERVER_Client *client,
343 "Client asked for transmission to `%s'\n", 343 "Client asked for transmission to `%s'\n",
344 GNUNET_i2s (&req->peer)); 344 GNUNET_i2s (&req->peer));
345#endif 345#endif
346 is_loopback = (0 == 346 is_loopback =
347 memcmp (&req->peer, &GSC_my_identity, 347 (0 ==
348 sizeof (struct GNUNET_PeerIdentity))); 348 memcmp (&req->peer, &GSC_my_identity,
349 if ( (! is_loopback) && 349 sizeof (struct GNUNET_PeerIdentity)));
350 (GNUNET_YES != 350 if ((!is_loopback) &&
351 GNUNET_CONTAINER_multihashmap_contains (c->connectmap, 351 (GNUNET_YES !=
352 &req->peer.hashPubKey)) ) 352 GNUNET_CONTAINER_multihashmap_contains (c->connectmap,
353 &req->peer.hashPubKey)))
353 { 354 {
354 /* neighbour must have disconnected since request was issued, 355 /* neighbour must have disconnected since request was issued,
355 * ignore (client will realize it once it processes the 356 * ignore (client will realize it once it processes the
@@ -390,8 +391,8 @@ handle_client_send_request (void *cls, struct GNUNET_SERVER_Client *client,
390 GSC_CLIENTS_solicit_request (car); 391 GSC_CLIENTS_solicit_request (car);
391 GNUNET_SERVER_receive_done (client, GNUNET_OK); 392 GNUNET_SERVER_receive_done (client, GNUNET_OK);
392 return; 393 return;
393 } 394 }
394 GSC_SESSIONS_queue_request (car); 395 GSC_SESSIONS_queue_request (car);
395 GNUNET_SERVER_receive_done (client, GNUNET_OK); 396 GNUNET_SERVER_receive_done (client, GNUNET_OK);
396} 397}
397 398
@@ -610,13 +611,12 @@ GSC_CLIENTS_solicit_request (struct GSC_ClientActiveRequest *car)
610 c = car->client_handle; 611 c = car->client_handle;
611 if (GNUNET_YES != 612 if (GNUNET_YES !=
612 GNUNET_CONTAINER_multihashmap_contains (c->connectmap, 613 GNUNET_CONTAINER_multihashmap_contains (c->connectmap,
613 &car-> 614 &car->target.hashPubKey))
614 target.hashPubKey))
615 { 615 {
616 /* connection has gone down since, drop request */ 616 /* connection has gone down since, drop request */
617 GNUNET_assert (0 != 617 GNUNET_assert (0 !=
618 memcmp (&car->target, &GSC_my_identity, 618 memcmp (&car->target, &GSC_my_identity,
619 sizeof (struct GNUNET_PeerIdentity))); 619 sizeof (struct GNUNET_PeerIdentity)));
620 GSC_SESSIONS_dequeue_request (car); 620 GSC_SESSIONS_dequeue_request (car);
621 GSC_CLIENTS_reject_request (car); 621 GSC_CLIENTS_reject_request (car);
622 return; 622 return;