diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..61c1717 Binary files /dev/null and b/.DS_Store differ diff --git a/server/.DS_Store b/server/.DS_Store new file mode 100644 index 0000000..4246552 Binary files /dev/null and b/server/.DS_Store differ diff --git a/server/server.c b/server/server.c index 2c4a9b5..2221100 100644 --- a/server/server.c +++ b/server/server.c @@ -37,8 +37,8 @@ int main(void) { int socket_recv; int accept_recv; int accept_temp; - char msg[1024] = "Puste"; - char msg_copy[1024]; + char msg[1025] = "Puste"; + char msg_copy[1025]; struct client_socket client[7]; //Tablica Klientów fd_set Socket; //Zbiór jednego deskryptora - głównego socketa fd_set Recv; @@ -170,7 +170,7 @@ int main(void) { client[i].accept_adr = accept_temp_adr; FD_SET(client[i].socket, &client[i].Client); printf("Dodano użytkownika %s na miejscu %i\n", inet_ntoa(client[i].accept_adr.sin_addr), i); - //strcpy(client[i].Ip, inet_ntoa(client[i].accept_adr.sin_addr)); + strcpy(client[i].Ip, inet_ntoa(client[i].accept_adr.sin_addr)); i++; break; } else { @@ -188,6 +188,8 @@ int main(void) { if(select(socket_recv+1, &Recv, NULL, NULL, &timeout) > 0) { printf("Wykryto wiadomosc\n"); accept_recv = accept(socket_recv, (struct sockaddr*)&recv_adr, &dl); + memset(msg, 0, 1024); + memset(msg_copy, 0, 1024); if(recv(accept_recv, msg, 1024, 0) > 0) { //Sklonuj msg i tokenizuj trzy pierwsze słowa (1.user> 2.Down/upload 3.Sciezka do pliku) printf("Zaczynam Kopiowac\n"); @@ -218,6 +220,7 @@ int main(void) { if(strcmp(client[i].Ip, inet_ntoa(recv_adr.sin_addr)) == 0) { printf("Użytkownik %i wyszedł\n", i); close(client[i].socket); + client[i].socket = 0; } i++; } @@ -251,6 +254,7 @@ int main(void) { break; } razem += send_plik; + memset(msg, 0, 1024); } fclose(plik); @@ -290,6 +294,7 @@ int main(void) { break; } fwrite(msg, 1, 1024, plik); + memset(msg, 0, 1024); razem += read_plik; } fclose(plik); diff --git a/server/test.txt b/server/test.txt new file mode 100644 index 0000000..b159169 Binary files /dev/null and b/server/test.txt differ diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..b159169 Binary files /dev/null and b/test.txt differ diff --git a/wordpress-5.1.1-pl_PL.zip b/wordpress-5.1.1-pl_PL.zip new file mode 100644 index 0000000..572a005 Binary files /dev/null and b/wordpress-5.1.1-pl_PL.zip differ