git-svn-id: svn://imanolbarba.net/PAD@26 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent 493ea8e7
Showing 9 changed files with 43 additions and 24 deletions
JChatClient/bin/client
JChatClient/src/client.cpp
JChatServer/bin/pad/prac2/Connection.class
JChatServer/bin/pad/prac2/MySocket.class
JChatServer/bin/pad/prac2/Server.class
JChatServer/src/pad/prac2/Connection.java
JChatServer/src/pad/prac2/JChat.java
JChatServer/src/pad/prac2/MySocket.java
JChatServer/src/pad/prac2/Server.java
@@ -124,7 +124,6 @@ void* recvThread(void* args)
 		}
 		else
 		{
-			*(t_arg->s) >> recv;
 			cout << recv << endl;
 		}
 	}
@@ -173,6 +172,7 @@ int main()
  
 /* TODO
  *
+ * disconnecting causes some real shit
  * list nicks
  * unicast message
  */
 \ No newline at end of file
 package pad.prac2;
  
+import java.io.IOException;
+
 public class Connection extends Thread
 {
 	private MySocket socket;
@@ -13,7 +15,7 @@ public class Connection extends Thread
 		sleep = true;
 	}
  
-	public void sendMessage(String message)
+	public void sendMessage(String message) throws IOException
 	{
 		socket.sendMsg(message);
 	}
@@ -67,22 +69,32 @@ public class Connection extends Thread
 					str = socket.recvMsg();
 					if(str != null)
 					{
-						if(str == "/disconnect")
-						{
-							socket.sendMsg("DISC_OK");
-							kill = true;
-							System.out.println(serv.getNickname(this) + " disconnected");
-						}
-						else if(str == "/exit")
+						try
 						{
-							socket.sendMsg("EXIT_OK");
-							kill = true;
-							System.out.println(serv.getNickname(this) + " disconnected");
+							if(str.equals("/disconnect"))
+							{
+								socket.sendMsg("DISC_OK");
+								kill = true;
+								System.out.println(serv.getNickname(this) + " disconnected");
+								break;
+							}
+							else if(str.equals("/exit"))
+							{
+								socket.sendMsg("EXIT_OK");
+								kill = true;
+								System.out.println(serv.getNickname(this) + " disconnected");
+								break;
+							}
+							else
+							{
+								System.out.println("FROM " + serv.getNickname(this) + ": " + str);
+								serv.sendToChat(this,str);
+							}
 						}
-						else
+						catch(IOException ioExc)
 						{
-							System.out.println("FROM " + serv.getNickname(this) + ": " + str);
-							serv.sendToChat(this,str);
+							System.out.println("TCP: Error writing to socket");
+							break;
 						}
 					}
 					else
@@ -31,4 +31,11 @@ public class JChat
 		});
 		serv.startServer();
 	}
+	/*
+	 * TODO
+	 * 
+	 * unicast message
+	 * list nicks
+	 * disconnect/reconnect successfully
+	 */
 }
@@ -3,15 +3,15 @@ package pad.prac2;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
+import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
  
 public class MySocket extends Socket
 {
-	private PrintWriter output;
 	private BufferedReader input;
+	private OutputStream output;
  
 	public MySocket()
 	{
@@ -36,7 +36,7 @@ public class MySocket extends Socket
 	{
 		try
 		{
-			output = new PrintWriter(super.getOutputStream());
+			output = super.getOutputStream();
 			input = new BufferedReader(new InputStreamReader(super.getInputStream()));
 		}
 		catch(IOException ioExc)
@@ -59,11 +59,11 @@ public class MySocket extends Socket
 		}
 	}
  
-	public void sendMsg(String msg)
+	public void sendMsg(String msg) throws IOException
 	{
 		String length = new Integer(msg.length()).toString();
-		this.write(length+'\0', length.length()+1);
-		this.write(msg,msg.length());
+		this.write(length + '\0');
+		this.write(msg);
 	}
  
 	public String recvMsg()
@@ -80,9 +80,9 @@ public class MySocket extends Socket
 		return str;
 	}
  
-	public void write(String str, int bytes)
+	public void write(String str) throws IOException
 	{
-		output.print(str.substring(0,bytes));
+		output.write(str.getBytes());
 	}
  
 	public String read(int bytes)
@@ -44,7 +44,7 @@ public class Server
 		}
 	}
  
-	public void sendToChat(Connection origin, String message)
+	public void sendToChat(Connection origin, String message) throws IOException
 	{
 		lock.lock();
 		String nickname = activeConnections.get(origin);