updating commands and server

tarcisio-marinho · Dec 6, 2017 · 0c59d26 · 0c59d26
1 parent 2943c84
commit 0c59d26
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/C/bin/client b/C/bin/client
diff --git a/C/bin/server b/C/bin/server
diff --git a/C/lib/commands.c b/C/lib/commands.c
@@ -30,7 +30,7 @@ char * execute(char * command){
     memset(output, 0, MAX_TERMINAL_OUTPUT);
 
     if (!(fpipe = (FILE*)popen(command,"r"))){
-        error("Pipe error");
+        return NULL;
     }
 
     while ( fgets( line, 256, fpipe)){

diff --git a/C/lib/communication.c b/C/lib/communication.c
@@ -93,19 +93,16 @@ int listen_forever(){
     int addrlen = sizeof(address);
     char buffer[size] = {0};        
     while(1){
-        int rest = 0;
 
         // Creating socket file descriptor
         if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) == 0){
-            perror("socket failed");
-            exit(EXIT_FAILURE);
+            error("socket failed");
         }
 
         // Forcefully attaching socket to the port 8080
         if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT,
                                                     &opt, sizeof(opt))){
-            perror("setsockopt");
-            exit(EXIT_FAILURE);
+            error("setsockopt");
         }
 
         address.sin_family = AF_INET;
@@ -115,26 +112,18 @@ int listen_forever(){
         // Forcefully attaching socket to the port 8080
         if (bind(server_fd, (struct sockaddr *)&address, 
                                     sizeof(address))<0){
-            perror("bind failed");
-            exit(EXIT_FAILURE);
+            error("bind failed");
         }
 
         if (listen(server_fd, 3) < 0){
-            perror("listen");
-            exit(EXIT_FAILURE);
+            error("listen");
         }
 
         if ((new_socket = accept(server_fd, (struct sockaddr *)&address, 
                         (socklen_t*)&addrlen))<0){
-            perror("accept");
-            exit(EXIT_FAILURE);
+            error("accept");
         }
 
-        if(rest == 1){
-            printf("Dormindo por 5 segundos");
-            sleep(5);
-            continue;
-        }
         return new_socket;
     }
 }

diff --git a/C/server.c b/C/server.c
@@ -1,24 +1,29 @@
 #include "lib/include.h"
 
 
-int main(){
+int main(int argc, char *argv[]){
 
     int new_socket, bytes_read, bytes_sent;
     char buffer[size] = {0};
     char output[MAX_TERMINAL_OUTPUT] = {0};
-    new_socket = listen_forever();
 
     while(1){
-        printf(">>> ");
-        fgets(buffer, 100, stdin);
-        bytes_sent = send(new_socket, buffer, size, 0);
-        bytes_read = recv( new_socket , output, MAX_TERMINAL_OUTPUT, 0);
-        if(bytes_read == 0 || bytes_read == -1){
-            printf("Client Disconnected\n");
-            exit(-1);
-        }else{
-            printf("%s\n", output );
-            memset(output , 0, sizeof(output));
+        printf("Trying to connect\n");
+        new_socket = listen_forever();
+        printf("Connected!\n");
+
+        while(1){
+            printf(">>> ");
+            fgets(buffer, 100, stdin);
+            bytes_sent = send(new_socket, buffer, size, 0);
+            bytes_read = recv( new_socket , output, MAX_TERMINAL_OUTPUT, 0);
+            if(bytes_read == 0 || bytes_read == -1){
+                printf("Client Disconnected\n");
+                break;
+            }else{
+                printf("%s\n", output );
+                memset(output , 0, sizeof(output));
+            }
         }
     }
     return 0;