Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBOMV-477 LindenMessages additions/fixes:

Browse Source 
* New LandStatReplyMessage
* Test added for UpdateNotecardAgentInventoryMessage
LIBOMV-492 More WinGridProxy Goodness:
* New Inspectors: Notation, Raw changed to show Request/Response Headers, default Request/Response tab shows a formatted string representation of the Packet/Message being decoded. 
* All messages are wire-data tested against IMessage system.
* Changed login box to be a dropdown with a few default grid options: Agni, Aditi, OSGrid, and LocalHost for Simian connections
* Some changes to GridProxy to pass along raw byte encoded data and Headers to the Caps Delegate.


git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2644 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Jim Radford
2009-04-22 00:01:30 +00:00
parent ed7daf44f1
commit 7129ee185e
9 changed files with 916 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Programs/WinGridProxy/ProxyManager.cs
View File

@@ -35,20 +35,28 @@ using OpenMetaverse.StructuredData;
namespace WinGridProxy
{
public class ProxyManager
public class ProxyManager
{
// fired when a new packet arrives
public delegate void PacketLogHandler(Packet packet, Direction direction, IPEndPoint endpoint);
public static event PacketLogHandler OnPacketLog;
// fired when a message arrives over a known capability
public delegate void MessageLogHandler(CapsRequest req, CapsStage stage);
public static event MessageLogHandler OnMessageLog;
// handle login request/response data
public delegate void LoginLogHandler(object request, Direction direction);
public static event LoginLogHandler OnLoginResponse;
// fired when a new Capability is added to the KnownCaps Dictionary
public delegate void CapsAddedHandler(CapInfo cap);
public static event CapsAddedHandler OnCapabilityAdded;
// Handle messages sent via the EventQueue
public delegate void EventQueueMessageHandler(CapsRequest req, CapsStage stage);
public static event EventQueueMessageHandler OnEventMessageLog;
private string _Port;
private string _ListenIP;
private string _LoginURI;
@@ -67,9 +75,9 @@ namespace WinGridProxy
_ListenIP = "--proxy-client-facing-address=127.0.0.1";
if (String.IsNullOrEmpty(loginUri))
_LoginURI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
_LoginURI = "--proxy-remote-login-uri=https://login.agni.lindenlab.com/cgi-bin/login.cgi";
else
_LoginURI = loginUri;
_LoginURI = "--proxy-remote-login-uri=" + loginUri;
string[] args = { _Port, _ListenIP, _LoginURI };
@@ -94,6 +102,7 @@ namespace WinGridProxy
Proxy.proxy.AddCapsDelegate("EventQueueGet", new CapsDelegate(EventQueueGetHandler));
// this is so we are informed of any new capabilities that are added to the KnownCaps dictionary
Proxy.proxy.KnownCaps.AddDelegate(OpenMetaverse.DictionaryEventAction.Add, new OpenMetaverse.DictionaryChangeCallback(KnownCapsAddedHandler));
}
@@ -147,6 +156,13 @@ namespace WinGridProxy
return false;
}
/// <summary>
/// Process individual messages that arrive via the EventQueue and convert each indvidual event into a format
/// suitable for processing by the IMessage system
/// </summary>
/// <param name="req"></param>
/// <param name="stage"></param>
/// <returns></returns>
private bool EventQueueGetHandler(CapsRequest req, CapsStage stage)
{
if (stage == CapsStage.Response)
@@ -157,17 +173,19 @@ namespace WinGridProxy
for (int i = 0; i < eventsArray.Count; i++)
{
OSDMap bodyMap = (OSDMap)eventsArray[i];
if (OnMessageLog != null)
if (OnEventMessageLog != null)
{
CapInfo capInfo = new CapInfo(req.Info.URI, req.Info.Sim, bodyMap["message"].AsString());
CapsRequest capReq = new CapsRequest(capInfo);
capReq.Request = req.Request;
capReq.RequestHeaders = req.RequestHeaders;
capReq.ResponseHeaders = req.ResponseHeaders;
capReq.Request = null;// req.Request;
capReq.RawRequest = null;// req.RawRequest;
capReq.RawResponse = OSDParser.SerializeLLSDXmlBytes(bodyMap);
capReq.Response = bodyMap;
OnMessageLog(capReq, CapsStage.Response);
OnEventMessageLog(capReq, CapsStage.Response);
}
//Console.WriteLine("[" + i + "] " + bodyMap["message"].AsString());
}
}
return false;