aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-01-25 21:08:22 +0000
committerChristian Grothoff <christian@grothoff.org>2015-01-25 21:08:22 +0000
commit260d4269dd93fd8e4e5af766e15970251c5b7ac9 (patch)
tree6b2b7ac3e1ba4224791518a38276efdd9729bb65 /src/transport/gnunet-service-transport.c
parentee266d0bd0b96c67ac1c7f76fff41980bb181e64 (diff)
downloadgnunet-260d4269dd93fd8e4e5af766e15970251c5b7ac9.tar.gz
gnunet-260d4269dd93fd8e4e5af766e15970251c5b7ac9.zip
-undo bad commit
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r--src/transport/gnunet-service-transport.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index b21b0c384..5126dad96 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -732,15 +732,11 @@ plugin_env_session_start (void *cls,
732 session, 732 session,
733 GNUNET_i2s (&address->peer), 733 GNUNET_i2s (&address->peer),
734 GST_plugins_a2s (address)); 734 GST_plugins_a2s (address));
735 if ( (GNUNET_YES == 735 if (GNUNET_YES ==
736 GNUNET_HELLO_address_check_option (address, 736 GNUNET_HELLO_address_check_option (address,
737 GNUNET_HELLO_ADDRESS_INFO_INBOUND)) || 737 GNUNET_HELLO_ADDRESS_INFO_INBOUND))
738 (GNUNET_NO ==
739 GST_ats_is_known (address, session) ) )
740 { 738 {
741 /* inbound is always new, but outbound MAY already be known, but 739 /* inbound is always new */
742 for example for UNIX, we have symmetric connections and thus we
743 may not know the address yet; add if necessary! */
744 GST_ats_add_address (address, 740 GST_ats_add_address (address,
745 session, 741 session,
746 ats, 742 ats,
@@ -748,6 +744,7 @@ plugin_env_session_start (void *cls,
748 } 744 }
749 else 745 else
750 { 746 {
747 /* outbound should already be known */
751 GST_ats_new_session (address, 748 GST_ats_new_session (address,
752 session); 749 session);
753 GST_ats_update_metrics (address, 750 GST_ats_update_metrics (address,
@@ -926,8 +923,8 @@ shutdown_task (void *cls,
926 const struct GNUNET_SCHEDULER_TaskContext *tc) 923 const struct GNUNET_SCHEDULER_TaskContext *tc)
927{ 924{
928 GST_neighbours_stop (); 925 GST_neighbours_stop ();
929 GST_plugins_unload ();
930 GST_validation_stop (); 926 GST_validation_stop ();
927 GST_plugins_unload ();
931 GST_ats_done (); 928 GST_ats_done ();
932 GNUNET_ATS_scheduling_done (GST_ats); 929 GNUNET_ATS_scheduling_done (GST_ats);
933 GST_ats = NULL; 930 GST_ats = NULL;