Skip to content

Commit 92df1f7

Browse files
committed
moving var update error message sender to dataout partial class
1 parent 5177bad commit 92df1f7

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

src/dds.net-server.lib/Core/Internal/IOProcessor/VariablesDatabase-DataOut.cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,48 @@ private void SendErrorMessage(string clientRef, string message)
5959
OutputQueue.Enqueue(new DataToClient(clientRef, _serverInfo));
6060
}
6161

62+
/// <summary>
63+
/// Sends error messages when there is an error while updating variable values.
64+
/// </summary>
65+
/// <param name="clientRef">Client's address.</param>
66+
/// <param name="errorMessages">Error messages (variable ID => error message)</param>
67+
private void SendVariablesUpdateErrorMessages(string clientRef, Dictionary<ushort, string> errorMessages)
68+
{
69+
//- Calculating required size for buffer
70+
71+
int sizeRequired = 0;
72+
73+
foreach (KeyValuePair<ushort, string> errorInfo in errorMessages)
74+
{
75+
sizeRequired +=
76+
2 + // Id size on buffer
77+
2 + Encoding.Unicode.GetBytes(errorInfo.Value).Length; // string size on buffer
78+
}
79+
80+
//- Sending response
81+
82+
if (sizeRequired > 0)
83+
{
84+
byte[] responseBuffer = new byte[
85+
EncDecMessageHeader.GetMessageHeaderSizeOnBuffer() +
86+
PacketId.VariablesUpdateAtServer.GetSizeOnBuffer() + sizeRequired];
87+
int responseBufferOffset = 0;
88+
89+
//- Filling the response buffer
90+
91+
responseBuffer.WriteMessageHeader(ref responseBufferOffset, responseBuffer.Length - EncDecMessageHeader.GetMessageHeaderSizeOnBuffer());
92+
responseBuffer.WritePacketId(ref responseBufferOffset, PacketId.VariablesUpdateAtServer);
93+
94+
foreach (KeyValuePair<ushort, string> varInfo in errorMessages)
95+
{
96+
responseBuffer.WriteUnsignedWord(ref responseBufferOffset, varInfo.Key);
97+
responseBuffer.WriteString(ref responseBufferOffset, varInfo.Value);
98+
}
99+
100+
OutputQueue.Enqueue(new DataToClient(clientRef, responseBuffer));
101+
}
102+
}
103+
62104
/// <summary>
63105
/// Sends variables' registration response to the client.
64106
/// </summary>

src/dds.net-server.lib/Core/Internal/IOProcessor/VariablesDatabase-PP-VariablesUpdateAtServer.cs

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -113,48 +113,6 @@ private void ProcessPacket_VariablesUpdateAtServer(string clientRef, byte[] data
113113
}
114114
}
115115

116-
/// <summary>
117-
/// Sends error messages when there is an error while updating variable values.
118-
/// </summary>
119-
/// <param name="clientRef">Client's address.</param>
120-
/// <param name="errorMessages">Error messages (variable ID => error message)</param>
121-
private void SendVariablesUpdateErrorMessages(string clientRef, Dictionary<ushort, string> errorMessages)
122-
{
123-
//- Calculating required size for buffer
124-
125-
int sizeRequired = 0;
126-
127-
foreach (KeyValuePair<ushort, string> errorInfo in errorMessages)
128-
{
129-
sizeRequired +=
130-
2 + // Id size on buffer
131-
2 + Encoding.Unicode.GetBytes(errorInfo.Value).Length; // string size on buffer
132-
}
133-
134-
//- Sending response
135-
136-
if (sizeRequired > 0)
137-
{
138-
byte[] responseBuffer = new byte[
139-
EncDecMessageHeader.GetMessageHeaderSizeOnBuffer() +
140-
PacketId.VariablesUpdateAtServer.GetSizeOnBuffer() + sizeRequired];
141-
int responseBufferOffset = 0;
142-
143-
//- Filling the response buffer
144-
145-
responseBuffer.WriteMessageHeader(ref responseBufferOffset, responseBuffer.Length - EncDecMessageHeader.GetMessageHeaderSizeOnBuffer());
146-
responseBuffer.WritePacketId(ref responseBufferOffset, PacketId.VariablesUpdateAtServer);
147-
148-
foreach (KeyValuePair<ushort, string> varInfo in errorMessages)
149-
{
150-
responseBuffer.WriteUnsignedWord(ref responseBufferOffset, varInfo.Key);
151-
responseBuffer.WriteString(ref responseBufferOffset, varInfo.Value);
152-
}
153-
154-
OutputQueue.Enqueue(new DataToClient(clientRef, responseBuffer));
155-
}
156-
}
157-
158116
/// <summary>
159117
/// Reads variable ID from the given data buffer.
160118
/// </summary>

0 commit comments

Comments
 (0)