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

Update svn properties.

0.6.1-post-fixes
Jeff Ames 2008-12-13 12:22:52 +00:00
parent e0765fa6c8
commit 4f9d5d955b
2 changed files with 254 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Framework/IClientFileTransfer.cs
View File

@ -1,15 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public delegate void UploadComplete(string filename, UUID fileID, byte[] fileData, IClientAPI remoteClient); public delegate void UploadComplete(string filename, UUID fileID, byte[] fileData, IClientAPI remoteClient);
public delegate void UploadAborted(string filename, ulong id, IClientAPI remoteClient); public delegate void UploadAborted(string filename, ulong id, IClientAPI remoteClient);
public interface IClientFileTransfer public interface IClientFileTransfer
{ {
bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback); bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
} }
} }

478
OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
View File

@ -1,239 +1,239 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.Interfaces; using OpenSim.Region.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.ClientStack.LindenUDP namespace OpenSim.Region.ClientStack.LindenUDP
{ {
public class LLFileTransfer : IClientFileTransfer public class LLFileTransfer : IClientFileTransfer
{ {
protected IClientAPI m_clientAPI; protected IClientAPI m_clientAPI;
/// Dictionary of handlers for uploading files from client /// Dictionary of handlers for uploading files from client
/// TODO: Need to add cleanup code to remove handlers that have completed their upload /// TODO: Need to add cleanup code to remove handlers that have completed their upload
protected Dictionary<ulong, XferHandler> m_handlers; protected Dictionary<ulong, XferHandler> m_handlers;
protected object m_handlerLock = new object(); protected object m_handlerLock = new object();
public LLFileTransfer(IClientAPI clientAPI) public LLFileTransfer(IClientAPI clientAPI)
{ {
m_handlers = new Dictionary<ulong, XferHandler>(); m_handlers = new Dictionary<ulong, XferHandler>();
m_clientAPI = clientAPI; m_clientAPI = clientAPI;
m_clientAPI.OnXferReceive += XferReceive; m_clientAPI.OnXferReceive += XferReceive;
m_clientAPI.OnAbortXfer += AbortXferHandler; m_clientAPI.OnAbortXfer += AbortXferHandler;
} }
public void Close() public void Close()
{ {
if (m_clientAPI != null) if (m_clientAPI != null)
{ {
m_clientAPI.OnXferReceive -= XferReceive; m_clientAPI.OnXferReceive -= XferReceive;
m_clientAPI.OnAbortXfer -= AbortXferHandler; m_clientAPI.OnAbortXfer -= AbortXferHandler;
m_clientAPI = null; m_clientAPI = null;
} }
} }
public bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback) public bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
{ {
if ((String.IsNullOrEmpty(clientFileName)) || (uploadCompleteCallback == null)) if ((String.IsNullOrEmpty(clientFileName)) || (uploadCompleteCallback == null))
{ {
return false; return false;
} }
XferHandler uploader = new XferHandler(m_clientAPI, clientFileName); XferHandler uploader = new XferHandler(m_clientAPI, clientFileName);
return StartUpload(uploader, uploadCompleteCallback, abortCallback); return StartUpload(uploader, uploadCompleteCallback, abortCallback);
} }
public bool RequestUpload(UUID fileID, UploadComplete uploadCompleteCallback, UploadAborted abortCallback) public bool RequestUpload(UUID fileID, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
{ {
if ((fileID == UUID.Zero) || (uploadCompleteCallback == null)) if ((fileID == UUID.Zero) || (uploadCompleteCallback == null))
{ {
return false; return false;
} }
XferHandler uploader = new XferHandler(m_clientAPI, fileID); XferHandler uploader = new XferHandler(m_clientAPI, fileID);
return StartUpload(uploader, uploadCompleteCallback, abortCallback); return StartUpload(uploader, uploadCompleteCallback, abortCallback);
} }
private bool StartUpload(XferHandler uploader, UploadComplete uploadCompleteCallback, UploadAborted abortCallback) private bool StartUpload(XferHandler uploader, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
{ {
uploader.UploadDone += uploadCompleteCallback; uploader.UploadDone += uploadCompleteCallback;
if (abortCallback != null) if (abortCallback != null)
{ {
uploader.UploadAborted += abortCallback; uploader.UploadAborted += abortCallback;
} }
lock (m_handlerLock) lock (m_handlerLock)
{ {
if (!m_handlers.ContainsKey(uploader.XferID)) if (!m_handlers.ContainsKey(uploader.XferID))
{ {
m_handlers.Add(uploader.XferID, uploader); m_handlers.Add(uploader.XferID, uploader);
uploader.RequestStartXfer(m_clientAPI); uploader.RequestStartXfer(m_clientAPI);
return true; return true;
} }
else else
{ {
// something went wrong with the xferID allocation // something went wrong with the xferID allocation
uploader.UploadDone -= uploadCompleteCallback; uploader.UploadDone -= uploadCompleteCallback;
if (abortCallback != null) if (abortCallback != null)
{ {
uploader.UploadAborted -= abortCallback; uploader.UploadAborted -= abortCallback;
} }
return false; return false;
} }
} }
} }
protected void AbortXferHandler(IClientAPI remoteClient, ulong xferID) protected void AbortXferHandler(IClientAPI remoteClient, ulong xferID)
{ {
lock (m_handlerLock) lock (m_handlerLock)
{ {
if (m_handlers.ContainsKey(xferID)) if (m_handlers.ContainsKey(xferID))
{ {
m_handlers[xferID].AbortUpload(remoteClient); m_handlers[xferID].AbortUpload(remoteClient);
m_handlers.Remove(xferID); m_handlers.Remove(xferID);
} }
} }
} }
protected void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) protected void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
{ {
lock (m_handlerLock) lock (m_handlerLock)
{ {
if (m_handlers.ContainsKey(xferID)) if (m_handlers.ContainsKey(xferID))
{ {
m_handlers[xferID].XferReceive(remoteClient, xferID, packetID, data); m_handlers[xferID].XferReceive(remoteClient, xferID, packetID, data);
} }
} }
} }
} }
public class XferHandler public class XferHandler
{ {
private AssetBase m_asset; private AssetBase m_asset;
public event UploadComplete UploadDone; public event UploadComplete UploadDone;
public event UploadAborted UploadAborted; public event UploadAborted UploadAborted;
private sbyte type = 0; private sbyte type = 0;
public ulong mXferID; public ulong mXferID;
private UploadComplete handlerUploadDone; private UploadComplete handlerUploadDone;
private UploadAborted handlerAbort; private UploadAborted handlerAbort;
private bool m_complete = false; private bool m_complete = false;
public bool UploadComplete public bool UploadComplete
{ {
get { return m_complete; } get { return m_complete; }
} }
public XferHandler(IClientAPI pRemoteClient, string pClientFilename) public XferHandler(IClientAPI pRemoteClient, string pClientFilename)
{ {
m_asset = new AssetBase(); m_asset = new AssetBase();
m_asset.FullID = UUID.Zero; m_asset.FullID = UUID.Zero;
m_asset.Type = type; m_asset.Type = type;
m_asset.Data = new byte[0]; m_asset.Data = new byte[0];
m_asset.Name = pClientFilename; m_asset.Name = pClientFilename;
m_asset.Description = "empty"; m_asset.Description = "empty";
m_asset.Local = true; m_asset.Local = true;
m_asset.Temporary = true; m_asset.Temporary = true;
mXferID = Util.GetNextXferID(); mXferID = Util.GetNextXferID();
} }
public XferHandler(IClientAPI pRemoteClient, UUID fileID) public XferHandler(IClientAPI pRemoteClient, UUID fileID)
{ {
m_asset = new AssetBase(); m_asset = new AssetBase();
m_asset.FullID = fileID; m_asset.FullID = fileID;
m_asset.Type = type; m_asset.Type = type;
m_asset.Data = new byte[0]; m_asset.Data = new byte[0];
m_asset.Name = null; m_asset.Name = null;
m_asset.Description = "empty"; m_asset.Description = "empty";
m_asset.Local = true; m_asset.Local = true;
m_asset.Temporary = true; m_asset.Temporary = true;
mXferID = Util.GetNextXferID(); mXferID = Util.GetNextXferID();
} }
public ulong XferID public ulong XferID
{ {
get { return mXferID; } get { return mXferID; }
} }
public void RequestStartXfer(IClientAPI pRemoteClient) public void RequestStartXfer(IClientAPI pRemoteClient)
{ {
if (m_asset.Name != null) if (m_asset.Name != null)
{ {
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
} }
else else
{ {
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
} }
} }
/// <summary> /// <summary>
/// Process transfer data received from the client. /// Process transfer data received from the client.
/// </summary> /// </summary>
/// <param name="xferID"></param> /// <param name="xferID"></param>
/// <param name="packetID"></param> /// <param name="packetID"></param>
/// <param name="data"></param> /// <param name="data"></param>
public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
{ {
if (mXferID == xferID) if (mXferID == xferID)
{ {
if (m_asset.Data.Length > 1) if (m_asset.Data.Length > 1)
{ {
byte[] destinationArray = new byte[m_asset.Data.Length + data.Length]; byte[] destinationArray = new byte[m_asset.Data.Length + data.Length];
Array.Copy(m_asset.Data, 0, destinationArray, 0, m_asset.Data.Length); Array.Copy(m_asset.Data, 0, destinationArray, 0, m_asset.Data.Length);
Array.Copy(data, 0, destinationArray, m_asset.Data.Length, data.Length); Array.Copy(data, 0, destinationArray, m_asset.Data.Length, data.Length);
m_asset.Data = destinationArray; m_asset.Data = destinationArray;
} }
else else
{ {
byte[] buffer2 = new byte[data.Length - 4]; byte[] buffer2 = new byte[data.Length - 4];
Array.Copy(data, 4, buffer2, 0, data.Length - 4); Array.Copy(data, 4, buffer2, 0, data.Length - 4);
m_asset.Data = buffer2; m_asset.Data = buffer2;
} }
remoteClient.SendConfirmXfer(xferID, packetID); remoteClient.SendConfirmXfer(xferID, packetID);
if ((packetID & 0x80000000) != 0) if ((packetID & 0x80000000) != 0)
{ {
SendCompleteMessage(remoteClient); SendCompleteMessage(remoteClient);
} }
} }
} }
protected void SendCompleteMessage(IClientAPI remoteClient) protected void SendCompleteMessage(IClientAPI remoteClient)
{ {
m_complete = true; m_complete = true;
handlerUploadDone = UploadDone; handlerUploadDone = UploadDone;
if (handlerUploadDone != null) if (handlerUploadDone != null)
{ {
handlerUploadDone(m_asset.Name, m_asset.FullID, m_asset.Data, remoteClient); handlerUploadDone(m_asset.Name, m_asset.FullID, m_asset.Data, remoteClient);
} }
} }
public void AbortUpload(IClientAPI remoteClient) public void AbortUpload(IClientAPI remoteClient)
{ {
handlerAbort = UploadAborted; handlerAbort = UploadAborted;
if (handlerAbort != null) if (handlerAbort != null)
{ {
handlerAbort(m_asset.Name, mXferID, remoteClient); handlerAbort(m_asset.Name, mXferID, remoteClient);
} }
} }
} }
} }