Merge pull request #4 from jingwei87/TwoRoundDownload

Two round download Fixed

Author: tinoryj

TEDStore/ShellScripts/systemBuild.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
 ./ShellScripts/systemCleanup.sh
 
-cd lib/leveldb/
-if [ ! -d "build" ]; then
-    mkdir -p build && cd build
-    cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build .
-    cd ../../../
-else
-    cd ../../
-fi
+# cd lib/leveldb/
+# if [ ! -d "build" ]; then
+#     mkdir -p build && cd build
+#     cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build .
+#     cd ../../../
+# else
+#     cd ../../
+# fi
 
-cd lib/openssl/
-if [ ! -f "Makefile" ]; then
-    ./config && make
-    cd ../../
-else
-    cd ../../
-fi
+# cd lib/openssl/
+# if [ ! -f "Makefile" ]; then
+#     ./config && make
+#     cd ../../
+# else
+#     cd ../../
+# fi
 
 if [ ! -d "bin" ]; then
     mkdir bin

TEDStore/ShellScripts/systemCleanup.sh

@@ -18,6 +18,15 @@ typedef struct {
     u_char chunkHash[CHUNK_HASH_SIZE];
     u_char encryptKey[CHUNK_ENCRYPT_KEY_SIZE];
 } Chunk_t;
+
+typedef struct {
+    u_char chunkHash[CHUNK_HASH_SIZE];
+} ChunkHash_t;
+
+typedef struct {
+    vector<ChunkHash_t> hash_;
+} HashList_t;
+
 // HIGH - 16460 LOW - 16428
 
 typedef struct {

TEDStore/include/dataStructure.hpp

@@ -18,7 +18,7 @@ class DedupCore {
 public:
     DedupCore();
     ~DedupCore();
-    bool dedupByHash(powSignedHash_t in, RequiredChunk_t& out);
+    bool dedupByHash(HashList_t in, RequiredChunk_t& out);
 };
 
 #endif //TEDSTORE_DEDUPCORE_HPP

TEDStore/include/dedupCore.hpp

@@ -3,18 +3,11 @@
 
 #include <bits/stdc++.h>
 //client-server network protocol
-#define SGX_RA_MSG01 0
-#define SGX_RA_MSG2 1
-#define SGX_RA_MSG3 2
-#define SGX_RA_MSG4 3
-#define POW_CLOSE_SESSION 4
-#define SGX_SIGNED_HASH 5
-#define POW_REQUEST 6
 #define CLIENT_UPLOAD_CHUNK 7
 #define CLIENT_DOWNLOAD_CHUNK_WITH_RECIPE 8
 #define SERVER_REQUIRED_CHUNK 9
-#define CLIENT_UPLOAD_RECIPE 10
-#define CLIENT_DOWNLOAD_FILEHEAD 11
+#define CLIENT_UPLOAD_ENCRYPTED_RECIPE 10
+#define CLIENT_DOWNLOAD_ENCRYPTED_RECIPE 11
 #define ERROR_RESEND 12
 #define ERROR_CLOSE 13
 #define SUCCESS 14
@@ -23,22 +16,9 @@
 #define ERROR_CHUNK_NOT_EXIST 17
 #define ERROR_CLIENT_CLOSE_CONNECT 18
 #define CLIENT_EXIT 19
-#define CLIENT_GET_KEY_SERVER_SK 20
-#define RA_REQUEST 21
+#define CLIENT_UPLOAD_DECRYPTED_RECIPE 20
+#define CLIENT_DOWNLOAD_RECIPE_SIZE 21
 
-//dupCore-storageCore protocol
-#define SAVE_CHUNK
-#define SAVE_RECIPE
 using namespace std;
 
-typedef struct _ra_msg4_struct {
-    bool status;
-    //sgx_platform_info_t platformInfoBlob;
-} ra_msg4_t;
-
-typedef struct {
-    uint8_t signature_[16];
-    vector<string> hash_;
-} powSignedHash_t;
-
 #endif //TEDSTORE_PROTOCOL_HPP

TEDStore/include/protocol.hpp

@@ -25,10 +25,11 @@ class RecvDecode {
 
 public:
     Recipe_t fileRecipe_;
+    RecipeList_t fileRecipeList_;
     RecvDecode(string fileName);
     ~RecvDecode();
     void run();
-    bool recvFileHead(Recipe_t& FileRecipe, u_char* fileNameHash);
+    bool processRecipe(Recipe_t& recipeHead, RecipeList_t& recipeList, u_char* fileNameHash);
     bool recvChunks(ChunkList_t& recvChunk, int& chunkNumber, uint32_t& startID, uint32_t& endID);
     Recipe_t getFileRecipeHead();
     bool insertMQToRetriever(RetrieverData_t& newChunk);

TEDStore/include/recvDecode.hpp

@@ -47,13 +47,14 @@ class StorageCore {
     StorageCore();
     ~StorageCore();
 
-    bool saveChunks(NetworkHeadStruct_t& networkHead, char* data);
-    bool saveRecipe(std::string recipeName, Recipe_t recipeHead, RecipeList_t recipeList, bool status);
-    bool restoreRecipeAndChunk(char* fileNameHash, uint32_t startID, uint32_t endID, ChunkList_t& restoredChunkList);
-    bool saveChunk(std::string chunkHash, char* chunkData, int chunkSize);
-    bool restoreChunk(std::string chunkHash, std::string& chunkData);
-    bool checkRecipeStatus(Recipe_t recipeHead, RecipeList_t recipeList);
-    bool restoreRecipeHead(char* fileNameHash, Recipe_t& restoreRecipe);
+    bool restoreChunks(NetworkHeadStruct_t& networkHead, char* data);
+    bool storeRecipes(char* fileNameHash, u_char* recipeContent, uint64_t recipeSize);
+    bool restoreRecipeAndChunk(RecipeList_t recipeList, uint32_t startID, uint32_t endID, ChunkList_t& restoredChunkList);
+    bool storeChunk(string chunkHash, char* chunkData, int chunkSize);
+    bool storeChunks(NetworkHeadStruct_t& networkHead, char* data);
+    bool restoreChunk(std::string chunkHash, std::string& chunkDataStr);
+    bool restoreRecipes(char* fileNameHash, u_char* recipeContent, uint64_t& recipeSize);
+    bool restoreRecipesSize(char* fileNameHash, uint64_t& recipeSize);
 };
 
 #endif

TEDStore/include/storageCore.hpp

@@ -335,10 +335,10 @@ void Chunker::fixSizeChunking()
     if (setJobDoneFlag() == false) {
         cerr << "Chunker : set chunking done flag error" << endl;
     }
-    cout << "Chunker : Fixed chunking over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
+    cerr << "Chunker : Fixed chunking over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
 #if BREAK_DOWN_DEFINE == 1
-    cout << "Chunker : total chunking time = " << chunkTime << " s" << endl;
-    cout << "Chunker : total hashing time = " << hashTime << " s" << endl;
+    cerr << "Chunker : total chunking time = " << chunkTime << " s" << endl;
+    cerr << "Chunker : total hashing time = " << hashTime << " s" << endl;
 #endif
 }
 
@@ -424,10 +424,10 @@ void Chunker::traceDrivenChunkingFSL()
     if (setJobDoneFlag() == false) {
         cerr << "Chunker : set chunking done flag error" << endl;
     }
-    cout << "Chunker : trace gen over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
+    cerr << "Chunker : trace gen over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
 #if BREAK_DOWN_DEFINE == 1
-    cout << "Chunker : total chunking time = " << chunkTime << " s" << endl;
-    cout << "Chunker : total hashing time = " << hashTime << " s" << endl;
+    cerr << "Chunker : total chunking time = " << chunkTime << " s" << endl;
+    cerr << "Chunker : total hashing time = " << hashTime << " s" << endl;
 #endif
 }
 
@@ -514,10 +514,10 @@ void Chunker::traceDrivenChunkingUBC()
     if (setJobDoneFlag() == false) {
         cerr << "Chunker : set chunking done flag error" << endl;
     }
-    cout << "Chunker : trace gen over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
+    cerr << "Chunker : trace gen over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
 #if BREAK_DOWN_DEFINE == 1
-    cout << "Chunker : total chunking time is" << chunkTime << " s" << endl;
-    cout << "Chunker : total hashing time is" << hashTime << " s" << endl;
+    cerr << "Chunker : total chunking time is" << chunkTime << " s" << endl;
+    cerr << "Chunker : total hashing time is" << hashTime << " s" << endl;
 #endif
 }
 
@@ -690,13 +690,13 @@ void Chunker::varSizeChunking()
         cerr << "Chunker: set chunking done flag error" << endl;
         return;
     }
-    cout << "Chunker : variable size chunking over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
+    cerr << "Chunker : variable size chunking over:\nTotal file size = " << fileRecipe.recipe.fileRecipeHead.fileSize << "; Total chunk number = " << fileRecipe.recipe.fileRecipeHead.totalChunkNumber << endl;
 #if BREAK_DOWN_DEFINE == 1
     gettimeofday(&timeendChunker, NULL);
     diff = 1000000 * (timeendChunker.tv_sec - timestartChunker.tv_sec) + timeendChunker.tv_usec - timestartChunker.tv_usec;
     second = diff / 1000000.0;
-    cout << "Chunker : total chunking time = " << setbase(10) << second - (insertTime + hashTime) << " s" << endl;
-    cout << "Chunker : total hashing time = " << hashTime << " s" << endl;
+    cerr << "Chunker : total chunking time = " << setbase(10) << second - (insertTime + hashTime) << " s" << endl;
+    cerr << "Chunker : total hashing time = " << hashTime << " s" << endl;
 #endif
     return;
 }

TEDStore/src/client/chunker.cpp

@@ -22,8 +22,8 @@ struct timeval timeend;
 
 void usage()
 {
-    cout << "[client -r filename] for receive file" << endl;
-    cout << "[client -s filename] for send file" << endl;
+    cerr << "[client -r filename] for receive file" << endl;
+    cerr << "[client -s filename] for send file" << endl;
 }
 
 int main(int argv, char* argc[])
@@ -74,8 +74,8 @@ int main(int argv, char* argc[])
     gettimeofday(&timeend, NULL);
     long diff = 1000000 * (timeend.tv_sec - timestart.tv_sec) + timeend.tv_usec - timestart.tv_usec;
     double second = diff / 1000000.0;
-    cout << "System : total work time is " << diff << " us = " << second << " s" << endl;
-    cout << "System : start work time is " << timestart.tv_sec << " s, " << timestart.tv_usec << " us" << endl;
-    cout << "System : end work time is " << timeend.tv_sec << " s, " << timeend.tv_usec << " us" << endl;
+    cerr << "System : total work time is " << diff << " us = " << second << " s" << endl;
+    cerr << "System : start work time is " << timestart.tv_sec << " s, " << timestart.tv_usec << " us" << endl;
+    cerr << "System : end work time is " << timeend.tv_sec << " s, " << timeend.tv_usec << " us" << endl;
     return 0;
 }

TEDStore/src/client/clientMain.cpp

@@ -145,19 +145,19 @@ void keyClient::run()
             if (!senderObj_->editJobDoneFlag()) {
                 cerr << "KeyClient : error to set job done flag for sender" << endl;
             } else {
-                cout << "KeyClient : key exchange thread job done, exit now" << endl;
+                cerr << "KeyClient : key exchange thread job done, exit now" << endl;
             }
             break;
         }
     }
 #if BREAK_DOWN_DEFINE == 1
-    cout << "KeyClient : keyGen total work time = " << keyGenTime << " s" << endl;
-    cout << "KeyClient : short hash compute work time = " << shortHashTime << " s" << endl;
-    cout << "KeyClient : key exchange work time = " << keyExchangeTime << " s" << endl;
-    cout << "KeyClient : key derviation work time = " << keyDerivationTime << " s" << endl;
-    cout << "KeyClient : encryption work time = " << encryptionTime << " s" << endl;
-    cout << "KeyClient : socket send time = " << keySocketSendTime << " s" << endl;
-    cout << "KeyClient : socket recv time = " << keySocketRecvTime << " s" << endl;
+    cerr << "KeyClient : keyGen total work time = " << keyGenTime << " s" << endl;
+    cerr << "KeyClient : short hash compute work time = " << shortHashTime << " s" << endl;
+    cerr << "KeyClient : key exchange work time = " << keyExchangeTime << " s" << endl;
+    cerr << "KeyClient : key derviation work time = " << keyDerivationTime << " s" << endl;
+    cerr << "KeyClient : encryption work time = " << encryptionTime << " s" << endl;
+    cerr << "KeyClient : socket send time = " << keySocketSendTime << " s" << endl;
+    cerr << "KeyClient : socket recv time = " << keySocketRecvTime << " s" << endl;
 #endif
     return;
 }