From: Ensar Sarajčić Date: Wed, 5 Feb 2025 14:59:09 +0000 (+0100) Subject: Fix formatting in `dnsdist-lua-bindings-protobuf.cc` X-Git-Tag: dnsdist-2.0.0-alpha1~111^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adba4d1061f8887844aa2890c9f73e01b91acebe;p=thirdparty%2Fpdns.git Fix formatting in `dnsdist-lua-bindings-protobuf.cc` --- diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc index cad3132287..b6f6a49657 100644 --- a/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc +++ b/pdns/dnsdistdist/dnsdist-lua-bindings-protobuf.cc @@ -39,7 +39,7 @@ static void parseFSTRMOptions(boost::optional> return; } - static std::vector const potentialOptions = { "bufferHint", "flushTimeout", "inputQueueSize", "outputQueueSize", "queueNotifyThreshold", "reopenInterval", "connectionCount" }; + static std::vector const potentialOptions = {"bufferHint", "flushTimeout", "inputQueueSize", "outputQueueSize", "queueNotifyThreshold", "reopenInterval", "connectionCount"}; for (const auto& potentialOption : potentialOptions) { getOptionalValue(params, potentialOption, options[potentialOption]); @@ -50,20 +50,20 @@ static void parseFSTRMOptions(boost::optional> void setupLuaBindingsProtoBuf(LuaContext& luaCtx, bool client, bool configCheck) { #ifdef HAVE_IPCIPHER - luaCtx.registerFunction("ipencrypt", [](const ComboAddress& ca, const std::string& key) { - return encryptCA(ca, key); - }); - luaCtx.registerFunction("ipdecrypt", [](const ComboAddress& ca, const std::string& key) { - return decryptCA(ca, key); - }); + luaCtx.registerFunction("ipencrypt", [](const ComboAddress& ca, const std::string& key) { + return encryptCA(ca, key); + }); + luaCtx.registerFunction("ipdecrypt", [](const ComboAddress& ca, const std::string& key) { + return decryptCA(ca, key); + }); luaCtx.writeFunction("makeIPCipherKey", [](const std::string& password) { - return makeIPCipherKey(password); - }); + return makeIPCipherKey(password); + }); #endif /* HAVE_IPCIPHER */ /* ProtobufMessage */ - pick luaCtx.registerFunction("setTag", [](DNSDistProtoBufMessage& message, const std::string& strValue) { + pick luaCtx.registerFunction("setTag", [](DNSDistProtoBufMessage& message, const std::string& strValue) { message.addTag(strValue); }); luaCtx.registerFunction)>("setTagArray", [](DNSDistProtoBufMessage& message, const LuaArray& tags) { @@ -72,132 +72,131 @@ void setupLuaBindingsProtoBuf(LuaContext& luaCtx, bool client, bool configCheck) } }); - luaCtx.registerFunction sec, boost::optional uSec)>("setProtobufResponseType", - [](DNSDistProtoBufMessage& message, boost::optional sec, boost::optional uSec) { - message.setType(pdns::ProtoZero::Message::MessageType::DNSResponseType); - message.setQueryTime(sec ? *sec : 0, uSec ? *uSec : 0); - }); - - luaCtx.registerFunction("addResponseRR", [](DNSDistProtoBufMessage& message, - const std::string& strQueryName, uint16_t uType, uint16_t uClass, uint32_t uTTL, const std::string& strBlob) { - message.addRR(DNSName(strQueryName), uType, uClass, uTTL, strBlob); - }); - luaCtx.registerFunction("setEDNSSubnet", [](DNSDistProtoBufMessage& message, const Netmask& subnet) { message.setEDNSSubnet(subnet); }); - luaCtx.registerFunction("setQuestion", [](DNSDistProtoBufMessage& message, const DNSName& qname, uint16_t qtype, uint16_t qclass) { message.setQuestion(qname, qtype, qclass); }); - luaCtx.registerFunction("setBytes", [](DNSDistProtoBufMessage& message, size_t bytes) { message.setBytes(bytes); }); - luaCtx.registerFunction("setTime", [](DNSDistProtoBufMessage& message, time_t sec, uint32_t usec) { message.setTime(sec, usec); }); - luaCtx.registerFunction("setQueryTime", [](DNSDistProtoBufMessage& message, time_t sec, uint32_t usec) { message.setQueryTime(sec, usec); }); - luaCtx.registerFunction("setResponseCode", [](DNSDistProtoBufMessage& message, uint8_t rcode) { message.setResponseCode(rcode); }); - - luaCtx.registerFunction)>("setRequestor", [](DNSDistProtoBufMessage& message, const ComboAddress& addr, boost::optional port) { - message.setRequestor(addr); - if (port) { - message.setRequestorPort(*port); - } - }); - luaCtx.registerFunction)>("setRequestorFromString", [](DNSDistProtoBufMessage& message, const std::string& str, boost::optional port) { - message.setRequestor(ComboAddress(str)); - if (port) { - message.setRequestorPort(*port); - } - }); - luaCtx.registerFunction)>("setResponder", [](DNSDistProtoBufMessage& message, const ComboAddress& addr, boost::optional port) { - message.setResponder(addr); - if (port) { - message.setResponderPort(*port); - } - }); - luaCtx.registerFunction)>("setResponderFromString", [](DNSDistProtoBufMessage& message, const std::string& str, boost::optional port) { - message.setResponder(ComboAddress(str)); - if (port) { - message.setResponderPort(*port); - } - }); - luaCtx.registerFunction("setServerIdentity", [](DNSDistProtoBufMessage& message, const std::string& str) { - message.setServerIdentity(str); - }); + luaCtx.registerFunction sec, boost::optional uSec)>("setProtobufResponseType", + [](DNSDistProtoBufMessage& message, boost::optional sec, boost::optional uSec) { + message.setType(pdns::ProtoZero::Message::MessageType::DNSResponseType); + message.setQueryTime(sec ? *sec : 0, uSec ? *uSec : 0); + }); - luaCtx.registerFunction("setExtra", [](DnstapMessage& message, const std::string& str) { - message.setExtra(str); - }); + luaCtx.registerFunction("addResponseRR", [](DNSDistProtoBufMessage& message, const std::string& strQueryName, uint16_t uType, uint16_t uClass, uint32_t uTTL, const std::string& strBlob) { + message.addRR(DNSName(strQueryName), uType, uClass, uTTL, strBlob); + }); + luaCtx.registerFunction("setEDNSSubnet", [](DNSDistProtoBufMessage& message, const Netmask& subnet) { message.setEDNSSubnet(subnet); }); + luaCtx.registerFunction("setQuestion", [](DNSDistProtoBufMessage& message, const DNSName& qname, uint16_t qtype, uint16_t qclass) { message.setQuestion(qname, qtype, qclass); }); + luaCtx.registerFunction("setBytes", [](DNSDistProtoBufMessage& message, size_t bytes) { message.setBytes(bytes); }); + luaCtx.registerFunction("setTime", [](DNSDistProtoBufMessage& message, time_t sec, uint32_t usec) { message.setTime(sec, usec); }); + luaCtx.registerFunction("setQueryTime", [](DNSDistProtoBufMessage& message, time_t sec, uint32_t usec) { message.setQueryTime(sec, usec); }); + luaCtx.registerFunction("setResponseCode", [](DNSDistProtoBufMessage& message, uint8_t rcode) { message.setResponseCode(rcode); }); + + luaCtx.registerFunction)>("setRequestor", [](DNSDistProtoBufMessage& message, const ComboAddress& addr, boost::optional port) { + message.setRequestor(addr); + if (port) { + message.setRequestorPort(*port); + } + }); + luaCtx.registerFunction)>("setRequestorFromString", [](DNSDistProtoBufMessage& message, const std::string& str, boost::optional port) { + message.setRequestor(ComboAddress(str)); + if (port) { + message.setRequestorPort(*port); + } + }); + luaCtx.registerFunction)>("setResponder", [](DNSDistProtoBufMessage& message, const ComboAddress& addr, boost::optional port) { + message.setResponder(addr); + if (port) { + message.setResponderPort(*port); + } + }); + luaCtx.registerFunction)>("setResponderFromString", [](DNSDistProtoBufMessage& message, const std::string& str, boost::optional port) { + message.setResponder(ComboAddress(str)); + if (port) { + message.setResponderPort(*port); + } + }); + luaCtx.registerFunction("setServerIdentity", [](DNSDistProtoBufMessage& message, const std::string& str) { + message.setServerIdentity(str); + }); + + luaCtx.registerFunction("setExtra", [](DnstapMessage& message, const std::string& str) { + message.setExtra(str); + }); /* RemoteLogger */ - luaCtx.writeFunction("newRemoteLogger", [client,configCheck](const std::string& remote, boost::optional timeout, boost::optional maxQueuedEntries, boost::optional reconnectWaitTime, boost::optional connectionCount) { - if (client || configCheck) { - return std::shared_ptr(nullptr); - } - auto count = connectionCount ? *connectionCount : 1; - if (count > 1) { - std::vector> loggers; - for (uint64_t i = 0; i < count; i++) { - loggers.emplace_back(new RemoteLogger(ComboAddress(remote), timeout ? *timeout : 2, maxQueuedEntries ? (*maxQueuedEntries * 100) : 10000, reconnectWaitTime ? *reconnectWaitTime : 1, client)); - } - return std::shared_ptr(new RemoteLoggerPool(std::move(loggers))); - } - else { - return std::shared_ptr(new RemoteLogger(ComboAddress(remote), timeout ? *timeout : 2, maxQueuedEntries ? (*maxQueuedEntries * 100) : 10000, reconnectWaitTime ? *reconnectWaitTime : 1, client)); + luaCtx.writeFunction("newRemoteLogger", [client, configCheck](const std::string& remote, boost::optional timeout, boost::optional maxQueuedEntries, boost::optional reconnectWaitTime, boost::optional connectionCount) { + if (client || configCheck) { + return std::shared_ptr(nullptr); + } + auto count = connectionCount ? *connectionCount : 1; + if (count > 1) { + std::vector> loggers; + for (uint64_t i = 0; i < count; i++) { + loggers.emplace_back(new RemoteLogger(ComboAddress(remote), timeout ? *timeout : 2, maxQueuedEntries ? (*maxQueuedEntries * 100) : 10000, reconnectWaitTime ? *reconnectWaitTime : 1, client)); } + return std::shared_ptr(new RemoteLoggerPool(std::move(loggers))); + } + else { + return std::shared_ptr(new RemoteLogger(ComboAddress(remote), timeout ? *timeout : 2, maxQueuedEntries ? (*maxQueuedEntries * 100) : 10000, reconnectWaitTime ? *reconnectWaitTime : 1, client)); + } }); - luaCtx.writeFunction("newFrameStreamUnixLogger", [client,configCheck]([[maybe_unused]] const std::string& address, [[maybe_unused]] boost::optional> params) { + luaCtx.writeFunction("newFrameStreamUnixLogger", [client, configCheck]([[maybe_unused]] const std::string& address, [[maybe_unused]] boost::optional> params) { #ifdef HAVE_FSTRM - if (client || configCheck) { - return std::shared_ptr(nullptr); - } + if (client || configCheck) { + return std::shared_ptr(nullptr); + } - LuaAssociativeTable options; - parseFSTRMOptions(params, options); - checkAllParametersConsumed("newFrameStreamUnixLogger", params); - auto connectionCount = options.find("connectionCount"); - auto count = connectionCount == options.end() ? 1 : connectionCount->second; - options.erase(connectionCount); - if (count > 1) { - std::vector> loggers; - for (uint64_t i = 0; i < count; i++) { - loggers.emplace_back(new FrameStreamLogger(AF_UNIX, address, !client, options)); - } - return std::shared_ptr(new RemoteLoggerPool(std::move(loggers))); - } - else { - return std::shared_ptr(new FrameStreamLogger(AF_UNIX, address, !client, options)); + LuaAssociativeTable options; + parseFSTRMOptions(params, options); + checkAllParametersConsumed("newFrameStreamUnixLogger", params); + auto connectionCount = options.find("connectionCount"); + auto count = connectionCount == options.end() ? 1 : connectionCount->second; + options.erase(connectionCount); + if (count > 1) { + std::vector> loggers; + for (uint64_t i = 0; i < count; i++) { + loggers.emplace_back(new FrameStreamLogger(AF_UNIX, address, !client, options)); } + return std::shared_ptr(new RemoteLoggerPool(std::move(loggers))); + } + else { + return std::shared_ptr(new FrameStreamLogger(AF_UNIX, address, !client, options)); + } #else throw std::runtime_error("fstrm support is required to build an AF_UNIX FrameStreamLogger"); #endif /* HAVE_FSTRM */ }); - luaCtx.writeFunction("newFrameStreamTcpLogger", [client,configCheck]([[maybe_unused]] const std::string& address, [[maybe_unused]] boost::optional> params) { + luaCtx.writeFunction("newFrameStreamTcpLogger", [client, configCheck]([[maybe_unused]] const std::string& address, [[maybe_unused]] boost::optional> params) { #if defined(HAVE_FSTRM) && defined(HAVE_FSTRM_TCP_WRITER_INIT) - if (client || configCheck) { - return std::shared_ptr(nullptr); - } + if (client || configCheck) { + return std::shared_ptr(nullptr); + } - LuaAssociativeTable options; - parseFSTRMOptions(params, options); - checkAllParametersConsumed("newFrameStreamTcpLogger", params); - auto connectionCount = options.find("connectionCount"); - auto count = connectionCount == options.end() ? 1 : connectionCount->second; - options.erase(connectionCount); - if (count > 1) { - std::vector> loggers; - for (uint64_t i = 0; i < count; i++) { - loggers.emplace_back(new FrameStreamLogger(AF_INET, address, !client, options)); - } - return std::shared_ptr(new RemoteLoggerPool(std::move(loggers))); - } - else { - return std::shared_ptr(new FrameStreamLogger(AF_INET, address, !client, options)); + LuaAssociativeTable options; + parseFSTRMOptions(params, options); + checkAllParametersConsumed("newFrameStreamTcpLogger", params); + auto connectionCount = options.find("connectionCount"); + auto count = connectionCount == options.end() ? 1 : connectionCount->second; + options.erase(connectionCount); + if (count > 1) { + std::vector> loggers; + for (uint64_t i = 0; i < count; i++) { + loggers.emplace_back(new FrameStreamLogger(AF_INET, address, !client, options)); } + return std::shared_ptr(new RemoteLoggerPool(std::move(loggers))); + } + else { + return std::shared_ptr(new FrameStreamLogger(AF_INET, address, !client, options)); + } #else - throw std::runtime_error("fstrm with TCP support is required to build an AF_INET FrameStreamLogger"); + throw std::runtime_error("fstrm with TCP support is required to build an AF_INET FrameStreamLogger"); #endif /* HAVE_FSTRM */ - }); + }); - luaCtx.registerFunction::*)()const>("toString", [](const std::shared_ptr& logger) { - if (logger) { - return logger->toString(); - } - return std::string(); + luaCtx.registerFunction::*)() const>("toString", [](const std::shared_ptr& logger) { + if (logger) { + return logger->toString(); + } + return std::string(); }); } #else /* DISABLE_PROTOBUF */