diff options
| author | Dor Bivas <dor1_b@walla.com> | 2014-03-29 20:48:17 +0300 |
|---|---|---|
| committer | Dor Bivas <dor1_b@walla.com> | 2014-03-29 20:48:28 +0300 |
| commit | f30a75c69f371ca8cf964181ae8e757d95419d1b (patch) | |
| tree | 988c7ca91b07524039c0dca99ea2a071b4c5ca84 | |
| parent | 3e6edd995e1e705f6470f77bfe07c914511e2f49 (diff) | |
Server: nick collision in sensitive, connection msg sent after rely
connecting
| -rw-r--r-- | src/Client/ChatClientReader.java | 3 | ||||
| -rw-r--r-- | src/Server/Client.java | 1 | ||||
| -rw-r--r-- | src/Server/CommandsTable.java | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/Client/ChatClientReader.java b/src/Client/ChatClientReader.java index 487676a..c5a279a 100644 --- a/src/Client/ChatClientReader.java +++ b/src/Client/ChatClientReader.java @@ -54,7 +54,10 @@ public class ChatClientReader extends Thread else if (!client.getConnected()) { if (parsed.get("command").compareTo("001") == 0) + { client.joinChannel(); + ui.outputWriter("You've conected succesefully to the server!"); + } else if (parsed.get("command").compareTo("433") == 0) { System.err.println("fixing nick collision"); diff --git a/src/Server/Client.java b/src/Server/Client.java index 35cfefc..04a9514 100644 --- a/src/Server/Client.java +++ b/src/Server/Client.java @@ -32,6 +32,7 @@ public class Client /** set nick name if it does not exist. */ public boolean setNick(String newNick) { + newNick = newNick.toLowerCase(); if (!ChatServer.server.addNick(newNick)) { return false; diff --git a/src/Server/CommandsTable.java b/src/Server/CommandsTable.java index 966b67f..d9bbea8 100644 --- a/src/Server/CommandsTable.java +++ b/src/Server/CommandsTable.java @@ -64,7 +64,7 @@ abstract class Command public void printUser(Client client,Client sender, String str) { try { - client.println(":" + sender.getNick() + "!" + client.getUsername() + "@" + client.getHostname() + " " + str); + client.println(":" + sender.getNick() + "!" + sender.getUsername() + "@" + sender.getHostname() + " " + str); } catch (IOException e) { System.err.println("Failed to print to client socket: <" + str + "> (" + e + ")"); } |