Added API for client and created test client. Also cleaned up code.

client/Makefile

@@ -1,18 +1,21 @@
 #Use the gcc compiler
 CC = gcc
 CFLAGS = -g
-DEPS = ../lib/marshal/marshal.o
+DEPS = ../lib/marshal/marshal.o 
 LDFLAGS =
 #Objects created by makefile
-OBJS = client-kv
+OBJS = client-kv client_api.o
 
 all: $(OBJS)
 
 rebuild: clean all
 
+client_api: client_api.c
+	$(CC) -c client_api.c -o client_api.o 
+
 client-kv: client-kv.c
 	cd ../lib/marshal && make
-	$(CC) $(CFLAGS) client-kv.c -o $(OBJS) $(DEPS)
+	$(CC) $(CFLAGS) client-kv.c -o client-kv $(DEPS)
 
 clean:
 	@rm -f $(OBJS)

client/client-kv.c

@@ -8,13 +8,18 @@
 #include <inttypes.h>
 #include <string.h>
 #include "../lib/marshal/marshal.h"
-/****************************************
- Author: Joel Klein, Katie Stasaski, Lucas Chaufournier, Tim Wood
- with a little help from
- http://beej.us/guide/bgnet/
- ****************************************/
-//Returns the number of bytes to wait for
-
+/************************************************
+ *                     GW KV
+ *  https://github.com/gwAdvNet2015/gw-kv-store
+ *
+ * Copyright 2015 Lucas Chaufournier, Joel Klein,
+ * and Katie Stasaski
+ *
+ * This program is licensed under the MIT license.
+ *
+ * client-kv.c - client that gets and sets keys
+ * from a keystore.
+ *************************************************/
 char* 
 marshal_msg(char * cmd, char * key, char * value)
 {
@@ -25,19 +30,14 @@ marshal_msg(char * cmd, char * key, char * value)
 	if (cmd[0] == 's') {
 		marshal_msg -> method_type = SET;
 		num_bytes = strlen(value);
-		//marshal_msg -> value = malloc(sizeof(num_bytes));
 		marshal_msg -> value = value;
 		marshal_msg -> value_length = num_bytes;
 	} else {
 		marshal_msg -> method_type = GET;
 	}
-	//marshal_msg -> key = malloc(sizeof(key));
 	marshal_msg -> key = key;
 	marshal_msg -> key_length = strlen(key);
 	gwkv_marshal_client(marshal_msg, &temp);
-//    printf("This is temp. %s\n",temp);
-    //free(marshal_msg->value);
-    //free(marshal_msg->key);
     free(marshal_msg);
 	return temp;
 }
@@ -49,7 +49,7 @@ demarshal_msg(int sockfd)
 	int count = 0;
 	int i;
 	char* msg = malloc(1024);
-	struct operation* marshal_msg;// = malloc(sizeof(struct operation));
+	struct operation* marshal_msg;
 	int * status = malloc(sizeof(int));
 
     recv(sockfd,&curr_char,1,0);
@@ -61,8 +61,6 @@ demarshal_msg(int sockfd)
     else{
         msg[count] = curr_char;
         count++;
-    //    printf("%c",curr_char);
-        //printf("reading lines\n");
         i = 0;
         for(i=0; i<3; i++) {
             while(1) {
@@ -71,29 +69,11 @@ demarshal_msg(int sockfd)
                 count++;
 
                 if(curr_char == ' ') {
-      //              printf(" ");
                     break;
                 }
-        //        printf("%c",curr_char);
 
             }
         }
-       /* while(1) {
-            recv(sockfd, &curr_char, 1, 0);
-            if (curr_char == '\r') {
-                msg[count] = curr_char;
-                count++;
-                recv(sockfd, &curr_char, 1, 0);
-                if (curr_char == '\n') {
-                    msg[count] = curr_char;
-                    count++;
-                    break;
-                }
-            } else {
-                msg[count] = curr_char;
-            }
-            count++;
-        }*/
         while(1) {
             recv(sockfd, &curr_char, 1, 0);
             if (curr_char == '\r') {
@@ -110,18 +90,11 @@ demarshal_msg(int sockfd)
             }
             count++;
         }
-        //printf("\nEND\n");
-        //printf("\nstring is %s\n",msg);
     }
 	gwkv_demarshal_client(msg, &marshal_msg, status);
     free(status);
     free(msg); 
-  //  printf("Value is %s\n",*marshal_msg->value);
-	//if (*status == -1) {
-	//	return 0;
-	//} else {
 		return marshal_msg;
-	//}
 }
 
 send_msg(int sockfd, char * temp)
@@ -139,8 +112,6 @@ send_msg(int sockfd, char * temp)
 read_get_msg(int sockfd)
 {
 	int bytes_received;
-	//char * recv_data = (char *)malloc(sizeof(char*)*1000);
-
 	struct operation* demarshaled_msg = malloc(sizeof(struct operation));
 	demarshaled_msg = demarshal_msg(sockfd);
 	bytes_received = recv(sockfd, demarshaled_msg->value, demarshaled_msg->value_length, 0);
@@ -218,7 +189,6 @@ int main(int argc, char ** argv)
 		perror("ERROR opening socket");
 		exit(-1);
 	}
-	//printf("socket created\n");
 	rc = connect(sockfd, server->ai_addr, server->ai_addrlen);
 	if (rc == -1) {
 		perror("ERROR on connect");
@@ -229,11 +199,8 @@ int main(int argc, char ** argv)
 
     //create the marshalled message
     temp = marshal_msg(cmd, key, value);
- //   printf("This is temp return %s\n",temp);
-	//send the marshaled message to the server
 	send_msg(sockfd, temp);
 
-	//read back get value
 	if (cmd[0] == 'g') {
 		read_get_msg(sockfd);
 	}
@@ -242,7 +209,6 @@ int main(int argc, char ** argv)
 		freeaddrinfo(server);
 	close(sockfd);
 
-	//printf("Done.\n");
 	return 0;
 
 }

client/client_api.c

@@ -0,0 +1,128 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <string.h>
+#include "client_api.h"
+/************************************************
+ *                     GW KV
+ *  https://github.com/gwAdvNet2015/gw-kv-store
+ *
+ * Copyright 2015 Lucas Chaufournier, Joel Klein,
+ * and Katie Stasaski
+ *
+ * This program is licensed under the MIT license.
+ *
+ * client_api.c- creates client api and modularizes
+ *************************************************/
+int
+set_mem(int sockfd, struct operation * msg)
+{
+    char * temp;
+    int num_bytes, rc;
+    int status = 0;
+
+    gwkv_marshal_client(msg, &temp);
+
+    rc = send(sockfd,temp,strlen(temp), 0);
+    if(rc < 0) {
+        status = -1;
+    }
+
+    return status;
+}
+
+int
+get_mem(int sockfd, struct operation * msg)
+{
+    char * temp;
+    int num_bytes, rc;
+    int status = 0;
+
+    gwkv_marshal_client(msg, &temp);
+
+    rc = send(sockfd,temp,strlen(temp), 0);
+    if(rc < 0) {
+        status = -1;
+        return status;
+    }
+
+    status = __read_get_msg(sockfd, msg);
+
+    return status;
+}
+
+int
+__read_get_msg(int sockfd, struct operation * msg)
+{
+    int bytes_received, status;
+
+    status = __demarshal_msg(sockfd, msg);
+    if (status < 0) {
+        return -1;  
+    } else {
+        msg->value = malloc(msg->value_length);
+        bytes_received = recv(sockfd, msg->value, msg->value_length, 0);
+        return 0;
+    }
+
+}
+
+int
+__demarshal_msg(int sockfd, struct operation * marshal_msg)
+{
+	char curr_char;
+	int count = 0;
+	int i;
+	char* msg = malloc(1024);
+	int * status = malloc(sizeof(int));
+    int stat = 0;
+    struct operation* op;
+    recv(sockfd,&curr_char,1,0);
+    if(curr_char == 'E')
+    {
+        stat = -1;
+    } else {
+        msg[count] = curr_char;
+        count++;
+
+        for(i=0; i<3; i++) {
+            while(1) {
+                recv(sockfd, &curr_char, 1, 0);
+                msg[count] = curr_char;
+                count++;
+
+                if(curr_char == ' ') {
+                    break;
+                }
+            }
+        }
+
+        while(1) {
+            recv(sockfd, &curr_char, 1, 0);
+            if (curr_char == '\r') {
+                msg[count] = curr_char;
+                count++;
+                recv(sockfd, &curr_char, 1, 0);
+                if (curr_char == '\n') {
+                    msg[count] = curr_char;
+                    count++;
+                    break;
+                }
+            } else {
+                msg[count] = curr_char;
+            }
+            count++;
+        }
+    	gwkv_demarshal_client(msg, &op, status);
+        marshal_msg->value_length = op-> value_length;
+        free(op);
+    }
+    free(status);
+    free(msg); 
+	return stat;
+}

client/client_api.h

@@ -0,0 +1,25 @@
+#ifndef __CLIENT_API__
+#define __CLIENT_API__
+
+#include "../lib/marshal/marshal.h"
+
+/************************************************
+ *                     GW KV
+ *  https://github.com/gwAdvNet2015/gw-kv-store
+ *
+ * Copyright 2015 Lucas Chaufournier, Joel Klein,
+ * and Katie Stasaski
+ *
+ * This program is licensed under the MIT license.
+ *
+ * client_api.h - sets up functions for client's
+ * api
+ *************************************************/
+
+int
+get_mem(int sockfd, struct operation *msg);
+
+int
+send_mem(int sockfd, struct operation * msg);
+
+#endif//__CLIENT_API__