From 510e436ca9ce308433fb087be2a92075d4ca9cb9 Mon Sep 17 00:00:00 2001
From: moukhlis <moukhlis@etud.insa-toulouse.fr>
Date: Tue, 8 Dec 2020 18:33:48 +0100
Subject: [PATCH] Phase de tests TCP

---
 Implementation/src/RunnerTCPEcoute.class | Bin 3517 -> 3726 bytes
 Implementation/src/RunnerTCPEnvoi.class  | Bin 2102 -> 2137 bytes
 Implementation/src/TCPEchange.class      | Bin 2454 -> 2525 bytes
 Implementation/src/TCPEchange.java       |  15 ++++++++++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Implementation/src/RunnerTCPEcoute.class b/Implementation/src/RunnerTCPEcoute.class
index 97d313e5811e5dd46fa77bee0b922e5b1430b0e3..ca0c3ec6f878f011f5140289961485a1fc2d9989 100644
GIT binary patch
delta 1977
zcma)6Yitx%6#nk)V`gWkEv`{AZ7Idj7nPQ_im>HnOA7@GrLEBVWZ4d|W!Z&&l%nFQ
zsE9lSFCb7r-itt~Mc6GZZx94TMMwbCXkz?j{NW!HL;{|fVvxj$n?2{=dmeMnch0%@
zXv&H{@`XE{#{dk)H|?^MMba8wO|JZK$m7j-`+e?kAfWj|`DM+TI~?){f(#CyHox4{
ztToim3TUo|D!<>$kds}JGvPlyYqUU<$E_91$V8TiYy~+Oz>s7(`Ls}ejo&?63-MZ3
zV0}`71q1m~md5h=9+tui_*s@FWui#IQ+S&H$_7e<@QiLXg!dEr<mJJsABq_s&F)FV
z<Ik_A?6g2}&J+p586YDMBNdFov)n86ca$<Pr;IX`ix{I|EGqamVNCLP24%Ds40(L6
zkjoR$bc;#_6ETUKOc~b63aU}V^Gsvp=k)Cq246N`Wg5%Bw`AGtP%q+n1ux)5{)cJG
z6Lol5!7G@?AkNf6wF~BI45sXy3K?~nuE323KF^$PpMjYoW-0JcY8%a|_Sx`?n4`c4
zKR<0AYM+OIh@gTH!d$czNwYCuK{FQc63gI`uQ6C_{NaFGldzD%tVfX$A#{Zj-eO27
z@%tJ{pB|tN_LH!PG_sEBT?Ox9F^^luNi(oS!3S8%ZPpRi<qB5dLtbg^-FFp3Vs+T(
z(*m`nRb{>=zemPOaJ|&48FG1xn8FWQdyTSVEj|{pPQiL?VCesU27%HJhNsW*gcyqW
zW$WXSe;=Rna3~zmiY07hc&umQ(i^fgJ(qNyFCeg+3HE4LNOM5I7QHKr9WY_C-tg@T
zcEHMDaeMtiYGx+3ONcV`D);z2!C4;P%=C~k#*%<fd4Z@}=V7mceY{FkllRj&8Bl1L
zDkhaRyS2F?kKZTaGrmZi!Q%WEaeU$t8AowU#Bn|F30^9l8Fh+5V6ucW6qo5g31_MC
zOqYGhV6WEPnx{!?aHcbwwhFzzrCwJss0Bq_WXRxtDZ?b<68GDRvf2nrFW8~b9Tkv7
zdwr!287oCVI~We|^S1QJ=OlB$One#f<*<=mB3UvVgjKf!Op73r3_{-nc*M~=2G!hw
zz7x8TTtDC-#27N-$gS)`UVRq^-4hkYF*uH)6CJ~xW+Drbl}IF#h-^f%YCg*%wF6@q
z;WVpeM@bB$O@)qeF-%yGW>t0!Gj>U;xf4}@(-LL9Rf}p>MO9L5ov0-l898mL+<~c1
zyK0Z&CG!^KQ&I`~!4-oRL!(ns75zB(pK?`+p(%>Qh~c#X)+jDU(Q!YGS04;c`j-33
z*A3<LdjfNz;|)Vlrq}09s?Pw`YQQ1Q+d7PQI`IA>EX(b}N~1n{CPd53@d!RTj5PwL
z>aH#1`ZroJiro7FH$9k*M478L-SiVGf{lFj{Z@cJ5WUk%CEZ4!r_SuuKf8;h`np@s
z>|W%a(!>zi6UD^Jhgp$Pjx*t*R%*iWb{f3|*2b=&)mU!=>?XU#Xr&R<hwUc}A<iLT
zH4+e6i&U&bAvRzzTHwS+jKC(8U^B`I+&FBZcXTUiupRZ-iAL<ACoPIMu?MTL7i+MO
zJX%S!pRl*lwQ9%LG_#i})D4>8Zp85;4&yg;;x>-31RP~)IL0z@f(^$>Ru{o3HjQqb
zm#*7FoMTIHfvv_Rwgca>-MGTqaE--rogK#w_AR;z*Hw0vWZfkDnPk6{>?W=W0<H@(
zZU`yp7Siwo4iUy`B;KX$?II)*YegiB$P-caz~5t>fr8tp5>a;xvXJ^G-1byC=`OuR
wLXR()h}H%Xu?#A2hf&JIga}BcJKIIK^rXR08~h7{pTl|5%cQ%2uc#*KUs<&95dZ)H

delta 1799
zcma)6Yitx%6#ni$W@cxH3WG_RMapV~ZY$eD!2%2NEbmgFEg&Mw&`#Se%WmCA0Yz7Q
z@D?anL@JM}g;fh;DeRV3K(t~+V^LyaVq*AX{HZ3yA861s(?Udl=w|P^_nvd^Ip2BB
z?qTPL%2#f6T>vl<m)qq4;~i|eFj9dNx%?)}VR>A$4b6RsL95pr^}=AJa9+3}5wD0x
z4Sij?p;sGG8D97m6rhl=wE3lcj4_`V@x8WT1wM>3FAp;e_LbhY(D!Uo-ZBZ}86d-l
zi3$Rk#J{&as6N8L0y3sznuzHNW?&{CWS`@i#h{cJv3M}7$Ms;;Fg4~Vn2UKlY9Api
zP*946{IGqFYms?e%n;^H!r*<5Rqk?Bh^SPs6w7#>W7z}ccvQg(JjNi_8u7}F4F-eV
zmp4yFIUZNA3QzFs4zGJPbP;P5R1q+@^FFtM8WFV$>Ja2b&WY}|2#HvyAdCoabdHq_
zJf$Ft7;kqLPfaig6_G@=%8;<0!C`ulu#sXblJE?}fEkf+J;}XMqbhN~gl9=2n=vI7
zJde$Mq%dDvjTaTXgqQgSValSd3btW8gDp`+uS=K4gP~wdj~j{TBoR9q23pw->EYVK
z$~r1ewTM?3vdR<Tuo11Cxp-E%F%p!q3wz9h?BzcT1xXn@u+O}5hV1_OSQgAz`kIho
z)o4G#FCkAVY&c-%cC!jQ7MNvgR`3P{24__$5~GrM(JbKzftei)2V-@?aIH6PfsxR{
zaPRb*nqXC(UTb)(4R0tnw=NiqM`WzUTMFJb?Wnq?VMND_rp5{fjc827G47X!uoRyy
z)v)*ZNohe=hm12gD<W;8$#B8dGwd8?hRG7T2@ErT63$aqnaR7ze{v0HA9GR8cl0pi
za9Pgb6|$OpoZ=V=Hx%lB8}6aAxl@|0oh;!UFucom$=>99#8crQx{c^|xF~m7*h%s>
z2&NWbPe8%|GBNZt2C3O;Xx;Fv$Ug%yjo}%LDD8%CMK|*MS)(!-ox#|JYH^ub9B|Nb
z(h_Kiv?N+C|7Es(R2mb?{7H3k8dK~=YDpTi4`RLMQj4uqmcI-0fq)~$ax{nL)C5h`
zq%M>Zk8}c(=IX?ffUL=BEO)e^knjvJFDuh{GL7nhTXUP&`oHrvcNz^TWLb}zA*7J}
zI)#h=+aTh1xpt<|dPme~i6VV>N0GY0x>uSRd73gpyXLgakZh9~!*j&V|0k~#FPz1e
zZtS3Z?K1O~6is}zwm34_ok7#`{<sO7?~e0V@4_XfC{l^^UZY${<e84I1LQAttBuln
zkjznO4w={v_hD0ynrQkx^(82cH&ZA}mi`Z|ynynbTAFgPo!U-fZLAlq)_wzEH`s5C
zc4|Mf(SE>qqI;;Fnve|+Ka%?~n&KFT1DHTTOvXV>Lo-Tf{^sHkjlp3o!4c><O5@am
zMw+LsWPT@(VIPi@RthJmn>(mad&tFS)V00D`39%(E!y!TPU9Dxp|9~-HV|nx1Q}L<
zPBshYm`+0#O42xO!UeV!msk^eSPMR9t+>M4@D=MoFYCrt_9d=SOkc38#QTnT*NOKl
z@ov!l7J6+0uG+G3&E_GOCn&yBWc^9#Wf77Hj|iWLssH{1{y(sIrHJyIkZqpd(I9(V
z^soSo9-5?;zI7)@P*P7>3H*TK0X#INr)e%bE!t(#4=s8DACX)p*(H2}Poez<@8GaJ

diff --git a/Implementation/src/RunnerTCPEnvoi.class b/Implementation/src/RunnerTCPEnvoi.class
index a13a982d3b334e8cb203598a11cb55c93422f822..81bf49958c615f4a6d7997c5ba028cc9efc76af7 100644
GIT binary patch
delta 424
zcmXAl-%C?r7{@<no*!ccE=5F8u*d`x2SyhvT|@~=YamUu%=B<P&gndx&DosgrmL1-
zh;gpE^lHJbmT@k25d`H$U3%4(7ycK5<}<u_zr64Bd3e9y=kbF7f`LC5wI9F$yVby7
zwdKaJvzCl^&UI&;&Sg7o#%w=X_gK9Z%3WszT|u)F$+R8dE;)luh2}+b%?u?>Cl(sc
zT6StRo^%Wf?rm*J`RMLz5iO5_&pp*1Xj}N$cDwZ0v!ZzRaZPjrl_*V&)5>$&dBIJl
zxWh~CGtCoTF~*G0S>8*xioypuBj}>rpqO%N5OU<6===GOp6}f2^{~D%+LZB#)ZZTS
z<^Qww%A2doBad|f?H+H-s86f%RfV7Y;++JnN1LZj)WT1UMi%HIP7jOpv&0|?9<t11
zl7vZNvLfU)dD28ntg=Uj&t&<+ItS$VDvPVI$)U8=D2P!}thV?q6P3iK1>HY%PS_x2
R5Iv)9(vTpM>61VoJC}V>VekL|

delta 390
zcmW-byDx(Q6vclZ-=issBErytfdSEk7`z5SQb7~(h__VJR*SY&t7z4`CL!NslNdUf
zh<pjbAHZMWe=r*)9+%;sdvngsIp@t`IqWar56?gwCpY$2)qGd0U8!O=(G@h`ay0I@
z(?H4~txz8JCcUm@ZzSmIOZoh<^-wfouw!;;OUj{{*F0JV1Bdykb!k}&*fl%#;K-i1
zH&G-wj>-sSj8e%2P9~{giaMrgWrhJ}8D@?#=Gm8T6@>#CH@e_1C}VOJit=oJ=x5oA
z`a4=0Eqs65B9Q-CyrsV^Vc`*`$6`a4(_$-+I&>ozSKRZ+wiNrTv_REA+VE3CfLemo
zvq&=`+6mLm61}W2NCYoYVPa%iCC3`4#BraK;DRKVY>4$1*J6E3T0*iCli^7^A4x<7
Zx~=1jL4%mV=qIHUhI~q&V-X9;{Q~5LS1SMj

diff --git a/Implementation/src/TCPEchange.class b/Implementation/src/TCPEchange.class
index 97276c831dd71fb77317c3a81882e085042a3a29..353e4bb80ee73e249b2edad3d982c24a3127ecc8 100644
GIT binary patch
delta 331
zcmWlTOG`pg6ouC@z2_>3lr#x~0~SV5I4Npk^dJc=DjGEtJ(bY)#`OwKv$WFQ2bwi*
zYy*V`LDT+1^aJ_@O?s`%fxY(L-`;zj`{YM5_V)Yy0$>)V6C1L!HtGUX`Lr&&HD9Z(
z#dTG5D}K3B)2eXb>8je-it3cLr~Exn7fPz6or33Si4&8yilS}W)<gCfA)W=o5QxBH
zY_J-p3TkA$2hm|7&}0lSFo-BlamK}l*^%3#X<lV2c}@}>X^~#wl3Bxi$rfqdo*TO&
zjic`y8Ht%g3CH5tHEx12q8`1&)J^kg&yPMq4jgrnc>H@`o9M#raH=19K8L2kN2U=s
lxo9f0fE6sUzl>Gnu)!)YN+9%u5eZ*na+h9QzhygwyMMZeM=AgS

delta 260
zcmcaBJWZJE)W2Q(7#J8V876Mzl44_KXK0$7#Fot1Ir$jdT)RdFCZHSx0}BHq11kd?
zkZcC>WPvmzkY?4|&cL`4$Y5k>0g@nT1_n_EPKH*7HlW7l$qU(|7+WU)VOJJz2g-m9
z=>W=hF?0i2&6ABdx`48KIqWrhfU>*{%zqdR*cmJ;*co!!fXaFq`asHnQmcV>vjAzY
z$ts+VvdjNJ_S4<QkiQWqE6Csigt<V=Kn^fs;F;XTsjTA+6mtbaHwI4z4+fCo{0vNg
Y8C2LAO4u3n;(_J^we|yrnHVMj0Efjdm;e9(

diff --git a/Implementation/src/TCPEchange.java b/Implementation/src/TCPEchange.java
index 0b4e04e..964d4bb 100644
--- a/Implementation/src/TCPEchange.java
+++ b/Implementation/src/TCPEchange.java
@@ -63,6 +63,7 @@ public class TCPEchange {
 	        	System.out.println("Attente Session de clavardage");
 	        	Socket link = ss.accept();
 	        	exec.submit(new RunnerTCPEcoute(link,app));
+	        	System.out.println("L'ecoute TCP continue apres le premier thread demarre");
 	        	//exec.submit(new RunnerTCPEnvoi(link,app,app.getMe()));
 	            }
 	        } 
@@ -75,7 +76,7 @@ public class TCPEchange {
 
 //ENVOI
 class RunnerTCPEnvoi implements Runnable {
-	final Socket link;
+	private Socket link;
 	private ChatApp app ;
 	private Utilisateur Destinataire;
 	final BufferedReader in;
@@ -97,6 +98,7 @@ class RunnerTCPEnvoi implements Runnable {
     public void run() {
     System.out.println("Creation d'un thread d'envoi");
     String msg;
+    
     while(true){
     	if(!bonjourEnvoye) {
     		MessageHorodate mh = new MessageHorodate(Destinataire,app.getMe(),"Bonjour",2);
@@ -114,7 +116,9 @@ class RunnerTCPEnvoi implements Runnable {
         	out.flush();
         	break;
         }
+        
         out.println(mh);
+        System.out.println("Envoi d'un mesage");
         out.flush();
     	}
      }
@@ -141,6 +145,7 @@ class RunnerTCPEcoute implements Runnable {
 	    @Override
 	    public void run() {
 	        System.out.println("Creation d'un thread d'ecoute");
+	        ExecutorService exec = Executors.newFixedThreadPool(1);
 	        try {
 	        	PrintStream output = new PrintStream(link.getOutputStream());
 	        	//InputStream is = link.getInputStream();
@@ -154,7 +159,9 @@ class RunnerTCPEcoute implements Runnable {
 	            String payload = "";
 	            String msg = "";
 	            while (line != null) {
+	            	
 	            	line = in.readLine();
+	            	
 	            	if(line.split(":")[0].equals("Destinataire")) {
 	            		if(msg.equals("")) {
 	            			dest = line+"\n";
@@ -166,6 +173,7 @@ class RunnerTCPEcoute implements Runnable {
 	            			if(mh.getType()==1) {
 	            			Historique h = app.getHist(mh.getSource().getPseudo());
 	            			h.addMessage(mh);
+	            			
 	            			app.majHistorique(mh.getSource().getPseudo(), h);
 	            			}
 	            			else if(mh.getType()==0) {
@@ -180,9 +188,10 @@ class RunnerTCPEcoute implements Runnable {
 	            	else if(line.split(":")[0].equals("Type")) {
 	            		if(line.split(":")[1].equals("2")) {
 	            			System.out.println("Bonjour recu!");
-	            			System.out.println(src.split(":")[1].replaceAll("\n", ""));
+	            			//System.out.println(src.split(":")[1].replaceAll("\n", ""));
 	            			u2=Utilisateur.stringToUtilisateur(src.split(":")[1].replaceAll("\n", ""));
-	            			new Thread(new RunnerTCPEnvoi(link,app,u2,true));
+	            			exec.submit(new RunnerTCPEnvoi(link,app,u2,true));
+	            			System.out.println("Thread d'envoi envoye");
 	            		}
 	            		type = line+"\n";
 	            	}