Move the test non-block code into the network callbacks, which know if the non-blocking is allowed.

Author: dgarske

examples/mqttnet.c

@@ -32,6 +32,10 @@ typedef struct MulticastCtx {
 } MulticastCtx;
 #endif
 
+#ifndef WOLFMQTT_TEST_NONBLOCK_TIMES
+#define WOLFMQTT_TEST_NONBLOCK_TIMES 1
+#endif
+
 /* Private functions */
 
 /* -------------------------------------------------------------------------- */
@@ -643,11 +647,16 @@ static int NetWrite(void *context, const byte* buf, int buf_len,
     int timeout_ms)
 {
     SocketContext *sock = (SocketContext*)context;
+    MQTTCtx* mqttCtx;
     int rc;
     SOERROR_T so_error = 0;
 #ifndef WOLFMQTT_NO_TIMEOUT
     struct timeval tv;
 #endif
+#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
+    static int testNbWriteAlt = 0;
+    static int testSmallerWrite = 0;
+#endif
 
     if (context == NULL || buf == NULL || buf_len <= 0) {
         return MQTT_CODE_ERROR_BAD_ARG;
@@ -656,6 +665,27 @@ static int NetWrite(void *context, const byte* buf, int buf_len,
     if (sock->fd == SOCKET_INVALID)
         return MQTT_CODE_ERROR_BAD_ARG;
 
+    mqttCtx = sock->mqttCtx;
+    (void)mqttCtx;
+
+#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
+    if (mqttCtx->useNonBlockMode) {
+        if (testNbWriteAlt < WOLFMQTT_TEST_NONBLOCK_TIMES) {
+            testNbWriteAlt++;
+            return MQTT_CODE_CONTINUE;
+        }
+        testNbWriteAlt = 0;
+        if (!testSmallerWrite) {
+            if (buf_len > 2)
+                buf_len /= 2;
+            testSmallerWrite = 1;
+        }
+        else {
+            testSmallerWrite = 0;
+        }
+    }
+#endif
+
 #ifndef WOLFMQTT_NO_TIMEOUT
     /* Setup timeout */
     setup_timeout(&tv, timeout_ms);
@@ -706,6 +736,10 @@ static int NetRead_ex(void *context, byte* buf, int buf_len,
     fd_set errfds;
     struct timeval tv;
 #endif
+#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
+    static int testNbReadAlt = 0;
+    static int testSmallerRead = 0;
+#endif
 
     if (context == NULL || buf == NULL || buf_len <= 0) {
         return MQTT_CODE_ERROR_BAD_ARG;
@@ -721,6 +755,24 @@ static int NetRead_ex(void *context, byte* buf, int buf_len,
     mqttCtx = sock->mqttCtx;
     (void)mqttCtx;
 
+#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
+    if (mqttCtx->useNonBlockMode) {
+        if (testNbReadAlt < WOLFMQTT_TEST_NONBLOCK_TIMES) {
+            testNbReadAlt++;
+            return MQTT_CODE_CONTINUE;
+        }
+        testNbReadAlt = 0;
+        if (!testSmallerRead) {
+            if (buf_len > 2)
+                buf_len /= 2;
+            testSmallerRead = 1;
+        }
+        else {
+            testSmallerRead = 0;
+        }
+    }
+#endif
+
 #ifndef WOLFMQTT_NO_TIMEOUT
     /* Setup timeout */
     setup_timeout(&tv, timeout_ms);

src/mqtt_socket.c

@@ -42,11 +42,6 @@
     #undef WOLFMQTT_DEBUG_SOCKET
 #endif
 
-/* #define WOLFMQTT_TEST_NONBLOCK */
-#ifdef WOLFMQTT_TEST_NONBLOCK
-    #define WOLFMQTT_TEST_NONBLOCK_TIMES 1
-#endif
-
 /* lwip */
 #ifdef WOLFSSL_LWIP
     #undef read
@@ -64,18 +59,6 @@ int MqttSocket_TlsSocketReceive(WOLFSSL* ssl, char *buf, int sz,
     MqttClient *client = (MqttClient*)ptr;
     (void)ssl; /* Not used */
 
-#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
-    static int testSmallerTlsRead = 0;
-    if (!testSmallerTlsRead) {
-        if (sz > 2)
-            sz /= 2;
-        testSmallerTlsRead = 1;
-    }
-    else {
-        testSmallerTlsRead = 0;
-    }
-#endif
-
     rc = client->net->read(client->net->context, (byte*)buf, sz,
         client->tls.timeout_ms);
 
@@ -99,18 +82,6 @@ int MqttSocket_TlsSocketSend(WOLFSSL* ssl, char *buf, int sz,
     MqttClient *client = (MqttClient*)ptr;
     (void)ssl; /* Not used */
 
-#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
-    static int testSmallerTlsWrite = 0;
-    if (!testSmallerTlsWrite) {
-        if (sz > 2)
-            sz /= 2;
-        testSmallerTlsWrite = 1;
-    }
-    else {
-        testSmallerTlsWrite = 0;
-    }
-#endif
-
     rc = client->net->write(client->net->context, (byte*)buf, sz,
         client->tls.timeout_ms);
 
@@ -153,15 +124,6 @@ static int MqttSocket_WriteDo(MqttClient *client, const byte* buf, int buf_len,
 {
     int rc;
 
-#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
-    static int testNbWriteAlt = 0;
-    if (testNbWriteAlt < WOLFMQTT_TEST_NONBLOCK_TIMES) {
-        testNbWriteAlt++;
-        return MQTT_CODE_CONTINUE;
-    }
-    testNbWriteAlt = 0;
-#endif
-
 #ifdef ENABLE_MQTT_TLS
     if (MqttClient_Flags(client,0,0) & MQTT_CLIENT_FLAG_IS_TLS) {
         client->tls.timeout_ms = timeout_ms;
@@ -194,18 +156,6 @@ static int MqttSocket_WriteDo(MqttClient *client, const byte* buf, int buf_len,
     else
 #endif /* ENABLE_MQTT_TLS */
     {
-    #if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
-        static int testSmallerWrite = 0;
-        if (!testSmallerWrite) {
-            if (buf_len > 2)
-                buf_len /= 2;
-            testSmallerWrite = 1;
-        }
-        else {
-            testSmallerWrite = 0;
-        }
-    #endif
-
         rc = client->net->write(client->net->context, buf, buf_len,
             timeout_ms);
     }
@@ -276,15 +226,6 @@ static int MqttSocket_ReadDo(MqttClient *client, byte* buf, int buf_len,
 {
     int rc;
 
-#if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
-    static int testNbReadAlt = 0;
-    if (testNbReadAlt < WOLFMQTT_TEST_NONBLOCK_TIMES) {
-        testNbReadAlt++;
-        return MQTT_CODE_CONTINUE;
-    }
-    testNbReadAlt = 0;
-#endif
-
 #ifdef ENABLE_MQTT_TLS
     if (MqttClient_Flags(client,0,0) & MQTT_CLIENT_FLAG_IS_TLS) {
         client->tls.timeout_ms = timeout_ms;
@@ -320,17 +261,6 @@ static int MqttSocket_ReadDo(MqttClient *client, byte* buf, int buf_len,
     else
 #endif /* ENABLE_MQTT_TLS */
     {
-    #if defined(WOLFMQTT_NONBLOCK) && defined(WOLFMQTT_TEST_NONBLOCK)
-        static int testSmallerRead = 0;
-        if (!testSmallerRead) {
-            if (buf_len > 2)
-                buf_len /= 2;
-            testSmallerRead = 1;
-        }
-        else {
-            testSmallerRead = 0;
-        }
-    #endif
         rc = client->net->read(client->net->context, buf, buf_len, timeout_ms);
     }