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

[gnunet]

Author: grothoff
Date: 2011-12-19 22:00:48 +0100 (Mon, 19 Dec 2011)
New Revision: 18702

Modified:
   gnunet/src/fs/fs_api.c
Log:
-not all uris are ksks

Modified: gnunet/src/fs/fs_api.c
===================================================================
--- gnunet/src/fs/fs_api.c      2011-12-19 20:48:41 UTC (rev 18701)
+++ gnunet/src/fs/fs_api.c      2011-12-19 21:00:48 UTC (rev 18702)
@@ -1793,14 +1793,19 @@
       || (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->mandatory_missing)) ||
       (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->optional_support)) ||
       (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->availability_success)) ||
-      (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->availability_trials)) ||
-      (GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap,
-                                     (sr->uri == NULL) ? 0 : 
(sr->uri->data.ksk.keywordCount + 7) / 8)) )
-
+      (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->availability_trials)) )
   {
     GNUNET_break (0);
     goto cleanup;
   }
+  if ( (sr->uri != NULL) &&
+       (sr->uri->type == ksk) &&
+       (GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap,
+                                      (sr->uri->data.ksk.keywordCount + 7) / 
8)) )
+  {
+    GNUNET_break (0);
+    goto cleanup;
+  }
   if (GNUNET_OK != GNUNET_BIO_write_close (wh))
   {
     wh = NULL;
@@ -2098,13 +2103,17 @@
     GNUNET_break (0);
     goto cleanup;
   }
-  sr->keyword_bitmap = GNUNET_malloc ((sr->uri->data.ksk.keywordCount + 7) / 
8); /* round up, count bits */
-  if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap",
-                                   sr->keyword_bitmap,
-                                   (sr->uri == NULL) ? 0 : 
(sr->uri->data.ksk.keywordCount + 7) / 8))
+  if ( (NULL != sr->uri) &&
+       (sr->uri->type == ksk) )
   {
-    GNUNET_break (0);
-    goto cleanup;
+    sr->keyword_bitmap = GNUNET_malloc ((sr->uri->data.ksk.keywordCount + 7) / 
8); /* round up, count bits */
+    if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap",
+                                     sr->keyword_bitmap,
+                                     (sr->uri->data.ksk.keywordCount + 7) / 8))
+    {
+      GNUNET_break (0);
+      goto cleanup;
+    }
   }
   GNUNET_free (uris);
   if (download != NULL)