indentation

1 files changed, 129 insertions, 144 deletions

diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h
index 5226c24df..d1d789b5f 100644
--- a/src/transport/gnunet-service-transport_ats.h
+++ b/src/transport/gnunet-service-transport_ats.h
@@ -68,10 +68,8 @@ struct ATS_mechanism;
 struct ATS_peer;
 
 typedef void (*GNUNET_TRANSPORT_ATS_AddressNotification)
-             (struct ATS_peer **peers,
-              int * c_p,
-              struct ATS_mechanism ** mechanisms,
-              int * c_m );
+    (struct ATS_peer ** peers,
+     int *c_p, struct ATS_mechanism ** mechanisms, int *c_m);
 
 typedef void (*GNUNET_TRANSPORT_ATS_ResultCallback) (void);
 
@@ -119,192 +117,192 @@ struct ATS_internals
      * result of last GLPK run
      * 5 == OPTIMAL
      */
-    int solution;
+  int solution;
 
     /**
      * Ressource costs or quality metrics changed
      * update problem before solving
      */
-    int modified_resources;
+  int modified_resources;
 
     /**
      * Ressource costs or quality metrics changed, update matrix
      * update problem before solving
      */
-    int modified_quality;
+  int modified_quality;
 
     /**
      * Peers have connected or disconnected
      * problem has to be recreated
      */
-    int recreate_problem;
+  int recreate_problem;
 
     /**
      * Was the available basis invalid and we needed to rerun simplex?
      */
-    int simplex_rerun_required;
+  int simplex_rerun_required;
 
     /**
      * is problem currently valid and can it be solved
      */
-    int valid;
+  int valid;
 
     /**
      * Number of transport mechanisms in the problem
      */
-    int c_mechs;
+  int c_mechs;
 
     /**
      * Number of transport mechanisms in the problem
      */
-    int c_peers;
+  int c_peers;
 
     /**
      * row index where quality related rows start
      */
-    int begin_qm;
+  int begin_qm;
 
     /**
      * row index where quality related rows end
      */
-    int end_qm;
+  int end_qm;
 
     /**
      * row index where ressource cost related rows start
      */
-    int begin_cr;
+  int begin_cr;
 
     /**
      * row index where ressource cost related rows end
      */
-    int end_cr;
+  int end_cr;
 
     /**
      * column index for objective function value d
      */
-    int col_d;
+  int col_d;
 
     /**
      * column index for objective function value u
      */
-    int col_u;
+  int col_u;
 
     /**
      * column index for objective function value r
      */
-    int col_r;
+  int col_r;
 
     /**
      * column index for objective function value quality metrics
      */
-    int col_qm;
+  int col_qm;
 
     /**
      * column index for objective function value cost ressources
      */
-    int col_cr;
+  int col_cr;
 };
 
 struct ATS_Handle
 {
-    /*
-     *  Callback functions
-     */
+  /*
+   *  Callback functions
+   */
 
-    GNUNET_TRANSPORT_ATS_AddressNotification addr_notification;
+  GNUNET_TRANSPORT_ATS_AddressNotification addr_notification;
 
-    GNUNET_TRANSPORT_ATS_ResultCallback result_cb;
+  GNUNET_TRANSPORT_ATS_ResultCallback result_cb;
 
 
     /**
      * Statistics handle
      */
-    struct GNUNET_STATISTICS_Handle *stats;
+  struct GNUNET_STATISTICS_Handle *stats;
 
     /**
      * Maximum execution time per calculation
      */
-    struct GNUNET_TIME_Relative max_exec_duration;
+  struct GNUNET_TIME_Relative max_exec_duration;
 
     /**
      * GLPK (MLP) problem object
      */
 #if HAVE_LIBGLPK
 
-    glp_prob *prob;
+  glp_prob *prob;
 #else
-    void * prob;
+  void *prob;
 #endif
 
     /**
      * Internal information state of the GLPK problem
      */
-    struct ATS_internals internal;
+  struct ATS_internals internal;
 
     /**
      * mechanisms used in current problem
      * needed for problem modification
      */
-    struct ATS_mechanism * mechanisms;
+  struct ATS_mechanism *mechanisms;
 
     /**
      * peers used in current problem
      * needed for problem modification
      */
-    struct ATS_peer * peers;
+  struct ATS_peer *peers;
 
     /**
      * State of the MLP problem
      * value of ATS_problem_state
      *
      */
-    int state;
+  int state;
 
     /**
      * number of successful executions
      */
-    int successful_executions;
+  int successful_executions;
 
     /**
      * number with an invalid result
      */
-    int invalid_executions;
+  int invalid_executions;
 
     /**
      * Maximum number of LP iterations per calculation
      */
-    int max_iterations;
+  int max_iterations;
 
 
-    /*
-     * ATS configuration
-     */
+  /*
+   * ATS configuration
+   */
 
 
     /**
      * Diversity weight
      */
-    double D;
+  double D;
 
     /**
      * Utility weight
      */
-    double U;
+  double U;
 
     /**
      * Relativity weight
      */
-    double R;
+  double R;
 
     /**
      * Minimum bandwidth per peer
      */
-    int v_b_min;
+  int v_b_min;
 
     /**
      * Minimum number of connections per peer
      */
-    int v_n_min;
+  int v_n_min;
 
 
     /**
@@ -315,104 +313,104 @@ struct ATS_Handle
     /**
      * Dump problem to a file?
      */
-    int save_mlp;
+  int save_mlp;
 
     /**
      * Dump solution to a file
      */
-    int save_solution;
+  int save_solution;
 
     /**
      * Dump solution when minimum peers:
      */
-    int dump_min_peers;
+  int dump_min_peers;
 
     /**
      * Dump solution when minimum addresses:
      */
-    int dump_min_addr;
+  int dump_min_addr;
 
     /**
      * Dump solution overwrite file:
      */
-    int dump_overwrite;
+  int dump_overwrite;
 };
 
 struct ATS_mechanism
 {
-    struct ATS_mechanism * prev;
-    struct ATS_mechanism * next;
-    struct ForeignAddressList * addr;
-    struct ATS_quality_entry * quality;
-    struct ATS_ressource_entry * ressources;
-    struct TransportPlugin * plugin;
-    struct ATS_peer * peer;
-    int col_index;
-    int     id;
-    struct ATS_ressource_cost * rc;
+  struct ATS_mechanism *prev;
+  struct ATS_mechanism *next;
+  struct ForeignAddressList *addr;
+  struct ATS_quality_entry *quality;
+  struct ATS_ressource_entry *ressources;
+  struct TransportPlugin *plugin;
+  struct ATS_peer *peer;
+  int col_index;
+  int id;
+  struct ATS_ressource_cost *rc;
 };
 
 struct ATS_peer
 {
-    struct GNUNET_PeerIdentity peer;
+  struct GNUNET_PeerIdentity peer;
 
-    struct ATS_mechanism * m_head;
-    struct ATS_mechanism * m_tail;
+  struct ATS_mechanism *m_head;
+  struct ATS_mechanism *m_tail;
 
-    /* preference value f */
-    double f;
+  /* preference value f */
+  double f;
 
-    //struct NeighbourList * n;
+  //struct NeighbourList * n;
 };
 
 struct ATS_ressource
 {
-    /* index in ressources array */
-    int index;
-    /* depending ATSi parameter to calculcate limits */
-    int atis_index;
-    /* cfg option to load limits */
-    char * cfg_param;
-    /* lower bound */
-    double c_min;
-    /* upper bound */
-    double c_max;
-
-    /* cofficients for the specific plugins */
-    double c_unix;
-    double c_tcp;
-    double c_udp;
-    double c_http;
-    double c_https;
-    double c_wlan;
-    double c_default;
+  /* index in ressources array */
+  int index;
+  /* depending ATSi parameter to calculcate limits */
+  int atis_index;
+  /* cfg option to load limits */
+  char *cfg_param;
+  /* lower bound */
+  double c_min;
+  /* upper bound */
+  double c_max;
+
+  /* cofficients for the specific plugins */
+  double c_unix;
+  double c_tcp;
+  double c_udp;
+  double c_http;
+  double c_https;
+  double c_wlan;
+  double c_default;
 };
 
 
 struct ATS_ressource_entry
 {
-    /* index in ressources array */
-    int index;
-    /* depending ATSi parameter to calculcate limits */
-    int atis_index;
-    /* lower bound */
-    double c;
+  /* index in ressources array */
+  int index;
+  /* depending ATSi parameter to calculcate limits */
+  int atis_index;
+  /* lower bound */
+  double c;
 };
 
 
 struct ATS_quality_metric
 {
-    int index;
-    int atis_index;
-    char * name;
+  int index;
+  int atis_index;
+  char *name;
 };
 
 struct ATS_quality_entry
 {
-    int index;
-    int atsi_index;
-    uint32_t values[3];
-    int current;
+  int index;
+  int atsi_index;
+  uint32_t values[3];
+  int current;
 };
 
 /*
@@ -420,12 +418,11 @@ struct ATS_quality_entry
  */
 
 
-static struct ATS_ressource ressources[] =
-{
-    /* FIXME: the coefficients for the specific plugins */
-    {1, 7, "LAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 1, 3},
-    {2, 7, "WAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 2, 3},
-    {3, 4, "WLAN_ENERGY_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 0, 0, 0, 0, 2, 1}
+static struct ATS_ressource ressources[] = {
+  /* FIXME: the coefficients for the specific plugins */
+  {1, 7, "LAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 1, 3},
+  {2, 7, "WAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 2, 3},
+  {3, 4, "WLAN_ENERGY_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 0, 0, 0, 0, 2, 1}
 /*
     {4, 4, "COST_ENERGY_CONSUMPTION", VERY_BIG_DOUBLE_VALUE},
     {5, 5, "COST_CONNECT", VERY_BIG_DOUBLE_VALUE},
@@ -439,8 +436,7 @@ static struct ATS_ressource ressources[] =
  * ATS quality metrics
  */
 
-static struct ATS_quality_metric qm[] =
-{
+static struct ATS_quality_metric qm[] = {
   {1, 1028, "QUALITY_NET_DISTANCE"},
   {2, 1034, "QUALITY_NET_DELAY"},
 };
@@ -451,61 +447,50 @@ static struct ATS_quality_metric qm[] =
 /*
  * ATS functions
  */
-struct ATS_Handle *
-ats_init (double D,
-          double U,
-          double R,
-          int v_b_min,
-          int v_n_min,
-          int max_iterations,
-          struct GNUNET_TIME_Relative max_duration,
-          GNUNET_TRANSPORT_ATS_AddressNotification address_not,
-          GNUNET_TRANSPORT_ATS_ResultCallback res_cb);
+struct ATS_Handle *ats_init (double D,
+                             double U,
+                             double R,
+                             int v_b_min,
+                             int v_n_min,
+                             int max_iterations,
+                             struct GNUNET_TIME_Relative max_duration,
+                             GNUNET_TRANSPORT_ATS_AddressNotification
+                             address_not,
+                             GNUNET_TRANSPORT_ATS_ResultCallback res_cb);
 
-void
-ats_shutdown (struct ATS_Handle * ats);
+void ats_shutdown (struct ATS_Handle *ats);
 
-void
-ats_delete_problem (struct ATS_Handle * ats);
+void ats_delete_problem (struct ATS_Handle *ats);
 
 int
 ats_create_problem (struct ATS_Handle *ats,
                     struct ATS_internals *stat,
                     struct ATS_peer *peers,
-                    int c_p,
-                    struct ATS_mechanism *mechanisms,
-                    int c_m);
+                    int c_p, struct ATS_mechanism *mechanisms, int c_m);
 
-void ats_modify_problem_state (struct ATS_Handle * ats,
-    enum ATS_problem_state s);
+void ats_modify_problem_state (struct ATS_Handle *ats,
+                               enum ATS_problem_state s);
 
-void
-ats_calculate_bandwidth_distribution (struct ATS_Handle * ats);
+void ats_calculate_bandwidth_distribution (struct ATS_Handle *ats);
 
 void
-ats_solve_problem (struct ATS_Handle * ats,
-    unsigned int max_it,
-    unsigned int  max_dur,
-    unsigned int c_peers,
-    unsigned int  c_mechs,
-    struct ATS_internals *stat);
+ats_solve_problem (struct ATS_Handle *ats,
+                   unsigned int max_it,
+                   unsigned int max_dur,
+                   unsigned int c_peers,
+                   unsigned int c_mechs, struct ATS_internals *stat);
 
-int
-ats_evaluate_results (int result,
-    int solution,
-    char * problem);
+int ats_evaluate_results (int result, int solution, char *problem);
 
-void
-ats_update_problem_qm (struct ATS_Handle * ats);
+void ats_update_problem_qm (struct ATS_Handle *ats);
 
-void
-ats_update_problem_cr (struct ATS_Handle * ats);
+void ats_update_problem_cr (struct ATS_Handle *ats);
 
 
 void
-ats_set_logging_options (struct ATS_Handle * ats,
-                         struct GNUNET_STATISTICS_Handle *stats,
-                         const struct GNUNET_CONFIGURATION_Handle *cfg);
+ats_set_logging_options (struct ATS_Handle *ats,
+                         struct GNUNET_STATISTICS_Handle *stats,
+                         const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 #endif
 /* end of file gnunet-service-transport_ats.h */