]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
AlignAfterOpenBracket: Align 10250/head
authorOtto <otto.moerbeek@open-xchange.com>
Wed, 31 Mar 2021 09:57:32 +0000 (11:57 +0200)
committerOtto <otto.moerbeek@open-xchange.com>
Wed, 31 Mar 2021 09:57:32 +0000 (11:57 +0200)
22 files changed:
.clang-format
modules/bindbackend/bindbackend2.hh
modules/geoipbackend/geoipbackend.cc
modules/geoipbackend/geoipinterface-dat.cc
modules/geoipbackend/geoipinterface-mmdb.cc
modules/geoipbackend/geoipinterface.hh
modules/gmysqlbackend/gmysqlbackend.cc
modules/gmysqlbackend/smysql.cc
modules/gmysqlbackend/smysql.hh
modules/godbcbackend/sodbc.cc
modules/gpgsqlbackend/gpgsqlbackend.cc
modules/gpgsqlbackend/spgsql.cc
modules/gpgsqlbackend/spgsql.hh
modules/ldapbackend/ldapauthenticator.cc
modules/lmdbbackend/lmdbbackend.cc
modules/lmdbbackend/lmdbbackend.hh
pdns/recursordist/aggressive_nsec.hh
pdns/recursordist/negcache.hh
pdns/recursordist/taskqueue.hh
pdns/recursordist/test-filterpo_cc.cc
pdns/recursordist/test-mtasker.cc
pdns/recursordist/test-syncres_cc3.cc

index e2bab20af9a339a764e561a04d35714de2890128..1d681f062ec2a9155553b7e6675d82f680156fc9 100644 (file)
@@ -6,6 +6,7 @@ ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
 IndentWidth:     2
 ObjCBlockIndentWidth: 2
+AlignAfterOpenBracket: Align
 
 SortIncludes:    false
 
index 70fc4640fb75d0b55fe7fb2c03b9571457fac51d..93c1fe85e1d6de702f3b61ce563857eeeabbba3b 100644 (file)
@@ -227,8 +227,8 @@ public:
   // end of DNSSEC
 
   typedef multi_index_container<BB2DomainInfo,
-    indexed_by<ordered_unique<member<BB2DomainInfo, unsigned int, &BB2DomainInfo::d_id>>,
-      ordered_unique<tag<NameTag>, member<BB2DomainInfo, DNSName, &BB2DomainInfo::d_name>>>>
+                                indexed_by<ordered_unique<member<BB2DomainInfo, unsigned int, &BB2DomainInfo::d_id>>,
+                                           ordered_unique<tag<NameTag>, member<BB2DomainInfo, DNSName, &BB2DomainInfo::d_name>>>>
     state_t;
   static state_t s_state;
   static ReadWriteLock s_state_lock;
index bf1a89e33d787f8fb43428cb85a74dd5a8983ce7..980c0643d5b4d36f60c406b6af12740eb3ba2ebb 100644 (file)
@@ -629,7 +629,7 @@ string getGeoForLua(const std::string& ip, int qaint)
 }
 
 static bool queryGeoLocation(const Netmask& addr, GeoIPNetmask& gl, double& lat, double& lon,
-  boost::optional<int>& alt, boost::optional<int>& prec)
+                             boost::optional<int>& alt, boost::optional<int>& prec)
 {
   for (auto const& gi : s_geoip_files) {
     string val;
index 584ae94bcedf71812dfd52b39ac7cd3cb143bf40..5a5a05dac4fb309b34ed3295ff9c282930fa3bc1 100644 (file)
@@ -432,8 +432,8 @@ public:
   }
 
   bool queryLocationV6(GeoIPNetmask& gl, const string& ip,
-    double& latitude, double& longitude,
-    boost::optional<int>& alt, boost::optional<int>& prec) override
+                       double& latitude, double& longitude,
+                       boost::optional<int>& alt, boost::optional<int>& prec) override
   {
     if (d_db_type == GEOIP_REGION_EDITION_REV0 || d_db_type == GEOIP_REGION_EDITION_REV1 || d_db_type == GEOIP_CITY_EDITION_REV0_V6 || d_db_type == GEOIP_CITY_EDITION_REV1_V6) {
       std::unique_ptr<GeoIPRecord, geoiprecord_deleter> gir(GeoIP_record_by_addr_v6(d_gi.get(), ip.c_str()));
@@ -448,8 +448,8 @@ public:
   }
 
   bool queryLocation(GeoIPNetmask& gl, const string& ip,
-    double& latitude, double& longitude,
-    boost::optional<int>& alt, boost::optional<int>& prec) override
+                     double& latitude, double& longitude,
+                     boost::optional<int>& alt, boost::optional<int>& prec) override
   {
     if (d_db_type == GEOIP_REGION_EDITION_REV0 || d_db_type == GEOIP_REGION_EDITION_REV1 || d_db_type == GEOIP_CITY_EDITION_REV0 || d_db_type == GEOIP_CITY_EDITION_REV1) {
       std::unique_ptr<GeoIPRecord, geoiprecord_deleter> gir(GeoIP_record_by_addr(d_gi.get(), ip.c_str()));
index 47cf7765553b22d48e9d2a3d40f97189dce87f5c..b8a11ef806a9a8e6c2484ccfddfd6cb5683cc95b 100644 (file)
@@ -207,8 +207,8 @@ public:
   }
 
   bool queryLocation(GeoIPNetmask& gl, const string& ip,
-    double& latitude, double& longitude,
-    boost::optional<int>& alt, boost::optional<int>& prec) override
+                     double& latitude, double& longitude,
+                     boost::optional<int>& alt, boost::optional<int>& prec) override
   {
     MMDB_entry_data_s data;
     MMDB_lookup_result_s res;
@@ -227,8 +227,8 @@ public:
   }
 
   bool queryLocationV6(GeoIPNetmask& gl, const string& ip,
-    double& latitude, double& longitude,
-    boost::optional<int>& alt, boost::optional<int>& prec) override
+                       double& latitude, double& longitude,
+                       boost::optional<int>& alt, boost::optional<int>& prec) override
   {
     MMDB_entry_data_s data;
     MMDB_lookup_result_s res;
index 1681d0d944831faec436220cb3db618c97db6240..3ac8d8bcf75f3bcf68cfc16a6c7eb50cf3033f6a 100644 (file)
@@ -54,12 +54,12 @@ public:
   virtual bool queryCity(string& ret, GeoIPNetmask& gl, const string& ip) = 0;
   virtual bool queryCityV6(string& ret, GeoIPNetmask& gl, const string& ip) = 0;
   virtual bool queryLocation(GeoIPNetmask& gl, const string& ip,
-    double& latitude, double& longitude,
-    boost::optional<int>& alt, boost::optional<int>& prec)
+                             double& latitude, double& longitude,
+                             boost::optional<int>& alt, boost::optional<int>& prec)
     = 0;
   virtual bool queryLocationV6(GeoIPNetmask& gl, const string& ip,
-    double& latitude, double& longitude,
-    boost::optional<int>& alt, boost::optional<int>& prec)
+                               double& latitude, double& longitude,
+                               boost::optional<int>& alt, boost::optional<int>& prec)
     = 0;
 
   virtual ~GeoIPInterface() {}
index f1c10f7b4b2b6d2ffbbf9bd5f3093a389b1eaad0..e47f370616be6346f6d508f2221ee0769e9bcdbf 100644 (file)
@@ -53,16 +53,16 @@ gMySQLBackend::gMySQLBackend(const string& mode, const string& suffix) :
 void gMySQLBackend::reconnect()
 {
   setDB(new SMySQL(getArg("dbname"),
-    getArg("host"),
-    getArgAsNum("port"),
-    getArg("socket"),
-    getArg("user"),
-    getArg("password"),
-    getArg("group"),
-    mustDo("innodb-read-committed"),
-    getArgAsNum("timeout"),
-    mustDo("thread-cleanup"),
-    mustDo("ssl")));
+                   getArg("host"),
+                   getArgAsNum("port"),
+                   getArg("socket"),
+                   getArg("user"),
+                   getArg("password"),
+                   getArg("group"),
+                   mustDo("innodb-read-committed"),
+                   getArgAsNum("timeout"),
+                   mustDo("thread-cleanup"),
+                   mustDo("ssl")));
   allocateStatements();
 }
 
index d05c1eec9d581d03b75f82a3175a266e9c2684a8..35267c9e58f00edaf57658f79ec1d19c87c3ea31 100644 (file)
@@ -504,12 +504,12 @@ void SMySQL::connect()
     mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, d_group.c_str());
 
     if (!mysql_real_connect(&d_db, d_host.empty() ? nullptr : d_host.c_str(),
-          d_user.empty() ? nullptr : d_user.c_str(),
-          d_password.empty() ? nullptr : d_password.c_str(),
-          d_database.empty() ? nullptr : d_database.c_str(),
-          d_port,
-          d_msocket.empty() ? nullptr : d_msocket.c_str(),
-          (d_clientSSL ? CLIENT_SSL : 0) | CLIENT_MULTI_RESULTS)) {
+                            d_user.empty() ? nullptr : d_user.c_str(),
+                            d_password.empty() ? nullptr : d_password.c_str(),
+                            d_database.empty() ? nullptr : d_database.c_str(),
+                            d_port,
+                            d_msocket.empty() ? nullptr : d_msocket.c_str(),
+                            (d_clientSSL ? CLIENT_SSL : 0) | CLIENT_MULTI_RESULTS)) {
 
       if (retry == 0)
         throw sPerrorException("Unable to connect to database");
@@ -526,7 +526,7 @@ void SMySQL::connect()
 }
 
 SMySQL::SMySQL(string database, string host, uint16_t port, string msocket, string user,
-  string password, string group, bool setIsolation, unsigned int timeout, bool threadCleanup, bool clientSSL) :
+               string password, string group, bool setIsolation, unsigned int timeout, bool threadCleanup, bool clientSSL) :
   d_database(std::move(database)), d_host(std::move(host)), d_msocket(std::move(msocket)), d_user(std::move(user)), d_password(std::move(password)), d_group(std::move(group)), d_timeout(timeout), d_port(port), d_setIsolation(setIsolation), d_threadCleanup(threadCleanup), d_clientSSL(clientSSL)
 {
   connect();
index e38914606299378fa04036721d270af0750a053e..255649ca1ab040e66a0f9a3fe539021f7e4f05cc 100644 (file)
@@ -30,10 +30,10 @@ class SMySQL : public SSql
 {
 public:
   SMySQL(string database, string host = "", uint16_t port = 0,
-    string msocket = "", string user = "",
-    string password = "", string group = "",
-    bool setIsolation = false, unsigned int timeout = 10,
-    bool threadCleanup = false, bool clientSSL = false);
+         string msocket = "", string user = "",
+         string password = "", string group = "",
+         bool setIsolation = false, unsigned int timeout = 10,
+         bool threadCleanup = false, bool clientSSL = false);
 
   ~SMySQL();
 
index 690ea6939766eaf1bafde56cc628d8fe10666095..2985557a770fa0c5a634623b0ddc449092e6b3d0 100644 (file)
@@ -52,7 +52,7 @@ static bool realTestResult(SQLRETURN result, SQLSMALLINT type, SQLHANDLE handle,
   do {
     // cerr<<"getting sql diag record "<<i<<endl;
     ret = SQLGetDiagRec(type, handle, ++i, state, &native, text,
-      sizeof(text), &len);
+                        sizeof(text), &len);
     // cerr<<"getdiagrec said "<<ret<<endl;
     if (SQL_SUCCEEDED(ret)) { // cerr<<"got it"<<endl;
       errmsg << state << i << native << text << "/";
@@ -424,9 +424,9 @@ SODBC::SODBC(
   char* l_password = strdup(password.c_str());
 
   result = SQLConnect(m_connection,
-    reinterpret_cast<SQLTCHAR*>(l_dsn), dsn.length(),
-    reinterpret_cast<SQLTCHAR*>(l_username), username.length(),
-    reinterpret_cast<SQLTCHAR*>(l_password), password.length());
+                      reinterpret_cast<SQLTCHAR*>(l_dsn), dsn.length(),
+                      reinterpret_cast<SQLTCHAR*>(l_username), username.length(),
+                      reinterpret_cast<SQLTCHAR*>(l_password), password.length());
 
   free(l_dsn);
   free(l_username);
index 7a2ad91ab768791db24259730b56c40661c15554..29d59df6c9349465105e4af4109b89c3decfa078 100644 (file)
@@ -41,12 +41,12 @@ gPgSQLBackend::gPgSQLBackend(const string& mode, const string& suffix) :
 {
   try {
     setDB(new SPgSQL(getArg("dbname"),
-      getArg("host"),
-      getArg("port"),
-      getArg("user"),
-      getArg("password"),
-      getArg("extra-connection-parameters"),
-      mustDo("prepared-statements")));
+                     getArg("host"),
+                     getArg("port"),
+                     getArg("user"),
+                     getArg("password"),
+                     getArg("extra-connection-parameters"),
+                     mustDo("prepared-statements")));
   }
 
   catch (SSqlException& e) {
index 19cb3cef770dd4bf9b65266cdb71c8a08b5eefa3..5ebc6ff653a5d53a570a34f92691765742032340 100644 (file)
@@ -317,7 +317,7 @@ static string escapeForPQparam(const string& v)
 }
 
 SPgSQL::SPgSQL(const string& database, const string& host, const string& port, const string& user,
-  const string& password, const string& extra_connection_parameters, const bool use_prepared)
+               const string& password, const string& extra_connection_parameters, const bool use_prepared)
 {
   d_db = nullptr;
   d_in_trx = false;
index 7e6dd5b6963758b01545eb6f8def4d99b68dd199..a1fd64f3d20c91f5728215eb70e4f4848656b444 100644 (file)
@@ -28,8 +28,8 @@ class SPgSQL : public SSql
 {
 public:
   SPgSQL(const string& database, const string& host = "", const string& port = "",
-    const string& user = "", const string& password = "",
-    const string& extra_connection_parameters = "", const bool use_prepared = true);
+         const string& user = "", const string& password = "",
+         const string& extra_connection_parameters = "", const bool use_prepared = true);
 
   ~SPgSQL();
 
index 79c842985190936fe95874b7a2f6a863844abd5e..9a4ddb91bf766f6cf7f5f1844492f2609755eb5a 100644 (file)
@@ -166,8 +166,8 @@ int LdapGssapiAuthenticator::attemptAuth(LDAP* conn)
 
   // And now try to bind
   int rc = ldap_sasl_interactive_bind_s(conn, "", defaults.mech.c_str(),
-    NULL, NULL, LDAP_SASL_QUIET,
-    ldapGssapiAuthenticatorSaslInteractCallback, &defaults);
+                                        NULL, NULL, LDAP_SASL_QUIET,
+                                        ldapGssapiAuthenticatorSaslInteractCallback, &defaults);
   g_log << Logger::Debug << d_logPrefix << "ldap_sasl_interactive_bind_s returned " << rc << std::endl;
 
   if (rc == LDAP_LOCAL_ERROR) {
index 7196d954e9ed7572f9925100a8a68c2ae5248570..03b0d5438a84cd22666d79e8e99d5820fe1e08d8 100644 (file)
@@ -531,7 +531,7 @@ std::shared_ptr<LMDBBackend::RecordsRWTransaction> LMDBBackend::getRecordsRWTran
   auto& shard = d_trecords[id % s_shards];
   if (!shard.env) {
     shard.env = getMDBEnv((getArg("filename") + "-" + std::to_string(id % s_shards)).c_str(),
-      MDB_NOSUBDIR | d_asyncFlag, 0600);
+                          MDB_NOSUBDIR | d_asyncFlag, 0600);
     shard.dbi = shard.env->openDB("records", MDB_CREATE);
   }
   auto ret = std::make_shared<RecordsRWTransaction>(shard.env->getRWTransaction());
@@ -548,7 +548,7 @@ std::shared_ptr<LMDBBackend::RecordsROTransaction> LMDBBackend::getRecordsROTran
       throw DBException("attempting to start nested transaction without open parent env");
     }
     shard.env = getMDBEnv((getArg("filename") + "-" + std::to_string(id % s_shards)).c_str(),
-      MDB_NOSUBDIR | d_asyncFlag, 0600);
+                          MDB_NOSUBDIR | d_asyncFlag, 0600);
     shard.dbi = shard.env->openDB("records", MDB_CREATE);
   }
 
@@ -581,13 +581,13 @@ bool LMDBBackend::upgradeToSchemav3()
     LMDBBackend::RecordsDB oldShard, newShard;
 
     oldShard.env = getMDBEnv((filename + "-old").c_str(),
-      MDB_NOSUBDIR | d_asyncFlag, 0600);
+                             MDB_NOSUBDIR | d_asyncFlag, 0600);
     oldShard.dbi = oldShard.env->openDB("records", MDB_CREATE | MDB_DUPSORT);
     auto txn = oldShard.env->getROTransaction();
     auto cursor = txn->getROCursor(oldShard.dbi);
 
     newShard.env = getMDBEnv((filename).c_str(),
-      MDB_NOSUBDIR | d_asyncFlag, 0600);
+                             MDB_NOSUBDIR | d_asyncFlag, 0600);
     newShard.dbi = newShard.env->openDB("records", MDB_CREATE);
     auto newTxn = newShard.env->getRWTransaction();
 
index 39b55111acbfeb585cba6bcd1ab3a50c7750a941..9951841d09800af1d57fc42a6ad2cda0741069bb 100644 (file)
@@ -228,19 +228,19 @@ public:
 
 private:
   typedef TypedDBI<DomainInfo,
-    index_on<DomainInfo, DNSName, &DomainInfo::zone>>
+                   index_on<DomainInfo, DNSName, &DomainInfo::zone>>
     tdomains_t;
 
   typedef TypedDBI<DomainMeta,
-    index_on<DomainMeta, DNSName, &DomainMeta::domain>>
+                   index_on<DomainMeta, DNSName, &DomainMeta::domain>>
     tmeta_t;
 
   typedef TypedDBI<KeyDataDB,
-    index_on<KeyDataDB, DNSName, &KeyDataDB::domain>>
+                   index_on<KeyDataDB, DNSName, &KeyDataDB::domain>>
     tkdb_t;
 
   typedef TypedDBI<TSIGKey,
-    index_on<TSIGKey, DNSName, &TSIGKey::name>>
+                   index_on<TSIGKey, DNSName, &TSIGKey::name>>
     ttsig_t;
 
   int d_asyncFlag;
index 1773f73aabf4581e8f87944c1386543cc85f9ef8..2a067b81b4f39f4be797778868c87f2ac5c665fa 100644 (file)
@@ -112,11 +112,11 @@ private:
       CacheEntry,
       indexed_by<
         ordered_unique<tag<OrderedTag>,
-          member<CacheEntry, DNSName, &CacheEntry::d_owner>,
-          CanonDNSNameCompare>,
+                       member<CacheEntry, DNSName, &CacheEntry::d_owner>,
+                       CanonDNSNameCompare>,
         sequenced<tag<SequencedTag>>,
         hashed_non_unique<tag<HashedTag>,
-          member<CacheEntry, DNSName, &CacheEntry::d_owner>>>>
+                          member<CacheEntry, DNSName, &CacheEntry::d_owner>>>>
       cache_t;
 
     cache_t d_entries;
index 2f37d421f32f7e8a775cad3db02f662a4054e12f..db360eb47eaeb4cf28393f5f7aae32a3c04b7622 100644 (file)
@@ -95,15 +95,15 @@ private:
     NegCacheEntry,
     indexed_by<
       ordered_unique<tag<CompositeKey>,
-        composite_key<
-          NegCacheEntry,
-          member<NegCacheEntry, DNSName, &NegCacheEntry::d_name>,
-          member<NegCacheEntry, QType, &NegCacheEntry::d_qtype>>,
-        composite_key_compare<
-          CanonDNSNameCompare, std::less<QType>>>,
+                     composite_key<
+                       NegCacheEntry,
+                       member<NegCacheEntry, DNSName, &NegCacheEntry::d_name>,
+                       member<NegCacheEntry, QType, &NegCacheEntry::d_qtype>>,
+                     composite_key_compare<
+                       CanonDNSNameCompare, std::less<QType>>>,
       sequenced<tag<SequenceTag>>,
       hashed_non_unique<tag<NegCacheEntry>,
-        member<NegCacheEntry, DNSName, &NegCacheEntry::d_name>>>>
+                        member<NegCacheEntry, DNSName, &NegCacheEntry::d_name>>>>
     negcache_t;
 
   struct MapCombo
index 0fe61428f96ac259d1abef41f9cde5c1c0ed0820..5ebb3aece36a9b561e37de87f07112c43da8bca4 100644 (file)
@@ -58,10 +58,10 @@ typedef multi_index_container<
   ResolveTask,
   indexed_by<
     hashed_unique<tag<HashTag>,
-      composite_key<ResolveTask,
-        member<ResolveTask, DNSName, &ResolveTask::d_qname>,
-        member<ResolveTask, uint16_t, &ResolveTask::d_qtype>,
-        member<ResolveTask, bool, &ResolveTask::d_refreshMode>>>,
+                  composite_key<ResolveTask,
+                                member<ResolveTask, DNSName, &ResolveTask::d_qname>,
+                                member<ResolveTask, uint16_t, &ResolveTask::d_qtype>,
+                                member<ResolveTask, bool, &ResolveTask::d_refreshMode>>>,
     sequenced<tag<SequencedTag>>>>
   queue_t;
 
index 181f0981e1ca7c01ecc7c7b12aa11c3f8418d7c3..aa2fb17f0c7f5ebaeb530e30441af890683e8adb 100644 (file)
@@ -231,14 +231,14 @@ BOOST_AUTO_TEST_CASE(test_filter_policies_wildcard_with_enc)
   zone->setRefresh(99);
 
   zone->addQNameTrigger(DNSName("bcbsks.com.102.112.2o7.net."),
-    DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::NoAction,
-      DNSFilterEngine::PolicyType::QName));
+                        DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::NoAction,
+                                                DNSFilterEngine::PolicyType::QName));
   zone->addQNameTrigger(DNSName("2o7.net."),
-    DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop,
-      DNSFilterEngine::PolicyType::QName));
+                        DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop,
+                                                DNSFilterEngine::PolicyType::QName));
   zone->addQNameTrigger(DNSName("*.2o7.net."),
-    DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop,
-      DNSFilterEngine::PolicyType::QName));
+                        DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop,
+                                                DNSFilterEngine::PolicyType::QName));
 
   dfe.addZone(zone);
 
index 372badc4379b2bc2374eef65f0193c29cb2f3ab2..f2f74ca662c39e51fb7af9d1533a2d9644258e2a 100644 (file)
@@ -56,6 +56,6 @@ BOOST_AUTO_TEST_CASE(test_MtaskerException)
       mt.schedule(&now);
     }
   },
-    std::exception);
+                    std::exception);
 }
 BOOST_AUTO_TEST_SUITE_END()
index 699d52b2acc341d1356ed47032570caa47fe2705..856efffd190bf906b96e9f35b2e611d13f0e2cf3 100644 (file)
@@ -123,8 +123,8 @@ static void test_no_data_f(bool qmin)
 
   sr->setAsyncCallback(
     [target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level,
-      struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context,
-      LWResult* res, bool* chained) {
+             struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context,
+             LWResult* res, bool* chained) {
       setLWResult(res, 0, true, false, true);
       return LWResult::Result::Success;
     });