changed from transfering images to movies

This commit is contained in:
Michal Starski 2018-11-29 00:22:35 +01:00
parent 277a77134f
commit 3fdef0aa3c
7 changed files with 48 additions and 6 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ server
.vscode
.DS_Store
package.jpg
assets

BIN
avClient

Binary file not shown.

BIN
avServer

Binary file not shown.

View File

@ -40,7 +40,7 @@ int main(int argc, char const *argv[])
printf("\nConnection Failed \n");
return -1;
}
avatar = fopen("package.jpg", "a+");
avatar = fopen("package.mp4", "a+");
if (avatar == NULL)
{
printf("Nie udalo się otworzyć pliku");

View File

@ -5,7 +5,6 @@
#include <netinet/in.h>
#include <string.h>
#include <fcntl.h>
#include <time.h>
#define PORT 8080
@ -17,8 +16,6 @@ int main(int argc, char const *argv[])
int addrlen = sizeof(address);
char buffer[1024];
char *overMessage = "over";
char files[3][64] = {{"assets/test.jpg"}, {"assets/test1.jpg"}, {"assets/test2.jpg"}};
srand(time(NULL));
// Creating socket file descriptor
if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) == 0)
@ -52,7 +49,7 @@ int main(int argc, char const *argv[])
exit(EXIT_FAILURE);
}
printf("accepted\n");
int avatar_fd = open(files[rand() % 3], O_RDONLY);
int avatar_fd = open("assets/test3.mp4", O_RDONLY);
if (avatar_fd < 0)
{
return -1;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

View File

@ -53,7 +53,6 @@ int main(void)
int sock[2];
struct sockaddr_in myAddrForClients[2];
struct sockaddr_in clients[2];
struct sockaddr_in tmp;
myAddr.sin_family = AF_INET;
@ -190,3 +189,48 @@ void Error(int err)
{
printf("Error! Code: %d\n", err);
}
void *videoHandler()
{
char video_buffer[1024];
int counter = 0; //Counts users that request video data
int VideoSocketTCP;
int new_socket;
struct sockaddr_in video_address_tcp;
if ((VideoSocketTCP = socket(AF_INET, SOCK_STREAM, 0)) < 0)
{
perror("tcp video socket");
exit(1);
}
video_address_tcp.sin_family = AF_INET;
video_address_tcp.sin_addr.s_addr = INADDR_ANY;
video_address_tcp.sin_port = htons(8989);
if (bind(VideoSocketTCP, (struct sockaddr *)&video_address_tcp,
sizeof(video_address_tcp)) < 0)
{
perror("bind failed");
return -1;
}
if (listen(VideoSocketTCP, 3) < 0)
{
perror("listen");
return -1;
}
while (counter < 2)
{
if ((new_socket = accept(VideoSocketTCP, (struct sockaddr *)&video_address_tcp,
sizeof(video_address_tcp))) < 0)
{
perror("accept");
return -1;
}
}
close(VideoSocketTCP);
close(new_socket);
return 0;
}