From 9d55a5700e89061b9076ddc6c1b0d6ca6dcca8d3 Mon Sep 17 00:00:00 2001 From: Metatheria Date: Mon, 15 Feb 2021 15:20:11 +0100 Subject: [PATCH] outdoor users(16) --- Projet.jar | Bin 19738 -> 19393 bytes src/chat/NetworkClient.java | 6 ++++-- src/chat/OutdoorListenerThread.java | 1 - src/chat/ReceiveThread.java | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Projet.jar b/Projet.jar index 9afed3e1a1b0ebd2b5ec90043003f2c0e5b6378f..5cbe56cb96ea3cab3086bcfe199204411c6cbe3d 100644 GIT binary patch delta 11897 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 I?0+NvA2ns;r2qf` delta 12213 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 T0m591Cq~JzAka(w&-MQg`Ub^k diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java index 53b6de0..e21a6ba 100644 --- a/src/chat/NetworkClient.java +++ b/src/chat/NetworkClient.java @@ -203,21 +203,23 @@ public class NetworkClient { void send (Notification notif) { + System.out.println("Indoor users:"); for(Socket s:dest_sockets) { try { - //System.out.println(s.getInetAddress().getHostAddress() + ": local port " + s.getLocalPort() + ", remote port " + s.getPort()); + System.out.println(s.getInetAddress().getHostAddress() + ": local port " + s.getLocalPort() + ", remote port " + s.getPort()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); out.writeObject(notif); } catch(IOException e){} } + System.out.println("Outdoor users:"); for(Socket s:outdoor_dest_sockets) { try { - //System.out.println(s.getInetAddress().getHostAddress() + ": local port " + s.getLocalPort() + ", remote port " + s.getPort()); + System.out.println(s.getInetAddress().getHostAddress() + ": local port " + s.getLocalPort() + ", remote port " + s.getPort()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); out.writeObject(notif); } diff --git a/src/chat/OutdoorListenerThread.java b/src/chat/OutdoorListenerThread.java index 31023cc..b4c9ea5 100644 --- a/src/chat/OutdoorListenerThread.java +++ b/src/chat/OutdoorListenerThread.java @@ -43,7 +43,6 @@ OutdoorListenerThread(User in_user, List in_known_users, List in_kn String username; String response = ""; - try { while(!exit) diff --git a/src/chat/ReceiveThread.java b/src/chat/ReceiveThread.java index 899b795..b7b6a4a 100644 --- a/src/chat/ReceiveThread.java +++ b/src/chat/ReceiveThread.java @@ -47,7 +47,6 @@ class ReceiveThread extends Thread { if(!(notif.getAuthor().equals(user)) && !notif.isRedirected()) { - System.out.println("Redirecting message"); for(Socket s:outdoor_dest_sockets) { try @@ -55,6 +54,7 @@ class ReceiveThread extends Thread { ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); notif.setRedirected(true); out.writeObject(notif); + notif.setRedirected(false); } catch(IOException e){} } @@ -141,10 +141,10 @@ class ReceiveThread extends Thread { catch(EOFException e) {} catch(SocketException e) { - /* if(!isOutdoor) + if(!isOutdoor) dest_sockets.remove(socket); else - outdoor_dest_sockets.remove(socket);*/ + outdoor_dest_sockets.remove(socket); } catch(Exception e) {