all protocols initialized

Author: da-moon

Makefile

@@ -36,15 +36,15 @@ LIBRARIES = $(filter-out $(wildcard ./cmd/*/*.c), $(call rwildcard,./,*.c))
 TARGET = $(notdir $(patsubst %/,%,$(dir $(wildcard ./cmd/*/.))))
 
 .PHONY:  dep client run-client server run-server clean
-client: clean
+client: 
 	- $(MKDIR) ./bin
 	- $(RM) ./bin/client
 	- gcc -o ./bin/client ${LIBRARIES} ./cmd/client/main.c -std=c99 -lpthread -Wall  -lnsl
 run-client: client
 	- $(CLEAR)
 	- ./bin/client ${SERVER_IP} ${SERVER_PORT}
 
-server: clean
+server: 
 	- $(CLEAR)
 	- $(MKDIR) ./bin
 	- $(RM) ./bin/server

bin/client

@@ -11,8 +11,9 @@ void Loop(int socket) {
     if (show_menu) {
       printf("\n--------------------------------------------------\n");
       puts("Please select your prefer service:\n  1. Echo\n  2. "
-           "Broadcast\n  3. "
-           "Quit\nEnter your choice: ");
+           "Download\n  3. Upload\n  4. Change Directory\n  5. List "
+           "Directory\n  "
+           "6. Quit\nEnter your choice: ");
       show_menu = 0;
     }
 
@@ -46,13 +47,14 @@ void Loop(int socket) {
               reply.size = payload_size;
               reply.body = recv_buffer;
 
-              fprintf(stderr,
-                      "MAGIC "
-                      "[0x%04hX] | PROTOCOL "
-                      "[0x%04hX] = [%C] | data : %s\n",
-                      reply.magic, reply.protocol, reply.protocol, reply.body);
               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;
               }
@@ -84,23 +86,30 @@ void Loop(int socket) {
               }
             }
             if (bcmp(choice, "1", 1) && bcmp(choice, "2", 1) &&
-                bcmp(choice, "3", 1)) {
+                bcmp(choice, "3", 1) && bcmp(choice, "4", 1) &&
+                bcmp(choice, "5", 1) && bcmp(choice, "6", 1)) {
               printf("Please enter a valid number from 1 to 3\n");
               continue;
             }
             system("clear");
 
             waiting_for_choice = 0;
             // Quit-----------------------------------------------------------------------------------------
-            if (!bcmp(choice, "3", 1)) {
+            if (!bcmp(choice, "6", 1)) {
               printf("Your choice is to Quit the program\n");
+              leave_request(socket);
               exit(0);
             }
             // Echo-----------------------------------------------------------------------------------------
             if (!bcmp(choice, "1", 1)) {
               printf("Your choice is Echo Protocol\n");
               EchoProtocolSendRequestToServer(socket);
             }
+            // Echo-----------------------------------------------------------------------------------------
+            if (!bcmp(choice, "2", 1)) {
+              printf("Your choice is Download Protocol\n");
+              DownloadProtocolSendRequestToServer(socket);
+            }
           }
           printf("MSG WAS SENT SUCCEFULLY\n");
         }

pkg/client/client.c

@@ -0,0 +1,26 @@
+#include "handlers.h"
+void ChangeDirectoryProtocolSendRequestToServer(int socket) {
+  printf("Enter Directory name For server TO change into\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, CHANGE_DIR_REQUEST, input);
+  Message message;
+  message.body = (char *)(request + PROTOCOL_HEADER_LEN);
+
+  if (send(socket, request, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr,
+          "[DEBUG] client : sending download reques for file %s to server\n",
+          message.body);
+}
+void ChangeDirectoryProtocolServerHandler(int socket, Message message) {
+  char *arr_ptr = &message.body[0];
+  int payload_length = strlen(arr_ptr);
+  char *reply = malloc(strlen(arr_ptr) + PROTOCOL_HEADER_LEN);
+  int mesg_length = MarshallMessage(reply, 0xC0DE, message.protocol, arr_ptr);
+  if (send(socket, reply, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr, "[DEBUG] Echo Handler Server : Replying bac .... \n");
+}

pkg/handlers/change_directory.c

@@ -0,0 +1,29 @@
+
+#include "handlers.h"
+
+void DownloadProtocolSendRequestToServer(int socket) {
+  printf("Enter File Name for download\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, DOWNLOAD_REQUEST, input);
+  Message message;
+  message.body = (char *)(request + PROTOCOL_HEADER_LEN);
+
+  if (send(socket, request, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr,
+          "[DEBUG] client : sending download reques for file %s to server\n",
+          message.body);
+}
+void DownloadProtocolServerHandler(int socket, Message message) {
+  char *arr_ptr = &message.body[0];
+  int payload_length = strlen(arr_ptr);
+
+  char *reply = malloc(strlen(arr_ptr) + PROTOCOL_HEADER_LEN);
+  int mesg_length = MarshallMessage(reply, 0xC0DE, FILE_REPLY, arr_ptr);
+  if (send(socket, reply, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr, "[DEBUG] Echo Handler Server : Replying bac .... \n");
+}

pkg/handlers/download.c

@@ -1,7 +1,4 @@
 #include "handlers.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 void EchoProtocolSendRequestToServer(int socket) {
   char input[MAX_BUFFER];

pkg/handlers/echo.c

@@ -19,15 +19,28 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <string.h>
 // https://www.ibm.com/support/knowledgecenter/en/SSVSD8_8.4.1/com.ibm.websphere.dtx.dsgnstud.doc/references/r_design_studio_intro_Hex_Decimal_and_Symbol_Values.htm
 
 typedef enum {
   // 'A' in hex
   ECHO_REQUEST = 0x0042,
-  //   'a' in hex
+  // 'a' in hex
   ECHO_REPLY = 0x0062,
-
+  // 'D' in hex
+  DOWNLOAD_REQUEST = 0x0044,
+  // 'U' in hex
+  UPLOAD_REQUEST = 0x0055,
+  // 'R' in hex
+  READY_REPLY = 0x0052,
+  // 'F' in hex
+  FILE_REPLY = 0x0046,
+  // 'P' in hex
+  CHANGE_DIR_REQUEST = 0x0050,
+  // 'L' in hex
+  LIST_DIR_REQUEST = 0x0050,
+  // 'l' in hex
+  LIST_DIR_REPLY = 0x006C,
   UNKNOWN_TYPE = 0xFFFF
 } MessageType;
 // RequestHandler - this is the main method
@@ -36,9 +49,14 @@ typedef enum {
 // handler
 void *ServerRequestHandler(void *arg);
 
-// EchoProtocolSendRequestToServer - reads from stdin and
-// sends a message to server . it uses ECHO_REQUEST
-// as the protocol value
 void EchoProtocolSendRequestToServer(int socket);
 void EchoProtocolServerHandler(int socket, Message message);
+void DownloadProtocolSendRequestToServer(int socket);
+void DownloadProtocolServerHandler(int socket, Message message);
+void UploadProtocolSendRequestToServer(int socket);
+void UploadProtocolServerHandler(int socket, Message message);
+void ChangeDirectoryProtocolSendRequestToServer(int socket);
+void ChangeDirectoryProtocolServerHandler(int socket, Message message);
+void ListDirectoryProtocolSendRequestToServer(int socket);
+void ListDirectoryProtocolServerHandler(int socket, Message message);
 #endif

pkg/handlers/handlers.h

@@ -0,0 +1,27 @@
+#include "handlers.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);
+  Message message;
+  message.body = (char *)(request + PROTOCOL_HEADER_LEN);
+
+  if (send(socket, request, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr,
+          "[DEBUG] client : sending download reques for file %s to server\n",
+          message.body);
+}
+void ListDirectoryProtocolServerHandler(int socket, Message message) {
+  char *arr_ptr = &message.body[0];
+  int payload_length = strlen(arr_ptr);
+
+  char *reply = malloc(strlen(arr_ptr) + PROTOCOL_HEADER_LEN);
+  int mesg_length = MarshallMessage(reply, 0xC0DE, message.protocol, arr_ptr);
+  if (send(socket, reply, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr, "[DEBUG] Echo Handler Server : Replying bac .... \n");
+}

pkg/handlers/list_directory.c

@@ -0,0 +1,27 @@
+#include "handlers.h"
+void UploadProtocolSendRequestToServer(int socket) {
+  printf("Enter File name (path) to upload\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, DOWNLOAD_REQUEST, input);
+  Message message;
+  message.body = (char *)(request + PROTOCOL_HEADER_LEN);
+
+  if (send(socket, request, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr,
+          "[DEBUG] client : sending download reques for file %s to server\n",
+          message.body);
+}
+
+void UploadProtocolServerHandler(int socket, Message message) {
+  char *arr_ptr = &message.body[0];
+  int payload_length = strlen(arr_ptr);
+  char *reply = malloc(strlen(arr_ptr) + PROTOCOL_HEADER_LEN);
+  int mesg_length = MarshallMessage(reply, 0xC0DE, LIST_DIR_REPLY, arr_ptr);
+  if (send(socket, reply, strlen(arr_ptr) + PROTOCOL_HEADER_LEN, 0) == -1)
+    perror("write failed: ");
+  fprintf(stderr, "[DEBUG] Echo Handler Server : Replying bac .... \n");
+}