From 8e8ff40c08bb8382eb4e4869d2a8dd6c7d23bd4a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 25 Mar 2010 15:18:11 +0000
Subject: [PATCH] better error handling

---
 src/fs/test_fs_namespace.c          | 17 +++++++++--------
 src/fs/test_gnunet_service_fs_p2p.c | 22 ++++++++++++++++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 48442f855..ea9e00c90 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -47,14 +47,6 @@ struct PeerContext
 };
 
 
-static void *
-progress_cb (void *cls, 
-	     const struct GNUNET_FS_ProgressInfo *event)
-{
-  return NULL;
-}
-
-
 static void
 setup_peer (struct PeerContext *p, const char *cfgname)
 {
@@ -97,6 +89,15 @@ spcb (void *cls,
 #endif
 
 
+
+static void *
+progress_cb (void *cls, 
+	     const struct GNUNET_FS_ProgressInfo *event)
+{
+  return NULL;
+}
+
+
 static void
 publish_cont (void *cls,
 	      const struct GNUNET_FS_Uri *ksk_uri,
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 410666dea..024e08155 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -75,7 +75,16 @@ static void
 do_download (void *cls,
 	     const struct GNUNET_FS_Uri *uri)
 {
-  GNUNET_assert (NULL != uri);
+  if (NULL == uri)
+    {
+      GNUNET_FS_TEST_daemons_stop (sched,
+				   NUM_DAEMONS,
+				   daemons);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Timeout during upload attempt, shutting down with error\n");
+      ok = 1;
+      return;
+    }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Downloading %llu bytes\n",
 	      (unsigned long long) FILESIZE);
@@ -92,7 +101,16 @@ static void
 do_publish (void *cls,
 	    const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+    {
+      GNUNET_FS_TEST_daemons_stop (sched,
+				   NUM_DAEMONS,
+				   daemons);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Timeout during connect attempt, shutting down with error\n");
+      ok = 1;
+      return;
+    }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Publishing %llu bytes\n",
 	      (unsigned long long) FILESIZE);
-- 
2.25.1