From 35b450d41d2695aa6a82a6d8e6bda5e327f431e1 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 31 May 2009 18:35:00 +0000 Subject: Add copyright headers, formatting cleanup, ignore some generated files. --- OpenSim/Framework/Console/RemoteConsole.cs | 2 +- OpenSim/Framework/NetworkUtil.cs | 37 +++++++++++++++++++--- .../Framework/Servers/Tests/VersionInfoTests.cs | 29 ++++++++++++++++- OpenSim/Framework/Util.cs | 2 +- 4 files changed, 62 insertions(+), 8 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index 5a57a3c..7e682fc 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs @@ -83,7 +83,7 @@ namespace OpenSim.Framework.Console m_DataEvent.WaitOne(); - lock(m_InputData) + lock (m_InputData) { if (m_InputData.Count == 0) { diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs index 351020b..5fe343d 100644 --- a/OpenSim/Framework/NetworkUtil.cs +++ b/OpenSim/Framework/NetworkUtil.cs @@ -1,4 +1,31 @@ -using System; +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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 + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; using System.Collections.Generic; using System.Net.Sockets; using System.Net; @@ -34,7 +61,7 @@ namespace OpenSim.Framework public static IPAddress GetIPFor(IPAddress user, IPAddress simulator) { - if(m_disabled) + if (m_disabled) return simulator; // Check if we're accessing localhost. @@ -97,7 +124,7 @@ namespace OpenSim.Framework } } - if(destination.AddressFamily != AddressFamily.InterNetwork) + if (destination.AddressFamily != AddressFamily.InterNetwork) return null; // Check if we're accessing localhost. @@ -118,12 +145,12 @@ namespace OpenSim.Framework byte[] localBytes = subnet.Key.GetAddressBytes(); byte[] destBytes = destination.GetAddressBytes(); - if(subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length) + if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length) return null; bool valid = true; - for(int i=0;i