[GNUnet-SVN] r10701 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-03-25 16:18:11 +0100 (Thu, 25 Mar 2010)
New Revision: 10701

Modified:
   gnunet/src/fs/test_fs_namespace.c
   gnunet/src/fs/test_gnunet_service_fs_p2p.c
Log:
better error handling

Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c   2010-03-25 15:01:38 UTC (rev 10700)
+++ gnunet/src/fs/test_fs_namespace.c   2010-03-25 15:18:11 UTC (rev 10701)
@@ -47,14 +47,6 @@
 };
 
 
-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 @@
 #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,

Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c  2010-03-25 15:01:38 UTC (rev 
10700)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c  2010-03-25 15:18:11 UTC (rev 
10701)
@@ -75,7 +75,16 @@
 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 @@
 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);