aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport_validation.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-06-22 20:02:10 +0000
committerChristian Grothoff <christian@grothoff.org>2014-06-22 20:02:10 +0000
commit194669680385bd40ce7c84b11021b21b6ed6d295 (patch)
treedda0c95d15c0956efb37fdf4dc02ff83de10c5e6 /src/transport/gnunet-service-transport_validation.c
parent658f44879747d23c92e30ca004b04e2dddac73d8 (diff)
downloadgnunet-194669680385bd40ce7c84b11021b21b6ed6d295.tar.gz
gnunet-194669680385bd40ce7c84b11021b21b6ed6d295.zip
-doxygen, indentation
Diffstat (limited to 'src/transport/gnunet-service-transport_validation.c')
-rw-r--r--src/transport/gnunet-service-transport_validation.c46
1 files changed, 26 insertions, 20 deletions
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index 6621ecc67..86172fab3 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -597,9 +597,10 @@ transmit_ping_if_allowed (void *cls,
597 network = papi->get_network (papi->cls, session); 597 network = papi->get_network (papi->cls, session);
598 if (GNUNET_ATS_NET_UNSPECIFIED == network) 598 if (GNUNET_ATS_NET_UNSPECIFIED == network)
599 { 599 {
600 GNUNET_log(GNUNET_ERROR_TYPE_ERROR, 600 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
601 "Could not obtain a valid network for `%s' `%s'\n", 601 "Could not obtain a valid network for `%s' `%s'\n",
602 GNUNET_i2s (pid), GST_plugins_a2s (ve->address)); 602 GNUNET_i2s (pid),
603 GST_plugins_a2s (ve->address));
603 GNUNET_break(0); 604 GNUNET_break(0);
604 } 605 }
605 GST_neighbours_notify_data_sent (pid, ve->address, session, tsize); 606 GST_neighbours_notify_data_sent (pid, ve->address, session, tsize);
@@ -607,8 +608,10 @@ transmit_ping_if_allowed (void *cls,
607 else 608 else
608 { 609 {
609 /* Could not get a valid session */ 610 /* Could not get a valid session */
610 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not get a valid session for `%s' `%s'\n", 611 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
611 GNUNET_i2s (pid), GST_plugins_a2s (ve->address)); 612 "Could not get a valid session for `%s' `%s'\n",
613 GNUNET_i2s (pid),
614 GST_plugins_a2s (ve->address));
612 ret = -1; 615 ret = -1;
613 } 616 }
614 } 617 }
@@ -623,10 +626,10 @@ transmit_ping_if_allowed (void *cls,
623 626
624 ve->network = network; 627 ve->network = network;
625 ve->expecting_pong = GNUNET_YES; 628 ve->expecting_pong = GNUNET_YES;
626 validations_running ++; 629 validations_running++;
627 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 630 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
628 "Validation started, %u validation processes running\n", 631 "Validation started, %u validation processes running\n",
629 validations_running); 632 validations_running);
630 /* Notify about PING sent */ 633 /* Notify about PING sent */
631 validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE); 634 validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
632 } 635 }
@@ -943,27 +946,30 @@ multicast_pong (void *cls,
943{ 946{
944 struct TransportPongMessage *pong = cls; 947 struct TransportPongMessage *pong = cls;
945 struct GNUNET_TRANSPORT_PluginFunctions *papi; 948 struct GNUNET_TRANSPORT_PluginFunctions *papi;
949 struct Session *session;
946 950
947 papi = GST_plugins_find (address->transport_name); 951 papi = GST_plugins_find (address->transport_name);
948 if (papi == NULL) 952 if (NULL == papi)
949 return; 953 return;
950 954
951 GNUNET_assert (papi->send != NULL); 955 GNUNET_assert (NULL != papi->send);
952 GNUNET_assert (papi->get_session != NULL); 956 GNUNET_assert (NULL != papi->get_session);
953 957 session = papi->get_session(papi->cls, address);
954 struct Session * session = papi->get_session(papi->cls, address); 958 if (NULL == session)
955 if (session == NULL)
956 { 959 {
957 GNUNET_break (0); 960 GNUNET_break (0);
958 return; 961 return;
959 } 962 }
960
961 papi->send (papi->cls, session, 963 papi->send (papi->cls, session,
962 (const char *) pong, ntohs (pong->header.size), 964 (const char *) pong,
963 PONG_PRIORITY, ACCEPTABLE_PING_DELAY, 965 ntohs (pong->header.size),
966 PONG_PRIORITY,
967 ACCEPTABLE_PING_DELAY,
964 NULL, NULL); 968 NULL, NULL);
965 GST_neighbours_notify_data_sent (&address->peer, 969 GST_neighbours_notify_data_sent (&address->peer,
966 address, session, pong->header.size); 970 address,
971 session,
972 pong->header.size);
967 973
968} 974}
969 975
@@ -1197,7 +1203,7 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
1197 pong->header.size); 1203 pong->header.size);
1198 } 1204 }
1199 } 1205 }
1200 if (ret != -1) 1206 if (-1 != ret)
1201 { 1207 {
1202 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1208 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1203 "Transmitted PONG to `%s' via reliable mechanism\n", 1209 "Transmitted PONG to `%s' via reliable mechanism\n",