From: Miod Vallat Date: Fri, 26 Sep 2025 08:24:20 +0000 (+0200) Subject: Sort registration of pdns_control actions. NFC X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64f01a39c643555eb9be8ed3f10c551eaab5858e;p=thirdparty%2Fpdns.git Sort registration of pdns_control actions. NFC Signed-off-by: Miod Vallat --- diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc index 9ea4d9e54..f1e33d445 100644 --- a/modules/bindbackend/bindbackend2.cc +++ b/modules/bindbackend/bindbackend2.cc @@ -843,11 +843,11 @@ Bind2Backend::Bind2Backend(const string& suffix, bool loadZones) s_first = 0; } - DynListener::registerFunc("BIND-RELOAD-NOW", &DLReloadNowHandler, "bindbackend: reload domains", ""); - DynListener::registerFunc("BIND-DOMAIN-STATUS", &DLDomStatusHandler, "bindbackend: list status of all domains", "[domains]"); + DynListener::registerFunc("BIND-ADD-ZONE", &DLAddDomainHandler, "bindbackend: add zone", " "); DynListener::registerFunc("BIND-DOMAIN-EXTENDED-STATUS", &DLDomExtendedStatusHandler, "bindbackend: list the extended status of all domains", "[domains]"); + DynListener::registerFunc("BIND-DOMAIN-STATUS", &DLDomStatusHandler, "bindbackend: list status of all domains", "[domains]"); DynListener::registerFunc("BIND-LIST-REJECTS", &DLListRejectsHandler, "bindbackend: list rejected domains"); - DynListener::registerFunc("BIND-ADD-ZONE", &DLAddDomainHandler, "bindbackend: add zone", " "); + DynListener::registerFunc("BIND-RELOAD-NOW", &DLReloadNowHandler, "bindbackend: reload domains", ""); } Bind2Backend::~Bind2Backend() diff --git a/pdns/auth-main.cc b/pdns/auth-main.cc index ce8a785b6..ce1c9f2df 100644 --- a/pdns/auth-main.cc +++ b/pdns/auth-main.cc @@ -1453,25 +1453,25 @@ int main(int argc, char** argv) writePid(); } - DynListener::registerFunc("SHOW", &DLShowHandler, "show a specific statistic or * to get a list", ""); - DynListener::registerFunc("RPING", &DLPingHandler, "ping instance"); DynListener::registerExitFunc("QUIT", &DLRQuitHandler); - DynListener::registerFunc("UPTIME", &DLUptimeHandler, "get instance uptime"); - DynListener::registerFunc("NOTIFY-HOST", &DLNotifyHostHandler, "notify host for specific zone", " "); + DynListener::registerFunc("CCOUNTS", &DLCCHandler, "get cache statistics"); + DynListener::registerFunc("CURRENT-CONFIG", &DLCurrentConfigHandler, "retrieve the current configuration", "[diff]"); + DynListener::registerFunc("LIST-ZONES", &DLListZones, "show list of zones", "[primary|secondary|native|consumer|producer]"); DynListener::registerFunc("NOTIFY", &DLNotifyHandler, "queue a notification", ""); - DynListener::registerFunc("RELOAD", &DLReloadHandler, "reload all zones"); - DynListener::registerFunc("REDISCOVER", &DLRediscoverHandler, "discover any new zones"); - DynListener::registerFunc("VERSION", &DLVersionHandler, "get instance version"); + DynListener::registerFunc("NOTIFY-HOST", &DLNotifyHostHandler, "notify host for specific zone", " "); DynListener::registerFunc("PURGE", &DLPurgeHandler, "purge entries from packet cache", "[]"); - DynListener::registerFunc("CCOUNTS", &DLCCHandler, "get cache statistics"); DynListener::registerFunc("QTYPES", &DLQTypesHandler, "get QType statistics"); - DynListener::registerFunc("RESPSIZES", &DLRSizesHandler, "get histogram of response sizes"); + DynListener::registerFunc("REDISCOVER", &DLRediscoverHandler, "discover any new zones"); + DynListener::registerFunc("RELOAD", &DLReloadHandler, "reload all zones"); DynListener::registerFunc("REMOTES", &DLRemotesHandler, "get top remotes"); - DynListener::registerFunc("SET", &DLSettingsHandler, "set config variables", " "); + DynListener::registerFunc("RESPSIZES", &DLRSizesHandler, "get histogram of response sizes"); DynListener::registerFunc("RETRIEVE", &DLNotifyRetrieveHandler, "retrieve secondary zone", " []"); - DynListener::registerFunc("CURRENT-CONFIG", &DLCurrentConfigHandler, "retrieve the current configuration", "[diff]"); - DynListener::registerFunc("LIST-ZONES", &DLListZones, "show list of zones", "[primary|secondary|native|consumer|producer]"); + DynListener::registerFunc("RPING", &DLPingHandler, "ping instance"); + DynListener::registerFunc("SET", &DLSettingsHandler, "set config variables", " "); + DynListener::registerFunc("SHOW", &DLShowHandler, "show a specific statistic or * to get a list", ""); DynListener::registerFunc("TOKEN-LOGIN", &DLTokenLogin, "Login to a PKCS#11 token", " "); + DynListener::registerFunc("UPTIME", &DLUptimeHandler, "get instance uptime"); + DynListener::registerFunc("VERSION", &DLVersionHandler, "get instance version"); DynListener::registerFunc("XFR-QUEUE", &DLSuckRequests, "Get all requests for XFR in queue"); if (!::arg()["tcp-control-address"].empty()) { diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh index 8bcf8c574..8c6faf0a1 100644 --- a/pdns/dynhandler.hh +++ b/pdns/dynhandler.hh @@ -32,26 +32,26 @@ bool DLQuitPlease(); void setStatus(const string &str); -string DLQuitHandler(const vector&parts, Utility::pid_t ppid); -string DLRQuitHandler(const vector&parts, Utility::pid_t ppid); -string DLPingHandler(const vector&parts, Utility::pid_t ppid); -string DLShowHandler(const vector&parts, Utility::pid_t ppid); -string DLUptimeHandler(const vector&parts, Utility::pid_t ppid); -string DLSettingsHandler(const vector&parts, Utility::pid_t ppid); -string DLRespSizeHandler(const vector&parts, Utility::pid_t ppid); string DLCCHandler(const vector&parts, Utility::pid_t ppid); +string DLCurrentConfigHandler(const vector&parts, Utility::pid_t ppid); +string DLListZones(const vector&parts, Utility::pid_t ppid); +string DLNotifyHandler(const vector&parts, Utility::pid_t ppid); +string DLNotifyHostHandler(const vector&parts, Utility::pid_t ppid); +string DLNotifyRetrieveHandler(const vector&parts, Utility::pid_t ppid); +string DLPingHandler(const vector&parts, Utility::pid_t ppid); +string DLPurgeHandler(const vector&parts, Utility::pid_t ppid); string DLQTypesHandler(const vector&parts, Utility::pid_t ppid); +string DLQuitHandler(const vector&parts, Utility::pid_t ppid); +string DLRQuitHandler(const vector&parts, Utility::pid_t ppid); string DLRSizesHandler(const vector&parts, Utility::pid_t ppid); +string DLRediscoverHandler(const vector&parts, Utility::pid_t ppid); +string DLReloadHandler(const vector&parts, Utility::pid_t ppid); string DLRemotesHandler(const vector&parts, Utility::pid_t ppid); +string DLRespSizeHandler(const vector&parts, Utility::pid_t ppid); +string DLSettingsHandler(const vector&parts, Utility::pid_t ppid); +string DLShowHandler(const vector&parts, Utility::pid_t ppid); string DLStatusHandler(const vector&parts, Utility::pid_t ppid); -string DLNotifyHandler(const vector&parts, Utility::pid_t ppid); -string DLNotifyHostHandler(const vector&parts, Utility::pid_t ppid); -string DLReloadHandler(const vector&parts, Utility::pid_t ppid); -string DLRediscoverHandler(const vector&parts, Utility::pid_t ppid); -string DLVersionHandler(const vector&parts, Utility::pid_t ppid); -string DLPurgeHandler(const vector&parts, Utility::pid_t ppid); -string DLNotifyRetrieveHandler(const vector&parts, Utility::pid_t ppid); -string DLCurrentConfigHandler(const vector&parts, Utility::pid_t ppid); -string DLListZones(const vector&parts, Utility::pid_t ppid); -string DLTokenLogin(const vector&parts, Utility::pid_t ppid); string DLSuckRequests(const vector &parts, Utility::pid_t ppid); +string DLTokenLogin(const vector&parts, Utility::pid_t ppid); +string DLUptimeHandler(const vector&parts, Utility::pid_t ppid); +string DLVersionHandler(const vector&parts, Utility::pid_t ppid);