aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-08-28 13:31:48 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-08-28 13:31:48 +0000
commit56dd92a399fdebc4d2771b9f3e7790026831867b (patch)
tree164c8891d887cae79c8ed720d4321daaa196a4f7 /src/transport/gnunet-service-transport.c
parent55e4ea7e6853ee2c29ae0152b517bf5c39c7dbc4 (diff)
downloadgnunet-56dd92a399fdebc4d2771b9f3e7790026831867b.tar.gz
gnunet-56dd92a399fdebc4d2771b9f3e7790026831867b.zip
using tcp terminology for 3 way handshake: syn/syn_ack/ack
renaming all functions, states, messages ...
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r--src/transport/gnunet-service-transport.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 870e541a9..ba9eb38d8 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -328,12 +328,12 @@ connect_bl_check_cont (void *cls,
328 328
329 if (GNUNET_OK == result) 329 if (GNUNET_OK == result)
330 { 330 {
331 /* Blacklist allows to speak to this peer, forward CONNECT to neighbours */ 331 /* Blacklist allows to speak to this peer, forward SYN to neighbours */
332 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 332 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
333 "Received CONNECT message from peer `%s' with `%s' %p\n", 333 "Received SYN message from peer `%s' with `%s' %p\n",
334 GNUNET_i2s (peer), GST_plugins_a2s (blctx->address), blctx->session); 334 GNUNET_i2s (peer), GST_plugins_a2s (blctx->address), blctx->session);
335 335
336 if (GNUNET_OK != GST_neighbours_handle_connect (blctx->msg, 336 if (GNUNET_OK != GST_neighbours_handle_session_syn (blctx->msg,
337 &blctx->address->peer)) 337 &blctx->address->peer))
338 { 338 {
339 cancel_pending_blacklist_checks (blctx->address, blctx->session); 339 cancel_pending_blacklist_checks (blctx->address, blctx->session);
@@ -345,7 +345,7 @@ connect_bl_check_cont (void *cls,
345 /* Blacklist denies to speak to this peer */ 345 /* Blacklist denies to speak to this peer */
346 346
347 GNUNET_log(GNUNET_ERROR_TYPE_INFO, 347 GNUNET_log(GNUNET_ERROR_TYPE_INFO,
348 "Discarding CONNECT message from `%s' due to denied blacklist check\n", 348 "Discarding SYN message from `%s' due to denied blacklist check\n",
349 GNUNET_i2s (peer)); 349 GNUNET_i2s (peer));
350 cancel_pending_blacklist_checks (blctx->address, blctx->session); 350 cancel_pending_blacklist_checks (blctx->address, blctx->session);
351 kill_session (blctx->address->transport_name, blctx->session); 351 kill_session (blctx->address->transport_name, blctx->session);
@@ -457,7 +457,7 @@ GST_receive_callback (void *cls,
457 kill_session (plugin_name, session); 457 kill_session (plugin_name, session);
458 } 458 }
459 break; 459 break;
460 case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT: 460 case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN:
461 /* Do blacklist check if communication with this peer is allowed */ 461 /* Do blacklist check if communication with this peer is allowed */
462 blctx = GNUNET_new (struct BlacklistCheckContext); 462 blctx = GNUNET_new (struct BlacklistCheckContext);
463 blctx->address = GNUNET_HELLO_address_copy (address); 463 blctx->address = GNUNET_HELLO_address_copy (address);
@@ -483,8 +483,8 @@ GST_receive_callback (void *cls,
483 blctx->blc = blc; 483 blctx->blc = blc;
484 } 484 }
485 break; 485 break;
486 case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK: 486 case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN_ACK:
487 if (GNUNET_OK != GST_neighbours_handle_connect_ack (message, 487 if (GNUNET_OK != GST_neighbours_handle_session_syn_ack (message,
488 &address->peer, address, session)) 488 &address->peer, address, session))
489 { 489 {
490 cancel_pending_blacklist_checks (address, session); 490 cancel_pending_blacklist_checks (address, session);