set svn:eol-style

afrisby
Jeff Ames 2007-11-29 01:57:59 +00:00
parent 40dc1ac3b0
commit 2364e6779b
1 changed files with 195 additions and 195 deletions

View File

@ -1,195 +1,195 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System; using System;
using System.Globalization; using System.Globalization;
using System.Net; using System.Net;
using System.Xml; using System.Xml;
using System.Net.Sockets; using System.Net.Sockets;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
[Serializable] [Serializable]
public class SearializableRegionInfo public class SearializableRegionInfo
{ {
public SearializableRegionInfo() public SearializableRegionInfo()
{ {
} }
public SearializableRegionInfo(RegionInfo ConvertFrom) public SearializableRegionInfo(RegionInfo ConvertFrom)
{ {
m_regionLocX = ConvertFrom.RegionLocX; m_regionLocX = ConvertFrom.RegionLocX;
m_regionLocY = ConvertFrom.RegionLocY; m_regionLocY = ConvertFrom.RegionLocY;
m_internalEndPoint = ConvertFrom.InternalEndPoint; m_internalEndPoint = ConvertFrom.InternalEndPoint;
m_externalHostName = ConvertFrom.ExternalHostName; m_externalHostName = ConvertFrom.ExternalHostName;
m_remotingPort = ConvertFrom.RemotingPort; m_remotingPort = ConvertFrom.RemotingPort;
RemotingAddress = ConvertFrom.RemotingAddress; RemotingAddress = ConvertFrom.RemotingAddress;
} }
public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
m_internalEndPoint = internalEndPoint; m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri; m_externalHostName = externalUri;
} }
public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, int port) public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, int port)
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
m_externalHostName = externalUri; m_externalHostName = externalUri;
m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
} }
public LLUUID RegionID = LLUUID.Zero; public LLUUID RegionID = LLUUID.Zero;
public uint m_remotingPort; public uint m_remotingPort;
public uint RemotingPort public uint RemotingPort
{ {
get get
{ {
return m_remotingPort; return m_remotingPort;
} }
set set
{ {
m_remotingPort = value; m_remotingPort = value;
} }
} }
public string RemotingAddress; public string RemotingAddress;
public IPEndPoint ExternalEndPoint public IPEndPoint ExternalEndPoint
{ {
get get
{ {
// Old one defaults to IPv6 // Old one defaults to IPv6
//return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port ); //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port );
IPAddress ia = null; IPAddress ia = null;
// If it is already an IP, don't resolve it - just return directly // If it is already an IP, don't resolve it - just return directly
if (IPAddress.TryParse(m_externalHostName, out ia)) if (IPAddress.TryParse(m_externalHostName, out ia))
return new IPEndPoint(ia, m_internalEndPoint.Port); return new IPEndPoint(ia, m_internalEndPoint.Port);
// Reset for next check // Reset for next check
ia = null; ia = null;
// New method favors IPv4 // New method favors IPv4
foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
{ {
if (ia == null) if (ia == null)
ia = Adr; ia = Adr;
if (Adr.AddressFamily == AddressFamily.InterNetwork) if (Adr.AddressFamily == AddressFamily.InterNetwork)
{ {
ia = Adr; ia = Adr;
break; break;
} }
} }
return new IPEndPoint(ia, m_internalEndPoint.Port); return new IPEndPoint(ia, m_internalEndPoint.Port);
} }
set set
{ {
m_externalHostName = value.ToString(); m_externalHostName = value.ToString();
} }
} }
protected string m_externalHostName; protected string m_externalHostName;
public string ExternalHostName public string ExternalHostName
{ {
get get
{ {
return m_externalHostName; return m_externalHostName;
} }
set set
{ {
m_externalHostName = value; m_externalHostName = value;
} }
} }
protected IPEndPoint m_internalEndPoint; protected IPEndPoint m_internalEndPoint;
public IPEndPoint InternalEndPoint public IPEndPoint InternalEndPoint
{ {
get get
{ {
return m_internalEndPoint; return m_internalEndPoint;
} }
set set
{ {
m_internalEndPoint = value; m_internalEndPoint = value;
} }
} }
protected uint? m_regionLocX; protected uint? m_regionLocX;
public uint RegionLocX public uint RegionLocX
{ {
get get
{ {
return m_regionLocX.Value; return m_regionLocX.Value;
} }
set set
{ {
m_regionLocX = value; m_regionLocX = value;
} }
} }
protected uint? m_regionLocY; protected uint? m_regionLocY;
public uint RegionLocY public uint RegionLocY
{ {
get get
{ {
return m_regionLocY.Value; return m_regionLocY.Value;
} }
set set
{ {
m_regionLocY = value; m_regionLocY = value;
} }
} }
public ulong RegionHandle public ulong RegionHandle
{ {
get get
{ {
return Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); return Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
} }
} }
} }
} }