-misc DNS related bugfixes

2 files changed, 4 insertions, 6 deletions

diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index c26541457..c6cd83a74 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -114,7 +114,6 @@ GNUNET_CRYPTO_crc32_n (const void *buf, size_t len)
 }
 
 
-
 /**
  * Perform an incremental step in a CRC16 (for TCP/IP) calculation.
  *
@@ -126,7 +125,6 @@ GNUNET_CRYPTO_crc32_n (const void *buf, size_t len)
 uint32_t
 GNUNET_CRYPTO_crc16_step (uint32_t sum, uint16_t * hdr, size_t len)
 {
-  GNUNET_assert (0 == (len & 1));
   for (; len >= 2; len -= 2)
     sum += *(hdr++);
   if (len == 1)
diff --git a/src/util/helper.c b/src/util/helper.c
index e5c3be08f..d4d26ba51 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -152,7 +152,7 @@ stop_helper (struct GNUNET_HELPER_Handle *h)
 
   if (NULL != h->helper_proc)
   {
-    GNUNET_OS_process_kill (h->helper_proc, SIGKILL);
+    GNUNET_OS_process_kill (h->helper_proc, SIGTERM);
     GNUNET_OS_process_wait (h->helper_proc);
     GNUNET_OS_process_close (h->helper_proc);
     h->helper_proc = NULL;
@@ -247,16 +247,16 @@ helper_read (void *cls,
   }
   if (0 == t)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+    /* this happens if the helper is shut down via a 
+       signal, so it is not a "hard" error */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
                 _("Got 0 bytes from helper `%s' (EOF)\n"),
                 h->binary_name);
-#if 0
     stop_helper (h);
     /* Restart the helper */
     h->restart_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                     &restart_task, h);
-#endif
     return;
   }
   if (GNUNET_SYSERR ==