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

* Massive amount of work on VoiceManager and VoiceTest, we are almost logging in

Browse Source 
* Fixed a few lingering bugs with the CAPS event queue wanting to time out
* Forced CapsRequest to always use POST
* Removed more debugging spew from HttpBase

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1346 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2007-08-03 16:00:50 +00:00
parent fa9b7830a3
commit d9e2b40e3e
9 changed files with 750 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
libsecondlife/CapsEventQueue.cs
View File

@@ -28,6 +28,7 @@ using System;
using System.Collections;
using System.Net;
using System.Text;
using System.IO;
using System.Threading;
namespace libsecondlife
@@ -96,6 +97,59 @@ namespace libsecondlife
new AsyncCallback(EventRequestStreamCallback), _RequestState);
}
public new void MakeRequest(byte[] postData)
{
// Create a new HttpWebRequest
HttpWebRequest httpRequest = (HttpWebRequest)WebRequest.Create(_RequestURL);
_RequestState = new HttpRequestState(httpRequest);
if (_ProxyURL != String.Empty)
{
// Create a proxy object
WebProxy proxy = new WebProxy();
// Associate a new Uri object to the _wProxy object, using the proxy address
// selected by the user
proxy.Address = new Uri(_ProxyURL);
// Finally, initialize the Web request object proxy property with the _wProxy
// object
httpRequest.Proxy = proxy;
}
// Always disable keep-alive for our purposes
httpRequest.KeepAlive = false;
try
{
if (postData != null)
{
// POST request
_RequestState.WebRequest.Method = "POST";
_RequestState.WebRequest.ContentLength = postData.Length;
_RequestState.RequestData = postData;
IAsyncResult result = (IAsyncResult)_RequestState.WebRequest.BeginGetRequestStream(
new AsyncCallback(EventRequestStreamCallback), _RequestState);
}
else
{
throw new ArgumentException("postData cannot be null for the event queue", "postData");
}
}
catch (WebException e)
{
Abort(false, e);
}
catch (Exception e)
{
Log(String.Format("CapsEventQueue.MakeRequest(): {0} (Source: {1})", e.Message, e.Source),
Helpers.LogLevel.Warning);
Abort(false, null);
}
}
public new void Abort()
{
Disconnect(true);
@@ -132,7 +186,41 @@ namespace libsecondlife
Simulator.Client.Log("Capabilities event queue connected for " + Simulator.ToString(), Helpers.LogLevel.Info);
}
base.RequestStreamCallback(result);
try
{
_RequestState = (HttpRequestState)result.AsyncState;
Stream reqStream = _RequestState.WebRequest.EndGetRequestStream(result);
reqStream.Write(_RequestState.RequestData, 0, _RequestState.RequestData.Length);
reqStream.Close();
IAsyncResult newResult = _RequestState.WebRequest.BeginGetResponse(new AsyncCallback(EventResponseCallback), _RequestState);
}
catch (WebException e)
{
Abort(false, e);
}
}
protected void EventResponseCallback(IAsyncResult result)
{
try
{
_RequestState = (HttpRequestState)result.AsyncState;
_RequestState.WebResponse = (HttpWebResponse)_RequestState.WebRequest.EndGetResponse(result);
// Read the response into a Stream object
Stream responseStream = _RequestState.WebResponse.GetResponseStream();
_RequestState.ResponseStream = responseStream;
// Begin reading of the contents of the response
IAsyncResult asynchronousInputRead = responseStream.BeginRead(_RequestState.BufferRead, 0, BUFFER_SIZE,
new AsyncCallback(ReadCallback), _RequestState);
}
catch (WebException e)
{
Abort(false, e);
}
}
protected override void RequestReply(HttpRequestState state, bool success, WebException exception)
@@ -153,7 +241,7 @@ namespace libsecondlife
_Running = false;
_Dead = true;
}
else if (!exception.Message.Contains("aborted") && !exception.Message.Contains("502"))
else if (!exception.Message.ToLower().Contains("aborted") && !exception.Message.Contains("502"))
{
Simulator.Client.Log(String.Format("Unrecognized caps exception for {0}: {1}", Simulator, exception.Message),
Helpers.LogLevel.Warning);