Correctly honor the PROVIDE_EXIT-option

We are not using the msg-types to arbitrate anymore...

1 files changed, 18 insertions, 16 deletions

diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 6349e0547..a9deb58ad 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -1135,25 +1135,27 @@ run (void *cls,
     {NULL, NULL, 0, 0}
   };
 
-  static struct GNUNET_MESH_MessageHandler *mesh_handlers;
+  static const struct GNUNET_MESH_MessageHandler mesh_handlers[] = {
+    {receive_mesh_query, GNUNET_MESSAGE_TYPE_REMOTE_QUERY_DNS, 0},
+    {receive_mesh_answer, GNUNET_MESSAGE_TYPE_REMOTE_ANSWER_DNS, 0},
+    {NULL, 0, 0}
+  };
+
+  static GNUNET_MESH_ApplicationType *apptypes;
 
-  if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(cfg_, "dns", "PROVIDE_EXIT"))
-    mesh_handlers = (struct GNUNET_MESH_MessageHandler[]) {
-          {receive_mesh_query, GNUNET_MESSAGE_TYPE_REMOTE_QUERY_DNS, 0},
-          {NULL, 0, 0}
-    };
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_yesno (cfg_, "dns", "PROVIDE_EXIT"))
+    apptypes = (GNUNET_MESH_ApplicationType[])
+    {
+    GNUNET_APPLICATION_TYPE_INTERNET_RESOLVER,
+    GNUNET_APPLICATION_TYPE_END};
   else
-    mesh_handlers = (struct GNUNET_MESH_MessageHandler[]) {
-          {receive_mesh_answer, GNUNET_MESSAGE_TYPE_REMOTE_ANSWER_DNS, 0},
-          {NULL, 0, 0}
-    };
-
-  static const GNUNET_MESH_ApplicationType apptypes[] =
-    { GNUNET_APPLICATION_TYPE_INTERNET_RESOLVER,
-    GNUNET_APPLICATION_TYPE_END
-  };
+  apptypes = (GNUNET_MESH_ApplicationType[])
+  {
+  GNUNET_APPLICATION_TYPE_END};
 
-  mesh_handle = GNUNET_MESH_connect (cfg_, NULL, NULL, mesh_handlers, apptypes);
+  mesh_handle =
+    GNUNET_MESH_connect (cfg_, NULL, NULL, mesh_handlers, apptypes);
 
   cfg = cfg_;