Added code to retrieve sender (by calling the appropriate message_helper function), started refactoring code so that all data is processed in one shot, instead of waiting for multiple 'recv's

main.c

@@ -14,6 +14,7 @@
 
 #define BUFFER_SIZE 10000
 #define MAX_CONNECTIONS 100
+#define DATA_SIZE 50000
 
 User** create_user_list(char* filename);
 void sigint_handler(int dummy);
@@ -22,9 +23,10 @@ User* fetch_user(char* username);
 User** users;
 int num_users;
 
-bool stop_running = false;
+bool stop_running;
 
 int main() {
+	stop_running = false;
 
 	signal(SIGINT,sigint_handler);
 
@@ -34,12 +36,14 @@ int main() {
 	fd_set read_fd_set;
 	int conn_sockets[MAX_CONNECTIONS] = {-1};
 	User* to_user[MAX_CONNECTIONS] = {NULL};
+	User* from_user[MAX_CONNECTIONS] = {NULL};
 	FD_ZERO(&read_fd_set);
 	char buffer[BUFFER_SIZE];
+	char data[DATA_SIZE];
 
 	num_users = num_of_lines("user_file.txt");
 	users = create_user_list("user_file.txt");
-
+	
 	struct sockaddr addr_struct;
 	int server_sock = create_local(4,'T',"127.0.0.1",30000,&addr_struct);
 	conn_sockets[0] = server_sock;
@@ -69,43 +73,70 @@ int main() {
 
 			for (int i=1; i < MAX_CONNECTIONS; i++) {
 				if (FD_ISSET(conn_sockets[i],&read_fd_set)) {
-					int num_bytes_read = recv(conn_sockets[i],buffer,sizeof(buffer),0);
-					if (num_bytes_read <= 0) {
-						close(conn_sockets[i]);
-						conn_sockets[i] = 0;
-						to_user[i] = NULL;
-					} else {
-						if (to_user[i] == NULL) {
-							to_user[i] = fetch_user(fetch_dest_user_string(buffer));
+					do {
+
+						while ( strcmp(buffer,"END_OF_DATA\r\n") != 0 ) {
+							int num_bytes_read = recv(conn_sockets[i],buffer,sizeof(buffer),0);
+                                	                if (num_bytes_read <= 0) {
+								close(conn_sockets[i]);
+								conn_sockets[i] = 0;
+								to_user[i] = NULL;
+								GOTO continue_for_loop;
+	                                                } 
+							strcat(data, buffer);
+						}
+
+						strcat(data,"\0");
+
+						if (num_bytes_read <= 0) {
+							close(conn_sockets[i]);
+							conn_sockets[i] = 0;
+							to_user[i] = NULL;
+							break;
+						} else {
+	
+							if (from_user[i] == NULL) {
+								from_user[i] = fetch_user(fetch_sender_user_string(buffer));
+								if (from_user[i] == NULL) {
+									printf("Please identify yourself.\n");
+									raise(SIGINT);
+									return 150;
+								} else {
+									printf("You are %s\n",from_user[i]->username);
+								}
+								continue;
+							}
+	
 							if (to_user[i] == NULL) {
-								printf("Invalid message format or User\n");
-								exit(241);
-							} else {
-								printf("Message intended for %s\n",to_user[i]->username);
-								exit(0);
+								to_user[i] = fetch_user(fetch_dest_user_string(buffer));
+								if (to_user[i] == NULL) {
+									printf("Invalid message format or User\n");
+									raise(SIGINT);
+								} else {
+									printf("Message intended for %s\n",to_user[i]->username);
+								}
+								continue;
 							}
 
+							char* message = fetch_message_string(buffer);
+							
 						}
-						
 
-//						for (int i=0;i<num_bytes_read;i++) {
-//							printf("%c",buffer[i]);
-//						}
-					}
+					} while (strcmp(buffer,"END_OF_DATA\r\n") != 0);
 
-					
 				}
+				continue_for_loop:
 			}
-
-
 		}
 		
 
-	if (stop_running) {
-		for (int i=0; i< MAX_CONNECTIONS; i++) {
+	if (stop_running == true) {
+		printf("Stopping...\n");
+		for (int i=MAX_CONNECTIONS-1; i>= 0;  i--) {
+			close(i);
 			close(conn_sockets[i]);
 		}
-		exit(130);
+		return 130;
 	}
 
 

message_helpers.c

@@ -13,3 +13,25 @@ char* fetch_dest_user_string(char* message) {
 
 	return token;
 }
+
+char* fetch_sender_user_string(char* message) {
+	fetch_generic_string("IAM",message);
+}
+
+char* fetch_generic_string(char* indicator, char* message) {
+        char* token = malloc (sizeof(char) * strlen(message));
+
+	char* string_to_search = malloc(strlen(indicator) + 1);
+	strcpy(string_to_search,indicator);
+	strcat(string_to_search,":");
+
+        token = strtok(message," r\n");
+        if (strcmp(token,string_to_search) == 0) {
+                token = strtok(NULL," \r\n");
+        } else {
+                return NULL;
+        }
+
+        return token;
+
+}

message_helpers.h

@@ -4,3 +4,18 @@
 TO: <Username>
 then return 'Username' */
 char* fetch_dest_user_string(char* message);
+
+/* If the message contains a string of the form:
+IAM: <Username>
+then return 'Username' */
+char* fetch_sender_user_string(char* message);
+
+/* If the message contains a string of the form:
+<Indicator>: <Value>
+Then return 'value' */
+char* fetch_generic_string(char* indicator, char* message);
+
+/* If the message contains a string of the form:
+START_OF_MESSAGE
+<text>
+END_OF_MESSAGE