From b55dc4d96ebb6c7dfeee09fd4cb94739074a364f Mon Sep 17 00:00:00 2001 From: xethyrion Date: Thu, 1 Dec 2016 21:26:26 +0200 Subject: [PATCH 01/10] Create node_PREVIEW_DO_NOT_USE_YET.h --- .../ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h | 217 ++++++++++++++++++ 1 file changed, 217 insertions(+) create mode 100644 include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h diff --git a/include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h b/include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h new file mode 100644 index 0000000..4e62e27 --- /dev/null +++ b/include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h @@ -0,0 +1,217 @@ +/** + * An implementation of an IPFS node + * Copying the go-ipfs-node project + */ +#ifndef IPFS_NODE_H +#define IPFS_NODE_H +#include +#include +#include +#include "inttypes.h" +#include "ipfs/cid/cid.h" + +int debug = 0; // Set to 1 to enable debug mode of this program + +/*==================================================================================== + * + * Structures + * + *===================================================================================*/ + +struct Link +{ + char * name; + size_t size; + struct Cid * Lcid; +}; +struct Node +{ + unsigned char * data; + unsigned char * encoded; + int link_ammount; + struct Link * links[]; +}; +/*==================================================================================== + * + * Functions + * + *===================================================================================*/ +/*==================================================================================== + * Link Functions + *===================================================================================*/ + +/* Create_Link + * @Param name: The name of the link (char *) + * @Param size: Size of the link (size_t) + * @Param ahash: An Qmhash + */ +struct Link Create_Link(char * name, unsigned char * ahash) +{ + struct Link mylink; + mylink.name = name; + int ver = 0; + size_t lenhash = strlen(ahash)-1; + ipfs_cid_new(ver, ahash, lenhash*2, CID_PROTOBUF, &mylink.Lcid); + mylink.size = sizeof(mylink) + mylink.Lcid->hash_length; //Unsure of this + return mylink; +} +/* Free_Link + * @param L: Free the link you have allocated. + */ +void Free_Link(struct Link L) +{ + ipfs_cid_free(L.Lcid); +} +/*==================================================================================== + * Node Functions + *===================================================================================*/ +//In progress +void Node_Free(struct Node * mynode) +{ + if(mynode->link_ammount != 0) + { + free(mynode); + } +} +/*N_Create_From_Data + * @param1: bytes buffer + * returns a new node with the bytes that you specified, also initializes the ammount of links to 0 + */ +struct Node * N_Create_From_Data(unsigned char * bytes) +{ + struct Node * datanode; + datanode->data = bytes; + datanode->link_ammount = 0; + return datanode; +} +/* N_Add_Link + * Adds a link to your node + * @param mynode: &yournode + * @param mylink: the CID you want to create a node from + * @param linksz: sizeof(your cid here) + * Returns your node with the newly added link + */ +struct Node * N_Add_Link(struct Node ** mynode, struct Cid * mylink, size_t linksz) +{ + struct Node * Nl = *mynode; + Nl->link_ammount++; + size_t calculatesize = 0; + if(Nl->link_ammount != 0) + { + for(int i=0; ilink_ammount-1;i++) + { + printf("WTF\n"); + calculatesize = calculatesize + sizeof(Nl->links[i]); + } + calculatesize = calculatesize + linksz; + Nl = (struct Node *) realloc(Nl, sizeof(struct Node) + calculatesize); + } + else + { + Nl = (struct Node *) malloc(sizeof(struct Node) + linksz); + } + Nl->links[Nl->link_ammount-1] = mylink; + return Nl; +} +/*N_Create_From_Link + * Create a node from a link + * @param mylink: the link you want to create it from. (struct Cid *) + * @param linksize: sizeof(the link in mylink) (size_T) + * Returns a fresh new node with the link you specified. Has to be freed with Node_Free preferably. + */ +struct Node * N_Create_From_Link(struct Cid * mylink, size_t linksize) +{ + struct Node * mynode; + mynode = (struct Node *) malloc(sizeof(struct Node) + linksize); + mynode->link_ammount = 0; + mynode->link_ammount++; + mynode->links[0] = mylink; + return mynode; +} + +//Finished +/*Node_Resolve_Max_Size + *Gets the ammount of words that will be returned by Node_Resolve + *@Param1: The string that will be processed (eg: char * sentence = "foo/bar/bin") + *Returns either -1 if something went wrong or the ammount of words that would be processed. +*/ +int Node_Resolve_Max_Size(char * input1) +{ + if(!input1) + { + return -1; // Input is null, therefor nothing can be processed. + } + char input[strlen(input1)]; + bzero(input, strlen(input1)); + strcpy(input, input1); + int num = 0; + char * tr; + char * end; + tr=strtok_r(input,"/",&end); + for(int i = 0;tr;i++) + { + tr=strtok_r(NULL,"/",&end); + num++; + } + return num; +} + +/*Node_Resolve Basically stores everything in a pointer array eg: char * bla[Max_Words_] + *@param1: Pointer array(char * foo[x], X=Whatever ammount there is. should be used with the helper function Node_Resolve_Max_Size) + *@param2: Sentence to gather words/paths from (Eg: char * meh = "foo/bar/bin") + *@Returns 1 or 0, 0 if something went wrong, 1 if everything went smoothly. +*/ + +int Node_Resolve(char ** result, char * input1) +{ + if(!input1) + { + return 0; // Input is null, therefor nothing can be processed. + } + char input[strlen(input1)]; + bzero(input, strlen(input1)); + strcpy(input, input1); + char * tr; + char * end; + tr=strtok_r(input,"/",&end); + for(int i = 0;tr;i++) + { + if(debug == 1) + { + printf("TR: %s\n", tr); + } + result[i] = (char *) malloc(strlen(tr)+1); + strcpy(result[i], tr); + tr=strtok_r(NULL,"/",&end); + } + return 1; +} +/*Node_Tree() Basically a unix-like ls + *@Param1: Result char * foo[strlen(sentence)] + *@Param2: char sentence[] = foo/bar/bin/whatever + *Return: 0 if failure, 1 if success +*/ +int Node_Tree(char * result, char * input1) +{ + if(!input1) + { + return 0; + } + char input[strlen(input1)]; + bzero(input, strlen(input1)); + strcpy(input, input1); + for(int i=0; i Date: Thu, 1 Dec 2016 21:27:18 +0200 Subject: [PATCH 02/10] Create testit.c_PREVIEW_DO_NOT_USE --- include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE diff --git a/include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE b/include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE new file mode 100644 index 0000000..120ed7f --- /dev/null +++ b/include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE @@ -0,0 +1,37 @@ +testit.c +int main(int argc, char** argv) +{ + printf("XETH TESTS\n"); + //Variables of link: + char * name = "Alex"; + char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; + struct Link mylink; + mylink = Create_Link(name,ahash); + printf("===================================\n" \ + "Node Link:\n" \ + " -Name: %s\n" \ + " -Size: %lu\n" \ + "\n Cid Details:\n\n" \ + " -Version: %d\n" \ + " -Codec: %c\n" \ + " -Hash: %s\n" \ + " -Hash Length: %lu\n" \ + "====================================\n" \ + , mylink.name, mylink.size, mylink.Lcid->version,mylink.Lcid->codec,mylink.Lcid->hash,mylink.Lcid->hash_length); +//Link Two for testing purposes + char * name2 = "Simo"; + char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; + struct Link mylink2; + mylink2 = Create_Link(name2,ahash2); +// + struct Node * mynode = N_Create_From_Link(mylink.Lcid, sizeof(mylink.Lcid)); + mynode = N_Add_Link(&mynode, mylink2.Lcid, sizeof(mylink2.Lcid)); + printf("Result pls: %s\n",mynode->links[0]->hash); + printf("LINKS: %d\n", mynode->link_ammount); + printf("Result pls2: %s\n",mynode->links[1]->hash); + Node_Free(mynode); + Free_Link(mylink); + Free_Link(mylink2); + unsigned char * data; + return 0; +} From 9fdda102c71e220046c30f3651831287d729c8fb Mon Sep 17 00:00:00 2001 From: xethyrion Date: Sat, 3 Dec 2016 22:51:15 +0200 Subject: [PATCH 03/10] Update node.h --- include/ipfs/node/node.h | 262 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 256 insertions(+), 6 deletions(-) diff --git a/include/ipfs/node/node.h b/include/ipfs/node/node.h index abedfdf..106ce1c 100644 --- a/include/ipfs/node/node.h +++ b/include/ipfs/node/node.h @@ -2,13 +2,263 @@ * An implementation of an IPFS node * Copying the go-ipfs-node project */ +#ifndef IPFS_NODE_H +#define IPFS_NODE_H +#include +#include +#include +#include "inttypes.h" +#include "ipfs/cid/cid.h" -#include +int debug = 0; // Set to 1 to enable debug mode of this program +/*==================================================================================== + * + * Structures + * + *===================================================================================*/ - -struct Link { - char* name; - uint64_t size; - struct Cid cid; // content id +struct Link +{ + char * name; + size_t size; + struct Cid * Lcid; }; +struct Node +{ + unsigned char * data; + unsigned char * encoded; + int link_ammount; + struct Link * links[]; +}; +/*==================================================================================== + * + * Functions + * + *===================================================================================*/ + +/*==================================================================================== + * Link Functions + *===================================================================================*/ +/* Create_Link + * @Param name: The name of the link (char *) + * @Param size: Size of the link (size_t) + * @Param ahash: An Qmhash + */ +struct Link * Create_Link(char * name, unsigned char * ahash) +{ + struct Link * mylink; + mylink = malloc(sizeof(struct Link)); + mylink->name = name; + int ver = 0; + size_t lenhash = strlen(ahash)-1; + ipfs_cid_new(ver, ahash, lenhash*2, CID_PROTOBUF, &mylink->Lcid); + mylink->size = sizeof(mylink) + mylink->Lcid->hash_length; //Unsure of this + return mylink; +} +/* Free_Link + * @param L: Free the link you have allocated. + */ +void Free_Link(struct Link * L) +{ + ipfs_cid_free(L->Lcid); + free(L); +} +/*==================================================================================== + * Node Functions + *===================================================================================*/ +//In progress +/*Node_Delete + * Once you are finished using a node, always delete it using this. + * It will take care of the links inside it. + * @param N: the node you want to free. (struct Node *) + */ +void Node_Delete(struct Node * N) +{ + if(N->link_ammount > 0) + { + for(int i=0; ilink_ammount; i++) + { + free(N->links[i]); + } + } + free(N); +} +/*Node_Get_Link + * Returns a copy of the link with given name + * @param Name: (char * name) searches for link with this name + * Returns the link struct if it's found otherwise returns NULL + */ +struct Link * Node_Get_Link(char * Name, struct Node * N) +{ + struct Link * L; + for(int i=0;ilink_ammount;i++) + { + if(N->links[i]->name==Name) + { + L = (struct Link *)malloc(sizeof(struct Link)); + memcpy(L,N->links[i],sizeof(struct Link)); + int ver = L->Lcid->version; + char * ahash = L->Lcid->hash; + size_t lenhash = L->Lcid->hash_length; + ipfs_cid_new(ver, ahash, lenhash, CID_PROTOBUF, &L->Lcid); + return L; + } + } + return NULL; +} +/*Node_Remove_Link + * Removes a link from node if found by name. + * @param name: Name of link (char * name) + * returns 1 on success, 0 on failure. + */ +int Node_Remove_Link(char * Name, struct Node * mynode) +{ + for(int i=0; ilink_ammount; i++) + { + if(mynode->links[i]->name == Name) + { + printf("FOUND THIS GUY: %s\n", mynode->links[i]->name); + for(int x=i;xlink_ammount && x+1 != mynode->link_ammount;i++) + { + memcpy(mynode->links[x],mynode->links[x+1],sizeof(struct Link)); + } + free(mynode->links[mynode->link_ammount-1]); + mynode->link_ammount--; + return 1; + } + } + return 0; +} +/* N_Add_Link + * Adds a link to your node + * @param mynode: &yournode + * @param mylink: the CID you want to create a node from + * @param linksz: sizeof(your cid here) + * Returns your node with the newly added link + */ +struct Node * N_Add_Link(struct Node ** mynode, struct Link * mylink, size_t linksz) +{ + struct Node * Nl = *mynode; + Nl->link_ammount++; + size_t calculatesize = 0; + if(Nl->link_ammount != 0) + { + for(int i=0; ilink_ammount-1;i++) + { + calculatesize = calculatesize + sizeof(Nl->links[i]); + } + calculatesize = calculatesize + linksz; + Nl = (struct Node *) realloc(Nl, sizeof(struct Node) + calculatesize); + } + else + { + Nl = (struct Node *) malloc(sizeof(struct Node) + linksz); + } + Nl->links[Nl->link_ammount-1] = malloc(sizeof(struct Link)); + memcpy(Nl->links[Nl->link_ammount-1],mylink,sizeof(struct Link)); + return Nl; +} + +/*N_Create_From_Link + * Create a node from a link + * @param mylink: the link you want to create it from. (struct Cid *) + * @param linksize: sizeof(the link in mylink) (size_T) + * Returns a fresh new node with the link you specified. Has to be freed with Node_Free preferably. + */ +struct Node * N_Create_From_Link(struct Link * mylink, size_t linksize) +{ + struct Node * mynode; + mynode = (struct Node *) malloc(sizeof(struct Node) + linksize); + mynode->link_ammount = 0; + mynode->link_ammount++; + mynode->links[0] = malloc(sizeof(struct Link)); + memcpy(mynode->links[0], mylink, sizeof(struct Link)); + return mynode; +} +//Finished +/*Node_Resolve_Max_Size + *Gets the ammount of words that will be returned by Node_Resolve + *@Param1: The string that will be processed (eg: char * sentence = "foo/bar/bin") + *Returns either -1 if something went wrong or the ammount of words that would be processed. +*/ +int Node_Resolve_Max_Size(char * input1) +{ + if(!input1) + { + return -1; // Input is null, therefor nothing can be processed. + } + char input[strlen(input1)]; + bzero(input, strlen(input1)); + strcpy(input, input1); + int num = 0; + char * tr; + char * end; + tr=strtok_r(input,"/",&end); + for(int i = 0;tr;i++) + { + tr=strtok_r(NULL,"/",&end); + num++; + } + return num; +} + +/*Node_Resolve Basically stores everything in a pointer array eg: char * bla[Max_Words_] + *@param1: Pointer array(char * foo[x], X=Whatever ammount there is. should be used with the helper function Node_Resolve_Max_Size) + *@param2: Sentence to gather words/paths from (Eg: char * meh = "foo/bar/bin") + *@Returns 1 or 0, 0 if something went wrong, 1 if everything went smoothly. +*/ + +int Node_Resolve(char ** result, char * input1) +{ + if(!input1) + { + return 0; // Input is null, therefor nothing can be processed. + } + char input[strlen(input1)]; + bzero(input, strlen(input1)); + strcpy(input, input1); + char * tr; + char * end; + tr=strtok_r(input,"/",&end); + for(int i = 0;tr;i++) + { + if(debug == 1) + { + printf("TR: %s\n", tr); + } + result[i] = (char *) malloc(strlen(tr)+1); + strcpy(result[i], tr); + tr=strtok_r(NULL,"/",&end); + } + return 1; +} +/*Node_Tree() Basically a unix-like ls + *@Param1: Result char * foo[strlen(sentence)] + *@Param2: char sentence[] = foo/bar/bin/whatever + *Return: 0 if failure, 1 if success +*/ +int Node_Tree(char * result, char * input1) +{ + if(!input1) + { + return 0; + } + char input[strlen(input1)]; + bzero(input, strlen(input1)); + strcpy(input, input1); + for(int i=0; i Date: Sat, 3 Dec 2016 22:51:40 +0200 Subject: [PATCH 04/10] Delete node_PREVIEW_DO_NOT_USE_YET.h --- .../ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h | 217 ------------------ 1 file changed, 217 deletions(-) delete mode 100644 include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h diff --git a/include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h b/include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h deleted file mode 100644 index 4e62e27..0000000 --- a/include/ipfs/node/node_PREVIEW_DO_NOT_USE_YET.h +++ /dev/null @@ -1,217 +0,0 @@ -/** - * An implementation of an IPFS node - * Copying the go-ipfs-node project - */ -#ifndef IPFS_NODE_H -#define IPFS_NODE_H -#include -#include -#include -#include "inttypes.h" -#include "ipfs/cid/cid.h" - -int debug = 0; // Set to 1 to enable debug mode of this program - -/*==================================================================================== - * - * Structures - * - *===================================================================================*/ - -struct Link -{ - char * name; - size_t size; - struct Cid * Lcid; -}; -struct Node -{ - unsigned char * data; - unsigned char * encoded; - int link_ammount; - struct Link * links[]; -}; -/*==================================================================================== - * - * Functions - * - *===================================================================================*/ -/*==================================================================================== - * Link Functions - *===================================================================================*/ - -/* Create_Link - * @Param name: The name of the link (char *) - * @Param size: Size of the link (size_t) - * @Param ahash: An Qmhash - */ -struct Link Create_Link(char * name, unsigned char * ahash) -{ - struct Link mylink; - mylink.name = name; - int ver = 0; - size_t lenhash = strlen(ahash)-1; - ipfs_cid_new(ver, ahash, lenhash*2, CID_PROTOBUF, &mylink.Lcid); - mylink.size = sizeof(mylink) + mylink.Lcid->hash_length; //Unsure of this - return mylink; -} -/* Free_Link - * @param L: Free the link you have allocated. - */ -void Free_Link(struct Link L) -{ - ipfs_cid_free(L.Lcid); -} -/*==================================================================================== - * Node Functions - *===================================================================================*/ -//In progress -void Node_Free(struct Node * mynode) -{ - if(mynode->link_ammount != 0) - { - free(mynode); - } -} -/*N_Create_From_Data - * @param1: bytes buffer - * returns a new node with the bytes that you specified, also initializes the ammount of links to 0 - */ -struct Node * N_Create_From_Data(unsigned char * bytes) -{ - struct Node * datanode; - datanode->data = bytes; - datanode->link_ammount = 0; - return datanode; -} -/* N_Add_Link - * Adds a link to your node - * @param mynode: &yournode - * @param mylink: the CID you want to create a node from - * @param linksz: sizeof(your cid here) - * Returns your node with the newly added link - */ -struct Node * N_Add_Link(struct Node ** mynode, struct Cid * mylink, size_t linksz) -{ - struct Node * Nl = *mynode; - Nl->link_ammount++; - size_t calculatesize = 0; - if(Nl->link_ammount != 0) - { - for(int i=0; ilink_ammount-1;i++) - { - printf("WTF\n"); - calculatesize = calculatesize + sizeof(Nl->links[i]); - } - calculatesize = calculatesize + linksz; - Nl = (struct Node *) realloc(Nl, sizeof(struct Node) + calculatesize); - } - else - { - Nl = (struct Node *) malloc(sizeof(struct Node) + linksz); - } - Nl->links[Nl->link_ammount-1] = mylink; - return Nl; -} -/*N_Create_From_Link - * Create a node from a link - * @param mylink: the link you want to create it from. (struct Cid *) - * @param linksize: sizeof(the link in mylink) (size_T) - * Returns a fresh new node with the link you specified. Has to be freed with Node_Free preferably. - */ -struct Node * N_Create_From_Link(struct Cid * mylink, size_t linksize) -{ - struct Node * mynode; - mynode = (struct Node *) malloc(sizeof(struct Node) + linksize); - mynode->link_ammount = 0; - mynode->link_ammount++; - mynode->links[0] = mylink; - return mynode; -} - -//Finished -/*Node_Resolve_Max_Size - *Gets the ammount of words that will be returned by Node_Resolve - *@Param1: The string that will be processed (eg: char * sentence = "foo/bar/bin") - *Returns either -1 if something went wrong or the ammount of words that would be processed. -*/ -int Node_Resolve_Max_Size(char * input1) -{ - if(!input1) - { - return -1; // Input is null, therefor nothing can be processed. - } - char input[strlen(input1)]; - bzero(input, strlen(input1)); - strcpy(input, input1); - int num = 0; - char * tr; - char * end; - tr=strtok_r(input,"/",&end); - for(int i = 0;tr;i++) - { - tr=strtok_r(NULL,"/",&end); - num++; - } - return num; -} - -/*Node_Resolve Basically stores everything in a pointer array eg: char * bla[Max_Words_] - *@param1: Pointer array(char * foo[x], X=Whatever ammount there is. should be used with the helper function Node_Resolve_Max_Size) - *@param2: Sentence to gather words/paths from (Eg: char * meh = "foo/bar/bin") - *@Returns 1 or 0, 0 if something went wrong, 1 if everything went smoothly. -*/ - -int Node_Resolve(char ** result, char * input1) -{ - if(!input1) - { - return 0; // Input is null, therefor nothing can be processed. - } - char input[strlen(input1)]; - bzero(input, strlen(input1)); - strcpy(input, input1); - char * tr; - char * end; - tr=strtok_r(input,"/",&end); - for(int i = 0;tr;i++) - { - if(debug == 1) - { - printf("TR: %s\n", tr); - } - result[i] = (char *) malloc(strlen(tr)+1); - strcpy(result[i], tr); - tr=strtok_r(NULL,"/",&end); - } - return 1; -} -/*Node_Tree() Basically a unix-like ls - *@Param1: Result char * foo[strlen(sentence)] - *@Param2: char sentence[] = foo/bar/bin/whatever - *Return: 0 if failure, 1 if success -*/ -int Node_Tree(char * result, char * input1) -{ - if(!input1) - { - return 0; - } - char input[strlen(input1)]; - bzero(input, strlen(input1)); - strcpy(input, input1); - for(int i=0; i Date: Sat, 3 Dec 2016 22:51:48 +0200 Subject: [PATCH 05/10] Delete testit.c_PREVIEW_DO_NOT_USE --- include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE diff --git a/include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE b/include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE deleted file mode 100644 index 120ed7f..0000000 --- a/include/ipfs/node/testit.c_PREVIEW_DO_NOT_USE +++ /dev/null @@ -1,37 +0,0 @@ -testit.c -int main(int argc, char** argv) -{ - printf("XETH TESTS\n"); - //Variables of link: - char * name = "Alex"; - char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; - struct Link mylink; - mylink = Create_Link(name,ahash); - printf("===================================\n" \ - "Node Link:\n" \ - " -Name: %s\n" \ - " -Size: %lu\n" \ - "\n Cid Details:\n\n" \ - " -Version: %d\n" \ - " -Codec: %c\n" \ - " -Hash: %s\n" \ - " -Hash Length: %lu\n" \ - "====================================\n" \ - , mylink.name, mylink.size, mylink.Lcid->version,mylink.Lcid->codec,mylink.Lcid->hash,mylink.Lcid->hash_length); -//Link Two for testing purposes - char * name2 = "Simo"; - char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; - struct Link mylink2; - mylink2 = Create_Link(name2,ahash2); -// - struct Node * mynode = N_Create_From_Link(mylink.Lcid, sizeof(mylink.Lcid)); - mynode = N_Add_Link(&mynode, mylink2.Lcid, sizeof(mylink2.Lcid)); - printf("Result pls: %s\n",mynode->links[0]->hash); - printf("LINKS: %d\n", mynode->link_ammount); - printf("Result pls2: %s\n",mynode->links[1]->hash); - Node_Free(mynode); - Free_Link(mylink); - Free_Link(mylink2); - unsigned char * data; - return 0; -} From 2ee91f76212a86272e1aea10116c51bd2e26be66 Mon Sep 17 00:00:00 2001 From: xethyrion Date: Sat, 3 Dec 2016 22:52:49 +0200 Subject: [PATCH 06/10] Update testit.c --- test/testit.c | 120 ++++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 78 deletions(-) diff --git a/test/testit.c b/test/testit.c index b455958..65ed684 100644 --- a/test/testit.c +++ b/test/testit.c @@ -8,83 +8,47 @@ #include "storage/test_ds_helper.h" #include "storage/test_datastore.h" #include "storage/test_blocks.h" +#include "ipfs/node/node.h" -int testit(const char* name, int (*func)(void)) { - printf("Testing %s...\n", name); - int retVal = func(); - if (retVal) - printf("%s success!\n", name); - else - printf("** Uh oh! %s failed.**\n", name); - return retVal == 0; -} - -const char* names[] = { - "test_cid_new_free", - "test_cid_cast_multihash", - "test_cid_cast_non_multihash", - //"test_init_new_installation", - "test_repo_config_new", - "test_repo_config_init", - "test_repo_config_write", - "test_repo_config_identity_new", - "test_repo_config_identity_private_key", - "test_get_init_command", - "test_repo_fsrepo_open_config", - "test_flatfs_get_directory", - "test_flatfs_get_filename", - "test_flatfs_get_full_filename", - "test_ds_key_from_binary", - "test_blocks_new", - "test_repo_bootstrap_peers_init", - "test_ipfs_datastore_put" -}; - -int (*funcs[])(void) = { - test_cid_new_free, - test_cid_cast_multihash, - test_cid_cast_non_multihash, - //test_init_new_installation, - test_repo_config_new, - test_repo_config_init, - test_repo_config_write, - test_repo_config_identity_new, - test_repo_config_identity_private_key, - test_get_init_command, - test_repo_fsrepo_open_config, - test_flatfs_get_directory, - test_flatfs_get_filename, - test_flatfs_get_full_filename, - test_ds_key_from_binary, - test_blocks_new, - test_repo_bootstrap_peers_init, - test_ipfs_datastore_put -}; - -/** - * run 1 test or run all - */ -int main(int argc, char** argv) { - int counter = 0; - char* test_wanted; - int only_one = 0; - if(argc > 1) { - only_one = 1; - test_wanted = argv[1]; - } - for (int i = 0; i < sizeof(funcs) / sizeof(funcs[0]); i++) { - if (only_one && strcmp(names[i], test_wanted) == 0) - counter += testit(names[i], funcs[i]); - else - if (!only_one) - counter += testit(names[i], funcs[i]); - - } - - if (counter > 0) { - printf("***** There were %d failed test(s) *****\n", counter); - } else { - printf("All tests passed\n"); - } - return 1; +int main(int argc, char** argv) +{ + printf("XETH TESTS\n"); + //Variables of link: + char * name = "Alex"; + char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; + struct Link * mylink; + mylink = Create_Link(name,ahash); + printf("===================================\n" \ + "Node Link:\n" \ + " -Name: %s\n" \ + " -Size: %lu\n" \ + "\n Cid Details:\n\n" \ + " -Version: %d\n" \ + " -Codec: %c\n" \ + " -Hash: %s\n" \ + " -Hash Length: %lu\n" \ + "====================================\n" \ + , mylink->name, mylink->size, mylink->Lcid->version,mylink->Lcid->codec,mylink->Lcid->hash,mylink->Lcid->hash_length); + //Link Two for testing purposes + char * name2 = "Simo"; + char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; + struct Link * mylink2; + mylink2 = Create_Link(name2,ahash2); + //Nodes + struct Node * Mynode; + Mynode = N_Create_From_Link(mylink,sizeof(mylink)); + mylink->name = "HAHA";//Testing for valid node creation + printf("Node Link[0] Name: %s\nHash: %s\n",Mynode->links[0]->name, Mynode->links[0]->Lcid->hash); + Mynode = N_Add_Link(&Mynode, mylink2, sizeof(mylink2)); + mylink2->name = "HAHA";//Testing for valid node creation + printf("Node Link[1] Name: %s\nHash: %s\n",Mynode->links[1]->name,Mynode->links[1]->Lcid->hash); + struct Link * ResultLink = Node_Get_Link("Simo", Mynode); + printf("\nResultLink: \nName: %s\nHash: %s\n", ResultLink->name, ResultLink->Lcid->hash); + Node_Remove_Link("Simo", Mynode); + printf("Outlinkamt: %d\n", Mynode->link_ammount); + Free_Link(mylink); + Free_Link(mylink2); + Free_Link(ResultLink); + Node_Delete(Mynode); + return 0; } From 5627bb3992b2f6af61b7a420a5fcc34c6a443f92 Mon Sep 17 00:00:00 2001 From: xethyrion Date: Sun, 4 Dec 2016 22:10:41 +0200 Subject: [PATCH 07/10] Update node.h --- include/ipfs/node/node.h | 157 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 8 deletions(-) diff --git a/include/ipfs/node/node.h b/include/ipfs/node/node.h index 106ce1c..d906dc8 100644 --- a/include/ipfs/node/node.h +++ b/include/ipfs/node/node.h @@ -28,6 +28,7 @@ struct Node { unsigned char * data; unsigned char * encoded; + struct Cid * cached; int link_ammount; struct Link * links[]; }; @@ -67,7 +68,64 @@ void Free_Link(struct Link * L) /*==================================================================================== * Node Functions *===================================================================================*/ -//In progress +/*Create_Empty_Node + * Creates an empty node, allocates the required memory + * Returns a fresh new node with no data set in it. + */ +struct Node * Create_Empty_Node() +{ + struct Node * N; + N = (struct Node *)malloc(sizeof(struct Node)); + return N; +} +/*Node_Set_Data + * Sets the data of a node + * @param Node: The node which you want to set data in. + * @param Data, the data you want to assign to the node + * returns 1 on success 0 on failure + */ +int Node_Set_Data(struct Node * N, unsigned char * Data) +{ + if(!N || !Data) + { + return 0; + } + N->encoded = NULL; + N->cached = NULL; + N->data = Data; + return 1; +} +/*Node_Get_Data + * Gets data from a node + * @param Node: = The node you want to get data from. (unsigned char *) + * Returns data of node. + */ +unsigned char * Node_Get_Data(struct Node * N) +{ + unsigned char * DATA; + DATA = N->data; + return DATA; +} + +/*Node_Copy: Returns a copy of the node you input + * @param Node: The node you want to copy (struct CP_Node *) + * Returns a copy of the node you wanted to copy. + */ +struct Node * Node_Copy(struct Node * CP_Node) +{ + struct Node * CN; + CN = (struct Node*) malloc(sizeof(struct Node) + sizeof(struct Link) * 2); + if(CP_Node->link_ammount != 0) + { + for(int i=0; ilink_ammount; i++) + { + CN->links[i] = malloc(sizeof(struct Link)); + } + } + memcpy(CN, CP_Node, sizeof(struct Node)); + memcpy(CN->links[0],CP_Node->links[0], sizeof(struct Link)); + return CN; +} /*Node_Delete * Once you are finished using a node, always delete it using this. * It will take care of the links inside it. @@ -89,12 +147,12 @@ void Node_Delete(struct Node * N) * @param Name: (char * name) searches for link with this name * Returns the link struct if it's found otherwise returns NULL */ -struct Link * Node_Get_Link(char * Name, struct Node * N) +struct Link * Node_Get_Link(struct Node * N, char * Name) { struct Link * L; for(int i=0;ilink_ammount;i++) { - if(N->links[i]->name==Name) + if(strcmp(N->links[i]->name,Name) == 0) { L = (struct Link *)malloc(sizeof(struct Link)); memcpy(L,N->links[i],sizeof(struct Link)); @@ -118,7 +176,6 @@ int Node_Remove_Link(char * Name, struct Node * mynode) { if(mynode->links[i]->name == Name) { - printf("FOUND THIS GUY: %s\n", mynode->links[i]->name); for(int x=i;xlink_ammount && x+1 != mynode->link_ammount;i++) { memcpy(mynode->links[x],mynode->links[x+1],sizeof(struct Link)); @@ -166,18 +223,29 @@ struct Node * N_Add_Link(struct Node ** mynode, struct Link * mylink, size_t lin * @param linksize: sizeof(the link in mylink) (size_T) * Returns a fresh new node with the link you specified. Has to be freed with Node_Free preferably. */ -struct Node * N_Create_From_Link(struct Link * mylink, size_t linksize) +struct Node * N_Create_From_Link(struct Link * mylink) { struct Node * mynode; - mynode = (struct Node *) malloc(sizeof(struct Node) + linksize); + mynode = (struct Node *) malloc(sizeof(struct Node) + sizeof(struct Link)); mynode->link_ammount = 0; mynode->link_ammount++; mynode->links[0] = malloc(sizeof(struct Link)); memcpy(mynode->links[0], mylink, sizeof(struct Link)); return mynode; } -//Finished +/*N_Create_From_Data + * @param data: bytes buffer you want to create the node from + * returns a node with the data you inputted. + */ +struct Node * N_Create_From_Data(unsigned char * data) +{ + struct Node * mynode; + mynode = (struct Node *) malloc(sizeof(struct Node)); + mynode->data = data; + return mynode; +} /*Node_Resolve_Max_Size + * !!!This shouldn't concern you! *Gets the ammount of words that will be returned by Node_Resolve *@Param1: The string that will be processed (eg: char * sentence = "foo/bar/bin") *Returns either -1 if something went wrong or the ammount of words that would be processed. @@ -204,6 +272,7 @@ int Node_Resolve_Max_Size(char * input1) } /*Node_Resolve Basically stores everything in a pointer array eg: char * bla[Max_Words_] + * !!!This shouldn't concern you!!! *@param1: Pointer array(char * foo[x], X=Whatever ammount there is. should be used with the helper function Node_Resolve_Max_Size) *@param2: Sentence to gather words/paths from (Eg: char * meh = "foo/bar/bin") *@Returns 1 or 0, 0 if something went wrong, 1 if everything went smoothly. @@ -233,12 +302,84 @@ int Node_Resolve(char ** result, char * input1) } return 1; } +/************************************************************************************************************************************** + *|||||||||||||||||||||||||||||||||||||||| !!!! IMPORTANT !!! ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||* + ************************************************************************************************************************************** + * Not sure where this is used, I'm making something to easen it up for all of you. + * This in itself will get all the links for you in a link[] array inside Link_Proc + * the memory allocation for storage will be noted in the ammount of links. + * After being done with this, you have to free the array for which you will have a function specially made for you. + * + * What this does: + * It searches for links using a path like /foo/bar/bin/, if links with those names are found in the node you specify, it stores them + * in a custom struct, Link_Proc; which is what Node_Resolve_Link returns. + * Notes: + * Use it, free it, it's all already laid out for you. + * There will also be a tutorial demonstrating it in the same folder here so everyone can understand this. +*/ +struct Link_Proc +{ + char * remaining_links; // Not your concern. + int ammount; //This will store the ammount of links, so you know what to process. + struct Link * links[]; // Link array +}; +/*Node_Resolve_Links + * Processes a path returning all links. + * @param N: The node you want to get links from + * @param path: The "foo/bar/bin" path + */ +struct Link_Proc * Node_Resolve_Links(struct Node * N, char * path) +{ + if(!N || !path) + { + return NULL; + } + int expected_link_ammount = Node_Resolve_Max_Size(path); + struct Link_Proc * LProc = (struct Link_Proc *) malloc(sizeof(struct Link_Proc) + sizeof(struct Link) * expected_link_ammount); + LProc->ammount = 0; + char * linknames[expected_link_ammount]; + Node_Resolve(linknames, path); + for(int i=0;ilinks[i] = (struct Link *)malloc(sizeof(struct Link)); + memcpy(LProc->links[i], proclink, sizeof(struct Link)); + LProc->ammount++; + free(proclink); + } + } + //Freeing pointer array + for(int i=0;iammount != 0) + { + for(int i=0;iammount;i++) + { + Free_Link(LPRC->links[i]); + } + } + free(LPRC); +} + /*Node_Tree() Basically a unix-like ls *@Param1: Result char * foo[strlen(sentence)] *@Param2: char sentence[] = foo/bar/bin/whatever *Return: 0 if failure, 1 if success */ -int Node_Tree(char * result, char * input1) +int Node_Tree(char * result, char * input1) //I don't know where you use this but here it is. { if(!input1) { From 0052ef8ca206460197d17727c57fd1d39f28d571 Mon Sep 17 00:00:00 2001 From: xethyrion Date: Sun, 4 Dec 2016 22:11:10 +0200 Subject: [PATCH 08/10] Create Example for this.c --- include/ipfs/node/Example for this.c | 96 ++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 include/ipfs/node/Example for this.c diff --git a/include/ipfs/node/Example for this.c b/include/ipfs/node/Example for this.c new file mode 100644 index 0000000..1cf7d4a --- /dev/null +++ b/include/ipfs/node/Example for this.c @@ -0,0 +1,96 @@ +#include "repo/test_repo_config.h" +#include "repo/test_repo_identity.h" +#include "repo/test_repo_bootstrap_peers.h" +#include "repo/test_repo_fsrepo.h" +#include "cmd/ipfs/test_init.h" +#include "cid/test_cid.h" +#include "flatfs/test_flatfs.h" +#include "storage/test_ds_helper.h" +#include "storage/test_datastore.h" +#include "storage/test_blocks.h" +#include "ipfs/node/node.h" +/*TODOS! + *Incoroparate protobuf funcs + *Incoroparate multihash funcs +*/ +int main(int argc, char** argv) +{ + printf("XETH TESTS\n"); + ////Links////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + //Variables of link: + char * name = "Alex"; + char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; + struct Link * mylink; + mylink = Create_Link(name,ahash); + printf("===================================\n" \ + "Node Link:\n" \ + " -Name: %s\n" \ + " -Size: %lu\n" \ + "\n Cid Details:\n\n" \ + " -Version: %d\n" \ + " -Codec: %c\n" \ + " -Hash: %s\n" \ + " -Hash Length: %lu\n" \ + "====================================\n" \ + , mylink->name, mylink->size, mylink->Lcid->version,mylink->Lcid->codec,mylink->Lcid->hash,mylink->Lcid->hash_length); + + //Link Two for testing purposes + char * name2 = "Simo"; + char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; + struct Link * mylink2; + mylink2 = Create_Link(name2,ahash2); + + ////Nodes///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + //N_Create_From_Link + struct Node * Mynode; + Mynode = N_Create_From_Link(mylink); + mylink->name = "HAHA";//Testing for valid node creation + printf("Node Link[0] Name: %s\nHash: %s\n",Mynode->links[0]->name, Mynode->links[0]->Lcid->hash); + + //N_Add_Link + Mynode = N_Add_Link(&Mynode, mylink2, sizeof(mylink2)); + mylink2->name = "HAHA";//Testing for valid node creation + printf("Node Link[1] Name: %s\nHash: %s\n",Mynode->links[1]->name,Mynode->links[1]->Lcid->hash); + + //Node_Get_Link + struct Link * ResultLink = Node_Get_Link(Mynode, "Simo"); + printf("\nResultLink: \nName: %s\nHash: %s\n\n", ResultLink->name, ResultLink->Lcid->hash); + + //Node_Resolve_Links + struct Link_Proc * LPRX = Node_Resolve_Links(Mynode, "Alex/Simo"); + for(int i=0;iammount;i++) + { + printf("RESOLVE LINKS-Result: %s\n", LPRX->links[i]->name); + } + Free_Link_Proc(LPRX); + + //Node_Remove Link + + int StatUs = Node_Remove_Link("Simo", Mynode); + printf("Status: %d\n",StatUs); + printf("Outlinkamt: %d\n", Mynode->link_ammount); + + //Node Copy + struct Node * Node2; + Node2 = Node_Copy(Mynode); + printf("NODE COPY TEST: [0]: %s\n", Node2->links[0]->Lcid->hash); + Node_Delete(Node2); + + //Node_Set_Data + Node_Set_Data(Mynode, "DATA_HERE"); + + //Node_Get_Data + unsigned char * meh; + meh = Node_Get_Data(Mynode); + printf("NODE DATA: %s", meh); + + + //Free Everything + Free_Link(mylink); + Free_Link(mylink2); + Free_Link(ResultLink); + + Node_Delete(Mynode); + return 0; +} From 53b893bda2a8c065c52a73558969e839215604c3 Mon Sep 17 00:00:00 2001 From: xethyrion Date: Sun, 4 Dec 2016 22:13:57 +0200 Subject: [PATCH 09/10] Update testit.c --- test/testit.c | 138 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 54 deletions(-) diff --git a/test/testit.c b/test/testit.c index 65ed684..16521b0 100644 --- a/test/testit.c +++ b/test/testit.c @@ -1,54 +1,84 @@ -#include "repo/test_repo_config.h" -#include "repo/test_repo_identity.h" -#include "repo/test_repo_bootstrap_peers.h" -#include "repo/test_repo_fsrepo.h" -#include "cmd/ipfs/test_init.h" -#include "cid/test_cid.h" -#include "flatfs/test_flatfs.h" -#include "storage/test_ds_helper.h" -#include "storage/test_datastore.h" -#include "storage/test_blocks.h" -#include "ipfs/node/node.h" - -int main(int argc, char** argv) -{ - printf("XETH TESTS\n"); - //Variables of link: - char * name = "Alex"; - char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; - struct Link * mylink; - mylink = Create_Link(name,ahash); - printf("===================================\n" \ - "Node Link:\n" \ - " -Name: %s\n" \ - " -Size: %lu\n" \ - "\n Cid Details:\n\n" \ - " -Version: %d\n" \ - " -Codec: %c\n" \ - " -Hash: %s\n" \ - " -Hash Length: %lu\n" \ - "====================================\n" \ - , mylink->name, mylink->size, mylink->Lcid->version,mylink->Lcid->codec,mylink->Lcid->hash,mylink->Lcid->hash_length); - //Link Two for testing purposes - char * name2 = "Simo"; - char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; - struct Link * mylink2; - mylink2 = Create_Link(name2,ahash2); - //Nodes - struct Node * Mynode; - Mynode = N_Create_From_Link(mylink,sizeof(mylink)); - mylink->name = "HAHA";//Testing for valid node creation - printf("Node Link[0] Name: %s\nHash: %s\n",Mynode->links[0]->name, Mynode->links[0]->Lcid->hash); - Mynode = N_Add_Link(&Mynode, mylink2, sizeof(mylink2)); - mylink2->name = "HAHA";//Testing for valid node creation - printf("Node Link[1] Name: %s\nHash: %s\n",Mynode->links[1]->name,Mynode->links[1]->Lcid->hash); - struct Link * ResultLink = Node_Get_Link("Simo", Mynode); - printf("\nResultLink: \nName: %s\nHash: %s\n", ResultLink->name, ResultLink->Lcid->hash); - Node_Remove_Link("Simo", Mynode); - printf("Outlinkamt: %d\n", Mynode->link_ammount); - Free_Link(mylink); - Free_Link(mylink2); - Free_Link(ResultLink); - Node_Delete(Mynode); - return 0; -} + #include "storage/test_ds_helper.h" #include "storage/test_ds_helper.h" + #include "storage/test_datastore.h" #include "storage/test_datastore.h" + #include "storage/test_blocks.h" #include "storage/test_blocks.h" ++#include "ipfs/node/node.h" + +-int testit(const char* name, int (*func)(void)) { +int main(int argc, char** argv) +- printf("Testing %s...\n", name); +{ +- int retVal = func(); + printf("XETH TESTS\n"); +- if (retVal) + //Variables of link: +- printf("%s success!\n", name); + char * name = "Alex"; +- else + char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; +- printf("** Uh oh! %s failed.**\n", name); + struct Link * mylink; +- return retVal == 0; + mylink = Create_Link(name,ahash); +-} + printf("===================================\n" \ +- + "Node Link:\n" \ +-const char* names[] = { + " -Name: %s\n" \ +- "test_cid_new_free", + " -Size: %lu\n" \ +- "test_cid_cast_multihash", + "\n Cid Details:\n\n" \ +- "test_cid_cast_non_multihash", + " -Version: %d\n" \ +- //"test_init_new_installation", + " -Codec: %c\n" \ +- "test_repo_config_new", + " -Hash: %s\n" \ +- "test_repo_config_init", + " -Hash Length: %lu\n" \ +- "test_repo_config_write", + "====================================\n" \ +- "test_repo_config_identity_new", + , mylink->name, mylink->size, mylink->Lcid->version,mylink->Lcid->codec,mylink->Lcid->hash,mylink->Lcid->hash_length); +- "test_repo_config_identity_private_key", + //Link Two for testing purposes +- "test_get_init_command", + char * name2 = "Simo"; +- "test_repo_fsrepo_open_config", + char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; +- "test_flatfs_get_directory", + struct Link * mylink2; +- "test_flatfs_get_filename", + mylink2 = Create_Link(name2,ahash2); +- "test_flatfs_get_full_filename", + //Nodes +- "test_ds_key_from_binary", + struct Node * Mynode; +- "test_blocks_new", + Mynode = N_Create_From_Link(mylink,sizeof(mylink)); +- "test_repo_bootstrap_peers_init", + mylink->name = "HAHA";//Testing for valid node creation +- "test_ipfs_datastore_put" + printf("Node Link[0] Name: %s\nHash: %s\n",Mynode->links[0]->name, Mynode->links[0]->Lcid->hash); +-}; + Mynode = N_Add_Link(&Mynode, mylink2, sizeof(mylink2)); +- + mylink2->name = "HAHA";//Testing for valid node creation +-int (*funcs[])(void) = { + printf("Node Link[1] Name: %s\nHash: %s\n",Mynode->links[1]->name,Mynode->links[1]->Lcid->hash); +- test_cid_new_free, + struct Link * ResultLink = Node_Get_Link("Simo", Mynode); +- test_cid_cast_multihash, + printf("\nResultLink: \nName: %s\nHash: %s\n", ResultLink->name, ResultLink->Lcid->hash); +- test_cid_cast_non_multihash, + Node_Remove_Link("Simo", Mynode); +- //test_init_new_installation, + printf("Outlinkamt: %d\n", Mynode->link_ammount); +- test_repo_config_new, + Free_Link(mylink); +- test_repo_config_init, + Free_Link(mylink2); +- test_repo_config_write, + Free_Link(ResultLink); +- test_repo_config_identity_new, + Node_Delete(Mynode); +- test_repo_config_identity_private_key, + return 0; +- test_get_init_command, +- test_repo_fsrepo_open_config, +- test_flatfs_get_directory, +- test_flatfs_get_filename, +- test_flatfs_get_full_filename, +- test_ds_key_from_binary, +- test_blocks_new, +- test_repo_bootstrap_peers_init, +- test_ipfs_datastore_put +-}; +- +-/** +- * run 1 test or run all +- */ +-int main(int argc, char** argv) { +- int counter = 0; +- char* test_wanted; +- int only_one = 0; +- if(argc > 1) { +- only_one = 1; +- test_wanted = argv[1]; +- } +- for (int i = 0; i < sizeof(funcs) / sizeof(funcs[0]); i++) { +- if (only_one && strcmp(names[i], test_wanted) == 0) +- counter += testit(names[i], funcs[i]); +- else +- if (!only_one) +- counter += testit(names[i], funcs[i]); +- +- } +- +- if (counter > 0) { +- printf("***** There were %d failed test(s) *****\n", counter); +- } else { +- printf("All tests passed\n"); +- } +- return 1; + } From b9b90014a6ebfdc184c0a4da1bfa4a60d2e6ec36 Mon Sep 17 00:00:00 2001 From: jmjatlanta Date: Mon, 5 Dec 2016 06:13:20 -0500 Subject: [PATCH 10/10] Fixed tests --- .cproject | 1 + test/cmd/ipfs/test_init.h | 2 + test/node/test_node.h | 42 +++++++++ test/testit.c | 175 ++++++++++++++++++++------------------ 4 files changed, 137 insertions(+), 83 deletions(-) create mode 100644 test/node/test_node.h diff --git a/.cproject b/.cproject index 9bbebce..d05172c 100644 --- a/.cproject +++ b/.cproject @@ -29,6 +29,7 @@ + diff --git a/test/cmd/ipfs/test_init.h b/test/cmd/ipfs/test_init.h index 86e4779..b43a0e7 100644 --- a/test/cmd/ipfs/test_init.h +++ b/test/cmd/ipfs/test_init.h @@ -4,6 +4,8 @@ #ifndef __TEST_INIT_H__ #define __TEST_INIT_H__ +#include + #include "ipfs/cmd/ipfs/init.h" #include "ipfs/commands/argument.h" #include "ipfs/commands/request.h" diff --git a/test/node/test_node.h b/test/node/test_node.h new file mode 100644 index 0000000..a61c851 --- /dev/null +++ b/test/node/test_node.h @@ -0,0 +1,42 @@ +#include "ipfs/node/node.h" + +int test_node() { + //Variables of link: + char * name = "Alex"; + unsigned char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; + struct Link * mylink; + mylink = Create_Link(name,ahash); + printf("===================================\n" \ + "Node Link:\n" \ + " -Name: %s\n" \ + " -Size: %lu\n" \ + "\n Cid Details:\n\n" \ + " -Version: %d\n" \ + " -Codec: %c\n" \ + " -Hash: %s\n" \ + " -Hash Length: %lu\n" \ + "====================================\n" \ + , mylink->name, mylink->size, mylink->Lcid->version,mylink->Lcid->codec,mylink->Lcid->hash,mylink->Lcid->hash_length); + //Link Two for testing purposes + char * name2 = "Simo"; + unsigned char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; + struct Link * mylink2; + mylink2 = Create_Link(name2,ahash2); + //Nodes + struct Node * Mynode; + Mynode = N_Create_From_Link(mylink); + mylink->name = "HAHA";//Testing for valid node creation + printf("Node Link[0] Name: %s\nHash: %s\n",Mynode->links[0]->name, Mynode->links[0]->Lcid->hash); + Mynode = N_Add_Link(&Mynode, mylink2, sizeof(mylink2)); + mylink2->name = "HAHA";//Testing for valid node creation + printf("Node Link[1] Name: %s\nHash: %s\n",Mynode->links[1]->name,Mynode->links[1]->Lcid->hash); + struct Link * ResultLink = Node_Get_Link(Mynode, "Simo"); + printf("\nResultLink: \nName: %s\nHash: %s\n", ResultLink->name, ResultLink->Lcid->hash); + Node_Remove_Link("Simo", Mynode); + printf("Outlinkamt: %d\n", Mynode->link_ammount); + Free_Link(mylink); + Free_Link(mylink2); + Free_Link(ResultLink); + Node_Delete(Mynode); + return 0; +} diff --git a/test/testit.c b/test/testit.c index 16521b0..119c40b 100644 --- a/test/testit.c +++ b/test/testit.c @@ -1,84 +1,93 @@ - #include "storage/test_ds_helper.h" #include "storage/test_ds_helper.h" - #include "storage/test_datastore.h" #include "storage/test_datastore.h" - #include "storage/test_blocks.h" #include "storage/test_blocks.h" -+#include "ipfs/node/node.h" +#include "cid/test_cid.h" +#include "cmd/ipfs/test_init.h" +#include "flatfs/test_flatfs.h" +#include "node/test_node.h" +#include "repo/test_repo_bootstrap_peers.h" +#include "repo/test_repo_config.h" +#include "repo/test_repo_fsrepo.h" +#include "repo/test_repo_identity.h" +#include "storage/test_ds_helper.h" +#include "storage/test_datastore.h" +#include "storage/test_blocks.h" --int testit(const char* name, int (*func)(void)) { +int main(int argc, char** argv) -- printf("Testing %s...\n", name); +{ -- int retVal = func(); + printf("XETH TESTS\n"); -- if (retVal) + //Variables of link: -- printf("%s success!\n", name); + char * name = "Alex"; -- else + char * ahash = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"; -- printf("** Uh oh! %s failed.**\n", name); + struct Link * mylink; -- return retVal == 0; + mylink = Create_Link(name,ahash); --} + printf("===================================\n" \ -- + "Node Link:\n" \ --const char* names[] = { + " -Name: %s\n" \ -- "test_cid_new_free", + " -Size: %lu\n" \ -- "test_cid_cast_multihash", + "\n Cid Details:\n\n" \ -- "test_cid_cast_non_multihash", + " -Version: %d\n" \ -- //"test_init_new_installation", + " -Codec: %c\n" \ -- "test_repo_config_new", + " -Hash: %s\n" \ -- "test_repo_config_init", + " -Hash Length: %lu\n" \ -- "test_repo_config_write", + "====================================\n" \ -- "test_repo_config_identity_new", + , mylink->name, mylink->size, mylink->Lcid->version,mylink->Lcid->codec,mylink->Lcid->hash,mylink->Lcid->hash_length); -- "test_repo_config_identity_private_key", + //Link Two for testing purposes -- "test_get_init_command", + char * name2 = "Simo"; -- "test_repo_fsrepo_open_config", + char * ahash2 = "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnSimo"; -- "test_flatfs_get_directory", + struct Link * mylink2; -- "test_flatfs_get_filename", + mylink2 = Create_Link(name2,ahash2); -- "test_flatfs_get_full_filename", + //Nodes -- "test_ds_key_from_binary", + struct Node * Mynode; -- "test_blocks_new", + Mynode = N_Create_From_Link(mylink,sizeof(mylink)); -- "test_repo_bootstrap_peers_init", + mylink->name = "HAHA";//Testing for valid node creation -- "test_ipfs_datastore_put" + printf("Node Link[0] Name: %s\nHash: %s\n",Mynode->links[0]->name, Mynode->links[0]->Lcid->hash); --}; + Mynode = N_Add_Link(&Mynode, mylink2, sizeof(mylink2)); -- + mylink2->name = "HAHA";//Testing for valid node creation --int (*funcs[])(void) = { + printf("Node Link[1] Name: %s\nHash: %s\n",Mynode->links[1]->name,Mynode->links[1]->Lcid->hash); -- test_cid_new_free, + struct Link * ResultLink = Node_Get_Link("Simo", Mynode); -- test_cid_cast_multihash, + printf("\nResultLink: \nName: %s\nHash: %s\n", ResultLink->name, ResultLink->Lcid->hash); -- test_cid_cast_non_multihash, + Node_Remove_Link("Simo", Mynode); -- //test_init_new_installation, + printf("Outlinkamt: %d\n", Mynode->link_ammount); -- test_repo_config_new, + Free_Link(mylink); -- test_repo_config_init, + Free_Link(mylink2); -- test_repo_config_write, + Free_Link(ResultLink); -- test_repo_config_identity_new, + Node_Delete(Mynode); -- test_repo_config_identity_private_key, + return 0; -- test_get_init_command, -- test_repo_fsrepo_open_config, -- test_flatfs_get_directory, -- test_flatfs_get_filename, -- test_flatfs_get_full_filename, -- test_ds_key_from_binary, -- test_blocks_new, -- test_repo_bootstrap_peers_init, -- test_ipfs_datastore_put --}; -- --/** -- * run 1 test or run all -- */ --int main(int argc, char** argv) { -- int counter = 0; -- char* test_wanted; -- int only_one = 0; -- if(argc > 1) { -- only_one = 1; -- test_wanted = argv[1]; -- } -- for (int i = 0; i < sizeof(funcs) / sizeof(funcs[0]); i++) { -- if (only_one && strcmp(names[i], test_wanted) == 0) -- counter += testit(names[i], funcs[i]); -- else -- if (!only_one) -- counter += testit(names[i], funcs[i]); -- -- } -- -- if (counter > 0) { -- printf("***** There were %d failed test(s) *****\n", counter); -- } else { -- printf("All tests passed\n"); -- } -- return 1; - } +int testit(const char* name, int (*func)(void)) { + printf("Testing %s...\n", name); + int retVal = func(); + if (retVal) + printf("%s success!\n", name); + else + printf("** Uh oh! %s failed.**\n", name); + return retVal == 0; +} + +const char* names[] = { + "test_cid_new_free", + "test_cid_cast_multihash", + "test_cid_cast_non_multihash", + //"test_init_new_installation", + "test_repo_config_new", + "test_repo_config_init", + "test_repo_config_write", + "test_repo_config_identity_new", + "test_repo_config_identity_private_key", + "test_get_init_command", + "test_repo_fsrepo_open_config", + "test_flatfs_get_directory", + "test_flatfs_get_filename", + "test_flatfs_get_full_filename", + "test_ds_key_from_binary", + "test_blocks_new", + "test_repo_bootstrap_peers_init", + "test_ipfs_datastore_put", + "test_node" +}; + +int (*funcs[])(void) = { + test_cid_new_free, + test_cid_cast_multihash, + test_cid_cast_non_multihash, + //test_init_new_installation, + test_repo_config_new, + test_repo_config_init, + test_repo_config_write, + test_repo_config_identity_new, + test_repo_config_identity_private_key, + test_get_init_command, + test_repo_fsrepo_open_config, + test_flatfs_get_directory, + test_flatfs_get_filename, + test_flatfs_get_full_filename, + test_ds_key_from_binary, + test_blocks_new, + test_repo_bootstrap_peers_init, + test_ipfs_datastore_put, + test_node +}; + +/** + * run 1 test or run all + */ +int main(int argc, char** argv) { + int counter = 0; + char* test_wanted; + int only_one = 0; + if(argc > 1) { + only_one = 1; + test_wanted = argv[1]; + } + for (int i = 0; i < sizeof(names) / sizeof(names[0]); i++) { + if (only_one && strcmp(names[i], test_wanted) == 0) + counter += testit(names[i], funcs[i]); + else + if (!only_one) + counter += testit(names[i], funcs[i]); + + } + + if (counter > 0) { + printf("***** There were %d failed test(s) *****\n", counter); + } else { + printf("All tests passed\n"); + } + return 1; +}