The IEEE OUI, IAB, and OUI-36 lists currently redirect to

http://standards.ieee.org/regauthmaint.html, which says

IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th

As a result the manuf file got clobbered. Revert the manuf file to
its non-clobbered state and add sanity checks to make-manuf. Add a
note about the impending addition of OUI-28.

svn path=/trunk/; revision=54485

1 files changed, 28 insertions, 8 deletions

diff --git a/tools/make-manuf b/tools/make-manuf
index 63194e4455..1765d315c9 100755
--- a/tools/make-manuf
+++ b/tools/make-manuf
@@ -38,9 +38,11 @@ $template = "manuf.tmpl";
 $wkatmpl  = "wka.tmpl";
 $outfile  = "manuf";
 $inheader = 1;
+# According to http://standards.ieee.org/regauthmaint.html
+# the IEEE is adding OUI-28 in January 2014.
 $oui_url  = "http://standards.ieee.org/develop/regauth/oui/oui.txt";
 $iab_url  = "http://standards.ieee.org/develop/regauth/iab/iab.txt";
-$oui36_url  = "http://standards.ieee.org/develop/regauth/oui36/oui36.txt";
+$oui36_url = "http://standards.ieee.org/develop/regauth/oui36/oui36.txt";
 $cb_url   = "http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt";
 %oui_list = ();
 $hp       = "[0-9a-fA-F]{2}";
@@ -48,15 +50,21 @@ $oui_re   = "$hp:$hp:$hp";
 $cb_re    = "$hp$hp$hp";
 $ieee_re  = "$hp-$hp-$hp";
 
-$tmpl_added   = 0;
-$cb_added     = 0;
-$cb_skipped   = 0;
-$oui_added   = 0;
-$oui_skipped = 0;
-$iab_added   = 0;
-$iab_skipped = 0;
+$min_entries = 100;
+
+$tmpl_added    = 0;
+$cb_added      = 0;
+$cb_skipped    = 0;
+$cb_total      = 0;
+$oui_added     = 0;
+$oui_skipped   = 0;
+$oui_total     = 0;
+$iab_added     = 0;
+$iab_skipped   = 0;
+$iab_total     = 0;
 $oui36_added   = 0;
 $oui36_skipped = 0;
+$oui36_total   = 0;
 
 sub shorten
 {
@@ -138,8 +146,11 @@ foreach $line (split(/\n/, $ieee_list)) {
       $iab_added++;
     }
   }
+  $iab_total++;
 }
 
+if ($iab_total < $min_entries) { die "Too few IAB entries ($iab_total)\n"; }
+
 # Add IEEE entries for OUI-36
 
 $ieee_list = fetch($oui36_url);
@@ -163,8 +174,11 @@ foreach $line (split(/\n/, $ieee_list)) {
       $oui36_added++;
     }
   }
+  $oui36_total++;
 }
 
+if ($oui36_total < $min_entries) { die "Too few OUI-36 entries ($oui36_total)\n"; }
+
 # Add IEEE entries for OUIs not yet known.
 
 $ieee_list = fetch($oui_url);
@@ -182,8 +196,11 @@ foreach $line (split(/\n/, $ieee_list)) {
       $oui_added++;
     }
   }
+  $oui_total++;
 }
 
+if ($oui_total < $min_entries) { die "Too few OUI entries ($oui_total)\n"; }
+
 # Add CaveBear entries for OUIs not yet known.
 
 $cb_list = fetch($cb_url);
@@ -203,8 +220,11 @@ foreach $line (split(/\n/, $cb_list)) {
       $cb_added++;
     }
   }
+  $cb_total++;
 }
 
+if ($cb_total < $min_entries) { die "Too few CaveBear entries ($cb_total)\n"; }
+
 # Write output file
 
 open (OUT, "> $outfile") ||