aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs10
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientViewBase.cs8
-rw-r--r--OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs12
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs14
8 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index bb4dccd..ee6d741 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -245,7 +245,7 @@ namespace OpenSim
245 } 245 }
246 catch (Exception e) 246 catch (Exception e)
247 { 247 {
248 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString()); 248 OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
249 } 249 }
250 } 250 }
251 251
@@ -271,7 +271,7 @@ namespace OpenSim
271 } 271 }
272 catch (Exception e) 272 catch (Exception e)
273 { 273 {
274 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString()); 274 OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
275 } 275 }
276 } 276 }
277 277
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 219cdae..4a1b6ad 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -55,7 +55,7 @@ namespace OpenSim
55 55
56 protected virtual bool Logout(ClientView simClient, Packet packet) 56 protected virtual bool Logout(ClientView simClient, Packet packet)
57 { 57 {
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request"); 58 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
59 //send reply to let the client logout 59 //send reply to let the client logout
60 LogoutReplyPacket logReply = new LogoutReplyPacket(); 60 LogoutReplyPacket logReply = new LogoutReplyPacket();
61 logReply.AgentData.AgentID = this.AgentID; 61 logReply.AgentData.AgentID = this.AgentID;
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 601fd97..d53832f 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -191,7 +191,7 @@ namespace OpenSim
191 191
192 #region Objects/Prims 192 #region Objects/Prims
193 case PacketType.ObjectLink: 193 case PacketType.ObjectLink:
194 // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); 194 // OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
195 ObjectLinkPacket link = (ObjectLinkPacket)Pack; 195 ObjectLinkPacket link = (ObjectLinkPacket)Pack;
196 uint parentprimid = 0; 196 uint parentprimid = 0;
197 List<uint> childrenprims = new List<uint>(); 197 List<uint> childrenprims = new List<uint>();
@@ -514,7 +514,7 @@ namespace OpenSim
514 //Console.WriteLine(Pack.ToString()); 514 //Console.WriteLine(Pack.ToString());
515 break; 515 break;
516 case PacketType.ObjectScale: 516 case PacketType.ObjectScale:
517 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); 517 //OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
518 break; 518 break;
519 #endregion 519 #endregion
520 } 520 }
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index c5f0a1d..b089bdc 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -90,7 +90,7 @@ namespace OpenSim
90 m_inventoryCache = inventoryCache; 90 m_inventoryCache = inventoryCache;
91 m_authenticateSessionsHandler = authenSessions; 91 m_authenticateSessionsHandler = authenSessions;
92 92
93 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); 93 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
94 cirpack = initialcirpack; 94 cirpack = initialcirpack;
95 userEP = remoteEP; 95 userEP = remoteEP;
96 96
@@ -188,7 +188,7 @@ namespace OpenSim
188 188
189 protected virtual void ClientLoop() 189 protected virtual void ClientLoop()
190 { 190 {
191 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop"); 191 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
192 while (true) 192 while (true)
193 { 193 {
194 QueItem nextPacket = PacketQueue.Dequeue(); 194 QueItem nextPacket = PacketQueue.Dequeue();
@@ -210,7 +210,7 @@ namespace OpenSim
210 210
211 protected virtual void InitNewClient() 211 protected virtual void InitNewClient()
212 { 212 {
213 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); 213 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
214 this.m_world.AddNewAvatar(this, this.AgentID, false); 214 this.m_world.AddNewAvatar(this, this.AgentID, false);
215 } 215 }
216 216
@@ -221,12 +221,12 @@ namespace OpenSim
221 if (!sessionInfo.Authorised) 221 if (!sessionInfo.Authorised)
222 { 222 {
223 //session/circuit not authorised 223 //session/circuit not authorised
224 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); 224 OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
225 ClientThread.Abort(); 225 ClientThread.Abort();
226 } 226 }
227 else 227 else
228 { 228 {
229 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); 229 OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
230 //session is authorised 230 //session is authorised
231 this.AgentID = cirpack.CircuitCode.ID; 231 this.AgentID = cirpack.CircuitCode.ID;
232 this.SessionID = cirpack.CircuitCode.SessionID; 232 this.SessionID = cirpack.CircuitCode.SessionID;
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
index facb3fa..8b503f0 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
@@ -159,7 +159,7 @@ namespace OpenSim
159 } 159 }
160 catch (Exception) 160 catch (Exception)
161 { 161 {
162 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); 162 OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
163 this.KillThread(); 163 this.KillThread();
164 } 164 }
165 165
@@ -254,7 +254,7 @@ namespace OpenSim
254 { 254 {
255 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) 255 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
256 { 256 {
257 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " + 257 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
258 (now - packet.TickCount) + "ms have passed"); 258 (now - packet.TickCount) + "ms have passed");
259 259
260 packet.Header.Resent = true; 260 packet.Header.Resent = true;
@@ -273,11 +273,11 @@ namespace OpenSim
273 if (PendingAcks.Count > 250) 273 if (PendingAcks.Count > 250)
274 { 274 {
275 // FIXME: Handle the odd case where we have too many pending ACKs queued up 275 // FIXME: Handle the odd case where we have too many pending ACKs queued up
276 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!"); 276 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Too many ACKs queued up!");
277 return; 277 return;
278 } 278 }
279 279
280 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck"); 280 //OpenSim.Framework.Console.MainLog.Instance.WriteLine("Sending PacketAck");
281 281
282 282
283 int i = 0; 283 int i = 0;
diff --git a/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs b/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
index 635bbdf..407ebe0 100644
--- a/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
@@ -60,7 +60,7 @@ namespace OpenSim
60 attri = configData.GetAttribute("GridServerURL"); 60 attri = configData.GetAttribute("GridServerURL");
61 if (attri == "") 61 if (attri == "")
62 { 62 {
63 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); 63 this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
64 configData.SetAttribute("GridServerURL", this.GridURL); 64 configData.SetAttribute("GridServerURL", this.GridURL);
65 } 65 }
66 else 66 else
@@ -73,7 +73,7 @@ namespace OpenSim
73 attri = configData.GetAttribute("GridSendKey"); 73 attri = configData.GetAttribute("GridSendKey");
74 if (attri == "") 74 if (attri == "")
75 { 75 {
76 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server", "null"); 76 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
77 configData.SetAttribute("GridSendKey", this.GridSendKey); 77 configData.SetAttribute("GridSendKey", this.GridSendKey);
78 } 78 }
79 else 79 else
@@ -86,7 +86,7 @@ namespace OpenSim
86 attri = configData.GetAttribute("GridRecvKey"); 86 attri = configData.GetAttribute("GridRecvKey");
87 if (attri == "") 87 if (attri == "")
88 { 88 {
89 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server", "null"); 89 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
90 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 90 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
91 } 91 }
92 else 92 else
@@ -98,7 +98,7 @@ namespace OpenSim
98 attri = configData.GetAttribute("AssetServerURL"); 98 attri = configData.GetAttribute("AssetServerURL");
99 if (attri == "") 99 if (attri == "")
100 { 100 {
101 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); 101 this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
102 configData.SetAttribute("AssetServerURL", this.GridURL); 102 configData.SetAttribute("AssetServerURL", this.GridURL);
103 } 103 }
104 else 104 else
@@ -111,8 +111,8 @@ namespace OpenSim
111 } 111 }
112 catch (Exception e) 112 catch (Exception e)
113 { 113 {
114 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Config.cs:InitConfig() - Exception occured"); 114 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); 115 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
116 } 116 }
117 } 117 }
118 } 118 }
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
index 8509dcc..fd16e93 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
@@ -76,7 +76,7 @@ namespace OpenSim
76 protected BaseHttpServer httpServer; 76 protected BaseHttpServer httpServer;
77 protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>(); 77 protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();
78 78
79 protected ConsoleBase m_console; 79 protected LogBase m_log;
80 80
81 public RegionApplicationBase() 81 public RegionApplicationBase()
82 { 82 {
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 54ec480..002e664 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -68,7 +68,7 @@ namespace OpenSim
68 protected IWorld m_localWorld; 68 protected IWorld m_localWorld;
69 protected AssetCache m_assetCache; 69 protected AssetCache m_assetCache;
70 protected InventoryCache m_inventoryCache; 70 protected InventoryCache m_inventoryCache;
71 protected ConsoleBase m_console; 71 protected LogBase m_log;
72 protected AuthenticateSessionsBase m_authenticateSessionsClass; 72 protected AuthenticateSessionsBase m_authenticateSessionsClass;
73 73
74 public PacketServer PacketServer 74 public PacketServer PacketServer
@@ -96,12 +96,12 @@ namespace OpenSim
96 { 96 {
97 } 97 }
98 98
99 public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, ConsoleBase console, AuthenticateSessionsBase authenticateClass) 99 public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AuthenticateSessionsBase authenticateClass)
100 { 100 {
101 listenPort = port; 101 listenPort = port;
102 this.m_assetCache = assetCache; 102 this.m_assetCache = assetCache;
103 this.m_inventoryCache = inventoryCache; 103 this.m_inventoryCache = inventoryCache;
104 this.m_console = console; 104 this.m_log = console;
105 this.m_authenticateSessionsClass = authenticateClass; 105 this.m_authenticateSessionsClass = authenticateClass;
106 this.CreatePacketServer(); 106 this.CreatePacketServer();
107 107
@@ -135,7 +135,7 @@ namespace OpenSim
135 } 135 }
136 else 136 else
137 { // invalid client 137 { // invalid client
138 Console.Error.WriteLine("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); 138 m_log.Warn("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
139 } 139 }
140 140
141 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 141 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
@@ -151,20 +151,20 @@ namespace OpenSim
151 151
152 public void ServerListener() 152 public void ServerListener()
153 { 153 {
154 m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); 154 m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
155 155
156 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort); 156 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
157 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 157 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
158 Server.Bind(ServerIncoming); 158 Server.Bind(ServerIncoming);
159 159
160 m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); 160 m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
161 161
162 ipeSender = new IPEndPoint(IPAddress.Any, 0); 162 ipeSender = new IPEndPoint(IPAddress.Any, 0);
163 epSender = (EndPoint)ipeSender; 163 epSender = (EndPoint)ipeSender;
164 ReceivedData = new AsyncCallback(this.OnReceivedData); 164 ReceivedData = new AsyncCallback(this.OnReceivedData);
165 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 165 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
166 166
167 m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - Listening..."); 167 m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");
168 168
169 } 169 }
170 170