pocoproject#550 WebSocket fragmented message problem

obiltschnig · obiltschnig · commit cd678638526a · 2014-10-02T20:24:50.000+02:00
diff --git a/Net/include/Poco/Net/WebSocket.h b/Net/include/Poco/Net/WebSocket.h
@@ -76,7 +76,8 @@ class Net_API WebSocket: public StreamSocket
 		FRAME_OP_CLOSE   = 0x08, /// Close connection.
 		FRAME_OP_PING    = 0x09, /// Ping frame.
 		FRAME_OP_PONG    = 0x0a, /// Pong frame.
-		FRAME_OP_BITMASK = 0x0f  /// Bit mask for opcodes. 
+		FRAME_OP_BITMASK = 0x0f, /// Bit mask for opcodes. 
+		FRAME_OP_SETRAW  = 0x100 /// Set raw flags (for use with sendBytes() and FRAME_OP_CONT).
 	};
 	
 	enum SendFlags
diff --git a/Net/src/WebSocket.cpp b/Net/src/WebSocket.cpp
@@ -101,6 +101,7 @@ void WebSocket::shutdown(Poco::UInt16 statusCode, const std::string& statusMessa
 
 int WebSocket::sendFrame(const void* buffer, int length, int flags)
 {
+	flags |= FRAME_OP_SETRAW;
 	return static_cast<WebSocketImpl*>(impl())->sendBytes(buffer, length, flags);
 }
 
diff --git a/Net/src/WebSocketImpl.cpp b/Net/src/WebSocketImpl.cpp
@@ -61,6 +61,7 @@ int WebSocketImpl::sendBytes(const void* buffer, int length, int flags)
 	Poco::BinaryWriter writer(ostr, Poco::BinaryWriter::NETWORK_BYTE_ORDER);
 	
 	if (flags == 0) flags = WebSocket::FRAME_BINARY;
+	flags &= 0xff;
 	writer << static_cast<Poco::UInt8>(flags);
 	Poco::UInt8 lengthByte(0);
 	if (_mustMaskPayload)

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ void WebSocket::shutdown(Poco::UInt16 statusCode, const std::string& statusMessa`
`101`	`101`
`102`	`102`	`int WebSocket::sendFrame(const void* buffer, int length, int flags)`
`103`	`103`	`{`
	`104`	`+ flags \|= FRAME_OP_SETRAW;`
`104`	`105`	`return static_cast<WebSocketImpl*>(impl())->sendBytes(buffer, length, flags);`
`105`	`106`	`}`
`106`	`107`