ContinuationIndentWidth: 2
IndentWidth: 2
ObjCBlockIndentWidth: 2
+AlignAfterOpenBracket: Align
SortIncludes: false
// 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;
}
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;
}
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()));
}
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()));
}
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;
}
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;
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() {}
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();
}
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");
}
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();
{
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();
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 << "/";
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);
{
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) {
}
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;
{
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();
// 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) {
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());
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);
}
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();
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;
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;
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
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;
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);
mt.schedule(&now);
}
},
- std::exception);
+ std::exception);
}
BOOST_AUTO_TEST_SUITE_END()
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;
});