list directory protocol done

Author: da-moon

bin/server

@@ -33,41 +33,52 @@ void Loop(int socket) {
             char *header = malloc(PROTOCOL_HEADER_LEN);
             int n = read(socket, header, PROTOCOL_HEADER_LEN);
             printf("size read from socket [%d] \n", n);
-            uint16_t magic = ExtractMessageMagic(header);
-            printf("server reply  magic [0x%04hX] \n", magic);
-            if (magic == 0xC0DE) {
-              uint16_t protocol = ExtractMessageProtocol(header);
-              uint32_t payload_size = ExtractMessageBodySize(header);
-              char *recv_buffer = malloc(payload_size);
-              read(socket, recv_buffer, payload_size);
-              Message reply;
-              reply.message_sender = socket;
-              reply.magic = magic;
-              reply.protocol = protocol;
-              reply.size = payload_size;
-              reply.body = recv_buffer;
+            if (n > 1) {
+              uint16_t magic = ExtractMessageMagic(header);
+              if (magic == 0xC0DE) {
+                uint16_t protocol = ExtractMessageProtocol(header);
+                uint32_t payload_size = ExtractMessageBodySize(header);
+                char *recv_buffer = malloc(payload_size);
+                read(socket, recv_buffer, payload_size);
+                Message reply;
+                reply.message_sender = socket;
+                reply.magic = magic;
+                reply.protocol = protocol;
+                reply.size = payload_size;
+                reply.body = recv_buffer;
 
-              switch (reply.protocol) {
-              case ECHO_REPLY: {
-                fprintf(stderr,
-                        "MAGIC "
-                        "[0x%04hX] | PROTOCOL "
-                        "[0x%04hX] = [%C] | data : %s\n",
-                        reply.magic, reply.protocol, reply.protocol,
-                        reply.body);
-                fprintf(stderr, "[ ECHO FROM SERVER ] ");
-                break;
-              }
-              default: {
+                switch (reply.protocol) {
+                case ERROR_MESSAGE: {
+                  fprintf(stderr, "[ ERROR MESSAGE ] : [ %s ]", reply.body);
+                  break;
+                }
+                case ECHO_REPLY: {
+                  fprintf(stderr,
+                          "MAGIC "
+                          "[0x%04hX] | PROTOCOL "
+                          "[0x%04hX] = [%C] | data : %s\n",
+                          reply.magic, reply.protocol, reply.protocol,
+                          reply.body);
+                  fprintf(stderr, "[ ECHO FROM SERVER ] ");
+                  break;
+                }
+                case LIST_DIR_REPLY: {
+                  fprintf(stderr, "[ List Dir Result ] : [ %s ]", reply.body);
+                  break;
+                }
+                default: {
+                  break;
+                }
+                }
+              } else {
                 break;
               }
-              }
-            } else {
-              break;
+
+              show_menu = 1;
             }
           }
+
           waiting_for_choice = 1;
-          show_menu = 1;
           // break;
         }
 

pkg/client/client.c

@@ -6,6 +6,7 @@ void DownloadProtocolSendRequestToServer(int socket) {
   char input[MAX_BUFFER];
   fgets(input, MAX_BUFFER - 1, stdin);
   char *arr_ptr = &input[0];
+  arr_ptr = Trim(arr_ptr);
   char *request = malloc(strlen(arr_ptr) + PROTOCOL_HEADER_LEN);
   int mesg_length = MarshallMessage(request, 0xC0DE, DOWNLOAD_REQUEST, input);
   Message message;

pkg/handlers/download.c

@@ -41,7 +41,7 @@ void *ServerRequestHandler(void *arg) {
         }
         case LIST_DIR_REQUEST: {
           printf("[DEBUG] Server Recieved List Directory Request\n");
-          //   ListDirectoryProtocolServerHandler(socket, message);
+          ListDirectoryProtocolServerHandler(socket, message);
           break;
         }
         default: {

pkg/handlers/handlers.c

@@ -4,6 +4,7 @@
 #include "../multiplexer/multiplexer.h"
 // #include "../queue/queue.h"
 #include "../shared/consts.h"
+#include "../shared/utils.h"
 
 #include <stdio.h>
 

pkg/handlers/handlers.h

@@ -2,14 +2,15 @@
 
 #include <dirent.h>
 #include <stdint.h>
+#include <string.h>
 
 void ListDirectoryProtocolSendRequestToServer(int socket) {
   printf("Enter Directory name For server list\n");
   char input[MAX_BUFFER];
   fgets(input, MAX_BUFFER - 1, stdin);
   char *arr_ptr = &input[0];
   char *request = malloc(strlen(arr_ptr) + PROTOCOL_HEADER_LEN);
-  int mesg_length = MarshallMessage(request, 0xC0DE, LIST_DIR_REQUEST, input);
+  int mesg_length = MarshallMessage(request, 0xC0DE, LIST_DIR_REQUEST, arr_ptr);
   Message message;
   message.body = (char *)(request + PROTOCOL_HEADER_LEN);
 
@@ -26,32 +27,37 @@ void ListDirectoryProtocolServerHandler(int socket, Message message) {
   DIR *dir;
   char payload[MAX_BUFFER];
   uint16_t protocol;
+  char buf[256];
+  sscanf(message.body, "%s", buf); // Trimming on both sides occurs here
+  dir = opendir(buf);
   // If the directory exists.
-  if ((dir = opendir(message.body)) != NULL) {
+  if (dir != NULL) {
     struct dirent *ent;
     protocol = LIST_DIR_REPLY;
-    /* Prepearing the File pointer for use in the while loop.
-    Pointer needed for file access and output. */
-    FILE *fp;
-
-    // While we are in a directory and there are other directories present.
+    // While we are in a directory and there are other directories
+    // present.
     while ((ent = readdir(dir)) != NULL) {
+      char temp[256];
+
       // Prints all of the data to the console.
-      printf("[DEBUG] '%s\n", ent->d_name);
-      fprintf(payload, "%s\n", ent->d_name);
+      sscanf(ent->d_name, "%s\n",
+             temp); // Trimming on both sides occurs here
+      strcat(payload, temp);
+      strcat(payload, " | ");
     }
-    // Closes file ponter & directory pointer, free's the data and shows where
-    // the log was saved to.
     closedir(dir);
   }
   // If the directory does not exist.
   else if (dir == NULL) {
-    fprintf(payload,
-            "You either typed the path incorrectly or the directory does not "
-            "existn");
+    memset(payload, 0, sizeof(payload));
 
+    strcpy(payload, "You either typed the path incorrectly or the directory "
+                    "does not existn");
+    protocol = ERROR_MESSAGE;
     closedir(dir);
   }
+  printf("%s\n", payload);
+
   char *arr_ptr = &payload[0];
   int payload_length = strlen(arr_ptr);