Start of a redesign of SimClient (now renamed ClientView)/World/Avatar/Prim , switching to a event based system (World/Avatar register as event handlers). It is possible that I've broke something with this commit but it doesn't matter as I'll just hide and no one will find me.

1 files changed, 31 insertions, 272 deletions

diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/ClientView.cs
index 3b243cf..a97049d 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/ClientView.cs
@@ -44,43 +44,31 @@ using OpenSim.Assets;
 

 namespace OpenSim

 {

-    public delegate bool PacketMethod(SimClient simClient, Packet packet);

+    public delegate bool PacketMethod(ClientView simClient, Packet packet);

 

     /// <summary>

     /// Handles new client connections

     /// Constructor takes a single Packet and authenticates everything

     /// </summary>

-    public partial class SimClient

+    public partial class ClientView : ClientViewBase

     {

         public LLUUID AgentID;

         public LLUUID SessionID;

         public LLUUID SecureSessionID = LLUUID.Zero;

         public bool m_child;

-        public uint CircuitCode;

         public world.Avatar ClientAvatar;

         private UseCircuitCodePacket cirpack;

         public Thread ClientThread;

-        public EndPoint userEP;

         public LLVector3 startpos;

-        private BlockingQueue<QueItem> PacketQueue;

-        private Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();

-        private Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();

-        //private Dictionary<LLUUID, AssetBase> UploadedAssets = new Dictionary<LLUUID, AssetBase>();

-        private System.Timers.Timer AckTimer;

-        private uint Sequence = 0;

-        private object SequenceLock = new object();

-        private const int MAX_APPENDED_ACKS = 10;

-        private const int RESEND_TIMEOUT = 4000;

-        private const int MAX_SEQUENCE = 0xFFFFFF;

+         

         private AgentAssetUpload UploadAssets;

         private LLUUID newAssetFolder = LLUUID.Zero;

         private bool debug = false;

         private World m_world;

-        private Dictionary<uint, SimClient> m_clientThreads;

+        private Dictionary<uint, ClientView> m_clientThreads;

         private AssetCache m_assetCache;

         private IGridServer m_gridServer;

         private IUserServer m_userServer = null;

-        private OpenSimNetworkHandler m_networkServer;

         private InventoryCache m_inventoryCache;

         public bool m_sandboxMode;

         private int cachedtextureserial = 0;

@@ -99,7 +87,7 @@ namespace OpenSim
             }

         }

 

-        public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, SimClient> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child, RegionInfo regionDat, AuthenticateSessionsBase authenSessions)

+        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, ClientView> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child, RegionInfo regionDat, AuthenticateSessionsBase authenSessions)

         {

             m_world = world;

             m_clientThreads = clientThreads;

@@ -170,7 +158,7 @@ namespace OpenSim
             kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];

             kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();

             kill.ObjectData[0].ID = this.ClientAvatar.localid;

-            foreach (SimClient client in m_clientThreads.Values)

+            foreach (ClientView client in m_clientThreads.Values)

             {

                 client.OutPacket(kill);

             }

@@ -247,246 +235,6 @@ namespace OpenSim
 

         # endregion

 

-        # region Low Level Packet Methods

-

-        private void ack_pack(Packet Pack)

-        {

-            if (Pack.Header.Reliable)

-            {

-                libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();

-                ack_it.Packets = new PacketAckPacket.PacketsBlock[1];

-                ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();

-                ack_it.Packets[0].ID = Pack.Header.Sequence;

-                ack_it.Header.Reliable = false;

-

-                OutPacket(ack_it);

-

-            }

-            /*

-            if (Pack.Header.Reliable)

-            {

-                lock (PendingAcks)

-                {

-                    uint sequence = (uint)Pack.Header.Sequence;

-                    if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }

-                }

-            }*/

-        }

-

-        private void ResendUnacked()

-        {

-            int now = Environment.TickCount;

-

-            lock (NeedAck)

-            {

-                foreach (Packet packet in NeedAck.Values)

-                {

-                    if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))

-                    {

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " +

-                         (now - packet.TickCount) + "ms have passed");

-

-                        packet.Header.Resent = true;

-                        OutPacket(packet);

-                    }

-                }

-            }

-        }

-

-        private void SendAcks()

-        {

-            lock (PendingAcks)

-            {

-                if (PendingAcks.Count > 0)

-                {

-                    if (PendingAcks.Count > 250)

-                    {

-                        // FIXME: Handle the odd case where we have too many pending ACKs queued up

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!");

-                        return;

-                    }

-

-                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");

-

-

-                    int i = 0;

-                    PacketAckPacket acks = new PacketAckPacket();

-                    acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];

-

-                    foreach (uint ack in PendingAcks.Values)

-                    {

-                        acks.Packets[i] = new PacketAckPacket.PacketsBlock();

-                        acks.Packets[i].ID = ack;

-                        i++;

-                    }

-

-                    acks.Header.Reliable = false;

-                    OutPacket(acks);

-

-                    PendingAcks.Clear();

-                }

-            }

-        }

-

-        private void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)

-        {

-            SendAcks();

-            ResendUnacked();

-        }

-

-        # endregion

-

-        #region Packet Queue Processing

-

-        protected virtual void ProcessOutPacket(Packet Pack)

-        {

-            // Keep track of when this packet was sent out

-            Pack.TickCount = Environment.TickCount;

-

-            if (!Pack.Header.Resent)

-            {

-                // Set the sequence number

-                lock (SequenceLock)

-                {

-                    if (Sequence >= MAX_SEQUENCE)

-                        Sequence = 1;

-                    else

-                        Sequence++;

-                    Pack.Header.Sequence = Sequence;

-                }

-

-                if (Pack.Header.Reliable)  //DIRTY HACK

-                {

-                    lock (NeedAck)

-                    {

-                        if (!NeedAck.ContainsKey(Pack.Header.Sequence))

-                        {

-                            try

-                            {

-                                NeedAck.Add(Pack.Header.Sequence, Pack);

-                            }

-                            catch (Exception e) // HACKY

-                            {

-                                e.ToString();

-                                // Ignore

-                                // Seems to throw a exception here occasionally

-                                // of 'duplicate key' despite being locked.

-                                // !?!?!?

-                            }

-                        }

-                        else

-                        {

-                            //  Client.Log("Attempted to add a duplicate sequence number (" +

-                            //     packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +

-                            //      packet.Type.ToString(), Helpers.LogLevel.Warning);

-                        }

-                    }

-

-                    // Don't append ACKs to resent packets, in case that's what was causing the

-                    // delivery to fail

-                    if (!Pack.Header.Resent)

-                    {

-                        // Append any ACKs that need to be sent out to this packet

-                        lock (PendingAcks)

-                        {

-                            if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&

-                                Pack.Type != PacketType.PacketAck &&

-                                Pack.Type != PacketType.LogoutRequest)

-                            {

-                                Pack.Header.AckList = new uint[PendingAcks.Count];

-                                int i = 0;

-

-                                foreach (uint ack in PendingAcks.Values)

-                                {

-                                    Pack.Header.AckList[i] = ack;

-                                    i++;

-                                }

-

-                                PendingAcks.Clear();

-                                Pack.Header.AppendedAcks = true;

-                            }

-                        }

-                    }

-                }

-            }

-

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

-            byte[] sendbuffer;

-            sendbuffer = Pack.ToBytes();

-

-            try

-            {

-                if (Pack.Header.Zerocoded)

-                {

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

-                    m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);

-                }

-                else

-                {

-                    m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);

-                }

-            }

-            catch (Exception)

-            {

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

-                ClientThread.Abort();

-            }

-

-        }

-

-        public virtual void InPacket(Packet NewPack)

-        {

-            // Handle appended ACKs

-            if (NewPack.Header.AppendedAcks)

-            {

-                lock (NeedAck)

-                {

-                    foreach (uint ack in NewPack.Header.AckList)

-                    {

-                        NeedAck.Remove(ack);

-                    }

-                }

-            }

-

-            // Handle PacketAck packets

-            if (NewPack.Type == PacketType.PacketAck)

-            {

-                PacketAckPacket ackPacket = (PacketAckPacket)NewPack;

-

-                lock (NeedAck)

-                {

-                    foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)

-                    {

-                        NeedAck.Remove(block.ID);

-                    }

-                }

-            }

-            else if ((NewPack.Type == PacketType.StartPingCheck))

-            {

-                //reply to pingcheck

-                libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;

-                libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();

-                endPing.PingID.PingID = startPing.PingID.PingID;

-                OutPacket(endPing);

-            }

-            else

-            {

-                QueItem item = new QueItem();

-                item.Packet = NewPack;

-                item.Incoming = true;

-                this.PacketQueue.Enqueue(item);

-            }

-

-        }

-

-        public virtual void OutPacket(Packet NewPack)

-        {

-            QueItem item = new QueItem();

-            item.Packet = NewPack;

-            item.Incoming = false;

-            this.PacketQueue.Enqueue(item);

-        }

-

         protected virtual void ClientLoop()

         {

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop");

@@ -506,8 +254,6 @@ namespace OpenSim
             }

         }

 

-        #endregion

-

         # region Setup

 

         protected virtual void InitNewClient()

@@ -556,6 +302,31 @@ namespace OpenSim
         }

         # endregion

 

+

+        protected override void KillThread()

+        {

+            this.ClientThread.Abort();

+        }

+

+        #region World/Avatar To Viewer Methods

+

+        public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

+        {

+            System.Text.Encoding enc = System.Text.Encoding.ASCII;

+            libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();

+            reply.ChatData.Audible = 1;

+            reply.ChatData.Message = message;

+            reply.ChatData.ChatType = type;

+            reply.ChatData.SourceType = 1;

+            reply.ChatData.Position = fromPos;

+            reply.ChatData.FromName = enc.GetBytes(fromName + "\0");

+            reply.ChatData.OwnerID = fromAgentID;

+            reply.ChatData.SourceID = fromAgentID;

+

+            this.OutPacket(reply);

+        }

+        #endregion

+

         #region Inventory Creation

         private void SetupInventory(AuthenticateResponse sessionInfo)

         {

@@ -646,17 +417,5 @@ namespace OpenSim
         }

         #endregion

 

-        #region Nested Classes

-

-        public class QueItem

-        {

-            public QueItem()

-            {

-            }

-

-            public Packet Packet;

-            public bool Incoming;

-        }

-        #endregion

     }

 }