From 34b2ed52e56b7ace76bc899630d5fcf59e637195 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 6 Mar 2024 12:09:41 +0100 Subject: [PATCH] dnsdist: Fix formatting issues --- .../dnsdist-lua-bindings-dnsquestion.cc | 24 +++++++++++++++---- pdns/dnsdistdist/dnsdist-lua-bindings.cc | 8 +++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc index 6003f5c5e8..9297dbccad 100644 --- a/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc +++ b/pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc @@ -42,7 +42,11 @@ void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) luaCtx.registerMember( "qclass", [](const DNSQuestion& dnsQuestion) -> uint16_t { return dnsQuestion.ids.qclass; }, [](DNSQuestion& dnsQuestion, uint16_t newClass) { (void)newClass; }); luaCtx.registerMember( - "rcode", [](const DNSQuestion& dnsQuestion) -> int { return static_cast(dnsQuestion.getHeader()->rcode); }, [](DNSQuestion& dnsQuestion, int newRCode) { + "rcode", + [](const DNSQuestion& dnsQuestion) -> int { + return static_cast(dnsQuestion.getHeader()->rcode); + }, + [](DNSQuestion& dnsQuestion, int newRCode) { dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsQuestion.getMutableData(), [newRCode](dnsheader& header) { header.rcode = static_cast(newRCode); return true; @@ -52,7 +56,11 @@ void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) "remoteaddr", [](const DNSQuestion& dnsQuestion) -> ComboAddress { return dnsQuestion.ids.origRemote; }, [](DNSQuestion& dnsQuestion, const ComboAddress newRemote) { (void)newRemote; }); /* DNSDist DNSQuestion */ luaCtx.registerMember( - "dh", [](const DNSQuestion& dnsQuestion) -> dnsheader* { return dnsQuestion.getMutableHeader(); }, [](DNSQuestion& dnsQuestion, const dnsheader* dnsHeader) { + "dh", + [](const DNSQuestion& dnsQuestion) -> dnsheader* { + return dnsQuestion.getMutableHeader(); + }, + [](DNSQuestion& dnsQuestion, const dnsheader* dnsHeader) { dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsQuestion.getMutableData(), [&dnsHeader](dnsheader& header) { header = *dnsHeader; return true; @@ -376,7 +384,11 @@ void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) luaCtx.registerMember( "qclass", [](const DNSResponse& dnsQuestion) -> uint16_t { return dnsQuestion.ids.qclass; }, [](DNSResponse& dnsQuestion, uint16_t newClass) { (void)newClass; }); luaCtx.registerMember( - "rcode", [](const DNSResponse& dnsQuestion) -> int { return static_cast(dnsQuestion.getHeader()->rcode); }, [](DNSResponse& dnsQuestion, int newRCode) { + "rcode", + [](const DNSResponse& dnsQuestion) -> int { + return static_cast(dnsQuestion.getHeader()->rcode); + }, + [](DNSResponse& dnsQuestion, int newRCode) { dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsQuestion.getMutableData(), [newRCode](dnsheader& header) { header.rcode = static_cast(newRCode); return true; @@ -385,7 +397,11 @@ void setupLuaBindingsDNSQuestion(LuaContext& luaCtx) luaCtx.registerMember( "remoteaddr", [](const DNSResponse& dnsQuestion) -> ComboAddress { return dnsQuestion.ids.origRemote; }, [](DNSResponse& dnsQuestion, const ComboAddress newRemote) { (void)newRemote; }); luaCtx.registerMember( - "dh", [](const DNSResponse& dnsResponse) -> dnsheader* { return dnsResponse.getMutableHeader(); }, [](DNSResponse& dnsResponse, const dnsheader* dnsHeader) { + "dh", + [](const DNSResponse& dnsResponse) -> dnsheader* { + return dnsResponse.getMutableHeader(); + }, + [](DNSResponse& dnsResponse, const dnsheader* dnsHeader) { dnsdist::PacketMangling::editDNSHeaderFromPacket(dnsResponse.getMutableData(), [&dnsHeader](dnsheader& header) { header = *dnsHeader; return true; diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings.cc b/pdns/dnsdistdist/dnsdist-lua-bindings.cc index ba63b54692..21afaf5dd7 100644 --- a/pdns/dnsdistdist/dnsdist-lua-bindings.cc +++ b/pdns/dnsdistdist/dnsdist-lua-bindings.cc @@ -283,10 +283,12 @@ void setupLuaBindings(LuaContext& luaCtx, bool client, bool configCheck) luaCtx.registerFunction("__tostring", [](const DNSNameSet& dns) { return dns.toString(); }); luaCtx.registerFunction("add", [](DNSNameSet& dns, DNSName& name) { dns.insert(name); }); luaCtx.registerFunction("check", [](DNSNameSet& dns, DNSName& name) { return dns.find(name) != dns.end(); }); + // clang-format off luaCtx.registerFunction("delete", (size_t (DNSNameSet::*)(const DNSName&)) &DNSNameSet::erase); luaCtx.registerFunction("size", (size_t (DNSNameSet::*)() const) &DNSNameSet::size); luaCtx.registerFunction("clear", (void (DNSNameSet::*)()) &DNSNameSet::clear); luaCtx.registerFunction("empty", (bool (DNSNameSet::*)() const) &DNSNameSet::empty); + // clang-format on #endif /* DISABLE_DNSNAME_BINDINGS */ #ifndef DISABLE_SUFFIX_MATCH_BINDINGS @@ -346,7 +348,9 @@ void setupLuaBindings(LuaContext& luaCtx, bool client, bool configCheck) } }); + // clang-format off luaCtx.registerFunction("check", (bool (SuffixMatchNode::*)(const DNSName&) const) &SuffixMatchNode::check); + // clang-format on luaCtx.registerFunction (SuffixMatchNode::*)(const DNSName&) const>("getBestMatch", [](const SuffixMatchNode& smn, const DNSName& needle) { boost::optional result{boost::none}; auto res = smn.getBestMatch(needle); @@ -381,7 +385,9 @@ void setupLuaBindings(LuaContext& luaCtx, bool client, bool configCheck) luaCtx.registerFunction("isIPv4", &Netmask::isIPv4); luaCtx.registerFunction("isIpv6", &Netmask::isIPv6); luaCtx.registerFunction("isIPv6", &Netmask::isIPv6); + // clang-format off luaCtx.registerFunction("match", (bool (Netmask::*)(const string&) const) &Netmask::match); + // clang-format on luaCtx.registerFunction("toString", &Netmask::toString); luaCtx.registerFunction("__tostring", &Netmask::toString); luaCtx.registerEqFunction(&Netmask::operator==); @@ -405,7 +411,9 @@ void setupLuaBindings(LuaContext& luaCtx, bool client, bool configCheck) } }); + // clang-format off luaCtx.registerFunction("match", (bool (NetmaskGroup::*)(const ComboAddress&) const) &NetmaskGroup::match); + // clang-format on luaCtx.registerFunction("size", &NetmaskGroup::size); luaCtx.registerFunction("clear", &NetmaskGroup::clear); luaCtx.registerFunction("toString", [](const NetmaskGroup& nmg) { return "NetmaskGroup " + nmg.toString(); }); -- 2.47.2