Merge pull request #326 from CESNET/ipfix-reconnect-lz4-fix

ipfix: fix stuck flushing loop after TCP disconnect in LZ4 mode

Author: SiskaPavel

src/plugins/output/ipfix/src/ipfix.cpp

@@ -818,10 +818,8 @@ void IPFIXExporter::send_data()
 	 * Loop ends when len = create_data_packet() is 0
 	 */
 	while (true) {
-		pkt.data = packetDataBuffer.getWriteBuffer(mtu);
+		pkt.data = packetDataBuffer.getWriteBufferOrReset(mtu);
 		if (!pkt.data) {
-			// this should never happen because packetDataBuffer
-			// should already have enough allocated memory
 			return;
 		}
 
@@ -1227,6 +1225,16 @@ int CompressBuffer::init(bool compress, size_t compressSize, size_t writeSize)
 	return 0;
 }
 
+uint8_t* CompressBuffer::getWriteBufferOrReset(size_t requiredSize)
+{
+	uint8_t* buffer = getWriteBuffer(requiredSize);
+	if (buffer != nullptr) {
+		return buffer;
+	}
+	shrinkTo(0);
+	return getWriteBuffer(requiredSize);
+}
+
 uint8_t* CompressBuffer::getWriteBuffer(size_t requiredSize)
 {
 	// the contents can happily fit into the buffer

src/plugins/output/ipfix/src/ipfix.hpp

@@ -457,6 +457,17 @@ class CompressBuffer {
 	 */
 	uint8_t* getWriteBuffer(size_t requiredSize);
 
+	/**
+	 * @brief Attempts to get a write buffer, resetting internal state on failure and retrying once.
+	 *
+	 *        This can happen in compress mode when a previous send failed without calling
+	 * compress(), leaving readSize non-zero and causing getWriteBuffer() to return null.
+	 *
+	 * @param requiredSize required size of the buffer
+	 * @return pointer to the buffer with the required size, null on failure
+	 */
+	uint8_t* getWriteBufferOrReset(size_t requiredSize);
+
 	/**
 	 * @brief compresses data written after last compress() call
 	 *