-have default line, complain about missing options to log

2 files changed, 12 insertions, 0 deletions

diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in
index 54204fc9f..ca27b535a 100644
--- a/src/conversation/conversation.conf.in
+++ b/src/conversation/conversation.conf.in
@@ -4,6 +4,7 @@ BINARY = gnunet-service-conversation
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock
 HOSTNAME = localhost
 @UNIXONLY@ PORT = 2106
+LINE = 1
 
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 24cd52eb2..a9efb7495 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -667,9 +667,20 @@ GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                              "CONVERSATION",
                                              "LINE",
                                              &line))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "CONVERSATION",
+                               "LINE");
     return NULL;
+  }
   if (line >= (1 << 31))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               "CONVERSATION",
+                               "LINE",
+                               _("number too large"));
     return NULL;
+  }
   phone = GNUNET_new (struct GNUNET_CONVERSATION_Phone);
   if (GNUNET_OK !=
       GNUNET_CRYPTO_get_peer_identity (cfg,