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

Tweaked "show users" formatting, added user's IP address to display.

afrisby
Brian McBee 2008-01-03 19:38:58 +00:00
parent 1337a3973d
commit 0e966baa2c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -880,13 +880,14 @@ namespace OpenSim
break; break;
case "users": case "users":
m_log.Error( m_log.Error(
String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", String.Format("{0,-16}{1,-16}{2,-37}{3,-16}{4,-22}{5,-16}", "Firstname", "Lastname",
"Agent ID", "Session ID", "Circuit", "IP", "World")); "Agent ID", "Circuit", "IP", "Region"));
foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars()) foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars())
{ {
RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
string regionName; string regionName;
System.Net.EndPoint ep = null;
if (regionInfo == null) if (regionInfo == null)
{ {
@ -896,15 +897,21 @@ namespace OpenSim
{ {
regionName = regionInfo.RegionName; regionName = regionInfo.RegionName;
} }
for (int i = 0; i < m_udpServers.Count; i++)
{
if (m_udpServers[i].RegionHandle == presence.RegionHandle)
{
m_udpServers[i].clientCircuits_reverse.TryGetValue(presence.ControllingClient.CircuitCode, out ep);
}
}
m_log.Error( m_log.Error(
String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", String.Format("{0,-16}{1,-16}{2,-37}{3,-16}{4,-22}{5,-16}",
presence.Firstname, presence.Firstname,
presence.Lastname, presence.Lastname,
presence.UUID, presence.UUID,
presence.ControllingClient.AgentId, presence.ControllingClient.CircuitCode,
"Unknown", ep,
"Unknown",
regionName)); regionName));
} }

2
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack
public class UDPServer : ClientStackNetworkHandler public class UDPServer : ClientStackNetworkHandler
{ {
protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
protected Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>(); public Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>();
public Socket Server; public Socket Server;
protected IPEndPoint ServerIncoming; protected IPEndPoint ServerIncoming;
protected byte[] RecvBuffer = new byte[4096]; protected byte[] RecvBuffer = new byte[4096];