From dda0ef459ed17bc330cda457ccc624ac9c8e6309 Mon Sep 17 00:00:00 2001
From: moukhlis <moukhlis@etud.insa-toulouse.fr>
Date: Mon, 7 Dec 2020 20:10:40 +0100
Subject: [PATCH] Tests sur le TCP

---
 Implementation/src/Historique.class      | Bin 1688 -> 1870 bytes
 Implementation/src/Historique.java       |   2 ++
 Implementation/src/RunnerTCPEcoute.class | Bin 2987 -> 3140 bytes
 Implementation/src/RunnerTCPEnvoi.class  | Bin 1872 -> 1889 bytes
 Implementation/src/TCPEchange.class      | Bin 2479 -> 2479 bytes
 Implementation/src/TCPEchange.java       |  18 ++++++++++--------
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Implementation/src/Historique.class b/Implementation/src/Historique.class
index 4447d378acabd73292617a29cf05113232a479d7..d31579e046f307baa4aadeebb37b9dbc5775e6b0 100644
GIT binary patch
delta 740
zcmY*WOHUI~6#j0fb;@*#4FpYX3)e@5@{%G5l%i-+X%T#(AU?0{g*LWR?F<Xuu+TqX
z?#88$g&Q|M(nS*uF)oY?xBd;c8ho6VCdN#1?)koR<~y$^{;#dZm*2Gy049)oY<%~(
zAdHBPP7__=>Kluvyx7MuG$Tu*QW0yC=Oiz7i`CUaHeZK#Ma3z|;x?Tx*iN}pxVJ71
z96(gZK@;8RQI2bT+CTukCi>9N;I<17B!kuyOSe(&K@*2C#IU<0?#NWx$_i(x;N;1(
z9bq{(Lq|_qJ!Ku<0ESH*#)t|r9y!9Wb6(muwJ}?+lykzNvZEL`X_$msX55#=l#Zh&
zj$v9oWW!yfIAJ1%X$E6WI?aFEz;LqO!70`6npCe`KUyytxQrzo%XRvSdaHd}yh=+*
z7x{fIxX3!|vRITQX*ry6x$W6JCoG$G^KS`WTxakwp5TnZOk0+$q>93}rLE%@LsV_L
zJJl~u*L2)g@7?q5r)e23%)(7Ad5|WXQ4vocn^S2|L_dT122=8cf^(E<P%dcCEr=4o
zfJ7tu%(H8w9^F9*7$AGL;b#baghskR`3*vCd#l(_Z|^&_R}rgGDu@Xf$tDvpUclG%
zliE}`^c)j)7_K6|iP0*?s+e5(k2#)jlj6We&|Sk!L++7_z5Mg}HPv*X-qj#{WaIE+
z7<=fF5sV;4M~h<&<Md_db}KYVp0I@^&QZ1>+7{w$3yl4wkcRUOxeK^RZz~Be(vT|+
Qdkr^;^BF|kgg_R-ztFvzTmS$7

delta 560
zcmY+AJ8u&~6otRpU1yW^I#>i@S$2#QJHc_DHiS5i!^<RKz~+?@o`pfH5D^SwT_7lE
z_ycGfN(2Q36$rUVfhZ_|f|kEQ3q-(Oi-uxG=bSln?$!C)|19Es`MvcXnCJRa=lhUD
zl%&fbDTU>4JoFT1Zmbr_X_p~}b<{|!tS%V4dNYi=>?Nn`Mmn5l+-AaMk}3VbC=O?s
zaVapRaMrzc-ShqCy4S}(_S?+59AHk{s*v3ojCLurporaR-u9|@TQ{5SwT<>IL4Ld0
zYWw=Lu@G@s<e<$Vm%|*<k5oxp=8yif4(B*;b0LUW(P8Uj;-Vs?(&e;LxV2WxyI<XG
z`o8DeT-NDO-nyzt>3dd8H!NFkh9(A%$_fTmEaWH0<X+ORL*r^$e+v!T$2rkeeuWb8
zWpO&<g)DuHh+ZSteVy*v{Wy5-5r%Z2IN8NZ!k%MFF04kKO8y-K9THLJCE<U#VlE~V
zFPIN#vcsMaWIBv=7;F5eOqZ><6er`>7A5FVd19zne?GmDV1r=vjZxVNsobQ<4k<du
zEGa2^hB@i1L__$B)O1Q*5zK93Y8$0~iez%Sn^PAP^ve2Y<gBtL%n@{nD_kS~7o&V(
Ap#T5?

diff --git a/Implementation/src/Historique.java b/Implementation/src/Historique.java
index 4419be3..81b093c 100644
--- a/Implementation/src/Historique.java
+++ b/Implementation/src/Historique.java
@@ -46,6 +46,8 @@ public class Historique {
 	}
 	
 	public void afficher10derniers() {
+		System.out.println("Demarrage de l'affichage partiel de l'historique");
+		System.out.println("Il y a actuellement " + HistoriqueHorodate.size() +" elements dans l'historique");
 		int n =10;
 		if(HistoriqueHorodate.size()<=10) {
 			n = HistoriqueHorodate.size();
diff --git a/Implementation/src/RunnerTCPEcoute.class b/Implementation/src/RunnerTCPEcoute.class
index fc77aa9e8241a32edb47b1ab6bb40cfbe6f6dc13..136db832a6cf6b4e23c9420dd838713b54ce7f08 100644
GIT binary patch
delta 758
zcma)(%S%)N6vlr?ow?WRC}j^D$(k18gUpH+87>SYD#eJ}wTQt{XL4{v#eyD&mhWeG
z@{y*N`AW;w7|Y6tguqo0^bZ8>TeQqNBkk+L{XWij&b@r!IdduNd#sJk)iofGg+=S9
z<D5k%O)l=>6da|&P;HrohbEI2VcV%dRiM@%sH*VP`D@C&K9e?K=gIQ&K&jtbQReZL
zd4d`KKy6*fqLL05opzctCDx$ZE^+Qw?zNkozFh_b!j3E6dT(yfTUC*J(O(m~YJYR)
zC5>1-WYl2HMKR-cwy~b}ScnnJ<ca!`=wmV^#7b0~u@lVwadSet-D9NK)uv$=oAGha
zgnfSnxAfTU<^e|^!ae(i>B+G*Y%+0**A;IN&rOoJrTs9@=oG|k;vf;^&GIj^KpGB4
zXv}_z5#jC<+mo9kxTD;vta75hbrCK{@I`2!rlj~khO$n${yF7#y<a32vq6d^L>H!V
zSY3ssKgz@q&9cE!#YRlMSqjbM(8^)jI7U0i=^&p@3iRtjx;agc?zNZm^x@T{mHLNz
z`e|W6CkIs-VweZaD=ss_x?bZG4P$&}oG(o9l}Wxc#Sdmgm=zauvX^<uU_p+sBn7NU
zA+Mx}w{n4Za)~tw@<HvtmTJ|msdihnKGnink7_-o^@`T3eB{1HIYZ)ab!r)y2B`*_
zc78(E*+Ym5QRwm+^r!1$2Df%Fq<$e)Z#k^jd$ffUTR6Fe)68n$(%w_e^&Iyfgb%jU

delta 616
zcmW-d+e=hY6vlr`ojJ$j!Ab)wLMG^jB^DK3=wYH11xdQR6!b969Q35l3^S8-5h^n^
zZ>gu7nwF+%jtOQ=U?o9<&{GifC-mM!uhJU#!?)Rct-ZhX{Z_Z7OROL3%PYW178b34
zzEYD1!saSB>Lwf9Xni2nkZ?i~i$)&Wba?0eC3P12>9To*U+{&SVoAp$K$k(UP<%bq
z5~^@x6*YC0H^WXm<;J2GJ@nf=&h~GLC){Z2QYsW~yqpMy9fLvdzCYrv`;QflTD)Y;
zVBDsbSKb+8H8>&Uh-LCdog}+VriEO|-pvRF7oD)<wm6Yf0TJw)Xw*rZZ3-omPSRjb
z*yF{`Qfqf@EY^4<ZZPjPn@428n=p6zh7de&%?y-3(ey>+soqk(O+I%hq*d!r@n^dr
zrxhPINb}Ox{Gj+gu%)QY8?=h=wja#US@sblL-!13?STw^i~7ivh}3KD9J1ffQKoti
zlQv3dr<@KB(aBM|IH4d<(@jvj&(TXYeHy=?3kod6fPx>SMStnkae8>h5YHLq1@jEE
zbd?cS^|;0uKN;s2ll*3iKTPvi2??`eD~X+?WgiQ2m_-Sak!n846_({1pC!VIj`~F!
z_$p0&QwylX_P!S!uiA?kI<-nq9=YnQEYy2g_Z<prM3cVW(8&#*+R(SmYTeS>JJP&o
F`+wpDkQe{}

diff --git a/Implementation/src/RunnerTCPEnvoi.class b/Implementation/src/RunnerTCPEnvoi.class
index 344d115767755a2c5f4baca956ed667301fa8264..d0a21d2abfff32afc4659fc176e628426ccf8ac8 100644
GIT binary patch
delta 380
zcmZ9H%Sr-q6vltks56L|4V6I#U8qH71+@<hyHHxDnb*|REV~$5Mp^U@&8jDG(IzUU
zMK93<v}xzIZ4mXhXcLEXz7M{`?{Hr1Z}z)Wc~D_ZqTOGpR<p&zLb+1TXO9b3!mKMq
zY-|wKoAQVnByPh@Lhm+B^{S*KRF5YVURm{ctfa{(WNmDb)34>}hecCU>Wg3^geC}1
zqPU1LK%7Yu%#qXs7U$JF7G$7)k5}^<%#S{z8Tgl<3C4u)7ws|#xlK>R{BA92uzADK
z|5R?JVs&E7Am5<t&$iT{*!a3_@k_t_8H0Th^ca-&SBrX*p~e|Uv<U?-4l&cH;uQxu
zhRHKdfmya$qDX*UB9ut6M}`A-IHWA9M&*ZcPL;YKbYfON@hPMgf**856>$QI3z4;P
F`3;+wRr~+|

delta 341
zcmZ9G%Sr-q6vlt!jLsmUF%S}3R0|1hx=`yDK{rS%Z_Q|#<0XqsO`{goQ_RXIa2pxZ
zq6cUfJwokzh@k#%Tb%E}@0|0U?<@Ebe7uz-8fgj5Ff!S_eZ%mRC8v@PaER%QE330A
z1&L6y-s{<o`gXh9uG!ahKSvy^lmeVkcKUKmv#12{Qgz<smEn%^EluW7NTZV{EX<;q
z%wVxZflZ1|$``gj@gW1fC)V{1m#z3Sx=V65p&z(p`b1u_ECHuQMO}&s`2{;UApV~#
zBQBN}=Ur-}?$Q|i4xM-3RMVuz6&*a>h+k`jgqF~-8Kc4kRTikR%&ExLAjKIu&PCb_
j$}|PJ6!#tB(4s5!PF#oZYCp`WWMif(W=Px%?BU@LuewSF

diff --git a/Implementation/src/TCPEchange.class b/Implementation/src/TCPEchange.class
index af2f31f126311d1e2a95e491ab35eea5eac66aaa..b89b7c0499602509f48a3b450645fe2066af53c4 100644
GIT binary patch
delta 155
zcmWNJ%L)Nu7=|A<|ICi2iE-#(5Gkj@2$8d7sg&cwM#*L_Mg4ngyKxKd#fA8K>#g_c
z?TMVo`5aZuH76B%X)HWaWYA<Ok)unV4ch$FJ1CH#h$~!EmafpG#)3Lq8k}Wa@ww6A
sPKyU^LIU%(UVe`_eQX9K8H#lzo-tJ>@}Ej(?3lA>$$=FY*5+yJKR9C-LjV8(

delta 155
zcmWNJISRs17zRh1mvl;$7!?C9!NM(ZM{z?DECs=}uo1*2M-g6cZ5OZLT|9_C(|yZC
zR%CsSDwfhG6*@Ks8EhO}vUud^k!M3e|J1u%BteNZ6=^-8N{bpx>TGFnrpZ;38*T3R
rJO~Ks=&$ke`@|VwG9<}JjAP17<U5t!jJdF5!CqVkR$N%?r|JFyE-Duw

diff --git a/Implementation/src/TCPEchange.java b/Implementation/src/TCPEchange.java
index f5d820a..2c67f2e 100644
--- a/Implementation/src/TCPEchange.java
+++ b/Implementation/src/TCPEchange.java
@@ -5,6 +5,7 @@ import java.io.OutputStream;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketException;
 import java.util.Scanner;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -159,7 +160,6 @@ class RunnerTCPEcoute implements Runnable {
 	            				break;
 	            			}
 	            			
-	            			
 	            		}
 	            	}
 	            	else if(line.split(":")[0].equals("Source")) {
@@ -180,14 +180,16 @@ class RunnerTCPEcoute implements Runnable {
 	            	
 	            
 	            }
-	            System.out.println("Finishing thread");
-	            app.getHist(u2.getPseudo()).afficher10derniers();
-	            
-	            
-	            	in.close();
-					link.close();
+	            in.close();
+	            link.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					//e.printStackTrace();
+				} finally {
+					System.out.println("Finishing thread");
+					System.out.println("Affichage de l'histo");
+		            app.getHist(u2.getPseudo()).afficher10derniers(); 
+		            	
+						
 				}
 	       
 	        }