From: Fred Morcos Date: Fri, 12 Aug 2022 11:25:25 +0000 (+0200) Subject: Rec: Move FrameStreamServersInfo to rec-main X-Git-Tag: rec-4.7.3~4^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11879%2Fhead;p=thirdparty%2Fpdns.git Rec: Move FrameStreamServersInfo to rec-main (cherry picked from commit 4354beb50caffdc4cb45ef3004402a780a0e2d81) --- diff --git a/pdns/rec-lua-conf.hh b/pdns/rec-lua-conf.hh index a6f0943da5..c8c94f0469 100644 --- a/pdns/rec-lua-conf.hh +++ b/pdns/rec-lua-conf.hh @@ -62,13 +62,6 @@ struct FrameStreamExportConfig bool operator==(const FrameStreamExportConfig& configA, const FrameStreamExportConfig& configB); bool operator!=(const FrameStreamExportConfig& configA, const FrameStreamExportConfig& configB); -struct FrameStreamServersInfo -{ - std::shared_ptr>> servers; - uint64_t generation; - FrameStreamExportConfig config; -}; - struct TrustAnchorFileInfo { uint32_t interval{24}; diff --git a/pdns/recursordist/rec-main.hh b/pdns/recursordist/rec-main.hh index 855bc29bd4..9855c88358 100644 --- a/pdns/recursordist/rec-main.hh +++ b/pdns/recursordist/rec-main.hh @@ -245,6 +245,13 @@ extern thread_local std::shared_ptr t_udrDBp; #endif #ifdef HAVE_FSTRM +struct FrameStreamServersInfo +{ + std::shared_ptr>> servers; + uint64_t generation; + FrameStreamExportConfig config; +}; + extern thread_local FrameStreamServersInfo t_frameStreamServersInfo; #endif /* HAVE_FSTRM */