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

change code for urls usage. Still bad after (un)link

Browse Source
This commit is contained in:
UbitUmarov
2020-08-23 03:54:44 +01:00
parent 1bbc7fd6aa
commit 0f50b17824
3 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@@ -49,6 +49,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
public class UrlData
{
public UUID hostID;
public UUID groupID;
public UUID itemID;
public IScriptModule engine;
public string url;
@@ -86,11 +87,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
protected Dictionary<UUID, UrlData> m_RequestMap =
new Dictionary<UUID, UrlData>();
protected readonly Dictionary<UUID, UrlData> m_RequestMap = new Dictionary<UUID, UrlData>();
protected readonly Dictionary<string, UrlData> m_UrlMap = new Dictionary<string, UrlData>();
protected readonly Dictionary<UUID, int> m_countsPerSOG = new Dictionary<UUID, int>();
protected Dictionary<string, UrlData> m_UrlMap =
new Dictionary<string, UrlData>();
protected bool m_enabled = false;
protected string m_ErrorStr;
@@ -241,8 +241,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
}
string url = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
UUID groupID = host.ParentGroup.UUID;
UrlData urlData = new UrlData();
urlData.hostID = host.UUID;
urlData.groupID = groupID;
urlData.itemID = itemID;
urlData.engine = engine;
urlData.url = url;
@@ -257,6 +259,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
m_UrlMap[url] = urlData;
if (m_countsPerSOG.TryGetValue(groupID, out int urlcount))
m_countsPerSOG[groupID] = ++urlcount;
else
m_countsPerSOG[groupID] = 1;
string uri = "/lslhttp/" + urlcode.ToString();
PollServiceEventArgs args
@@ -300,8 +307,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
}
string url = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/";
UUID groupID = host.ParentGroup.UUID;
UrlData urlData = new UrlData();
urlData.hostID = host.UUID;
urlData.groupID = groupID;
urlData.itemID = itemID;
urlData.engine = engine;
urlData.url = url;
@@ -315,6 +324,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
m_UrlMap[url] = urlData;
if (m_countsPerSOG.TryGetValue(groupID, out int urlcount))
m_countsPerSOG[groupID] = ++urlcount;
else
m_countsPerSOG[groupID] = 1;
string uri = "/lslhttps/" + urlcode.ToString();
PollServiceEventArgs args
@@ -496,6 +510,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
m_HttpsServer.RemovePollServiceHTTPHandler("", "/lslhttps/"+data.urlcode.ToString()+"/");
else
m_HttpServer.RemovePollServiceHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
if(m_countsPerSOG.TryGetValue(data.groupID, out int count))
{
--count;
if(count <= 0)
m_countsPerSOG.Remove(data.groupID);
else
m_countsPerSOG[data.groupID] = count;
}
}
protected Hashtable NoEvents(UUID requestID, UUID sessionID)
@@ -774,18 +797,23 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
public Dictionary<UUID, int> GetUrlCountForHosts()
{
Dictionary<UUID, int> dict = new Dictionary<UUID, int>();
foreach(var data in m_UrlMap)
{
int count = 0;
if(dict.ContainsKey(data.Value.hostID))
{
count = dict[data.Value.hostID];
}
count++;
dict[data.Value.hostID] = count;
if (!m_enabled)
return new Dictionary<UUID, int>();
lock (m_UrlMap)
return new Dictionary<UUID, int>(m_countsPerSOG);
}
public int GetUrlCount(UUID groupID)
{
if (!m_enabled)
return 0;
lock (m_UrlMap)
{
m_countsPerSOG.TryGetValue(groupID, out int count);
return count;
}
return dict;
}
}
}