From 66f99ae2677c4cfc26d2376c1de9e8e5d7022dfd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 17 Jan 2011 11:03:46 -0800
Subject: More debug messages to help track the XFF header problem.

---
 OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Server/Handlers/Hypergrid')

diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index 0066bd4..814a8d9 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -223,6 +223,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 if (ep != null)
                     return ep.Address.ToString();
             }
+            else
+                m_log.WarnFormat("[HOME AGENT HANDLER]: No XFF header");
 
             // Oops
             return Util.GetCallerIP(request);
-- 
cgit v1.1


From 479d72ac975fd34f43d76c0ab20f869cb07fb6fc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 17 Jan 2011 11:37:39 -0800
Subject: Account for some component along the way lower-casing the HTTP header
 keys. (XFF header issue)

---
 .../Server/Handlers/Hypergrid/HomeAgentHandlers.cs  | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Server/Handlers/Hypergrid')

diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index 814a8d9..968c1e6 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -215,16 +215,21 @@ namespace OpenSim.Server.Handlers.Hypergrid
 
             // We're behind a proxy
             Hashtable headers = (Hashtable)request["headers"];
-            if (headers.ContainsKey("X-Forwarded-For") && headers["X-Forwarded-For"] != null)
-            {
-                m_log.DebugFormat("[HOME AGENT HANDLER]: XFF is {0}", headers["X-Forwarded-For"]);
+            string xff = "X-Forwarded-For";
+            if (headers.ContainsKey(xff.ToLower()))
+                xff = xff.ToLower();
 
-                IPEndPoint ep = Util.GetClientIPFromXFF((string)headers["X-Forwarded-For"]);
-                if (ep != null)
-                    return ep.Address.ToString();
+            if (!headers.ContainsKey(xff) || headers[xff] == null)
+            {
+                m_log.WarnFormat("[AGENT HANDLER]: No XFF header");
+                return Util.GetCallerIP(request);
             }
-            else
-                m_log.WarnFormat("[HOME AGENT HANDLER]: No XFF header");
+
+            m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]);
+
+            IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]);
+            if (ep != null)
+                return ep.Address.ToString();
 
             // Oops
             return Util.GetCallerIP(request);
-- 
cgit v1.1


From bf5ec8cb88219c8fefd7b396d5bd03110d3fa0e5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 Jan 2011 22:51:52 +0000
Subject: remove some mono compiler warnings and unnecessary dictionary
 instantiations

---
 OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs             | 3 ++-
 OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | 6 +++---
 OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs  | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Server/Handlers/Hypergrid')

diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
index 31eefb1..f3f81b0 100644
--- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
 {
     public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentHandler
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         private IGatekeeperService m_GatekeeperService;
 
         public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy)
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 49de8b1..3d0967f 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -41,9 +41,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
 {
     public class GatekeeperServiceInConnector : ServiceConnector
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         private IGatekeeperService m_GatekeeperService;
         public IGatekeeperService GateKeeper
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index e5f6a5d..0e8ce80 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
 {
     public class UserAgentServerConnector : ServiceConnector
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         private IUserAgentService m_HomeUsersService;
 
-- 
cgit v1.1