Changeset 803

Timestamp:

11/06/20 10:59:29 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 5th archived iteration of bind2hosts in development

File:

• trunk/bind2hosts (modified) (6 diffs)

trunk/bind2hosts

@@ -145 +145 @@
   my $curatom = 'class';
 ##fixme:  maybe wrap this in an eval() instead of the warn/badrec/last bits?
+eval {
   for (; $nc < 3; $nc++) {
     my ($atom) = ($rec =~ /^([\w\d.]+)\s/);
@@ -153 +154 @@
 #print "a$nc: d: atom [$atom]\n $rec\n" if $i == $debugid;
       if (defined($ttl)) {
-        warn "bad record ($origrec)\n";
-        $badrec = 1;
-        last;
+        die "bad record ($origrec)\n";
+#        warn "bad record ($origrec)\n";
+#        $badrec = 1;
+#        last;
       } else {
         if ($curatom ne 'class' && $curatom ne 'ttl') {
-          warn "bad record ($origrec)\n";
-          $badrec = 1;
-          last;
+          die "bad record ($origrec)\n";
+#          warn "bad record ($origrec)\n";
+#          $badrec = 1;
+#          last;
         }
         $curatom = 'ttl';
@@ -169 +172 @@
 #print "a$nc: d2: atom [$atom]\n        $rec\n" if $i == $debugid;
       if ($atom =~ /CS|CH|HS/) {
-        warn "unsupported class $atom in record ($origrec)\n";
-        $badrec = 1;
-        last;
+        die "unsupported class $atom in record ($origrec)\n";
+#        warn "unsupported class $atom in record ($origrec)\n";
+#        $badrec = 1;
+#        last;
       }
       $curatom = 'class';
@@ -182 +186 @@
         $type = $atom;
       } else {
-        warn "unknown type $atom in record ($origrec)\n";
-        $badrec = 1;
-        last;
+        die "unknown type $atom in record ($origrec)\n";
+#        warn "unknown type $atom in record ($origrec)\n";
+#        $badrec = 1;
+#        last;
       }
     }
@@ -190 +195 @@
 #print "a$nc: next: $rec\n" if $i == $debugid;
   } # class/type/TTL loop
+};
+if ($@) {
+  warn $@;
+  next;
+}
+
 
 #last if $i > 15;
-  next if $badrec;
+#  next if $badrec;
 
 #print Dumper(\%reverse_typemap);
@@ -210 +221 @@
   if ($type eq 'SOA') {
     my ($ns, $adminmail) = ($rdata =~ /([\w.]+)\s+([\w.]+)\s+\(/);
-    die "Can't parse gibberish SOAish record: $_\n" if !$ns;
+    die "Can't parse gibberish SOAish record: $origrec\n" if !$ns;
     $rdata =~ s/([\w.]+)\s+([\w.]+)\s+\(\s*//;