From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 21 Jan 2022 10:50:17 +0000 (+0100)
Subject: dnsdist: Fix dnsdist_ffi_ring_entry_get_protocol
X-Git-Tag: dnsdist-1.8.0-rc1~288^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ef780f4d0abdb28b08a3c52eafae0fb89eac727;p=thirdparty%2Fpdns.git

dnsdist: Fix dnsdist_ffi_ring_entry_get_protocol
---

diff --git a/pdns/dnsdist-protocols.cc b/pdns/dnsdist-protocols.cc
index 4fc02eeb63..adafcf759b 100644
--- a/pdns/dnsdist-protocols.cc
+++ b/pdns/dnsdist-protocols.cc
@@ -74,4 +74,8 @@ const std::string& Protocol::toPrettyString() const
   return s_prettyNames.at(static_cast<uint8_t>(d_protocol));
 }
 
+uint8_t Protocol::toNumber() const
+{
+  return static_cast<uint8_t>(d_protocol);
+}
 }
diff --git a/pdns/dnsdist-protocols.hh b/pdns/dnsdist-protocols.hh
index fbd51683b8..36284c37f0 100644
--- a/pdns/dnsdist-protocols.hh
+++ b/pdns/dnsdist-protocols.hh
@@ -31,7 +31,7 @@ class Protocol
 public:
   enum typeenum : uint8_t
   {
-    DoUDP,
+    DoUDP = 0,
     DoTCP,
     DNSCryptUDP,
     DNSCryptTCP,
@@ -54,6 +54,7 @@ public:
 
   const std::string& toString() const;
   const std::string& toPrettyString() const;
+  uint8_t toNumber() const;
 
 private:
   typeenum d_protocol;
diff --git a/pdns/dnsdistdist/dnsdist-lua-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
index 38f01ce9f0..8100c62516 100644
--- a/pdns/dnsdistdist/dnsdist-lua-ffi.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-ffi.cc
@@ -924,9 +924,7 @@ uint8_t dnsdist_ffi_ring_entry_get_protocol(const dnsdist_ffi_ring_entry_list_t*
     return 0;
   }
 
-  //return static_cast<uint8_t>(list->d_entries.at(idx).protocol);
-  #warning FIXME
-  return 0;
+  return list->d_entries.at(idx).protocol.toNumber();
 }
 
 uint16_t dnsdist_ffi_ring_entry_get_size(const dnsdist_ffi_ring_entry_list_t* list, size_t idx)