From 3f39648605a432aae6a8c9ff9fb5ee481b06035e Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 16 May 2007 15:46:22 +0000
Subject: More refactoring. Changed AuthenticateSession handling, now calls a
 method in UDPServer. (but is likely to change again soon)

---
 OpenSim.Servers/OpenGridProtocol.cs       | 95 -------------------------------
 OpenSim.Servers/OpenSim.Servers.csproj    | 40 +++++++------
 OpenSim.Servers/OpenSim.Servers.dll.build |  1 -
 3 files changed, 22 insertions(+), 114 deletions(-)
 delete mode 100644 OpenSim.Servers/OpenGridProtocol.cs

(limited to 'OpenSim.Servers')

diff --git a/OpenSim.Servers/OpenGridProtocol.cs b/OpenSim.Servers/OpenGridProtocol.cs
deleted file mode 100644
index 66ca497..0000000
--- a/OpenSim.Servers/OpenGridProtocol.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using Nwc.XmlRpc;
-using System.Collections;
-using OpenSim.Framework.Console;
-
-namespace OpenSim.Servers
-{
-    public class OpenGridProtocolServer
-    {
-
-        private Thread m_workerThread;
-        private Socket m_listenerSocket;
-        private IPEndPoint m_IPendpoint;
-
-        private int m_port;
-        private ArrayList m_clients;
-
-        private class ClientHandler
-        {
-            private Thread m_clientThread;
-            private Socket m_socketHandle;
-
-            public ClientHandler(Socket clientSocketHandle)
-            {
-                m_socketHandle = clientSocketHandle;
-                m_clientThread = new Thread(new ThreadStart(DoWork));
-                m_clientThread.IsBackground = true;
-                m_clientThread.Start();
-            }
-
-            private void DoWork()
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.NORMAL, "OpenSim 0.1, running OGS protocol 1.0");
-
-            }
-
-            private void WriteLine(string theline)
-            {
-                theline += "\n";
-                byte[] thelinebuffer = System.Text.Encoding.ASCII.GetBytes(theline.ToCharArray());
-                m_socketHandle.Send(thelinebuffer, theline.Length, 0);
-            }
-        }
-
-        public OpenGridProtocolServer(int port)
-        {
-            m_port = port;
-        }
-
-        public void Start()
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: Start() - Opening server socket");
-
-            m_clients = new ArrayList();
-            m_workerThread = new Thread(new ThreadStart(StartServerSocket));
-            m_workerThread.IsBackground = true;
-            m_workerThread.Start();
-        }
-
-        private void StartServerSocket()
-        {
-            try
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
-
-
-                m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
-                m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-                m_listenerSocket.Bind(m_IPendpoint);
-                m_listenerSocket.Listen(4);
-
-                Socket sockethandle;
-                while (true)
-                {
-                    sockethandle = m_listenerSocket.Accept();
-                    lock (m_clients.SyncRoot)
-                    {
-                        m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle));
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,e.Message);
-            }
-        }
-    }
-}
diff --git a/OpenSim.Servers/OpenSim.Servers.csproj b/OpenSim.Servers/OpenSim.Servers.csproj
index cacdb5d..182b558 100644
--- a/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/OpenSim.Servers/OpenSim.Servers.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
     <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Servers</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>OpenSim.Servers</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,18 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" >
+    <Reference Include="System">
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="libsecondlife.dll">
       <HintPath>..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -76,19 +83,19 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\OpenSim.Framework.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>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
       <Name>XMLRPC</Name>
       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -110,9 +117,6 @@
     <Compile Include="LoginServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenGridProtocol.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -124,4 +128,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenSim.Servers/OpenSim.Servers.dll.build b/OpenSim.Servers/OpenSim.Servers.dll.build
index 61475ec..4ad29dd 100644
--- a/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -17,7 +17,6 @@
                 <include name="LocalUserProfileManager.cs" />
                 <include name="LoginResponse.cs" />
                 <include name="LoginServer.cs" />
-                <include name="OpenGridProtocol.cs" />
                 <include name="XmlRpcMethod.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
-- 
cgit v1.1