mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 11:33:28 +08:00
* Cleaning code still.
This commit is contained in:
@@ -41,12 +41,12 @@ namespace OpenSim.Grid.UserServer
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public Dictionary<string, MessageServerInfo> MessageServers;
|
||||
|
||||
|
||||
public MessageServersConnector()
|
||||
{
|
||||
MessageServers = new Dictionary<string, MessageServerInfo>();
|
||||
}
|
||||
|
||||
|
||||
public void RegisterMessageServer(string URI, MessageServerInfo serverData)
|
||||
{
|
||||
lock (MessageServers)
|
||||
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer
|
||||
MessageServers.Add(URI, serverData);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void DeRegisterMessageServer(string URI)
|
||||
{
|
||||
lock (MessageServers)
|
||||
@@ -64,7 +64,7 @@ namespace OpenSim.Grid.UserServer
|
||||
MessageServers.Remove(URI);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void AddResponsibleRegion(string URI, ulong regionhandle)
|
||||
{
|
||||
if (!MessageServers.ContainsKey(URI))
|
||||
@@ -76,8 +76,9 @@ namespace OpenSim.Grid.UserServer
|
||||
MessageServerInfo msginfo = MessageServers["URI"];
|
||||
msginfo.responsibleForRegions.Add(regionhandle);
|
||||
MessageServers["URI"] = msginfo;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void RemoveResponsibleRegion(string URI, ulong regionhandle)
|
||||
{
|
||||
if (!MessageServers.ContainsKey(URI))
|
||||
@@ -92,20 +93,20 @@ namespace OpenSim.Grid.UserServer
|
||||
msginfo.responsibleForRegions.Remove(regionhandle);
|
||||
MessageServers["URI"] = msginfo;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request)
|
||||
{
|
||||
XmlRpcResponse response = new XmlRpcResponse();
|
||||
Hashtable requestData = (Hashtable)request.Params[0];
|
||||
Hashtable requestData = (Hashtable) request.Params[0];
|
||||
Hashtable responseData = new Hashtable();
|
||||
|
||||
if (requestData.Contains("uri"))
|
||||
{
|
||||
string URI = (string)requestData["uri"];
|
||||
string sendkey=(string)requestData["sendkey"];
|
||||
string recvkey=(string)requestData["recvkey"];
|
||||
string URI = (string) requestData["uri"];
|
||||
string sendkey = (string) requestData["sendkey"];
|
||||
string recvkey = (string) requestData["recvkey"];
|
||||
MessageServerInfo m = new MessageServerInfo();
|
||||
m.URI = URI;
|
||||
m.sendkey = sendkey;
|
||||
@@ -116,15 +117,16 @@ namespace OpenSim.Grid.UserServer
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
public XmlRpcResponse XmlRPCDeRegisterMessageServer(XmlRpcRequest request)
|
||||
{
|
||||
XmlRpcResponse response = new XmlRpcResponse();
|
||||
Hashtable requestData = (Hashtable)request.Params[0];
|
||||
Hashtable requestData = (Hashtable) request.Params[0];
|
||||
Hashtable responseData = new Hashtable();
|
||||
|
||||
if (requestData.Contains("uri"))
|
||||
{
|
||||
string URI = (string)requestData["uri"];
|
||||
string URI = (string) requestData["uri"];
|
||||
|
||||
DeRegisterMessageServer(URI);
|
||||
responseData["responsestring"] = "TRUE";
|
||||
@@ -132,23 +134,24 @@ namespace OpenSim.Grid.UserServer
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
public XmlRpcResponse XmlRPCUserMovedtoRegion(XmlRpcRequest request)
|
||||
{
|
||||
XmlRpcResponse response = new XmlRpcResponse();
|
||||
Hashtable requestData = (Hashtable)request.Params[0];
|
||||
Hashtable requestData = (Hashtable) request.Params[0];
|
||||
Hashtable responseData = new Hashtable();
|
||||
|
||||
if (requestData.Contains("fromuri"))
|
||||
{
|
||||
string sURI = (string)requestData["fromuri"];
|
||||
string sagentID = (string)requestData["agentid"];
|
||||
string ssessionID = (string)requestData["sessionid"];
|
||||
string scurrentRegionID = (string)requestData["regionid"];
|
||||
string sregionhandle = (string)requestData["regionhandle"];
|
||||
string scurrentpos = (string)requestData["currentpos"];
|
||||
string sURI = (string) requestData["fromuri"];
|
||||
string sagentID = (string) requestData["agentid"];
|
||||
string ssessionID = (string) requestData["sessionid"];
|
||||
string scurrentRegionID = (string) requestData["regionid"];
|
||||
string sregionhandle = (string) requestData["regionhandle"];
|
||||
string scurrentpos = (string) requestData["currentpos"];
|
||||
//LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
|
||||
// TODO: Okay now raise event so the user server can pass this data to the Usermanager
|
||||
|
||||
|
||||
responseData["responsestring"] = "TRUE";
|
||||
response.Value = responseData;
|
||||
}
|
||||
@@ -156,7 +159,7 @@ namespace OpenSim.Grid.UserServer
|
||||
}
|
||||
|
||||
public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
|
||||
ulong regionhandle, float positionX, float positionY,
|
||||
ulong regionhandle, float positionX, float positionY,
|
||||
float positionZ, string firstname, string lastname)
|
||||
{
|
||||
// Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D )
|
||||
@@ -173,8 +176,8 @@ namespace OpenSim.Grid.UserServer
|
||||
foreach (MessageServerInfo serv in MessageServers.Values)
|
||||
{
|
||||
NotifyMessageServerAboutUser(serv, agentID, sessionID, RegionID,
|
||||
regionhandle, positionX, positionY, positionZ,
|
||||
firstname, lastname);
|
||||
regionhandle, positionX, positionY, positionZ,
|
||||
firstname, lastname);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -191,10 +194,10 @@ namespace OpenSim.Grid.UserServer
|
||||
// {
|
||||
// m_log.Debug("[MSGCONNECTOR]: No Message Servers registered, ignoring");
|
||||
// }
|
||||
foreach (MessageServerInfo serv in MessageServers.Values)
|
||||
{
|
||||
NotifyMessageServerAboutUserLogoff(serv,agentID);
|
||||
}
|
||||
foreach (MessageServerInfo serv in MessageServers.Values)
|
||||
{
|
||||
NotifyMessageServerAboutUserLogoff(serv, agentID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -218,10 +221,10 @@ namespace OpenSim.Grid.UserServer
|
||||
m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout");
|
||||
}
|
||||
|
||||
private void NotifyMessageServerAboutUser(MessageServerInfo serv,
|
||||
LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
|
||||
ulong regionhandle, float positionX, float positionY, float positionZ,
|
||||
string firstname, string lastname)
|
||||
private void NotifyMessageServerAboutUser(MessageServerInfo serv,
|
||||
LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
|
||||
ulong regionhandle, float positionX, float positionY, float positionZ,
|
||||
string firstname, string lastname)
|
||||
{
|
||||
Hashtable reqparams = new Hashtable();
|
||||
reqparams["sendkey"] = serv.sendkey;
|
||||
@@ -250,7 +253,6 @@ namespace OpenSim.Grid.UserServer
|
||||
{
|
||||
m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user