Fixes for release

embhorn · embhorn · commit 65f3241505db · 2023-11-02T08:25:11.000-05:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,9 @@
 ## Release Notes
 
-### v1.16.0 (11/2/2023)
+### v1.17.0 (11/2/2023)
+Release 1.17.0 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
+https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
+
 * Fix for declaration after executable block by @lealem47 in #341
 * Add QNX IDE, Makefile, and remove source code exec bit by @JacobBarthelmeh 
   in #317
diff --git a/examples/pub-sub/mqtt-pub.c b/examples/pub-sub/mqtt-pub.c
@@ -461,7 +461,6 @@ int pub_client(MQTTCtx *mqttCtx)
         static BOOL CtrlHandler(DWORD fdwCtrlType)
         {
             if (fdwCtrlType == CTRL_C_EVENT) {
-                mStopRead = 1;
                 PRINTF("Received Ctrl+c");
                 return TRUE;
             }
diff --git a/scripts/firmware.test b/scripts/firmware.test
@@ -67,6 +67,9 @@ sleep 0.5
 server_result=$?
 [ $server_result -ne 0 ] && echo -e "\n\nMQTT Example fwpush failed!" && do_cleanup "-1"
 
+# give some time for the client complete
+sleep 0.5
+
 if [ $ENABLE_MQTT_TLS -ne 1 ]; then
     # Compare files
     echo "Comparing files"
diff --git a/src/mqtt_sn_packet.c b/src/mqtt_sn_packet.c
@@ -1488,7 +1488,7 @@ int SN_Packet_Read(MqttClient *client, byte* rx_buf, int rx_buf_len,
                         return MqttPacket_HandleNetError(client,
                                  MQTT_TRACE_ERROR(MQTT_CODE_ERROR_NETWORK));
                     }
-                    rc += len;
+                    len += rc;
                 }
                 else {
                     rc = MqttSocket_Peek(client, rx_buf, 4, timeout_ms);

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,6 @@ int pub_client(MQTTCtx *mqttCtx)`
`461`	`461`	`static BOOL CtrlHandler(DWORD fdwCtrlType)`
`462`	`462`	`{`
`463`	`463`	`if (fdwCtrlType == CTRL_C_EVENT) {`
`464`		`- mStopRead = 1;`
`465`	`464`	`PRINTF("Received Ctrl+c");`
`466`	`465`	`return TRUE;`
`467`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1488,7 +1488,7 @@ int SN_Packet_Read(MqttClient client, byte rx_buf, int rx_buf_len,`
`1488`	`1488`	`return MqttPacket_HandleNetError(client,`
`1489`	`1489`	`MQTT_TRACE_ERROR(MQTT_CODE_ERROR_NETWORK));`
`1490`	`1490`	`}`
`1491`		`- rc += len;`
	`1491`	`+ len += rc;`
`1492`	`1492`	`}`
`1493`	`1493`	`else {`
`1494`	`1494`	`rc = MqttSocket_Peek(client, rx_buf, 4, timeout_ms);`