From 274ce6987e0b017800ddb62fe65143e0d5e1cae5 Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 19 May 2007 18:32:01 +0000
Subject: Border crossing back to mostly working, still seems a problem in that
 you need to stop walking just after you cross the border for it to work
 properly (else you will continue moving into a negative position in the first
 sim)

---
 OpenSim.Servers/CheckSumServer.cs | 34 +++++++++++++---------------------
 OpenSim.Servers/UDPServerBase.cs  |  9 ++-------
 2 files changed, 15 insertions(+), 28 deletions(-)

(limited to 'OpenSim.Servers')

diff --git a/OpenSim.Servers/CheckSumServer.cs b/OpenSim.Servers/CheckSumServer.cs
index f0b4124..ae1724f 100644
--- a/OpenSim.Servers/CheckSumServer.cs
+++ b/OpenSim.Servers/CheckSumServer.cs
@@ -17,12 +17,11 @@ namespace OpenSim.Servers
 {
     public class CheckSumServer : UDPServerBase
     {
-        protected ConsoleBase m_console;
+        //protected ConsoleBase m_console;
 
-        public CheckSumServer(int port, ConsoleBase console)
+        public CheckSumServer(int port)
+            : base(port)
         {
-            listenPort = port;
-            this.m_console = console;
         }
 
         protected override void OnReceivedData(IAsyncResult result)
@@ -35,10 +34,8 @@ namespace OpenSim.Servers
 
             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;
@@ -55,23 +52,21 @@ namespace OpenSim.Servers
                 SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();
                 checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;
                 this.SendPacket(checkrequest, epSender);
-                 */
-
+                */
             }
             else if (packet.Type == PacketType.TemplateChecksumReply)
             {
                 //echo back the client checksum reply (Hegemon's method)
-                TemplateChecksumReplyPacket checksum = (TemplateChecksumReplyPacket)packet;
+                TemplateChecksumReplyPacket checksum2 = (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;
+                checkreply2.DataBlock.Checksum = checksum2.DataBlock.Checksum;
+                checkreply2.DataBlock.Flags = checksum2.DataBlock.Flags;
+                checkreply2.DataBlock.MajorVersion = checksum2.DataBlock.MajorVersion;
+                checkreply2.DataBlock.MinorVersion = checksum2.DataBlock.MinorVersion;
+                checkreply2.DataBlock.PatchVersion = checksum2.DataBlock.PatchVersion;
+                checkreply2.DataBlock.ServerVersion = checksum2.DataBlock.ServerVersion;
+                checkreply2.TokenBlock.Token = checksum2.TokenBlock.Token;
                 this.SendPacket(checkreply2, epSender);
-
             }
             else
             {
@@ -80,16 +75,13 @@ namespace OpenSim.Servers
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
         }
 
-
         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();
diff --git a/OpenSim.Servers/UDPServerBase.cs b/OpenSim.Servers/UDPServerBase.cs
index e7feb01..a308052 100644
--- a/OpenSim.Servers/UDPServerBase.cs
+++ b/OpenSim.Servers/UDPServerBase.cs
@@ -24,8 +24,9 @@ namespace OpenSim.Servers
         protected AsyncCallback ReceivedData;
         protected int listenPort;
 
-        public UDPServerBase()
+        public UDPServerBase(int port)
         {
+            listenPort = port;
         }
 
         protected virtual void OnReceivedData(IAsyncResult result)
@@ -38,8 +39,6 @@ namespace OpenSim.Servers
 
             packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
 
-
-
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
         }
 
@@ -60,14 +59,10 @@ namespace OpenSim.Servers
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
         }
 
-
         public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
         {
-            // find the endpoint for this circuit
 
         }
-
-
     }
 }
 
-- 
cgit v1.1