fix timeout of test_service, misc signed/unsigned and unused argument issues

1 files changed, 26 insertions, 1 deletions

diff --git a/src/util/test_service.c b/src/util/test_service.c
index 1567c97ce..3ffacb0a9 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -30,10 +30,17 @@
  */
 #define MY_TYPE 256
 
+#define TIMEOUT GNUNET_TIME_UNIT_SECONDS
+
 static int global_ret = 1;
 
 static struct GNUNET_MQ_Handle *mq;
 
+/**
+ * Timeout task.
+ */
+static struct GNUNET_SCHEDULER_Task *tt;
+
 
 static void
 handle_recv (void *cls,
@@ -86,10 +93,24 @@ disconnect_cb (void *cls,
   {
     GNUNET_SCHEDULER_shutdown ();
     global_ret = 0;
+    if (NULL != tt)
+    {
+      GNUNET_SCHEDULER_cancel (tt);
+      tt = NULL;
+    }
   }
 }
 
 
+static void
+timeout_task (void *cls)
+{
+  tt = NULL;
+  global_ret = 33;
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
 /**
  * Initialization function of the service.  Starts
  * a client to connect to the service.
@@ -106,7 +127,11 @@ service_init (void *cls,
   const char *service_name = cls;
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
-  
+
+  GNUNET_assert (NULL == tt);
+  tt = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                     &timeout_task,
+                                     NULL);
   mq = GNUNET_CLIENT_connect (cfg,
                               service_name,
                               NULL,