Changeset 472

Timestamp:

09/03/05 14:00:21 (8 years ago)

Author:

ahu

Message:

first stab at SPF support, which closes ticket #22
Please test!

Location:

trunk/pdns/pdns

Files:

• dnspacket.cc (modified) (4 diffs)
• dnspacket.hh (modified) (1 diff)
• qtype.hh (modified) (1 diff)

trunk/pdns/pdns/dnspacket.cc

@@ -781 +781 @@
 }
 
-
-
 void DNSPacket::addTXTRecord(const DNSResourceRecord& rr)
 {
-  addTXTRecord(rr.qname, rr.content, rr.ttl);
-}
-
-void DNSPacket::addTXTRecord(string domain, string txt, u_int32_t ttl)
+  addTXTorSPFRecord(QType::TXT, rr.qname, rr.content, rr.ttl);
+}
+
+void DNSPacket::addSPFRecord(const DNSResourceRecord& rr)
+{
+  addTXTorSPFRecord(QType::SPF, rr.qname, rr.content, rr.ttl);
+}
+
+
+void DNSPacket::addTXTorSPFRecord(uint16_t qtype, string domain, string txt, u_int32_t ttl)
 {
  string piece1;
@@ -794 +798 @@
  toqname(domain, &piece1);
  char p[10];
- makeHeader(p,QType::TXT,ttl);
+ makeHeader(p, qtype, ttl);
  string piece3;
  piece3.reserve(txt.length()+1);
@@ -1040 +1044 @@
       break;
 
-    case 16: // TXT
+    case QType::TXT: // TXT
+
       addTXTRecord(rr);
       break;
@@ -1063 +1068 @@
     case QType::NAPTR:
       addNAPTRRecord(rr);
+      break;
+
+    case QType::SPF: // SPF
+      addSPFRecord(rr);
       break;
 

trunk/pdns/pdns/dnspacket.hh

@@ -195 +195 @@
   void addSOARecord(const DNSResourceRecord &); //!< add a SOA record to the packet
 
-  void addTXTRecord(string domain, string, u_int32_t ttl); //!< add a TXT record to the packet
+  void addTXTorSPFRecord(uint16_t qtype, string domain, string, u_int32_t ttl); //!< add a TXT or SPF record to the packet
+
   void addTXTRecord(const DNSResourceRecord &); //!< add a TXT record to the packet
+  void addSPFRecord(const DNSResourceRecord &); //!< add a SPF record to the packet
 
   void addHINFORecord(string domain, string, u_int32_t ttl); //!< add a HINFO record to the packet

trunk/pdns/pdns/qtype.hh

@@ -60 +60 @@
   static int chartocode(const char *p); //!< convert a character string to a code
   
-  enum {A=1,NS=2,CNAME=5,SOA=6,PTR=12,HINFO=13,MX=15,TXT=16,RP=17,AAAA=28,LOC=29,SRV=33,NAPTR=35,AXFR=252, IXFR=254, ANY=255} types;
+  enum {A=1,NS=2,CNAME=5,SOA=6,PTR=12,HINFO=13,MX=15,TXT=16,RP=17,AAAA=28,LOC=29,SRV=33,NAPTR=35, SPF=99, AXFR=252, IXFR=254, ANY=255} types;
 private:
   short int code;