diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-09-06 13:32:37 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-09-06 13:32:37 +0000 |
commit | 240715f901a8ee70c01f0293ee8fcca76fb85f7d (patch) | |
tree | a226c84e0e9f5733ff358a4a5d46650cda2acfd6 | |
parent | 9f812d987d53e33d2b9badf769de2f657bc4e2ed (diff) | |
download | gnunet-240715f901a8ee70c01f0293ee8fcca76fb85f7d.tar.gz gnunet-240715f901a8ee70c01f0293ee8fcca76fb85f7d.zip |
- use GNUNET_log_config_invalid
-rw-r--r-- | src/mesh/gnunet-service-mesh-enc.c | 73 |
1 files changed, 24 insertions, 49 deletions
diff --git a/src/mesh/gnunet-service-mesh-enc.c b/src/mesh/gnunet-service-mesh-enc.c index 49575f9da..ad0f2efd3 100644 --- a/src/mesh/gnunet-service-mesh-enc.c +++ b/src/mesh/gnunet-service-mesh-enc.c | |||
@@ -7150,33 +7150,19 @@ static void | |||
7150 | run (void *cls, struct GNUNET_SERVER_Handle *server, | 7150 | run (void *cls, struct GNUNET_SERVER_Handle *server, |
7151 | const struct GNUNET_CONFIGURATION_Handle *c) | 7151 | const struct GNUNET_CONFIGURATION_Handle *c) |
7152 | { | 7152 | { |
7153 | char *keyfile; | ||
7154 | struct GNUNET_CRYPTO_EccPrivateKey *pk; | 7153 | struct GNUNET_CRYPTO_EccPrivateKey *pk; |
7155 | 7154 | ||
7156 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting to run\n"); | 7155 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting to run\n"); |
7157 | server_handle = server; | 7156 | server_handle = server; |
7158 | GNUNET_SERVER_suspend (server_handle); | 7157 | GNUNET_SERVER_suspend (server_handle); |
7159 | 7158 | ||
7160 | if (GNUNET_OK != | 7159 | |
7161 | GNUNET_CONFIGURATION_get_value_filename (c, "PEER", "PRIVATE_KEY", | ||
7162 | &keyfile)) | ||
7163 | { | ||
7164 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
7165 | _ | ||
7166 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
7167 | "mesh", "peer/privatekey"); | ||
7168 | GNUNET_SCHEDULER_shutdown (); | ||
7169 | return; | ||
7170 | } | ||
7171 | |||
7172 | if (GNUNET_OK != | 7160 | if (GNUNET_OK != |
7173 | GNUNET_CONFIGURATION_get_value_time (c, "MESH", "REFRESH_CONNECTION_TIME", | 7161 | GNUNET_CONFIGURATION_get_value_time (c, "MESH", "REFRESH_CONNECTION_TIME", |
7174 | &refresh_connection_time)) | 7162 | &refresh_connection_time)) |
7175 | { | 7163 | { |
7176 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 7164 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, |
7177 | _ | 7165 | "MESH", "REFRESH_CONNECTION_TIME", "MISSING"); |
7178 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
7179 | "mesh", "refresh path time"); | ||
7180 | GNUNET_SCHEDULER_shutdown (); | 7166 | GNUNET_SCHEDULER_shutdown (); |
7181 | return; | 7167 | return; |
7182 | } | 7168 | } |
@@ -7185,10 +7171,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7185 | GNUNET_CONFIGURATION_get_value_time (c, "MESH", "ID_ANNOUNCE_TIME", | 7171 | GNUNET_CONFIGURATION_get_value_time (c, "MESH", "ID_ANNOUNCE_TIME", |
7186 | &id_announce_time)) | 7172 | &id_announce_time)) |
7187 | { | 7173 | { |
7188 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 7174 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, |
7189 | _ | 7175 | "MESH", "ID_ANNOUNCE_TIME", "MISSING"); |
7190 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
7191 | "mesh", "id announce time"); | ||
7192 | GNUNET_SCHEDULER_shutdown (); | 7176 | GNUNET_SCHEDULER_shutdown (); |
7193 | return; | 7177 | return; |
7194 | } | 7178 | } |
@@ -7197,10 +7181,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7197 | GNUNET_CONFIGURATION_get_value_time (c, "MESH", "CONNECT_TIMEOUT", | 7181 | GNUNET_CONFIGURATION_get_value_time (c, "MESH", "CONNECT_TIMEOUT", |
7198 | &connect_timeout)) | 7182 | &connect_timeout)) |
7199 | { | 7183 | { |
7200 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 7184 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, |
7201 | _ | 7185 | "MESH", "CONNECT_TIMEOUT", "MISSING"); |
7202 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
7203 | "mesh", "connect timeout"); | ||
7204 | GNUNET_SCHEDULER_shutdown (); | 7186 | GNUNET_SCHEDULER_shutdown (); |
7205 | return; | 7187 | return; |
7206 | } | 7188 | } |
@@ -7209,10 +7191,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7209 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_MSGS_QUEUE", | 7191 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_MSGS_QUEUE", |
7210 | &max_msgs_queue)) | 7192 | &max_msgs_queue)) |
7211 | { | 7193 | { |
7212 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 7194 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, |
7213 | _ | 7195 | "MESH", "MAX_MSGS_QUEUE", "MISSING"); |
7214 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
7215 | "mesh", "max msgs queue"); | ||
7216 | GNUNET_SCHEDULER_shutdown (); | 7196 | GNUNET_SCHEDULER_shutdown (); |
7217 | return; | 7197 | return; |
7218 | } | 7198 | } |
@@ -7221,10 +7201,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7221 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_CONNECTIONS", | 7201 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_CONNECTIONS", |
7222 | &max_connections)) | 7202 | &max_connections)) |
7223 | { | 7203 | { |
7224 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 7204 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, |
7225 | _ | 7205 | "MESH", "MAX_CONNECTIONS", "MISSING"); |
7226 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
7227 | "mesh", "max tunnels"); | ||
7228 | GNUNET_SCHEDULER_shutdown (); | 7206 | GNUNET_SCHEDULER_shutdown (); |
7229 | return; | 7207 | return; |
7230 | } | 7208 | } |
@@ -7233,10 +7211,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7233 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "DEFAULT_TTL", | 7211 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "DEFAULT_TTL", |
7234 | &default_ttl)) | 7212 | &default_ttl)) |
7235 | { | 7213 | { |
7236 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 7214 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING, |
7237 | _ | 7215 | "MESH", "DEFAULT_TTL", "USING DEFAULT"); |
7238 | ("%s service is lacking key configuration settings (%s). Using default (%u).\n"), | ||
7239 | "mesh", "default ttl", 64); | ||
7240 | default_ttl = 64; | 7216 | default_ttl = 64; |
7241 | } | 7217 | } |
7242 | 7218 | ||
@@ -7244,9 +7220,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7244 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_PEERS", | 7220 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_PEERS", |
7245 | &max_peers)) | 7221 | &max_peers)) |
7246 | { | 7222 | { |
7247 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 7223 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING, |
7248 | _("%s service is lacking key configuration settings (%s). Using default (%u).\n"), | 7224 | "MESH", "MAX_PEERS", "USING DEFAULT"); |
7249 | "mesh", "max peers", 1000); | ||
7250 | max_peers = 1000; | 7225 | max_peers = 1000; |
7251 | } | 7226 | } |
7252 | 7227 | ||
@@ -7259,19 +7234,19 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7259 | else | 7234 | else |
7260 | { | 7235 | { |
7261 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 7236 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
7262 | "Mesh is running with drop mode enabled. " | 7237 | "\n***************************************\n" |
7263 | "This is NOT a good idea! " | 7238 | "Mesh is running with drop mode enabled.\n" |
7264 | "Remove the DROP_PERCENT option from your configuration.\n"); | 7239 | "This is NOT a good idea!\n" |
7240 | "Remove the DROP_PERCENT option from your configuration.\n" | ||
7241 | "***************************************\n"); | ||
7265 | } | 7242 | } |
7266 | 7243 | ||
7267 | if (GNUNET_OK != | 7244 | if (GNUNET_OK != |
7268 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "DHT_REPLICATION_LEVEL", | 7245 | GNUNET_CONFIGURATION_get_value_number (c, "MESH", "DHT_REPLICATION_LEVEL", |
7269 | &dht_replication_level)) | 7246 | &dht_replication_level)) |
7270 | { | 7247 | { |
7271 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 7248 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING, |
7272 | _ | 7249 | "MESH", "DHT_REPLICATION_LEVEL", "USING DEFAULT"); |
7273 | ("%s service is lacking key configuration settings (%s). Using default (%u).\n"), | ||
7274 | "mesh", "dht replication level", 3); | ||
7275 | dht_replication_level = 3; | 7250 | dht_replication_level = 3; |
7276 | } | 7251 | } |
7277 | 7252 | ||
@@ -7289,8 +7264,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
7289 | /* Scheduled the task to clean up when shutdown is called */ | 7264 | /* Scheduled the task to clean up when shutdown is called */ |
7290 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, | 7265 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
7291 | NULL); | 7266 | NULL); |
7292 | pk = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 7267 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "reading key\n"); |
7293 | GNUNET_free (keyfile); | 7268 | pk = GNUNET_CRYPTO_ecc_key_create_from_configuration (c); |
7294 | GNUNET_assert (NULL != pk); | 7269 | GNUNET_assert (NULL != pk); |
7295 | my_private_key = pk; | 7270 | my_private_key = pk; |
7296 | GNUNET_CRYPTO_ecc_key_get_public (my_private_key, &my_public_key); | 7271 | GNUNET_CRYPTO_ecc_key_get_public (my_private_key, &my_public_key); |