mirrors/hello-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move check for cname into the right place, fix up logging output, move edns parsing to right place

Browse Source
This commit is contained in:
bert hubert
2018-04-12 16:16:31 +02:00
parent cc9a13b29a
commit 9dd1e50cf6
4 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tdns/dns-storage.cc
View File

@ -66,7 +66,11 @@ DNSNode* DNSNode::add(dnsname name)
{
cout<<"Add called for '"<<name<<"'"<<endl;
if(name.size() == 1) {
cout<<" Last label, possibly addding, already present="<<children.count(name.front())<<endl;
cout<<" Last label, done with add. ";
if(children.count(name.front()))
cout<<"Label was present already"<<endl;
else
cout<<"Added label as new child"<<endl;
return &children[name.front()];
}

17
tdns/dnsmessages.cc
View File

@ -25,6 +25,23 @@ void DNSMessageReader::getQuestion(dnsname& name, DNSType& type)
payload.getUInt16(); // skip the class
}
bool DNSMessageReader::getEDNS(uint16_t* newsize, bool* doBit)
{
if(dh.arcount) {
if(payload.getUInt8() == 0 && payload.getUInt16() == (uint16_t)DNSType::OPT) {
*newsize=payload.getUInt16();
payload.getUInt16(); // extended RCODE, EDNS version
auto flags = payload.getUInt8();
*doBit = flags & 0x80;
payload.getUInt8(); payload.getUInt16(); // ignore rest
cout<<" There was an EDNS section, size supported: "<<newsize<<endl;
return true;
}
}
return false;
}
void DNSMessageWriter::putRR(DNSSection section, const dnsname& name, DNSType type, uint32_t ttl, const std::unique_ptr<RRGen>& content)
{
auto cursize = payloadpos;

2
tdns/dnsmessages.hh
View File

@ -11,7 +11,7 @@ struct DNSMessageReader
dnsname getName();
void getQuestion(dnsname& name, DNSType& type);
bool getEDNS(uint16_t* newsize, bool* doBit);
std::string serialize() const;
};

61
tdns/tdns.cc
View File

@ -52,20 +52,10 @@ bool processQuestion(const DNSNode& zones, DNSMessageReader& dm, const ComboAddr
cout<<"Received a query from "<<remote.toStringWithPort()<<" for "<<name<<" and type "<<type<<endl;
uint16_t newsize=0;
bool doBit=false;
if(dm.dh.arcount) {
if(dm.payload.getUInt8() == 0 && dm.payload.getUInt16() == (uint16_t)DNSType::OPT) {
haveEDNS=true;
newsize=dm.payload.getUInt16();
dm.payload.getUInt16(); // extended RCODE, EDNS version
auto flags = dm.payload.getUInt8();
doBit = flags & 0x80;
dm.payload.getUInt8(); dm.payload.getUInt16(); // ignore rest
cout<<" There was an EDNS section, size supported: "<<newsize<<endl;
if(newsize > sizeof(dnsheader))
response.payload.resize(newsize - sizeof(dnsheader));
}
}
haveEDNS = dm.getEDNS(&newsize, &doBit);
if(haveEDNS && newsize > sizeof(dnsheader))
response.payload.resize(newsize - sizeof(dnsheader));
try {
response.dh = dm.dh;
response.dh.ad = response.dh.ra = response.dh.aa = 0;
@ -131,28 +121,8 @@ bool processQuestion(const DNSNode& zones, DNSMessageReader& dm, const ComboAddr
auto iter = node->rrsets.cbegin();
vector<dnsname> additional;
if(type == DNSType::ANY) {
for(const auto& t : node->rrsets) {
const auto& rrset = t.second;
for(const auto& rr : rrset.contents) {
response.putRR(DNSSection::Answer, lastnode+zone, t.first, rrset.ttl, rr);
if(t.first == DNSType::MX)
additional.push_back(dynamic_cast<MXGen*>(rr.get())->d_name);
}
}
}
else if(iter = node->rrsets.find(type), iter != node->rrsets.end()) {
const auto& rrset = iter->second;
for(const auto& rr : rrset.contents) {
response.putRR(DNSSection::Answer, lastnode+zone, type, rrset.ttl, rr);
if(type == DNSType::MX)
additional.push_back(dynamic_cast<MXGen*>(rr.get())->d_name);
}
}
else if(iter = node->rrsets.find(DNSType::CNAME), iter != node->rrsets.end()) {
cout<<"We do have a CNAME!"<<endl;
if(iter = node->rrsets.find(DNSType::CNAME), iter != node->rrsets.end()) {
cout<<"We have a CNAME!"<<endl;
const auto& rrset = iter->second;
dnsname target;
for(const auto& rr : rrset.contents) {
@ -172,6 +142,25 @@ bool processQuestion(const DNSNode& zones, DNSMessageReader& dm, const ComboAddr
else
cout<<" CNAME points to record "<<target<<" in other zone, good luck"<<endl;
}
else if(type == DNSType::ANY) {
for(const auto& t : node->rrsets) {
const auto& rrset = t.second;
for(const auto& rr : rrset.contents) {
response.putRR(DNSSection::Answer, lastnode+zone, t.first, rrset.ttl, rr);
if(t.first == DNSType::MX)
additional.push_back(dynamic_cast<MXGen*>(rr.get())->d_name);
}
}
}
else if(iter = node->rrsets.find(type), iter != node->rrsets.end() || type==DNSType::ANY) {
const auto& rrset = iter->second;
for(const auto& rr : rrset.contents) {
response.putRR(DNSSection::Answer, lastnode+zone, type, rrset.ttl, rr);
if(type == DNSType::MX)
additional.push_back(dynamic_cast<MXGen*>(rr.get())->d_name);
}
}
else {
cout<<"Node exists, qtype doesn't, NOERROR situation, inserting SOA"<<endl;
const auto& rrset = fnd->zone->rrsets[DNSType::SOA];