MW 2007-06-10 12:01:09 +00:00
parent ed899c30f6
commit 93f07a9fce
8 changed files with 177 additions and 110 deletions

View File

@ -16,7 +16,7 @@ namespace OpenGrid.Framework.Communications.GridServer
/// </summary> /// </summary>
/// <param name="regionInfo"></param> /// <param name="regionInfo"></param>
/// <returns></returns> /// <returns></returns>
public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo) internal virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
{ {
return null; return null;
} }
@ -30,21 +30,6 @@ namespace OpenGrid.Framework.Communications.GridServer
{ {
return null; return null;
} }
/// <summary>
///
/// </summary>
/// <returns></returns>
public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
{
return false;
}
public virtual bool AddNewSession(ulong regionHandle, Login loginData)
{
return false;
}
} }
} }

View File

@ -11,94 +11,19 @@ namespace OpenGrid.Framework.Communications.GridServer
{ {
public class GridCommsManagerLocal : GridCommsManagerBase public class GridCommsManagerLocal : GridCommsManagerBase
{ {
protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();
public GridCommsManagerLocal() public GridCommsManagerLocal()
{ {
} }
public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo) internal override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
{ {
//Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
{
//Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
this.regions.Add(regionInfo.RegionHandle, regionInfo);
RegionCommsHostBase regionHost = new RegionCommsHostBase();
this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
return regionHost;
}
//already in our list of regions so for now lets return null
return null; return null;
} }
public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo) public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
{ {
// Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle); return null;
List<RegionInfo> neighbours = new List<RegionInfo>();
foreach (RegionInfo reg in this.regions.Values)
{
// Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
if (reg.RegionHandle != regionInfo.RegionHandle)
{
//Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
{
if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
{
neighbours.Add(reg);
}
}
}
}
return neighbours;
}
public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
{
//Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
if (this.regionHosts.ContainsKey(regionHandle))
{
// Console.WriteLine("CommsManager- Informing a region to expect child agent");
this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
return true;
}
return false;
}
/// <summary>
/// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="loginData"></param>
/// <returns></returns>
public override bool AddNewSession(ulong regionHandle, Login loginData)
{
//Console.WriteLine(" comms manager been told to expect new user");
AgentCircuitData agent = new AgentCircuitData();
agent.AgentID = loginData.Agent;
agent.firstname = loginData.First;
agent.lastname = loginData.Last;
agent.SessionID = loginData.Session;
agent.SecureSessionID = loginData.SecureSession;
agent.circuitcode = loginData.CircuitCode;
agent.BaseFolder = loginData.BaseFolder;
agent.InventoryFolder = loginData.InventoryFolder;
agent.startpos = new LLVector3(128, 128, 70);
if (this.regionHosts.ContainsKey(regionHandle))
{
this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
return true;
}
// region not found
return false;
} }
} }
} }

View File

@ -13,7 +13,7 @@ namespace OpenGrid.Framework.Communications.GridServer
{ {
} }
public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo) internal override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
{ {
return null; return null;
} }
@ -22,15 +22,5 @@ namespace OpenGrid.Framework.Communications.GridServer
{ {
return null; return null;
} }
public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
{
return false;
}
public override bool AddNewSession(ulong regionHandle, Login loginData)
{
return false;
}
} }
} }

View File

@ -11,10 +11,117 @@ namespace OpenGrid.Framework.Communications
{ {
public class RegionServerCommsLocal : RegionServerCommsManager public class RegionServerCommsLocal : RegionServerCommsManager
{ {
protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();
public RegionServerCommsLocal() public RegionServerCommsLocal()
{ {
userServer = new UserServer.UserCommsManagerLocal(); //Local User Server userServer = new UserServer.UserCommsManagerLocal(); //Local User Server
gridServer = new GridServer.GridCommsManagerLocal(); //Locl Grid Server gridServer = new GridServer.GridCommsManagerLocal(); //Locl Grid Server
} }
/// <summary>
/// Main Register a region method with the CommsManager.
/// Should do anything that is needed and also call the RegisterRegion method in the gridserver class
/// to inform the grid server (in grid mode).
/// </summary>
/// <param name="regionInfo"></param>
/// <returns></returns>
public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
{
//Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
{
//Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
this.regions.Add(regionInfo.RegionHandle, regionInfo);
RegionCommsHostBase regionHost = new RegionCommsHostBase();
this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
return regionHost;
}
//already in our list of regions so for now lets return null
return null;
}
/// <summary>
/// In the current class structure this shouldn't be here as it should only be in the gridserver class
/// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out
/// it will have to be here as well
/// </summary>
/// <param name="regionInfo"></param>
/// <returns></returns>
public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
{
// Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
List<RegionInfo> neighbours = new List<RegionInfo>();
foreach (RegionInfo reg in this.regions.Values)
{
// Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
if (reg.RegionHandle != regionInfo.RegionHandle)
{
//Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
{
if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
{
neighbours.Add(reg);
}
}
}
}
return neighbours;
}
/// <summary>
/// informs a neighbouring sim to expect a child agent
/// I guess if we are going to stick with the current class structure then we need a intersim class
/// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="agentData"></param>
/// <returns></returns>
public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
{
//Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
if (this.regionHosts.ContainsKey(regionHandle))
{
// Console.WriteLine("CommsManager- Informing a region to expect child agent");
this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
return true;
}
return false;
}
/// <summary>
/// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="loginData"></param>
/// <returns></returns>
public bool AddNewSession(ulong regionHandle, Login loginData)
{
//Console.WriteLine(" comms manager been told to expect new user");
AgentCircuitData agent = new AgentCircuitData();
agent.AgentID = loginData.Agent;
agent.firstname = loginData.First;
agent.lastname = loginData.Last;
agent.SessionID = loginData.Session;
agent.SecureSessionID = loginData.SecureSession;
agent.circuitcode = loginData.CircuitCode;
agent.BaseFolder = loginData.BaseFolder;
agent.InventoryFolder = loginData.InventoryFolder;
agent.startpos = new LLVector3(128, 128, 70);
if (this.regionHosts.ContainsKey(regionHandle))
{
this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
return true;
}
// region not found
return false;
}
} }
} }

View File

@ -19,5 +19,20 @@ namespace OpenGrid.Framework.Communications
{ {
} }
public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
{
return null;
}
public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
{
return null;
}
public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
{
return false;
}
} }
} }

View File

@ -1,6 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Framework;
using OpenSim.Framework.Types;
namespace OpenGrid.Framework.Communications namespace OpenGrid.Framework.Communications
{ {
@ -11,5 +13,35 @@ namespace OpenGrid.Framework.Communications
userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server
gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server
} }
public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
{
return gridServer.RegisterRegion(regionInfo);
}
/// <summary>
/// In the current class structure this shouldn't be here as it should only be in the gridserver class
/// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out
/// it will have to be here as well
/// </summary>
/// <param name="regionInfo"></param>
/// <returns></returns>
public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
{
return gridServer.RequestNeighbours(regionInfo);
}
/// <summary>
/// informs a neighbouring sim to expect a child agent
/// I guess if we are going to stick with the current class structure then we need a intersim class
/// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="agentData"></param>
/// <returns></returns>
public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
{
return false;
}
} }
} }

View File

@ -523,7 +523,7 @@ namespace OpenSim.world
protected void InformClientOfNeighbours(IClientAPI remoteClient) protected void InformClientOfNeighbours(IClientAPI remoteClient)
{ {
// Console.WriteLine("informing client of neighbouring regions"); // Console.WriteLine("informing client of neighbouring regions");
List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo); List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);
//Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
if (neighbours != null) if (neighbours != null)
@ -535,7 +535,7 @@ namespace OpenSim.world
agent.BaseFolder = LLUUID.Zero; agent.BaseFolder = LLUUID.Zero;
agent.InventoryFolder = LLUUID.Zero; agent.InventoryFolder = LLUUID.Zero;
agent.startpos = new LLVector3(128, 128, 70); agent.startpos = new LLVector3(128, 128, 70);
this.commsManager.gridServer.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
} }
} }
@ -591,18 +591,26 @@ namespace OpenSim.world
#region RegionCommsHost #region RegionCommsHost
/// <summary>
///
/// </summary>
public void RegisterRegionWithComms() public void RegisterRegionWithComms()
{ {
this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo); this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo);
if (this.regionCommsHost != null) if (this.regionCommsHost != null)
{ {
this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
} }
} }
/// <summary>
///
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="agent"></param>
public void NewUserConnection(ulong regionHandle, AgentCircuitData agent) public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
{ {
Console.WriteLine("World.cs - add new user connection"); // Console.WriteLine("World.cs - add new user connection");
//should just check that its meant for this region //should just check that its meant for this region
if (regionHandle == this.m_regInfo.RegionHandle) if (regionHandle == this.m_regInfo.RegionHandle)
{ {
@ -612,6 +620,12 @@ namespace OpenSim.world
#endregion #endregion
/// <summary>
///
/// </summary>
/// <param name="px"></param>
/// <param name="py"></param>
/// <param name="RemoteClient"></param>
public override void SendLayerData(int px, int py, IClientAPI RemoteClient) public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
{ {
RemoteClient.SendLayerData( Terrain.getHeights1D() ); RemoteClient.SendLayerData( Terrain.getHeights1D() );

View File

@ -104,7 +104,6 @@ namespace OpenSim
this.checkServer = new CheckSumServer(12036); this.checkServer = new CheckSumServer(12036);
this.checkServer.ServerListener(); this.checkServer.ServerListener();
this.commsManager = new RegionServerCommsLocal(); this.commsManager = new RegionServerCommsLocal();
new RegionServerCommsOGS();
} }
else else
{ {
@ -132,7 +131,7 @@ namespace OpenSim
loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
loginServer.Startup(); loginServer.Startup();
//loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession); //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);
loginServer.SetSessionHandler(((RegionServerCommsManager)this.commsManager).gridServer.AddNewSession); loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).AddNewSession);
//sandbox mode with loginserver not using accounts //sandbox mode with loginserver not using accounts
httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
} }