add test, clean thread

Author: Dyzio18

README.md

@@ -1,14 +1,41 @@
 # Linux_stream_server
 Stream text files using socket
 
-RUN:
+## GET STARTED:
+
+```
 make
+```
+
+
+## Example:
 
-command
-./server.out -k store/ -p .info  
-./client.out -x1 -o64 -r10 -p .info -f l -s 3135
+Server side:
+```
+./server.out -k store/Pan_Tadeusz -p .info
+```
+Client side:
+``` 
+./client.out -r 10 -o 64 -f l -p .info -x 1 -s <server_pid>
+```
 
+## Run options:
 
+```
+Klient:
+	-s <pid> PID procesu serwera
+	-r <signal> numer sygnału RT, który ma być zastosowany przy komunikacie zwrotnym
+	-x <int> numer księgi, którą ma odczytać
+	-o <int> długość interwału pomiędzy komunikatami
+	-f <char> (fragmentacja tekstu)
+		 z - slowa
+		 l - linia 
+		 s - slowa
+	-p <file> sciezka do tablicy ogloszeniowej
+```
+```
+Serwer:
+	-k <katalog> katalog, w którym są przechowywane pliki do udostępniania
+	-p <plik> ścieżka do pliku pełniącego rolę tablicy ogłoszeniowej.
 
-// ***
-cntrl+shift+i //code format
+```

src/client.c

@@ -1,3 +1,10 @@
+/**
+ * Name: Book streaming (CLIENT)
+ * @Author: Patryk Nizio
+ * Date: 2018.02
+ * https://github.com/Dyzio18/Linux_stream_server
+ */
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -16,7 +23,6 @@
 
 #include "common.h"
 
-#define BUF_SIZE 10
 #define MAX_PATH 16
 #define LINE 256
 #define WORD 24
@@ -212,7 +218,7 @@ int main(int argc, char **argv)
     memset(&client_address, 0, sizeof(client_address));
     client_address.sun_family = AF_UNIX;
     char clientAddr_path[MAX_PATH];
-    char *pathUniq = "cli";
+    const char *pathUniq = "cli";
     snprintf(clientAddr_path, sizeof(char) * (MAX_PATH + 5), "%s%s", SV_SOCK_PATH, pathUniq);
     strcpy(client_address.sun_path, clientAddr_path);
     client_address.sun_path[0] = 0; // Abstract namespace

src/common.c

@@ -14,7 +14,7 @@
  */
 void helpDisplay_client()
 {
-    printf("\nKlient:\n\t-s <pid> PID procesu serwera\n\t-r <sygnał> numer sygnału RT, który ma być zastosowany przy komunikacie zwrotnym\n\t-x <nr> numer księgi, którą ma odczytać\n\t-p <czas> długość interwału pomiędzy komunikatami\n\n\n");
+    printf("\nKlient:\n\t-s <pid> PID procesu serwera\n\t-r <signal> numer sygnału RT, który ma być zastosowany przy komunikacie zwrotnym\n\t-x <int> numer księgi, którą ma odczytać\n\t-o <int> długość interwału pomiędzy komunikatami\n\t-f <char> (fragmentacja tekstu)\n\t\t z - slowa\n\t\t l - linia \n\t\t s - slowa\n\t-p <file> sciezka do tablicy ogloszeniowej\n\n\n");
 }
 
 /**

src/server.c

@@ -1,3 +1,10 @@
+/**
+ * Name: Book streaming (SERVER)
+ * @Author: Patryk Nizio
+ * Date: 2018.02
+ * https://github.com/Dyzio18/Linux_stream_server
+ */
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -29,6 +36,7 @@ struct threadData
     char fragmentation;
     int interval;
     char *path;
+    pthread_t client_thread;
 };
 int nsleep(int time);
 
@@ -61,6 +69,11 @@ void *clientThread_handler(void *thread_arg)
     char *source = NULL;
     FILE *fp = fopen(sourcePath, "r");
 
+    if (fp == NULL){
+        snprintf(sourcePath, sizeof(sourcePath), "%s/%d.txt", catalog, myData->book);
+        fp = fopen(sourcePath, "r");
+    }
+
     long bufsize;
     if (fp != NULL)
     {
@@ -98,6 +111,7 @@ void *clientThread_handler(void *thread_arg)
     else
     {
         printf("\nResources not found...\n ");
+        pthread_cancel(myData->client_thread);
         pthread_exit(NULL);
     }
 
@@ -109,7 +123,7 @@ void *clientThread_handler(void *thread_arg)
     int socket_fd;
     struct sockaddr_un server_address, client_address;
     int bytes_received = 0;
-    int bytes_sent = 0;
+    //int bytes_sent = 0;
     socklen_t address_length = sizeof(struct sockaddr_un);
 
     if ((socket_fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
@@ -157,7 +171,7 @@ void *clientThread_handler(void *thread_arg)
         // CHECK FIRST MSG WITH CLIENT PID
         if (INITIALIZATION_FLAG == 0)
         {
-            bytes_received = recvfrom(socket_fd, &INITIALIZATION_FLAG, sizeof(INITIALIZATION_FLAG), 0, (struct sockaddr *)&client_address, &address_length);
+            recvfrom(socket_fd, &INITIALIZATION_FLAG, sizeof(INITIALIZATION_FLAG), 0, (struct sockaddr *)&client_address, &address_length);
             if (INITIALIZATION_FLAG == myData->clientPID)
             {
                 printf("\n\nCLIENT with PID %d authorized\n", INITIALIZATION_FLAG);
@@ -192,7 +206,7 @@ void *clientThread_handler(void *thread_arg)
                     lineLen++;
                 }
                 lineBuff[lineLen + 1] = '\0';
-                bytes_sent = sendto(socket_fd, &lineBuff, sizeof(char) * LINE, 0, (struct sockaddr *)&client_address, address_length);
+                sendto(socket_fd, &lineBuff, sizeof(char) * LINE, 0, (struct sockaddr *)&client_address, address_length);
                 bytes_received = recvfrom(socket_fd, &lineBuffCheck, sizeof(char) * LINE, 0, (struct sockaddr *)&client_address, &address_length);
                 //write(STDOUT_FILENO, lineBuffCheck, sizeof(char) * LINE);
                 if (!rot13_arr_check(lineBuff, lineBuffCheck, WORD))
@@ -218,7 +232,7 @@ void *clientThread_handler(void *thread_arg)
                     wordLen++;
                 }
                 wordBuff[wordLen + 1] = '\0';
-                bytes_sent = sendto(socket_fd, &wordBuff, sizeof(char) * WORD, 0, (struct sockaddr *)&client_address, address_length);
+                sendto(socket_fd, &wordBuff, sizeof(char) * WORD, 0, (struct sockaddr *)&client_address, address_length);
                 bytes_received = recvfrom(socket_fd, &wordBuffCheck, sizeof(char) * WORD, 0, (struct sockaddr *)&client_address, &address_length);
                 //write(STDOUT_FILENO, wordBuff, sizeof(char) * WORD);
                 if (!rot13_arr_check(wordBuff, wordBuffCheck, WORD))
@@ -231,7 +245,7 @@ void *clientThread_handler(void *thread_arg)
             {
                 /* SEND LETTER */
                 msg = source[i++];
-                bytes_sent = sendto(socket_fd, &msg, sizeof(msg), 0, (struct sockaddr *)&client_address, address_length);
+                sendto(socket_fd, &msg, sizeof(msg), 0, (struct sockaddr *)&client_address, address_length);
                 bytes_received = recvfrom(socket_fd, &msgCheck, sizeof(msgCheck), 0, (struct sockaddr *)&client_address, &address_length);
 
                 if (rot13(msg) != msgCheck)
@@ -240,15 +254,20 @@ void *clientThread_handler(void *thread_arg)
                     CONNECTED = 0;
                 }
             }
+            if (bytes_received < 1)
+            {
+                CONNECTED = 0;
+            }
         }
         //write(STDOUT_FILENO, &msg, sizeof(msg));
         //printf("\nSEND: %d RECV: %d",bytes_sent, bytes_received);
         nsleep(myData->interval);
     }
 
     free(source);
-    close(socket_fd);
+    close(socket_fd); 
     pthread_exit(NULL);
+    pthread_cancel(myData->client_thread);
 }
 
 /*****************************************
@@ -302,6 +321,7 @@ void clientRegisterSignal_handler(int signum, siginfo_t *siginfo, void *ptrVoid)
     {
         // CREATE THREAD
         pthread_t client_thread;
+        currUser[CLIENTS_COUNT].client_thread = client_thread;
         if (pthread_create(&client_thread, NULL, clientThread_handler, &currUser[CLIENTS_COUNT++]) < 0)
         {
             perror("pthread_create");

test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+server_pid=$1
+
+echo "PID: $server_pid "
+# ksiega 12 slowa co 32 sig 12
+lxterminal -e ./client.out -r 12 -o 32 -f s -p .info -x 12 -s $server_pid
+# ksiega 12 slowa co 64 sig 12
+lxterminal -e ./client.out -r 12 -o 64 -f s -p .info -x 12 -s $server_pid
+# ksiega 1 linia co 16 sig 8
+lxterminal -e ./client.out -r 8 -o 16 -f l -p .info -x 1 -s $server_pid
+# ksiega 1 linia co 128 sig 9
+lxterminal -e ./client.out -r 9 -o 128 -f l -p .info -x 1 -s $server_pid
+
+sleep 2
+# ksiega 2 znaki co 44 sig 9 
+lxterminal -e ./client.out -r 9 -o 44 -f z -p .info -x 2 -s $server_pid
+sleep 1
+# ksiega 2 znaki co 4 sig 9 
+lxterminal -e ./client.out -r 9 -o 4 -f z -p .info -x 2 -s $server_pid