aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r--src/transport/gnunet-service-transport.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 3f20ef7b8..f01c64bb4 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -6240,7 +6240,7 @@ static void ats_update_problem_qm ()
6240 6240
6241 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) 6241 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
6242 { 6242 {
6243 double v0, v1, v2; 6243 double v0 = 0, v1 = 0, v2 = 0;
6244 v0 = ats->mechanisms[c2].addr->quality[c-1].values[0]; 6244 v0 = ats->mechanisms[c2].addr->quality[c-1].values[0];
6245 if (v1 < 1) v0 = 0.1; 6245 if (v1 < 1) v0 = 0.1;
6246 v1 = ats->mechanisms[c2].addr->quality[c-1].values[1]; 6246 v1 = ats->mechanisms[c2].addr->quality[c-1].values[1];
@@ -6252,7 +6252,7 @@ static void ats_update_problem_qm ()
6252 } 6252 }
6253 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE) 6253 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
6254 { 6254 {
6255 double v0, v1, v2; 6255 double v0 = 0, v1 = 0, v2 = 0;
6256 v0 = ats->mechanisms[c2].addr->quality[c-1].values[0]; 6256 v0 = ats->mechanisms[c2].addr->quality[c-1].values[0];
6257 if (v0 < 1) v0 = 1; 6257 if (v0 < 1) v0 = 1;
6258 v1 = ats->mechanisms[c2].addr->quality[c-1].values[1]; 6258 v1 = ats->mechanisms[c2].addr->quality[c-1].values[1];
@@ -6729,7 +6729,7 @@ static int ats_create_problem (double D, double U, double R, int v_b_min, int v_
6729 ja[array_index] = c2; 6729 ja[array_index] = c2;
6730 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) 6730 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
6731 { 6731 {
6732 double v0, v1, v2; 6732 double v0 = 0, v1 = 0, v2 = 0;
6733 v0 = mechanisms[c2].addr->quality[c-1].values[0]; 6733 v0 = mechanisms[c2].addr->quality[c-1].values[0];
6734 if (v1 < 1) v0 = 0.1; 6734 if (v1 < 1) v0 = 0.1;
6735 v1 = mechanisms[c2].addr->quality[c-1].values[1]; 6735 v1 = mechanisms[c2].addr->quality[c-1].values[1];
@@ -6741,7 +6741,7 @@ static int ats_create_problem (double D, double U, double R, int v_b_min, int v_
6741 } 6741 }
6742 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE) 6742 if (qm[c-1].atis_index == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
6743 { 6743 {
6744 double v0, v1, v2; 6744 double v0 = 0, v1 = 0, v2 = 0;
6745 v0 = mechanisms[c2].addr->quality[c-1].values[0]; 6745 v0 = mechanisms[c2].addr->quality[c-1].values[0];
6746 if (v0 < 1) v0 = 1; 6746 if (v0 < 1) v0 = 1;
6747 v1 = mechanisms[c2].addr->quality[c-1].values[1]; 6747 v1 = mechanisms[c2].addr->quality[c-1].values[1];
@@ -6901,6 +6901,7 @@ ats_calculate_bandwidth_distribution ()
6901 text = "new"; 6901 text = "new";
6902 ats->modified_addr = GNUNET_YES; 6902 ats->modified_addr = GNUNET_YES;
6903 ats_delete_problem (); 6903 ats_delete_problem ();
6904
6904 ats_create_problem (ats->D, ats->U, ats->R, ats->v_b_min, ats->v_n_min, &ats->stat); 6905 ats_create_problem (ats->D, ats->U, ats->R, ats->v_b_min, ats->v_n_min, &ats->stat);
6905#if DEBUG_ATS 6906#if DEBUG_ATS
6906 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers/Addresses were modified... new problem: %i peer, %i mechs\n", ats->stat.c_peers, ats->stat.c_mechs); 6907 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers/Addresses were modified... new problem: %i peer, %i mechs\n", ats->stat.c_peers, ats->stat.c_mechs);
@@ -7137,8 +7138,10 @@ static void ats_shutdown ()
7137 if (ats->ats_task != GNUNET_SCHEDULER_NO_TASK) 7138 if (ats->ats_task != GNUNET_SCHEDULER_NO_TASK)
7138 GNUNET_SCHEDULER_cancel(ats->ats_task); 7139 GNUNET_SCHEDULER_cancel(ats->ats_task);
7139 ats->ats_task = GNUNET_SCHEDULER_NO_TASK; 7140 ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
7141
7140#if HAVE_LIBGLPK 7142#if HAVE_LIBGLPK
7141 ats_delete_problem (); 7143 ats_delete_problem ();
7144 glp_free_env();
7142#endif 7145#endif
7143 GNUNET_free (ats); 7146 GNUNET_free (ats);
7144} 7147}
@@ -7151,7 +7154,6 @@ void ats_notify_peer_connect (
7151#if DEBUG_ATS 7154#if DEBUG_ATS
7152 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_notify_peer_connect: %s\n",GNUNET_i2s(peer)); 7155 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_notify_peer_connect: %s\n",GNUNET_i2s(peer));
7153#endif 7156#endif
7154
7155 //update_addr_ats(); 7157 //update_addr_ats();
7156 ats->modified_addr = GNUNET_YES; 7158 ats->modified_addr = GNUNET_YES;
7157 7159