X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;ds=inline;f=bluesky%2Fserialize.c;h=fc3cd312a12f08e20ea1af1d2cee85a764cff2c9;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=1659eec73406f5a4c7912079e4ea03420814296c;hpb=2ad1881ef34f84f3dc8ded636ada9b21e3fd906b;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index 1659eec..fc3cd31 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include <stdint.h>
@@ -296,7 +318,9 @@ void bluesky_deserialize_cloudlog(BlueSkyCloudLog *item,
         data1 = data + sizeof(struct log_header);
         data2 = data1 + len1;
         data3 = data2 + len2;
-        g_assert(data3 + len3 - data < len);
+        g_assert(data3 + len3 - data <= len);
+        item->type = header->type - '0';
+        item->inum = GUINT64_FROM_LE(header->inum);
     } else if (memcmp(data, CLOUDLOG_MAGIC, 4) == 0) {
         g_assert(len >= sizeof(struct cloudlog_header));
         struct cloudlog_header *header = (struct cloudlog_header *)data;
@@ -308,14 +332,23 @@ void bluesky_deserialize_cloudlog(BlueSkyCloudLog *item,
         data1 = data + sizeof(struct cloudlog_header);
         data2 = data1 + len1;
         data3 = data2 + len2;
-        g_assert(data3 + len3 - data < len);
+        g_assert(data3 + len3 - data <= len);
+        item->type = header->type - '0';
+        item->inum = GUINT64_FROM_LE(header->inum);
+    } else {
+        g_warning("Deserializing garbage cloud log item!");
+        return;
+    }
+
+    if (memcmp(&id, &item->id, sizeof(BlueSkyCloudID)) != 0) {
+        g_warning("ID does not match expected value!\n");
     }
 
     BlueSkyFS *fs = item->fs;
 
     bluesky_string_unref(item->data);
     item->data = NULL;
-    //item->location_flags = CLOUDLOG_JOURNAL;
+    item->data_size = len1;
 
     int link_count = len2 / sizeof(BlueSkyCloudID);
     GArray *new_links = g_array_new(FALSE, TRUE, sizeof(BlueSkyCloudLog *));
@@ -330,6 +363,7 @@ void bluesky_deserialize_cloudlog(BlueSkyCloudLog *item,
             g_mutex_lock(ref->lock);
             g_assert(len3 >= sizeof(ref->location));
             memcpy(&ref->location, data3, sizeof(ref->location));
+            ref->location_flags |= CLOUDLOG_CLOUD;
             data3 += sizeof(ref->location); len3 -= sizeof(ref->location);
             g_mutex_unlock(ref->lock);
         }