add xo_app_client

modify multi_server, add disconnect handler features
Deer-WarLord · Jun 21, 2012 · 4f86bcd · 4f86bcd
1 parent 29664c8
commit 4f86bcd
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 12 deletions.
diff --git a/MultiServer/MultiServer.suo b/MultiServer/MultiServer.suo
diff --git a/MultiServer/MultiServer/Actions/NullAction.cs b/MultiServer/MultiServer/Actions/NullAction.cs
@@ -9,10 +9,21 @@ public class NullAction:IAction
     {
         private IConnection m_sender;
         private string m_input_data;
+        private string m_message;
+
+        public NullAction()
+        {
+            m_message = "{\"error\":\"error\"}";
+        }
+
+        public NullAction(string message)
+        {
+            m_message = message;
+        }
 
         public void Execute()
         {
-            //stud
+            m_sender.Send(m_message);
         }
 
         public IConnection Sender

diff --git a/MultiServer/MultiServer/Connections/AppSocketConnection.cs b/MultiServer/MultiServer/Connections/AppSocketConnection.cs
@@ -75,30 +75,44 @@ private void onDataReceived(DataReceivedEventArgs e)
 
         private void listen()
         {
-            ConnectionSocket.BeginReceive(dataBuffer, 0, dataBuffer.Length, 0, readData, null);
+            try
+            {
+                ConnectionSocket.BeginReceive(dataBuffer, 0, dataBuffer.Length, 0, readData, null);
+            }
+            catch 
+            {
+                var handler = Disconnected;
+
+
+                if (handler != null)
+                { Disconnected(this, EventArgs.Empty); };
+            }
         }
 
         private void readData(IAsyncResult ar)
         {
-            int sizeOfReceivedData = ConnectionSocket.EndReceive(ar);
+            try
+            {
+                int sizeOfReceivedData = ConnectionSocket.EndReceive(ar);
 
 
-            if (sizeOfReceivedData > 0)
-            {
-                dataString.Append(Encoding.UTF8.GetString(dataBuffer, 0, dataBuffer.Length));
-                int size = Encoding.UTF8.GetBytes(dataString.ToString().ToCharArray()).Length;
-                onDataReceived(new DataReceivedEventArgs(size, dataString.ToString()));
-                dataString = new StringBuilder();
-                listen();
+                if (sizeOfReceivedData > 0)
+                {
+                    dataString.Append(Encoding.UTF8.GetString(dataBuffer, 0, sizeOfReceivedData));
+                    int size = Encoding.UTF8.GetBytes(dataString.ToString().ToCharArray()).Length;
+                    onDataReceived(new DataReceivedEventArgs(size, dataString.ToString()));
+                    dataString = new StringBuilder();
+                    listen();
+                }
+
             }
-            else
+            catch(SocketException)
             {
                 var handler = Disconnected;
 
 
                 if (handler != null)
                 { Disconnected(this, EventArgs.Empty); }
-
             }
 
         }

diff --git a/MultiServer/MultiServer/Game.cs b/MultiServer/MultiServer/Game.cs
@@ -42,6 +42,21 @@ private void onDataReceived(IConnection sender, DataReceivedEventArgs e)
         private void onDisconnect(IConnection sender, EventArgs e)
         {
             Console.WriteLine(sender.GUID + " disconnected");
+            int index = UserListStorage.inactiveUsers.FindIndex((current_user) => { return current_user.Connection.GUID == sender.GUID; });
+
+            if (index == -1)
+            {
+
+                int pair_index = UserListStorage.activeUsers.FindIndex((current_pair) =>
+                {
+                    return (current_pair.User1.Connection.GUID == sender.GUID || current_pair.User2.Connection.GUID == sender.GUID);
+                });
+
+                IConnection notify_sender = (UserListStorage.activeUsers[pair_index].User1.Connection.GUID == sender.GUID) ?
+                    UserListStorage.activeUsers[pair_index].User2.Connection : UserListStorage.activeUsers[pair_index].User1.Connection;
+
+                notify_sender.Send("{\"error\":\"your opponent disconnected\"}");
+            }
         }
 
         private void onConnect(IConnection sender, EventArgs e)

diff --git a/MultiServer/MultiServer/bin/Debug/MultiServer.dll b/MultiServer/MultiServer/bin/Debug/MultiServer.dll
diff --git a/MultiServer/MultiServer/bin/Debug/MultiServer.pdb b/MultiServer/MultiServer/bin/Debug/MultiServer.pdb
diff --git a/MultiServer/MultiServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MultiServer/MultiServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/MultiServer/MultiServer/obj/Debug/MultiServer.csproj.FileListAbsolute.txt b/MultiServer/MultiServer/obj/Debug/MultiServer.csproj.FileListAbsolute.txt
@@ -3,3 +3,8 @@ c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\MultiServer\bin
 c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\MultiServer\bin\Debug\MultiServer.pdb
 c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\MultiServer\obj\Debug\MultiServer.dll
 c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\MultiServer\obj\Debug\MultiServer.pdb
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\MultiServer\bin\Debug\MultiServer.dll
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\MultiServer\bin\Debug\MultiServer.pdb
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\MultiServer\obj\Debug\ResolveAssemblyReference.cache
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\MultiServer\obj\Debug\MultiServer.dll
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\MultiServer\obj\Debug\MultiServer.pdb
diff --git a/MultiServer/MultiServer/obj/Debug/MultiServer.dll b/MultiServer/MultiServer/obj/Debug/MultiServer.dll
diff --git a/MultiServer/MultiServer/obj/Debug/MultiServer.pdb b/MultiServer/MultiServer/obj/Debug/MultiServer.pdb
diff --git a/MultiServer/ServerDebug/bin/Debug/MultiServer.dll b/MultiServer/ServerDebug/bin/Debug/MultiServer.dll
diff --git a/MultiServer/ServerDebug/bin/Debug/MultiServer.pdb b/MultiServer/ServerDebug/bin/Debug/MultiServer.pdb
diff --git a/MultiServer/ServerDebug/bin/Debug/ServerDebug.exe b/MultiServer/ServerDebug/bin/Debug/ServerDebug.exe
diff --git a/MultiServer/ServerDebug/bin/Debug/ServerDebug.pdb b/MultiServer/ServerDebug/bin/Debug/ServerDebug.pdb
diff --git a/MultiServer/ServerDebug/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MultiServer/ServerDebug/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/MultiServer/ServerDebug/obj/x86/Debug/ResolveAssemblyReference.cache b/MultiServer/ServerDebug/obj/x86/Debug/ResolveAssemblyReference.cache
diff --git a/MultiServer/ServerDebug/obj/x86/Debug/ServerDebug.csproj.FileListAbsolute.txt b/MultiServer/ServerDebug/obj/x86/Debug/ServerDebug.csproj.FileListAbsolute.txt
@@ -5,3 +5,10 @@ c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\ServerDebug\bin
 c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\ServerDebug\bin\Debug\MultiServer.pdb
 c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\ServerDebug\obj\x86\Debug\ServerDebug.exe
 c:\Users\Tioma\Documents\Visual Studio 2010\Projects\MultiServer\ServerDebug\obj\x86\Debug\ServerDebug.pdb
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\obj\x86\Debug\ServerDebug.exe
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\obj\x86\Debug\ServerDebug.pdb
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\bin\Debug\ServerDebug.exe
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\bin\Debug\ServerDebug.pdb
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\bin\Debug\MultiServer.dll
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\bin\Debug\MultiServer.pdb
+c:\Users\Tioma\Documents\Visual Studio 2010\XO\MultiServer\ServerDebug\obj\x86\Debug\ResolveAssemblyReference.cache
diff --git a/MultiServer/ServerDebug/obj/x86/Debug/ServerDebug.exe b/MultiServer/ServerDebug/obj/x86/Debug/ServerDebug.exe
diff --git a/MultiServer/ServerDebug/obj/x86/Debug/ServerDebug.pdb b/MultiServer/ServerDebug/obj/x86/Debug/ServerDebug.pdb