Changeset 1051

Timestamp:

05/19/07 13:14:07 (3 years ago)

Author:

ahu

Message:

silence signedness warning, refuse direct queries for non-standard 'URL' and 'CURL' and 'MBOXFW' records, fix some g++ 4.2.0 generated warnings. Thanks to Jorn Ekkelenkamp for noticing the 'fancy record' issues.

Location:

trunk/pdns/pdns

Files:

• dnsparser.cc (modified) (2 diffs)
• packethandler.cc (modified) (2 diffs)
• qtype.hh (modified) (1 diff)
• receiver.cc (modified) (1 diff)

trunk/pdns/pdns/dnsparser.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2005 - 2006  PowerDNS.COM BV
+    Copyright (C) 2005 - 2007  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -206 +206 @@
     vector<unsigned char> record;
     validPacket=true;
-    for(n=0;n < d_header.ancount + d_header.nscount + d_header.arcount; ++n) {
+    for(n=0;n < (unsigned int)(d_header.ancount + d_header.nscount + d_header.arcount); ++n) {
       DNSRecord dr;
       

trunk/pdns/pdns/packethandler.cc

@@ -67 +67 @@
 {  
   // nobody reads what we output, but it appears to be the magic that shuts some nameservers up
-  static char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53", 
+  static const char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53", 
                      "192.36.148.17","192.58.128.30", "193.0.14.129", "198.32.64.12", "202.12.27.33"};
   static char templ[40];
@@ -613 +613 @@
     }
 
+    // please don't query fancy records directly!
+    if(d_doFancyRecords && (p->qtype.getCode()==QType::URL || p->qtype.getCode()==QType::CURL || p->qtype.getCode()==QType::MBOXFW)) {
+      r->setRcode(RCode::ServFail);
+      return r;
+    }
+
     bool found=false;
     

trunk/pdns/pdns/qtype.hh

@@ -73 +73 @@
   static int chartocode(const char *p); //!< convert a character string to a code
   
-  enum typeenum {A=1,NS=2,CNAME=5,SOA=6, MR=9, PTR=12,HINFO=13,MX=15,TXT=16,RP=17,AFSDB=18,KEY=25,AAAA=28,LOC=29,SRV=33,NAPTR=35, SPF=99, AXFR=252, IXFR=251, ANY=255} types;
+  enum typeenum {A=1,NS=2,CNAME=5,SOA=6, MR=9, PTR=12,HINFO=13,MX=15,TXT=16,RP=17,AFSDB=18,KEY=25,AAAA=28,LOC=29,SRV=33,NAPTR=35, SPF=99, AXFR=252, IXFR=251, ANY=255, URL=256, MBOXFW=257, CURL=258} types;
 private:
   short int code;

trunk/pdns/pdns/receiver.cc

@@ -67 +67 @@
 string s_programname="pdns"; // used in packethandler.cc
 
-char *funnytext=
+const char *funnytext=
 "*****************************************************************************\n"\
 "Ok, you just ran pdns_server through 'strings' hoping to find funny messages.\n"\