Merge branch 'release/3.1.3'

LabVIEW-Open-Source · Dec 13, 2020 · 31a2411 · 31a2411
2 parents e788156 + ac5ad1f
commit 31a2411
Show file tree

Hide file tree

Showing 27 changed files with 345 additions and 340 deletions.
diff --git a/MQTT Broker.vipb b/MQTT Broker.vipb
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-11-01 07:33:35" Creator="normandinf" Comments="" ID="771419214bce8bf973667a4183bec876">
+<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-12-12 19:15:06" Creator="normandinf" Comments="" ID="ab354f8753b088e3aceac7b46e8e55ef">
   <Library_General_Settings>
     <Package_File_Name>LabVIEW_Open_Source_Project_lib_MQTT_Broker</Package_File_Name>
-    <Library_Version>3.1.2.10</Library_Version>
+    <Library_Version>3.1.3.12</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>source</Library_Source_Folder>
     <Library_Output_Folder>.</Library_Output_Folder>
@@ -18,13 +18,13 @@
   <Advanced_Settings>
     <Package_Dependencies>
       <External_Dependencies>labview_open_source_lib_data_manipulation &gt;= 1.3.0.12</External_Dependencies>
-      <External_Dependencies>labview_open_source_lib_serializer &gt;= 1.1.0.12</External_Dependencies>
+      <External_Dependencies>labview_open_source_lib_serializer &gt;= 1.1.1.14</External_Dependencies>
       <External_Dependencies>labview_open_source_project_lib_mqtt_connection &gt;= 3.1.3.21</External_Dependencies>
-      <External_Dependencies>labview_open_source_project_lib_mqtt_control_packets &gt;= 3.1.2.8</External_Dependencies>
+      <External_Dependencies>labview_open_source_project_lib_mqtt_control_packets &gt;= 3.1.3.9</External_Dependencies>
       <Direct_Dependencies>labview_open_source_lib_data_manipulation-1.3.0.12</Direct_Dependencies>
-      <Direct_Dependencies>labview_open_source_lib_serializer-1.1.0.12</Direct_Dependencies>
+      <Direct_Dependencies>labview_open_source_lib_serializer-1.1.1.14</Direct_Dependencies>
       <Direct_Dependencies>labview_open_source_project_lib_mqtt_connection-3.1.3.21</Direct_Dependencies>
-      <Direct_Dependencies>labview_open_source_project_lib_mqtt_control_packets-3.1.2.8</Direct_Dependencies>
+      <Direct_Dependencies>labview_open_source_project_lib_mqtt_control_packets-3.1.3.9</Direct_Dependencies>
     </Package_Dependencies>
     <Custom_Action_VIs>
       <Pre-Build_VI/>
@@ -88,19 +88,11 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
       <Copyright/>
       <Packager/>
       <URL/>
-      <Release_Notes>[MQTT-2.3.1-6] QoS = 2 is enabled
-[MQTT-4.3.2-1] Subscription stores unacknowledged packets in QoS = 1 delivery, until PUBACK received
-[MQTT-4.3.3-1] Subscription stores unacknowledged packets in QoS = 2 delivery, until PUBCOMP received
-[MQTT-4.8.0-1] Protocol Violation causes a disconnection of the endpoint
-[MQTT-6.0.0-1] Sending a Text Frame causes an immediate disconnection
-[MQTT-6.0.0-2] MQTT Engine does not assume that control packets are aligned with websocket frame boundaries
-[MQTT-6.0.0-3] Client send mqtt as subprotocol
-[MQTT-6.0.0-4] Server responds with mqtt as subprotocol
+      <Release_Notes>[Fix: 161] Repetition of publish packet in QoS &gt; 0 (MQTT Client package upgrade)
 
-- This release completes the support requirements specifically for Websockets connections.
-- This release also brings QoS support for server, both as a receiver (published messages from client) and as a sender (subscriptions forwarding messages to clients)
-
-</Release_Notes>
+- Fixed a unit test which failed after fixing CONNECT packet handling of length-prefixed password
+- Includes upgrade for MQTT Client and Control Packet Dependencies which fix a few bugs
+Please refer to https://github.com/LabVIEW-Open-Source/MQTT-Client and https://github.com/LabVIEW-Open-Source/LV-MQTT-Control-Packets for more info</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -306,7 +298,7 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
         <Path>source\DropVI_MQTT Server.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>EABD481B43DEBA417DF73B86854E5965</GUID>
+      <GUID>67BB9EBAE6152A7074B54F018A28CB1E</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>
diff --git a/MQTT Broker.vipc b/MQTT Broker.vipc
diff --git a/MQTT-Broker.lvproj b/MQTT-Broker.lvproj
diff --git a/Unit Tests/Manual Dev Tests/161-Test QoS Repetition Bug.vi b/Unit Tests/Manual Dev Tests/161-Test QoS Repetition Bug.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-2.3.1-3.vi b/Unit Tests/Requirements Coverage/Test MQTT-2.3.1-3.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-1.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-1.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-5.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-5.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-6.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-6.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-7.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-7.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-8.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.1.3-8.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.3.2-3.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.3.2-3.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.8.1-1.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.8.1-1.vi
diff --git a/Unit Tests/Requirements Coverage/Test MQTT-3.8.3-3.vi b/Unit Tests/Requirements Coverage/Test MQTT-3.8.3-3.vi
diff --git a/source/DropVI_MQTT Server.vi b/source/DropVI_MQTT Server.vi
diff --git a/source/Server class/Add ClientID Session.vi b/source/Server class/Add ClientID Session.vi
diff --git a/source/Server class/Create Server.vi b/source/Server class/Create Server.vi
diff --git a/source/Server class/Forward Acknowledgement.vi b/source/Server class/Forward Acknowledgement.vi
diff --git a/source/Server class/Forward Inbound Message.vi b/source/Server class/Forward Inbound Message.vi
diff --git a/source/Server class/Get ClientID from Session.vi b/source/Server class/Get ClientID from Session.vi
diff --git a/source/Server class/Get Session from ClientID.vi b/source/Server class/Get Session from ClientID.vi
diff --git a/source/Server class/Launch Connection Handler.vi b/source/Server class/Launch Connection Handler.vi
diff --git a/source/Server class/Read Server Private Events.vi b/source/Server class/Read Server Private Events.vi
diff --git a/source/Server class/Read Server Public Events.vi b/source/Server class/Read Server Public Events.vi
diff --git a/source/Server class/Remove Session (byClientID).vi b/source/Server class/Remove Session (byClientID).vi
diff --git a/source/Server class/Remove Session (byMailbox).vi b/source/Server class/Remove Session (byMailbox).vi
diff --git a/source/Server class/onStop.vi b/source/Server class/onStop.vi
diff --git a/source/Server class/process.vi b/source/Server class/process.vi