ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

changes on agenthandlers: simplify HG only agentposthandler, etc

Browse Source
This commit is contained in:
UbitUmarov
2020-12-23 15:36:51 +00:00
parent d0ade39641
commit 3732677972
7 changed files with 62 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
View File

@@ -25,26 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections;
using System.IO;
using System.Reflection;
using System.Net;
using System.Text;
using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base;
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Server.Handlers.Simulation;
using Utils = OpenSim.Server.Handlers.Simulation.Utils;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using Nini.Config;
using log4net;
//using log4net;
namespace OpenSim.Server.Handlers.Hypergrid

2
OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
View File

@@ -73,7 +73,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false);
server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy));
server.AddSimpleStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy));
}
public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, string configName)

7
OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
View File

@@ -69,9 +69,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
return new ExtendedAgentDestinationData();
}
protected override void UnpackData(OSDMap args, AgentDestinationData d, Hashtable request)
protected override void UnpackData(OSDMap args, AgentDestinationData d, string remoteAddress)
{
base.UnpackData(args, d, request);
base.UnpackData(args, d, remoteAddress);
ExtendedAgentDestinationData data = (ExtendedAgentDestinationData)d;
try
{
@@ -90,9 +90,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData");
}
string callerIP = GetCallerIP(request);
// Verify if this call came from the login server
if (callerIP == m_LoginServerIP)
if (remoteAddress == m_LoginServerIP)
data.fromLogin = true;
}

2
OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
View File

@@ -110,7 +110,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
server.AddXmlRPCHandler("get_uui", GetUUI, false);
server.AddXmlRPCHandler("get_uuid", GetUUID, false);
server.AddStreamHandler(new HomeAgentHandler(m_HomeUsersService, loginServerIP, proxy));
server.AddSimpleStreamHandler(new HomeAgentHandler(m_HomeUsersService, loginServerIP, proxy));
}
public XmlRpcResponse GetHomeRegion(XmlRpcRequest request, IPEndPoint remoteClient)