HeroOfTheWinds/CS-350-410-431-Group-Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added code to prevent spawning of multiple TcpListeners on the same port. Also fixed a bug where the server was asking for a string for the message to be sent multiple times

Browse Source
This commit is contained in:
Kyle 2016-04-10 20:12:14 -10:00
parent 92049fa1c8
commit 6861889a8d
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Server application/Server application/ChatServer.cs
View File

@ -14,6 +14,9 @@ namespace Server_application
{
class ChatServer : TCPServer
{
protected static TcpListener listener = null;
protected static bool listenerStarted = false;
private static uint currentID = 0;
public static readonly object IDLock = new object();
private Dictionary<TcpClient, string> clientList = new Dictionary<TcpClient, string>();
@ -54,16 +57,21 @@ namespace Server_application
public override void startServer()
{
//attempts to start listener on chat port
try
if (!listenerStarted)
{
listener = new TcpListener(IPAddress.Any, port);
listener.Start();
}
//displays error box if unable to start server
catch (SocketException e)
{
MessageBox.Show("A network error has occured.", "Unable to start chat server.", MessageBoxButtons.OK, MessageBoxIcon.Error);
try
{
listener = new TcpListener(IPAddress.Any, port);
listener.Start();
listenerStarted = true;
}
//displays error box if unable to start server
catch (SocketException e)
{
MessageBox.Show("A network error has occured.", "Unable to start chat server.", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
//server control loop
while (running)
{
@ -106,10 +114,10 @@ namespace Server_application
//checks if data is available on the clients stream
if (inStream.DataAvailable)
{
message = reader.ReadLine();
//sends data to all clients in chat
foreach (KeyValuePair<TcpClient, string> c in clientList)
{
message = "";
string clientName;
//creates StreamWriter for current outgoing client
@ -117,7 +125,6 @@ namespace Server_application
writer = new StreamWriter(outStream);
//appends sender name to beginning of message
clientList.TryGetValue(thisClient, out clientName);
message = reader.ReadLine();
//writes sender and message to outgoing stream
writer.WriteLine(clientName + ": " + message.ToString());
writer.Flush();

26
Server application/Server application/MainServer.cs
View File

@ -13,6 +13,9 @@ namespace Server_application
{
class MainServer : TCPServer
{
protected static TcpListener listener = null;
protected static bool listenerStarted = false;
//dictionary of connected clients by clientID
private Dictionary<uint, TcpClient> clientList = new Dictionary<uint, TcpClient>();
private bool running = true;
@ -23,17 +26,20 @@ namespace Server_application
public override void startServer()
{
//attempts to start listener on chat port
try
//attempts to start listener on chat port
if (!listenerStarted)
{
//possible issues with conflicts if multiple chat servers running, to be fixed later
listener = new TcpListener(IPAddress.Any, port);
listener.Start();
}
//displays error box if unable to start server
catch (SocketException e)
{
MessageBox.Show("A network error has occured.", "Unable to start chat server.", MessageBoxButtons.OK, MessageBoxIcon.Error);
try
{
//possible issues with conflicts if multiple chat servers running, to be fixed later
listener = new TcpListener(IPAddress.Any, port);
listener.Start();
}
//displays error box if unable to start server
catch (SocketException e)
{
MessageBox.Show("A network error has occured.", "Unable to start chat server.", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
//main server control
while (running)