[GNUnet-SVN] r14965 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-04-12 16:02:01 +0200 (Tue, 12 Apr 2011)
New Revision: 14965

Modified:
   gnunet/src/transport/gnunet-service-transport.c
Log:


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-04-12 13:56:36 UTC 
(rev 14964)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-04-12 14:02:01 UTC 
(rev 14965)
@@ -1107,18 +1107,18 @@
 static void try_transmission_to_peer (struct NeighbourList *n);
 
 
-void ats_init ();
+static void ats_init ();
 
-void ats_shutdown ( );
+static void ats_shutdown ( );
 
-void ats_notify_peer_connect (
+static void ats_notify_peer_connect (
                const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_TRANSPORT_ATS_Information *ats_data);
 
-void ats_notify_peer_disconnect (
+static void ats_notify_peer_disconnect (
                const struct GNUNET_PeerIdentity *peer);
 
-void ats_notify_ats_data (
+static void ats_notify_ats_data (
                const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_TRANSPORT_ATS_Information *ats_data);
 
@@ -5875,9 +5875,9 @@
 }
 #endif
 
+#if HAVE_LIBGLPK
 static void ats_solve_problem (unsigned int max_it, unsigned int  max_dur, 
unsigned int c_peers, unsigned int  c_mechs, struct ATS_result *res)
 {
-#if HAVE_LIBGLPK
        int result;
        int solution;
 
@@ -5975,10 +5975,11 @@
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", 
glp_get_col_name(prob,2*c_mechs+2), glp_get_col_prim(prob,2*c_mechs+2));
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", 
glp_get_col_name(prob,2*c_mechs+3), glp_get_col_prim(prob,2*c_mechs+3));
 #endif
+}
 #endif
 
-}
 
+#if HAVE_LIBGLPK
 /** solve the bandwidth distribution problem
  * @param max_it maximum iterations
  * @param max_dur maximum duration in ms
@@ -6438,6 +6439,7 @@
        return GNUNET_OK;
 #endif
 }
+#endif
 
 void ats_calculate_bandwidth_distribution ()
 {
@@ -6524,7 +6526,7 @@
 
 
 
-void
+static void
 ats_schedule_calculation (void *cls,
                          const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -6612,7 +6614,7 @@
 }
 
 
-void ats_shutdown ()
+static void ats_shutdown ()
 {
 #if DEBUG_ATS
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_destroy\n");
@@ -6664,7 +6666,7 @@
        ats_calculate_bandwidth_distribution (ats);
 }
 
-
+#if HAVE_LIBGLPK
 void ats_notify_ats_data (
                const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
@@ -6674,6 +6676,7 @@
 #endif
        ats_calculate_bandwidth_distribution(ats);
 }
+#endif
 
 struct ForeignAddressList * ats_get_preferred_address (
                struct NeighbourList *n)