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;
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 *));
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);
}