Added CLI "debug packet 0..255" to enable the in/out packet dumps with various verbosity

3 files changed, 33 insertions, 10 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index d2f311b..fab5433 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -62,13 +62,6 @@ namespace OpenSim.Region.ClientStack
         protected override void ProcessInPacket(Packet Pack)
         {
             ack_pack(Pack);
-            if (debug)
-            {
-                if (Pack.Type != PacketType.AgentUpdate)
-                {
-                    Console.WriteLine(CircuitCode + ":IN: " + Pack.Type.ToString());
-                }
-            }
 
             if (this.ProcessPacketMethod(Pack))
             {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 4d7dbda..54c9a0d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack
 
         //private AgentAssetUpload UploadAssets;
         private LLUUID newAssetFolder = LLUUID.Zero;
-        private bool debug = false;
+        private int debug = 0;
         protected IScene m_scene;
         private Dictionary<uint, ClientView> m_clientThreads;
         private AssetCache m_assetCache;
@@ -116,6 +116,11 @@ namespace OpenSim.Region.ClientStack
             ClientThread.Start();
         }
 
+        public void SetDebug(int newDebug) 
+        {
+            debug = newDebug;
+        }
+
         # region Client Methods
 
         public void KillClient()
@@ -192,6 +197,31 @@ namespace OpenSim.Region.ClientStack
             return result;
         }
 
+        protected void DebugPacket(string direction, Packet packet)
+        {
+            if (debug > 0) {
+                string info;
+                if (debug < 255 && packet.Type == PacketType.AgentUpdate) 
+                  return;
+                if (debug < 254 && packet.Type == PacketType.ViewerEffect) 
+                  return;
+                if (debug < 253 && (
+                      packet.Type == PacketType.CompletePingCheck ||
+                      packet.Type == PacketType.StartPingCheck 
+                      ) )
+                  return;
+                if (debug < 252 && packet.Type == PacketType.PacketAck) 
+                  return;
+
+                if (debug > 1) {
+                    info = packet.ToString();
+                } else {
+                    info = packet.Type.ToString();
+                }
+                Console.WriteLine(CircuitCode + ":" + direction + ": " + info);
+            }
+        }
+
         protected virtual void ClientLoop()
         {
             MainLog.Instance.Verbose("OpenSimClient.cs:ClientLoop() - Entered loop");
@@ -205,11 +235,13 @@ namespace OpenSim.Region.ClientStack
                     {
                         packetsReceived++;
                     }
+                    DebugPacket("IN", nextPacket.Packet);
                     ProcessInPacket(nextPacket.Packet);
                 }
                 else
                 {
                     //is a out going packet
+                    DebugPacket("OUT", nextPacket.Packet);
                     ProcessOutPacket(nextPacket.Packet);
                 }
             }
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8ff5a11..80d7e53 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -71,8 +71,6 @@ namespace OpenSim.Region.ClientStack
             // Keep track of when this packet was sent out
             Pack.TickCount = System.Environment.TickCount;
 
-          //  Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());
-
             if (!Pack.Header.Resent)
             {
                 // Set the sequence number