outdoor users(16)

src/chat/ConnectionListenerThread.java

@@ -62,14 +62,7 @@ public class ConnectionListenerThread extends Thread {
 					requestSocket.receive(request);
 					username = new String(request.getData(), 0, request.getLength());
 					
-					if(username.charAt(0) == '+')
+
-					{
-						username = username.substring(1);
-						outdoor = true;
-					}
-					else
-					{
-						outdoor = false;
 					InetAddress clientAddress= request.getAddress();
 					System.out.println("Received a request from " + username + "@" + clientAddress.getHostAddress());
 						
@@ -98,7 +91,7 @@ public class ConnectionListenerThread extends Thread {
 					responseBytes = response.getBytes();
 					responsePacket = new DatagramPacket(responseBytes, responseBytes.length, clientAddress, 1337);
 					responseSocket.send(responsePacket);
-					}
+					
 					accepted = true;
 					for(User a:known_users)
 					{
@@ -109,13 +102,6 @@ public class ConnectionListenerThread extends Thread {
 						accepted = accepted && (!username.equals(a.getName()));
 					}
 					if(accepted)
-					{
-						if(outdoor)
-						{
-							known_outdoor_users.add(new User(username));
-							Collections.sort(known_outdoor_users);
-						}
-						else
 					{
 						portNumber++;
 						Socket s = (new ServerSocket(portNumber)).accept();
@@ -123,7 +109,6 @@ public class ConnectionListenerThread extends Thread {
 				        dest_sockets.add(s);
 					}
 				}
-				}
 				catch(SocketTimeoutException e) {}
 	    	}
 		}

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);
     		}

src/chat/OutdoorListenerThread.java

@@ -21,7 +21,7 @@ class OutdoorListenerThread extends Thread {
 	List<User> known_outdoor_users;
 	List<Socket> dest_sockets;
 	List<Socket> outdoor_dest_sockets;
-	int portNumber;
+	int outdoorPortNumber;
 	
 OutdoorListenerThread(User in_user, List<User> in_known_users,  List<User> in_known_outdoor_users, List<Socket> in_dest_sockets, List<Socket> in_outdoor_dest_sockets,
 			JTextArea in_displayArea, JTextArea in_knownUsersPanel)
@@ -33,22 +33,16 @@ OutdoorListenerThread(User in_user, List<User> in_known_users,  List<User> in_kn
 		outdoor_dest_sockets = in_outdoor_dest_sockets;
 		displayArea = in_displayArea;
 		knownUsersPanel = in_knownUsersPanel;
-		portNumber = 2344;
+		outdoorPortNumber = 2344;
 	}
 	public void run()
 	{
 		boolean exit = false;
 		boolean accepted = true;
 
-		String notification;
 		String username;
 		String response = "";
 		
-		byte[] buffer = new byte[100];
-		DatagramPacket notifPacket = new DatagramPacket(buffer, buffer.length);
-		DatagramSocket notifSocket;
-		byte[] notifBytes;
-		
 		try
 		{
 			while(!exit)
@@ -75,7 +69,7 @@ OutdoorListenerThread(User in_user, List<User> in_known_users,  List<User> in_kn
 						response += u.getName() + " ";
 					}
 					response = response.trim();
-					response += ";" + (portNumber+1);
+					response += ";" + (outdoorPortNumber+1);
 					
 					out.println(response);
 					
@@ -90,14 +84,8 @@ OutdoorListenerThread(User in_user, List<User> in_known_users,  List<User> in_kn
 					}
 					if(accepted)
 					{
-						notification = "+" + username;
+						outdoorPortNumber++;
-						notifBytes = notification.getBytes();
+						Socket s = (new ServerSocket(outdoorPortNumber)).accept();
-						notifSocket = new DatagramSocket();
-						notifPacket = new DatagramPacket(notifBytes, notifBytes.length, InetAddress.getByName("192.168.1.255"), 1234);
-						notifSocket.send(notifPacket);
-						
-						portNumber++;
-						Socket s = (new ServerSocket(portNumber)).accept();
 						(new ReceiveThread(user, s, displayArea, known_users, known_outdoor_users, knownUsersPanel, dest_sockets, outdoor_dest_sockets, true)).start();
 			        	outdoor_dest_sockets.add(s);
 					}

src/chat/ReceiveThread.java

@@ -1,6 +1,7 @@
 package chat;
 
 import java.io.EOFException;
+import java.net.SocketException;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -46,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
@@ -54,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){}
 				    	}
@@ -90,6 +91,8 @@ class ReceiveThread extends Thread {
 				            
 				            if(!dn.isRedirected() && !dn.getAuthor().equals(user))
 				            {
+				            	exit = true;
+				            	
 				            	socket.close();
 				            	if(!isOutdoor)
 				            	dest_sockets.remove(socket);
@@ -136,6 +139,13 @@ class ReceiveThread extends Thread {
 		      }
     	}
 		catch(EOFException e) {}
+		catch(SocketException e)
+		{
+            	if(!isOutdoor)
+            	dest_sockets.remove(socket);
+            	else
+            	outdoor_dest_sockets.remove(socket);
+		}
 		catch(Exception e)
     	{
     		e.printStackTrace();