aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-14 17:34:04 +0000
committerJustin Clarke Casey2009-01-14 17:34:04 +0000
commit6ae1b80d20cbcb850a715bd6b452b0eb575a1291 (patch)
tree08e239b4f929e8b54578866ff191fde7fa9a80cb /OpenSim
parent* Fix typo which meant that RestComms was never enabled if you explicitly ena... (diff)
downloadopensim-SC_OLD-6ae1b80d20cbcb850a715bd6b452b0eb575a1291.zip
opensim-SC_OLD-6ae1b80d20cbcb850a715bd6b452b0eb575a1291.tar.gz
opensim-SC_OLD-6ae1b80d20cbcb850a715bd6b452b0eb575a1291.tar.bz2
opensim-SC_OLD-6ae1b80d20cbcb850a715bd6b452b0eb575a1291.tar.xz
* Do some log tweaking to better see incoming connection success (and failure)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs19
2 files changed, 17 insertions, 18 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index a90c380..18b5acf 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -416,24 +416,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
416 if (!m_packetServer.IsClientAuthorized(useCircuit, m_circuitManager, out sessionInfo)) 416 if (!m_packetServer.IsClientAuthorized(useCircuit, m_circuitManager, out sessionInfo))
417 { 417 {
418 m_log.WarnFormat( 418 m_log.WarnFormat(
419 "[CLIENT]: New user request denied to avatar {0} connecting with unauthorized circuit code {1} from {2}", 419 "[CONNECTION FAILURE]: Connection request for client {0} connecting with unnotified circuit code {1} from {2}",
420 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, epSender); 420 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, epSender);
421 421
422 return; 422 return;
423 } 423 }
424 else
425 {
426 m_log.Debug("[CLIENT]: Got authenticated connection from " + epSender);
427 }
428 424
429 lock (clientCircuits) 425 lock (clientCircuits)
430 { 426 {
431 if (!clientCircuits.ContainsKey(epSender)) 427 if (!clientCircuits.ContainsKey(epSender))
432 { 428 {
433 m_log.DebugFormat(
434 "[CLIENT]: Adding new circuit for agent {0}, circuit code {1}",
435 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
436
437 clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); 429 clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
438 isNewCircuit = true; 430 isNewCircuit = true;
439 } 431 }
@@ -451,6 +443,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
451 443
452 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); 444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
453 } 445 }
446
447 m_log.DebugFormat(
448 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated",
449 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
454 } 450 }
455 451
456 // Ack the UseCircuitCode packet 452 // Ack the UseCircuitCode packet
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bbc6232..11655e9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2294,7 +2294,7 @@ namespace OpenSim.Region.Environment.Scenes
2294 else 2294 else
2295 { 2295 {
2296 m_log.DebugFormat( 2296 m_log.DebugFormat(
2297 "[SCENE]: Adding new child agent {0} for new user connection in {1}", 2297 "[SCENE]: Adding new child agent for {0} in {1}",
2298 client.Name, RegionInfo.RegionName); 2298 client.Name, RegionInfo.RegionName);
2299 2299
2300 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 2300 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
@@ -2759,10 +2759,15 @@ namespace OpenSim.Region.Environment.Scenes
2759 /// <param name="agent"></param> 2759 /// <param name="agent"></param>
2760 public void NewUserConnection(AgentCircuitData agent) 2760 public void NewUserConnection(AgentCircuitData agent)
2761 { 2761 {
2762 // Don't disable this log messages - it's too useful
2763 m_log.DebugFormat(
2764 "[CONNECTION SETUP]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})",
2765 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
2766
2762 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 2767 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
2763 { 2768 {
2764 m_log.WarnFormat( 2769 m_log.WarnFormat(
2765 "[CONNECTION DEBUGGING]: Denied access to: {0} at {1} because the user is on the region banlist", 2770 "[CONNECTION SETUP]: Denied access to: {0} at {1} because the user is on the region banlist",
2766 agent.AgentID, RegionInfo.RegionName); 2771 agent.AgentID, RegionInfo.RegionName);
2767 } 2772 }
2768 2773
@@ -2773,21 +2778,18 @@ namespace OpenSim.Region.Environment.Scenes
2773 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID); 2778 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
2774 if (sp != null) 2779 if (sp != null)
2775 { 2780 {
2776 m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); 2781 m_log.DebugFormat(
2782 "[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
2777 sp.AdjustKnownSeeds(); 2783 sp.AdjustKnownSeeds();
2778 sp.AbsolutePosition = agent.startpos; 2784 sp.AbsolutePosition = agent.startpos;
2779 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 2785 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
2780 return; 2786 return;
2781 } 2787 }
2782 2788
2783 m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}, pos={3}", agent.AgentID,
2784 RegionInfo.RegionName, agent.circuitcode, agent.startpos.ToString());
2785
2786 AddCapsHandler(agent.AgentID); 2789 AddCapsHandler(agent.AgentID);
2787 2790
2788 if (!agent.child) 2791 if (!agent.child)
2789 { 2792 {
2790
2791 // Honor parcel landing type and position. 2793 // Honor parcel landing type and position.
2792 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); 2794 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
2793 if (land != null) 2795 if (land != null)
@@ -2810,7 +2812,8 @@ namespace OpenSim.Region.Environment.Scenes
2810 } 2812 }
2811 else 2813 else
2812 { 2814 {
2813 m_log.WarnFormat("[USERINFO CACHE]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID); 2815 m_log.WarnFormat(
2816 "[CONNECTION SETUP]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID);
2814 } 2817 }
2815 } 2818 }
2816 2819