Changeset 7143 for 2015

Timestamp:

2016-04-15 19:02:35 (3 years ago)

Author:

sieerinn

Message:

Vaihto binääristä tekstimuotoiseen protokollaan.

Location:

2015/koodauskerho/sieerinn/TasohyppelyNettipeli

Files:

• . (modified) (1 prop)
• GameServer/GameServer.cs (modified) (3 diffs)
• TasohyppelyNettipeli/TasohyppelyNettipeli/NetworkConnection.cs (modified) (7 diffs)
• TasohyppelyNettipeli/TasohyppelyNettipeli/TasohyppelyNettipeli.cs (modified) (2 diffs)

2015/koodauskerho/sieerinn/TasohyppelyNettipeli

@@ -1 +1 @@
 *.suo
+*.user

@@ -1 +1 @@
 *.suo
+*.user

2015/koodauskerho/sieerinn/TasohyppelyNettipeli/GameServer/GameServer.cs

@@ -81 +81 @@
     public class Client
     {
+        private const int BLOCK_SIZE = 2048;
+
         private NetworkStream stream;
         
@@ -95 +97 @@
         }
 
+        private void ParsePacket(string packet)
+        {
+            var parts = packet.Split('\x01');
+
+            var messageType = int.Parse(parts[0]);
+            var senderGuid = new Guid(Convert.FromBase64String(parts[1]));
+            var game = parts[2];
+
+            if (messageType == 0)
+            {
+                Console.WriteLine("Game: " + game);
+                GameName = game;
+            }
+
+            GameServer.Broadcast(this, game, Encoding.ASCII.GetBytes(packet + "\x00"));
+        }
+
         private void ReceiveThread()
         {
-            var buffer = new byte[2048];
+            var buffer = new StringBuilder();
+
             while (ClientSocket.Connected)
             {
@@ -104 +124 @@
                     if (ClientSocket.Available <= 0) continue;
 
-                    var bytesRead = stream.Read(buffer, 0, 2048);
-                    var bytes = new byte[bytesRead];
-                    Buffer.BlockCopy(buffer, 0, bytes, 0, bytesRead);
+                    var receivedBytes = new byte[BLOCK_SIZE];
+                    var bytesRead = stream.Read(receivedBytes, 0, BLOCK_SIZE);
 
-                    var mstream = new MemoryStream(buffer);
-                    var reader = new BinaryReader(mstream);
-
-                    var messageType = reader.ReadByte();
-                    reader.ReadBytes(16); // read guid
-                    var gameName = reader.ReadString();
-                    if (messageType == 0)
+                    for (int i = 0; i < bytesRead; i++)
                     {
-                        Console.WriteLine("Game: " + gameName);
-                        GameName = gameName;
+                        if (receivedBytes[i] == '\x00')
+                        {
+                            ParsePacket(buffer.ToString());
+                            buffer.Clear();
+                        }
+                        else
+                        {
+                            buffer.Append((char)receivedBytes[i]);
+                        }
                     }
-                    GameServer.Broadcast(this, gameName, bytes);
                 }
                 catch (Exception)

2015/koodauskerho/sieerinn/TasohyppelyNettipeli/TasohyppelyNettipeli/TasohyppelyNettipeli/NetworkConnection.cs

@@ -2 +2 @@
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
@@ -7 +8 @@
 using System.Threading;
 using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
 
 
@@ -24 +26 @@
     private readonly TcpClient client;
     private readonly CancellationTokenSource cancelSource;
-    private NetworkStream stream;
+    private readonly string gameName;
+    private NetworkStream networkStream;
     private Thread receiveThread;
-    private string gameName;
 
     public delegate void MessageReceived(Guid id, string message);
@@ -55 +57 @@
     {
         client.Connect(ip, port); // TODO: try
-        stream = client.GetStream();
+        networkStream = client.GetStream();
         receiveThread = new Thread(() => ReceiveThread(cancelSource.Token));
         receiveThread.Start();
@@ -68 +70 @@
         cancelSource.Cancel();
         receiveThread.Join();
-        stream.Close();
+        networkStream.Close();
         client.Client.Close();
         client.Close();
@@ -74 +76 @@
     }
 
-    private void Send(MessageType type, string message="")
+    private void Send(MessageType type, string message = "")
     {
-        var mstream = new MemoryStream();
-        var writer = new BinaryWriter(mstream);
+        //var mstream = new MemoryStream();
+        //var writer = new BinaryWriter(mstream);
 
-        writer.Write((byte)type);
-        writer.Write(guidBytes, 0, guidBytes.Length);
-        writer.Write(gameName);
+        //writer.Write((byte)type);
+        //writer.Write(guidBytes, 0, guidBytes.Length);
+        //writer.Write(gameName);
+        //if (message.Length > 0)
+        //    writer.Write(message);
+
+        //var sendBytes = mstream.ToArray();
+        //var lengthBytes = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(sendBytes.Length));
+
+        //networkStream.Write(lengthBytes, 0, lengthBytes.Length);
+        //networkStream.Write(sendBytes, 0, sendBytes.Length);
+        //networkStream.Flush();
+
+        var builder = new StringBuilder();
+
+        builder.Append((int)type);
+        builder.Append('\x01');
+
+        builder.Append(Convert.ToBase64String(guidBytes));
+        builder.Append('\x01');
+
+        builder.Append(gameName);
+        builder.Append('\x01');
+
         if (message.Length > 0)
-            writer.Write(message);
+        {
+            builder.Append(message);
+            builder.Append('\x01');
+        }
 
-        var sendBytes = mstream.ToArray();
-        stream.Write(sendBytes, 0, sendBytes.Length);
-        stream.Flush();
+        builder.Append('\x00');
+
+        var bytes = Encoding.ASCII.GetBytes(builder.ToString());
+        networkStream.Write(bytes, 0, bytes.Length);
+        networkStream.Flush();
     }
 
@@ -119 +147 @@
     }
 
+    private void ParsePacket(string packet)
+    {
+        var parts = packet.Split('\x01');
+
+        var messageType = (MessageType)int.Parse(parts[0]);
+        var senderGuid = new Guid(Convert.FromBase64String(parts[1]));
+        var game = parts[2];
+
+        if (messageType == MessageType.Message && OnMessageReceive != null)
+        {
+            var message = parts[3];
+            OnMessageReceive(senderGuid, message);
+        }
+        else if (messageType == MessageType.Connected && OnConnect != null)
+        {
+            OnConnect(senderGuid);
+        }
+        else if (messageType == MessageType.Disconnected && OnDisconnect != null)
+        {
+            OnDisconnect(senderGuid);
+        }
+    }
+
     private void ReceiveThread(CancellationToken cancelToken)
     {
+        var buffer = new StringBuilder();
+
         while (!cancelToken.IsCancellationRequested)
         {
-            if (client.Available == 0) continue;
+            if (client.Available == 0)
+                continue;
 
             var receivedBytes = new byte[BLOCK_SIZE];
-            stream.Read(receivedBytes, 0, BLOCK_SIZE);
-            var mstream = new MemoryStream(receivedBytes);
-            var reader = new BinaryReader(mstream);
-            
-            var messageType = (MessageType)reader.ReadByte();
-            var senderGuid = new Guid(reader.ReadBytes(guidBytes.Length));
-            var game = reader.ReadString();
+            var bytesRead = networkStream.Read(receivedBytes, 0, BLOCK_SIZE);
 
-            if (messageType == MessageType.Message && OnMessageReceive != null)
+            for (int i = 0; i < bytesRead; i++)
             {
-                var message = reader.ReadString();
-                OnMessageReceive(senderGuid, message);
-            }
-            else if (messageType == MessageType.Connected && OnConnect != null)
-            {
-                OnConnect(senderGuid);
-            }
-            else if (messageType == MessageType.Disconnected && OnDisconnect != null)
-            {
-                OnDisconnect(senderGuid);
+                if (receivedBytes[i] == '\x00')
+                {
+                    ParsePacket(buffer.ToString());
+                    buffer.Clear();
+                }
+                else
+                {
+                    buffer.Append((char)receivedBytes[i]);
+                }
             }
         }

2015/koodauskerho/sieerinn/TasohyppelyNettipeli/TasohyppelyNettipeli/TasohyppelyNettipeli/TasohyppelyNettipeli.cs

@@ -41 +41 @@
         yhteys.OnConnect += UusiPelaaja;
         yhteys.OnDisconnect += PoistaPelaaja;
-        yhteys.Connect("192.168.0.100", 8888);
+        yhteys.Connect("192.168.0.100", 3074);
         Exiting += yhteys.Close;
 
@@ -69 +69 @@
     void UusiViesti(Guid id, string viesti)
     {
+        if (!muutPelaajat.ContainsKey(id))
+        {
+            muutPelaajat.Add(id, LuoPelaaja());
+        }
         Paketti paketti = yhteys.DeserializeFromString<Paketti>(viesti);
         muutPelaajat[id].Position = new Vector(paketti.X, paketti.Y);

@@ -1 +1 @@
 *.suo
+*.user