Archived
3
0

tcpserver : malloc

This commit is contained in:
Philippe PITTOLI 2016-09-26 14:15:56 +02:00
parent f3f7927d25
commit a35ba9ce45

View File

@ -21,212 +21,209 @@
int init_connection(void) int init_connection(void)
{ {
int sock = socket(AF_INET, SOCK_STREAM, 0); int sock = socket(AF_INET, SOCK_STREAM, 0);
struct sockaddr_in sin = { 0 }; struct sockaddr_in sin = { 0 };
if(sock == -1) if(sock == -1)
{ {
perror("socket()"); perror("socket()");
exit(errno); exit(errno);
} }
sin.sin_addr.s_addr = htonl(INADDR_ANY); sin.sin_addr.s_addr = htonl(INADDR_ANY);
sin.sin_port = htons(PORT); sin.sin_port = htons(PORT);
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
if(bind(sock,(struct sockaddr *) &sin, sizeof sin) == -1) if(bind(sock,(struct sockaddr *) &sin, sizeof sin) == -1)
{ {
perror("bind()"); perror("bind()");
exit(errno); exit(errno);
} }
if(listen(sock, 5) == -1) if(listen(sock, 5) == -1)
{ {
perror("listen()"); perror("listen()");
exit(errno); exit(errno);
} }
return sock; return sock;
} }
void write_message(int sock, const char *buffer) void write_message(int sock, const char *buffer)
{ {
if(send(sock, buffer, strlen(buffer), 0) < 0) if(send(sock, buffer, strlen(buffer), 0) < 0)
{ {
perror("send()"); perror("send()");
exit(errno); exit(errno);
} }
} }
int read_message(int sock, char *buffer) int read_message(int sock, char *buffer)
{ {
int n = 0; return recv(sock, buffer, BUF_SIZE - 1, 0);
if((n = recv(sock, buffer, BUF_SIZE - 1, 0)) < 0)
{
perror("recv()");
/* if recv error we disonnect the client */
n = 0;
}
buffer[n] = 0;
return n;
} }
void endConnection(int sock) { void endConnection(int sock) {
close(sock); close(sock);
} }
void printClientAddr(struct sockaddr_in *csin) { void printClientAddr(struct sockaddr_in *csin) {
printf("New client\n"); printf("New client\n");
printf("IP Addr : %s\n", inet_ntoa(csin->sin_addr)); printf("IP Addr : %s\n", inet_ntoa(csin->sin_addr));
printf("Port : %u\n", ntohs(csin->sin_port)); printf("Port : %u\n", ntohs(csin->sin_port));
} }
void * service_thread(void * c_data) { void * service_thread(void * c_data) {
client_data *cda = (client_data*) c_data; client_data *cda = (client_data*) c_data;
char buffer[BUF_SIZE]; char buffer[BUF_SIZE];
char *service; char *service;
int version; int version;
int clientSock = cda->sfd; int clientSock = cda->sfd;
if (read_message(clientSock, buffer) == -1) { if (read_message(clientSock, buffer) == -1) {
perror("read_message()"); perror("read_message()");
return NULL; return NULL;
}else { }else {
parseServiceVersion(buffer, &service, &version); parseServiceVersion(buffer, &service, &version);
} }
/* TODO : service correspond au service que le client veut utiliser /* TODO : service correspond au service que le client veut utiliser
** il faut comparer service à un tableau qui contient les services ** il faut comparer service à un tableau qui contient les services
** disponibles ** disponibles
*/ */
//path service //path service
char * servicePath = (char*) calloc((strlen(TMPDIR) + strlen(service) + 1), sizeof(char)); char * servicePath = malloc (strlen(TMPDIR) + strlen(service) + 1);
if (servicePath == NULL) { memset (servicePath, 0, strlen(TMPDIR) + strlen(service) + 1);
perror("calloc()");
}
strcat(servicePath, TMPDIR);
strcat(servicePath, service);
//pid index version if (servicePath == NULL) {
char * piv = (char*) calloc(PATH_MAX, sizeof(char)); perror("malloc()");
if (piv == NULL) { }
perror("calloc()"); strcat(servicePath, TMPDIR);
} strcat(servicePath, service);
makePivMessage(&piv, getpid(), cda->index, version);
printf("piv : %s\n",piv );
//write pid index version in T/I/S of service //pid index version
int ret = file_write(servicePath, piv, strlen(piv)); char * piv = (char*) malloc(PATH_MAX);
if(ret == 0) { memset(piv , 0, PATH_MAX);
perror("file_write()"); if (piv == NULL) {
free(servicePath); perror("malloc()");
free(piv); }
return NULL; makePivMessage(&piv, getpid(), cda->index, version);
} printf("piv : %s\n",piv );
// gets the service path, such as /tmp/ipc/pid-index-version-in/out //write pid index version in T/I/S of service
char *pathname[2]; int ret = file_write(servicePath, piv, strlen(piv));
pathname[0] = (char*) calloc(PATH_MAX, sizeof(char)); if(ret == 0) {
if (pathname[0] == NULL) { perror("file_write()");
perror("calloc()"); free(servicePath);
} free(piv);
pathname[1] = (char*) calloc(PATH_MAX, sizeof(char)); return NULL;
if (pathname[1] == NULL) { }
perror("calloc()");
}
inOutPathCreate(pathname, cda->index, version);
//create in out files // gets the service path, such as /tmp/ipc/pid-index-version-in/out
if(fifo_create(pathname[0]) != 0) { char *pathname[2];
perror("fifo_create()"); pathname[0] = (char*) malloc(PATH_MAX);
return NULL; memset(pathname[0], 0, PATH_MAX);
} if (pathname[0] == NULL) {
perror("malloc()");
}
pathname[1] = malloc(PATH_MAX);
memset(pathname[1] , 0, PATH_MAX);
if (pathname[1] == NULL) {
perror("malloc()");
}
inOutPathCreate(pathname, cda->index, version);
if(fifo_create(pathname[1]) != 0) { //create in out files
perror("fifo_create()"); if(fifo_create(pathname[0]) != 0) {
return NULL; perror("fifo_create()");
} return NULL;
}
//open -in fifo file if(fifo_create(pathname[1]) != 0) {
int fdin = open (pathname[0], O_RDWR); perror("fifo_create()");
return NULL;
}
//open -in fifo file
int fdin = open (pathname[0], O_RDWR);
if (fdin <= 0) { if (fdin <= 0) {
printf("open: fd < 0\n"); printf("open: fd < 0\n");
perror ("open()"); perror ("open()");
return NULL; return NULL;
} }
//utilisation du select() pour surveiller la socket du client et fichier in //utilisation du select() pour surveiller la socket du client et fichier in
fd_set rdfs; fd_set rdfs;
int max = clientSock > fdin ? clientSock : fdin; int max = clientSock > fdin ? clientSock : fdin;
printf("Waitting for new messages :\n" ); printf("Waitting for new messages :\n" );
while(1) { while(1) {
FD_ZERO(&rdfs); FD_ZERO(&rdfs);
/* add STDIN_FILENO */ /* add STDIN_FILENO */
FD_SET(STDIN_FILENO, &rdfs); FD_SET(STDIN_FILENO, &rdfs);
//add client's socket //add client's socket
FD_SET(clientSock, &rdfs); FD_SET(clientSock, &rdfs);
//add in file //add in file
FD_SET(fdin, &rdfs); FD_SET(fdin, &rdfs);
if(select(max + 1, &rdfs, NULL, NULL, NULL) == -1) if(select(max + 1, &rdfs, NULL, NULL, NULL) == -1)
{ {
perror("select()"); perror("select()");
exit(errno); exit(errno);
} }
/* something from standard input : i.e keyboard */ /* something from standard input : i.e keyboard */
if(FD_ISSET(STDIN_FILENO, &rdfs)) if(FD_ISSET(STDIN_FILENO, &rdfs))
{ {
/* stop process when type on keyboard */ /* stop process when type on keyboard */
printf("thread %d shutdown\n", cda->index ); printf("thread %d shutdown\n", cda->index );
break; break;
}else /*if (FD_ISSET(fdin, &rdfs))*/{ }else /*if (FD_ISSET(fdin, &rdfs))*/{
if (FD_ISSET(clientSock, &rdfs)) { if (FD_ISSET(clientSock, &rdfs)) {
if(read_message(clientSock, buffer) > 0) { int n = 0;
printf("message : %s\n",buffer ); n = read_message(clientSock, buffer);
if(file_write(pathname[1], buffer, strlen(buffer)) < 0) { if(n > 0) {
perror("file_write"); if(file_write(pathname[1], buffer, strlen(buffer)) < 0) {
} perror("file_write");
printf("ok\n"); }
} printf("ok\n");
} }
printf("message (%d bytes) : %s\n", n, buffer);
}
if (FD_ISSET(fdin, &rdfs)) { if (FD_ISSET(fdin, &rdfs)) {
if(read(fdin, &buffer, BUF_SIZE) < 0) { if(read(fdin, &buffer, BUF_SIZE) < 0) {
perror("read()"); perror("read()");
} }
printf("message from file in : %s\n", buffer ); printf("message from file in : %s\n", buffer );
} }
} }
} memset (buffer, 0, BUF_SIZE);
}
//free //free
free(servicePath); free(servicePath);
free(piv); free(piv);
free(service); free(service);
free(pathname[0]); free(pathname[0]);
free(pathname[1]); free(pathname[1]);
//close the files descriptors //close the files descriptors
close(fdin); close(fdin);
close(clientSock); close(clientSock);
return NULL; return NULL;
} }
void parseServiceVersion(char * buf, char ** service, int *version) { void parseServiceVersion(char * buf, char ** service, int *version) {
char *token = NULL, *saveptr = NULL; char *token = NULL, *saveptr = NULL;
char *str = NULL; char *str = NULL;
int i = 0; int i = 0;
@ -281,135 +278,135 @@ int fifo_create (char * path)
} }
void inOutPathCreate(char ** pathname, int index, int version) { void inOutPathCreate(char ** pathname, int index, int version) {
int length = snprintf( NULL, 0, "%d", version ); int length = snprintf( NULL, 0, "%d", version );
char* versionStr = malloc( length + 2 ); char* versionStr = malloc( length + 2 );
snprintf( versionStr, length + 1, "%d", version ); snprintf( versionStr, length + 1, "%d", version );
int length2 = snprintf( NULL, 0, "%d", getpid() ); int length2 = snprintf( NULL, 0, "%d", getpid() );
char * pidprocess = malloc( length2 + 1 ); char * pidprocess = malloc( length2 + 1 );
snprintf( pidprocess, length2 + 1, "%d", getpid() ); snprintf( pidprocess, length2 + 1, "%d", getpid() );
int length3 = snprintf( NULL, 0, "%d", index ); int length3 = snprintf( NULL, 0, "%d", index );
char* indexStr = malloc( length3 + 1 ); char* indexStr = malloc( length3 + 1 );
snprintf( indexStr, length3 + 1, "%d", index ); snprintf( indexStr, length3 + 1, "%d", index );
strcat(pathname[0], TMPDIR); strcat(pathname[0], TMPDIR);
strcat(pathname[0], pidprocess); strcat(pathname[0], pidprocess);
strcat(pathname[0], "-"); strcat(pathname[0], "-");
strcat(pathname[0], indexStr); strcat(pathname[0], indexStr);
strcat(pathname[0], "-"); strcat(pathname[0], "-");
strcat(pathname[0], versionStr); strcat(pathname[0], versionStr);
strcat(pathname[0], "-in"); strcat(pathname[0], "-in");
strcat(pathname[1], TMPDIR); strcat(pathname[1], TMPDIR);
strcat(pathname[1], pidprocess); strcat(pathname[1], pidprocess);
strcat(pathname[1], "-"); strcat(pathname[1], "-");
strcat(pathname[1], indexStr); strcat(pathname[1], indexStr);
strcat(pathname[1], "-"); strcat(pathname[1], "-");
strcat(pathname[1], versionStr); strcat(pathname[1], versionStr);
strcat(pathname[1], "-out"); strcat(pathname[1], "-out");
free(pidprocess); free(pidprocess);
free(indexStr); free(indexStr);
free(versionStr); free(versionStr);
} }
void makePivMessage (char ** piv, int pid, int index, int version) { void makePivMessage (char ** piv, int pid, int index, int version) {
int length1 = snprintf( NULL, 0, "%d", getpid() ); int length1 = snprintf( NULL, 0, "%d", getpid() );
char * pidprocess = malloc( length1 + 1 ); char * pidprocess = malloc( length1 + 1 );
snprintf( pidprocess, length1 + 1, "%d", getpid() ); snprintf( pidprocess, length1 + 1, "%d", getpid() );
int length2 = snprintf( NULL, 0, "%d", index ); int length2 = snprintf( NULL, 0, "%d", index );
char* indexStr = malloc( length2 + 1 ); char* indexStr = malloc( length2 + 1 );
snprintf( indexStr, length2 + 1, "%d", index ); snprintf( indexStr, length2 + 1, "%d", index );
int length3 = snprintf( NULL, 0, "%d", version ); int length3 = snprintf( NULL, 0, "%d", version );
char* versionStr = malloc( length3 + 2 ); char* versionStr = malloc( length3 + 2 );
snprintf( versionStr, length3 + 1, "%d", version ); snprintf( versionStr, length3 + 1, "%d", version );
strcat(*piv, pidprocess); strcat(*piv, pidprocess);
strcat(*piv, " "); strcat(*piv, " ");
strcat(*piv, indexStr); strcat(*piv, indexStr);
strcat(*piv, " "); strcat(*piv, " ");
strcat(*piv, versionStr); strcat(*piv, versionStr);
free(pidprocess); free(pidprocess);
free(indexStr); free(indexStr);
free(versionStr); free(versionStr);
} }
int main(int argc, char * argv[], char **env) { int main(int argc, char * argv[], char **env) {
//client //client
client_data tab_client[NBCLIENT]; client_data tab_client[NBCLIENT];
pthread_t tab_service_threads[NBCLIENT]; pthread_t tab_service_threads[NBCLIENT];
int actual = 0; int actual = 0;
int i; int i;
int sock = init_connection(); int sock = init_connection();
fd_set rdfs; fd_set rdfs;
int max = sock; int max = sock;
printf("Waitting for new clients :\n" ); printf("Waitting for new clients :\n" );
while(1) { while(1) {
FD_ZERO(&rdfs); FD_ZERO(&rdfs);
/* add STDIN_FILENO */ /* add STDIN_FILENO */
FD_SET(STDIN_FILENO, &rdfs); FD_SET(STDIN_FILENO, &rdfs);
//add client's socket //add client's socket
FD_SET(sock, &rdfs); FD_SET(sock, &rdfs);
if(select(max + 1, &rdfs, NULL, NULL, NULL) == -1) if(select(max + 1, &rdfs, NULL, NULL, NULL) == -1)
{ {
perror("select()"); perror("select()");
exit(errno); exit(errno);
} }
/* something from standard input : i.e keyboard */ /* something from standard input : i.e keyboard */
if(FD_ISSET(STDIN_FILENO, &rdfs)) if(FD_ISSET(STDIN_FILENO, &rdfs))
{ {
/* stop process when type on keyboard */ /* stop process when type on keyboard */
// for (i = 0; i < actual; i++) { // for (i = 0; i < actual; i++) {
// if (pthread_cancel(tab_service_threads[i]) != 0) { // if (pthread_cancel(tab_service_threads[i]) != 0) {
// printf("Aucun thread correspond \n"); // printf("Aucun thread correspond \n");
// } // }
// } // }
printf("server shutdown\n"); printf("server shutdown\n");
break; break;
} }
else if (FD_ISSET(sock, &rdfs)){ else if (FD_ISSET(sock, &rdfs)){
//New client //New client
socklen_t sinsize = sizeof (struct sockaddr_in); socklen_t sinsize = sizeof (struct sockaddr_in);
tab_client[actual].sfd = accept(sock, (struct sockaddr *)&tab_client[actual].c_addr, &sinsize); tab_client[actual].sfd = accept(sock, (struct sockaddr *)&tab_client[actual].c_addr, &sinsize);
if(tab_client[actual].sfd == -1) if(tab_client[actual].sfd == -1)
{ {
perror("accept()"); perror("accept()");
close(sock); close(sock);
exit(errno); exit(errno);
} }
printClientAddr(&tab_client[actual].c_addr); printClientAddr(&tab_client[actual].c_addr);
tab_client[actual].index = actual; tab_client[actual].index = actual;
int ret = pthread_create( &tab_service_threads[actual], NULL, &service_thread, (void *) &tab_client[actual]); int ret = pthread_create( &tab_service_threads[actual], NULL, &service_thread, (void *) &tab_client[actual]);
if (ret) { if (ret) {
perror("pthread_create()"); perror("pthread_create()");
endConnection(sock); endConnection(sock);
exit(errno); exit(errno);
} else { } else {
printf("Creation of listen thread %d\n", actual); printf("Creation of listen thread %d\n", actual);
} }
max = tab_client[actual].sfd > max ? tab_client[actual].sfd : max; max = tab_client[actual].sfd > max ? tab_client[actual].sfd : max;
actual++; actual++;
} }
} }
for (i = 0; i < actual; i++) { for (i = 0; i < actual; i++) {
pthread_join(tab_service_threads[i], NULL); pthread_join(tab_service_threads[i], NULL);
} }
endConnection(sock); endConnection(sock);
return 0; return 0;
} }