aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-09-27 19:01:04 +0000
committerChristian Grothoff <christian@grothoff.org>2012-09-27 19:01:04 +0000
commit383eec1895fff4a83f26bb8244d86571dd5baef9 (patch)
treedc6eccf68932c71785ee86d688ebebeda2ac4025 /src/transport
parent195267a6ac380d106d9409aa296885251d102c8e (diff)
downloadgnunet-383eec1895fff4a83f26bb8244d86571dd5baef9.tar.gz
gnunet-383eec1895fff4a83f26bb8244d86571dd5baef9.zip
reducing error messages about missing configuration options by introducing new helper functions to print them uniformly
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/gnunet-service-transport_blacklist.c5
-rw-r--r--src/transport/plugin_transport_tcp.c5
-rw-r--r--src/transport/plugin_transport_wlan.c14
3 files changed, 9 insertions, 15 deletions
diff --git a/src/transport/gnunet-service-transport_blacklist.c b/src/transport/gnunet-service-transport_blacklist.c
index 8b6e45612..505326879 100644
--- a/src/transport/gnunet-service-transport_blacklist.c
+++ b/src/transport/gnunet-service-transport_blacklist.c
@@ -230,9 +230,8 @@ read_blacklist_file ()
230 GNUNET_CONFIGURATION_get_value_filename (GST_cfg, "TRANSPORT", 230 GNUNET_CONFIGURATION_get_value_filename (GST_cfg, "TRANSPORT",
231 "BLACKLIST_FILE", &fn)) 231 "BLACKLIST_FILE", &fn))
232 { 232 {
233 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 233 GNUNET_log_config_missing (GNUNET_ERROR_TYPE_DEBUG,
234 "Option `%s' in section `%s' not specified!\n", 234 "transport", "BLACKLIST_FILE");
235 "BLACKLIST_FILE", "TRANSPORT");
236 return; 235 return;
237 } 236 }
238 if (GNUNET_OK != GNUNET_DISK_file_test (fn)) 237 if (GNUNET_OK != GNUNET_DISK_file_test (fn))
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 208ddad68..9d23c5121 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2385,9 +2385,8 @@ libgnunet_plugin_transport_tcp_init (void *cls)
2385 GNUNET_CONFIGURATION_get_value_time (env->cfg, "transport-tcp", 2385 GNUNET_CONFIGURATION_get_value_time (env->cfg, "transport-tcp",
2386 "TIMEOUT", &idle_timeout)) 2386 "TIMEOUT", &idle_timeout))
2387 { 2387 {
2388 LOG (GNUNET_ERROR_TYPE_ERROR, 2388 GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
2389 _("Failed to find option %s in section %s!\n"), 2389 "transport-tcp", "TIMEOUT");
2390 "TIMEOUT", "transport-tcp");
2391 if (plugin->nat != NULL) 2390 if (plugin->nat != NULL)
2392 GNUNET_NAT_unregister (plugin->nat); 2391 GNUNET_NAT_unregister (plugin->nat);
2393 GNUNET_free (plugin); 2392 GNUNET_free (plugin);
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 4ff1b67bf..49fe101b7 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -1691,11 +1691,9 @@ libgnunet_plugin_transport_wlan_init (void *cls)
1691 GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-wlan", 1691 GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-wlan",
1692 "TESTMODE", &testmode)) || 1692 "TESTMODE", &testmode)) ||
1693 (testmode > 2) ) ) 1693 (testmode > 2) ) )
1694 { 1694 {
1695 LOG (GNUNET_ERROR_TYPE_ERROR, 1695 GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
1696 _("Invalid configuration option `%s' in section `%s'\n"), 1696 "transport-wlan", "TESTMODE");
1697 "TESTMODE",
1698 "transport-wlan");
1699 return NULL; 1697 return NULL;
1700 } 1698 }
1701 if ( (0 == testmode) && 1699 if ( (0 == testmode) &&
@@ -1711,10 +1709,8 @@ libgnunet_plugin_transport_wlan_init (void *cls)
1711 (env->cfg, "transport-wlan", "INTERFACE", 1709 (env->cfg, "transport-wlan", "INTERFACE",
1712 &interface)) 1710 &interface))
1713 { 1711 {
1714 LOG (GNUNET_ERROR_TYPE_ERROR, 1712 GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
1715 _("Missing configuration option `%s' in section `%s'\n"), 1713 "transport-wlan", "INTERFACE");
1716 "INTERFACE",
1717 "transport-wlan");
1718 return NULL; 1714 return NULL;
1719 } 1715 }
1720 1716