Merge branch 'master' of https://github.com/openlightingproject/ola i…

…nto e1.33-controller
OpenLightingProject · Mar 16, 2024 · 58a6cc2 · 58a6cc2
2 parents 1a036f9 + e7b4039
commit 58a6cc2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -262,7 +262,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js v18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18 # LTS
           cache: 'npm'

diff --git a/libs/acn/LLRPHeader.h b/libs/acn/LLRPHeader.h
@@ -51,8 +51,8 @@ class LLRPHeader {
     uint32_t TransactionNumber() const { return m_transaction_number; }
 
     bool operator==(const LLRPHeader &other) const {
-      return m_destination_cid == other.m_destination_cid &&
-        m_transaction_number == other.m_transaction_number;
+      return ((m_destination_cid == other.m_destination_cid) &&
+        (m_transaction_number == other.m_transaction_number));
     }
 
     PACK(

diff --git a/libs/acn/Makefile.mk b/libs/acn/Makefile.mk
@@ -238,6 +238,14 @@ libs_acn_LLRPTester_LDADD = \
     libs/acn/libolae131core.la \
     $(COMMON_TESTING_LIBS)
 
+libs_acn_LLRPTester_SOURCES = \
+    libs/acn/LLRPInflatorTest.cpp \
+    libs/acn/LLRPPDUTest.cpp
+libs_acn_LLRPTester_CPPFLAGS = $(COMMON_TESTING_FLAGS)
+libs_acn_LLRPTester_LDADD = \
+    libs/acn/libolae131core.la \
+    $(COMMON_TESTING_LIBS)
+
 libs_acn_TransportTester_SOURCES = \
     libs/acn/TCPTransportTest.cpp \
     libs/acn/UDPTransportTest.cpp