esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-05-06 11:32:59 +00:00
Code Issues Projects Releases Wiki Activity

Send Lock

Browse Source
This commit is contained in:
Ahmed Zamil 2019-11-20 20:57:31 +03:00
parent 5c995a7def
commit 5a0673b403
2 changed files with 50 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
Esiur/Net/Packets/IIPPacket.cs
View File

@ -52,7 +52,7 @@ namespace Esiur.Net.Packets
rt += " " + Action.ToString(); rt += " " + Action.ToString();
if (Action == IIPPacketAction.AttachResource) if (Action == IIPPacketAction.AttachResource)
{ {
rt += " CID: " + CallbackId + " RID: " + ResourceId; rt += " CID: " + CallbackId + " RID: " + ResourceId;
} }
} }
else if (Command == IIPPacketCommand.Reply) else if (Command == IIPPacketCommand.Reply)
@ -71,7 +71,7 @@ namespace Esiur.Net.Packets
Report, Report,
} }
public enum IIPPacketEvent: byte public enum IIPPacketEvent : byte
{ {
// Event Manage // Event Manage
ResourceReassigned = 0, ResourceReassigned = 0,
@ -124,14 +124,14 @@ namespace Esiur.Net.Packets
ClearAttributes ClearAttributes
} }
public enum IIPPacketReport: byte public enum IIPPacketReport : byte
{ {
ManagementError, ManagementError,
ExecutionError, ExecutionError,
ProgressReport = 0x8, ProgressReport = 0x8,
ChunkStream = 0x9 ChunkStream = 0x9
} }
public IIPPacketReport Report public IIPPacketReport Report
{ {
@ -174,13 +174,6 @@ namespace Esiur.Net.Packets
} }
//public uint[] ResourcesIds { get; set; }
//public uint NewResourcesIds { get; set; }
//public uint ChildrenIds { get; set; }
//public uint StoresIds { get; set; }
//public IIPPacketAttachInfo[] AttachReply { get; set; }
public uint ResourceId { get; set; } public uint ResourceId { get; set; }
public uint NewResourceId { get; set; } public uint NewResourceId { get; set; }
//public uint ParentId { get; set; } //public uint ParentId { get; set; }
@ -235,7 +228,7 @@ namespace Esiur.Net.Packets
PreviousCommand = Command; PreviousCommand = Command;
Command = (IIPPacketCommand)(data[offset] >> 6); Command = (IIPPacketCommand)(data[offset] >> 6);
if (Command == IIPPacketCommand.Event) if (Command == IIPPacketCommand.Event)
{ {
Event = (IIPPacketEvent)(data[offset++] & 0x3f); Event = (IIPPacketEvent)(data[offset++] & 0x3f);
@ -256,11 +249,11 @@ namespace Esiur.Net.Packets
CallbackId = data.GetUInt32(offset); CallbackId = data.GetUInt32(offset);
offset += 4; offset += 4;
} }
else // response or reply else
{ {
PreviousAction = Action; PreviousAction = Action;
Action = (IIPPacketAction)(data[offset] & 0x1f); Action = (IIPPacketAction)(data[offset++] & 0x3f);
//Bulk = (data[offset++] & 0x20) == 0x20;
if (NotEnough(offset, ends, 4)) if (NotEnough(offset, ends, 4))
return -dataLengthNeeded; return -dataLengthNeeded;
@ -275,7 +268,7 @@ namespace Esiur.Net.Packets
if (NotEnough(offset, ends, 4)) if (NotEnough(offset, ends, 4))
return -dataLengthNeeded; return -dataLengthNeeded;
NewResourceId = data.GetUInt32( offset); NewResourceId = data.GetUInt32(offset);
offset += 4; offset += 4;
} }
@ -292,7 +285,7 @@ namespace Esiur.Net.Packets
ChildId = data.GetUInt32(offset); ChildId = data.GetUInt32(offset);
offset += 4; offset += 4;
} }
else if(Event == IIPPacketEvent.Renamed) else if (Event == IIPPacketEvent.Renamed)
{ {
if (NotEnough(offset, ends, 2)) if (NotEnough(offset, ends, 2))
return -dataLengthNeeded; return -dataLengthNeeded;
@ -322,13 +315,13 @@ namespace Esiur.Net.Packets
if (NotEnough(offset, ends, 4)) if (NotEnough(offset, ends, 4))
return -dataLengthNeeded; return -dataLengthNeeded;
var cl = data.GetUInt32( offset); var cl = data.GetUInt32(offset);
offset += 4; offset += 4;
if (NotEnough(offset, ends, cl)) if (NotEnough(offset, ends, cl))
return -dataLengthNeeded; return -dataLengthNeeded;
Content = data.Clip( offset - 5, cl + 5); Content = data.Clip(offset - 5, cl + 5);
offset += cl; offset += cl;
} }
else else
@ -342,15 +335,15 @@ namespace Esiur.Net.Packets
} }
else if (Event == IIPPacketEvent.EventOccurred) else if (Event == IIPPacketEvent.EventOccurred)
{ {
if (NotEnough(offset, ends, 5)) if (NotEnough(offset, ends, 5))
return -dataLengthNeeded; return -dataLengthNeeded;
MethodIndex = data[offset++]; MethodIndex = data[offset++];
var cl = data.GetUInt32( offset); var cl = data.GetUInt32(offset);
offset += 4; offset += 4;
Content = data.Clip( offset, cl); Content = data.Clip(offset, cl);
offset += cl; offset += cl;
} }
@ -378,21 +371,8 @@ namespace Esiur.Net.Packets
if (NotEnough(offset, ends, 4)) if (NotEnough(offset, ends, 4))
return -dataLengthNeeded; return -dataLengthNeeded;
/*if (Bulk) ResourceId = data.GetUInt32(offset);
{ offset += 4;
var cl = data.GetUInt32(offset);
offset += 4;
if (NotEnough(offset, ends, cl))
return -dataLengthNeeded;
ResourcesIds = data.GetUInt32Array(offset, cl);
}
else*/
{
ResourceId = data.GetUInt32(offset);
offset += 4;
}
} }
else if (Action == IIPPacketAction.ReattachResource) else if (Action == IIPPacketAction.ReattachResource)
{ {
@ -609,7 +589,7 @@ namespace Esiur.Net.Packets
if (NotEnough(offset, ends, cl)) if (NotEnough(offset, ends, cl))
return -dataLengthNeeded; return -dataLengthNeeded;
Content = data.Clip(offset-5, cl + 5); Content = data.Clip(offset - 5, cl + 5);
offset += cl; offset += cl;
} }
else else
@ -617,7 +597,7 @@ namespace Esiur.Net.Packets
if (NotEnough(offset, ends, (uint)size)) if (NotEnough(offset, ends, (uint)size))
return -dataLengthNeeded; return -dataLengthNeeded;
Content = data.Clip(offset-1, (uint)size + 1); Content = data.Clip(offset - 1, (uint)size + 1);
offset += (uint)size; offset += (uint)size;
} }
} }
@ -648,74 +628,35 @@ namespace Esiur.Net.Packets
|| Action == IIPPacketAction.ReattachResource) || Action == IIPPacketAction.ReattachResource)
{ {
//if (!Bulk) if (NotEnough(offset, ends, 26))
//{ return -dataLengthNeeded;
if (NotEnough(offset, ends, 26))
return -dataLengthNeeded;
ClassId = data.GetGuid(offset); ClassId = data.GetGuid(offset);
offset += 16; offset += 16;
ResourceAge = data.GetUInt64(offset); ResourceAge = data.GetUInt64(offset);
offset += 8; offset += 8;
uint cl = data.GetUInt16(offset); uint cl = data.GetUInt16(offset);
offset += 2; offset += 2;
if (NotEnough(offset, ends, cl)) if (NotEnough(offset, ends, cl))
return -dataLengthNeeded; return -dataLengthNeeded;
ResourceLink = data.GetString(offset, cl); ResourceLink = data.GetString(offset, cl);
offset += cl; offset += cl;
if (NotEnough(offset, ends, 4)) if (NotEnough(offset, ends, 4))
return -dataLengthNeeded; return -dataLengthNeeded;
cl = data.GetUInt32(offset); cl = data.GetUInt32(offset);
offset += 4; offset += 4;
if (NotEnough(offset, ends, cl)) if (NotEnough(offset, ends, cl))
return -dataLengthNeeded; return -dataLengthNeeded;
Content = data.Clip(offset, cl); Content = data.Clip(offset, cl);
offset += cl; offset += cl;
//}
//else
//{
// // length
// if (NotEnough(offset, ends, 4))
// return -dataLengthNeeded;
// var cl = data.GetUInt32(offset);
// offset += 4;
// if (NotEnough(offset, ends, cl))
// return -dataLengthNeeded;
// // Content = data.Clip(offset, cl);
// //offset += cl;
// cl += offset;
// var list = new List<IIPPacketAttachInfo>();
// while(offset < cl)
// {
// Guid classId = data.GetGuid(offset);
// offset += 16;
// ulong age = data.GetUInt64(offset);
// offset += 8;
// var len = data.GetUInt16(offset);
// offset += 2;
// var link = data.GetString(offset, len);
// offset += len;
// var cc = data.GetUInt32(offset);
// list.Add(new IIPPacketAttachInfo(classId, age, link, data.Clip(offset, cc)));
// offset += cc;
// }
//AttachReply = list.ToArray();
//}
} }
else if (Action == IIPPacketAction.DetachResource) else if (Action == IIPPacketAction.DetachResource)
{ {
@ -737,7 +678,7 @@ namespace Esiur.Net.Packets
{ {
// nothing to do // nothing to do
} }
// Inquire // Inquire
else if (Action == IIPPacketAction.TemplateFromClassName else if (Action == IIPPacketAction.TemplateFromClassName
|| Action == IIPPacketAction.TemplateFromClassId || Action == IIPPacketAction.TemplateFromClassId
|| Action == IIPPacketAction.TemplateFromResourceId || Action == IIPPacketAction.TemplateFromResourceId
@ -871,7 +812,7 @@ namespace Esiur.Net.Packets
offset += (uint)size; offset += (uint)size;
} }
} }
} }
return offset - originalOffset; return offset - originalOffset;
} }

17
Esiur/Net/Sockets/TCPSocket.cs
View File

@ -55,7 +55,7 @@ namespace Esiur.Net.Sockets
bool asyncSending; bool asyncSending;
bool began = false; bool began = false;
SocketState state = SocketState.Initial; SocketState state = SocketState.Initial;
public event ISocketReceiveEvent OnReceive; public event ISocketReceiveEvent OnReceive;
@ -240,19 +240,20 @@ namespace Esiur.Net.Sockets
{ {
try try
{ {
lock (sendLock)
if (sendBufferQueue.Count > 0)
{ {
lock (sendLock)
if (sendBufferQueue.Count > 0)
{ {
byte[] data = sendBufferQueue.Dequeue(); byte[] data = sendBufferQueue.Dequeue();
//Console.WriteLine(Encoding.UTF8.GetString(data)); //Console.WriteLine(Encoding.UTF8.GetString(data));
sock.SendAsync(new ArraySegment<byte>(data), SocketFlags.None).ContinueWith(DataSent); sock.SendAsync(new ArraySegment<byte>(data), SocketFlags.None).ContinueWith(DataSent);
} }
}
else else
{ {
asyncSending = false; asyncSending = false;
}
} }
} }
catch (Exception ex) catch (Exception ex)