farina/COO-farina-vincent
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

outdoor users(16)

Browse source
This commit is contained in:
Louis Farina 2021-02-15 15:20:11 +01:00
parent b03bb2a335
commit 9d55a5700e
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Projet.jar
View file

Binary file not shown.

6
src/chat/NetworkClient.java
View file

@ -203,21 +203,23 @@ public class NetworkClient {
void send (Notification notif) void send (Notification notif)
{ {
System.out.println("Indoor users:");
for(Socket s:dest_sockets) for(Socket s:dest_sockets)
{ {
try 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()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
out.writeObject(notif); out.writeObject(notif);
} }
catch(IOException e){} catch(IOException e){}
} }
System.out.println("Outdoor users:");
for(Socket s:outdoor_dest_sockets) for(Socket s:outdoor_dest_sockets)
{ {
try 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()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
out.writeObject(notif); out.writeObject(notif);
} }

1
src/chat/OutdoorListenerThread.java
View file

@ -43,7 +43,6 @@ OutdoorListenerThread(User in_user, List<User> in_known_users, List<User> in_kn
String username; String username;
String response = ""; String response = "";
try try
{ {
while(!exit) while(!exit)

6
src/chat/ReceiveThread.java
View file

@ -47,7 +47,6 @@ class ReceiveThread extends Thread {
if(!(notif.getAuthor().equals(user)) && !notif.isRedirected()) if(!(notif.getAuthor().equals(user)) && !notif.isRedirected())
{ {
System.out.println("Redirecting message");
for(Socket s:outdoor_dest_sockets) for(Socket s:outdoor_dest_sockets)
{ {
try try
@ -55,6 +54,7 @@ class ReceiveThread extends Thread {
ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
notif.setRedirected(true); notif.setRedirected(true);
out.writeObject(notif); out.writeObject(notif);
notif.setRedirected(false);
} }
catch(IOException e){} catch(IOException e){}
} }
@ -141,10 +141,10 @@ class ReceiveThread extends Thread {
catch(EOFException e) {} catch(EOFException e) {}
catch(SocketException e) catch(SocketException e)
{ {
/* if(!isOutdoor) if(!isOutdoor)
dest_sockets.remove(socket); dest_sockets.remove(socket);
else else
outdoor_dest_sockets.remove(socket);*/ outdoor_dest_sockets.remove(socket);
} }
catch(Exception e) catch(Exception e)
{ {