s434786/DSIK_project
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hard reset server

Browse Source
This commit is contained in:
Konrad Pierzyński 2018-11-20 14:10:40 +01:00
parent 4e09837eff
commit fe503f9283
2 changed files with 61 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
server
View File

Binary file not shown.

73
server.c
View File

@ -1,3 +1,6 @@
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-variable"
#include <stdio.h>
#include <string.h>
#include <netinet/in.h>
@ -8,28 +11,21 @@
#include <pthread.h>
#include <unistd.h>
typedef struct
{
typedef struct {
int socket;
struct sockaddr_in address;
} TData;
typedef struct
{
typedef struct {
float x;
float y;
float z;
float rot_x;
float rot_y;
float rot_z;
float rot_w;
} TFloat;
void Error( int err );
void* dataProcessHandler( void * data );
int main(void)
{
int main( void ) {
int e = 0;
int i = 0;
@ -57,33 +53,28 @@ int main(void)
myAddrForClients[0].sin_addr.s_addr = INADDR_ANY;
myAddrForClients[1].sin_addr.s_addr = INADDR_ANY;
for (i = 0; i < 2; i++)
{
if ((sock[i] = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
{
for( i = 0; i < 2; i ++ ) {
if( (sock[i] = socket(AF_INET, SOCK_DGRAM, 0)) < 0 ) {
Error( e++ );
return -1;
}
while (bind(sock[i], (struct sockaddr *)&myAddrForClients[i], sizeof(struct sockaddr_in)) < 0)
{
while( bind( sock[i], (struct sockaddr*)&myAddrForClients[i], sizeof( struct sockaddr_in) ) < 0 ) {
myAddrForClients[i].sin_port = htons(ntohs(myAddrForClients[i].sin_port) + 1);
}
}
if ((sockMain = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
{
if( (sockMain = socket(AF_INET, SOCK_DGRAM, 0)) < 0 ) {
Error( e++ );
return -1;
}
if (bind(sockMain, (struct sockaddr *)&myAddr, sizeof(struct sockaddr_in)) < 0)
{
if( bind( sockMain, (struct sockaddr*)&myAddr, sizeof(struct sockaddr_in) ) < 0 ) {
Error( e++ );
return -1;
}
printf("Server running on port 8080\n");
addrLen = sizeof( struct sockaddr_in );
@ -93,20 +84,17 @@ int main(void)
char buf[5];
memset( buf, 0 , sizeof(buf));
while (flag)
{
while( flag ) {
recvLen = recvfrom( sockMain, buf, 5, 0, (struct sockaddr*)&tmp, &addrLen );
if (buf[0] != 'U' || buf[1] != 'N' || buf[2] != 'I' || buf[3] != 'T' || buf[4] != 'Y')
{
if( buf[0] != 'U' || buf[1] != 'N' || buf[2] != 'I' || buf[3] != 'T' || buf[4] != 'Y' ) {
Error( e++ );
return -1;
}
clients[2-flag--] = tmp;
}
for (i = 0; i < (sizeof(myAddrForClients) / sizeof(myAddrForClients[0])); i++)
{
for( i = 0; i < (sizeof(myAddrForClients) / sizeof(myAddrForClients[0])); i++ ) {
char port2char[8];
sprintf(port2char, "%d\r\n", ntohs(myAddrForClients[i].sin_port) );
@ -122,25 +110,20 @@ int main(void)
int size = ( sizeof(handlers) / sizeof(handlers[0]) );
for (i = 0; i < size; i++)
{
for( i = 0; i < size; i++ ) {
data[i].socket = sock[i];
data[i].address = clients[size-1-i];
}
for (i = 0; i < size; i++)
{
if (pthread_create(&handlers[i], NULL, dataProcessHandler, &data[i]))
{
for( i = 0; i < size; i++ ) {
if( pthread_create(&handlers[i], NULL, dataProcessHandler, &data[i] ) ) {
Error( e++ );
return -1;
}
}
for (i = 0; i < size; i++)
{
if (pthread_join(handlers[i], NULL))
{
for( i = 0; i < size; i++ ) {
if( pthread_join( handlers[i], NULL )) {
Error( e++ );
return -1;
}
@ -153,8 +136,7 @@ int main(void)
return 0;
}
void *dataProcessHandler(void *data)
{
void* dataProcessHandler( void * data ) {
TData *info = (TData*)data;
@ -167,17 +149,14 @@ void *dataProcessHandler(void *data)
printf("HANDLER STARTED..\n");
printf("LOOKING AT SOCKET: %d, ON PORT: %d\n", info->socket, ntohs(info->address.sin_port) );
while (1)
{
if (recvfrom(info->socket, &floats, 28, 0, (struct sockaddr *)&tmp, &addrLen) != 28)
continue;
// printf("x: %f, y: %f, z: %f, rot_x: %f, rot_y: %f, rot_z: %f, rot_w: %f\n", floats.x, floats.y, floats.z, floats.rot_x, floats.rot_y, floats.rot_z, floats.rot_w);
sendto(info->socket, &floats, 28, 0, (struct sockaddr *)&info->address, sizeof(info->address));
while( 1 ) {
if( recvfrom( info->socket, &floats, 12, 0, (struct sockaddr*)&tmp, &addrLen) != 12 ) continue;
sendto( info->socket, &floats, 12, 0, (struct sockaddr*)&info->address, sizeof(info->address));
}
return NULL;
}
void Error(int err)
{
void Error( int err ) {
printf("Error! Code: %d\n", err);
}