Changeset 1614 for trunk/pdns/pdns/nsecrecords.cc

Timestamp:

05/13/10 19:16:47 (3 years ago)

Author:

ahu

Message:

fix up NSEC3 rendering/generation/parsing

Files:

• trunk/pdns/pdns/nsecrecords.cc (modified) (6 diffs)

trunk/pdns/pdns/nsecrecords.cc

@@ -109 +109 @@
 
   rtr.xfrHexBlob(d_salt);
-  rtr.xfrHexBlob(d_nexthash);
-
+  rtr.xfrBase32HexBlob(d_nexthash);
+  
   while(!rtr.eof()) {
     uint16_t type;
@@ -128 +128 @@
   pw.xfr8BitInt(d_nexthash.length());
   pw.xfrBlob(d_nexthash);
-
+  
   uint8_t res[34];
   memset(res, 0, sizeof(res));
@@ -158 +158 @@
 
   pr.xfr8BitInt(len);
+  
   pr.xfrBlob(ret->d_nexthash, len);
-
+  
   string bitmap;
   pr.xfrBlob(bitmap);
@@ -172 +173 @@
   
   if(bitmap[0])
-    throw MOADNSException("Can't deal with NSEC mappings > 255 yet");
+    throw MOADNSException("Can't deal with NSEC3 mappings > 255 yet");
   
   unsigned int bitmaplen=bitmap[1];
   if(bitmap.size()!=2+bitmaplen)
-    throw MOADNSException("Can't deal with multi-part NSEC mappings yet");
+    throw MOADNSException("Can't deal with multi-part NSEC3 mappings yet");
   
   for(unsigned int n=0 ; n < bitmaplen ; ++n) {
@@ -199 +200 @@
   rtw.xfrHexBlob(d_salt);
   rtw.xfrBase32HexBlob(d_nexthash);
-  
   for(set<uint16_t>::const_iterator i=d_set.begin(); i!=d_set.end(); ++i) {
     ret+=" ";
@@ -223 +223 @@
   RecordTextReader rtr(content, zone);
   rtr.xfr8BitInt(d_algorithm); 
-        rtr.xfr8BitInt(d_flags); 
-        rtr.xfr16BitInt(d_iterations); 
+  rtr.xfr8BitInt(d_flags); 
+  rtr.xfr16BitInt(d_iterations); 
   rtr.xfrHexBlob(d_salt);
 }