Commit 7ad0f169 authored by Bhavesh Yadav's avatar Bhavesh Yadav

Fixed a lot of routing bugs

parent 7f1f4d66
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#define PORT 6089 #define PORT 8081
void sendUDP(char * msg, char ip[], int port, bool recvResponse, char * buffer, int src_port) void sendUDP(char * msg, char ip[], int port, bool recvResponse, char * buffer, int src_port)
{ {
......
...@@ -25,4 +25,4 @@ kvstore.o: kvstore.c kvstore.h ...@@ -25,4 +25,4 @@ kvstore.o: kvstore.c kvstore.h
run: kvserver run: kvserver
./kvserver -port=8081 -threadPoolSize=5 -numSetsInCache=4 -sizeOfSet=2 ./kvserver -port=8081 -threadPoolSize=5 -numSetsInCache=4 -sizeOfSet=2
clean: clean:
rm -f *.o kvserver kvclient *.csv *.xml batchResp*.txt rm -f *.o kvserver kvclient *.csv *.xml batchResp*.txt .chordConfig
\ No newline at end of file \ No newline at end of file
...@@ -258,14 +258,12 @@ void decodeRequestAndProcess(char* buffer) { ...@@ -258,14 +258,12 @@ void decodeRequestAndProcess(char* buffer) {
strcpy(buffer,toRespXML(request->err)); strcpy(buffer,toRespXML(request->err));
return; return;
} }
puts("key");
puts(request->key); puts(request->key);
int id = keyToId(request->key); int id = keyToId(request->key);
printf("key id : %d\n",id); printf("\nKey: %s, Key-Id: %d, server-id: %d\n",request->key,id,chord.node.nodeId);
Node successorNode = findSuccessor(id,false); //find server where the key belongs Node successorNode = findSuccessor(id,false); //find server where the key belongs
if(successorNode.nodeId == chord.node.nodeId) { //key belongs to the server if(successorNode.nodeId == chord.node.nodeId) { //key belongs to the server
puts("Node Id self"); puts("Send response back to client");
printf("%d\n Key Id: %d,\n",chord.node.nodeId,id);
if(!strcmp(request->operation,"putreq")){ if(!strcmp(request->operation,"putreq")){
puts("putreq"); puts("putreq");
addKey(request->key,request->val); addKey(request->key,request->val);
...@@ -297,7 +295,7 @@ void decodeRequestAndProcess(char* buffer) { ...@@ -297,7 +295,7 @@ void decodeRequestAndProcess(char* buffer) {
sendUDP(buffer,request->ipAddr,request->port,false,NULL); sendUDP(buffer,request->ipAddr,request->port,false,NULL);
}else }else
{ {
puts("Forward request"); puts("Forwarding request");
printf("key id: %d, successor node id: %d\n",id,successorNode.nodeId); printf("key id: %d, successor node id: %d\n",id,successorNode.nodeId);
puts("buffer"); puts("buffer");
puts(buffer); puts(buffer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment