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

a few changes to updateitemasset things

master
UbitUmarov 2020-04-29 16:52:54 +01:00
parent ae15b75f79
commit 5da135a90b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/UpdateItemAsset.cs
View File

@ -211,8 +211,7 @@ namespace OpenSim.Region.ClientStack.Linden
uploadResponse.state = "upload"; uploadResponse.state = "upload";
TaskInventoryScriptUpdater uploader = new TaskInventoryScriptUpdater(itemID, objectID, is_script_running, TaskInventoryScriptUpdater uploader = new TaskInventoryScriptUpdater(itemID, objectID, is_script_running,
uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile); uploaderPath, m_HostCapsObj.HttpListener, httpRequest.RemoteIPEndPoint.Address, m_dumpAssetsToFile);
uploader.remoteAdress = httpRequest.RemoteIPEndPoint.Address;
uploader.OnUpLoad += TaskScriptUpdated; uploader.OnUpLoad += TaskScriptUpdated;
var uploaderHandler = new SimpleBinaryHandler("POST", uploaderPath, uploader.process); var uploaderHandler = new SimpleBinaryHandler("POST", uploaderPath, uploader.process);
@ -305,9 +304,8 @@ namespace OpenSim.Region.ClientStack.Linden
public void process(IOSHttpRequest request, IOSHttpResponse response, byte[] data) public void process(IOSHttpRequest request, IOSHttpResponse response, byte[] data)
{ {
m_timeout.Stop(); m_timeout.Stop();
m_timeout.Dispose();
m_httpListener.RemoveSimpleStreamHandler(m_uploaderPath); m_httpListener.RemoveSimpleStreamHandler(m_uploaderPath);
m_timeout.Dispose();
if (!request.RemoteIPEndPoint.Address.Equals(m_remoteAdress)) if (!request.RemoteIPEndPoint.Address.Equals(m_remoteAdress))
{ {
@ -370,11 +368,11 @@ namespace OpenSim.Region.ClientStack.Linden
private bool m_isScriptRunning; private bool m_isScriptRunning;
private IHttpServer m_httpListener; private IHttpServer m_httpListener;
private bool m_dumpAssetToFile; private bool m_dumpAssetToFile;
public IPAddress remoteAdress; public IPAddress m_remoteAddress;
private Timer m_timeout; private Timer m_timeout;
public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, bool isScriptRunning, public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, bool isScriptRunning,
string path, IHttpServer httpServer, bool dumpAssetToFile) string path, IHttpServer httpServer, IPAddress address, bool dumpAssetToFile)
{ {
m_dumpAssetToFile = dumpAssetToFile; m_dumpAssetToFile = dumpAssetToFile;
@ -385,7 +383,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_uploaderPath = path; m_uploaderPath = path;
m_httpListener = httpServer; m_httpListener = httpServer;
m_remoteAddress = address;
m_timeout = new Timer(); m_timeout = new Timer();
m_timeout.Elapsed += Timeout; m_timeout.Elapsed += Timeout;
m_timeout.Interval = 1000; m_timeout.Interval = 1000;
@ -408,10 +406,16 @@ namespace OpenSim.Region.ClientStack.Linden
public void process(IOSHttpRequest request, IOSHttpResponse response, byte[] data) public void process(IOSHttpRequest request, IOSHttpResponse response, byte[] data)
{ {
m_timeout.Stop(); m_timeout.Stop();
m_httpListener.RemoveSimpleStreamHandler(m_uploaderPath);
m_timeout.Dispose(); m_timeout.Dispose();
m_httpListener.RemoveSimpleStreamHandler(m_uploaderPath); if (!request.RemoteIPEndPoint.Address.Equals(m_remoteAddress))
if(OnUpLoad == null) {
response.StatusCode = (int)HttpStatusCode.Unauthorized;
return;
}
if (OnUpLoad == null)
{ {
response.StatusCode = (int)HttpStatusCode.Gone; response.StatusCode = (int)HttpStatusCode.Gone;
return; return;