From d4957dd9be8ef4484478510f5d3c6c974d3afe26 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 25 May 2009 01:59:50 +0000
Subject: Update svn properties.

---
 OpenSim/Framework/NetworkUtil.cs                   | 442 ++++++++++-----------
 .../Region/Framework/Interfaces/ITeleportModule.cs |  28 +-
 .../Resources/SimulatorServices.addin.xml          |  28 +-
 bin/config-include/Grid.ini                        |  12 +-
 bin/config-include/GridCommon.ini.example          |  34 +-
 bin/config-include/GridHypergrid.ini               |  20 +-
 bin/config-include/Standalone.ini                  |  20 +-
 bin/config-include/StandaloneCommon.ini.example    |  42 +-
 bin/config-include/StandaloneHypergrid.ini         |  30 +-
 9 files changed, 328 insertions(+), 328 deletions(-)

diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs
index e3fb009..351020b 100644
--- a/OpenSim/Framework/NetworkUtil.cs
+++ b/OpenSim/Framework/NetworkUtil.cs
@@ -1,221 +1,221 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Sockets;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Reflection;
-using log4net;
-
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// Handles NAT translation in a 'manner of speaking'
-    /// Allows you to return multiple different external
-    /// hostnames depending on the requestors network
-    /// 
-    /// This enables standard port forwarding techniques
-    /// to work correctly with OpenSim.
-    /// </summary>
-    public static class NetworkUtil
-    {
-        // Logger
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private static bool m_disabled = true;
-
-        public static bool Enabled
-        {
-            set { m_disabled = value; }
-            get { return m_disabled; }
-        }
-
-        // IPv4Address, Subnet
-        static readonly Dictionary<IPAddress,IPAddress> m_subnets = new Dictionary<IPAddress, IPAddress>();
-
-        public static IPAddress GetIPFor(IPAddress user, IPAddress simulator)
-        {
-            if(m_disabled)
-                return simulator;
-
-            // Check if we're accessing localhost.
-            foreach (IPAddress host in Dns.GetHostAddresses(Dns.GetHostName()))
-            {
-                if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork)
-                {
-                    m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + simulator + "'");
-                    return host;
-                }
-            }
-
-            // Check for same LAN segment
-            foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
-            {
-                byte[] subnetBytes = subnet.Value.GetAddressBytes();
-                byte[] localBytes = subnet.Key.GetAddressBytes();
-                byte[] destBytes = user.GetAddressBytes();
-
-                if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
-                    return null;
-
-                bool valid = true;
-
-                for (int i = 0; i < subnetBytes.Length; i++)
-                {
-                    if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
-                    {
-                        valid = false;
-                        break;
-                    }
-                }
-
-                if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
-                    valid = false;
-
-                if (valid)
-                {
-                    m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + simulator + "'");
-                    return subnet.Key;
-                }
-            }
-
-            // Otherwise, return outside address
-            return simulator;
-        }
-
-        private static IPAddress GetExternalIPFor(IPAddress destination, string defaultHostname)
-        {
-            // Adds IPv6 Support (Not that any of the major protocols supports it...)
-            if (destination.AddressFamily == AddressFamily.InterNetworkV6)
-            {
-                foreach (IPAddress host in Dns.GetHostAddresses(defaultHostname))
-                {
-                    if (host.AddressFamily == AddressFamily.InterNetworkV6)
-                    {
-                        m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'");
-                        return host;
-                    }
-                }
-            }
-
-            if(destination.AddressFamily != AddressFamily.InterNetwork)
-                return null;
-
-            // Check if we're accessing localhost.
-            foreach (KeyValuePair<IPAddress, IPAddress> pair in m_subnets)
-            {
-                IPAddress host = pair.Value;
-                if (host.Equals(destination) && host.AddressFamily == AddressFamily.InterNetwork)
-                {
-                    m_log.Info("[NATROUTING] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'");
-                    return destination;
-                }
-            }
-
-            // Check for same LAN segment
-            foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
-            {
-                byte[] subnetBytes = subnet.Value.GetAddressBytes();
-                byte[] localBytes = subnet.Key.GetAddressBytes();
-                byte[] destBytes = destination.GetAddressBytes();
-                
-                if(subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
-                    return null;
-
-                bool valid = true;
-
-                for(int i=0;i<subnetBytes.Length;i++)
-                {
-                    if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
-                    {
-                        valid = false;
-                        break;
-                    }
-                }
-
-                if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
-                    valid = false;
-
-                if (valid)
-                {
-                    m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + defaultHostname + "'");
-                    return subnet.Key;
-                }
-            }
-
-            // Check to see if we can find a IPv4 address.
-            foreach (IPAddress host in Dns.GetHostAddresses(defaultHostname))
-            {
-                if (host.AddressFamily == AddressFamily.InterNetwork)
-                    return host;
-            }
-
-            // Unable to find anything.
-            throw new ArgumentException("[NetworkUtil] Unable to resolve defaultHostname to an IPv4 address for an IPv4 client");
-        }
-
-        static NetworkUtil()
-        {
-            try
-            {
-                foreach (NetworkInterface ni in NetworkInterface.GetAllNetworkInterfaces())
-                {
-                    foreach (UnicastIPAddressInformation address in ni.GetIPProperties().UnicastAddresses)
-                    {
-                        if (address.Address.AddressFamily == AddressFamily.InterNetwork)
-                        {
-                            if (address.IPv4Mask != null)
-                            {
-                                m_subnets.Add(address.Address, address.IPv4Mask);
-                            }
-                        }
-                    }
-                }
-            }
-            catch (NotImplementedException)
-            {
-                // Mono Sucks.
-            }
-        }
-
-        public static IPAddress GetIPFor(IPEndPoint user, string defaultHostname)
-        {
-            if (!m_disabled)
-            {
-                // Try subnet matching
-                IPAddress rtn = GetExternalIPFor(user.Address, defaultHostname);
-                if (rtn != null)
-                    return rtn;
-            }
-
-            // Otherwise use the old algorithm
-            IPAddress ia;
-
-            if (IPAddress.TryParse(defaultHostname, out ia))
-                return ia;
-
-            ia = null;
-
-            foreach (IPAddress Adr in Dns.GetHostAddresses(defaultHostname))
-            {
-                if (Adr.AddressFamily == AddressFamily.InterNetwork)
-                {
-                    ia = Adr;
-                    break;
-                }
-            }
-
-            return ia;
-        }
-
-        public static string GetHostFor(IPAddress user, string defaultHostname)
-        {
-            if (!m_disabled)
-            {
-                IPAddress rtn = GetExternalIPFor(user, defaultHostname);
-                if (rtn != null)
-                    return rtn.ToString();
-            }
-            return defaultHostname;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Net.Sockets;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using log4net;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// Handles NAT translation in a 'manner of speaking'
+    /// Allows you to return multiple different external
+    /// hostnames depending on the requestors network
+    /// 
+    /// This enables standard port forwarding techniques
+    /// to work correctly with OpenSim.
+    /// </summary>
+    public static class NetworkUtil
+    {
+        // Logger
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private static bool m_disabled = true;
+
+        public static bool Enabled
+        {
+            set { m_disabled = value; }
+            get { return m_disabled; }
+        }
+
+        // IPv4Address, Subnet
+        static readonly Dictionary<IPAddress,IPAddress> m_subnets = new Dictionary<IPAddress, IPAddress>();
+
+        public static IPAddress GetIPFor(IPAddress user, IPAddress simulator)
+        {
+            if(m_disabled)
+                return simulator;
+
+            // Check if we're accessing localhost.
+            foreach (IPAddress host in Dns.GetHostAddresses(Dns.GetHostName()))
+            {
+                if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork)
+                {
+                    m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + simulator + "'");
+                    return host;
+                }
+            }
+
+            // Check for same LAN segment
+            foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
+            {
+                byte[] subnetBytes = subnet.Value.GetAddressBytes();
+                byte[] localBytes = subnet.Key.GetAddressBytes();
+                byte[] destBytes = user.GetAddressBytes();
+
+                if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
+                    return null;
+
+                bool valid = true;
+
+                for (int i = 0; i < subnetBytes.Length; i++)
+                {
+                    if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
+                    {
+                        valid = false;
+                        break;
+                    }
+                }
+
+                if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
+                    valid = false;
+
+                if (valid)
+                {
+                    m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + simulator + "'");
+                    return subnet.Key;
+                }
+            }
+
+            // Otherwise, return outside address
+            return simulator;
+        }
+
+        private static IPAddress GetExternalIPFor(IPAddress destination, string defaultHostname)
+        {
+            // Adds IPv6 Support (Not that any of the major protocols supports it...)
+            if (destination.AddressFamily == AddressFamily.InterNetworkV6)
+            {
+                foreach (IPAddress host in Dns.GetHostAddresses(defaultHostname))
+                {
+                    if (host.AddressFamily == AddressFamily.InterNetworkV6)
+                    {
+                        m_log.Info("[NetworkUtil] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'");
+                        return host;
+                    }
+                }
+            }
+
+            if(destination.AddressFamily != AddressFamily.InterNetwork)
+                return null;
+
+            // Check if we're accessing localhost.
+            foreach (KeyValuePair<IPAddress, IPAddress> pair in m_subnets)
+            {
+                IPAddress host = pair.Value;
+                if (host.Equals(destination) && host.AddressFamily == AddressFamily.InterNetwork)
+                {
+                    m_log.Info("[NATROUTING] Localhost user detected, sending them '" + host + "' instead of '" + defaultHostname + "'");
+                    return destination;
+                }
+            }
+
+            // Check for same LAN segment
+            foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
+            {
+                byte[] subnetBytes = subnet.Value.GetAddressBytes();
+                byte[] localBytes = subnet.Key.GetAddressBytes();
+                byte[] destBytes = destination.GetAddressBytes();
+                
+                if(subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
+                    return null;
+
+                bool valid = true;
+
+                for(int i=0;i<subnetBytes.Length;i++)
+                {
+                    if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
+                    {
+                        valid = false;
+                        break;
+                    }
+                }
+
+                if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
+                    valid = false;
+
+                if (valid)
+                {
+                    m_log.Info("[NetworkUtil] Local LAN user detected, sending them '" + subnet.Key + "' instead of '" + defaultHostname + "'");
+                    return subnet.Key;
+                }
+            }
+
+            // Check to see if we can find a IPv4 address.
+            foreach (IPAddress host in Dns.GetHostAddresses(defaultHostname))
+            {
+                if (host.AddressFamily == AddressFamily.InterNetwork)
+                    return host;
+            }
+
+            // Unable to find anything.
+            throw new ArgumentException("[NetworkUtil] Unable to resolve defaultHostname to an IPv4 address for an IPv4 client");
+        }
+
+        static NetworkUtil()
+        {
+            try
+            {
+                foreach (NetworkInterface ni in NetworkInterface.GetAllNetworkInterfaces())
+                {
+                    foreach (UnicastIPAddressInformation address in ni.GetIPProperties().UnicastAddresses)
+                    {
+                        if (address.Address.AddressFamily == AddressFamily.InterNetwork)
+                        {
+                            if (address.IPv4Mask != null)
+                            {
+                                m_subnets.Add(address.Address, address.IPv4Mask);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (NotImplementedException)
+            {
+                // Mono Sucks.
+            }
+        }
+
+        public static IPAddress GetIPFor(IPEndPoint user, string defaultHostname)
+        {
+            if (!m_disabled)
+            {
+                // Try subnet matching
+                IPAddress rtn = GetExternalIPFor(user.Address, defaultHostname);
+                if (rtn != null)
+                    return rtn;
+            }
+
+            // Otherwise use the old algorithm
+            IPAddress ia;
+
+            if (IPAddress.TryParse(defaultHostname, out ia))
+                return ia;
+
+            ia = null;
+
+            foreach (IPAddress Adr in Dns.GetHostAddresses(defaultHostname))
+            {
+                if (Adr.AddressFamily == AddressFamily.InterNetwork)
+                {
+                    ia = Adr;
+                    break;
+                }
+            }
+
+            return ia;
+        }
+
+        public static string GetHostFor(IPAddress user, string defaultHostname)
+        {
+            if (!m_disabled)
+            {
+                IPAddress rtn = GetExternalIPFor(user, defaultHostname);
+                if (rtn != null)
+                    return rtn.ToString();
+            }
+            return defaultHostname;
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Interfaces/ITeleportModule.cs b/OpenSim/Region/Framework/Interfaces/ITeleportModule.cs
index 5365094..6a34a1e 100644
--- a/OpenSim/Region/Framework/Interfaces/ITeleportModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITeleportModule.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenMetaverse;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
-    public interface ITeleportModule
-    {
-        void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
-                                                      Vector3 lookAt, uint teleportFlags);
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenMetaverse;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface ITeleportModule
+    {
+        void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
+                                                      Vector3 lookAt, uint teleportFlags);
+    }
+}
diff --git a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
index accc467..05f143d 100644
--- a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
+++ b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
@@ -1,14 +1,14 @@
-<Addin id="OpenSim.SimulatorServices" version="0.2">
-    <Runtime>
-        <Import assembly="OpenSim.SimulatorServices.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/RegionModules">
-        <RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" />
-    </Extension>
-
-</Addin>
+<Addin id="OpenSim.SimulatorServices" version="0.2">
+    <Runtime>
+        <Import assembly="OpenSim.SimulatorServices.dll"/>
+    </Runtime>
+
+    <Dependencies>
+        <Addin id="OpenSim" version="0.5" />
+    </Dependencies>
+
+    <Extension path = "/OpenSim/RegionModules">
+        <RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" />
+    </Extension>
+
+</Addin>
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 7f9db1c..6a339f2 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,6 +1,6 @@
-[Includes]
-    Include-Common = "config-include/GridCommon.ini"
-
-[Modules]
-    AssetServices = "RemoteAssetServicesConnector"
-
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    AssetServices = "RemoteAssetServicesConnector"
+
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 0e95f35..de57c98 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,17 +1,17 @@
-[Modules]
-    AssetCaching = "CoreAssetCache"
-
-[AssetCache]
-    ; Number of buckets for assets
-    CacheBuckets = 32768
-
-[AssetService]
-
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-    ;
-    ; change this to your grid-wide asset server
-    ;
-    AssetServerURI = "http://myassetserver.com:8003"
-
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 32768
+
+[AssetService]
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+    ;
+    ; change this to your grid-wide asset server
+    ;
+    AssetServerURI = "http://myassetserver.com:8003"
+
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5a93b79..e21f306 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,10 +1,10 @@
-[Includes]
-    Include-Common = "config-include/GridCommon.ini"
-
-[Modules]
-    AssetServices = "HGAssetBroker"
-
-
-[AssetService]
-    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
+[Modules]
+    AssetServices = "HGAssetBroker"
+
+
+[AssetService]
+    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c35cda9..dd9fdb5 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,10 +1,10 @@
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-
-[Modules]
-    AssetServices = "LocalAssetServicesConnector"
-
-
-[AssetService]
-    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
+
+[Modules]
+    AssetServices = "LocalAssetServicesConnector"
+
+
+[AssetService]
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a14c653..001b3a0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,21 +1,21 @@
-[Modules]
-    AssetCaching = "CoreAssetCache"
-
-[AssetCache]
-    ; Number of buckets for assets
-    CacheBuckets = 16384
-
-[AssetService]
-    ;
-    ;### Choose the DB
-    ;
-    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
-
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-
+[Modules]
+    AssetCaching = "CoreAssetCache"
+
+[AssetCache]
+    ; Number of buckets for assets
+    CacheBuckets = 16384
+
+[AssetService]
+    ;
+    ;### Choose the DB
+    ;
+    ;--- For SQLite
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+    ;--- For MySql
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 975132b..a97ac7b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,15 +1,15 @@
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-
-[Modules]
-    AssetServices = "HGAssetBroker"
-
-
-[AssetService]
-    ; For the RegionAssetService
-    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
-
-    ; For HGAssetBroker
-    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
-
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
+
+[Modules]
+    AssetServices = "HGAssetBroker"
+
+
+[AssetService]
+    ; For the RegionAssetService
+    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
+
+    ; For HGAssetBroker
+    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+
-- 
cgit v1.1