From 67bbfadc06f36b5175cd5f7268ba876769667dca Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 2 May 2008 18:26:19 +0000
Subject: * More refactorings of UDPServer. * Removed all references where
possible. * Renamed lots of variables from UDPServerXYZ to clientServerXYZ
---
ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 22 ++++++++++------------
ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | 2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
(limited to 'ThirdParty/3Di')
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 668b413..9bccc0b 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -39,7 +39,6 @@ using Mono.Addins;
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
-//using OpenSim.Region.ClientStack.LindenUDP;
using OpenSim.Region.ClientStack;
using OpenSim.Region.ClientStack.LindenUDP;
using OpenSim.Region.Environment.Scenes;
@@ -88,7 +87,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
AsynchronousSocketListener.PacketHandler = new AsynchronousSocketListener.PacketRecieveHandler(SynchronizePacketRecieve);
sceneManager = openSim.SceneManager;
- m_clientServers = openSim.UdpServers;
+ m_clientServers = openSim.ClientServers;
regionData = openSim.RegionData;
simMain = openSim;
commandServer = openSim.HttpServer;
@@ -390,7 +389,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
return result;
}
- private IClientNetworkServer SearchUDPServerFromPortNum(int portnum)
+ private IClientNetworkServer SearchClientServerFromPortNum(int portnum)
{
return m_clientServers.Find(delegate(IClientNetworkServer server) { return (portnum + proxyOffset == ((IPEndPoint)server.Server.LocalEndPoint).Port); });
}
@@ -522,12 +521,11 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
Scene scene = null;
string[] files = null;
IClientAPI controller = null;
- IClientNetworkServer udpserv = null;
+ IClientNetworkServer clientserv = null;
if (sceneManager.TryGetScene(dst_region.RegionID, out scene))
{
- // search udpserver
- udpserv = SearchUDPServerFromPortNum(scene.RegionInfo.InternalEndPoint.Port);
+ clientserv = SearchClientServerFromPortNum(scene.RegionInfo.InternalEndPoint.Port);
// restore the scene presence
for (int i = 0;; i++)
@@ -565,9 +563,9 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
// BUG: Will only work with LLUDPServer.
// TODO: This needs to be abstracted and converted into IClientNetworkServer
- if (udpserv is LLUDPServer)
+ if (clientserv is LLUDPServer)
{
- ((LLUDPServer) udpserv).RestoreClient(agentdata, data.userEP, data.proxyEP);
+ ((LLUDPServer) clientserv).RestoreClient(agentdata, data.userEP, data.proxyEP);
}
// waiting for the scene-presense restored
@@ -627,12 +625,12 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
}
// Shutting down the UDP server
- IClientNetworkServer udpsvr = SearchUDPServerFromPortNum(port);
+ IClientNetworkServer clientsvr = SearchClientServerFromPortNum(port);
- if (udpsvr != null)
+ if (clientsvr != null)
{
- udpsvr.Server.Close();
- m_clientServers.Remove(udpsvr);
+ clientsvr.Server.Close();
+ m_clientServers.Remove(clientsvr);
}
}
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
index eaafe6c..e8ae8a9 100644
--- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
+++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
@@ -295,7 +295,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
try
{
- m_log.InfoFormat("[PROXY] Opening UDP socket on {0}", sd.clientEP);
+ m_log.InfoFormat("[PROXY] Opening special UDP socket on {0}", sd.clientEP);
sd.serverIP = new IPEndPoint(IPAddress.Parse("0.0.0.0"), ((IPEndPoint) sd.clientEP).Port);
sd.server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
sd.server.Bind(sd.serverIP);
--
cgit v1.1