OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rolling back #6139 because there is no consensus on it's application. 

Reverted pending further discussion.
0.6.0-stable
Melanie Thielker 2008-09-06 04:35:33 +00:00
parent b6b1e9e214
commit a7e2d14454
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -30,7 +30,6 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading;
using System.Reflection; using System.Reflection;
using libsecondlife.Packets; using libsecondlife.Packets;
using log4net; using log4net;
@ -70,8 +69,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected AssetCache m_assetCache; protected AssetCache m_assetCache;
protected AgentCircuitManager m_authenticateSessionsClass; protected AgentCircuitManager m_authenticateSessionsClass;
protected Queue<Packet> CreateUserPacket = new Queue<Packet>();
public LLPacketServer PacketServer public LLPacketServer PacketServer
{ {
get { return m_packetServer; } get { return m_packetServer; }
@ -239,6 +236,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// new client // new client
m_log.Debug("[UDPSERVER]: Adding New Client"); m_log.Debug("[UDPSERVER]: Adding New Client");
AddNewClient(packet);
UseCircuitCodePacket p = (UseCircuitCodePacket)packet; UseCircuitCodePacket p = (UseCircuitCodePacket)packet;
@ -250,14 +248,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ack_it.Packets[0].ID = packet.Header.Sequence; ack_it.Packets[0].ID = packet.Header.Sequence;
ack_it.Header.Reliable = false; ack_it.Header.Reliable = false;
SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code); SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code);
// toss it to a worker thread so IOthread can go home
lock (CreateUserPacket)
{
CreateUserPacket.Enqueue(packet);
}
WaitCallback createUserCallback = new WaitCallback(AddNewClient);
ThreadPool.QueueUserWorkItem(createUserCallback);
} }
} }
catch (Exception e) catch (Exception e)
@ -321,22 +311,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
/// <summary>
/// target of workerthread delegate to create a new user.
/// It assumes we get fired for each new user packet that comes in.
/// </summary>
/// <param name="o"></param>
protected void AddNewClient(object o)
{
Packet packet;
lock (CreateUserPacket)
{
packet = CreateUserPacket.Dequeue();
}
if (null != packet)
AddNewClient(packet);
}
protected virtual void AddNewClient(Packet packet) protected virtual void AddNewClient(Packet packet)
{ {
//Slave regions don't accept new clients //Slave regions don't accept new clients