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

LIBOMV-492 Fixed up WinGridProxy with all sorts of new goodies, now using VirtualMode for efficiency of time and memory, This version has some new features and probably some new bugs:

Browse Source 
* New QuickLaunch bar will (on windows) detect and allow you to launch installed viewers
* Custom login url's are now saved for future sessions
* Better exception handling in GridProxy

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3224 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Jim Radford
2009-11-12 00:15:59 +00:00
parent 0306802a27
commit 320669bbb5
12 changed files with 1586 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Programs/GridProxy/GridProxy.cs
View File

@@ -198,7 +198,7 @@ namespace GridProxy
InitializeCaps();
}
object keepAliveLock = new Object();
object keepAliveLock = new object();
// Start: begin accepting clients
public void Start()
@@ -209,9 +209,10 @@ namespace GridProxy
(new Thread(new ThreadStart(KeepAlive))).Start();
RunSimProxy();
Thread runLoginProxy = new Thread(new ThreadStart(RunLoginProxy));
runLoginProxy.IsBackground = true;
runLoginProxy.Name = "LoginProxy";
runLoginProxy.Name = "Login Proxy";
runLoginProxy.Start();
IPEndPoint endPoint = (IPEndPoint)loginServer.LocalEndPoint;
@@ -778,7 +779,7 @@ namespace GridProxy
}
}
if (cap != null && !requestFailed)
if (cap != null && !requestFailed && !capReq.Response.ToString().Equals("undef"))
{
foreach (CapsDelegate d in cap.GetDelegates())
{
@@ -786,9 +787,14 @@ namespace GridProxy
{
if (d(capReq, CapsStage.Response)) { break; }
}
catch (Exception e)
catch (InvalidCastException ex)
{
OpenMetaverse.Logger.Log("Error firing delegate", Helpers.LogLevel.Error, e);
OpenMetaverse.Logger.Log("Invalid Cast thrown trying to cast OSD to OSDMap: \n'" + capReq.Response.AsString() + "' Length="+capReq.RawResponse.Length.ToString() + "\n",
Helpers.LogLevel.Error, ex);
}
catch (Exception ex)
{
OpenMetaverse.Logger.Log("Error firing delegate", Helpers.LogLevel.Error, ex);
}
}
@@ -1034,7 +1040,8 @@ namespace GridProxy
{
foreach (XmlRpcRequestDelegate d in loginRequestDelegates)
{
try { d(request); }
try { d(this, new XmlRpcRequestEventArgs(request)); }
//try { d(request); }
catch (Exception e) { OpenMetaverse.Logger.Log("Exception in login request delegate" + e, Helpers.LogLevel.Error, e); }
}
}
@@ -1212,6 +1219,7 @@ namespace GridProxy
{
foreach (SimProxy simProxy in simProxies.Values)
simProxy.Reset();
KnownCaps.Clear();
}
@@ -2111,7 +2119,7 @@ namespace GridProxy
}
// XmlRpcRequestDelegate: specifies a delegate to be called for XML-RPC requests
public delegate void XmlRpcRequestDelegate(XmlRpcRequest request);
public delegate void XmlRpcRequestDelegate(object sender, XmlRpcRequestEventArgs e);
// XmlRpcResponseDelegate: specifies a delegate to be called for XML-RPC responses
public delegate void XmlRpcResponseDelegate(XmlRpcResponse response);
@@ -2138,6 +2146,16 @@ namespace GridProxy
Request,
Response
}
public class XmlRpcRequestEventArgs : EventArgs
{
public XmlRpcRequest m_Request;
public XmlRpcRequestEventArgs(XmlRpcRequest request)
{
this.m_Request = request;
}
}
}

4
Programs/GridProxy/GridProxyLoader.cs
View File

@@ -152,12 +152,12 @@ namespace GridProxy
}
// LoginRequest: dump a login request to the console
private void LoginRequest(XmlRpcRequest request)
private void LoginRequest(object sender, XmlRpcRequestEventArgs e)
{
if (logLogin)
{
Console.WriteLine("==> Login Request");
Console.WriteLine(request);
Console.WriteLine(e.m_Request);
}
}