-valgrind checks

diff --git a/src/lockmanager/gnunet-service-lockmanager.c b/src/lockmanager/gnunet-service-lockmanager.c
index 828915e70c9f0c2720e147fc43e97098221ec0c0..8ec988978f2f17c79d5cd5053dd0c944f713e883 100644 (file)
--- a/src/lockmanager/gnunet-service-lockmanager.c
+++ b/src/lockmanager/gnunet-service-lockmanager.c
@@ -772,6 +772,7 @@ client_disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client)
 {
   struct ClientList *cl_entry;
   struct LockList *ll_entry;
+  struct Lock *lock;
 
   if (NULL == client)
     return;
@@ -782,8 +783,9 @@ client_disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client)
     return;
   while (NULL != (ll_entry = cl_entry->ll_head))
   {
+    lock = ll_entry->lock;
     cl_ll_remove_lock (cl_entry, ll_entry);
-    process_lock_release (ll_entry->lock); 
+    process_lock_release (lock);
   }
   cl_remove_client (cl_entry);
 }

diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c
index 9b6f311e4ba945f837c6e5cf5e28450d2c397723..e8d04128f97889aaceed2d1af89561a0300843da 100644 (file)
--- a/src/lockmanager/test_lockmanager_api.c
+++ b/src/lockmanager/test_lockmanager_api.c
@@ -226,7 +226,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                              "-c", "test_lockmanager_api.conf", NULL);
 
   GNUNET_assert (NULL != arm_pid);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
                                 &test,
                                 NULL);
 }

diff --git a/src/lockmanager/test_lockmanager_api.conf b/src/lockmanager/test_lockmanager_api.conf
index aa13706cd5e8a36abf2d7ccef76555c9f2a857e3..894f409080b8b24fb4dcb190fa4d1031de14aba4 100644 (file)
--- a/src/lockmanager/test_lockmanager_api.conf
+++ b/src/lockmanager/test_lockmanager_api.conf
@@ -1,6 +1,6 @@
 [lockmanager]
 DEBUG = YES
-AUTOSTART = YES
+AUTOSTART = NO 
 PORT = 12112
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost

diff --git a/src/lockmanager/test_lockmanager_api_lockrelease.c b/src/lockmanager/test_lockmanager_api_lockrelease.c
index 8eea5cc2254f06980a2385d783e1a6d46f87b788..7e24d10ceb467c0da54ab92870955793376cf25f 100644 (file)
--- a/src/lockmanager/test_lockmanager_api_lockrelease.c
+++ b/src/lockmanager/test_lockmanager_api_lockrelease.c
@@ -223,7 +223,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                              &status_cb,
                                              handle);
   GNUNET_assert (NULL != request);
-  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (60),
+  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10),
                                                 &do_abort,
                                                 NULL);
 }
@@ -247,7 +247,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                              "-c", "test_lockmanager_api.conf", NULL);
 
   GNUNET_assert (NULL != arm_pid);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
                                 &test,
                                 NULL);
 }

diff --git a/src/lockmanager/test_lockmanager_api_servercrash.c b/src/lockmanager/test_lockmanager_api_servercrash.c
index 4b9d9cbe42193bebebe63f7ed26d80cba2a9d46a..3fa6418c8d6e438c3f1a56a80735e5eb8652d788 100644 (file)
--- a/src/lockmanager/test_lockmanager_api_servercrash.c
+++ b/src/lockmanager/test_lockmanager_api_servercrash.c
@@ -248,7 +248,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                              &status_cb,
                                              handle);
   GNUNET_assert (NULL != request);
-  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (60),
+  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10),
                                                 &do_abort,
                                                 NULL);
 }
@@ -272,7 +272,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                              "-c", "test_lockmanager_api.conf", NULL);
 
   GNUNET_assert (NULL != arm_pid);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
                                 &test,
                                 NULL);
 }