Skip to content

Commit

Permalink
Merge branch 'release/3.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
francois-normandin committed Nov 1, 2020
2 parents 219ee6b + 7dd3889 commit 4c58556
Show file tree
Hide file tree
Showing 144 changed files with 866 additions and 341 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
*.aliases
*.lvlps
*.vip
.source/
Full Project Dependencies.vipc
29 changes: 18 additions & 11 deletions MQTT Broker.vipb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-10-20 20:13:26" Creator="normandinf" Comments="" ID="e864d7836a2e2614406db17db95bdf6d">
<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">
<Library_General_Settings>
<Package_File_Name>LabVIEW_Open_Source_Project_lib_MQTT_Broker</Package_File_Name>
<Library_Version>3.1.1.9</Library_Version>
<Library_Version>3.1.2.10</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>source</Library_Source_Folder>
<Library_Output_Folder>.</Library_Output_Folder>
Expand All @@ -19,12 +19,12 @@
<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_project_lib_mqtt_connection &gt;= 3.1.1.13</External_Dependencies>
<External_Dependencies>labview_open_source_project_lib_mqtt_control_packets &gt;= 3.1.1.7</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>
<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_project_lib_mqtt_connection-3.1.1.13</Direct_Dependencies>
<Direct_Dependencies>labview_open_source_project_lib_mqtt_control_packets-3.1.1.7</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>
</Package_Dependencies>
<Custom_Action_VIs>
<Pre-Build_VI/>
Expand Down Expand Up @@ -88,10 +88,17 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
<Copyright/>
<Packager/>
<URL/>
<Release_Notes>[Fix: 149] Duplicate subscriptions will not duplicate the number of publish packets received
[Fix: 152] All asynchronously launched processs now have a reference to front panel to force in-memory for EXE builds (server and client)
[MQTT-7.1.2-1] Added test for conformant client over at least one lossless, ordered protocol (TCP)
[MQTT-3.3.2-2] Publishing a topic containing a wildcard gets rejected with error 55015
<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

- 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>
</Description>
Expand Down Expand Up @@ -299,7 +306,7 @@ A mechanism to notify interested parties when an abnormal disconnection occurs.<
<Path>source\DropVI_MQTT Server.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>BC90A4A9138921F6ACA1C2D083C773F6</GUID>
<GUID>EABD481B43DEBA417DF73B86854E5965</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
Binary file modified MQTT Broker.vipc
Binary file not shown.
234 changes: 103 additions & 131 deletions MQTT-Broker.lvproj

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file modified Unit Tests/Manual Dev Tests/Test Local Queue Connection.vi
Binary file not shown.
Binary file modified Unit Tests/Manual Dev Tests/Test Server.vi
Binary file not shown.
Binary file modified Unit Tests/Manual Dev Tests/Test Simple Connection.vi
Binary file not shown.
Binary file modified Unit Tests/Manual Dev Tests/Test TCPConnection Process Kill.vi
Binary file not shown.
Binary file modified Unit Tests/Manual Dev Tests/Test WebSockets Connection.vi
Binary file not shown.
Binary file modified Unit Tests/Requirement Coverage.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/GetServerRef.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-1.5.3-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-1.5.3-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-2.2.2-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-2.3.1-2.vi
Binary file not shown.
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-2.3.1-6.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-2.3.1-7.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.0-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.0-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.2-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.2-12.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.2-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.2-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.3-5.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.3-6.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.3-7.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.3-8.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.3-9.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.1.4-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.12.4-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.14.4-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.2.0-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.2.2-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.3.2-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.3.2-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.8.1-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.8.3-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.8.4-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.8.4-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-3.8.4-5.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.1-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.1-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.2-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.3-1.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.3-2.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.3-3.vi
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-4.7.3-4.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Unit Tests/Requirements Coverage/Test MQTT-7.1.2-1.vi
Binary file not shown.
Binary file not shown.
Binary file modified UnitTesting Dependencies.vipc
Binary file not shown.
Binary file modified source/ConnectionHandler/process.vi
Binary file not shown.
Binary file modified source/DropVI_MQTT Server.vi
Binary file not shown.
5 changes: 5 additions & 0 deletions source/MQTT Server.lvlib
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="Session.Server.lvclass" Type="LVClass" URL="../Session.Server/Session.Server.lvclass"/>
<Item Name="_Subscription.lvclass" Type="LVClass" URL="../Subscription/_Subscription.lvclass"/>
<Item Name="_TopicFilter.lvclass" Type="LVClass" URL="../TopicFilter/_TopicFilter.lvclass"/>
<Item Name="ConnectionHandler.lvclass" Type="LVClass" URL="../ConnectionHandler/ConnectionHandler.lvclass"/>
<Item Name="PacketCollection.lvclass" Type="LVClass" URL="../PacketCollection/PacketCollection.lvclass">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
</Library>
Binary file not shown.
Binary file added source/PacketCollection/Flatten Packets.vi
Binary file not shown.
Binary file added source/PacketCollection/Get Collection Size.vi
Binary file not shown.
76 changes: 76 additions & 0 deletions source/PacketCollection/PacketCollection.lvclass

Large diffs are not rendered by default.

Binary file added source/PacketCollection/Read Packets.vi
Binary file not shown.
Binary file not shown.
Binary file modified source/Server class/Add ClientID Session.vi
Binary file not shown.
Binary file added source/Server class/Add Subscription.vi
Binary file not shown.
Binary file added source/Server class/CONNECT.checkValidID.vi
Binary file not shown.
Binary file added source/Server class/Clean Subscriptions.vi
Binary file not shown.
Binary file modified source/Server class/Create Server.vi
Binary file not shown.
Binary file added source/Server class/Forward Acknowledgement.vi
Binary file not shown.
Binary file added source/Server class/Forward Inbound Message.vi
Binary file not shown.
Binary file added source/Server class/Get ClientID from Session.vi
Binary file not shown.
Binary file modified source/Server class/Get Session from ClientID.vi
Binary file not shown.
Binary file modified source/Server class/Handle Incoming Packets.vi
Binary file not shown.
Binary file modified source/Server class/Launch Connection Handler.vi
Binary file not shown.
Binary file not shown.
Binary file modified source/Server class/Public Events -- cluster.ctl
Binary file not shown.
Binary file added source/Server class/Read Inbound Message.vi
Binary file not shown.
Binary file not shown.
Binary file modified source/Server class/Read Server Public Events.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added source/Server class/Remove Subscription.vi
Binary file not shown.
Binary file modified source/Server class/Send SessionDisconnectMessage.vi
Binary file not shown.
488 changes: 300 additions & 188 deletions source/Server class/Server.lvclass

Large diffs are not rendered by default.

Binary file modified source/Server class/SessionRef -- cluster.ctl
Binary file not shown.
Binary file added source/Server class/clearStoredSession.vi
Binary file not shown.
Binary file removed source/Server class/isSessionPresent.vi
Binary file not shown.
Binary file added source/Server class/isSessionStored.vi
Binary file not shown.
Binary file modified source/Server class/onCreate.vi
Binary file not shown.
Binary file modified source/Server class/onDestroy.vi
Binary file not shown.
Binary file modified source/Server class/onStart.vi
Binary file not shown.
Binary file modified source/Server class/onStop.vi
Binary file not shown.
Binary file modified source/Server class/process.vi
Binary file not shown.
Binary file added source/Session.Server/Forward Packet.vi
Binary file not shown.
15 changes: 12 additions & 3 deletions source/Session.Server/Session.Server.lvclass

Large diffs are not rendered by default.

Binary file modified source/Session.Server/Validate Incoming Packet.vi
Binary file not shown.
Binary file modified source/Session.Server/onTerminateSession.vi
Binary file not shown.
Binary file added source/StoredSessions/Add PUBREC.vi
Binary file not shown.
Binary file added source/StoredSessions/Add Subscription.vi
Binary file not shown.
Binary file modified source/StoredSessions/Delete Session State.vi
Binary file not shown.
Binary file modified source/StoredSessions/Get Storage Ref.vi
Binary file not shown.
Binary file not shown.
Binary file added source/StoredSessions/Remove PUBREC.vi
Binary file not shown.
Binary file added source/StoredSessions/Remove Subscription.vi
Binary file not shown.
Binary file removed source/StoredSessions/Retrieve Stored Session.vi
Binary file not shown.
Binary file not shown.
Binary file removed source/StoredSessions/Store Session State.vi
Binary file not shown.
70 changes: 62 additions & 8 deletions source/StoredSessions/StoredSessions.lvclass

Large diffs are not rendered by default.

Binary file added source/StoredSessions/Update Subscription.vi
Binary file not shown.
Binary file added source/StoredSessions/hasStateStored.vi
Binary file not shown.
Binary file added source/Subscription/Check Packet ID Unused.vi
Binary file not shown.
Binary file added source/Subscription/Create Subscription.vi
Binary file not shown.
Binary file added source/Subscription/Destroy Subscription.vi
Binary file not shown.
Binary file added source/Subscription/Discard Packet.vi
Binary file not shown.
Binary file added source/Subscription/Evaluate Match.vi
Binary file not shown.
Binary file not shown.
Binary file added source/Subscription/Merge QoS.vi
Binary file not shown.
Binary file not shown.
Binary file added source/Subscription/Read QoS.vi
Binary file not shown.
Binary file added source/Subscription/Read SessionMailbox.vi
Binary file not shown.
Binary file added source/Subscription/Read Topic Filter.vi
Binary file not shown.
Binary file added source/Subscription/Reply to Client.vi
Binary file not shown.
Binary file added source/Subscription/Store Packet.vi
Binary file not shown.
Binary file added source/Subscription/Stored Packet -- cluster.ctl
Binary file not shown.
Binary file added source/Subscription/Write QoS.vi
Binary file not shown.
Binary file added source/Subscription/Write Topic Filter.vi
Binary file not shown.
183 changes: 183 additions & 0 deletions source/Subscription/_Subscription.lvclass

Large diffs are not rendered by default.

Binary file added source/Subscription/process.vi
Binary file not shown.
Binary file added source/TopicFilter/Add to Cache.vi
Binary file not shown.
Binary file added source/TopicFilter/Create TopicFilter.vi
Binary file not shown.
Binary file added source/TopicFilter/Destroy TopicFilter.vi
Binary file not shown.
Binary file added source/TopicFilter/Evaluate.vi
Binary file not shown.
Binary file added source/TopicFilter/Read Topic Filter.vi
Binary file not shown.
Binary file added source/TopicFilter/Topic Filter Error.ctl
Binary file not shown.
Binary file added source/TopicFilter/Write Topic Filter.vi
Binary file not shown.
105 changes: 105 additions & 0 deletions source/TopicFilter/_TopicFilter.lvclass

Large diffs are not rendered by default.

Binary file added source/TopicFilter/isCached.vi
Binary file not shown.
Binary file added source/TopicFilter/isUniversal.vi
Binary file not shown.

0 comments on commit 4c58556

Please sign in to comment.