From d52563a834e6165b0ed4f356a4eef1320d3421ec Mon Sep 17 00:00:00 2001
From: Flavien Haas <flavien@MacBook-Pro-de-Flavien.local>
Date: Wed, 30 Oct 2019 20:53:00 +0100
Subject: [PATCH] fonction traite_connexion

---
 .DS_Store      | Bin 0 -> 6148 bytes
 Makefile       |   4 ++--
 serveur_echo.c |  48 +++++++++++++++++++++++-------------------------
 3 files changed, 25 insertions(+), 27 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/Makefile b/Makefile
index dd03d1e..8307f33 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ all: clean serveur client
 clean:
 	rm -f *.o
 
-serveur:
+serveur: serveur_echo.c
 	gcc -c serveur_echo.c -o serveur_echo.o
 
-client:
+client: client_echo.c 
 	gcc -c client_echo.c -o client_echo.o
diff --git a/serveur_echo.c b/serveur_echo.c
index 64da377..aee019f 100755
--- a/serveur_echo.c
+++ b/serveur_echo.c
@@ -11,13 +11,12 @@
 
 struct addrinfo *result;                     /* tableau des adresses réseaux des clients */
 
-int cree_socket(struct addrinfo hints, char* port){
+void cree_socket(struct addrinfo hints, char* port){
   int s = getaddrinfo(NULL, port, &hints, &result);
   if (s != 0) {
     fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
-    s = 1;
+    exit(EXIT_FAILURE);
   }
-  return s;
 }
 
 void con_client(int *sfd){
@@ -42,38 +41,43 @@ void con_client(int *sfd){
     fprintf(stderr, "Could not connect\n");
     exit(EXIT_FAILURE);
   }
-  listen(*sfd, MAX_CON);
+  if (listen(*sfd, MAX_CON) == -1){
+    fprintf(stderr, "erreur du listen");
+    exit(EXIT_FAILURE);
+  }
+  freeaddrinfo(result);                       /* libère la structure d'adresse client */
 }
 
-void traite_connexion(int sfd, int s){
+void traite_connexion(int *sfd){
   ssize_t nread;
   char buf[BUF_SIZE];
   struct sockaddr_storage peer_addr;
   socklen_t peer_addr_len;
-  /* Lit les datagrammes et les renvoi au client */
+  int s, new_sfd;
+  char host[NI_MAXHOST], service[NI_MAXSERV];
+
+  /* Lit les messages et les renvoi au client */
   for (;;) {
     peer_addr_len = sizeof(struct sockaddr_storage);
-    accept(sfd, (struct sockaddr*)&peer_addr, &peer_addr_len);    /* accepte la connexion */
-    nread = recvfrom(sfd, buf, BUF_SIZE, 0, (struct sockaddr *) &peer_addr, &peer_addr_len);
+    new_sfd = accept(*sfd, (struct sockaddr*) &peer_addr, &peer_addr_len);   /* accepte la connexion */
+    nread = read(new_sfd, buf, BUF_SIZE);                                    /* lit dans le buffer de la connexion, renvoie la taille du message */
     if (nread == -1){
-      continue;
-      /* ignore la mauvaise requete */
+      continue;                                                              /* ignore la mauvaise requete */
     }
-    char host[NI_MAXHOST], service[NI_MAXSERV];
     s = getnameinfo((struct sockaddr *) &peer_addr, peer_addr_len, host, NI_MAXHOST, service, NI_MAXSERV, NI_NUMERICSERV);
     if (s == 0){
       printf("Recu %ld octets de %s:%s\n", (long) nread, host, service);
+      if (write(new_sfd, buf, nread) != nread){
+        fprintf(stderr, "Erreur d'envoi de la reponse\n");
+      }
+      close(new_sfd);
     }
     else{
       fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));
     }
-    if (sendto(sfd, buf, nread, 0, (struct sockaddr *) &peer_addr, peer_addr_len) != nread){
-      fprintf(stderr, "Erreur d'envoi de la reponse\n");
-    }
   }
 }
 
-
 int main(int argc, char *argv[]){
   struct addrinfo hints;
   int s;                                       /* s code de retour de getaddrinfo */
@@ -92,16 +96,10 @@ int main(int argc, char *argv[]){
   hints.ai_socktype = SOCK_STREAM;             /* socket en mode datagramme */
   hints.ai_protocol = IPPROTO_TCP;             /* protocol de connexion */
 
-  s = cree_socket(hints, port);                /* création du socket */
-  if(s == 1) {
-    exit(EXIT_FAILURE);
-  }
-
-  con_client(&sfd);
-
-  freeaddrinfo(result);                        /* libère la structure d'adresse client */
-
-  traite_connexion(sfd, s);
+  cree_socket(hints, port);                    /* création du socket */
 
+  con_client(&sfd);                            /* connexion au client */
 
+  traite_connexion(&sfd);
+  printf("traite_connexion ok\n");
 }