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

* Allow HttpServer AddHandler() and RemoveHandler() while the server is running

Browse Source 
* Simplified HttpServer calback exception handling
* Fixed a recently introduced typo in LLSD binary serialization
* Allow LLSD binary serialization to work with any Stream instead of only MemoryStream
* Improved Utils.HexStringToBytes(), changed function signature
* Added an efficient Utils.EnumTryParse<T>()

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2323 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-11-05 01:50:24 +00:00
parent f53aee6fa8
commit 61c8451fac
5 changed files with 89 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenMetaverse/StructuredData/BinaryLLSD.cs
View File

@@ -53,7 +53,7 @@ namespace OpenMetaverse.StructuredData
private const int int32Length = 4;
private const int doubleLength = 8;
private static byte[] binaryHead = Encoding.ASCII.GetBytes("<?osd/binary?>\n");
private static byte[] llsdBinaryHead = Encoding.ASCII.GetBytes("<?llsd/binary?>\n");
private const byte undefBinaryValue = (byte)'!';
private const byte trueBinaryValue = (byte)'1';
private const byte falseBinaryValue = (byte)'0';
@@ -89,11 +89,11 @@ namespace OpenMetaverse.StructuredData
/// </summary>
/// <param name="stream"></param>
/// <returns></returns>
public static OSD DeserializeLLSDBinary(MemoryStream stream)
public static OSD DeserializeLLSDBinary(Stream stream)
{
SkipWhiteSpace(stream);
bool result = FindByteArray(stream, binaryHead);
bool result = FindByteArray(stream, llsdBinaryHead);
if (!result)
throw new OSDException("No binary encoded SD.");
@@ -123,7 +123,7 @@ namespace OpenMetaverse.StructuredData
{
MemoryStream stream = new MemoryStream(initialBufferSize);
stream.Write(binaryHead, 0, binaryHead.Length);
stream.Write(llsdBinaryHead, 0, llsdBinaryHead.Length);
SerializeLLSDBinaryElement(stream, data);
return stream;
}
@@ -218,7 +218,7 @@ namespace OpenMetaverse.StructuredData
stream.WriteByte(mapEndBinaryMarker);
}
private static OSD ParseLLSDBinaryElement(MemoryStream stream)
private static OSD ParseLLSDBinaryElement(Stream stream)
{
SkipWhiteSpace(stream);
OSD osd;
@@ -291,7 +291,7 @@ namespace OpenMetaverse.StructuredData
return osd;
}
private static OSD ParseLLSDBinaryArray(MemoryStream stream)
private static OSD ParseLLSDBinaryArray(Stream stream)
{
int numElements = NetworkToHostInt(ConsumeBytes(stream, int32Length));
int crrElement = 0;
@@ -308,7 +308,7 @@ namespace OpenMetaverse.StructuredData
return (OSD)osdArray;
}
private static OSD ParseLLSDBinaryMap(MemoryStream stream)
private static OSD ParseLLSDBinaryMap(Stream stream)
{
int numElements = NetworkToHostInt(ConsumeBytes(stream, int32Length));
int crrElement = 0;
@@ -333,7 +333,7 @@ namespace OpenMetaverse.StructuredData
///
/// </summary>
/// <param name="stream"></param>
public static void SkipWhiteSpace(MemoryStream stream)
public static void SkipWhiteSpace(Stream stream)
{
int bt;
@@ -352,7 +352,7 @@ namespace OpenMetaverse.StructuredData
/// <param name="stream"></param>
/// <param name="toFind"></param>
/// <returns></returns>
public static bool FindByte(MemoryStream stream, byte toFind)
public static bool FindByte(Stream stream, byte toFind)
{
int bt = stream.ReadByte();
if (bt < 0)
@@ -372,7 +372,7 @@ namespace OpenMetaverse.StructuredData
/// <param name="stream"></param>
/// <param name="toFind"></param>
/// <returns></returns>
public static bool FindByteArray(MemoryStream stream, byte[] toFind)
public static bool FindByteArray(Stream stream, byte[] toFind)
{
int lastIndexToFind = toFind.Length - 1;
int crrIndex = 0;
@@ -412,7 +412,7 @@ namespace OpenMetaverse.StructuredData
/// <param name="stream"></param>
/// <param name="consumeBytes"></param>
/// <returns></returns>
public static byte[] ConsumeBytes(MemoryStream stream, int consumeBytes)
public static byte[] ConsumeBytes(Stream stream, int consumeBytes)
{
byte[] bytes = new byte[consumeBytes];
if (stream.Read(bytes, 0, consumeBytes) < consumeBytes)