From 1d04a9000ddfb3a9cc4ddf2e036e0f180c4442ce Mon Sep 17 00:00:00 2001
From: alartigu <alartigu@etud.insa-toulouse.fr>
Date: Thu, 26 Nov 2020 10:47:25 +0100
Subject: [PATCH] Suite connexion() 3

---
 Implementation/src/ChatApp.class    | Bin 3044 -> 2305 bytes
 Implementation/src/ChatApp.java     |  66 ++++++++++++----------------
 Implementation/src/Runner.class     | Bin 0 -> 371 bytes
 Implementation/src/RunnerUDP.class  | Bin 0 -> 943 bytes
 Implementation/src/UDPEchange.class | Bin 0 -> 1683 bytes
 Implementation/src/UDPEchange.java  |  60 +++++++++++++++++++++++++
 6 files changed, 89 insertions(+), 37 deletions(-)
 create mode 100644 Implementation/src/Runner.class
 create mode 100644 Implementation/src/RunnerUDP.class
 create mode 100644 Implementation/src/UDPEchange.class
 create mode 100644 Implementation/src/UDPEchange.java

diff --git a/Implementation/src/ChatApp.class b/Implementation/src/ChatApp.class
index 952a0cee74d8391ec3b6ec06b9896bbee0262982..2e60ad080ed0f86b37a9a9bda6e067f4e43cfea0 100644
GIT binary patch
delta 1274
zcmaJ>O>^5+6g^LN{A^i3oit68bb{L^t-liI0}>LqPTe+vfZT?rNeQJTiu__Lb!8*T
zsiA;dK6YJnMk{_n*JYU0Au|jcHZ0k*U|_*-U>M4koSA09Fq(OOdiS1l&$;)>fAl@<
zmVf@|`yT+z;_IjK9(yT*BvKq{1sROGsldck7+Hq6YS@m5mxLW}I7Zd5HAgfoJFe-D
zv1P~S;xZ;M$uXtiHN5Wr8kh@n%qVyRv+i$QXQDZr<2bJ%k9oH{bT*trLBT~_atom$
zS;in16fELR_oOtOk6}r{+vsKJE(=Gk)#{s?ey30>S;Dqus3>w=QE(N@46$u(N6S_<
zvz%Qr9Z?pRs|QE&*RaBIUBN2W806K<%L{sias)#}ubHN38a0z4pHO|cDI7uz=b%K+
zoo6FTa?LCCo`Q9}?@k9t!clynpbNL$$H8ptLytSep)vIM97Zj>bakPri@HPHGB(gJ
zqXfaRrJ#%o!;qinbuUXA^oC^#)5$J0h2C&#mQ8L=ac|LRiqiFpCA89VtyX17CYF*N
zm4}h7!_XCB?HIbqacnb$t~JP?CBs0~lY5szNvM}9np3FPbIG+RYN&I3q`(5z9R6QX
z2h7B3H#YAY4#QNZWtmRPy;|C4RpkCdqNi}N;WRAa-VWUgaD3t}OT9B(E0w&v#Bd~`
zuD-ZRB#oh8+uAbpim?3Kb|`AQ`=M;#7u4*Voo4tGUvVtMEa%(^KQV@rh(e-^EYb5a
zUIBySzcuLn6i(B=i_U0%wC=b+g;!el=qv@9)}sibmoR;Zp`Ugqa2x~l4B}M`VU*Tc
z#L=Y8en`(L803g@e9WP8f-sI_A)>vHPd#!<JLAg$<kWYN)4LeH@sv&(ypl4-K$2P!
zQpNBYJg5iSra*vxC%#3Zdu$iu9(WhiYI+ZI4BudYHWwIv#9)z9GP}4;Nl%{t?r}>#
z_c1aEj37)3P9s6mlNcwHo^)!@-#EgN`-}WAthT7I<QKk3WrLJ4(8gOT6^#>fF&6x#
zjd!l3Gox+1`$B!E!WiX`L!ocJ2b0v4DSS@&Akl6hf)*YeSb9WyJWDhCh_0ssld0fj
z8#jpe8E)QJsWG>oAY3FTo3X&3ZRo|!K8*GBGu+vODS^7iXgJ4d5E};$Pmwp!-^x+s
q=sZu6b2P5=G@f~!#RW{G;JfYd1~mwY;~~w;8_|X*?@Izp`08JK?-SVo

literal 3044
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

diff --git a/Implementation/src/ChatApp.java b/Implementation/src/ChatApp.java
index 0330b69..4a71dd6 100644
--- a/Implementation/src/ChatApp.java
+++ b/Implementation/src/ChatApp.java
@@ -1,11 +1,9 @@
 import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
 import java.net.InetAddress;
-import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class ChatApp {
 	
@@ -28,20 +26,24 @@ public class ChatApp {
 		this.me = new Utilisateur(pseudo,port,ip);
 		this.actifUsers.add(me);
 	}
-
+	public void addList(Utilisateur u) {
+		this.actifUsers.add(u);
+	}
+	public void afficherListeUtilisateurs() {
+		System.out.println ("Liste des utilisateurs actifs : ");
+		for(Utilisateur elem: this.actifUsers)
+        {
+        	 System.out.println (elem.toString());
+        }	      
+	}
+	
 	public void connexion() throws IOException {
-		// Envoie en broadcast à tous les utilsateurs
-		DatagramSocket socket = new DatagramSocket();
-		socket.setBroadcast(true);
 		// @ de broadcast du réseau de l'utilisateur me 
-	    InetAddress broadcastAdress = this.me.getIp(); // A MODIFIER 
+	    InetAddress broadcastAdress = InetAddress.getLoopbackAddress(); // A MODIFIER 
 	    // Message que l'on envoie à tous les utilisateurs actifs
 		String broadcastMessage = this.me.toString() ;
-		byte[]buffer = broadcastMessage.getBytes();
-	    DatagramPacket packet = new DatagramPacket( buffer, buffer.length,  InetAddress.getLoopbackAddress(), 1234 );
-	    socket.send(packet);
-	    socket.close();
-	    System.out.println(this.me.getPseudo() + " envoie : "  + broadcastMessage);
+		Integer port = 1234 ;
+		UDPEchange.connexion(broadcastAdress,broadcastMessage, port);
 	}
 	
 	
@@ -54,29 +56,19 @@ public class ChatApp {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		DatagramSocket socket = null;
-		try {
-			socket = new DatagramSocket(1234);
-		} catch (SocketException e1) {
-			e1.printStackTrace();
-		} 
-		byte buffer[] = new byte[1024];
-	      while(true) 
-	      { 
-	        DatagramPacket data = new DatagramPacket(buffer,buffer.length); 
-	        try {
-				socket.receive(data);
-			} catch (IOException e) {
-				e.printStackTrace();
-			} 
-	        String received = new String(data.getData(), 0, data.getLength());
-	        System.out.println(app.me.getPseudo() + " reçoit : " + received); 
-	        app.actifUsers.add(Utilisateur.stringToUtilisateur(received));
-	        for(Utilisateur elem: app.actifUsers)
-	        {
-	        	 System.out.println (elem.toString());
-	        }	      }
-	      
+		ExecutorService exec = Executors.newFixedThreadPool(1000);
+		 exec.submit(new Runner(app));
 	}
 	
 }
+class Runner implements Runnable {
+    ChatApp app ; 
+    public Runner(ChatApp app) {
+        this.app = app ;
+    }
+    @Override
+    public void run() {
+    	UDPEchange.ecouteUDP(app);
+    }
+}
+
diff --git a/Implementation/src/Runner.class b/Implementation/src/Runner.class
new file mode 100644
index 0000000000000000000000000000000000000000..8933e5d498e746ff495be74e2de622e84538700b
GIT binary patch
literal 371
zcmYLFO-sW-6r4@cY!lbE#&1s^JhTz)SrkF4RWPXd(fcMYHl=Pt$ojtoMe*Pd@JESn
zvDm}Td-L9#Vc74V&o2P`*b3pm<?sX=@EJN2`7HZWsUQ1S=|p8UgMXOoygp)ZyS-6>
zCIXI7U;%=5H%4n!(N2~nLy!!{vOX@$gAgsWIXVJMh#12Alk3xLOty-yR92W;(TG8G
z|0TT<#|lF<PhibuIwgrWC?2S^lU%Dy^OUOU?r-5%Mw9(*VX90Gb9*ah8TPCZwkfa!
zhGlxNp$RQ-AR=5P787@<hVeUCy!!_JLX2UJumzWJ2oGlna8A>8_%q!ORqNS|U%@}H
TI9J&}1unpm(8UJz4mN)Qw&Opx

literal 0
HcmV?d00001

diff --git a/Implementation/src/RunnerUDP.class b/Implementation/src/RunnerUDP.class
new file mode 100644
index 0000000000000000000000000000000000000000..1650904088d998c5a10eec3d50793708e98410c6
GIT binary patch
literal 943
zcmZ`&Yfl<M6g>mT%DM{0T8n*%ZM8hCNUaaVJ_Kw+vS~>{lEzO1JHlF6$TBqP&uUY#
zX_Nkd{-~yRfK*BJ%iWoK?>YA|XaD^D`5Qn6M>;(4YVaADf}bID#y|5^i#v_f``VeP
zO9uae?bz}agEtnh1~83)2Hn6642HmmzT*h@xKLv7SzL04h&iNigiIC4(QtXY#Ot4g
z%qr}hfgnP}#k*aCoB1Y}hutp4!kE`^+rR?uOtew{(vzZ1h)$oHSs1a~om9!S9a)yH
z;O*=*?lR0(nsl+EJ;_}uEFDX@r{TVV2YARZKkRA}$Dnl;OUohR*ob*JI?>urBO9-3
zh)y;$4Cr`-#~Pj(Sj8H{;tc~6eM3mK1X@lkev(tTn1MJFG&+S$;WT7(xY(kOWvr`5
zct)_;Nv>FoS9PSYsUdCPIkp&Pj-}nQdt8dXO9S<Wy;M3A-j(adFt4O!b!=lt!>)ln
zWT@8o1?a>r%d~s6<WOt^p&Hpn*1&;MNQ9rB+V!SzRj#<g+|xiJ3113GX@l2Vf?;*s
z)it8{uYh=!wv_K!lpZu~N4)E|Yr?IJ2)u5e-bgQZ`fgpkwH0TOM0Zqgl2XNns);Dc
z%L9g&WJ5}xBycFTkyZXFye9jGZd*$8DwenaOC-;sCDzX|`;}Y_hh)R>k=-PlMu3(-
zM-YY_{9^(^WFE@Me8a8q;sB9fSpJy!4sC!H@96vV0!fp?Ns5wZHu(b^1H4ej0roFT
dEfFcOL%r{k0`{;*KV=&Gbjnh(JjFaH`~#r>)i3}6

literal 0
HcmV?d00001

diff --git a/Implementation/src/UDPEchange.class b/Implementation/src/UDPEchange.class
new file mode 100644
index 0000000000000000000000000000000000000000..4366d90864a5c5bc8aa27d1aac2cd11e0053a3ac
GIT binary patch
literal 1683
zcmaJ?ZC4vb6n+La3`v(l3Ke3ZwFqre2+_8-l2nvejfNKqrBZy`Y(`iNyE&U(q`!#I
z`T?qV_yK;@KjHB=c*JLt2;m$sd(O=6%)QTj?sM-<e*5Q_69ALgiJ=Yc5{8KgIs|%l
ztUW7JvD~f9a%o4|fk4MI$8~}!f%ar-U7}N<zi#BJATwtL)|PMW7CrlW6~rLXu7_(T
zOmqpDH5JVGo>jK38j+0T%hY-d-RO~so4A4A3jvFP@3>n6om=#J6{wo_NNvtY+`KI2
ziq(kOj{%8<i8paepzn-Yp8TfEWna~ZbAylt&#RW`bGA5;OcgFO&&4o=+Y)z7yoI|0
z@pDb`ZlJc5PmYcotXq{()n&=Y(1*9Rgd+k&$<3Mk<-mEJzQjEf_mO0FHRYBC29xL3
z{|VYiF4wSsU}8)cCt_E;nu;Qg35kq}cku2-0bkVuwM#}`NVRV^P#rI`LR|x@tE^q-
z_6Uz9-ZSw8PX&7Gxm~mokX7wbaS77oR_};Lf$F3tk(J1qc!m!IZr4G=z^P<x&$UC}
zS8kA*-&b}Rc)ph3RX;2^`>MRQO%ml5&#MTelKH0oS9undzvtMBoFzWg>VBj<f+9-H
z2n?LnuF-w-`?jhEj_1ZOjX4wZTC(nXCdGhtU-K<n=|X+1p*~?_>q0dY{?x>0x+2n7
zwsQ8A#A1s!`Q;Yu0_G%E1fr{<>ni{G+)50~Sk;(CfzhjLS(x3ng6V3N`d!0wFo_o?
zzQBgS$p7lsRDpbJVQJT4WgoQ`MbofK6_vX}%!M!reU+2g6o`@SyuHoS&Av5ey)vin
zg5#>CaJQuVHI2i}SVULtQ%QlTmV8=HRIbrmtzFTw(mW+hlp)WgV;@A7&DK<8!Mh>Z
zB8Wg&y+(^xwN65UJY-Wa30?|qn=E;(=!L$m7935p`#hNmEg<gVB`-7mYX=VtIyipG
zuOZHYbL7Dh#E*Ot_==<62BLhv#y51-rY=`IIA@O`H;xcpN*jlWjUD28);LDrM#4xK
zC$I6w_#p<5Fr1B~6OluVrVo+&3FEYTc#c1eP9k-2yw0&3z34#_aZK>yd&sXzw&J(6
zFvz1o78Xi;(=7g~lLuBsA>RJyYrMax>BNoSk1$m@K<5(U&BhJ<+PS1jrPC)zSjZY<
z36jkpAeN12R!if@SSDj;{rS&WYr~6!(?6JJlyUocL?-YUPZ_zbu11zDfdPIcXmN`+
zw`n!Vl_8FIFwAEHBlNjXuTiqUhbiW>j1+8oK0)M^4*V-AOGwEE7ZTIP--t+jcS<<U
T%^faCE^xn~Yp_l4HaPzRk+_YB

literal 0
HcmV?d00001

diff --git a/Implementation/src/UDPEchange.java b/Implementation/src/UDPEchange.java
new file mode 100644
index 0000000..5dfdc77
--- /dev/null
+++ b/Implementation/src/UDPEchange.java
@@ -0,0 +1,60 @@
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class UDPEchange {
+	
+	public static void connexion( InetAddress broadcastAdress , String broadcastMessage , Integer port) throws IOException {
+		// Envoie en broadcast à tous les utilsateurs
+		DatagramSocket socket = new DatagramSocket();
+		socket.setBroadcast(true);
+		byte[]buffer = broadcastMessage.getBytes();
+	    DatagramPacket packet = new DatagramPacket( buffer, buffer.length,  InetAddress.getLoopbackAddress(), port );
+	    socket.send(packet);
+	    socket.close();
+	    System.out.println(broadcastMessage);
+	}
+	
+	public static void ecouteUDP(ChatApp app)
+	{
+		DatagramSocket socket = null;
+		ExecutorService exec = Executors.newFixedThreadPool(1000);
+		try {
+			socket = new DatagramSocket(1234);
+		} catch (SocketException e1) {
+			e1.printStackTrace();
+		} 
+		byte buffer[] = new byte[1024];
+	      while(true) 
+	      { 
+	        DatagramPacket data = new DatagramPacket(buffer,buffer.length); 
+	        try {
+				socket.receive(data);
+			} catch (IOException e) {
+				e.printStackTrace();
+			} 
+	        exec.submit(new RunnerUDP(data,app));
+	       }
+	}
+}
+class RunnerUDP implements Runnable {
+    final DatagramPacket data ;
+    ChatApp app ; 
+
+    public RunnerUDP(DatagramPacket data, ChatApp app) {
+        this.data= data;
+        this.app = app ;
+    }
+    @Override
+    public void run() {
+        System.out.println("Thread started");
+        String received = new String(data.getData(), 0, data.getLength());
+        System.out.println(received); 
+        app.addList(Utilisateur.stringToUtilisateur(received));
+        app.afficherListeUtilisateurs();
+    }
+}