From a9b579af6133a24c1968559f18aef218aa9e60f4 Mon Sep 17 00:00:00 2001
From: Metatheria <farina@etud.insa-toulouse.fr>
Date: Mon, 30 Nov 2020 15:13:21 +0100
Subject: [PATCH] bugfixes

---
 src/{ => chat}/Message.java  |   1 +
 src/{ => chat}/User.java     |   1 +
 src/chat/socket_client.class | Bin 0 -> 1658 bytes
 src/chat/socket_client.java  |   2 +-
 src/chat/socket_server.class | Bin 0 -> 1392 bytes
 src/chat/socket_server.java  |  32 +++++++++++++++++++-------------
 6 files changed, 22 insertions(+), 14 deletions(-)
 rename src/{ => chat}/Message.java (91%)
 rename src/{ => chat}/User.java (92%)
 create mode 100644 src/chat/socket_client.class
 create mode 100644 src/chat/socket_server.class

diff --git a/src/Message.java b/src/chat/Message.java
similarity index 91%
rename from src/Message.java
rename to src/chat/Message.java
index 1f49f15..f8edf8a 100644
--- a/src/Message.java
+++ b/src/chat/Message.java
@@ -1,3 +1,4 @@
+package chat;
 public class Message {
 
 
diff --git a/src/User.java b/src/chat/User.java
similarity index 92%
rename from src/User.java
rename to src/chat/User.java
index 3ca6510..7165cf6 100644
--- a/src/User.java
+++ b/src/chat/User.java
@@ -1,3 +1,4 @@
+package chat;
 
 public class User {
 
diff --git a/src/chat/socket_client.class b/src/chat/socket_client.class
new file mode 100644
index 0000000000000000000000000000000000000000..6ad3586ee4c0cc6e07a35754453a2b113350b192
GIT binary patch
literal 1658
zcmaJ>?NZxD6g_KfWK<;tgGmg<F)bu^LhLsE#%bE(LgU8ZBqpXLZBrpHpjg&=q%~9C
zq;JsQ$qzgeX8HjA*@x)QK0@hT$pq23^^B#}?z!ild-v@A{`afj0F?2Qju=KX#0?}c
z%5dqqd0>_t)7>l8cb;=gGK}7_U0dE|7|9o!V@P65gKpq080X-PLtpX^p+t{@(zSrd
z7NrNC?aGGqxY;QuagpJ2MYt|8+wNXYik#2A1MU@zMIDzgp&?~p5>pJ5LkJkOuA*~X
z%8(CJ1X_uo=*oqrhG~ZJAk^iu)DTvi%OtKaj5)$Goqgd;9cj#{dS@A?hp<!&%_Qa+
zW><Y_?l`u;ucTH>^_(A+;geVmS1I^Z;!1CKmwUYRh?_0$X_#looUT>fZf{V3xUAB@
zYhVG33>Wvfi~y)P`NHeYMHb3Ba=5NE=NYaHG*fe<kU~>O7B>{=CbjPj6s8TDbL-!I
z-STY7Jte7R;61!g%_B+mo_sA@<vY_9T_I6R_(0|RkYVO5-#N^a&@&$!_ynIa#B8;7
z|50KV%LaM!4nvac(yG}mXP7$89^L2^nfI=NFYqO`tYfx0dCD^7mM!;bMBC;{pW)h&
z%^j2yB~xXP@hXwtRO_ohTf8f6;U=-l5O?kNyoPTWF8G0^o>`8~T{3#SB3h(!T#4Q2
zb#}P7NuHsZc*j(=PUoKv^C=NEq-nL+&2E6#utDjEKpFIg=y?`jvlVOVT>7Fi8J)rv
zAtZUz?5=aUFIxWiC>lC8@mNDsb!m%XA@E~Rw(TB>HZO%|CT!fAX-VN7GW-&4*#H=l
z-ZR~n!~KPt5ba*K{AN*+nR9`ghh07d9<4RJYRb{Q8BkPA$7zs7>FU@fTU2V*)s4+%
z#$Z(G67edI>HFN*@IAxg8x;-{uHi?9?EgdQ&I_x=Jl5!bRKFM)8GV$V_vmYm-i+Rf
z8-1`BG+?OGQ!N7q#_%of(^x_O48j2M5?boQ5yp>^-cDVfi2u<?rluy}4kokP$H;Bp
zJi<GDT<fE-evBpcS&a8_d*c}4`b&HiE-%M3@gsb;oVb-qyu#<e5x)BM<gbA6Ya)CR
zNa5gEA?-@sZ4w4d&;_2N<333>Owox?Q|vSzAcHN;U<b1lF^64Tg-g}fC}I(@69ObO
vtZPVX$ZA-kCvZXpjAqqi1tX{vI7Y~a^iERxNA&*=Pv}dh(Np|@XUO~mY~rp-

literal 0
HcmV?d00001

diff --git a/src/chat/socket_client.java b/src/chat/socket_client.java
index fb31fe4..07186e4 100644
--- a/src/chat/socket_client.java
+++ b/src/chat/socket_client.java
@@ -1,4 +1,4 @@
-package chat;
+//package chat;
 import java.net.*;
 
 import java.io.BufferedReader;
diff --git a/src/chat/socket_server.class b/src/chat/socket_server.class
new file mode 100644
index 0000000000000000000000000000000000000000..294f771dce76bf99945a0c97cf7d174fa5aef63f
GIT binary patch
literal 1392
zcmZux*-{fh6g>?g9m0eqED{tAiWo!__l3CPiUy)aQBcbol7<=yGt^{)`lR3C2gtKN
z1WT&?03UtzPb^D3JqeJgNmb8u-`n?`bLVt_`~BrBfHa<m(S&A+fPoeS1v+1vt7fWb
z+KZ{|{7aSh1cDbV+wv|6G$%%9!U&;NB5a@yhCtU&`h?>Ym1zseRkK)D*#&{V#N24+
zpNzCbyFjnMZYwX9Q|_vAb54Fqd0|A*si|}c1QL^@Gp*=Gk3_G5KJ03smwQw4)G}E)
zWs>Zz;#f}Vo@?1&&U2NyoDLx-(0}!nX?d2t7|%PlO-Ytx$CJrqJdEAgBQa=TFZKy^
z`-~bZP|b?2SER1qM4c7_uwq&_B!VFW`*DDsGV^)0LN?urnr>g8uZ&y{3PiWL6im<b
zSx6jWr?#*s$_oq1RfPx2EGSoER3Nq$o3vNTHD%Rs7-KjhanwK(DS?iimimwa?TgB*
z+a<7Tix_3r1=3+8a9sEO1p8If`B#dTI)YO=>9kh3-S8?GwnF0U-(7s{TAp$>&+`Vx
zktRt}%9g!tB^s~RECSX?Na_qOYCL*xU<a=uXRd0=D+aD&Lco}>x^PBY(0A;dW_{hj
z4crt6(G`V^Wi!;Xh3b2~_BlhiP2Z{47L7QDI|lCRGtrVSIwd7BRi|z;d*ikK*7Q;c
zS?1W*QhZ3_zCfhpcmGAn_ciNXa|#6P(74m(<$2{kH0O(42`rlyebtwE`aff_P|h>+
zOH<~GpD*!*`2R_jm}@*3zBL8HIj8LA)lExdMH@&ZwNo&Jdp!L5*90m+kmCc+2Kf|x
zwj5rE_{bN597i1nTKRv7M|@|h800p|)pyOGAu}6@%ytF7ucKq?6Qa@n3I>i;5TDkQ
zVNNzMGP{Aq?9mEX`q(;7jt4eyM$gX$)^TCHWvqhB?=c(;RB&xP7z;*keL!14*Iq*#
z%fx~#v$pwzJ0{m)WOU_eE`9X5m9UBo#b~y75arlTejVuKzaL!`7R5ncDCg0GTf9)F
zx%vn(Ji`DA*n=W799{+`9AKq5Uh!DJ#V}@A=_G=i+!T~}ED@53NQ_C0NO}~%^ffa3
V6S8SjcZn%_$b?AhDYrJ^*&jN^N8SJc

literal 0
HcmV?d00001

diff --git a/src/chat/socket_server.java b/src/chat/socket_server.java
index d6b1415..cdda7b3 100644
--- a/src/chat/socket_server.java
+++ b/src/chat/socket_server.java
@@ -1,31 +1,37 @@
-package chat; 
+//package chat; 
 import java.net.*;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
-public class mySocketClient {
-    public static void main (String [] args)
+public class socket_server {
+	public static void main (String [] args)
     {
         try
         {
-            System.out.println("Connecting to server...");
-            Socket link = new Socket("192.168.1.54", 1234);
-            System.out.println("Establishing I/O streams...");
+            Boolean exit = false;
+            ServerSocket servSocket = new ServerSocket(1234);
+            System.out.println("Awaiting connection ... ");
+            Socket link = servSocket.accept();
+            System.out.println("Awaiting data ... ");
             BufferedReader in = new BufferedReader(new InputStreamReader(link.getInputStream()));
             PrintWriter out = new PrintWriter(link.getOutputStream(),true);
-            BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
-            while(true)
+            
+            while(!exit)
             {
-                String message = console.readLine();
-                out.println("CLIENT:" + message);
+                String message = in.readLine();
+                if(message == "exit")
+                    exit = true;
+                else
+                    System.out.println(message);
             }
+            link.close();
         }
         catch(IOException e)
         {
-            System.out.println("nik!");
+            System.out.println("nik !");
         }
+    }
+}