Fixed keylookup and request forwarding

client/kvclient.c

@@ -9,7 +9,7 @@
 #include <arpa/inet.h> 
 #include <netinet/in.h> 
 
-#define PORT 8080
+#define PORT 6089
 
 void sendUDP(char * msg, char ip[], int port, bool recvResponse, char * buffer, int src_port)
 {

server/chord.c

@@ -15,7 +15,7 @@
 #include "chord.h"
 #include <pthread.h>
 
-#define MAXLOCATIONS 32
+#define MAXLOCATIONS 16
 #define MAXIDVALUE 65536
 
 int keyToId(char * key){
@@ -158,10 +158,10 @@ void stabilize() {
     fclose(configFile);
     sortNodes(currNodes,i);
     setSuccessorAndPredecessor(currNodes,i);
-    system("clear");
-    printf("node-id: %d,successor: %d, pred: %d\n",chord.node.nodeId,chord.successor.nodeId,chord.predecessor.nodeId);
+    // system("clear");
+    // printf("node-id: %d,successor: %d, pred: %d\n",chord.node.nodeId,chord.successor.nodeId,chord.predecessor.nodeId);
     fixFingers(currNodes,i);
-    printFingerTable();
+    // printFingerTable();
 }
 
 void initChordServer(sockaddr_t serverAddr) {
@@ -223,27 +223,31 @@ void initChordStructure(struct sockaddr_in *joinNode,sockaddr_t socketAddrServer
 
 
 Node closestPreceedingNode(int id){
-    int m= log(MAXLOCATIONS);
+    int m= MAXLOCATIONS;
     Node* f=chord.fingerTable[0];
     for (int i = m-1; i >=0; i--)
     {        
         int nextId = chord.fingerTable[i]->nodeId;
-        printf("nextid: %d",nextId);
-        if(nextId == 0)
-            continue;
+        printf("nextid: %d\n",nextId);
         if (nextId>chord.node.nodeId && nextId<=id)
         {
             return *chord.fingerTable[i];
         }
-        
+        /// To handle edge case
+        if(chord.node.nodeId<chord.predecessor.nodeId)   
+            return chord.node;
+        else if(chord.node.nodeId>chord.successor.nodeId)
+                return chord.successor;
     }
     // strcpy(ip,f[0].ip); //????
 }
 
 Node findSuccessor(int id, bool fixFinger){
-    if(chord.predecessor.nodeId == -1) {
+    printf("successor: %d, pred: %d",chord.successor.nodeId,chord.predecessor.nodeId);
+    printFingerTable();
+    if(chord.predecessor.nodeId == chord.node.nodeId) {
         return chord.node;
-    }else if(id>chord.predecessor.nodeId && id<=chord.node.nodeId)
+    }else if(id<=chord.node.nodeId && id > chord.predecessor.nodeId)
             return chord.node;
     if (id>chord.node.nodeId && id<=chord.successor.nodeId)
     {

server/chord.h

@@ -33,3 +33,5 @@ void sendUDPToNode(char* msg,Node node, bool recvResponse, char* buffer);
 void initChordServer();
 void createNodeStruct(Node *givenNode,char ip[16],int port,int id);
 void stabilize();
+Node getSuccessor();
+void sendUDP(char * msg, char ip[], int port, bool recvResponse, char * buffer);
\ No newline at end of file

server/kvserver.c

@@ -67,7 +67,7 @@ int main(int argc, char* argv[])
     char* cacheptr =  buildCache(numSets, setSize);
     initStore();
     int sock_fd, addrlen, msglen, newConnection, client_socket[MAX_CLIENTS], max_sd;
-    struct sockaddr_in socketAddr,joinServer;
+    struct sockaddr_in socketAddr,joinServer,clientAddr;
     puts("getting socket");
     if(joinPort!=-1)
         getSocketFromIpAndPort(joinIp,joinPort,&joinServer);
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
     fd_set rset;
     memset(client_socket,0,sizeof(int)*MAX_CLIENTS);
 
-    if( (sock_fd = socket(AF_INET , SOCK_STREAM , 0)) == 0) {
+    if( (sock_fd = socket(AF_INET , SOCK_DGRAM , 0)) == 0) {
 		printf("%s",toRespXML("Network Error: Could not create socket"));
         exit(1);
     }
@@ -95,78 +95,88 @@ int main(int argc, char* argv[])
     // initChordStructure(&joinServer,socketAddr);
     printf("Listening on port %d \n", PORT);
 
-    if (listen(sock_fd, BACKLOG) < 0) {
-        perror("listen");
-        exit(1);
-    }
-    puts("Waiting for connections ...");
-
-    while(1)
-    {
-        FD_ZERO(&rset);
-        FD_SET(sock_fd, &rset);
-        max_sd = sock_fd;
-
-        for (int i = 0 ; i < MAX_CLIENTS ; i++) {
-            int sd = client_socket[i];
-
-            if(sd > 0)
-                FD_SET( sd , &rset);
-
-            if(sd > max_sd)
-                max_sd = sd;
-        }
-
-        if ( (select(max_sd+1,&rset,NULL,NULL,NULL) < 0) && (errno!=EINTR))
-            printf("select error");
-
-        if (FD_ISSET(sock_fd, &rset)){
-            newConnection = accept(sock_fd, (struct sockaddr *)&socketAddr, (socklen_t*)&addrlen);
-            if (newConnection < 0) {
-                perror("Error during Accept");
-                exit(1);
-            }
-            printf("New connection,socket_fd is %d,ip is:%s,port:%d\n", newConnection,inet_ntoa(socketAddr.sin_addr),ntohs(socketAddr.sin_port));
-
-            for (int i=0;i<MAX_CLIENTS;i++) {
-                if( client_socket[i] == 0 ) {
-                    client_socket[i] = newConnection;
-                    printf("Adding to list of sockets as %d\n" , i);
-                    break;
-                }
-            }
-        }
-
-        for (int i = 0; i < MAX_CLIENTS; i++) {
-            int sd = client_socket[i];
-            if (FD_ISSET(sd,&rset)) {
-                if ((msglen = read(sd,buffer,1024*257)) == 0) {
-                    getpeername(sd , (struct sockaddr*)&socketAddr,(socklen_t*)&addrlen);
-                    printf("Host disconnected,ip %s,port %d\n",inet_ntoa(socketAddr.sin_addr),ntohs(socketAddr.sin_port));
-                    close(sd);
-                    client_socket[i] = 0;
-                }
-                else {
-                    buffer[msglen] = '\0';
-                    // printf("message recieved\n");
-                    // printf("%s",buffer);
+    // if (listen(sock_fd, BACKLOG) < 0) {
+    //     perror("listen");
+    //     exit(1);
+    // }
+    // puts("Waiting for connections ...");
+    int len, n; 
+    while(1) {
+        puts("in udp listen");
+        n = recvfrom(sock_fd, (char *)buffer, 257*1024,  
+                    MSG_WAITALL, ( struct sockaddr *) &clientAddr, 
+                    &len); 
+        buffer[n] = '\0'; 
+        printf("Client : %s\n", buffer); 
         puts(buffer);
-                    addRequestToQueue(tp,decodeRequestAndProcess,buffer,sd);
-                    /*
-                    char operation[7],key[257],value[256*1024+1];
-                    extractXML(buffer,key,value,operation);
-                    printf("%s\n%s\n%s\n",key,value,operation);
-                    
-
-                    ThreadPool Here !!
-                    Call extract from XML procedure to get Operation Type, Key, Value
-
-                    */
-                    // write(sd , buffer , strlen(buffer));
-                }
-            }
-        }
-    }
+        addRequestToQueue(tp,decodeRequestAndProcess,buffer);
+    }
+    // while(1)
+    // {
+    //     FD_ZERO(&rset);
+    //     FD_SET(sock_fd, &rset);
+    //     max_sd = sock_fd;
+
+    //     for (int i = 0 ; i < MAX_CLIENTS ; i++) {
+    //         int sd = client_socket[i];
+
+    //         if(sd > 0)
+    //             FD_SET( sd , &rset);
+
+    //         if(sd > max_sd)
+    //             max_sd = sd;
+    //     }
+
+    //     if ( (select(max_sd+1,&rset,NULL,NULL,NULL) < 0) && (errno!=EINTR))
+    //         printf("select error");
+
+    //     if (FD_ISSET(sock_fd, &rset)){
+    //         newConnection = accept(sock_fd, (struct sockaddr *)&socketAddr, (socklen_t*)&addrlen);
+    //         if (newConnection < 0) {
+    //             perror("Error during Accept");
+    //             exit(1);
+    //         }
+    //         printf("New connection,socket_fd is %d,ip is:%s,port:%d\n", newConnection,inet_ntoa(socketAddr.sin_addr),ntohs(socketAddr.sin_port));
+
+    //         for (int i=0;i<MAX_CLIENTS;i++) {
+    //             if( client_socket[i] == 0 ) {
+    //                 client_socket[i] = newConnection;
+    //                 printf("Adding to list of sockets as %d\n" , i);
+    //                 break;
+    //             }
+    //         }
+    //     }
+
+    //     for (int i = 0; i < MAX_CLIENTS; i++) {
+    //         int sd = client_socket[i];
+    //         if (FD_ISSET(sd,&rset)) {
+    //             if ((msglen = read(sd,buffer,1024*257)) == 0) {
+    //                 getpeername(sd , (struct sockaddr*)&socketAddr,(socklen_t*)&addrlen);
+    //                 printf("Host disconnected,ip %s,port %d\n",inet_ntoa(socketAddr.sin_addr),ntohs(socketAddr.sin_port));
+    //                 close(sd);
+    //                 client_socket[i] = 0;
+    //             }
+    //             else {
+    //                 buffer[msglen] = '\0';
+    //                 // printf("message recieved\n");
+    //                 // printf("%s",buffer);
+    //                 puts(buffer);
+    //                 addRequestToQueue(tp,decodeRequestAndProcess,buffer,sd);
+    //                 /*
+    //                 char operation[7],key[257],value[256*1024+1];
+    //                 extractXML(buffer,key,value,operation);
+    //                 printf("%s\n%s\n%s\n",key,value,operation);
+                    
+
+    //                 ThreadPool Here !!
+    //                 Call extract from XML procedure to get Operation Type, Key, Value
+
+    //                 */
+    //                 // write(sd , buffer , strlen(buffer));
+    //             }
+    //         }
+    //     }
+    // }
 
     return 0;
 }
\ No newline at end of file

server/parsexml.c

@@ -133,7 +133,7 @@ char *extractRespXml(FILE *fp,char *buffer){
 extReq_t *extractXML(char *buffer){
 	extReq_t *req;
 	req = malloc(sizeof(extReq_t));
-	char *p,*q;
+	char *p,*q,*r;
 	req->operation = malloc(sizeof(char)*12);
 	req->err = malloc(sizeof(char)*170);
 	req->val = malloc(sizeof(char)*256*1024+1); 
@@ -183,11 +183,14 @@ extReq_t *extractXML(char *buffer){
 	p = strstr(buffer, "<Address>")+9;
 	q = strstr(buffer, "</Address>");
 	if(p!=NULL && q!=NULL){
-		strcpy(req->ipAddr,strtok(p, " "));
-		int l = strlen(req->ipAddr); 
+		r = strstr(p," ");
+		memcpy(req->ipAddr,p,r-p);
+		// strcpy(req->ipAddr,strtok(p, " "));
+		// int l = strlen(req->ipAddr);
+		req->ipAddr[r-p] = '\0';
 		char port_s[6];
-		memcpy(port_s,p+l+1,q-p-l-1);
-		port_s[q-p-l-1] = '\0';
+		memcpy(port_s,r+1,q-r-1);
+		port_s[q-r-1] = '\0';
 		req->port = atoi(port_s);
 
 	}

server/threadPool.c

@@ -29,7 +29,7 @@ struct tpool {
     bool             stop;
 };
 
-static request_t *createJob(tFunction func, void *arg,int clientFD)
+static request_t *createJob(tFunction func, void *arg)
 {
     request_t *work;
 
@@ -39,7 +39,7 @@ static request_t *createJob(tFunction func, void *arg,int clientFD)
     work       = malloc(sizeof(*work));
     work->func = func;
     work->arg  = arg;
-    work->clientFD = clientFD;
+    // work->clientFD = clientFD;
     work->next = NULL;
     return work;
 }
@@ -90,8 +90,8 @@ static void *threadMainFunction(void *arg)
 
         if (work != NULL) {
             work->func(work->arg);
-            if(work->arg !=NULL);
-                write(work->clientFD,work->arg,sizeof(char)*strlen(work->arg));
+            // if(work->arg !=NULL);
+                // write(work->clientFD,work->arg,sizeof(char)*strlen(work->arg));
             deleteJob(work);
         }
 
@@ -162,7 +162,7 @@ void destroyThreadPool(tpool_t *tm)
     free(tm);
 }
 
-bool addRequestToQueue(tpool_t *tm, tFunction func, void *arg,int clientFD)
+bool addRequestToQueue(tpool_t *tm, tFunction func, void *arg)
 {
     request_t *work;
     int msglen = 1024*257+170;
@@ -170,7 +170,7 @@ bool addRequestToQueue(tpool_t *tm, tFunction func, void *arg,int clientFD)
     strcpy(copyBuffer,arg);
     if (tm == NULL)
         return false;
-    work = createJob(func, copyBuffer,clientFD);
+    work = createJob(func, copyBuffer);
     if (work == NULL)
         return false;
     pthread_mutex_lock(&(tm->queueLock));
@@ -239,7 +239,7 @@ int init(int argc, char **argv)
     strcpy(buffer[3],"<?xml version=\"1.0\" encoding=\"UTF-8\"?><KVMessage type=\"getreq\"><Key>5</Key><Value></Value></KVMessage>");
     for (i=0; i<4; i++) {
         vals[i] = i;
-        addRequestToQueue(tm, decodeRequestAndProcess, buffer[i],1);
+        addRequestToQueue(tm, decodeRequestAndProcess, buffer[i]);
     }
     tpoolWait(tm);
     free(vals);
@@ -261,8 +261,8 @@ void decodeRequestAndProcess(char* buffer) {
     puts("key");
     puts(request->key);
     int id = keyToId(request->key);
-    printf("key id : %d",id);
-    Node successorNode = findSuccessor(id, false); //find server where the key belongs
+    printf("key id : %d\n",id);
+    Node successorNode = findSuccessor(id,false); //find server where the key belongs
     if(successorNode.nodeId == chord.node.nodeId) { //key belongs to the server
         puts("Node Id self");
         printf("%d\n Key Id: %d,\n",chord.node.nodeId,id);
@@ -291,10 +291,16 @@ void decodeRequestAndProcess(char* buffer) {
             // puts("buffer");
             // puts(buffer);
         }
+        puts("buffer");
+        puts(buffer);
+        puts(request->ipAddr);
+        sendUDP(buffer,request->ipAddr,request->port,false,NULL);
     }else
     {   
         puts("Forward request");
-        printf("key id: %d, successor node id: %d",id,successorNode.nodeId);
+        printf("key id: %d, successor node id: %d\n",id,successorNode.nodeId);
+        puts("buffer");
+        puts(buffer);
         sendUDPToNode(buffer,successorNode,false,NULL);
         buffer = NULL;
     }

server/threadPool.h

@@ -9,5 +9,5 @@ tpool_t *createThreadPool(size_t num);
 void destroyThreadPool(tpool_t *tm);
 void decodeRequestAndProcess(char* buffer);
 
-bool addRequestToQueue(tpool_t *tm, tFunction func, void *arg,int clientFD);
+bool addRequestToQueue(tpool_t *tm, tFunction func, void *arg);
 void tpoolWait(tpool_t *tm);
\ No newline at end of file