From 5ad7a5b0dfa1b10e56964e70cf14c5d9431881f5 Mon Sep 17 00:00:00 2001
From: Flavien Haas <flavien@MacBook-Pro-de-Flavien.local>
Date: Tue, 29 Oct 2019 12:42:43 +0100
Subject: [PATCH] ajout fonction cree_socket

---
 serveur_echo.c |  47 +++++++++++++++++++++++++++++++++--------------
 serveur_echo.o | Bin 13200 -> 13280 bytes
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/serveur_echo.c b/serveur_echo.c
index 1bb791b..4ac34b8 100755
--- a/serveur_echo.c
+++ b/serveur_echo.c
@@ -8,31 +8,50 @@
 
 #define BUF_SIZE 500
 
+struct addrinfo *result;                     // tableau des adresses réseaux des clients
+
+// affiche_adresse_socket, serveur et traite_connexion
+
+int cree_socket(struct addrinfo hints, char* ip){
+  //remplissage de la structure hints contenants la configuration réseau du serveur
+  memset(&hints, 0, sizeof(struct addrinfo));
+
+  int s = getaddrinfo(NULL, ip, &hints, &result);
+  if (s != 0) {
+    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
+    s = 1;
+  }
+  return s;
+}
+
 int main(int argc, char *argv[]){
   struct addrinfo hints;
-  struct addrinfo *result, *rp;
-  int sfd, s;
+  struct addrinfo *rp;
+  int sfd, s;                                 // s code de retour de getaddrinfo
   struct sockaddr_storage peer_addr;
   socklen_t peer_addr_len;
   ssize_t nread;
   char buf[BUF_SIZE];
 
-  if (argc != 2) {
+  if (argc != 2) {                            // test du nombre d'arguments entrés
     fprintf(stderr, "Usage: %s port\n", argv[0]);
     exit(EXIT_FAILURE);
   }
 
-  //remplissage de la structure hints contenants la configuration réseau du serveur
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_INET6;    // utilisation du serveur sur IPv6 (AF_UNSPEC pour IPv4/6)
-  hints.ai_socktype = SOCK_DGRAM; // socket en mode datagramme
+  char* ip = argv[1];
 
-  s = getaddrinfo(NULL, argv[1], &hints, &result);
-  if (s != 0) {
-    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
+  // remploissage de la structure config réseau serveur
+  hints.ai_family = AF_INET6;                 // utilisation du serveur sur IPv6 (AF_UNSPEC pour IPv4/6)
+  hints.ai_socktype = SOCK_DGRAM;             // socket en mode datagramme
+
+  s = cree_socket(hints, ip);                 // création du socket
+  if(s == 1) {
     exit(EXIT_FAILURE);
   }
 
+
+
+
   /* getaddrinfo () retourne une liste de structures d'adresses.
      Essayez chaque adresse jusqu'à ce que nous ayons réussi à bind(2).
      Si socket() (ou bind()) échoue, nous (fermons le socket et)
@@ -45,20 +64,20 @@ int main(int argc, char *argv[]){
     }
 
     if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == 0){
-      break;                             /* Succès */
+      break;                             // Succès
     }
 
     close(sfd);
   }
 
-  if (rp == NULL) {                      /* Aucune adresse n'a pu marcher */
+  if (rp == NULL) {                      // Aucune adresse n'a pu marcher
     fprintf(stderr, "Could not bind\n");
     exit(EXIT_FAILURE);
   }
 
-  freeaddrinfo(result);                  /* libère le buffer */
+  freeaddrinfo(result);                  // libère
 
-  /* Lit les datagrammes et les renvois au client */
+  // Lit les datagrammes et les renvois au client
 
   for (;;) {
     peer_addr_len = sizeof(struct sockaddr_storage);
diff --git a/serveur_echo.o b/serveur_echo.o
index 2f4945eb41ee059fd2c67a8adc564e7aac4e9e07..c46a99dabcb13ff4d5b2c3bdd2f5ff70701950bc 100755
GIT binary patch
delta 1821
zcmZWqZ%7<R6rc5O!Dw{P7+a&UZj*|JO5@sUPn$M(jSCad<iwf^MV7-`{}A;qcW05%
z>or_fT$U}dQ%eb@<b!R6q;R0Z*<dSas2W;&{Re(1#ipfQAs;MAtA%#^W_L}(^<ehR
z?>BGWoA;Z?+?9cifhz}@*{QOd2eJhSF$kdv7kuECEttCdLdm&en>}Nb=o}H4lO;0_
z`<BDbkW0WebGGkAhixX`0GoDL?67I_c;3xCFGGIHYh_&Ikn5u+N$LxajD$xW4<t!#
z{+IlF2%!jX2hM*$A=gw(C0TYgFdO6#*QrARSjvM@4x>jv=pfkqrx98w9qvc>xdE{-
zIC6=tWZ!K>=<rl$DY@pZ^9<iT6*#(hA~2KLoj7*B;s{xHdzlC+Vb7KXAP!A=42B0r
z&)fx;V~MAbO{VVour7LpHT4eGi_|iNgg>#G*um<GKhprdSnW32)mvB<H?Z2VZoCGn
zVr^^(YY78u-5Xc~@)aOeaXXdRM%?9R=`M}^3eJi(uhy{*@v`dIMuW98k;Qt`?{uo(
zN~21HgXxO6O)pFpztqHSoVxAn{hX`z5w5T{*>6X|nz)5E4{Uu8{Dn3D<Z9dGvXKU*
zKC`we_jXLvxC+>I_2pw#DgVbbSH#<oLF^TAm8y!hB}#&ifz_X}>aT+-6z1o_u7fQH
zn+59uyNtDD_bOI9Ar@nN{I6-MVmg&bGn@h~W+yi4XiA+u4)=sLC`!!WR3Za1M67gT
zMjLlStc(`Pw@hHaA;1<@oKGd@O-`Y=xe51+w8T7hz*>Z!C8GsA#xj#cD7AweuWH-N
zNJGV{VnD(6245XbyQ!E!Sh<yYD>wV3rMMSV8;6v_+T@+dtnoVRb~O8yYBmTM3J90d
z0=$L{P*}tI0#C(jRO%t>8_w}`r2)_<^s-K?%k8>O7mXeoKvj4v{Sr@nMSPO_X$y22
z8flS%OY|@D5M{;v1Z_m)FZkGELUB(4z`DLg3(}`OyR@zaE1drP0t8PZ<2&lFY=FmR
z3-#96CaODauQXPd)?ooUY}#4^l%$cG-nI?~U1nUcwto*^_e-<np0=}CWwmKmIZ&7p
zrE#9KD&j8F?ty$?&|n(X@{E0?Dl2A|9%&9*!>pMpLCCE6kbX&5v44NNUbO_k-(}Wx
zlN-eo)dO-o7z#y)M*G99d`+wXb;p7OGM(~~a5PRjxiW5yuNe;U;l8*WkMSXyT;vW{
z$YW7HR4b3Z8Xf|Q9}e<SIT9X?$pz#(S5-vcyJz4qbi6$G16S(_&O6WAr;c59?6;2n
z(XqcdcFVDUJJ#(yb;XV?ckB_z*3Sj`4?JCNX=G56$K}4UxGW9I!H^t9&3#c>mSW+)
z^Ku-ujs%BB(aESB8yk+JHn=k6LfJC-Y&}9hJ|L`Lw(J_HiqINq5o(irFZfYlIN&3N
z_OnUfFK*w1XH)<T%hpbqq7ymz#T<M(2cONsJvOemAFw~iAx?IM>fSeV*mrX9`#E?v
v2d8sz=3z{F8;=)3+n@t5=;KgI8Sfs$!+*;EMVB5HU9v=%Y|+UtjkEs&tl$S8

delta 1605
zcmZuxacCP=7=OufxTQ;TovWs<U9YgvOeQv|gV?cY?GB!>>eeZ&e{3;ru34Z>Vv@@8
zM~I_6$$1>6KI$KeFc2|dz(Cz7t<`K4({{tPB3S>CvVXk7z#&rlkDlMVdn@Dc$h+@-
zzwh^b-|xMbdt32xynNVkX{L4Y5Z{E510mGE4_@%_O*0S9v<x*{=o=P@hDgxyO3Mv~
ze$3Dt<T{`suf@$XG(<K4tuhodv`V_1i%uPp-<^F9Cu!UF72#byjxy<Y4Yc(D$qB;;
zBOFBN5ZILv4Dz|_*#k5})p^MVcZ9nHc>BzSr^zE%fOr2neWvy9sngS)KVP|gv2mRQ
zxUhpKQSQx_9;mY)vW~;xVT9*yb6$>Yab>dZ=E!7ISMf&|LRbxBReXe19&0E6fHuL^
z{?f|XQe8g?&JT2J6#3z<Vdy)cBUo1&!5yp(*0HjNm8C5RVCB~Zx&W+bo0Rt#@EYPW
zAYfLg_=Z@gbsFM53gU*iY1(2#++u)kT6GX~yt^N(R$X<L)`MpAI)O5ZSeYtRkazk5
zkg>`gu+*!A6%euxOy#~V0T0&EW3HpL29;=_G<%;GQto^x(}~^-ELd5QE^UPZ9W+f9
z=dmKz@Km7&P10r)v8G;gL8PXpK^B<v2lW%Cmg-cYYItQ1XxqK;QVUf|z-n5sh`hcC
zi=Ns=jMQn7^sfO`<Yj1Ev=Uwo(6-yM0TRvL@(Hsy_dKkE9*=f13oV1IrM1$!o`-aH
zDs?J-6nv}}=Jhd{1Xr<kQ~1X)8uBqH_de65$pP>d{szYDO8uOs(V#xuOj8xvXEt8)
z5z!+&MTzRoV`SXZ=H7*LYtzX`9$(SqX{T>NRt@RD(4hPsNZ5WErf?p8<|c-%^Qb`p
z&f^m^v_w5v#;0b(JCL0*v#S8_Nj5id)<?xyde5q+PEf38fgZ%COsU@KqgKDWw3@j+
zZ&{KkuE-TAx;^)=VU)>8^J_lC|9uNWhQAK)b6Ur3F#Q(||1haFe}Lc4M&nYS;Li%_
zR3_&}aVZy##WIQHSc;-<G?1Dcj|s_CP8dlfV{SAgjY^64q?q6bcqE^bvcgy<H9_*;
z_SRHJ$V$mrA{iGlQZ}7RW+gWw-*`Jb^p1H6#L+P{_nWtypLxd>t+Cr=f!Sqde`0o%
z*$2!%WOj#H#BLZjvxk{I%4}dRDtyWJIwKQTBhoc#bTTJJu1e9EltEn+(L@sY;lSWx
zDL(^-K948glHp)?@$tpj4iVU2_*qZ4&40n>(?veX@3Z*>HlKdYPx2#{|J+`~aT_5|
z+CrV8Vnd0||IFrpVe{egKpfc!z373j48gww?IA}56#1V`i_lFY;ob`U<`Mc2j-1a&