From 5fe25affc01fb003a3a66937458a25640a6075ce Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 3 Dec 2012 20:15:22 +0100
Subject: hwdb: add IAB to the OUI database
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The individual address block is a poor man's organizationally unique
identifier.

Perhaps we should change the udev key from ID_OUI_FROM_DATABASE to
something like ID_IEEE_VENDOR_FROM_DATABASE?

Suggested-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
---
 hwdb/ids-update.pl | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'hwdb/ids-update.pl')

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 90b90c5de2..869c49b861 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -208,24 +208,53 @@ sub pci_classes {
 }
 
 sub oui {
-        open(IN, "<", "oui.txt");
+        my $iab_prefix;
+        my %iab_prefixes = ();
+
         open(OUT, ">", "20-OUI.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
+                  "# Data imported and updated from: http://standards.ieee.org/develop/regauth/iab/iab.txt\n" .
                   "# Data imported and updated from: http://standards.ieee.org/develop/regauth/oui/oui.txt\n");
 
+        open(IN, "<", "iab.txt");
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
-                $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/;
+                $line =~ m/^([0-9A-F]{2})-([0-9A-F]{2})-([0-9A-F]{2})\s*\(hex\)\s*.+$/;
+                if (defined $1) {
+                        $iab_prefix = $1 . $2 . $3;
+                        $iab_prefixes{ $iab_prefix } = 1;
+                        next;
+                }
+
+                $line =~ m/^([0-9A-F]{3})000-\g1FFF\s*\(base 16\)\s*(.+)$/;
                 if (defined $1) {
                         my $vendor = uc $1;
                         my $text = $2;
+
                         print(OUT "\n");
-                        print(OUT "OUI:" . $vendor . "\n");
+                        print(OUT "OUI:" . $iab_prefix . $vendor . "*\n");
                         print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
                 }
         }
+        close(INP);
+
+        open(IN, "<", "oui.txt");
+        while (my $line = <IN>) {
+                $line =~ s/\s+$//;
+                $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/;
+                if (defined $1) {
+                        my $vendor = uc $1;
+                        my $text = $2;
 
+                        # skip the IAB prefixes
+                        if (! exists $iab_prefixes{ $vendor }) {
+                                print(OUT "\n");
+                                print(OUT "OUI:" . $vendor . "*\n");
+                                print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
+                        }
+                }
+        }
         close(INP);
         close(OUTP);
 }
-- 
cgit v1.2.3-54-g00ecf