...

diff --git a/inc/block.h b/inc/block.h
index d3798ba192ff4193b199c421d4e17e0f555599eb..8a8d6498ceaaca6cb1476ce9819a3399caea1b19 100644 (file)
--- a/inc/block.h
+++ b/inc/block.h
@@ -10,6 +10,7 @@
 #define BLOCK_SIZE 16384
 
 struct block {
+       size_t index;
        unsigned char hash[crypto_hash_sha256_BYTES];
        struct block *next;
 };

diff --git a/inc/file.h b/inc/file.h
index 2a996a1720a443088f658e4ad1685cd36d8754d0..dff32c238100f1bfe241973147cd435e620d9c0f 100644 (file)
--- a/inc/file.h
+++ b/inc/file.h
@@ -15,8 +15,11 @@
 struct file {
        char *name;
        char *path;
-       unsigned char root[crypto_hash_sha256_BYTES];
+
+       struct block *root;
        struct block *piece_layers;
+       struct block *blocks;
+
        uint64_t size;
 };
 

diff --git a/src/block.c b/src/block.c
index 6870fd248461a69de3ec1a153388b35ca117103a..f3889446aae11d5e6cff65eb43ab57cb896d40c0 100644 (file)
--- a/src/block.c
+++ b/src/block.c
@@ -43,6 +43,7 @@ int block_init(struct block **p) {
                return -1;
        }
 
+       (*p)->index = 0;
        memset((*p)->hash,0,crypto_hash_sha256_BYTES);
        (*p)->next = NULL;
 

diff --git a/src/file.c b/src/file.c
index 1e211d2bb2c238650f34bb7847d9560b76d460bc..5d82848584f55ea6467b350e416ec4a020b51219 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -189,8 +189,10 @@ int file_init(struct file **p, const char *path) {
        
        (*p)->name = strdup(b);
 
-       memset((*p)->root,0,crypto_hash_sha256_BYTES);
+       (*p)->root = NULL;
        (*p)->piece_layers = NULL;
+       (*p)->blocks = NULL;
+
        (*p)->size = 0;
 
        return 1;