Don't enforce receive-maximum on the broker

Author: ralight

ChangeLog.txt

@@ -12,6 +12,8 @@
 - Fix $SYS load values not being published initially. Closes #3459.
 - Fix max_connections not being honoured on libwebsockets listeners. This does
   not affect the built-in websockets support. Closes #3455.
+- Don't enforce receive-maximum, just log a warning. This allows badly
+  behaving clients to be fixed. Closes #3471.
 
 # Plugins
 - Fix incorrect linking of libmosquitto_common.so for the acl and password

src/handle_publish.c

@@ -108,9 +108,15 @@ int handle__accepted_publish(struct mosquitto *context, struct mosquitto__base_m
 
 	if(!cmsg_stored){
 		if(base_msg->data.qos > 0 && context->msgs_in.inflight_quota == 0){
+			log__printf(NULL, MOSQ_LOG_WARNING, "Client %s has exceeded its receive-maximum quota. This behaviour must be fixed on the client.", context->id);
+#if 0
+			/* Badly behaving clients like on the esp32 fall foul of this
+			 * check, so report it for now but don't disconnect, to give chance
+			 * for the bad behaviour to be fixed. */
 			/* Client isn't allowed any more incoming messages, so fail early */
 			db__msg_store_free(base_msg);
 			return MOSQ_ERR_RECEIVE_MAXIMUM_EXCEEDED;
+#endif
 		}
 
 		if(base_msg->data.qos == 0

test/broker/CMakeLists.txt

@@ -8,14 +8,10 @@ list(APPEND PY_TEST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/msg_sequence_test.py")
 set(PERSIST_LIST
     persist_sqlite
 )
-set(PERSIST_LMDB_EXCLUDE_LIST
-    15-persist-migrate-db
-    15-persist-migrate-db
-)
-
 set(EXCLUDE_LIST
     01-connect-uname-password-success-no-tls
     03-publish-qos1-queued-bytes
+    03-publish-qos2-max-inflight-exceeded
     09-extended-auth-single2
     # Not a test
     06-bridge-clean-session-core
@@ -44,9 +40,6 @@ endforeach()
 foreach(PERSIST_TYPE ${PERSIST_LIST})
     foreach(PY_TEST_FILE ${PY_PERSIST_TEST_FILES})
         get_filename_component(PY_TEST_NAME ${PY_TEST_FILE} NAME_WE)
-        if("${PERSIST_TYPE}" STREQUAL "persist_lmdb" AND ${PY_TEST_NAME} IN_LIST PERSIST_LMDB_EXCLUDE_LIST)
-	    continue()
-	endif()
         add_test(NAME broker-${PY_TEST_NAME}-${PERSIST_TYPE}
             COMMAND ${PY_TEST_FILE} ${PERSIST_TYPE}
         )

test/broker/Makefile

@@ -96,7 +96,7 @@ msg_sequence_test:
 	./03-publish-qos1-retain-disabled.py
 	./03-publish-qos1.py
 	./03-publish-qos2-dup.py
-	./03-publish-qos2-max-inflight-exceeded.py
+	#./03-publish-qos2-max-inflight-exceeded.py
 	./03-publish-qos2-max-inflight.py
 	./03-publish-qos2-reuse-mid.py
 	./03-publish-qos2.py

test/broker/test.py

@@ -77,7 +77,7 @@
     (1, './03-publish-qos1-retain-disabled.py'),
     (1, './03-publish-qos1.py'),
     (1, './03-publish-qos2-dup.py'),
-    (1, './03-publish-qos2-max-inflight-exceeded.py'),
+    #(1, './03-publish-qos2-max-inflight-exceeded.py'),
     (1, './03-publish-qos2-max-inflight.py'),
     (1, './03-publish-qos2-reuse-mid.py'),
     (1, './03-publish-qos2.py'),