Fix implementation of MaxFrameSize

darkl · darkl · commit ab27141217dd · 2021-06-08T11:27:06.000-04:00
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs
@@ -57,25 +57,29 @@ await mWebSocket.SendAsync(messageToSend, WebSocketMessageType, true, mCancellat
             {
                 int maxFrameSize = mMaxFrameSize.Value;
 
-                int numberOfFrames = messageToSend.Count / maxFrameSize;
+                int remainingSize = messageToSend.Count;
 
-                for (int i = 0; i < numberOfFrames; i++)
-                {
-                    bool endOfMessage = false;
-                    int currentFrameSize = maxFrameSize;
+                bool endOfMessage = false;
+                int currentFrameSize = maxFrameSize;
+                int offset = 0;
 
-                    if (i == numberOfFrames - 1)
+                while (remainingSize > 0)
+                {
+                    if (remainingSize < maxFrameSize)
                     {
                         endOfMessage = true;
-                        currentFrameSize = messageToSend.Count - maxFrameSize * i;
+                        currentFrameSize = remainingSize;
                     }
 
                     ArraySegment<byte> partialMessage = new ArraySegment<byte>(messageToSend.Array, 
-                                                                               i * maxFrameSize,
+                                                                               offset,
                                                                                currentFrameSize);
 
                     await mWebSocket.SendAsync(partialMessage, WebSocketMessageType, endOfMessage, mCancellationToken)
                                     .ConfigureAwait(false);
+
+                    offset += maxFrameSize;
+                    remainingSize -= maxFrameSize;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -57,25 +57,29 @@ await mWebSocket.SendAsync(messageToSend, WebSocketMessageType, true, mCancellat`
`57`	`57`	`{`
`58`	`58`	`int maxFrameSize = mMaxFrameSize.Value;`
`59`	`59`
`60`		`- int numberOfFrames = messageToSend.Count / maxFrameSize;`
	`60`	`+ int remainingSize = messageToSend.Count;`
`61`	`61`
`62`		`- for (int i = 0; i < numberOfFrames; i++)`
`63`		`- {`
`64`		`- bool endOfMessage = false;`
`65`		`- int currentFrameSize = maxFrameSize;`
	`62`	`+ bool endOfMessage = false;`
	`63`	`+ int currentFrameSize = maxFrameSize;`
	`64`	`+ int offset = 0;`
`66`	`65`
`67`		`- if (i == numberOfFrames - 1)`
	`66`	`+ while (remainingSize > 0)`
	`67`	`+ {`
	`68`	`+ if (remainingSize < maxFrameSize)`
`68`	`69`	`{`
`69`	`70`	`endOfMessage = true;`
`70`		`- currentFrameSize = messageToSend.Count - maxFrameSize * i;`
	`71`	`+ currentFrameSize = remainingSize;`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`ArraySegment<byte> partialMessage = new ArraySegment<byte>(messageToSend.Array,`
`74`		`- i * maxFrameSize,`
	`75`	`+ offset,`
`75`	`76`	`currentFrameSize);`
`76`	`77`
`77`	`78`	`await mWebSocket.SendAsync(partialMessage, WebSocketMessageType, endOfMessage, mCancellationToken)`
`78`	`79`	`.ConfigureAwait(false);`
	`80`	`+`
	`81`	`+ offset += maxFrameSize;`
	`82`	`+ remainingSize -= maxFrameSize;`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`	`}`