throw PDNSException("duplicate georecord " + gr->qname + ", skipping");
}
catch(PDNSException &e) {
- L << Logger::Error << logprefix << "Error occured while reading director file "
+ L << Logger::Error << logprefix << "Error occurred while reading director file "
<< gr->directorfile << ": " << e.reason << endl;
delete gr;
}
void declareArguments(const string &suffix = "") {
declare(suffix, "zone", "zonename to be served", "");
- declare(suffix, "soa-values", "values of the SOA master nameserver and hostmaster fields, comma seperated", "");
+ declare(suffix, "soa-values", "values of the SOA master nameserver and hostmaster fields, comma separated", "");
declare(suffix, "ns-records", "targets of the NS records, comma separated.", "");
declare(suffix, "ttl", "TTL value for geo records", "3600");
declare(suffix, "ns-ttl", "TTL value for NS records", "86400");
//See CDB::searchKey()
d_key = strdup(key.c_str());
- // We are ok wiht a search on things, but we do want to know if a record with that key exists.........
+ // We are ok with a search on things, but we do want to know if a record with that key exists.........
bool hasDomain = (cdb_find(&d_cdb, key.c_str(), key.size()) == 1);
if (hasDomain) {
cdb_seqinit(&d_seqPtr, &d_cdb);
bbd->d_status="parsed into memory at "+nowTime();
}
-/** THIS IS AN INTERNAL FUNCTION! It does moadnsparser prio impedence matching
+/** THIS IS AN INTERNAL FUNCTION! It does moadnsparser prio impedance matching
This function adds a record to a domain with a certain id.
Much of the complication is due to the efforts to benefit from std::string reference counting copy on write semantics */
void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu, const QType &qtype, const string &content, int ttl, int prio, const std::string& hashed)
ArgvMap theArg;
StatBag S; //!< Statistics are gathered across PDNS via the StatBag class S
-PacketCache PC; //!< This is the main PacketCache, shared accross all threads
+PacketCache PC; //!< This is the main PacketCache, shared across all threads
DNSProxy *DP;
DynListener *dl;
CommunicatorClass Communicator;
S.declare("query-cache-miss","Number of misses on the query cache");
S.declare("rfc2136-queries", "RFC2136 packets received.");
- S.declare("rfc2136-answers", "RFC2136 packets succesfully answered.");
+ S.declare("rfc2136-answers", "RFC2136 packets successfully answered.");
S.declare("rfc2136-refused", "RFC2136 packets that are refused.");
S.declare("rfc2136-changes", "RFC2136 changes to records in total.");
extern ArgvMap theArg;
extern StatBag S; //!< Statistics are gathered across PDNS via the StatBag class S
-extern PacketCache PC; //!< This is the main PacketCache, shared accross all threads
+extern PacketCache PC; //!< This is the main PacketCache, shared across all threads
extern DNSProxy *DP;
extern DynListener *dl;
extern CommunicatorClass Communicator;
/* fields in third byte */
unsigned qr: 1; /* response flag */
unsigned opcode: 4; /* purpose of message */
- unsigned aa: 1; /* authoritive answer */
+ unsigned aa: 1; /* authoritative answer */
unsigned tc: 1; /* truncated message */
unsigned rd: 1; /* recursion desired */
/* fields in fourth byte */
/* fields in third byte */
unsigned rd :1; /* recursion desired */
unsigned tc :1; /* truncated message */
- unsigned aa :1; /* authoritive answer */
+ unsigned aa :1; /* authoritative answer */
unsigned opcode :4; /* purpose of message */
unsigned qr :1; /* response flag */
/* fields in fourth byte */
L<<Logger::Error<<"Fatal STL error: "<<e.what()<<endl;
}
catch(...) {
- L<<Logger::Error<<"Fatal: unknown exception occured"<<endl;
+ L<<Logger::Error<<"Fatal: unknown exception occurred"<<endl;
}
}
}
//! reports that an event took place for which threads may be waiting
-/** From the kernel loop, sendEvent can be called to report that something occured for which there may be waiters.
+/** From the kernel loop, sendEvent can be called to report that something occurred for which there may be waiters.
\param key Key of the event for which threads may be waiting
\param val If non-zero, pointer to the content of the event
\return Returns -1 in case of error, 0 if there were no waiters, 1 if a thread was woken up.
return 0;
}
-/** Returns 0 if nothing was found, -1 if an error occured or 1 if the search
+/** Returns 0 if nothing was found, -1 if an error occurred or 1 if the search
was satisfied */
int PacketHandler::doFancyRecords(DNSPacket *p, DNSPacket *r, string &target)
{
// 3.4.2 - Perform the updates.
// There's a special condition where deleting the last NS record at zone apex is never deleted (3.4.2.4)
- // This means we must do it outside the normal performUpdate() because that focusses only on a seperate RR.
+ // This means we must do it outside the normal performUpdate() because that focusses only on a separate RR.
vector<const DNSRecord *> nsRRtoDelete;
for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i != mdp.d_answers.end(); ++i) {
const DNSRecord *rr = &i->first;
zone.append("$");
PC.purge(zone);
- L<<Logger::Info<<msgPrefix<<"Update completed, "<<changedRecords<<" changed records commited."<<endl;
+ L<<Logger::Info<<msgPrefix<<"Update completed, "<<changedRecords<<" changed records committed."<<endl;
} else {
//No change, no commit, we perform abort() because some backends might like this more.
L<<Logger::Info<<msgPrefix<<"Update completed, 0 changes, rolling back."<<endl;
ret.push_back(*i);
newtarget=i->content;
}
- // for ANY answers we *must* have an authoritive answer
+ // for ANY answers we *must* have an authoritative answer
else if(i->d_place==DNSResourceRecord::ANSWER && pdns_iequals(i->qname, qname) &&
(
i->qtype==qtype || (lwr.d_aabit && (qtype==QType(QType::ANY) || magicAddrMatch(qtype, i->qtype) ) )
ret.push_back(*i);
newtarget=i->content;
}
- // for ANY answers we *must* have an authoritive answer, unless we are forwarding recursively
+ // for ANY answers we *must* have an authoritative answer, unless we are forwarding recursively
else if(i->d_place==DNSResourceRecord::ANSWER && pdns_iequals(i->qname, qname) &&
(
i->qtype==qtype || (lwr.d_aabit && (qtype==QType(QType::ANY) || magicAddrMatch(qtype, i->qtype) ) ) || sendRDQuery
/* Days since 1970 is 365 * number of years + number of leap years since 1970 */
day = years * 365 + (years + 1) / 4;
- /* After 2100 we have to substract 3 leap years for every 400 years
+ /* After 2100 we have to subtract 3 leap years for every 400 years
This is not intuitive. Most mktime implementations do not support
dates after 2059, anyway, so we might leave this out for it's
bloat. */
int getValue( Semaphore::sem_value_t *sval );
};
-//! This is a utility class used for platform independant abstraction.
+//! This is a utility class used for platform independent abstraction.
class Utility
{
public: