OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Do some log tweaking to better see incoming connection success (and failure)

0.6.2-post-fixes
Justin Clarke Casey 2009-01-14 17:34:04 +00:00
parent 2a5f060ed8
commit 6ae1b80d20
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -416,24 +416,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!m_packetServer.IsClientAuthorized(useCircuit, m_circuitManager, out sessionInfo)) if (!m_packetServer.IsClientAuthorized(useCircuit, m_circuitManager, out sessionInfo))
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[CLIENT]: New user request denied to avatar {0} connecting with unauthorized circuit code {1} from {2}", "[CONNECTION FAILURE]: Connection request for client {0} connecting with unnotified circuit code {1} from {2}",
useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, epSender); useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, epSender);
return; return;
} }
else
{
m_log.Debug("[CLIENT]: Got authenticated connection from " + epSender);
}
lock (clientCircuits) lock (clientCircuits)
{ {
if (!clientCircuits.ContainsKey(epSender)) if (!clientCircuits.ContainsKey(epSender))
{ {
m_log.DebugFormat(
"[CLIENT]: Adding new circuit for agent {0}, circuit code {1}",
useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
isNewCircuit = true; isNewCircuit = true;
} }
@ -451,6 +443,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
} }
m_log.DebugFormat(
"[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated",
useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
} }
// Ack the UseCircuitCode packet // Ack the UseCircuitCode packet

19
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2294,7 +2294,7 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[SCENE]: Adding new child agent {0} for new user connection in {1}", "[SCENE]: Adding new child agent for {0} in {1}",
client.Name, RegionInfo.RegionName); client.Name, RegionInfo.RegionName);
CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
@ -2759,10 +2759,15 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="agent"></param> /// <param name="agent"></param>
public void NewUserConnection(AgentCircuitData agent) public void NewUserConnection(AgentCircuitData agent)
{ {
// Don't disable this log messages - it's too useful
m_log.DebugFormat(
"[CONNECTION SETUP]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})",
RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[CONNECTION DEBUGGING]: Denied access to: {0} at {1} because the user is on the region banlist", "[CONNECTION SETUP]: Denied access to: {0} at {1} because the user is on the region banlist",
agent.AgentID, RegionInfo.RegionName); agent.AgentID, RegionInfo.RegionName);
} }
@ -2773,21 +2778,18 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID); ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
if (sp != null) if (sp != null)
{ {
m_log.DebugFormat("[CONNECTION DEBUGGING]: Updated agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); m_log.DebugFormat(
"[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
sp.AdjustKnownSeeds(); sp.AdjustKnownSeeds();
sp.AbsolutePosition = agent.startpos; sp.AbsolutePosition = agent.startpos;
m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
return; return;
} }
m_log.DebugFormat("[CONNECTION DEBUGGING]: Adding NewUserConnection for {0} in {1} with CC of {2}, pos={3}", agent.AgentID,
RegionInfo.RegionName, agent.circuitcode, agent.startpos.ToString());
AddCapsHandler(agent.AgentID); AddCapsHandler(agent.AgentID);
if (!agent.child) if (!agent.child)
{ {
// Honor parcel landing type and position. // Honor parcel landing type and position.
ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
if (land != null) if (land != null)
@ -2810,7 +2812,8 @@ namespace OpenSim.Region.Environment.Scenes
} }
else else
{ {
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); m_log.WarnFormat(
"[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);
} }
} }