Added the echo method for template checksum handling (idea from Hegemons_Login_Analysis page) to the CheckSumServer, but currently it is comment out as enabling it would mean that any version of client could connect which is very likely to lead to problem with pre 1.15 version clients.

3 files changed, 26 insertions, 126 deletions

diff --git a/OpenSim.RegionServer/CheckSumServer.cs b/OpenSim.RegionServer/CheckSumServer.cs
deleted file mode 100644
index 353383a..0000000
--- a/OpenSim.RegionServer/CheckSumServer.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;

-using System.Text;

-using System.IO;

-using System.Threading;

-using System.Net;

-using System.Net.Sockets;

-using System.Timers;

-using System.Reflection;

-using System.Collections;

-using System.Collections.Generic;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.world;

-using OpenSim.Terrain;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.UserServer;

-using OpenSim.Assets;

-using OpenSim.CAPS;

-using OpenSim.Framework.Console;

-using Nwc.XmlRpc;

-using OpenSim.Servers;

-using OpenSim.GenericConfig;

-

-

-namespace OpenSim

-{

-    public class CheckSumServer : UDPServer

-    {

-        public CheckSumServer(int port, ConsoleBase console)

-        {

-            listenPort = port;

-            this.m_console = console;

-        }

-

-        protected override void CreatePacketServer()

-        {

-

-        }

-

-        public override void RegisterPacketServer(PacketServer server)

-        {

-

-        }

-

-        protected override void OnReceivedData(IAsyncResult result)

-        {

-            ipeSender = new IPEndPoint(IPAddress.Any, 0);

-            epSender = (EndPoint)ipeSender;

-            Packet packet = null;

-            int numBytes = Server.EndReceiveFrom(result, ref epSender);

-            int packetEnd = numBytes - 1;

-

-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);

-

-            // do we already have a circuit for this endpoint

-            if (packet.Type == PacketType.SecuredTemplateChecksumRequest)

-            {

-                SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;

-                TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();

-                checkreply.DataBlock.Checksum = 180572585;

-                checkreply.DataBlock.Flags = 0;

-                checkreply.DataBlock.MajorVersion = 1;

-                checkreply.DataBlock.MinorVersion = 15;

-                checkreply.DataBlock.PatchVersion = 0;

-                checkreply.DataBlock.ServerVersion = 2;

-                checkreply.TokenBlock.Token = checksum.TokenBlock.Token;

-                this.SendPacket(checkreply, epSender);

-

-            }

-            else

-            { // invalid client

-              //  Console.Error.WriteLine("CheckSumServer.cs:OnReceivedData() - WARNING: Got a invalid packet from an invalid client - " + epSender.ToString());

-            }

-

-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

-        }

-

-        protected override void AddNewClient(Packet packet)

-        {

-        }

-

-        private void SendPacket(Packet Pack, EndPoint endp)

-        {

-            if (!Pack.Header.Resent)

-            {

-                // Set the sequence number

-

-                Pack.Header.Sequence = 1;

-

-            }

-            byte[] ZeroOutBuffer = new byte[4096];

-            byte[] sendbuffer;

-            sendbuffer = Pack.ToBytes();

-

-            try

-            {

-                if (Pack.Header.Zerocoded)

-                {

-                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);

-                    this.SendPackTo(ZeroOutBuffer, packetsize, SocketFlags.None, endp);

-                }

-                else

-                {

-                    this.SendPackTo(sendbuffer, sendbuffer.Length, SocketFlags.None, endp); 

-                }

-            }

-            catch (Exception)

-            {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " );

-                

-            }

-        }

-

-        private void SendPackTo(byte[] buffer, int size, SocketFlags flags, EndPoint endp)

-        {

-            this.Server.SendTo(buffer, size, flags, endp);

-        }

-    }

-}

diff --git a/OpenSim.Servers/CheckSumServer.cs b/OpenSim.Servers/CheckSumServer.cs
index dc83192..2f79b7a 100644
--- a/OpenSim.Servers/CheckSumServer.cs
+++ b/OpenSim.Servers/CheckSumServer.cs
@@ -38,21 +38,42 @@ namespace OpenSim.Servers
             // do we already have a circuit for this endpoint

             if (packet.Type == PacketType.SecuredTemplateChecksumRequest)

             {

+               

                 SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;

-                TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();

+               TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();

                 checkreply.DataBlock.Checksum = 180572585;

                 checkreply.DataBlock.Flags = 0;

                 checkreply.DataBlock.MajorVersion = 1;

                 checkreply.DataBlock.MinorVersion = 15;

                 checkreply.DataBlock.PatchVersion = 0;

-                checkreply.DataBlock.ServerVersion = 2;

+                checkreply.DataBlock.ServerVersion = 0;

                 checkreply.TokenBlock.Token = checksum.TokenBlock.Token;

                 this.SendPacket(checkreply, epSender);

 

+                /*

+                //if we wanted to echo the the checksum/ version from the client (so that any client worked)

+                SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();

+                checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;

+                this.SendPacket(checkrequest, epSender);

+                 */

+                 

+            }

+            else if (packet.Type == PacketType.TemplateChecksumReply)

+            {

+                TemplateChecksumReplyPacket checksum = (TemplateChecksumReplyPacket)packet;

+                TemplateChecksumReplyPacket checkreply2 = new TemplateChecksumReplyPacket();

+                checkreply2.DataBlock.Checksum = checksum.DataBlock.Checksum;

+                checkreply2.DataBlock.Flags = checksum.DataBlock.Flags;

+                checkreply2.DataBlock.MajorVersion = checksum.DataBlock.MajorVersion;

+                checkreply2.DataBlock.MinorVersion = checksum.DataBlock.MinorVersion;

+                checkreply2.DataBlock.PatchVersion = checksum.DataBlock.PatchVersion;

+                checkreply2.DataBlock.ServerVersion = checksum.DataBlock.ServerVersion;

+                checkreply2.TokenBlock.Token = checksum.TokenBlock.Token;

+                this.SendPacket(checkreply2, epSender);

+                

             }

             else

-            { // invalid client

-                //  Console.Error.WriteLine("CheckSumServer.cs:OnReceivedData() - WARNING: Got a invalid packet from an invalid client - " + epSender.ToString());

+            { 

             }

 

             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

diff --git a/OpenSim.Servers/UDPServerBase.cs b/OpenSim.Servers/UDPServerBase.cs
index bdbc772..e7feb01 100644
--- a/OpenSim.Servers/UDPServerBase.cs
+++ b/OpenSim.Servers/UDPServerBase.cs
@@ -15,7 +15,6 @@ namespace OpenSim.Servers
 {

     public class UDPServerBase

     {

-

         public Socket Server;

         protected IPEndPoint ServerIncoming;

         protected byte[] RecvBuffer = new byte[4096];

@@ -48,7 +47,7 @@ namespace OpenSim.Servers
         {

         }

 

-        public void ServerListener()

+        public virtual void ServerListener()

         {

 

             ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);