ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

In an attempt to solve multihomed UDP problem I seem to have bound UDP socket to external IP instead of internal :)

Browse Source
This commit is contained in:
Tedd Hansen
2008-02-02 16:03:10 +00:00
parent 2d6c21e8fc
commit 3a6405d2f7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/RegionInfo.cs
View File

@@ -167,7 +167,7 @@ namespace OpenSim.Framework
public bool isSandbox = false; public bool isSandbox = false;
public bool commFailTF = false; public bool commFailTF = false;
public bool m_allow_alternate_ports; // public bool m_allow_alternate_ports;
public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
public LLUUID CovenantID = LLUUID.Zero; public LLUUID CovenantID = LLUUID.Zero;

6
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@@ -109,9 +109,9 @@ namespace OpenSim.Region.ClientStack
protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions) protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions)
{ {
AgentCircuitManager circuitManager = new AgentCircuitManager(); AgentCircuitManager circuitManager = new AgentCircuitManager();
IPAddress listenIP; IPAddress listenIP = regionInfo.InternalEndPoint.Address;
if (!IPAddress.TryParse(regionInfo.ExternalHostName, out listenIP)) //if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
listenIP = IPAddress.Parse("0.0.0.0"); // listenIP = IPAddress.Parse("0.0.0.0");
uint port = (uint) regionInfo.InternalEndPoint.Port; uint port = (uint) regionInfo.InternalEndPoint.Port;
udpServer = new UDPServer(listenIP, ref port, regionInfo.m_allow_alternate_ports, m_assetCache, m_log, circuitManager); udpServer = new UDPServer(listenIP, ref port, regionInfo.m_allow_alternate_ports, m_assetCache, m_log, circuitManager);

4
OpenSim/Region/ClientStack/UDPServer.cs
View File

@@ -260,7 +260,7 @@ namespace OpenSim.Region.ClientStack
for (uint i = 0; i < 20; i++) for (uint i = 0; i < 20; i++)
{ {
newPort = listenPort + i; newPort = listenPort + i;
m_log.Verbose("SERVER", "Opening UDP socket on " + listenIP.ToString() + " " + newPort + ". Allow alternate ports: " + Allow_Alternate_Port.ToString()); m_log.Verbose("SERVER", "Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString());
try try
{ {
ServerIncoming = new IPEndPoint(listenIP, (int) newPort); ServerIncoming = new IPEndPoint(listenIP, (int) newPort);
@@ -272,7 +272,7 @@ namespace OpenSim.Region.ClientStack
catch (Exception ex) catch (Exception ex)
{ {
// We are not looking for alternate ports? // We are not looking for alternate ports?
if (!Allow_Alternate_Port) //if (!Allow_Alternate_Port)
throw (ex); throw (ex);
// We are looking for alternate ports! // We are looking for alternate ports!