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

Configuration of PhysicsSyncServerAddress and port in regions file

dsg
Robert Adams 2011-01-21 12:28:12 -08:00
parent 677889d3b6
commit 3123671651
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/RegionInfo.cs
View File

@ -393,6 +393,9 @@ namespace OpenSim.Framework
//IP:port for the avatar sync server this actor is configured to connect to //IP:port for the avatar sync server this actor is configured to connect to
private string m_avatarSyncServerAddr = String.Empty; private string m_avatarSyncServerAddr = String.Empty;
private int m_avatarSyncServerPort; private int m_avatarSyncServerPort;
//IP:port for the physics sync server this actor is configured to connect to
private string m_physicsSyncServerAddr = String.Empty;
private int m_physicsSyncServerPort;
private uint m_quarkLocX; private uint m_quarkLocX;
private uint m_quarkLocY; private uint m_quarkLocY;
//end of SYMMETRIC SYNC //end of SYMMETRIC SYNC
@ -703,6 +706,14 @@ namespace OpenSim.Framework
{ {
get { return m_avatarSyncServerPort; } get { return m_avatarSyncServerPort; }
} }
public string PhysicsSyncServerAddress
{
get { return m_physicsSyncServerAddr; }
}
public int PhysicsSyncServerPort
{
get { return m_physicsSyncServerPort; }
}
public uint SyncQuarkLocationX public uint SyncQuarkLocationX
{ {
@ -884,6 +895,11 @@ namespace OpenSim.Framework
if (m_avatarSyncServerPort == -1) if (m_avatarSyncServerPort == -1)
m_avatarSyncServerAddr = String.Empty; m_avatarSyncServerAddr = String.Empty;
m_physicsSyncServerAddr = config.GetString("PhysicsSyncServerAddress", String.Empty);
m_physicsSyncServerPort = config.GetInt("PhysicsSyncServerPort", -1);
if (m_physicsSyncServerPort == -1)
m_physicsSyncServerAddr = String.Empty;
string quarkLocation = config.GetString("SyncQuarkLocation", "1000,1000"); string quarkLocation = config.GetString("SyncQuarkLocation", "1000,1000");
string[] quarkLocElements = location.Split(new char[] { ',' }); string[] quarkLocElements = location.Split(new char[] { ',' });

20
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
View File

@ -105,10 +105,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
m_log.Debug(LogHeader + " Init PEToSceneConnectorModule, for local scene " + scene.RegionInfo.RegionName); m_log.Debug(LogHeader + " Init PEToSceneConnectorModule, for local scene " + scene.RegionInfo.RegionName);
string configString = scene.RegionInfo.RegionName + "_SceneToPESyncServerIP"; // string configString = scene.RegionInfo.RegionName + "_SceneToPESyncServerIP";
m_serveraddr = syncConfig.GetString(configString, "127.0.0.1"); // m_serveraddr = syncConfig.GetString(configString, "127.0.0.1");
configString = scene.RegionInfo.RegionName + "_SceneToPESyncServerPort"; // configString = scene.RegionInfo.RegionName + "_SceneToPESyncServerPort";
m_serverport = syncConfig.GetInt(configString, 13000); // m_serverport = syncConfig.GetInt(configString, 13000);
m_scene = scene; m_scene = scene;
m_scene.RegisterModuleInterface<IPhysEngineToSceneConnectorModule>(this); m_scene.RegisterModuleInterface<IPhysEngineToSceneConnectorModule>(this);
@ -133,8 +133,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
InstallInterfaces(); InstallInterfaces();
SyncStart(null); // fake a 'phys start' to get things going
m_log.Warn(LogHeader + " Initialised"); m_log.Warn(LogHeader + " Initialised");
// collect all the scenes for later routing // collect all the scenes for later routing
@ -149,6 +147,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
if (!m_active) if (!m_active)
return; return;
Start(); // fake a 'phys start' to get things going
//m_log.Warn(LogHeader + " Post-Initialised"); //m_log.Warn(LogHeader + " Post-Initialised");
} }
@ -364,6 +364,14 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
private void SyncStart(Object[] args) private void SyncStart(Object[] args)
{ {
Start();
}
private void Start()
{
m_serveraddr = m_scene.RegionInfo.PhysicsSyncServerAddress;
m_serverport = m_scene.RegionInfo.PhysicsSyncServerPort;
lock (m_client_lock) lock (m_client_lock)
{ {
//m_log.Warn(LogHeader + " Starting synchronization"); //m_log.Warn(LogHeader + " Starting synchronization");

12
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
View File

@ -118,11 +118,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
DefaultPort++; DefaultPort++;
//Get sync server info for Physics Engine actors //Get sync server info for Physics Engine actors
string peServerAddr = scene.RegionInfo.RegionName + "_SceneToPESyncServerIP"; // string peServerAddr = scene.RegionInfo.RegionName + "_SceneToPESyncServerIP";
m_peSyncServeraddr = syncConfig.GetString(peServerAddr, "127.0.0.1"); // m_peSyncServeraddr = syncConfig.GetString(peServerAddr, "127.0.0.1");
string peServerPort = scene.RegionInfo.RegionName + "_SceneToPESyncServerPort"; // string peServerPort = scene.RegionInfo.RegionName + "_SceneToPESyncServerPort";
m_peSyncServerport = syncConfig.GetInt(peServerPort, DefaultPort); // m_peSyncServerport = syncConfig.GetInt(peServerPort, DefaultPort);
DefaultPort++; // DefaultPort++;
// m_symsync = syncConfig.GetBoolean("SymSync", false); // m_symsync = syncConfig.GetBoolean("SymSync", false);
@ -190,6 +190,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
m_sceneToSESyncServer.Start(); m_sceneToSESyncServer.Start();
} }
m_peSyncServeraddr = m_scene.RegionInfo.PhysicsSyncServerAddress;
m_peSyncServerport = m_scene.RegionInfo.PhysicsSyncServerPort;
if (!m_peSyncServeraddr.Equals(IPAddrUnknown) && m_peSyncServerport != PortUnknown) if (!m_peSyncServeraddr.Equals(IPAddrUnknown) && m_peSyncServerport != PortUnknown)
{ {
m_log.Warn("[REGION SYNC SERVER MODULE] Starting SceneToPhysEngineSyncServer"); m_log.Warn("[REGION SYNC SERVER MODULE] Starting SceneToPhysEngineSyncServer");