ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something

Browse Source
This commit is contained in:
mingchen
2007-06-27 16:39:11 +00:00
parent 646bbbc84b
commit e41eedc9ae
74 changed files with 231 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
View File

@@ -1,18 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
namespace OpenSim.Framework.Communications.OGS1
{
public class GridCommsManager : CommunicationsManager
{
private OGS1GridServices gridInterComms = new OGS1GridServices();
public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
{
GridServer = gridInterComms;
InterRegion = gridInterComms;
UserServer = new OGSUserServices();
}
}
}

248
OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
View File

@@ -1,248 +0,0 @@
using System;
using System.Collections.Generic;
using System.Collections;
using System.Text;
using System.Runtime.Remoting;
using System.Runtime.Remoting.Channels;
using System.Runtime.Remoting.Channels.Tcp;
using OpenSim.Servers;
using OpenSim.Framework;
using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
using Nwc.XmlRpc;
using libsecondlife;
namespace OpenSim.Framework.Communications.OGS1
{
public class OGS1GridServices : IGridServices, IInterRegionCommunications
{
public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();
public GridInfo grid;
public BaseHttpServer httpListener;
private bool initialised = false;
public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
{
Hashtable GridParams = new Hashtable();
grid = gridInfo;
// Login / Authentication
GridParams["authkey"] = gridInfo.GridServerSendKey;
GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
GridParams["sim_ip"] = regionInfo.CommsExternalAddress;
GridParams["sim_port"] = regionInfo.CommsIPListenPort.ToString();
// Package into an XMLRPC Request
ArrayList SendParams = new ArrayList();
SendParams.Add(GridParams);
// Send Request
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(gridInfo.GridServerURI, 3000);
Hashtable GridRespData = (Hashtable)GridResp.Value;
Hashtable griddatahash = GridRespData;
// Process Response
if (GridRespData.ContainsKey("error"))
{
string errorstring = (string)GridRespData["error"];
OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
return null;
}
if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
{
// initialised = true;
httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);
httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
httpListener.Start();
}
// Initialise the background listeners
listeners[regionInfo.RegionHandle] = new RegionCommsListener();
return listeners[regionInfo.RegionHandle];
}
public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
{
Hashtable respData = MapBlockQuery((int)regionInfo.RegionLocX - 1, (int)regionInfo.RegionLocY - 1, (int)regionInfo.RegionLocX + 1, (int)regionInfo.RegionLocY + 1);
List<RegionInfo> neighbours = new List<RegionInfo>();
foreach (Hashtable n in (Hashtable)respData.Values)
{
RegionInfo neighbour = new RegionInfo();
//OGS1
neighbour.RegionHandle = (ulong)n["regionhandle"];
neighbour.RegionLocX = (uint)n["x"];
neighbour.RegionLocY = (uint)n["y"];
neighbour.RegionName = (string)n["name"];
//OGS1+
neighbour.CommsIPListenAddr = (string)n["sim_ip"];
neighbour.CommsIPListenPort = (int)n["sim_port"];
neighbour.CommsExternalAddress = (string)n["sim_uri"];
neighbour.SimUUID = (string)n["uuid"];
neighbours.Add(neighbour);
}
return neighbours;
}
public RegionInfo RequestNeighbourInfo(ulong regionHandle)
{
OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
return null;
}
public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
{
Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);
List<MapBlockData> neighbours = new List<MapBlockData>();
foreach (Hashtable n in (Hashtable)respData.Values)
{
MapBlockData neighbour = new MapBlockData();
neighbour.X = (ushort)n["x"];
neighbour.Y = (ushort)n["y"];
neighbour.Name = (string)n["name"];
neighbour.Access = (byte)n["access"];
neighbour.RegionFlags = (uint)n["region-flags"];
neighbour.WaterHeight = (byte)n["water-height"];
neighbour.MapImageId = (string)n["map-image-id"];
neighbours.Add(neighbour);
}
return neighbours;
}
/// <summary>
/// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
/// </summary>
/// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
/// <param name="minX">Minimum X value</param>
/// <param name="minY">Minimum Y value</param>
/// <param name="maxX">Maximum X value</param>
/// <param name="maxY">Maximum Y value</param>
/// <returns>Hashtable of hashtables containing map data elements</returns>
private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
{
Hashtable param = new Hashtable();
param["xmin"] = minX;
param["ymin"] = minY;
param["xmax"] = maxX;
param["ymax"] = maxY;
IList parameters = new ArrayList();
parameters.Add(param);
XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
XmlRpcResponse resp = req.Send(grid.GridServerURI, 3000);
Hashtable respData = (Hashtable)resp.Value;
return respData;
}
// Grid Request Processing
public XmlRpcResponse ExpectUser(XmlRpcRequest request)
{
Hashtable requestData = (Hashtable)request.Params[0];
AgentCircuitData agentData = new AgentCircuitData();
agentData.SessionID = new LLUUID((string)requestData["session_id"]);
agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
agentData.firstname = (string)requestData["firstname"];
agentData.lastname = (string)requestData["lastname"];
agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
{
agentData.child = true;
}
else
{
agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
agentData.child = false;
}
if (listeners.ContainsKey((ulong)requestData["regionhandle"]))
{
this.listeners[(ulong)requestData["regionhandle"]].TriggerExpectUser((ulong)requestData["regionhandle"], agentData);
}
else
{
OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
}
return new XmlRpcResponse();
}
#region InterRegion Comms
private void StartRemoting()
{
TcpChannel ch = new TcpChannel(8895);
ChannelServices.RegisterChannel(ch);
WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
RemotingConfiguration.RegisterWellKnownServiceType(wellType);
InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;
InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
}
#region Methods called by regions in this instance
public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
{
if (this.listeners.ContainsKey(regionHandle))
{
this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
return true;
}
//TODO need to see if we know about where this region is and use .net remoting
// to inform it.
return false;
}
public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
{
if (this.listeners.ContainsKey(regionHandle))
{
this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
return true;
}
//TODO need to see if we know about where this region is and use .net remoting
// to inform it.
return false;
}
#endregion
#region Methods triggered by calls from external instances
public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
{
if (this.listeners.ContainsKey(regionHandle))
{
this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
return true;
}
return false;
}
public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
{
if (this.listeners.ContainsKey(regionHandle))
{
this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
return true;
}
return false;
}
#endregion
#endregion
}
}

70
OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
View File

@@ -1,70 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
namespace OpenSim.Framework.Communications.OGS1
{
public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
public sealed class InterRegionSingleton
{
static readonly InterRegionSingleton instance = new InterRegionSingleton();
public event InformRegionChild OnChildAgent;
public event ExpectArrival OnArrival;
static InterRegionSingleton()
{
}
InterRegionSingleton()
{
}
public static InterRegionSingleton Instance
{
get
{
return instance;
}
}
public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
{
if (OnChildAgent != null)
{
return OnChildAgent(regionHandle, agentData);
}
return false;
}
public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
{
if (OnArrival != null)
{
return OnArrival(regionHandle, agentID, position);
}
return false;
}
}
public class OGS1InterRegionRemoting : MarshalByRefObject
{
public OGS1InterRegionRemoting()
{
}
public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
{
return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
}
public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
{
return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
}
}
}

25
OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
View File

@@ -1,25 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Data;
using libsecondlife;
namespace OpenSim.Framework.Communications.OGS1
{
public class OGSUserServices :IUserServices
{
public UserProfileData GetUserProfile(string firstName, string lastName)
{
return null;
}
public UserProfileData GetUserProfile(string name)
{
return null;
}
public UserProfileData GetUserProfile(LLUUID avatarID)
{
return null;
}
}
}

142
OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
View File

@@ -1,142 +0,0 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6109024D-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>OpenSim.Framework.Communications.OGS1</AssemblyName>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder>
<RootNamespace>OpenSim.Framework.Communications.OGS1</RootNamespace>
<StartupObject></StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile>
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
<OutputPath>..\..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn></NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile>
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn></NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="libsecondlife.dll" >
<HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" >
<HintPath>System.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Data" >
<HintPath>System.Data.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Runtime.Remoting" >
<HintPath>System.Runtime.Remoting.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Xml" >
<HintPath>System.Xml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="XMLRPC.dll" >
<HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\General\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name>
<Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Communications\OpenSim.Framework.Communications.csproj">
<Name>OpenSim.Framework.Communications</Name>
<Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
<Name>OpenSim.Framework.Data</Name>
<Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Servers\OpenSim.Framework.Servers.csproj">
<Name>OpenSim.Framework.Servers</Name>
<Project>{2CC71860-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="GridCommsManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OGS1GridServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OGSInterSimComms.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OGSUserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>

12
OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
View File

@@ -1,12 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>
<PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
</Project>

35
OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
View File

@@ -1,35 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

8
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -36,7 +36,7 @@ using Nwc.XmlRpc;
using System.Collections;
using OpenSim.Framework.Console;
namespace OpenSim.Servers
namespace OpenSim.Framework.Servers
{
public class BaseHttpServer
{
@@ -171,7 +171,7 @@ namespace OpenSim.Servers
protected virtual string ParseLLSDXML(string requestBody)
{
// dummy function for now - IMPLEMENT ME!
Console.WriteLine("LLSD request "+requestBody);
//Console.WriteLine("LLSD request "+requestBody);
string resp = "";
if (firstcaps)
{
@@ -195,7 +195,7 @@ namespace OpenSim.Servers
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
//Console.WriteLine(e.ToString());
}
return responseString;
}
@@ -273,7 +273,7 @@ namespace OpenSim.Servers
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
//Console.WriteLine(e.ToString());
}
}

2
OpenSim/Framework/Servers/CheckSumServer.cs
View File

@@ -40,7 +40,7 @@ using libsecondlife.Packets;
using OpenSim.Framework.Console;
namespace OpenSim.Servers
namespace OpenSim.Framework.Servers
{
/* public class CheckSumServer : UDPServerBase
{

2
OpenSim/Framework/Servers/IRestHandler.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Servers
namespace OpenSim.Framework.Servers
{
public delegate string RestMethod( string request, string path, string param );
}

2
OpenSim/Framework/Servers/UDPServerBase.cs
View File

@@ -38,7 +38,7 @@ using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
namespace OpenSim.Servers
namespace OpenSim.Framework.Servers
{
public class UDPServerBase
{

2
OpenSim/Framework/Servers/XmlRpcMethod.cs
View File

@@ -28,7 +28,7 @@
using System;
using Nwc.XmlRpc;
namespace OpenSim.Servers
namespace OpenSim.Framework.Servers
{
public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );
}