From f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 25 Apr 2007 13:03:48 +0000 Subject: Small clean up of files and directories --- OpenSim.Servers/LocalUserProfileManager.cs | 1 + OpenSim.Servers/LoginServer.cs | 1 + OpenSim.Servers/OpenGridProtocol.cs | 183 +++++++++++++++-------------- 3 files changed, 96 insertions(+), 89 deletions(-) (limited to 'OpenSim.Servers') diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/OpenSim.Servers/LocalUserProfileManager.cs index 6166e02..989af22 100644 --- a/OpenSim.Servers/LocalUserProfileManager.cs +++ b/OpenSim.Servers/LocalUserProfileManager.cs @@ -33,6 +33,7 @@ using OpenSim.Framework.User; using OpenSim.Framework.Grid; using OpenSim.Framework.Inventory; using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Types; using libsecondlife; namespace OpenSim.UserServer diff --git a/OpenSim.Servers/LoginServer.cs b/OpenSim.Servers/LoginServer.cs index 77f0dd8..c56dbc1 100644 --- a/OpenSim.Servers/LoginServer.cs +++ b/OpenSim.Servers/LoginServer.cs @@ -43,6 +43,7 @@ using OpenSim.Framework.Grid; using OpenSim.Framework.Inventory; using OpenSim.Framework.User; using OpenSim.Framework.Utilities; +using OpenSim.Framework.Types; namespace OpenSim.UserServer { diff --git a/OpenSim.Servers/OpenGridProtocol.cs b/OpenSim.Servers/OpenGridProtocol.cs index c3d7d5c..55c47b4 100644 --- a/OpenSim.Servers/OpenGridProtocol.cs +++ b/OpenSim.Servers/OpenGridProtocol.cs @@ -1,89 +1,94 @@ -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; - -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("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client"); - this.WriteLine("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("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("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(e.Message); - } - } - } -} +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; + +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("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client"); + this.WriteLine("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("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("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(e.Message); + } + } + } +} -- cgit v1.1