diff options
author | LRN <lrn1986@gmail.com> | 2014-12-23 05:07:02 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-12-23 05:07:02 +0000 |
commit | eb5224e351e70128f6f0afc4b9e7c5fe90c72213 (patch) | |
tree | bbb8a0c34916564b64b1f4ae18decc2a206fa239 /src | |
parent | 8bcc9eb56238a7e63655ffc229363f0aaee5b0fd (diff) | |
download | gnunet-eb5224e351e70128f6f0afc4b9e7c5fe90c72213.tar.gz gnunet-eb5224e351e70128f6f0afc4b9e7c5fe90c72213.zip |
Rename DEFAULT_QUALITY to MLP_DEFAULT_QUALITY to avoid conflicting with W32 GDI
Diffstat (limited to 'src')
-rw-r--r-- | src/ats/plugin_ats_mlp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c index d2f95242a..75bb76dde 100644 --- a/src/ats/plugin_ats_mlp.c +++ b/src/ats/plugin_ats_mlp.c | |||
@@ -42,12 +42,12 @@ | |||
42 | #define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10) | 42 | #define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10) |
43 | #define MLP_MAX_ITERATIONS 4096 | 43 | #define MLP_MAX_ITERATIONS 4096 |
44 | 44 | ||
45 | #define DEFAULT_D 1.0 | 45 | #define MLP_DEFAULT_D 1.0 |
46 | #define DEFAULT_R 1.0 | 46 | #define MLP_DEFAULT_R 1.0 |
47 | #define DEFAULT_U 1.0 | 47 | #define MLP_DEFAULT_U 1.0 |
48 | #define DEFAULT_QUALITY 1.0 | 48 | #define MLP_DEFAULT_QUALITY 1.0 |
49 | #define DEFAULT_MIN_CONNECTIONS 4 | 49 | #define MLP_DEFAULT_MIN_CONNECTIONS 4 |
50 | #define DEFAULT_PEER_PREFERENCE 1.0 | 50 | #define MLP_DEFAULT_PEER_PREFERENCE 1.0 |
51 | 51 | ||
52 | #define MLP_NaN -1 | 52 | #define MLP_NaN -1 |
53 | #define MLP_UNDEFINED 0 | 53 | #define MLP_UNDEFINED 0 |
@@ -2794,7 +2794,7 @@ libgnunet_plugin_ats_mlp_init (void *cls) | |||
2794 | } | 2794 | } |
2795 | 2795 | ||
2796 | /* Get diversity coefficient from configuration */ | 2796 | /* Get diversity coefficient from configuration */ |
2797 | mlp->pv.co_D = DEFAULT_D; | 2797 | mlp->pv.co_D = MLP_DEFAULT_D; |
2798 | if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats", | 2798 | if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats", |
2799 | "MLP_COEFFICIENT_D", &f_tmp)) | 2799 | "MLP_COEFFICIENT_D", &f_tmp)) |
2800 | { | 2800 | { |
@@ -2812,7 +2812,7 @@ libgnunet_plugin_ats_mlp_init (void *cls) | |||
2812 | } | 2812 | } |
2813 | 2813 | ||
2814 | /* Get relativity coefficient from configuration */ | 2814 | /* Get relativity coefficient from configuration */ |
2815 | mlp->pv.co_R = DEFAULT_R; | 2815 | mlp->pv.co_R = MLP_DEFAULT_R; |
2816 | if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats", | 2816 | if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats", |
2817 | "MLP_COEFFICIENT_R", &f_tmp)) | 2817 | "MLP_COEFFICIENT_R", &f_tmp)) |
2818 | { | 2818 | { |
@@ -2831,7 +2831,7 @@ libgnunet_plugin_ats_mlp_init (void *cls) | |||
2831 | 2831 | ||
2832 | 2832 | ||
2833 | /* Get utilization coefficient from configuration */ | 2833 | /* Get utilization coefficient from configuration */ |
2834 | mlp->pv.co_U = DEFAULT_U; | 2834 | mlp->pv.co_U = MLP_DEFAULT_U; |
2835 | if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats", | 2835 | if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats", |
2836 | "MLP_COEFFICIENT_U", &f_tmp)) | 2836 | "MLP_COEFFICIENT_U", &f_tmp)) |
2837 | { | 2837 | { |
@@ -2855,7 +2855,7 @@ libgnunet_plugin_ats_mlp_init (void *cls) | |||
2855 | for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++) | 2855 | for (c = 0; c < GNUNET_ATS_QualityPropertiesCount; c++) |
2856 | { | 2856 | { |
2857 | /* initialize quality coefficients with default value 1.0 */ | 2857 | /* initialize quality coefficients with default value 1.0 */ |
2858 | mlp->pv.co_Q[c] = DEFAULT_QUALITY; | 2858 | mlp->pv.co_Q[c] = MLP_DEFAULT_QUALITY; |
2859 | 2859 | ||
2860 | mlp->pv.q[c] = q[c]; | 2860 | mlp->pv.q[c] = q[c]; |
2861 | if (q[c] == GNUNET_ATS_QUALITY_NET_DELAY) | 2861 | if (q[c] == GNUNET_ATS_QUALITY_NET_DELAY) |
@@ -2869,14 +2869,14 @@ libgnunet_plugin_ats_mlp_init (void *cls) | |||
2869 | "MLP_COEFFICIENT_QUALITY_DELAY", &tmp)) ) | 2869 | "MLP_COEFFICIENT_QUALITY_DELAY", &tmp)) ) |
2870 | mlp->pv.co_Q[i_delay] = (double) tmp / 100; | 2870 | mlp->pv.co_Q[i_delay] = (double) tmp / 100; |
2871 | else | 2871 | else |
2872 | mlp->pv.co_Q[i_delay] = DEFAULT_QUALITY; | 2872 | mlp->pv.co_Q[i_delay] = MLP_DEFAULT_QUALITY; |
2873 | 2873 | ||
2874 | if ( (i_distance != MLP_NaN) && | 2874 | if ( (i_distance != MLP_NaN) && |
2875 | (GNUNET_OK == GNUNET_CONFIGURATION_get_value_size (env->cfg, "ats", | 2875 | (GNUNET_OK == GNUNET_CONFIGURATION_get_value_size (env->cfg, "ats", |
2876 | "MLP_COEFFICIENT_QUALITY_DISTANCE", &tmp)) ) | 2876 | "MLP_COEFFICIENT_QUALITY_DISTANCE", &tmp)) ) |
2877 | mlp->pv.co_Q[i_distance] = (double) tmp / 100; | 2877 | mlp->pv.co_Q[i_distance] = (double) tmp / 100; |
2878 | else | 2878 | else |
2879 | mlp->pv.co_Q[i_distance] = DEFAULT_QUALITY; | 2879 | mlp->pv.co_Q[i_distance] = MLP_DEFAULT_QUALITY; |
2880 | 2880 | ||
2881 | /* Get minimum bandwidth per used address from configuration */ | 2881 | /* Get minimum bandwidth per used address from configuration */ |
2882 | if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_size (env->cfg, "ats", | 2882 | if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_size (env->cfg, "ats", |
@@ -2894,7 +2894,7 @@ libgnunet_plugin_ats_mlp_init (void *cls) | |||
2894 | &tmp)) | 2894 | &tmp)) |
2895 | n_min = tmp; | 2895 | n_min = tmp; |
2896 | else | 2896 | else |
2897 | n_min = DEFAULT_MIN_CONNECTIONS; | 2897 | n_min = MLP_DEFAULT_MIN_CONNECTIONS; |
2898 | 2898 | ||
2899 | /* Init network quotas */ | 2899 | /* Init network quotas */ |
2900 | int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType; | 2900 | int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType; |