diff --git a/Projet.jar b/Projet.jar index 9afed3e..5cbe56c 100644 Binary files a/Projet.jar and b/Projet.jar differ 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) {