From b1512814fd0293e7be8a16ee49c617d53fe01c85 Mon Sep 17 00:00:00 2001
From: Peter Newman <peterjnewman@gmail.com>
Date: Tue, 18 Feb 2020 05:41:54 +0000
Subject: [PATCH] Add the ability to inflate an LLRP Probe Reply and build a
 Probe Request

(cherry picked from commit 8db5131776b31ada6cf78a0bd6c78a280840432b)
---
 libs/acn/LLRPProbeRequestPDU.cpp | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/libs/acn/LLRPProbeRequestPDU.cpp b/libs/acn/LLRPProbeRequestPDU.cpp
index 2d3dfcf19..125cc7b2b 100644
--- a/libs/acn/LLRPProbeRequestPDU.cpp
+++ b/libs/acn/LLRPProbeRequestPDU.cpp
@@ -81,6 +81,56 @@ void LLRPProbeRequestPDU::PackData(ola::io::OutputStream *stream) const {
                                           (m_known_uids.Size() * UID::LENGTH)));
 }
 
+unsigned int LLRPProbeRequestPDU::DataSize() const {
+  llrp_probe_request_pdu_data data;
+  return static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -
+                                   sizeof(data.known_uids) +
+                                   (m_known_uids.Size() * UID::LENGTH));
+
+}
+
+bool LLRPProbeRequestPDU::PackData(uint8_t *data, unsigned int *length) const {
+  llrp_probe_request_pdu_data pdu_data;
+  m_lower_uid.Pack(pdu_data.lower_uid, sizeof(pdu_data.lower_uid));
+  m_upper_uid.Pack(pdu_data.upper_uid, sizeof(pdu_data.upper_uid));
+  uint16_t filter = 0;
+  if (m_client_tcp_connection_inactive) {
+    filter |= FILTER_CLIENT_TCP_CONNECTION_INACTIVE;
+  }
+  if (m_brokers_only) {
+    filter |= FILTER_BROKERS_ONLY;
+  }
+  pdu_data.filter = HostToNetwork(filter);
+  // TODO(Peter): We need to check we've got <= 200 UIDs here
+  m_known_uids.Pack(pdu_data.known_uids, sizeof(pdu_data.known_uids));
+  *length = static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -
+                                      sizeof(pdu_data.known_uids) +
+                                      (m_known_uids.Size() * UID::LENGTH));
+
+  memcpy(data, &pdu_data, *length);
+  return true;
+}
+
+void LLRPProbeRequestPDU::PackData(ola::io::OutputStream *stream) const {
+  llrp_probe_request_pdu_data data;
+  m_lower_uid.Pack(data.lower_uid, sizeof(data.lower_uid));
+  m_upper_uid.Pack(data.upper_uid, sizeof(data.upper_uid));
+  uint16_t filter = 0;
+  if (m_client_tcp_connection_inactive) {
+    filter |= FILTER_CLIENT_TCP_CONNECTION_INACTIVE;
+  }
+  if (m_brokers_only) {
+    filter |= FILTER_BROKERS_ONLY;
+  }
+  data.filter = HostToNetwork(filter);
+  // TODO(Peter): We need to check we've got <= 200 UIDs here
+  m_known_uids.Pack(data.known_uids, sizeof(data.known_uids));
+  stream->Write(reinterpret_cast<uint8_t*>(&data),
+                static_cast<unsigned int>(sizeof(llrp_probe_request_pdu_data) -
+                                          sizeof(data.known_uids) +
+                                          (m_known_uids.Size() * UID::LENGTH)));
+}
+
 void LLRPProbeRequestPDU::PrependPDU(ola::io::IOStack *stack,
                                      const UID &lower_uid,
                                      const UID &upper_uid,